From a84fcabb253d11e75b947af8faa1cf3baa9aa124 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 17 Apr 2018 14:01:46 -0700 Subject: [PATCH 001/363] Update version number to 2.2.0 --- version.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.props b/version.props index 15ee0fc807..c836c8d68c 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ - 2.1.0 - preview3 + 2.2.0 + preview1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From 341f6c4f302cca349104b55bc5cc817ef4da509e Mon Sep 17 00:00:00 2001 From: pan-wang Date: Wed, 18 Apr 2018 14:04:55 -0700 Subject: [PATCH 002/363] reset some timeout values to infinite if debugger is attached (#776) --- .../outofprocess/forwardinghandler.cpp | 14 ++++++++++---- .../RequestHandler/outofprocess/serverprocess.cxx | 10 +++++++++- .../RequestHandler/outofprocess/serverprocess.h | 9 +++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp index 4614b27d34..9b8c9466c8 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp @@ -1098,6 +1098,7 @@ FORWARDING_HANDLER::CreateWinHttpRequest( HRESULT hr = S_OK; PCWSTR pszVersion = NULL; PCSTR pszVerb; + DWORD dwTimeout = INFINITE; STACK_STRU(strVerb, 32); // @@ -1138,11 +1139,16 @@ FORWARDING_HANDLER::CreateWinHttpRequest( goto Finished; } + if (!pServerProcess->IsDebuggerAttached()) + { + dwTimeout = pProtocol->QueryTimeout(); + } + if (!WinHttpSetTimeouts(m_hRequest, - pProtocol->QueryTimeout(), - pProtocol->QueryTimeout(), - pProtocol->QueryTimeout(), - pProtocol->QueryTimeout())) + dwTimeout, //resolve timeout + dwTimeout, // connect timeout + dwTimeout, // send timeout + dwTimeout)) // receive timeout { hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx index de309bf643..dc4aace72b 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx @@ -40,6 +40,7 @@ SERVER_PROCESS::Initialize( m_fAnonymousAuthEnabled = fAnonymousAuthEnabled; m_fWebsocketsEnabled = fWebsocketsEnabled; m_pProcessManager->ReferenceProcessManager(); + m_fDebuggerAttached = FALSE; if (FAILED(hr = m_ProcessPath.Copy(*pszProcessExePath)) || FAILED(hr = m_struLogFile.Copy(*pstruStdoutLogFile))|| @@ -719,6 +720,8 @@ SERVER_PROCESS::PostStartCheck( m_fReady = TRUE; Finished: + m_fDebuggerAttached = fDebuggerAttached; + if (FAILED(hr)) { if (m_pForwarderConnection != NULL) @@ -1277,7 +1280,12 @@ SERVER_PROCESS::SendSignal( goto Finished; } - if (WaitForSingleObject(m_hShutdownHandle, m_dwShutdownTimeLimitInMS) != WAIT_OBJECT_0) + // + // Reset the shutdown timeout if debugger is attached. + // Do it only for the case that debugger is attached during process creation + // as IsDebuggerIsAttached call is too heavy + // + if (WaitForSingleObject(m_hShutdownHandle, m_fDebuggerAttached ? INFINITE : m_dwShutdownTimeLimitInMS) != WAIT_OBJECT_0) { hr = HRESULT_FROM_WIN32(ERROR_TIMEOUT); goto Finished; diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h index ff76297a1c..e60454cac0 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h @@ -57,6 +57,14 @@ public: return m_fReady; } + BOOL + IsDebuggerAttached( + VOID + ) + { + return m_fDebuggerAttached; + } + VOID StopProcess( VOID @@ -230,6 +238,7 @@ private: BOOL m_fBasicAuthEnabled; BOOL m_fAnonymousAuthEnabled; BOOL m_fWebsocketsEnabled; + BOOL m_fDebuggerAttached; STTIMER m_Timer; SOCKET m_socket; From 7351b274f7c5ab1701b15f69c76e056931821479 Mon Sep 17 00:00:00 2001 From: pan-wang Date: Wed, 18 Apr 2018 16:03:12 -0700 Subject: [PATCH 003/363] Add LPTHREAD_START_ROUTINE due to compiler change (fixing issue #780) (#783) --- src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx | 2 +- src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx | 2 +- .../RequestHandler/inprocess/inprocessapplication.cpp | 3 ++- .../RequestHandler/inprocess/inprocessapplication.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx b/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx index 086ed8774f..c3fd9f1882 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx +++ b/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx @@ -38,7 +38,7 @@ FILE_WATCHER::Create( m_hChangeNotificationThread = CreateThread(NULL, 0, - ChangeNotificationThread, + (LPTHREAD_START_ROUTINE)ChangeNotificationThread, this, 0, NULL); diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx index 4d3174937f..7fbc860c5e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx @@ -75,7 +75,7 @@ FILE_WATCHER::Create( m_hChangeNotificationThread = CreateThread(NULL, 0, - ChangeNotificationThread, + (LPTHREAD_START_ROUTINE)ChangeNotificationThread, this, 0, NULL); diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp index d8566262e1..59d3d08a84 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp @@ -43,7 +43,7 @@ IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION() } //static -VOID +DWORD IN_PROCESS_APPLICATION::DoShutDown( LPVOID lpParam ) @@ -51,6 +51,7 @@ IN_PROCESS_APPLICATION::DoShutDown( IN_PROCESS_APPLICATION* pApplication = static_cast(lpParam); DBG_ASSERT(pApplication); pApplication->ShutDownInternal(); + return 0; } __override diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h index a97fa0a3a9..ea234382dd 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h @@ -100,7 +100,7 @@ public: private: static - VOID + DWORD DoShutDown( LPVOID lpParam ); From 1f4473f96d53a392b01ad8930f9be8d6128ad775 Mon Sep 17 00:00:00 2001 From: pan-wang Date: Fri, 20 Apr 2018 13:48:10 -0700 Subject: [PATCH 004/363] fixing x86 build issue (#786) fixing issue #780 --- src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx b/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx index a64b6cae28..006fc1dcb8 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx +++ b/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx @@ -2005,7 +2005,9 @@ SERVER_PROCESS::~SERVER_PROCESS() InterlockedDecrement(&g_dwActiveServerProcesses); } -VOID +static +VOID +CALLBACK ProcessHandleCallback( _In_ PVOID pContext, _In_ BOOL @@ -2347,4 +2349,4 @@ SERVER_PROCESS::TerminateBackendProcess( } } } -} \ No newline at end of file +} From 3761667e3611dd07c1be9e2ea113a21a3df15e29 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 23 Apr 2018 12:11:42 -0700 Subject: [PATCH 005/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 66 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 6d392beab8..bc185e8407 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,44 +3,44 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-rc1-15774 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 0.5.0-preview2-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 + 2.2.0-preview1-17037 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 0.5.0-preview3-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 15.6.82 15.6.82 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 2.0.0 - 2.1.0-rc1-26419-02 - 2.1.0-rc1-30613 + 2.1.0-preview3-26413-05 + 2.2.0-preview1-34029 15.6.1 2.0.1 - 4.5.0-rc1-26419-03 - 4.5.0-rc1-26419-03 - 4.5.0-rc1-26419-03 - 4.5.0-rc1-26419-03 - 4.5.0-rc1-26419-03 - 4.5.0-rc1-26419-03 - 4.5.0-rc1-26419-03 + 4.5.0-preview3-26413-02 + 4.5.0-preview3-26413-02 + 4.5.0-preview3-26413-02 + 4.5.0-preview3-26413-02 + 4.5.0-preview3-26413-02 + 4.5.0-preview3-26413-02 + 4.5.0-preview3-26413-02 9.0.1 2.3.1 2.4.0-beta.1.build3945 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index ce2f277c53..790ae84e6d 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview3-17018 -commithash:af264ca131f212b5ba8aafbc5110fc0fc510a2be +version:2.2.0-preview1-17037 +commithash:557055a86cbdc359c97d4fb1c2d23a3dc7ae731e From e888481548d2702678ad80416158142120f6d677 Mon Sep 17 00:00:00 2001 From: pan-wang Date: Tue, 24 Apr 2018 09:45:22 -0700 Subject: [PATCH 006/363] update legal info for V1 assembly (#784) update company name --- src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc | 2 +- src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc b/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc index fc9f40f623..19f29cbbaf 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc +++ b/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc @@ -77,7 +77,7 @@ BEGIN VALUE "FileDescription", "IIS ASP.NET Core Module" VALUE "FileVersion", FileVersionStr VALUE "InternalName", "aspnetcore.dll" - VALUE "LegalCopyright", "Copyright (C) 2016" + VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation" VALUE "OriginalFilename", "aspnetcore.dll" VALUE "ProductName", "ASP.NET Core Module" VALUE "ProductVersion", ProductVersionStr diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc b/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc index 9d0dfa7f83..39edfaffc4 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc @@ -76,7 +76,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Microsoft Corporation" + VALUE "CompanyName", "Microsoft" VALUE "FileDescription", FileDescription VALUE "FileVersion", FileVersionStr VALUE "InternalName", "aspnetcore" From 47f728160f8de04864c34d51de4c5e235a86dac9 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 24 Apr 2018 13:53:09 -0700 Subject: [PATCH 007/363] React to splitting memory pool --- build/dependencies.props | 3 ++- .../Microsoft.AspNetCore.Server.IISIntegration.csproj | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index bc185e8407..3f8c6e638a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -19,7 +19,8 @@ 2.2.0-preview1-34029 15.6.82 15.6.82 - 2.2.0-preview1-34029 + 2.2.0-a-preview1-split-pool-16472 + 2.2.0-a-preview1-split-pool-16472 2.2.0-preview1-34029 2.2.0-preview1-34029 2.2.0-preview1-34029 diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj index f5efc09f7a..a17b331554 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -22,7 +22,8 @@ - + + From a4635cf5e2aa72905ab57e2ee6732daeab8426b6 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 29 Apr 2018 12:18:54 -0700 Subject: [PATCH 008/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 70 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 3f8c6e638a..96b6b1e7de 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,45 +3,45 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17037 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 0.5.0-preview3-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 + 2.2.0-preview1-17042 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 0.5.0-preview3-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 15.6.82 15.6.82 - 2.2.0-a-preview1-split-pool-16472 - 2.2.0-a-preview1-split-pool-16472 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 2.0.0 - 2.1.0-preview3-26413-05 - 2.2.0-preview1-34029 + 2.2.0-preview1-26424-04 + 2.2.0-preview1-34066 15.6.1 - 2.0.1 - 4.5.0-preview3-26413-02 - 4.5.0-preview3-26413-02 - 4.5.0-preview3-26413-02 - 4.5.0-preview3-26413-02 - 4.5.0-preview3-26413-02 - 4.5.0-preview3-26413-02 - 4.5.0-preview3-26413-02 + 2.0.3 + 4.5.0-preview3-26423-04 + 4.5.0-preview3-26423-04 + 4.5.0-preview3-26423-04 + 4.5.0-preview3-26423-04 + 4.5.0-preview3-26423-04 + 4.5.0-preview3-26423-04 + 4.5.0-preview3-26423-04 9.0.1 2.3.1 2.4.0-beta.1.build3945 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 790ae84e6d..5a9689541e 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17037 -commithash:557055a86cbdc359c97d4fb1c2d23a3dc7ae731e +version:2.2.0-preview1-17042 +commithash:edf0705d014293c260de763543784330514db9a3 From 3d2bf869c535911e2a867d1cd3188e4dfb80fa7b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 1 May 2018 10:57:00 -0700 Subject: [PATCH 009/363] Don't rely on USERPROFILE to find the path to dotnet.exe (#803) --- build/dependencies.props | 1 + .../IISIntegration.FunctionalTests.csproj | 3 ++- .../Inprocess/StartupTests.cs | 25 +++++++++++-------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 96b6b1e7de..a45d38b922 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -21,6 +21,7 @@ 15.6.82 2.2.0-preview1-34066 2.2.0-preview1-34066 + 2.2.0-preview1-34066 2.2.0-preview1-34066 2.2.0-preview1-34066 2.2.0-preview1-34066 diff --git a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj index d79a5ec5d9..acaebe6958 100644 --- a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj +++ b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj @@ -10,13 +10,14 @@ - + False + diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index 890bd248d3..a47e95aa99 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -1,19 +1,18 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + using System; -using System.Collections.Generic; using System.IO; -using System.Linq; using System.Net; -using System.Threading; using System.Threading.Tasks; -using System.Xml.Linq; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.Extensions.CommandLineUtils; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; using Xunit.Abstractions; using Xunit.Sdk; - namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class StartupTests : LoggedTest @@ -26,8 +25,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [Fact] public async Task ExpandEnvironmentVariableInWebConfig() { - var architecture = RuntimeArchitecture.x64; - var dotnetLocation = $"%USERPROFILE%\\.dotnet\\{architecture.ToString()}\\dotnet.exe"; +#if NET461 + // use the dotnet on PATH + var dotnetLocation = "dotnet"; +#else + var dotnetLocation = DotNetMuxer.MuxerPathOrDefault(); +#endif using (StartLog(out var loggerFactory)) { var logger = loggerFactory.CreateLogger("HelloWorldTest"); @@ -35,7 +38,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentParameters = GetBaseDeploymentParameters(); // Point to dotnet installed in user profile. - deploymentParameters.EnvironmentVariables["DotnetPath"] = Environment.ExpandEnvironmentVariables(dotnetLocation); // Path to dotnet. + deploymentParameters.EnvironmentVariables["DotnetPath"] = dotnetLocation; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) { @@ -72,7 +75,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var logger = loggerFactory.CreateLogger("HelloWorldTest"); var deploymentParameters = GetBaseDeploymentParameters(); - + // Point to dotnet installed in user profile. deploymentParameters.EnvironmentVariables["DotnetPath"] = Environment.ExpandEnvironmentVariables(dotnetLocation); // Path to dotnet. @@ -101,7 +104,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests using (StartLog(out var loggerFactory)) { var logger = loggerFactory.CreateLogger("HelloWorldTest"); - + var deploymentParameters = GetBaseDeploymentParameters(); using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) @@ -171,7 +174,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests #else #error Target frameworks need to be updated #endif - + [Fact] public async Task DetectsOveriddenServer() { From e36b0982bfb5041e430dfc7b3d12e89570be9211 Mon Sep 17 00:00:00 2001 From: pan-wang Date: Tue, 1 May 2018 15:50:51 -0700 Subject: [PATCH 010/363] port change from v2 to v1 on resetting timeout for debugger attached (#787) --- .../AspNetCore/Inc/resource.h | 1 + .../AspNetCore/Inc/serverprocess.h | 9 ++ .../AspNetCore/aspnetcore_msg.mc | 6 ++ .../AspNetCore/src/forwardinghandler.cxx | 14 ++- .../AspNetCore/src/serverprocess.cxx | 92 +++++++++++++------ 5 files changed, 88 insertions(+), 34 deletions(-) diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h b/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h index 64dde656b0..899e9a5c93 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h +++ b/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h @@ -18,3 +18,4 @@ #define ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE_MSG L"Failed to gracefully shutdown process '%d'." #define ASPNETCORE_EVENT_SENT_SHUTDOWN_HTTP_REQUEST_MSG L"Sent shutdown HTTP message to process '%d' and received http status '%d'." #define ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG L"App_offline file '%s' was detected." +#define ASPNETCORE_EVENT_PROCESS_SHUTDOWN_MSG L"Application '%s' with physical root '%s' shut down process with Id '%d' listening on port '%d'" diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h b/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h index 4d6bf6c145..0a721c1544 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h +++ b/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h @@ -65,6 +65,14 @@ public: return m_fReady; } + BOOL + IsDebuggerAttached( + VOID + ) + { + return m_fDebuggerAttached; + } + VOID StopProcess( VOID @@ -278,6 +286,7 @@ private: BOOL m_fWindowsAuthEnabled; BOOL m_fBasicAuthEnabled; BOOL m_fAnonymousAuthEnabled; + BOOL m_fDebuggerAttached; STTIMER m_Timer; SOCKET m_socket; diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc b/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc index 50bf87b656..0bbc4fa1c2 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc +++ b/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc @@ -73,6 +73,12 @@ Language=English %1 . +Messageid=1030 +SymbolicName=ASPNETCORE_EVENT_PROCESS_SHUTDOWN +Language=English +%1 +. + ; ;#endif // _ASPNETCORE_MODULE_MSG_H_ ; diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx b/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx index f02a318f41..1665539f18 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx +++ b/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx @@ -883,6 +883,7 @@ FORWARDING_HANDLER::CreateWinHttpRequest( HRESULT hr = S_OK; PCWSTR pszVersion = NULL; PCSTR pszVerb; + DWORD dwTimeout = INFINITE; STACK_STRU(strVerb, 32); // @@ -923,11 +924,16 @@ FORWARDING_HANDLER::CreateWinHttpRequest( goto Finished; } + if (!pServerProcess->IsDebuggerAttached()) + { + dwTimeout = pProtocol->QueryTimeout(); + } + if (!WinHttpSetTimeouts(m_hRequest, - pProtocol->QueryTimeout(), - pProtocol->QueryTimeout(), - pProtocol->QueryTimeout(), - pProtocol->QueryTimeout())) + dwTimeout, //resolve timeout + dwTimeout, // connect timeout + dwTimeout, // send timeout + dwTimeout)) // receive timeout { hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx b/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx index 006fc1dcb8..8b5e6f47e2 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx +++ b/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx @@ -35,6 +35,7 @@ SERVER_PROCESS::Initialize( m_fBasicAuthEnabled = fBasicAuthEnabled; m_fAnonymousAuthEnabled = fAnonymousAuthEnabled; m_pProcessManager->ReferenceProcessManager(); + m_fDebuggerAttached = FALSE; if (FAILED (hr = m_ProcessPath.Copy(*pszProcessExePath)) || FAILED (hr = m_struLogFile.Copy(*pstruStdoutLogFile))|| @@ -880,6 +881,7 @@ SERVER_PROCESS::PostStartCheck( m_fReady = TRUE; Finished: + m_fDebuggerAttached = fDebuggerAttached; return hr; } @@ -1328,10 +1330,10 @@ SERVER_PROCESS::CheckIfServerIsUp( ) { HRESULT hr = S_OK; - DWORD dwResult = 0; + DWORD dwResult = ERROR_INSUFFICIENT_BUFFER; MIB_TCPTABLE_OWNER_PID *pTCPInfo = NULL; MIB_TCPROW_OWNER_PID *pOwner = NULL; - DWORD dwSize = 0; + DWORD dwSize = 1000; int iResult = 0; SOCKADDR_IN sockAddr; SOCKET socketCheck = INVALID_SOCKET; @@ -1347,36 +1349,36 @@ SERVER_PROCESS::CheckIfServerIsUp( if (!g_fNsiApiNotSupported) { - dwResult = GetExtendedTcpTable(NULL, - &dwSize, - FALSE, - AF_INET, - TCP_TABLE_OWNER_PID_LISTENER, - 0); - - if (dwResult != NO_ERROR && dwResult != ERROR_INSUFFICIENT_BUFFER) + while (dwResult == ERROR_INSUFFICIENT_BUFFER) { - hr = HRESULT_FROM_WIN32(dwResult); - goto Finished; - } + // Increase the buffer size with additional space, MIB_TCPROW 20 bytes + // New entries may be added by other processes before calling GetExtendedTcpTable + dwSize += 200; - pTCPInfo = (MIB_TCPTABLE_OWNER_PID*)HeapAlloc(GetProcessHeap(), 0, dwSize); - if (pTCPInfo == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } + if (pTCPInfo != NULL) + { + HeapFree(GetProcessHeap(), 0, pTCPInfo); + } - dwResult = GetExtendedTcpTable(pTCPInfo, - &dwSize, - FALSE, - AF_INET, - TCP_TABLE_OWNER_PID_LISTENER, - 0); - if (dwResult != NO_ERROR) - { - hr = HRESULT_FROM_WIN32(dwResult); - goto Finished; + pTCPInfo = (MIB_TCPTABLE_OWNER_PID*)HeapAlloc(GetProcessHeap(), 0, dwSize); + if (pTCPInfo == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } + + dwResult = GetExtendedTcpTable(pTCPInfo, + &dwSize, + FALSE, + AF_INET, + TCP_TABLE_OWNER_PID_LISTENER, + 0); + + if (dwResult != NO_ERROR && dwResult != ERROR_INSUFFICIENT_BUFFER) + { + hr = HRESULT_FROM_WIN32(dwResult); + goto Finished; + } } // iterate pTcpInfo struct to find PID/PORT entry @@ -1421,6 +1423,12 @@ SERVER_PROCESS::CheckIfServerIsUp( if (iResult == SOCKET_ERROR) { hr = HRESULT_FROM_WIN32(WSAGetLastError()); + if (hr == HRESULT_FROM_WIN32(WSAECONNREFUSED)) + { + // WSAECONNREFUSED means no application listen on the given port. + // This is not a failure. Reset the hresult to S_OK and return fReady to false + hr = S_OK; + } goto Finished; } @@ -1483,7 +1491,7 @@ SERVER_PROCESS::SendSignal( goto Finished; } - if (WaitForSingleObject(m_hShutdownHandle, m_dwShutdownTimeLimitInMS) != WAIT_OBJECT_0) + if (WaitForSingleObject(m_hShutdownHandle, m_fDebuggerAttached ? INFINITE : m_dwShutdownTimeLimitInMS) != WAIT_OBJECT_0) { hr = HRESULT_FROM_WIN32(ERROR_TIMEOUT); goto Finished; @@ -2065,12 +2073,36 @@ SERVER_PROCESS::HandleProcessExit() HRESULT hr = S_OK; BOOL fReady = FALSE; DWORD dwProcessId = 0; + LPCWSTR apsz[1]; + STACK_STRU(strEventMsg, 256); + if (InterlockedCompareExchange(&m_lStopping, 1L, 0L) == 0L) { CheckIfServerIsUp(m_dwPort, &dwProcessId, &fReady); if (!fReady) { + if (SUCCEEDED(strEventMsg.SafeSnwprintf( + ASPNETCORE_EVENT_PROCESS_SHUTDOWN_MSG, + m_struAppFullPath.QueryStr(), + m_pszRootApplicationPath.QueryStr(), + m_dwProcessId, + m_dwPort))) + { + apsz[0] = strEventMsg.QueryStr(); + if (FORWARDING_HANDLER::QueryEventLog() != NULL) + { + ReportEventW(FORWARDING_HANDLER::QueryEventLog(), + EVENTLOG_INFORMATION_TYPE, + 0, + ASPNETCORE_EVENT_PROCESS_SHUTDOWN, + NULL, + 1, + 0, + apsz, + NULL); + } + } m_pProcessManager->ShutdownProcess(this); } From e49b0a34ab35857ddba29b632a87582ea0f68342 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 1 May 2018 16:09:49 -0700 Subject: [PATCH 011/363] Make exchange classes pure virtual (#792) Make exchange classes pure virtual --- .gitignore | 1 + .../AspNetCore/Inc/applicationinfo.h | 24 ++----- .../AspNetCore/Inc/proxymodule.h | 4 +- .../AspNetCore/src/applicationinfo.cpp | 33 ++++------ .../AspNetCore/src/dllmain.cpp | 5 +- .../AspNetCore/src/precomp.hxx | 5 +- .../AspNetCore/src/proxymodule.cxx | 7 +- .../CommonLib/CommonLib.vcxproj | 4 +- .../CommonLib/application.cpp | 50 --------------- .../CommonLib/application.h | 64 +++++++++---------- .../CommonLib/iapplication.h | 47 ++++++++++++++ .../CommonLib/irequesthandler.h | 48 ++++++++++++++ .../CommonLib/requesthandler.cxx | 44 ------------- .../CommonLib/requesthandler.h | 62 ++++++------------ src/AspNetCoreModuleV2/CommonLib/stdafx.h | 8 ++- .../RequestHandler/Source.def | 1 - .../RequestHandler/disconnectcontext.h | 8 +-- .../RequestHandler/dllmain.cxx | 49 ++------------ .../inprocess/inprocessapplication.cpp | 29 ++++++++- .../inprocess/inprocessapplication.h | 13 ++++ .../inprocess/inprocesshandler.cpp | 20 +++--- .../inprocess/inprocesshandler.h | 19 ++++-- .../outofprocess/forwardinghandler.cpp | 30 +++++---- .../outofprocess/forwardinghandler.h | 10 ++- .../outofprocess/outprocessapplication.cpp | 27 +++++++- .../outofprocess/outprocessapplication.h | 26 ++++++-- .../RequestHandler/precomp.hxx | 1 + test/CommonLibTests/stdafx.h | 2 +- 28 files changed, 321 insertions(+), 320 deletions(-) delete mode 100644 src/AspNetCoreModuleV2/CommonLib/application.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/iapplication.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/irequesthandler.h delete mode 100644 src/AspNetCoreModuleV2/CommonLib/requesthandler.cxx diff --git a/.gitignore b/.gitignore index f86f68b748..e30a491fca 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,7 @@ x64/ *.pdb *.lib *.idb +*.TMP src/*/AspNetCore/aspnetcoremodule.h src/*/AspNetCore/aspnetcore_msg.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h index f47b51786b..96532217e6 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h @@ -11,17 +11,9 @@ HRESULT (WINAPI * PFN_ASPNETCORE_CREATE_APPLICATION)( _In_ IHttpServer *pServer, _In_ ASPNETCORE_CONFIG *pConfig, - _Out_ APPLICATION **pApplication + _Out_ IAPPLICATION **pApplication ); -typedef -HRESULT -(WINAPI * PFN_ASPNETCORE_CREATE_REQUEST_HANDLER)( - _In_ IHttpContext *pHttpContext, - _In_ HTTP_MODULE_ID *pModuleId, - _In_ APPLICATION *pApplication, - _Out_ REQUEST_HANDLER **pRequestHandler - ); // // The key used for hash-table lookups, consists of the port on which the http process is created. // @@ -71,8 +63,7 @@ public: m_cRefs(1), m_fAppOfflineFound(FALSE), m_pAppOfflineHtm(NULL), m_pFileWatcherEntry(NULL), m_pConfiguration(NULL), - m_pfnAspNetCoreCreateApplication(NULL), - m_pfnAspNetCoreCreateRequestHandler(NULL) + m_pfnAspNetCoreCreateApplication(NULL) { InitializeSRWLock(&m_srwLock); } @@ -136,7 +127,7 @@ public: // Otherwise memory leak // VOID - ExtractApplication(APPLICATION** ppApplication) + ExtractApplication(IAPPLICATION** ppApplication) { AcquireSRWLockShared(&m_srwLock); if (m_pApplication != NULL) @@ -156,12 +147,6 @@ public: HRESULT EnsureApplicationCreated(); - PFN_ASPNETCORE_CREATE_REQUEST_HANDLER - QueryCreateRequestHandler() - { - return m_pfnAspNetCoreCreateRequestHandler; - } - private: HRESULT FindRequestHandlerAssembly(); HRESULT FindNativeAssemblyFromGlobalLocation(STRU* struFilename); @@ -175,11 +160,10 @@ private: APP_OFFLINE_HTM *m_pAppOfflineHtm; FILE_WATCHER_ENTRY *m_pFileWatcherEntry; ASPNETCORE_CONFIG *m_pConfiguration; - APPLICATION *m_pApplication; + IAPPLICATION *m_pApplication; SRWLOCK m_srwLock; IHttpServer *m_pServer; PFN_ASPNETCORE_CREATE_APPLICATION m_pfnAspNetCoreCreateApplication; - PFN_ASPNETCORE_CREATE_REQUEST_HANDLER m_pfnAspNetCoreCreateRequestHandler; }; class APPLICATION_INFO_HASH : diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h index 7e5f30a8eb..982dd8c970 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h @@ -46,8 +46,8 @@ class ASPNET_CORE_PROXY_MODULE : public CHttpModule private: APPLICATION_INFO *m_pApplicationInfo; - APPLICATION *m_pApplication; - REQUEST_HANDLER *m_pHandler; + IAPPLICATION *m_pApplication; + IREQUEST_HANDLER *m_pHandler; }; class ASPNET_CORE_PROXY_MODULE_FACTORY : public IHttpModuleFactory diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 63efb9e889..20d8ef7915 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -15,7 +15,7 @@ APPLICATION_INFO::~APPLICATION_INFO() { // Mark the entry as invalid, // StopMonitor will close the file handle and trigger a FCN - // the entry will delete itself when processing this FCN + // the entry will delete itself when processing this FCN m_pFileWatcherEntry->MarkEntryInValid(); m_pFileWatcherEntry->StopMonitor(); m_pFileWatcherEntry->DereferenceFileWatcherEntry(); @@ -161,7 +161,7 @@ APPLICATION_INFO::UpdateAppOfflineFileHandle() STACK_STRU(strEventMsg, 256); if (SUCCEEDED(strEventMsg.SafeSnwprintf( ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG, - m_pApplication->QueryConfig()->QueryApplicationPath()->QueryStr()))) + m_pConfiguration->QueryApplicationPath()->QueryStr()))) { UTILITY::LogEvent(g_hEventLog, EVENTLOG_INFORMATION_TYPE, @@ -181,7 +181,7 @@ APPLICATION_INFO::EnsureApplicationCreated() { HRESULT hr = S_OK; BOOL fLocked = FALSE; - APPLICATION* pApplication = NULL; + IAPPLICATION* pApplication = NULL; STACK_STRU(struFileName, 300); // >MAX_PATH STRU struHostFxrDllLocation; @@ -314,24 +314,15 @@ APPLICATION_INFO::FindRequestHandlerAssembly() hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; } - - g_pfnAspNetCoreCreateRequestHandler = (PFN_ASPNETCORE_CREATE_REQUEST_HANDLER) - GetProcAddress(g_hAspnetCoreRH, "CreateRequestHandler"); - if (g_pfnAspNetCoreCreateRequestHandler == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } g_fAspnetcoreRHAssemblyLoaded = TRUE; } Finished: // // Question: we remember the load failure so that we will not try again. - // User needs to check whether the fuction pointer is NULL + // User needs to check whether the fuction pointer is NULL // m_pfnAspNetCoreCreateApplication = g_pfnAspNetCoreCreateApplication; - m_pfnAspNetCoreCreateRequestHandler = g_pfnAspNetCoreCreateRequestHandler; if (!g_fAspnetcoreRHLoadedError && FAILED(hr)) { g_fAspnetcoreRHLoadedError = TRUE; @@ -401,11 +392,11 @@ Finished: return hr; } -// +// // Tries to find aspnetcorerh.dll from the application // Calls into hostfxr.dll to find it. // Will leave hostfxr.dll loaded as it will be used again to call hostfxr_main. -// +// HRESULT APPLICATION_INFO::FindNativeAssemblyFromHostfxr( STRU* struFilename @@ -440,7 +431,7 @@ APPLICATION_INFO::FindNativeAssemblyFromHostfxr( if (pFnHostFxrSearchDirectories == NULL) { // Host fxr version is incorrect (need a higher version). - // TODO log error + // TODO log error hr = E_FAIL; goto Finished; } @@ -540,7 +531,7 @@ Finished: VOID APPLICATION_INFO::RecycleApplication() { - APPLICATION* pApplication = NULL; + IAPPLICATION* pApplication = NULL; HANDLE hThread = INVALID_HANDLE_VALUE; BOOL fLockAcquired = FALSE; @@ -551,7 +542,7 @@ APPLICATION_INFO::RecycleApplication() if (m_pApplication != NULL) { pApplication = m_pApplication; - if (pApplication->QueryConfig()->QueryHostingModel() == HOSTING_OUT_PROCESS) + if (m_pConfiguration->QueryHostingModel() == HOSTING_OUT_PROCESS) { // // For inprocess, need to set m_pApplication to NULL first to @@ -588,7 +579,7 @@ APPLICATION_INFO::RecycleApplication() g_pHttpServer->RecycleProcess(L"On Demand by AspNetCore Module for recycle application failure"); } } - else + else { // Closing a thread handle does not terminate the associated thread or remove the thread object. CloseHandle(hThread); @@ -606,7 +597,7 @@ VOID APPLICATION_INFO::DoRecycleApplication( LPVOID lpParam) { - APPLICATION* pApplication = static_cast(lpParam); + IAPPLICATION* pApplication = static_cast(lpParam); // No lock required @@ -624,7 +615,7 @@ APPLICATION_INFO::DoRecycleApplication( VOID APPLICATION_INFO::ShutDownApplication() { - APPLICATION* pApplication = NULL; + IAPPLICATION* pApplication = NULL; BOOL fLockAcquired = FALSE; // pApplication can be NULL due to app_offline diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp index 2e4f87e542..56829cb382 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp @@ -21,7 +21,6 @@ DWORD g_dwDebugFlags = 0; PCSTR g_szDebugLabel = "ASPNET_CORE_MODULE"; PCWSTR g_pwzAspnetcoreRequestHandlerName = L"aspnetcorerh.dll"; PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; -PFN_ASPNETCORE_CREATE_REQUEST_HANDLER g_pfnAspNetCoreCreateRequestHandler; VOID StaticCleanup() @@ -49,7 +48,7 @@ BOOL WINAPI DllMain(HMODULE hModule, break; case DLL_PROCESS_DETACH: // IIS can cause dll detach to occur before we receive global notifications - // For example, when we switch the bitness of the worker process, + // For example, when we switch the bitness of the worker process, // this is a bug in IIS. To try to avoid AVs, we will set a global flag g_fInShutdown = TRUE; StaticCleanup(); @@ -204,7 +203,7 @@ HRESULT hr = E_OUTOFMEMORY; goto Finished; } - + hr = pApplicationManager->Initialize(); if(FAILED(hr)) { diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx index 574244ba35..bd07247484 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx @@ -104,7 +104,7 @@ inline bool IsSpace(char ch) #include "..\..\CommonLib\environmentvariablehash.h" #include "..\..\CommonLib\aspnetcoreconfig.h" #include "..\..\CommonLib\hostfxr_utility.h" -#include "..\..\CommonLib\application.h" +#include "..\..\CommonLib\iapplication.h" #include "..\..\CommonLib\utility.h" #include "..\..\CommonLib\debugutil.h" #include "..\..\CommonLib\requesthandler.h" @@ -138,7 +138,7 @@ FORCEINLINE HRESULT HRESULT_FROM_GETLASTERROR() { - return ( GetLastError() != NO_ERROR ) + return ( GetLastError() != NO_ERROR ) ? HRESULT_FROM_WIN32( GetLastError() ) : E_FAIL; } @@ -155,5 +155,4 @@ extern SRWLOCK g_srwLock; extern PCWSTR g_pwzAspnetcoreRequestHandlerName; extern HANDLE g_hEventLog; extern PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; -extern PFN_ASPNETCORE_CREATE_REQUEST_HANDLER g_pfnAspNetCoreCreateRequestHandler; #pragma warning( error : 4091) diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index 8ab880339a..0c295fbd0c 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -81,7 +81,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( ASPNETCORE_CONFIG *pConfig = NULL; APPLICATION_MANAGER *pApplicationManager = NULL; REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; - APPLICATION* pApplication = NULL; + IAPPLICATION* pApplication = NULL; STACK_STRU(struFileName, 256); if (g_fInShutdown) { @@ -162,9 +162,8 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( } // Create RequestHandler and process the request - hr = m_pApplicationInfo->QueryCreateRequestHandler()(pHttpContext, + hr = pApplication->CreateHandler(pHttpContext, (HTTP_MODULE_ID*) &g_pModuleId, - pApplication, &m_pHandler); if (FAILED(hr)) @@ -174,7 +173,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( retVal = m_pHandler->OnExecuteRequestHandler(); -Finished: +Finished: if (FAILED(hr)) { retVal = RQ_NOTIFICATION_FINISH_REQUEST; diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 1ab1ef971c..525198f1b6 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -171,12 +171,14 @@ + + @@ -184,11 +186,9 @@ - - Create diff --git a/src/AspNetCoreModuleV2/CommonLib/application.cpp b/src/AspNetCoreModuleV2/CommonLib/application.cpp deleted file mode 100644 index b68c093266..0000000000 --- a/src/AspNetCoreModuleV2/CommonLib/application.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#include "stdafx.h" - -APPLICATION::APPLICATION( - _In_ IHttpServer* pHttpServer, - _In_ ASPNETCORE_CONFIG* pConfig) : - m_cRefs(1), - m_pConfig(pConfig), - m_status(APPLICATION_STATUS::UNKNOWN) -{ - UNREFERENCED_PARAMETER(pHttpServer); -} - -APPLICATION::~APPLICATION() -{ -} - -APPLICATION_STATUS -APPLICATION::QueryStatus() -{ - return m_status; -} - -ASPNETCORE_CONFIG* -APPLICATION::QueryConfig() -{ - return m_pConfig; -} - -VOID -APPLICATION::ReferenceApplication() -const -{ - InterlockedIncrement(&m_cRefs); -} - -VOID -APPLICATION::DereferenceApplication() -const -{ - DBG_ASSERT(m_cRefs != 0); - - LONG cRefs = 0; - if ((cRefs = InterlockedDecrement(&m_cRefs)) == 0) - { - delete this; - } -} diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index 43c9dafd0c..212fb27f63 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -3,51 +3,45 @@ #pragma once -enum APPLICATION_STATUS -{ - UNKNOWN = 0, - STARTING, - RUNNING, - SHUTDOWN, - FAIL -}; +#include "stdafx.h" -class ASPNETCORE_CONFIG; - -class APPLICATION +class APPLICATION : public IAPPLICATION { + public: - APPLICATION( - _In_ IHttpServer* pHttpServer, - _In_ ASPNETCORE_CONFIG* pConfig); - - virtual - VOID - ShutDown() = 0; - - virtual - VOID - Recycle() = 0; - - virtual - ~APPLICATION(); APPLICATION_STATUS - QueryStatus(); + QueryStatus() override + { + return m_status; + } - ASPNETCORE_CONFIG* - QueryConfig(); + APPLICATION() + : m_cRefs(1) + { + } VOID - ReferenceApplication() - const; + ReferenceApplication() override + { + InterlockedIncrement(&m_cRefs); + } VOID - DereferenceApplication() - const; + DereferenceApplication() override + { + DBG_ASSERT(m_cRefs != 0); + + LONG cRefs = 0; + if ((cRefs = InterlockedDecrement(&m_cRefs)) == 0) + { + delete this; + } + } protected: - mutable LONG m_cRefs; - volatile APPLICATION_STATUS m_status; - ASPNETCORE_CONFIG* m_pConfig; + volatile APPLICATION_STATUS m_status = APPLICATION_STATUS::UNKNOWN; + +private: + mutable LONG m_cRefs; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h new file mode 100644 index 0000000000..95d726ead7 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -0,0 +1,47 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +enum APPLICATION_STATUS +{ + UNKNOWN = 0, + STARTING, + RUNNING, + SHUTDOWN, + FAIL +}; + +class IAPPLICATION +{ +public: + virtual + VOID + ShutDown() = 0; + + virtual + VOID + Recycle() = 0; + + virtual + ~IAPPLICATION() = 0 { }; + + virtual + APPLICATION_STATUS + QueryStatus() = 0; + + virtual + VOID + ReferenceApplication() = 0; + + virtual + VOID + DereferenceApplication() = 0; + + virtual + HRESULT + CreateHandler( + _In_ IHttpContext *pHttpContext, + _In_ HTTP_MODULE_ID *pModuleId, + _Out_ IREQUEST_HANDLER **pRequestHandler) = 0; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h new file mode 100644 index 0000000000..fce1913c32 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h @@ -0,0 +1,48 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include "stdafx.h" + +// +// Pure abstract class +// +class IREQUEST_HANDLER +{ +public: + + virtual + REQUEST_NOTIFICATION_STATUS + OnExecuteRequestHandler() = 0; + + virtual + REQUEST_NOTIFICATION_STATUS + OnAsyncCompletion( + DWORD cbCompletion, + HRESULT hrCompletionStatus + ) = 0; + + virtual + VOID + TerminateRequest( + bool fClientInitiated + ) = 0; + + virtual + ~IREQUEST_HANDLER( + VOID + ) = 0 { } + + virtual + VOID + ReferenceRequestHandler( + VOID + ) = 0; + + virtual + VOID + DereferenceRequestHandler( + VOID + ) = 0; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler.cxx b/src/AspNetCoreModuleV2/CommonLib/requesthandler.cxx deleted file mode 100644 index bcf1887d35..0000000000 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler.cxx +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#include "stdafx.h" - -REQUEST_HANDLER::REQUEST_HANDLER( - _In_ IHttpContext *pW3Context, - _In_ HTTP_MODULE_ID *pModuleId, - _In_ APPLICATION *pApplication) - : m_cRefs(1) -{ - m_pW3Context = pW3Context; - m_pApplication = pApplication; - m_pModuleId = *pModuleId; -} - - -REQUEST_HANDLER::~REQUEST_HANDLER() -{ -} - -VOID -REQUEST_HANDLER::ReferenceRequestHandler( - VOID -) const -{ - InterlockedIncrement(&m_cRefs); -} - - -VOID -REQUEST_HANDLER::DereferenceRequestHandler( - VOID -) const -{ - DBG_ASSERT(m_cRefs != 0); - - LONG cRefs = 0; - if ((cRefs = InterlockedDecrement(&m_cRefs)) == 0) - { - delete this; - } - -} diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h index 28f4fb725e..ad12b90733 100644 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h @@ -4,56 +4,32 @@ #pragma once #include "stdafx.h" -#include "application.h" // -// Abstract class +// Pure abstract class // -class REQUEST_HANDLER +class REQUEST_HANDLER: public virtual IREQUEST_HANDLER { + public: - REQUEST_HANDLER( - _In_ IHttpContext *pW3Context, - _In_ HTTP_MODULE_ID *pModuleId, - _In_ APPLICATION *pApplication - ); - - virtual - REQUEST_NOTIFICATION_STATUS - OnExecuteRequestHandler() = 0; - - virtual - REQUEST_NOTIFICATION_STATUS - OnAsyncCompletion( - DWORD cbCompletion, - HRESULT hrCompletionStatus - ) = 0; - - virtual VOID - TerminateRequest( - bool fClientInitiated - ) = 0; - - virtual - ~REQUEST_HANDLER( - VOID - ); + ReferenceRequestHandler() override + { + InterlockedIncrement(&m_cRefs); + } VOID - ReferenceRequestHandler( - VOID - ) const; + DereferenceRequestHandler() override + { + DBG_ASSERT(m_cRefs != 0); - virtual - VOID - DereferenceRequestHandler( - VOID - ) const; + LONG cRefs = 0; + if ((cRefs = InterlockedDecrement(&m_cRefs)) == 0) + { + delete this; + } + } -protected: - mutable LONG m_cRefs; - IHttpContext* m_pW3Context; - APPLICATION* m_pApplication; - HTTP_MODULE_ID m_pModuleId; -}; \ No newline at end of file +private: + mutable LONG m_cRefs = 1; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index 69ad058f1f..30186ed4ad 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -25,10 +25,14 @@ #include "environmentvariablehash.h" #include "utility.h" #include "aspnetcoreconfig.h" -#include "application.h" -#include "requesthandler.h" #include "fx_ver.h" #include "hostfxr_utility.h" #include "resources.h" #include "aspnetcore_msg.h" +#include "irequesthandler.h" +#include "iapplication.h" +#include "requesthandler.h" +#include "application.h" + + diff --git a/src/AspNetCoreModuleV2/RequestHandler/Source.def b/src/AspNetCoreModuleV2/RequestHandler/Source.def index 889bd1a39b..86c8c2a268 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/Source.def +++ b/src/AspNetCoreModuleV2/RequestHandler/Source.def @@ -2,5 +2,4 @@ LIBRARY aspnetcorerh EXPORTS CreateApplication - CreateRequestHandler diff --git a/src/AspNetCoreModuleV2/RequestHandler/disconnectcontext.h b/src/AspNetCoreModuleV2/RequestHandler/disconnectcontext.h index e43a49c0a0..e421fe11e3 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/disconnectcontext.h +++ b/src/AspNetCoreModuleV2/RequestHandler/disconnectcontext.h @@ -21,7 +21,7 @@ public: VOID NotifyDisconnect() { - REQUEST_HANDLER *pInitialValue = (REQUEST_HANDLER*) + IREQUEST_HANDLER *pInitialValue = (IREQUEST_HANDLER*) InterlockedExchangePointer((PVOID*)&m_pHandler, NULL); if (pInitialValue != NULL) @@ -33,7 +33,7 @@ public: VOID SetHandler( - REQUEST_HANDLER *pHandler + IREQUEST_HANDLER *pHandler ) { // @@ -61,7 +61,7 @@ public: VOID ) { - REQUEST_HANDLER *pInitialValue = (REQUEST_HANDLER*) + IREQUEST_HANDLER *pInitialValue = (IREQUEST_HANDLER*) InterlockedExchangePointer((PVOID*)&m_pHandler, NULL); if (pInitialValue != NULL) @@ -74,5 +74,5 @@ private: ~ASYNC_DISCONNECT_CONTEXT() {} - REQUEST_HANDLER * m_pHandler; + IREQUEST_HANDLER * m_pHandler; }; \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx index 3cfdef0798..5014e3a3ef 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx @@ -187,10 +187,10 @@ EnsureOutOfProcessInitializtion() } // - // Don't set non-blocking callbacks WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS, + // Don't set non-blocking callbacks WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS, // as we will call WinHttpQueryDataAvailable to get response on the same thread // that we received callback from Winhttp on completing sending/forwarding the request - // + // // // Setup the callback function @@ -277,11 +277,11 @@ __stdcall CreateApplication( _In_ IHttpServer *pServer, _In_ ASPNETCORE_CONFIG *pConfig, - _Out_ APPLICATION **ppApplication + _Out_ IAPPLICATION **ppApplication ) { HRESULT hr = S_OK; - APPLICATION *pApplication = NULL; + IAPPLICATION *pApplication = NULL; // Initialze some global variables here InitializeGlobalConfiguration(pServer); @@ -303,7 +303,8 @@ CreateApplication( goto Finished; } - pApplication = new OUT_OF_PROCESS_APPLICATION(pServer, pConfig); + + pApplication = new OUT_OF_PROCESS_APPLICATION(pConfig); if (pApplication == NULL) { hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); @@ -329,41 +330,3 @@ CreateApplication( Finished: return hr; } - -HRESULT -__stdcall -CreateRequestHandler( - _In_ IHttpContext *pHttpContext, - _In_ HTTP_MODULE_ID *pModuleId, - _In_ APPLICATION *pApplication, - _Out_ REQUEST_HANDLER **pRequestHandler -) -{ - HRESULT hr = S_OK; - REQUEST_HANDLER* pHandler = NULL; - ASPNETCORE_CONFIG* pConfig = pApplication->QueryConfig(); - DBG_ASSERT(pConfig); - - if (pConfig->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) - { - pHandler = new IN_PROCESS_HANDLER(pHttpContext, pModuleId, pApplication); - } - else if (pConfig->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_OUT_PROCESS) - { - pHandler = new FORWARDING_HANDLER(pHttpContext, pModuleId, pApplication); - } - else - { - return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); - } - - if (pHandler == NULL) - { - hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); - } - else - { - *pRequestHandler = pHandler; - } - return hr; -} diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp index 59d3d08a84..ca599c9389 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp @@ -5,7 +5,6 @@ IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL; IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( IHttpServer* pHttpServer, ASPNETCORE_CONFIG* pConfig) : - APPLICATION(pHttpServer, pConfig), m_pHttpServer(pHttpServer), m_ProcessExitCode(0), m_hLogFileHandle(INVALID_HANDLE_VALUE), @@ -17,7 +16,8 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( m_fInitialized(FALSE), m_fShutdownCalledFromNative(FALSE), m_fShutdownCalledFromManaged(FALSE), - m_srwLock() + m_srwLock(), + m_pConfig(pConfig) { // is it guaranteed that we have already checked app offline at this point? // If so, I don't think there is much to do here. @@ -985,3 +985,28 @@ IN_PROCESS_APPLICATION::FilterException(unsigned int, struct _EXCEPTION_POINTERS // TODO, log error based on exception code. return EXCEPTION_EXECUTE_HANDLER; } + +ASPNETCORE_CONFIG* +IN_PROCESS_APPLICATION::QueryConfig() const +{ + return m_pConfig; +} + +HRESULT +IN_PROCESS_APPLICATION::CreateHandler( + _In_ IHttpContext *pHttpContext, + _In_ HTTP_MODULE_ID *pModuleId, + _Out_ IREQUEST_HANDLER **pRequestHandler) +{ + HRESULT hr = S_OK; + IREQUEST_HANDLER* pHandler = NULL; + pHandler = new IN_PROCESS_HANDLER(pHttpContext, pModuleId, this); + + if (pHandler == NULL) + { + hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); + } + + *pRequestHandler = pHandler; + return hr; +} diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h index ea234382dd..6c27d8e202 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h @@ -33,6 +33,14 @@ public: VOID ); + __override + HRESULT + CreateHandler( + _In_ IHttpContext *pHttpContext, + _In_ HTTP_MODULE_ID *pModuleId, + _Out_ IREQUEST_HANDLER **pRequestHandler) + override; + // Executes the .NET Core process HRESULT ExecuteApplication( @@ -98,6 +106,9 @@ public: return s_Application; } + ASPNETCORE_CONFIG* + QueryConfig() const; + private: static DWORD @@ -155,6 +166,8 @@ private: DWORD m_dwStdErrReadTotal; static IN_PROCESS_APPLICATION* s_Application; + ASPNETCORE_CONFIG* m_pConfig; + VOID SetStdOut( VOID diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp index c98d84744c..a8bce9b974 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp @@ -3,8 +3,10 @@ IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( _In_ IHttpContext *pW3Context, _In_ HTTP_MODULE_ID *pModuleId, - _In_ APPLICATION *pApplication -): REQUEST_HANDLER(pW3Context, pModuleId, pApplication) + _In_ IN_PROCESS_APPLICATION *pApplication +): m_pW3Context(pW3Context), + m_pApplication(pApplication), + m_pModuleId(*pModuleId) { m_fManagedRequestComplete = FALSE; } @@ -20,7 +22,7 @@ IN_PROCESS_HANDLER::OnExecuteRequestHandler() { // First get the in process Application HRESULT hr; - hr = ((IN_PROCESS_APPLICATION*)m_pApplication)->LoadManagedApplication(); + hr = m_pApplication->LoadManagedApplication(); if (FAILED(hr)) { // TODO remove com_error? @@ -39,7 +41,7 @@ IN_PROCESS_HANDLER::OnExecuteRequestHandler() } // FREB log - + if (ANCMEvents::ANCM_START_APPLICATION_SUCCESS::IsEnabled(m_pW3Context->GetTraceContext())) { ANCMEvents::ANCM_START_APPLICATION_SUCCESS::RaiseEvent( @@ -49,7 +51,7 @@ IN_PROCESS_HANDLER::OnExecuteRequestHandler() } //SetHttpSysDisconnectCallback(); - return ((IN_PROCESS_APPLICATION*)m_pApplication)->OnExecuteRequest(m_pW3Context, this); + return m_pApplication->OnExecuteRequest(m_pW3Context, this); } __override @@ -59,15 +61,9 @@ IN_PROCESS_HANDLER::OnAsyncCompletion( HRESULT hrCompletionStatus ) { - IN_PROCESS_APPLICATION* application = (IN_PROCESS_APPLICATION*)m_pApplication; - if (application == NULL) - { - return RQ_NOTIFICATION_FINISH_REQUEST; - } - // OnAsyncCompletion must call into the application if there was a error. We will redo calls // to Read/Write if we called cancelIo on the IHttpContext. - return application->OnAsyncCompletion(cbCompletion, hrCompletionStatus, this); + return m_pApplication->OnAsyncCompletion(cbCompletion, hrCompletionStatus, this); } VOID diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h index 1ea1a8dbc5..344bde1bb0 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h +++ b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h @@ -1,5 +1,7 @@ #pragma once +class IN_PROCESS_APPLICATION; + class IN_PROCESS_HANDLER : public REQUEST_HANDLER { public: @@ -7,27 +9,26 @@ public: _In_ IHttpContext *pW3Context, _In_ HTTP_MODULE_ID *pModuleId, - _In_ APPLICATION *pApplication); + _In_ IN_PROCESS_APPLICATION *pApplication); - ~IN_PROCESS_HANDLER(); + ~IN_PROCESS_HANDLER() override; __override REQUEST_NOTIFICATION_STATUS - OnExecuteRequestHandler(); + OnExecuteRequestHandler() override; __override REQUEST_NOTIFICATION_STATUS OnAsyncCompletion( DWORD cbCompletion, HRESULT hrCompletionStatus - ); + ) override; __override VOID TerminateRequest( bool fClientInitiated - - ); + ) override; PVOID QueryManagedHttpContext( @@ -69,4 +70,8 @@ private: IHttpContext* m_pHttpContext; BOOL m_fManagedRequestComplete; REQUEST_NOTIFICATION_STATUS m_requestNotificationStatus; -}; \ No newline at end of file + + IHttpContext* m_pW3Context; + IN_PROCESS_APPLICATION* m_pApplication; + HTTP_MODULE_ID m_pModuleId; +}; diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp index 9b8c9466c8..f15be2a3f3 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp @@ -18,10 +18,10 @@ PROTOCOL_CONFIG FORWARDING_HANDLER::sm_ProtocolConfig; RESPONSE_HEADER_HASH * FORWARDING_HANDLER::sm_pResponseHeaderHash = NULL; FORWARDING_HANDLER::FORWARDING_HANDLER( - _In_ IHttpContext *pW3Context, - _In_ HTTP_MODULE_ID *pModuleId, - _In_ APPLICATION *pApplication -) : REQUEST_HANDLER(pW3Context, pModuleId, pApplication), + _In_ IHttpContext *pW3Context, + _In_ HTTP_MODULE_ID *pModuleId, + _In_ OUT_OF_PROCESS_APPLICATION *pApplication +) : IREQUEST_HANDLER(), m_Signature(FORWARDING_HANDLER_SIGNATURE), m_RequestStatus(FORWARDER_START), m_fClientDisconnected(FALSE), @@ -39,7 +39,11 @@ FORWARDING_HANDLER::FORWARDING_HANDLER( m_fDoneAsyncCompletion(FALSE), m_fHttpHandleInClose(FALSE), m_fWebSocketHandleInClose(FALSE), - m_fServerResetConn(FALSE) + m_fServerResetConn(FALSE), + m_cRefs(1), + m_pW3Context(pW3Context), + m_pApplication(pApplication), + m_pModuleId(*pModuleId) { #ifdef DEBUG DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, @@ -67,9 +71,9 @@ FORWARDING_HANDLER::~FORWARDING_HANDLER( // // Disconnect notification cleanup would happen first, before // the FORWARDING_HANDLER instance got removed from m_pSharedhandler list. - // The m_pServer cleanup would happen afterwards, since there may be a + // The m_pServer cleanup would happen afterwards, since there may be a // call pending from SHARED_HANDLER to FORWARDING_HANDLER::SetStatusAndHeaders() - // + // DBG_ASSERT(m_pDisconnect == NULL); RemoveRequest(); @@ -472,7 +476,7 @@ REQUEST_NOTIFICATION_STATUS if (FAILED(hr)) { - // This failure could happen when client disconnect happens or backend server fails + // This failure could happen when client disconnect happens or backend server fails // after websocket upgrade goto Failure; } @@ -827,8 +831,8 @@ FORWARDING_HANDLER::GetHeaders( PCSTR pszFinalHeader; USHORT cchCurrentHeader; DWORD cchFinalHeader; - BOOL fSecure = FALSE; // dummy. Used in SplitUrl. Value will not be used - // as ANCM always use http protocol to communicate with backend + BOOL fSecure = FALSE; // dummy. Used in SplitUrl. Value will not be used + // as ANCM always use http protocol to communicate with backend STRU struDestination; STRU struUrl; STACK_STRA(strTemp, 64); @@ -858,7 +862,7 @@ FORWARDING_HANDLER::GetHeaders( } // // Strip all headers starting with MS-ASPNETCORE. - // These headers are generated by the asp.net core module and + // These headers are generated by the asp.net core module and // passed to the process it creates. // @@ -1143,7 +1147,7 @@ FORWARDING_HANDLER::CreateWinHttpRequest( { dwTimeout = pProtocol->QueryTimeout(); } - + if (!WinHttpSetTimeouts(m_hRequest, dwTimeout, //resolve timeout dwTimeout, // connect timeout @@ -2007,7 +2011,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusReadComplete( // hr = pResponse->Flush(TRUE, // fAsync TRUE, // fMoreData - NULL); // pcbSent + NULL); // pcbSent if (FAILED(hr)) { goto Finished; diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h index 427540f2d3..458d07dba4 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h @@ -4,6 +4,7 @@ extern DWORD g_OptionalWinHttpFlags; extern HINSTANCE g_hWinHttpModule; extern HINSTANCE g_hAspNetCoreModule; +class OUT_OF_PROCESS_APPLICATION; enum FORWARDING_REQUEST_STATUS { @@ -23,7 +24,7 @@ public: _In_ IHttpContext *pW3Context, _In_ HTTP_MODULE_ID *pModuleId, - _In_ APPLICATION *pApplication); + _In_ OUT_OF_PROCESS_APPLICATION *pApplication); ~FORWARDING_HANDLER(); @@ -193,7 +194,7 @@ private: volatile BOOL m_fDoneAsyncCompletion; volatile BOOL m_fHasError; // - // WinHttp may hit AV under race if handle got closed more than once simultaneously + // WinHttp may hit AV under race if handle got closed more than once simultaneously // Use two bool variables to guard // volatile BOOL m_fHttpHandleInClose; @@ -230,4 +231,9 @@ private: static TRACE_LOG * sm_pTraceLog; static STRA sm_pStra502ErrorMsg; + + mutable LONG m_cRefs; + IHttpContext* m_pW3Context; + OUT_OF_PROCESS_APPLICATION* m_pApplication; + HTTP_MODULE_ID m_pModuleId; }; diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp index e9222ba95e..ba6e3c9b4f 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp @@ -1,9 +1,8 @@ #include "..\precomp.hxx" OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION( - IHttpServer* pHttpServer, ASPNETCORE_CONFIG* pConfig) : - APPLICATION(pHttpServer, pConfig) + m_pConfig(pConfig) { m_status = APPLICATION_STATUS::RUNNING; m_pProcessManager = NULL; @@ -53,6 +52,12 @@ OUT_OF_PROCESS_APPLICATION::GetProcess( return m_pProcessManager->GetProcess(m_pConfig, ppServerProcess); } +ASPNETCORE_CONFIG* +OUT_OF_PROCESS_APPLICATION::QueryConfig() const +{ + return m_pConfig; +} + __override VOID OUT_OF_PROCESS_APPLICATION::ShutDown() @@ -76,3 +81,21 @@ OUT_OF_PROCESS_APPLICATION::Recycle() ShutDown(); } +HRESULT +OUT_OF_PROCESS_APPLICATION::CreateHandler( + _In_ IHttpContext *pHttpContext, + _In_ HTTP_MODULE_ID *pModuleId, + _Out_ IREQUEST_HANDLER **pRequestHandler) +{ + HRESULT hr = S_OK; + IREQUEST_HANDLER* pHandler = NULL; + pHandler = new FORWARDING_HANDLER(pHttpContext, pModuleId, this); + + if (pHandler == NULL) + { + hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); + } + + *pRequestHandler = pHandler; + return hr; +} diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h index f8c30a69cc..cd6f935098 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h @@ -4,9 +4,10 @@ class OUT_OF_PROCESS_APPLICATION : public APPLICATION { public: - OUT_OF_PROCESS_APPLICATION(IHttpServer* pHttpServer, ASPNETCORE_CONFIG *pConfig); + OUT_OF_PROCESS_APPLICATION(ASPNETCORE_CONFIG *pConfig); - ~OUT_OF_PROCESS_APPLICATION(); + __override + ~OUT_OF_PROCESS_APPLICATION() override; HRESULT Initialize(); @@ -18,13 +19,30 @@ public: __override VOID - ShutDown(); + ShutDown() + override; __override VOID - Recycle(); + Recycle() + override; + + __override + HRESULT + CreateHandler( + _In_ IHttpContext *pHttpContext, + _In_ HTTP_MODULE_ID *pModuleId, + _Out_ IREQUEST_HANDLER **pRequestHandler) + override; + + ASPNETCORE_CONFIG* + QueryConfig() + const; private: + PROCESS_MANAGER * m_pProcessManager; SRWLOCK rwlock; + + ASPNETCORE_CONFIG* m_pConfig; }; diff --git a/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx b/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx index 2fa43aac17..64bfd09ae7 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx +++ b/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx @@ -72,6 +72,7 @@ #include ".\outofprocess\forwardinghandler.h" #include ".\outofprocess\outprocessapplication.h" #include ".\outofprocess\winhttphelper.h" +#include ".\outofprocess\outprocessapplication.h" #ifdef max #undef max diff --git a/test/CommonLibTests/stdafx.h b/test/CommonLibTests/stdafx.h index e4ee515033..feb79f19fe 100644 --- a/test/CommonLibTests/stdafx.h +++ b/test/CommonLibTests/stdafx.h @@ -43,7 +43,7 @@ #include "hostfxr_utility.h" #include "environmentvariablehash.h" #include "aspnetcoreconfig.h" -#include "application.h" +#include "iapplication.h" #include "utility.h" #include "debugutil.h" #include "requesthandler.h" From c414223c727bd8a0ec746e409dfc580e85256386 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 2 May 2018 09:12:38 -0700 Subject: [PATCH 012/363] Make feature detection tests use out of process path (#805) --- .../UpgradeFeatureDetectionTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs index c8c7a8aefd..908e6520a5 100644 --- a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs +++ b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs @@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var logger = loggerFactory.CreateLogger("HelloWorldTest"); - var deploymentParameters = new DeploymentParameters(Helpers.GetInProcessTestSitesPath(), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(sitePath, serverType, runtimeFlavor, architecture) { EnvironmentName = "UpgradeFeatureDetection", // Will pick the Start class named 'StartupHelloWorld', ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText(configPath) : null, From 53cad943b3270f651f759754546c70ba097cc0e2 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 3 May 2018 13:49:31 -0700 Subject: [PATCH 013/363] Split ANCM into two dlls. (#811) --- IISIntegration.sln | 31 +++++----- NuGetPackageVerifier.json | 2 +- build/applicationhost.config | 2 + build/applicationhost.iis.config | 2 + build/build.msbuild | 3 +- build/dependencies.props | 52 ++++++++--------- build/launchSettings.json | 4 +- build/repo.targets | 16 ++--- build/testsite.props | 16 +++-- nuget/AspNetCoreV1.nuspec | 2 +- nuget/AspNetCoreV2.nuspec | 6 +- .../Properties/launchSettings.json | 4 +- samples/NativeIISSample/web.config | 2 +- .../AspNetCore/AspNetCore.vcxproj | 6 +- src/AspNetCoreModuleV2/AspNetCore/Source.def | 2 +- ...re_schema.xml => aspnetcore_schema_v2.xml} | 0 .../AppHostConfig/Http.config | 3 + .../AppHostConfig/Https.config | 4 +- .../AppHostConfig/NtlmAuthentation.config | 4 +- .../WebsocketsNotSupported.config | 4 +- .../Inprocess/StartupTests.cs | 11 +--- .../OutOfProcess/HelloWorldTest.cs | 22 +++---- .../OutOfProcess/HttpsTest.cs | 58 ++++++++----------- .../OutOfProcess/NtlmAuthentationTest.cs | 33 +++-------- .../UpgradeFeatureDetectionTests.cs | 7 +-- .../Utilities/Helpers.cs | 1 + .../Utilities/IISTestSiteFixture.cs | 7 +-- .../Properties/launchSettings.json | 4 +- test/WebSites/InProcessWebSite/web.config | 2 +- .../Properties/launchSettings.json | 4 +- .../Properties/launchSettings.json | 4 +- .../OverriddenServerWebSite/web.config | 2 +- tools/update_schema.ps1 | 43 ++++++++------ 33 files changed, 167 insertions(+), 196 deletions(-) rename src/AspNetCoreModuleV2/AspNetCore/{aspnetcore_schema.xml => aspnetcore_schema_v2.xml} (100%) diff --git a/IISIntegration.sln b/IISIntegration.sln index 9875c3523a..d8564e4be6 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -26,15 +26,14 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "samples\IISSample\IISSample.csproj", "{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{8B3446E8-E6A8-4591-AA63-A95837C6E97C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "test\Microsoft.AspNetCore.Server.IISIntegration.Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{4106DB10-E09F-480E-9CE6-B39235512EE6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\WebSites\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{F54715C3-88D8-49E3-A291-C13570FE81FC}" ProjectSection(ProjectDependencies) = postProject + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} {D57EA297-6DC2-4BC0-8C91-334863327863} = {D57EA297-6DC2-4BC0-8C91-334863327863} {439824F9-1455-4CC4-BD79-B44FA0A16552} = {439824F9-1455-4CC4-BD79-B44FA0A16552} EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "test\Microsoft.AspNetCore.Server.IISIntegration.Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{4106DB10-E09F-480E-9CE6-B39235512EE6}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E-9CC8-450C-8A8D-94FC76428150}" ProjectSection(SolutionItems) = preProject build\applicationhost.config = build\applicationhost.config @@ -94,6 +93,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreMod EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandler", "src\AspNetCoreModuleV2\RequestHandler\RequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\WebSites\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{42E60F88-E23F-417A-8143-0CCEC05E1D02}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -140,16 +141,6 @@ Global {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.Build.0 = Release|Any CPU {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.ActiveCfg = Release|Any CPU {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.Build.0 = Release|Any CPU - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|Any CPU.ActiveCfg = Debug|x86 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x64.ActiveCfg = Debug|x64 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x64.Build.0 = Debug|x64 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x86.ActiveCfg = Debug|x86 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Debug|x86.Build.0 = Debug|x86 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|Any CPU.ActiveCfg = Release|x86 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x64.ActiveCfg = Release|x64 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x64.Build.0 = Release|x64 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x86.ActiveCfg = Release|x86 - {F54715C3-88D8-49E3-A291-C13570FE81FC}.Release|x86.Build.0 = Release|x86 {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -308,6 +299,16 @@ Global {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64 {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.ActiveCfg = Release|Win32 {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.Build.0 = Release|Win32 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.ActiveCfg = Debug|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.ActiveCfg = Debug|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.Build.0 = Debug|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.ActiveCfg = Debug|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.Build.0 = Debug|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.ActiveCfg = Release|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.ActiveCfg = Release|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.Build.0 = Release|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.ActiveCfg = Release|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -316,7 +317,6 @@ Global {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9} {8B3446E8-E6A8-4591-AA63-A95837C6E97C} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {4106DB10-E09F-480E-9CE6-B39235512EE6} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {F54715C3-88D8-49E3-A291-C13570FE81FC} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {9BC4AFCB-325D-4C81-8228-8CF301CE2F97} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9} {679FA2A2-898B-4320-884E-C2D294A97CE1} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} @@ -335,6 +335,7 @@ Global {55494E58-E061-4C4C-A0A8-837008E72F85} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} + {42E60F88-E23F-417A-8143-0CCEC05E1D02} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index eea701bb65..a20c45992c 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -3,7 +3,7 @@ "rules": [], "packages": { "Microsoft.AspNetCore.AspNetCoreModule": {}, - "Microsoft.AspNetCore.AspNetCoreModuleV1": {} + "Microsoft.AspNetCore.AspNetCoreModuleV2": {} } }, "Default": { diff --git a/build/applicationhost.config b/build/applicationhost.config index 9af39ac631..8c7429db8d 100644 --- a/build/applicationhost.config +++ b/build/applicationhost.config @@ -233,6 +233,7 @@ + @@ -875,6 +876,7 @@ + diff --git a/build/applicationhost.iis.config b/build/applicationhost.iis.config index 1998fc2d86..e7771484cb 100644 --- a/build/applicationhost.iis.config +++ b/build/applicationhost.iis.config @@ -226,6 +226,7 @@ + @@ -288,6 +289,7 @@ + diff --git a/build/build.msbuild b/build/build.msbuild index 55ed0be07c..86984b2cb4 100644 --- a/build/build.msbuild +++ b/build/build.msbuild @@ -1,6 +1,7 @@ + @@ -8,7 +9,7 @@ - + diff --git a/build/dependencies.props b/build/dependencies.props index a45d38b922..1e89a11d85 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,36 +4,36 @@ 2.2.0-preview1-17042 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 0.5.0-preview3-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 2.2.0-a-preview1-ancmV2-17006 + 2.2.0-a-preview1-ancmV2-17006 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 0.6.0-a-preview1-ancmV2-17006 + 2.2.0-preview1-34097 + 2.2.0-a-preview1-ancmV2-17006 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 15.6.82 15.6.82 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 + 2.2.0-preview1-34097 2.0.0 2.2.0-preview1-26424-04 - 2.2.0-preview1-34066 + 2.2.0-preview1-34097 15.6.1 2.0.3 4.5.0-preview3-26423-04 diff --git a/build/launchSettings.json b/build/launchSettings.json index 6d5ce43f73..aa0472a2dd 100644 --- a/build/launchSettings.json +++ b/build/launchSettings.json @@ -15,7 +15,7 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)" @@ -27,7 +27,7 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)" diff --git a/build/repo.targets b/build/repo.targets index 97c231e7ba..d56787031b 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -39,13 +39,13 @@ - + NuGetPackage - Microsoft.AspNetCore.AspNetCoreModuleV1 + Microsoft.AspNetCore.AspNetCoreModuleV2 $(PackageVersion) $(RepositoryRoot) - + ZipArchive @@ -79,20 +79,20 @@ - - + + - - + + - + diff --git a/build/testsite.props b/build/testsite.props index d2f6acea7e..f45cefa7e1 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -28,13 +28,11 @@ $(NativePlatform)\ - + - - - - + + @@ -44,6 +42,7 @@ -h "$(IISAppHostConfig)" $(NativePlatform)\aspnetcore.dll + $(NativePlatform)\aspnetcorev2.dll $(NativePlatform)\aspnetcorerh.dll $(userprofile)\.dotnet\$(NativePlatform)\dotnet.exe @@ -61,10 +60,9 @@ - + $(MSBuildThisFileDirectory)..\test\TestTasks\bin\$(Configuration)\$(TargetFramework)\TestTasks - $(InjectDepsAssembly) "win7-$(NativePlatform)" "$(AncmRHPath)" @@ -81,11 +79,11 @@ - + - + diff --git a/nuget/AspNetCoreV1.nuspec b/nuget/AspNetCoreV1.nuspec index f89b7ff754..4b9112cd72 100644 --- a/nuget/AspNetCoreV1.nuspec +++ b/nuget/AspNetCoreV1.nuspec @@ -1,7 +1,7 @@ - Microsoft.AspNetCore.AspNetCoreModuleV1 + Microsoft.AspNetCore.AspNetCoreModule Microsoft ASP.NET Core Module $VERSION$ Microsoft diff --git a/nuget/AspNetCoreV2.nuspec b/nuget/AspNetCoreV2.nuspec index 10745f52c4..6e0f6470f1 100644 --- a/nuget/AspNetCoreV2.nuspec +++ b/nuget/AspNetCoreV2.nuspec @@ -1,7 +1,7 @@  - Microsoft.AspNetCore.AspNetCoreModule + Microsoft.AspNetCore.AspNetCoreModuleV2 Microsoft ASP.NET Core Module $VERSION$ Microsoft @@ -19,8 +19,8 @@ - - + + diff --git a/samples/NativeIISSample/Properties/launchSettings.json b/samples/NativeIISSample/Properties/launchSettings.json index 6d5ce43f73..aa0472a2dd 100644 --- a/samples/NativeIISSample/Properties/launchSettings.json +++ b/samples/NativeIISSample/Properties/launchSettings.json @@ -15,7 +15,7 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)" @@ -27,7 +27,7 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)" diff --git a/samples/NativeIISSample/web.config b/samples/NativeIISSample/web.config index 08baab0922..b366ebfd8c 100644 --- a/samples/NativeIISSample/web.config +++ b/samples/NativeIISSample/web.config @@ -2,7 +2,7 @@ - + diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index 4660054b0b..e848a32af8 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -24,7 +24,7 @@ Win32Proj AspNetCoreModule AspNetCore - aspnetcore + aspnetcorev2 false 10.0.15063.0 @@ -243,7 +243,7 @@ - + PreserveNewest @@ -251,7 +251,7 @@ - + diff --git a/src/AspNetCoreModuleV2/AspNetCore/Source.def b/src/AspNetCoreModuleV2/AspNetCore/Source.def index 9aae10ab5d..74135f4835 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Source.def +++ b/src/AspNetCoreModuleV2/AspNetCore/Source.def @@ -1,4 +1,4 @@ -LIBRARY aspnetcore +LIBRARY aspnetcorev2 EXPORTS RegisterModule diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema.xml b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema.xml rename to src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config b/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config index 18a1aa2e22..771c84bcdd 100644 --- a/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config +++ b/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config @@ -254,6 +254,8 @@ + + @@ -930,6 +932,7 @@ + diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config b/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config index e16fd734b7..0a1e6d29e1 100644 --- a/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config +++ b/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config @@ -253,7 +253,8 @@ - + + @@ -929,6 +930,7 @@ + diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config b/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config index d74f6b2e4f..2ecb42968f 100644 --- a/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config +++ b/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config @@ -253,7 +253,8 @@ - + + @@ -929,6 +930,7 @@ + diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config b/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config index 541f91ad81..8edd622936 100644 --- a/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config +++ b/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config @@ -253,7 +253,8 @@ - + + @@ -929,6 +930,7 @@ + diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index a47e95aa99..eaddefb45e 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -202,19 +202,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests SiteName = "HttpTestSite", // This is configured in the Http.config TargetFramework = "netcoreapp2.1", ApplicationType = ApplicationType.Portable, - Configuration = GetCurrentConfiguration() + ANCMVersion = ANCMVersion.AspNetCoreModuleV2 }; } - private static string GetCurrentConfiguration() - { -#if DEBUG - return "Debug"; -#else - return "Release"; -#endif - } - private class TestLoggerProvider : ILoggerProvider { private readonly TestLoggerFactory _loggerFactory; diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 370ce2cf63..1ef7f93143 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -20,22 +20,22 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] - [InlineData("V1")] - [InlineData("V2")] - public Task HelloWorld_IISExpress_Clr_X64_Portable(string ancmVersion) + [InlineData(ANCMVersion.AspNetCoreModule)] + [InlineData(ANCMVersion.AspNetCoreModuleV2)] + public Task HelloWorld_IISExpress_Clr_X64_Portable(ANCMVersion ancmVersion) { return HelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, ancmVersion); } [Theory] - [InlineData("V1")] - [InlineData("V2")] - public Task HelloWorld_IISExpress_CoreClr_X64_Portable(string ancmVersion) + [InlineData(ANCMVersion.AspNetCoreModule)] + [InlineData(ANCMVersion.AspNetCoreModuleV2)] + public Task HelloWorld_IISExpress_CoreClr_X64_Portable(ANCMVersion ancmVersion) { return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, ancmVersion); } - private async Task HelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, string ancmVersion) + private async Task HelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, ANCMVersion ancmVersion) { var serverType = ServerType.IISExpress; var architecture = RuntimeArchitecture.x64; @@ -51,13 +51,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests SiteName = "HttpTestSite", // This is configured in the Http.config TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", ApplicationType = applicationType, - Configuration = -#if DEBUG - "Debug", -#else - "Release", -#endif - AdditionalPublishParameters = $" /p:ANCMVersion={ancmVersion}" + ANCMVersion = ancmVersion }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs index 0e71a21fdc..a5bdd30bbf 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -26,22 +26,22 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [Theory(Skip = "Full framework web.config generation is currently incorrect. See: https://github.com/aspnet/websdk/pull/322")] - [InlineData("V1")] - [InlineData("V2")] - public Task Https_HelloWorld_CLR_X64(string ancmVersion) + [InlineData(ANCMVersion.AspNetCoreModule)] + [InlineData(ANCMVersion.AspNetCoreModuleV2)] + public Task Https_HelloWorld_CLR_X64(ANCMVersion ancmVersion) { return HttpsHelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44396, ancmVersion); } [Theory] - [InlineData("V1")] - [InlineData("V2")] - public Task Https_HelloWorld_CoreCLR_X64_Portable(string ancmVersion) + [InlineData(ANCMVersion.AspNetCoreModule)] + [InlineData(ANCMVersion.AspNetCoreModuleV2)] + public Task Https_HelloWorld_CoreCLR_X64_Portable(ANCMVersion ancmVersion) { return HttpsHelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44394, ancmVersion); } - private async Task HttpsHelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, int port, string ancmVersion) + private async Task HttpsHelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, int port, ANCMVersion ancmVersion) { var serverType = ServerType.IISExpress; var architecture = RuntimeArchitecture.x64; @@ -60,19 +60,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests SiteName = "HttpsTestSite", // This is configured in the Https.config TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", ApplicationType = applicationType, - Configuration = -#if DEBUG - "Debug", -#else - "Release", -#endif - AdditionalPublishParameters = $" /p:ANCMVersion={ancmVersion}" - + ANCMVersion = ancmVersion }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) { var deploymentResult = await deployer.DeployAsync(); + var handler = new HttpClientHandler(); handler.ServerCertificateCustomValidationCallback = (a, b, c, d) => true; var httpClient = deploymentResult.CreateHttpClient(handler); @@ -100,42 +94,42 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [Theory] - [InlineData("V1")] - [InlineData("V2")] - public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable(string ancmVersion) + [InlineData(ANCMVersion.AspNetCoreModule)] + [InlineData(ANCMVersion.AspNetCoreModuleV2)] + public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable(ANCMVersion ancmVersion) { return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44397, sendClientCert: false, ancmVersion); } [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] - [InlineData("V1")] - [InlineData("V2")] - public Task Https_HelloWorld_NoClientCert_Clr_X64(string ancmVersion) + [InlineData(ANCMVersion.AspNetCoreModule)] + [InlineData(ANCMVersion.AspNetCoreModuleV2)] + public Task Https_HelloWorld_NoClientCert_Clr_X64(ANCMVersion ancmVersion) { return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44398, sendClientCert: false, ancmVersion); } #pragma warning disable xUnit1004 // Test methods should not be skipped [Theory(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")] - [InlineData("V1")] - [InlineData("V2")] + [InlineData(ANCMVersion.AspNetCoreModule)] + [InlineData(ANCMVersion.AspNetCoreModuleV2)] #pragma warning restore xUnit1004 // Test methods should not be skipped - public Task Https_HelloWorld_ClientCert_Clr_X64(string ancmVersion) + public Task Https_HelloWorld_ClientCert_Clr_X64(ANCMVersion ancmVersion) { return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44301, sendClientCert: true, ancmVersion); } #pragma warning disable xUnit1004 // Test methods should not be skipped [Theory(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")] - [InlineData("V1")] - [InlineData("V2")] + [InlineData(ANCMVersion.AspNetCoreModule)] + [InlineData(ANCMVersion.AspNetCoreModuleV2)] #pragma warning restore xUnit1004 // Test methods should not be skipped - public Task Https_HelloWorld_ClientCert_CoreCLR_X64_Portable(string ancmVersion) + public Task Https_HelloWorld_ClientCert_CoreCLR_X64_Portable(ANCMVersion ancmVersion) { return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44302, sendClientCert: true, ancmVersion); } - private async Task HttpsHelloWorldCerts(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, int port, bool sendClientCert, string ancmVersion) + private async Task HttpsHelloWorldCerts(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, int port, bool sendClientCert, ANCMVersion ancmVersion) { var serverType = ServerType.IISExpress; var architecture = RuntimeArchitecture.x64; @@ -153,13 +147,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests SiteName = "HttpsTestSite", // This is configured in the Https.config TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", ApplicationType = applicationType, - Configuration = -#if DEBUG - "Debug", -#else - "Release", -#endif - AdditionalPublishParameters = $" /p:ANCMVersion={ancmVersion}" + ANCMVersion = ancmVersion }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index 809c213b27..04f1d4e77a 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -26,22 +26,22 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] - [InlineData("V1")] - [InlineData("V2")] - public Task NtlmAuthentication_Clr_X64(string ancmVersion) + [InlineData(ANCMVersion.AspNetCoreModule)] + [InlineData(ANCMVersion.AspNetCoreModuleV2)] + public Task NtlmAuthentication_Clr_X64(ANCMVersion ancmVersion) { return NtlmAuthentication(RuntimeFlavor.Clr, ApplicationType.Portable, port: 5051, ancmVersion); } [Theory] - [InlineData("V1")] - [InlineData("V2")] - public Task NtlmAuthentication_CoreClr_X64_Portable(string ancmVersion) + [InlineData(ANCMVersion.AspNetCoreModule)] + [InlineData(ANCMVersion.AspNetCoreModuleV2)] + public Task NtlmAuthentication_CoreClr_X64_Portable(ANCMVersion ancmVersion) { return NtlmAuthentication(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 5052, ancmVersion); } - private async Task NtlmAuthentication(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, int port, string ancmVersion) + private async Task NtlmAuthentication(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, int port, ANCMVersion ancmVersion) { var serverType = ServerType.IISExpress; var architecture = RuntimeArchitecture.x64; @@ -50,16 +50,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var logger = loggerFactory.CreateLogger("NtlmAuthenticationTest"); - var windowsRid = architecture == RuntimeArchitecture.x64 - ? "win7-x64" - : "win7-x86"; - var additionalPublishParameters = $" /p:ANCMVersion={ancmVersion}"; - if (ApplicationType.Standalone == applicationType && RuntimeFlavor.CoreClr == runtimeFlavor) - { - additionalPublishParameters += " -r " + windowsRid; - - } - var deploymentParameters = new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), serverType, runtimeFlavor, architecture) { ApplicationBaseUriHint = $"http://localhost:{port}", @@ -68,13 +58,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", ApplicationType = applicationType, - AdditionalPublishParameters = additionalPublishParameters, - Configuration = -#if DEBUG - "Debug" -#else - "Release" -#endif + ANCMVersion = ancmVersion, + }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) diff --git a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs index 908e6520a5..9ff8f906b9 100644 --- a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs +++ b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs @@ -82,12 +82,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests SiteName = "HttpTestSite", // This is configured in the Http.config TargetFramework = "netcoreapp2.1", ApplicationType = applicationType, - Configuration = -#if DEBUG - "Debug" -#else - "Release" -#endif + ANCMVersion = ANCMVersion.AspNetCoreModuleV2 }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) diff --git a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs index 5cda360005..65a981a86f 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using System; using System.IO; using System.Linq; +using System.Threading.Tasks; using System.Xml.Linq; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs index 763603508d..28ef7bd4c6 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -25,12 +25,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests SiteName = "HttpTestSite", TargetFramework = "netcoreapp2.1", ApplicationType = ApplicationType.Portable, - Configuration = -#if DEBUG - "Debug" -#else - "Release" -#endif + ANCMVersion = ANCMVersion.AspNetCoreModuleV2 }; _deployer = ApplicationDeployerFactory.Create(deploymentParameters, NullLoggerFactory.Instance); diff --git a/test/WebSites/InProcessWebSite/Properties/launchSettings.json b/test/WebSites/InProcessWebSite/Properties/launchSettings.json index 6d5ce43f73..aa0472a2dd 100644 --- a/test/WebSites/InProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/InProcessWebSite/Properties/launchSettings.json @@ -15,7 +15,7 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)" @@ -27,7 +27,7 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)" diff --git a/test/WebSites/InProcessWebSite/web.config b/test/WebSites/InProcessWebSite/web.config index 8ba96a4e9e..532ccefdd9 100644 --- a/test/WebSites/InProcessWebSite/web.config +++ b/test/WebSites/InProcessWebSite/web.config @@ -2,7 +2,7 @@ - + diff --git a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json index 6d5ce43f73..aa0472a2dd 100644 --- a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json @@ -15,7 +15,7 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)" @@ -27,7 +27,7 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)" diff --git a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json index 6d5ce43f73..aa0472a2dd 100644 --- a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json +++ b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json @@ -15,7 +15,7 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)" @@ -27,7 +27,7 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)" diff --git a/test/WebSites/OverriddenServerWebSite/web.config b/test/WebSites/OverriddenServerWebSite/web.config index f125d57107..ccfab87ca0 100644 --- a/test/WebSites/OverriddenServerWebSite/web.config +++ b/test/WebSites/OverriddenServerWebSite/web.config @@ -2,7 +2,7 @@ - + diff --git a/tools/update_schema.ps1 b/tools/update_schema.ps1 index b299c91e6a..a887c69551 100644 --- a/tools/update_schema.ps1 +++ b/tools/update_schema.ps1 @@ -1,6 +1,7 @@ <# .DESCRIPTION Updates aspnetcore_schema.xml to the latest version. +Updates aspnetcore_schema.xml to the latest version. Requires admin privileges. #> [cmdletbinding(SupportsShouldProcess = $true)] @@ -9,7 +10,16 @@ param() $ErrorActionPreference = 'Stop' Set-StrictMode -Version 1 -$schemaSource = Resolve-Path "$PSScriptRoot\..\src\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema.xml" +$ancmSchemaFiles = @( + "aspnetcore_schema.xml", + "aspnetcore_schema_v2.xml" +) + +$ancmSchemaFileLocations = @( + @(Resolve-Path "$PSScriptRoot\..\src\AspNetCoreModuleV1\AspNetCore\aspnetcore_schema.xml"), + @(Resolve-Path "$PSScriptRoot\..\src\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml") +) + [bool]$isAdmin = ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator") if (-not $isAdmin -and -not $WhatIfPreference) { @@ -33,23 +43,22 @@ if (-not $isAdmin -and -not $WhatIfPreference) { } } -$destinations = @( - "${env:ProgramFiles(x86)}\IIS Express\config\schema\aspnetcore_schema.xml", - "${env:ProgramFiles}\IIS Express\config\schema\aspnetcore_schema.xml", - "${env:windir}\system32\inetsrv\config\schema\aspnetcore_schema.xml" -) | Get-Unique +for ($i=0; $i -lt $ancmSchemaFiles.Length; $i++) +{ + $schemaFile = $ancmSchemaFiles[$i] + $schemaSource = $ancmSchemaFileLocations[$i] + $destinations = @( + "${env:ProgramFiles(x86)}\IIS Express\config\schema\${schemaFile}", + "${env:ProgramFiles}\IIS Express\config\schema\${schemaFile}", + "${env:windir}\system32\inetsrv\config\schema\${schemaFile}" + ) -foreach ($dest in $destinations) { - if (-not (Test-Path $dest)) { - Write-Host -ForegroundColor Yellow "Skipping $dest. File does not already exist." - continue - } - - if ($PSCmdlet.ShouldProcess($dest, "Replace file")) { - Write-Host "Updated $dest" - Move-Item $dest "${dest}.bak" -ErrorAction Ignore - Copy-Item $schemaSource $dest + foreach ($dest in $destinations) { + if ($PSCmdlet.ShouldProcess($dest, "Replace file")) { + Write-Host "Updated $dest" + Move-Item $dest "${dest}.bak" -ErrorAction Ignore + Copy-Item $schemaSource $dest + } } } - From 2b38e09bef587e2402b09110340b2b1aef61da39 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 6 May 2018 12:18:10 -0700 Subject: [PATCH 014/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 1e89a11d85..e329df4db4 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,37 +3,37 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17042 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 2.2.0-a-preview1-ancmV2-17006 - 2.2.0-a-preview1-ancmV2-17006 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 0.6.0-a-preview1-ancmV2-17006 - 2.2.0-preview1-34097 - 2.2.0-a-preview1-ancmV2-17006 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 + 2.2.0-preview1-17047 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 0.6.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 15.6.82 15.6.82 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 - 2.2.0-preview1-34097 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 2.0.0 2.2.0-preview1-26424-04 - 2.2.0-preview1-34097 + 2.2.0-preview1-34135 15.6.1 2.0.3 4.5.0-preview3-26423-04 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 5a9689541e..18df6940ae 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17042 -commithash:edf0705d014293c260de763543784330514db9a3 +version:2.2.0-preview1-17047 +commithash:e1957b52ddc8b62bd39c5c400322fccb5364624c From dc9db57389a7f4cd4da12d73b800776d97970404 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 7 May 2018 13:49:27 -0700 Subject: [PATCH 015/363] Fix out of process websocket check (#819) --- .../CommonLib/aspnetcoreconfig.cxx | 31 ++++--------------- .../environmentvariablehelpers.h | 1 - .../UpgradeFeatureDetectionTests.cs | 10 +++--- 3 files changed, 11 insertions(+), 31 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.cxx b/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.cxx index 97a7d0c63e..46ec0edcfd 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.cxx +++ b/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.cxx @@ -178,7 +178,6 @@ ASPNETCORE_CONFIG::Populate( IAppHostElement *pWindowsAuthenticationElement = NULL; IAppHostElement *pBasicAuthenticationElement = NULL; IAppHostElement *pAnonymousAuthenticationElement = NULL; - IAppHostElement *pWebSocketElement = NULL; IAppHostElement *pEnvVarList = NULL; IAppHostElement *pEnvVar = NULL; IAppHostElementCollection *pEnvVarCollection = NULL; @@ -192,7 +191,6 @@ ASPNETCORE_CONFIG::Populate( BSTR bstrBasicAuthSection = NULL; BSTR bstrAnonymousAuthSection = NULL; BSTR bstrAspNetCoreSection = NULL; - BSTR bstrWebsocketSection = NULL; m_pEnvironmentVariables = new ENVIRONMENT_VAR_HASH(); if (m_pEnvironmentVariables == NULL) @@ -322,29 +320,18 @@ ASPNETCORE_CONFIG::Populate( } } - bstrWebsocketSection = SysAllocString(CS_WEBSOCKET_SECTION); - if (bstrWebsocketSection == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } - - hr = pAdminManager->GetAdminSection(bstrWebsocketSection, - m_struConfigPath.QueryStr(), - &pWebSocketElement); + // Even though the applicationhost.config file contains the websocket element, + // the websocket module may still not be enabled. Check if the + PCWSTR pszVariableValue; + DWORD cbLength; + hr = pHttpContext->GetServerVariable("WEBSOCKET_VERSION", &pszVariableValue, &cbLength); if (FAILED(hr)) { m_fWebSocketEnabled = FALSE; } else { - hr = GetElementBoolProperty(pWebSocketElement, - CS_ENABLED, - &m_fWebSocketEnabled); - if (FAILED(hr)) - { - goto Finished; - } + m_fWebSocketEnabled = TRUE; } bstrAspNetCoreSection = SysAllocString(CS_ASPNETCORE_SECTION); @@ -557,12 +544,6 @@ Finished: pAspNetCoreElement = NULL; } - if (pWebSocketElement != NULL) - { - pWebSocketElement->Release(); - pWebSocketElement = NULL; - } - if (pWindowsAuthenticationElement != NULL) { pWindowsAuthenticationElement->Release(); diff --git a/src/AspNetCoreModuleV2/RequestHandler/environmentvariablehelpers.h b/src/AspNetCoreModuleV2/RequestHandler/environmentvariablehelpers.h index 268011d30a..d7df903554 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/environmentvariablehelpers.h +++ b/src/AspNetCoreModuleV2/RequestHandler/environmentvariablehelpers.h @@ -362,7 +362,6 @@ public: return hr; } - static HRESULT AddWebsocketEnabledToEnvironmentVariables diff --git a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs index 9ff8f906b9..d566b4c330 100644 --- a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs +++ b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [Fact] - public Task UpgradeFeatureDetectionEnabled_InProcess_IISExpress_CoreClr_x64_Portable() + public Task UpgradeFeatureDetectionDisabled_InProcess_IISExpress_CoreClr_x64_Portable() { return UpgradeFeatureDetectionDeployer(RuntimeFlavor.CoreClr, ApplicationType.Portable, @@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [Fact] - public Task UpgradeFeatureDetectionDisabled_InProcess_IISExpress_CoreClr_x64_Portable() + public Task UpgradeFeatureDetectionEnabled_InProcess_IISExpress_CoreClr_x64_Portable() { return UpgradeFeatureDetectionDeployer(RuntimeFlavor.CoreClr, ApplicationType.Portable, @@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [Fact] - public Task UpgradeFeatureDetectionEnabled_OutOfProcess_IISExpress_CoreClr_x64_Portable() + public Task UpgradeFeatureDetectionDisabled_OutOfProcess_IISExpress_CoreClr_x64_Portable() { return UpgradeFeatureDetectionDeployer(RuntimeFlavor.CoreClr, ApplicationType.Portable, @@ -52,8 +52,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests "Disabled"); } + // This test is failing on win7 and win2008 [Fact] - public Task UpgradeFeatureDetectionDisabled_OutOfProcess_IISExpress_CoreClr_x64_Portable() + public Task UpgradeFeatureDetectionEnabled_OutOfProcess_IISExpress_CoreClr_x64_Portable() { return UpgradeFeatureDetectionDeployer(RuntimeFlavor.CoreClr, ApplicationType.Portable, @@ -89,7 +90,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var deploymentResult = await deployer.DeployAsync(); deploymentResult.HttpClient.Timeout = TimeSpan.FromSeconds(5); - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. var response = await RetryHelper.RetryRequest(() => { From 379a73f5d2fa54e0373d4189079d744d3eec6d53 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 8 May 2018 10:12:17 -0700 Subject: [PATCH 016/363] Add benchmarks to IISIntegration (#823) --- .gitignore | 1 + IISIntegration.sln | 17 ++++++ .../IIS.Performance/FirstRequestConfig.cs | 39 ++++++++++++++ .../IIS.Performance/IIS.Performance.csproj | 31 +++++++++++ .../IIS.Performance/StartupTimeBenchmark.cs | 53 +++++++++++++++++++ build/dependencies.props | 4 +- 6 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 benchmarks/IIS.Performance/FirstRequestConfig.cs create mode 100644 benchmarks/IIS.Performance/IIS.Performance.csproj create mode 100644 benchmarks/IIS.Performance/StartupTimeBenchmark.cs diff --git a/.gitignore b/.gitignore index e30a491fca..e353a67858 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ _ReSharper.*/ packages/ artifacts/ PublishProfiles/ +BenchmarkDotNet.Artifacts/ *.user *.suo *.cache diff --git a/IISIntegration.sln b/IISIntegration.sln index d8564e4be6..adccebbe1f 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -95,6 +95,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandler", "src\AspNe EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\WebSites\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{42E60F88-E23F-417A-8143-0CCEC05E1D02}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{622D35C9-627B-466E-8D15-752968CC79AF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Performance", "benchmarks\IIS.Performance\IIS.Performance.csproj", "{48F46909-E76A-4788-BCE1-E543C0E140FE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -309,6 +313,18 @@ Global {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.Build.0 = Release|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.ActiveCfg = Release|x86 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.Build.0 = Release|x86 + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x64.ActiveCfg = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x64.Build.0 = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x86.ActiveCfg = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x86.Build.0 = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.Build.0 = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x64.ActiveCfg = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x64.Build.0 = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x86.ActiveCfg = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -336,6 +352,7 @@ Global {09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {42E60F88-E23F-417A-8143-0CCEC05E1D02} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} + {48F46909-E76A-4788-BCE1-E543C0E140FE} = {622D35C9-627B-466E-8D15-752968CC79AF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/benchmarks/IIS.Performance/FirstRequestConfig.cs b/benchmarks/IIS.Performance/FirstRequestConfig.cs new file mode 100644 index 0000000000..727746871f --- /dev/null +++ b/benchmarks/IIS.Performance/FirstRequestConfig.cs @@ -0,0 +1,39 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using BenchmarkDotNet.Columns; +using BenchmarkDotNet.Configs; +using BenchmarkDotNet.Diagnosers; +using BenchmarkDotNet.Engines; +using BenchmarkDotNet.Exporters; +using BenchmarkDotNet.Jobs; +using BenchmarkDotNet.Loggers; +using BenchmarkDotNet.Toolchains.CsProj; +using BenchmarkDotNet.Toolchains.DotNetCli; +using BenchmarkDotNet.Validators; + +namespace BenchmarkDotNet.Attributes +{ + internal class FirstRequestConfig : ManualConfig + { + public FirstRequestConfig() + { + Add(ConsoleLogger.Default); + Add(MarkdownExporter.GitHub); + + Add(MemoryDiagnoser.Default); + Add(StatisticColumn.OperationsPerSecond); + Add(DefaultColumnProviders.Instance); + + Add(JitOptimizationsValidator.FailOnError); + + Add(Job.Core + .With(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21)) + .With(new GcMode { Server = true }) + .WithTargetCount(10) + .WithInvocationCount(1) + .WithUnrollFactor(1) + .With(RunStrategy.ColdStart)); + } + } +} diff --git a/benchmarks/IIS.Performance/IIS.Performance.csproj b/benchmarks/IIS.Performance/IIS.Performance.csproj new file mode 100644 index 0000000000..5a29058351 --- /dev/null +++ b/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -0,0 +1,31 @@ + + + + + IIS.Performance + Microsoft.AspNetCore.Server.IIS.Performance + netcoreapp2.1 + Exe + true + true + false + + + + + + + + + + False + + + + + + + + + + \ No newline at end of file diff --git a/benchmarks/IIS.Performance/StartupTimeBenchmark.cs b/benchmarks/IIS.Performance/StartupTimeBenchmark.cs new file mode 100644 index 0000000000..9797a02eba --- /dev/null +++ b/benchmarks/IIS.Performance/StartupTimeBenchmark.cs @@ -0,0 +1,53 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; +using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Running; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging.Abstractions; + +namespace Microsoft.AspNetCore.Server.IIS.Performance +{ + [AspNetCoreBenchmark(typeof(FirstRequestConfig))] + public class StartupTimeBenchmark + { + private IApplicationDeployer _deployer; + public HttpClient _client; + + [IterationSetup] + public void Setup() + { + var deploymentParameters = new DeploymentParameters(Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "test/Websites/InProcessWebSite"), + ServerType.IISExpress, + RuntimeFlavor.CoreClr, + RuntimeArchitecture.x64) + { + ServerConfigTemplateContent = File.ReadAllText("Http.config"), + SiteName = "HttpTestSite", + TargetFramework = "netcoreapp2.1", + ApplicationType = ApplicationType.Portable, + ANCMVersion = ANCMVersion.AspNetCoreModuleV2 + }; + _deployer = ApplicationDeployerFactory.Create(deploymentParameters, NullLoggerFactory.Instance); + _client = _deployer.DeployAsync().Result.HttpClient; + } + + [IterationCleanup] + public void Cleanup() + { + _deployer.Dispose(); + } + + [Benchmark] + public async Task SendFirstRequest() + { + var response = await _client.GetAsync(""); + } + } +} diff --git a/build/dependencies.props b/build/dependencies.props index e329df4db4..ff93798e8c 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,11 +1,13 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + 0.10.13 2.2.0-preview1-17047 2.2.0-preview1-34135 2.2.0-preview1-34135 + 2.2.0-preview1-34135 2.2.0-preview1-34135 2.2.0-preview1-34135 2.2.0-preview1-34135 From fbf727e073088b7196f9391ca7539e45f4713dac Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 7 May 2018 15:11:56 -0700 Subject: [PATCH 017/363] Upgrade to netcoreapp22 --- Directory.Build.targets | 5 +- build/dependencies.props | 61 ++++++++++--------- build/repo.props | 1 + korebuild-lock.txt | 4 +- .../NativeIISSample/NativeIISSample.csproj | 2 +- test/Directory.Build.props | 4 +- .../Inprocess/AuthenticationTests.cs | 2 +- .../Inprocess/StartupTests.cs | 2 +- .../OutOfProcess/HelloWorldTest.cs | 4 +- .../OutOfProcess/HttpsTest.cs | 8 +-- .../OutOfProcess/NtlmAuthentationTest.cs | 4 +- 11 files changed, 52 insertions(+), 45 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 53b3f6e1da..78626b773e 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,7 +1,10 @@ - + $(MicrosoftNETCoreApp20PackageVersion) $(MicrosoftNETCoreApp21PackageVersion) + $(MicrosoftNETCoreApp22PackageVersion) $(NETStandardLibrary20PackageVersion) + + 99.9 diff --git a/build/dependencies.props b/build/dependencies.props index ff93798e8c..b0618b5a9b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,41 +1,42 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 0.10.13 - 2.2.0-preview1-17047 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 0.6.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 + 2.2.0-preview1-17049 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 0.6.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 15.6.82 15.6.82 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 2.0.0 - 2.2.0-preview1-26424-04 - 2.2.0-preview1-34135 + 2.1.0-rc1 + 2.2.0-preview1-26424-04 + 2.2.0-preview1-34144 15.6.1 2.0.3 4.5.0-preview3-26423-04 diff --git a/build/repo.props b/build/repo.props index 4913e566c1..143448ce88 100644 --- a/build/repo.props +++ b/build/repo.props @@ -25,6 +25,7 @@ + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 18df6940ae..eb63d54c23 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17047 -commithash:e1957b52ddc8b62bd39c5c400322fccb5364624c +version:2.2.0-preview1-17049 +commithash:9c4fefdcd2b950f8b6da5aa3784fe200eb0664c2 diff --git a/samples/NativeIISSample/NativeIISSample.csproj b/samples/NativeIISSample/NativeIISSample.csproj index d9bf22ba16..9c88fbe560 100644 --- a/samples/NativeIISSample/NativeIISSample.csproj +++ b/samples/NativeIISSample/NativeIISSample.csproj @@ -5,7 +5,7 @@ netcoreapp2.1 - + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 3a74fe4d2a..179511a68d 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -2,9 +2,11 @@ + netcoreapp2.1 $(DeveloperBuildTestTfms) - $(StandardTestTfms);netcoreapp2.0 + $(StandardTestTfms) $(StandardTestTfms);net461 diff --git a/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs index 4370014007..511021b72d 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs @@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } } -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 #else #error Target frameworks need to be updated #endif diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index eaddefb45e..6777c35188 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -96,7 +96,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP2_1 [Fact] // Consistently fails on CI for net461 public async Task StandaloneApplication_ExpectCorrectPublish() diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 1ef7f93143..7cee6a6777 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -1,6 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP2_1 using System.IO; using System.Threading.Tasks; @@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld', ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/Http.config") : null, SiteName = "HttpTestSite", // This is configured in the Http.config - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", + TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.1", ApplicationType = applicationType, ANCMVersion = ancmVersion }; diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs index a5bdd30bbf..9066c60c72 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -1,6 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP2_1 using System; using System.IO; @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld', ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/Https.config") : null, SiteName = "HttpsTestSite", // This is configured in the Https.config - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", + TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.1", ApplicationType = applicationType, ANCMVersion = ancmVersion }; @@ -98,7 +98,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [InlineData(ANCMVersion.AspNetCoreModuleV2)] public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable(ANCMVersion ancmVersion) { - return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44397, sendClientCert: false, ancmVersion); + return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44397, sendClientCert: false, ancmVersion); } [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] @@ -145,7 +145,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld', ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/Https.config") : null, SiteName = "HttpsTestSite", // This is configured in the Https.config - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", + TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.1", ApplicationType = applicationType, ANCMVersion = ancmVersion }; diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index 04f1d4e77a..a5ed40c7c6 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication' ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/NtlmAuthentation.config") : null, SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", + TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.1", ApplicationType = applicationType, ANCMVersion = ancmVersion, @@ -126,7 +126,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } } -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 #else #error Target frameworks need to be updated #endif From 22a865b83237cd50bdb7b764a87c28a3ec046afa Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 11 May 2018 13:02:12 -0700 Subject: [PATCH 018/363] Extract a layer of IIS Async IO handling (#818) --- .../NativeMethods.cs | 7 +- .../Server/IISAwaitable.cs | 119 ------ .../IISHttpContext.FeatureCollection.cs | 16 +- .../Server/IISHttpContext.ReadWrite.cs | 404 +++--------------- .../Server/IISHttpContext.Websockets.cs | 225 ---------- .../Server/IISHttpContext.cs | 145 +++---- .../Server/IISHttpContextOfT.cs | 24 +- .../Server/IISHttpRequestBody.cs | 4 +- .../Server/IISServerConstants.cs | 10 - .../Server/IO/AsyncIOEngine.Flush.cs | 43 ++ .../Server/IO/AsyncIOEngine.Read.cs | 63 +++ .../Server/IO/AsyncIOEngine.Write.cs | 34 ++ .../Server/IO/AsyncIOEngine.cs | 172 ++++++++ .../Server/IO/AsyncIOOperation.cs | 158 +++++++ .../Server/IO/AsyncWriteOperationBase.cs | 119 ++++++ .../Server/IO/IAsyncIOEngine.cs | 17 + .../IO/WebSocketsAsyncIOEngine.Initialize.cs | 42 ++ .../Server/IO/WebSocketsAsyncIOEngine.Read.cs | 79 ++++ .../IO/WebSocketsAsyncIOEngine.Write.cs | 49 +++ .../Server/IO/WebSocketsAsyncIOEngine.cs | 127 ++++++ .../Server/OutputProducer.cs | 15 +- .../IISIntegration.FunctionalTests.csproj | 3 +- .../Inprocess/SynchronousReadAndWriteTests.cs | 144 +++++-- .../Inprocess/WebSocketTests.cs | 78 ++++ .../Utilities/IISTestSiteFixture.cs | 5 + .../Utilities/TestConnections.cs | 212 +++++++++ .../InProcessWebSite/InProcessWebSite.csproj | 7 +- .../InProcessWebSite/Startup.WebSockets.cs | 154 +++++++ test/WebSites/InProcessWebSite/Startup.cs | 63 ++- .../Properties/launchSettings.json | 4 +- test/WebSites/StressTestWebSite/Startup.cs | 1 + .../StressTestWebSite.csproj | 6 +- .../WebSockets/Constants.cs | 2 +- .../WebSockets/HandshakeHelpers.cs | 3 +- 34 files changed, 1684 insertions(+), 870 deletions(-) delete mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISAwaitable.cs delete mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.Websockets.cs delete mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISServerConstants.cs create mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Flush.cs create mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Read.cs create mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Write.cs create mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.cs create mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOOperation.cs create mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncWriteOperationBase.cs create mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/IAsyncIOEngine.cs create mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Initialize.cs create mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Read.cs create mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Write.cs create mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.cs create mode 100644 test/IISIntegration.FunctionalTests/Inprocess/WebSocketTests.cs create mode 100644 test/IISIntegration.FunctionalTests/Utilities/TestConnections.cs create mode 100644 test/WebSites/InProcessWebSite/Startup.WebSockets.cs rename test/WebSites/{StressTestWebSite => shared}/WebSockets/Constants.cs (93%) rename test/WebSites/{StressTestWebSite => shared}/WebSockets/HandshakeHelpers.cs (97%) diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs index eef84d69b8..ece7f954c6 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs @@ -9,8 +9,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration { internal static class NativeMethods { - private const int HR_NOT_FOUND = unchecked((int)0x80070490); - private const int HR_OK = 0; + internal const int HR_OK = 0; + internal const int ERROR_NOT_FOUND = unchecked((int)0x80070490); + internal const int ERROR_OPERATION_ABORTED = unchecked((int)0x800703E3); private const string KERNEL32 = "kernel32.dll"; @@ -238,7 +239,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration var hr = http_cancel_io(pInProcessHandler); // Async operation finished // https://msdn.microsoft.com/en-us/library/windows/desktop/aa363792(v=vs.85).aspx - if (hr == HR_NOT_FOUND) + if (hr == ERROR_NOT_FOUND) { return false; } diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISAwaitable.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISAwaitable.cs deleted file mode 100644 index a24586b137..0000000000 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISAwaitable.cs +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Threading; -using System.Threading.Tasks; - -namespace Microsoft.AspNetCore.Server.IISIntegration -{ - // Primarily copied from https://github.com/aspnet/KestrelHttpServer/blob/dev/src/Kestrel.Transport.Libuv/Internal/LibuvAwaitable.cs - internal class IISAwaitable : ICriticalNotifyCompletion - { - private readonly static Action _callbackCompleted = () => { }; - - private Action _callback; - - private Exception _exception; - private int _cbBytes; - private int _hr; - - public static readonly NativeMethods.PFN_WEBSOCKET_ASYNC_COMPLETION ReadCallback = (IntPtr pHttpContext, IntPtr pCompletionInfo, IntPtr pvCompletionContext) => - { - var context = (IISHttpContext)GCHandle.FromIntPtr(pvCompletionContext).Target; - - NativeMethods.HttpGetCompletionInfo(pCompletionInfo, out int cbBytes, out int hr); - - context.CompleteReadWebSockets(hr, cbBytes); - - return NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_PENDING; - }; - - public static readonly NativeMethods.PFN_WEBSOCKET_ASYNC_COMPLETION WriteCallback = (IntPtr pHttpContext, IntPtr pCompletionInfo, IntPtr pvCompletionContext) => - { - var context = (IISHttpContext)GCHandle.FromIntPtr(pvCompletionContext).Target; - - NativeMethods.HttpGetCompletionInfo(pCompletionInfo, out int cbBytes, out int hr); - - context.CompleteWriteWebSockets(hr, cbBytes); - - return NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_PENDING; - }; - - public IISAwaitable GetAwaiter() => this; - public bool IsCompleted => _callback == _callbackCompleted; - - public bool HasContinuation => _callback != null && !IsCompleted; - - public int GetResult() - { - var exception = _exception; - var cbBytes = _cbBytes; - var hr = _hr; - - // Reset the awaitable state - _exception = null; - _cbBytes = 0; - _callback = null; - _hr = 0; - - if (exception != null) - { - // If the exception was an aborted read operation, - // return -1 to notify NativeReadAsync that the write was cancelled. - // E_OPERATIONABORTED == 0x800703e3 == -2147023901 - // We also don't throw the exception here as this is expected behavior - // and can negatively impact perf if we catch an exception for each - // cann - if (hr != IISServerConstants.HResultCancelIO) - { - throw exception; - } - else - { - cbBytes = -1; - } - } - - return cbBytes; - } - - public void OnCompleted(Action continuation) - { - // There should never be a race between IsCompleted and OnCompleted since both operations - // should always be on the libuv thread - - if (_callback == _callbackCompleted || - Interlocked.CompareExchange(ref _callback, continuation, null) == _callbackCompleted) - { - // Just run it inline - Task.Run(continuation); - } - } - - public void UnsafeOnCompleted(Action continuation) - { - OnCompleted(continuation); - } - - public void Complete(int hr, int cbBytes) - { - _hr = hr; - _exception = Marshal.GetExceptionForHR(hr); - _cbBytes = cbBytes; - var continuation = Interlocked.Exchange(ref _callback, _callbackCompleted); - continuation?.Invoke(); - } - - public Action GetCompletion(int hr, int cbBytes) - { - _hr = hr; - _exception = Marshal.GetExceptionForHR(hr); - _cbBytes = cbBytes; - - return Interlocked.Exchange(ref _callback, _callbackCompleted); - } - } -} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.FeatureCollection.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.FeatureCollection.cs index 0acf621bb0..1acdc3e36d 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.FeatureCollection.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.FeatureCollection.cs @@ -4,6 +4,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Net; using System.Security.Claims; @@ -250,16 +251,23 @@ namespace Microsoft.AspNetCore.Server.IISIntegration { throw new InvalidOperationException("CoreStrings.UpgradeCannotBeCalledMultipleTimes"); } + _wasUpgraded = true; StatusCode = StatusCodes.Status101SwitchingProtocols; ReasonPhrase = ReasonPhrases.GetReasonPhrase(StatusCodes.Status101SwitchingProtocols); - _readWebSocketsOperation = new IISAwaitable(); - _writeWebSocketsOperation = new IISAwaitable(); - NativeMethods.HttpEnableWebsockets(_pInProcessHandler); + + // If we started reading before calling Upgrade Task should be completed at this point + // because read would return 0 syncronosly + Debug.Assert(_readBodyTask == null || _readBodyTask.IsCompleted); + + // Reset reading status to allow restarting with new IO + _hasRequestReadingStarted = false; // Upgrade async will cause the stream processing to go into duplex mode - await UpgradeAsync(); + AsyncIO = new WebSocketsAsyncIOEngine(_pInProcessHandler); + + await InitializeResponse(flushHeaders: true); return new DuplexStream(RequestBody, ResponseBody); } diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.ReadWrite.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.ReadWrite.cs index d6480cde9a..839eefc1e9 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.ReadWrite.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.ReadWrite.cs @@ -3,17 +3,13 @@ using System; using System.Buffers; -using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.HttpSys.Internal; namespace Microsoft.AspNetCore.Server.IISIntegration { internal partial class IISHttpContext { - private const int HttpDataChunkStackLimit = 128; // 16 bytes per HTTP_DATA_CHUNK - /// /// Reads data from the Input pipe to the user. /// @@ -22,11 +18,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration /// internal async Task ReadAsync(Memory memory, CancellationToken cancellationToken) { - StartProcessingRequestAndResponseBody(); + if (!_hasRequestReadingStarted) + { + InitializeRequestIO(); + } while (true) { - var result = await Input.Reader.ReadAsync(); + var result = await _bodyInputPipe.Reader.ReadAsync(); var readableBuffer = result.Buffer; try { @@ -44,7 +43,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration } finally { - Input.Reader.AdvanceTo(readableBuffer.End, readableBuffer.End); + _bodyInputPipe.Reader.AdvanceTo(readableBuffer.End, readableBuffer.End); } } } @@ -57,18 +56,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration /// internal Task WriteAsync(ReadOnlyMemory memory, CancellationToken cancellationToken = default(CancellationToken)) { - - // Want to keep exceptions consistent, - if (!_hasResponseStarted) + async Task WriteFirstAsync() { - return WriteAsyncAwaited(memory, cancellationToken); + await InitializeResponse(flushHeaders: false); + await _bodyOutput.WriteAsync(memory, cancellationToken); } - lock (_stateSync) - { - DisableReads(); - return Output.WriteAsync(memory, cancellationToken); - } + return !HasResponseStarted ? WriteFirstAsync() : _bodyOutput.WriteAsync(memory, cancellationToken); } /// @@ -78,397 +72,99 @@ namespace Microsoft.AspNetCore.Server.IISIntegration /// internal Task FlushAsync(CancellationToken cancellationToken = default(CancellationToken)) { - if (!_hasResponseStarted) + async Task FlushFirstAsync() { - return FlushAsyncAwaited(cancellationToken); - } - lock (_stateSync) - { - DisableReads(); - return Output.FlushAsync(cancellationToken); + await InitializeResponse(flushHeaders: true); + await _bodyOutput.FlushAsync(cancellationToken); } + + return !HasResponseStarted ? FlushFirstAsync() : _bodyOutput.FlushAsync(cancellationToken); } - private void StartProcessingRequestAndResponseBody() - { - if (_processBodiesTask == null) - { - lock (_createReadWriteBodySync) - { - if (_processBodiesTask == null) - { - _processBodiesTask = ConsumeAsync(); - } - } - } - } - - private async Task FlushAsyncAwaited(CancellationToken cancellationToken) - { - await InitializeResponseAwaited(); - - Task flushTask; - lock (_stateSync) - { - DisableReads(); - - // Want to guarantee that data has been written to the pipe before releasing the lock. - flushTask = Output.FlushAsync(cancellationToken: cancellationToken); - } - await flushTask; - } - - private async Task WriteAsyncAwaited(ReadOnlyMemory data, CancellationToken cancellationToken) - { - // WriteAsyncAwaited is only called for the first write to the body. - // Ensure headers are flushed if Write(Chunked)Async isn't called. - await InitializeResponseAwaited(); - - Task writeTask; - lock (_stateSync) - { - DisableReads(); - - // Want to guarantee that data has been written to the pipe before releasing the lock. - writeTask = Output.WriteAsync(data, cancellationToken: cancellationToken); - } - await writeTask; - } - - // ConsumeAsync is called when either the first read or first write is done. - // There are two modes for reading and writing to the request/response bodies without upgrade. - // 1. Await all reads and try to read from the Output pipe - // 2. Done reading and await all writes. - // If the request is upgraded, we will start bidirectional streams for the input and output. - private async Task ConsumeAsync() - { - await ReadAndWriteLoopAsync(); - - // The ReadAndWriteLoop can return due to being upgraded. Check if _wasUpgraded is true to determine - // whether we go to a bidirectional stream or only write. - if (_wasUpgraded) - { - await StartBidirectionalStream(); - } - } - - private unsafe IISAwaitable ReadFromIISAsync(int length) - { - Action completion = null; - lock (_stateSync) - { - // We don't want to read if there is data available in the output pipe - // Therefore, we mark the current operation as cancelled to allow for the read - // to be requeued. - if (Output.Reader.TryRead(out var result)) - { - // If the buffer is empty, it is considered a write of zero. - // we still want to cancel and allow the write to occur. - completion = _operation.GetCompletion(hr: IISServerConstants.HResultCancelIO, cbBytes: 0); - Output.Reader.AdvanceTo(result.Buffer.Start); - } - else - { - var hr = NativeMethods.HttpReadRequestBytes( - _pInProcessHandler, - (byte*)_inputHandle.Pointer, - length, - out var dwReceivedBytes, - out bool fCompletionExpected); - // if we complete the read synchronously, there is no need to set the reading flag - // as there is no cancelable operation. - if (!fCompletionExpected) - { - completion = _operation.GetCompletion(hr, dwReceivedBytes); - } - else - { - _reading = true; - } - } - } - - // Invoke the completion outside of the lock if the reead finished synchronously. - completion?.Invoke(); - - return _operation; - } - - private unsafe IISAwaitable WriteToIISAsync(ReadOnlySequence buffer) - { - var fCompletionExpected = false; - var hr = 0; - var nChunks = 0; - - // Count the number of chunks in memory. - if (buffer.IsSingleSegment) - { - nChunks = 1; - } - else - { - foreach (var memory in buffer) - { - nChunks++; - } - } - - if (nChunks == 1) - { - // If there is only a single chunk, use fixed to get a pointer to the buffer - var pDataChunks = stackalloc HttpApiTypes.HTTP_DATA_CHUNK[1]; - - fixed (byte* pBuffer = &MemoryMarshal.GetReference(buffer.First.Span)) - { - ref var chunk = ref pDataChunks[0]; - - chunk.DataChunkType = HttpApiTypes.HTTP_DATA_CHUNK_TYPE.HttpDataChunkFromMemory; - chunk.fromMemory.pBuffer = (IntPtr)pBuffer; - chunk.fromMemory.BufferLength = (uint)buffer.Length; - hr = NativeMethods.HttpWriteResponseBytes(_pInProcessHandler, pDataChunks, nChunks, out fCompletionExpected); - } - } - else if (nChunks < HttpDataChunkStackLimit) - { - // To avoid stackoverflows, we will only stackalloc if the write size is less than the StackChunkLimit - // The stack size is IIS is by default 128/256 KB, so we are generous with this threshold. - var pDataChunks = stackalloc HttpApiTypes.HTTP_DATA_CHUNK[nChunks]; - hr = WriteSequenceToIIS(nChunks, buffer, pDataChunks, out fCompletionExpected); - } - else - { - // Otherwise allocate the chunks on the heap. - var chunks = new HttpApiTypes.HTTP_DATA_CHUNK[nChunks]; - fixed (HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks = chunks) - { - hr = WriteSequenceToIIS(nChunks, buffer, pDataChunks, out fCompletionExpected); - } - } - - if (!fCompletionExpected) - { - _operation.Complete(hr, 0); - } - return _operation; - } - - private unsafe int WriteSequenceToIIS(int nChunks, ReadOnlySequence buffer, HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, out bool fCompletionExpected) - { - var currentChunk = 0; - var hr = 0; - - // REVIEW: We don't really need this list since the memory is already pinned with the default pool, - // but shouldn't assume the pool implementation right now. Unfortunately, this causes a heap allocation... - var handles = new MemoryHandle[nChunks]; - - foreach (var b in buffer) - { - ref var handle = ref handles[currentChunk]; - ref var chunk = ref pDataChunks[currentChunk]; - handle = b.Pin(); - - chunk.DataChunkType = HttpApiTypes.HTTP_DATA_CHUNK_TYPE.HttpDataChunkFromMemory; - chunk.fromMemory.BufferLength = (uint)b.Length; - chunk.fromMemory.pBuffer = (IntPtr)handle.Pointer; - - currentChunk++; - } - - hr = NativeMethods.HttpWriteResponseBytes(_pInProcessHandler, pDataChunks, nChunks, out fCompletionExpected); - - // Free the handles - foreach (var handle in handles) - { - handle.Dispose(); - } - - return hr; - } - - private unsafe IISAwaitable FlushToIISAsync() - { - // Calls flush - var hr = 0; - hr = NativeMethods.HttpFlushResponseBytes(_pInProcessHandler, out var fCompletionExpected); - if (!fCompletionExpected) - { - _operation.Complete(hr, 0); - } - - return _operation; - } - - /// - /// Main function for control flow with IIS. - /// Uses two Pipes (Input and Output) between application calls to Read/Write/FlushAsync - /// Control Flow: - /// Try to see if there is data written by the application code (using TryRead) - /// and write it to IIS. - /// Check if the connection has been upgraded and call StartBidirectionalStreams - /// if it has. - /// Await reading from IIS, which will be cancelled if application code calls Write/FlushAsync. - /// - /// The Reading and Writing task. - private async Task ReadAndWriteLoopAsync() + private async Task ReadBody() { try { while (true) { - // First we check if there is anything to write from the Output pipe - // If there is, we call WriteToIISAsync - // Check if Output pipe has anything to write to IIS. - if (Output.Reader.TryRead(out var readResult)) - { - var buffer = readResult.Buffer; + var memory = _bodyInputPipe.Writer.GetMemory(); - try - { - if (!buffer.IsEmpty) - { - // Write to IIS buffers - // Guaranteed to write the entire buffer to IIS - await WriteToIISAsync(buffer); - } - else if (readResult.IsCompleted) - { - break; - } - else - { - // Flush of zero bytes - await FlushToIISAsync(); - } - } - finally - { - // Always Advance the data pointer to the end of the buffer. - Output.Reader.AdvanceTo(buffer.End); - } + var read = await AsyncIO.ReadAsync(memory); + + // End of body + if (read == 0) + { + break; } - // Check if there was an upgrade. If there is, we will replace the request and response bodies with - // two seperate loops. These will still be using the same Input and Output pipes here. - if (_upgradeTcs?.TrySetResult(null) == true) + // Read was not canceled because of incoming write or IO stopping + if (read != -1) { - // _wasUpgraded will be set at this point, exit the loop and we will check if we upgraded or not - // when going to next read/write type. - return; + _bodyInputPipe.Writer.Advance(read); } - // Now we handle the read. - var memory = Input.Writer.GetMemory(); - _inputHandle = memory.Pin(); + var result = await _bodyInputPipe.Writer.FlushAsync(); - try - { - // Lock around invoking ReadFromIISAsync as we don't want to call CancelIo - // when calling read - var read = await ReadFromIISAsync(memory.Length); - - // read value of 0 == done reading - // read value of -1 == read cancelled, still allowed to read but we - // need a write to occur first. - if (read == 0) - { - break; - } - else if (read == -1) - { - continue; - } - Input.Writer.Advance(read); - } - finally - { - // Always commit any changes to the Input pipe - _inputHandle.Dispose(); - } - - // Flush the read data for the Input Pipe writer - var flushResult = await Input.Writer.FlushAsync(); - - // If the pipe was closed, we are done reading, - if (flushResult.IsCompleted || flushResult.IsCanceled) + if (result.IsCompleted || result.IsCanceled) { break; } } - - // Complete the input writer as we are done reading the request body. - Input.Writer.Complete(); } catch (Exception ex) { - Input.Writer.Complete(ex); + _bodyInputPipe.Writer.Complete(ex); + } + finally + { + _bodyInputPipe.Writer.Complete(); } - - await WriteLoopAsync(); } - /// - /// Secondary function for control flow with IIS. This is only called once we are done - /// reading the request body. We now await reading from the Output pipe. - /// - /// - private async Task WriteLoopAsync() + private async Task WriteBody(bool flush = false) { try { while (true) { - // Reading is done, so we will await all reads from the output pipe - var readResult = await Output.Reader.ReadAsync(); + var result = await _bodyOutput.Reader.ReadAsync(); - // Get data from pipe - var buffer = readResult.Buffer; + var buffer = result.Buffer; try { if (!buffer.IsEmpty) { - // Write to IIS buffers - // Guaranteed to write the entire buffer to IIS - await WriteToIISAsync(buffer); + await AsyncIO.WriteAsync(buffer); } - else if (readResult.IsCompleted) + + // if request is done no need to flush, http.sys would do it for us + if (result.IsCompleted) { break; } - else + + flush = flush | result.IsCanceled; + + if (flush) { - // Flush of zero bytes will - await FlushToIISAsync(); + await AsyncIO.FlushAsync(); + flush = false; } } finally { - // Always Advance the data pointer to the end of the buffer. - Output.Reader.AdvanceTo(buffer.End); + _bodyOutput.Reader.AdvanceTo(buffer.End); } } - - // Close the output pipe as we are done reading from it. - Output.Reader.Complete(); } catch (Exception ex) { - Output.Reader.Complete(ex); + _bodyOutput.Reader.Complete(ex); } - } - - // Always called from within a lock - private void DisableReads() - { - // To avoid concurrent reading and writing, if we have a pending read, - // we must cancel it. - // _reading will always be false if we upgrade to websockets, so we don't need to check wasUpgrade - // Also, we set _reading to false after cancelling to detect redundant calls - if (_reading) + finally { - _reading = false; - // Calls IHttpContext->CancelIo(), which will cause the OnAsyncCompletion handler to fire. - NativeMethods.HttpTryCancelIO(_pInProcessHandler); + _bodyOutput.Reader.Complete(); } } } diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.Websockets.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.Websockets.cs deleted file mode 100644 index 75a1efba1e..0000000000 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.Websockets.cs +++ /dev/null @@ -1,225 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Buffers; -using System.Runtime.InteropServices; -using System.Threading.Tasks; -using Microsoft.AspNetCore.HttpSys.Internal; - -namespace Microsoft.AspNetCore.Server.IISIntegration -{ - /// - /// Represents the websocket portion of the - /// - internal partial class IISHttpContext - { - private bool _wasUpgraded; // Used for detecting repeated upgrades in IISHttpContext - - private IISAwaitable _readWebSocketsOperation; - private IISAwaitable _writeWebSocketsOperation; - private TaskCompletionSource _upgradeTcs; - - private Task StartBidirectionalStream() - { - // IIS allows for websocket support and duplex channels only on Win8 and above - // This allows us to have two tasks for reading the request and writing the response - var readWebsocketTask = ReadWebSockets(); - var writeWebsocketTask = WriteWebSockets(); - return Task.WhenAll(readWebsocketTask, writeWebsocketTask); - } - - public async Task UpgradeAsync() - { - if (_upgradeTcs == null) - { - _upgradeTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - // Flush any contents of the OutputPipe before upgrading to websockets. - await FlushAsync(); - await _upgradeTcs.Task; - } - } - - private unsafe IISAwaitable ReadWebSocketsFromIISAsync(int length) - { - var hr = 0; - int dwReceivedBytes; - bool fCompletionExpected; - - // For websocket calls, we can directly provide a callback function to be called once the websocket operation completes. - hr = NativeMethods.HttpWebsocketsReadBytes( - _pInProcessHandler, - (byte*)_inputHandle.Pointer, - length, - IISAwaitable.ReadCallback, - (IntPtr)_thisHandle, - out dwReceivedBytes, - out fCompletionExpected); - if (!fCompletionExpected) - { - CompleteReadWebSockets(hr, dwReceivedBytes); - } - - return _readWebSocketsOperation; - } - - private unsafe IISAwaitable WriteWebSocketsFromIISAsync(ReadOnlySequence buffer) - { - var fCompletionExpected = false; - var hr = 0; - var nChunks = 0; - - if (buffer.IsSingleSegment) - { - nChunks = 1; - } - else - { - foreach (var memory in buffer) - { - nChunks++; - } - } - - if (buffer.IsSingleSegment) - { - var pDataChunks = stackalloc HttpApiTypes.HTTP_DATA_CHUNK[1]; - - fixed (byte* pBuffer = &MemoryMarshal.GetReference(buffer.First.Span)) - { - ref var chunk = ref pDataChunks[0]; - - chunk.DataChunkType = HttpApiTypes.HTTP_DATA_CHUNK_TYPE.HttpDataChunkFromMemory; - chunk.fromMemory.pBuffer = (IntPtr)pBuffer; - chunk.fromMemory.BufferLength = (uint)buffer.Length; - hr = NativeMethods.HttpWebsocketsWriteBytes(_pInProcessHandler, pDataChunks, nChunks, IISAwaitable.WriteCallback, (IntPtr)_thisHandle, out fCompletionExpected); - } - } - else - { - // REVIEW: Do we need to guard against this getting too big? It seems unlikely that we'd have more than say 10 chunks in real life - var pDataChunks = stackalloc HttpApiTypes.HTTP_DATA_CHUNK[nChunks]; - var currentChunk = 0; - - // REVIEW: We don't really need this list since the memory is already pinned with the default pool, - // but shouldn't assume the pool implementation right now. Unfortunately, this causes a heap allocation... - var handles = new MemoryHandle[nChunks]; - - foreach (var b in buffer) - { - ref var handle = ref handles[currentChunk]; - ref var chunk = ref pDataChunks[currentChunk]; - - handle = b.Pin(); - - chunk.DataChunkType = HttpApiTypes.HTTP_DATA_CHUNK_TYPE.HttpDataChunkFromMemory; - chunk.fromMemory.BufferLength = (uint)b.Length; - chunk.fromMemory.pBuffer = (IntPtr)handle.Pointer; - - currentChunk++; - } - - hr = NativeMethods.HttpWebsocketsWriteBytes(_pInProcessHandler, pDataChunks, nChunks, IISAwaitable.WriteCallback, (IntPtr)_thisHandle, out fCompletionExpected); - - foreach (var handle in handles) - { - handle.Dispose(); - } - } - - if (!fCompletionExpected) - { - CompleteWriteWebSockets(hr, 0); - } - - return _writeWebSocketsOperation; - } - - internal void CompleteWriteWebSockets(int hr, int cbBytes) - { - _writeWebSocketsOperation.Complete(hr, cbBytes); - } - - internal void CompleteReadWebSockets(int hr, int cbBytes) - { - _readWebSocketsOperation.Complete(hr, cbBytes); - } - - private async Task ReadWebSockets() - { - try - { - while (true) - { - var memory = Input.Writer.GetMemory(); - _inputHandle = memory.Pin(); - - try - { - int read = 0; - read = await ReadWebSocketsFromIISAsync(memory.Length); - - if (read == 0) - { - break; - } - - Input.Writer.Advance(read); - } - finally - { - _inputHandle.Dispose(); - } - - var result = await Input.Writer.FlushAsync(); - - if (result.IsCompleted || result.IsCanceled) - { - break; - } - } - Input.Writer.Complete(); - } - catch (Exception ex) - { - Input.Writer.Complete(ex); - } - } - - private async Task WriteWebSockets() - { - try - { - while (true) - { - var result = await Output.Reader.ReadAsync(); - - var buffer = result.Buffer; - var consumed = buffer.End; - - try - { - if (!buffer.IsEmpty) - { - await WriteWebSocketsFromIISAsync(buffer); - } - else if (result.IsCompleted) - { - break; - } - } - finally - { - Output.Reader.AdvanceTo(consumed); - } - } - - Output.Reader.Complete(); - } - catch (Exception ex) - { - Output.Reader.Complete(ex); - } - } - } -} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs index fa04d66e6c..92ccdf3326 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs @@ -19,6 +19,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpSys.Internal; using Microsoft.AspNetCore.WebUtilities; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.IISIntegration { @@ -33,15 +34,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration private readonly IISOptions _options; - private bool _reading; // To know whether we are currently in a read operation. private volatile bool _hasResponseStarted; + private volatile bool _hasRequestReadingStarted; private int _statusCode; private string _reasonPhrase; private readonly object _onStartingSync = new object(); private readonly object _onCompletedSync = new object(); - private readonly object _stateSync = new object(); - protected readonly object _createReadWriteBodySync = new object(); protected Stack, object>> _onStarting; protected Stack, object>> _onCompleted; @@ -51,16 +50,20 @@ namespace Microsoft.AspNetCore.Server.IISIntegration private readonly IISHttpServer _server; private GCHandle _thisHandle; - private MemoryHandle _inputHandle; - private IISAwaitable _operation = new IISAwaitable(); - protected Task _processBodiesTask; + protected Task _readBodyTask; + protected Task _writeBodyTask; + private bool _wasUpgraded; protected int _requestAborted; + protected Pipe _bodyInputPipe; + protected OutputProducer _bodyOutput; + private const string NtlmString = "NTLM"; private const string NegotiateString = "Negotiate"; private const string BasicString = "Basic"; + internal unsafe IISHttpContext(MemoryPool memoryPool, IntPtr pInProcessHandler, IISOptions options, IISHttpServer server) : base((HttpApiTypes.HTTP_REQUEST*)NativeMethods.HttpGetRawRequest(pInProcessHandler)) { @@ -89,8 +92,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration internal WindowsPrincipal WindowsUser { get; set; } public Stream RequestBody { get; set; } public Stream ResponseBody { get; set; } - public Pipe Input { get; set; } - public OutputProducer Output { get; set; } + + protected IAsyncIOEngine AsyncIO { get; set; } public IHeaderDictionary RequestHeaders { get; set; } public IHeaderDictionary ResponseHeaders { get; set; } @@ -153,7 +156,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration RequestBody = new IISHttpRequestBody(this); ResponseBody = new IISHttpResponseBody(this); - Input = new Pipe(new PipeOptions(_memoryPool, readerScheduler: PipeScheduler.ThreadPool, minimumSegmentSize: MinAllocBufferSize)); + var pipe = new Pipe( new PipeOptions( _memoryPool, @@ -161,7 +164,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration pauseWriterThreshold: PauseWriterThreshold, resumeWriterThreshold: ResumeWriterTheshold, minimumSegmentSize: MinAllocBufferSize)); - Output = new OutputProducer(pipe); + _bodyOutput = new OutputProducer(pipe); } public int StatusCode @@ -169,7 +172,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration get { return _statusCode; } set { - if (_hasResponseStarted) + if (HasResponseStarted) { ThrowResponseAlreadyStartedException(nameof(StatusCode)); } @@ -182,7 +185,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration get { return _reasonPhrase; } set { - if (_hasResponseStarted) + if (HasResponseStarted) { ThrowResponseAlreadyStartedException(nameof(ReasonPhrase)); } @@ -190,12 +193,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration } } - internal IISHttpServer Server - { - get { return _server; } - } + internal IISHttpServer Server => _server; - private async Task InitializeResponseAwaited() + private async Task InitializeResponse(bool flushHeaders) { await FireOnStarting(); @@ -204,7 +204,46 @@ namespace Microsoft.AspNetCore.Server.IISIntegration ThrowResponseAbortedException(); } - await ProduceStart(appCompleted: false); + await ProduceStart(flushHeaders); + } + + private async Task ProduceStart(bool flushHeaders) + { + Debug.Assert(_hasResponseStarted == false); + + _hasResponseStarted = true; + + SetResponseHeaders(); + + EnsureIOInitialized(); + + if (flushHeaders) + { + await AsyncIO.FlushAsync(); + } + + _writeBodyTask = WriteBody(!flushHeaders); + } + + private void InitializeRequestIO() + { + Debug.Assert(!_hasRequestReadingStarted); + + _hasRequestReadingStarted = true; + + EnsureIOInitialized(); + + _bodyInputPipe = new Pipe(new PipeOptions(_memoryPool, readerScheduler: PipeScheduler.ThreadPool, minimumSegmentSize: MinAllocBufferSize)); + _readBodyTask = ReadBody(); + } + + private void EnsureIOInitialized() + { + // If at this point request was not upgraded just start a normal IO engine + if (AsyncIO == null) + { + AsyncIO = new AsyncIOEngine(_pInProcessHandler); + } } private void ThrowResponseAbortedException() @@ -212,38 +251,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration throw new ObjectDisposedException("Unhandled application exception", _applicationException); } - private async Task ProduceStart(bool appCompleted) - { - if (_hasResponseStarted) - { - return; - } - - _hasResponseStarted = true; - - SendResponseHeaders(appCompleted); - - // On first flush for websockets, we need to flush the headers such that - // IIS will know that an upgrade occured. - // If we don't have anything on the Output pipe, the TryRead in ReadAndWriteLoopAsync - // will fail and we will signal the upgradeTcs that we are upgrading. However, we still - // didn't flush. To fix this, we flush 0 bytes right after writing the headers. - Task flushTask; - lock (_stateSync) - { - DisableReads(); - flushTask = Output.FlushAsync(); - } - await flushTask; - - StartProcessingRequestAndResponseBody(); - } - protected Task ProduceEnd() { if (_applicationException != null) { - if (_hasResponseStarted) + if (HasResponseStarted) { // We can no longer change the response, so we simply close the connection. return Task.CompletedTask; @@ -258,7 +270,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration } } - if (!_hasResponseStarted) + if (!HasResponseStarted) { return ProduceEndAwaited(); } @@ -275,27 +287,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration private async Task ProduceEndAwaited() { - if (_hasResponseStarted) - { - return; - } - - _hasResponseStarted = true; - - SendResponseHeaders(appCompleted: true); - StartProcessingRequestAndResponseBody(); - - Task flushAsync; - - lock (_stateSync) - { - DisableReads(); - flushAsync = Output.FlushAsync(); - } - await flushAsync; + await ProduceStart(flushHeaders: true); + await _bodyOutput.FlushAsync(default); } - public unsafe void SendResponseHeaders(bool appCompleted) + public unsafe void SetResponseHeaders() { // Verifies we have sent the statuscode before writing a header var reasonPhrase = string.IsNullOrEmpty(ReasonPhrase) ? ReasonPhrases.GetReasonPhrase(StatusCode) : ReasonPhrase; @@ -348,7 +344,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration { lock (_onStartingSync) { - if (_hasResponseStarted) + if (HasResponseStarted) { throw new InvalidOperationException("Response already started"); } @@ -439,8 +435,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration public void PostCompletion(NativeMethods.REQUEST_NOTIFICATION_STATUS requestNotificationStatus) { - Debug.Assert(!_operation.HasContinuation, "Pending async operation!"); - NativeMethods.HttpSetCompletionStatus(_pInProcessHandler, requestNotificationStatus); NativeMethods.HttpPostCompletion(_pInProcessHandler, 0); } @@ -450,18 +444,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration NativeMethods.HttpIndicateCompletion(_pInProcessHandler, notificationStatus); } - internal void OnAsyncCompletion(int hr, int cbBytes) + internal void OnAsyncCompletion(int hr, int bytes) { - // Must acquire the _stateSync here as anytime we call complete, we need to hold the lock - // to avoid races with cancellation. - Action continuation; - lock (_stateSync) - { - _reading = false; - continuation = _operation.GetCompletion(hr, cbBytes); - } - - continuation?.Invoke(); + AsyncIO.NotifyCompletion(hr, bytes); } private bool disposedValue = false; // To detect redundant calls diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContextOfT.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContextOfT.cs index 0867c3dd06..e3152802bc 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContextOfT.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContextOfT.cs @@ -80,18 +80,24 @@ namespace Microsoft.AspNetCore.Server.IISIntegration } finally { - // The app is finished and there should be nobody writing to the response pipe - Output.Dispose(); + // Complete response writer and request reader pipe sides + _bodyOutput.Dispose(); + _bodyInputPipe?.Reader.Complete(); - // The app is finished and there should be nobody reading from the request pipe - Input.Reader.Complete(); - - Task processBodiesTask; - lock (_createReadWriteBodySync) + // Allow writes to drain + if (_writeBodyTask != null) { - processBodiesTask = _processBodiesTask; + await _writeBodyTask; + } + + // Cancell all remaining IO, thre might be reads pending if not entire request body was sent + // by client + AsyncIO.Dispose(); + + if (_readBodyTask != null) + { + await _readBodyTask; } - await processBodiesTask; } return success; } diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpRequestBody.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpRequestBody.cs index be5746c0d3..87d7742dfa 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpRequestBody.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpRequestBody.cs @@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration return ReadAsync(buffer, offset, count, CancellationToken.None).GetAwaiter().GetResult(); } - public override unsafe Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { var memory = new Memory(buffer, offset, count); @@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration throw new NotSupportedException(); } - public unsafe override void Write(byte[] buffer, int offset, int count) + public override void Write(byte[] buffer, int offset, int count) { throw new NotSupportedException(); } diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISServerConstants.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISServerConstants.cs deleted file mode 100644 index fc137bd159..0000000000 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISServerConstants.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNetCore.Server.IISIntegration -{ - internal static class IISServerConstants - { - internal const int HResultCancelIO = -2147023901; - } -} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Flush.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Flush.cs new file mode 100644 index 0000000000..f0b30dcf2f --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Flush.cs @@ -0,0 +1,43 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + internal partial class AsyncIOEngine + { + internal class AsyncFlushOperation : AsyncIOOperation + { + private readonly AsyncIOEngine _engine; + + private IntPtr _requestHandler; + + public AsyncFlushOperation(AsyncIOEngine engine) + { + _engine = engine; + } + + public void Initialize(IntPtr requestHandler) + { + _requestHandler = requestHandler; + } + + protected override bool InvokeOperation(out int hr, out int bytes) + { + bytes = 0; + hr = NativeMethods.HttpFlushResponseBytes(_requestHandler, out var fCompletionExpected); + + return !fCompletionExpected; + } + + protected override void ResetOperation() + { + base.ResetOperation(); + + _requestHandler = default; + _engine.ReturnOperation(this); + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Read.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Read.cs new file mode 100644 index 0000000000..207ce9efc4 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Read.cs @@ -0,0 +1,63 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Buffers; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + internal partial class AsyncIOEngine + { + internal class AsyncReadOperation : AsyncIOOperation + { + private readonly AsyncIOEngine _engine; + + private MemoryHandle _inputHandle; + + private IntPtr _requestHandler; + + private Memory _memory; + + public AsyncReadOperation(AsyncIOEngine engine) + { + _engine = engine; + } + + public void Initialize(IntPtr requestHandler, Memory memory) + { + _requestHandler = requestHandler; + _memory = memory; + } + + protected override unsafe bool InvokeOperation(out int hr, out int bytes) + { + _inputHandle = _memory.Pin(); + hr = NativeMethods.HttpReadRequestBytes( + _requestHandler, + (byte*)_inputHandle.Pointer, + _memory.Length, + out bytes, + out bool completionExpected); + + return !completionExpected; + } + + protected override void ResetOperation() + { + base.ResetOperation(); + + _memory = default; + _inputHandle.Dispose(); + _inputHandle = default; + _requestHandler = default; + + _engine.ReturnOperation(this); + } + + public override void FreeOperationResources(int hr, int bytes) + { + _inputHandle.Dispose(); + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Write.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Write.cs new file mode 100644 index 0000000000..8bd708797d --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Write.cs @@ -0,0 +1,34 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.HttpSys.Internal; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + internal partial class AsyncIOEngine + { + private class AsyncWriteOperation : AsyncWriteOperationBase + { + private readonly AsyncIOEngine _engine; + + public AsyncWriteOperation(AsyncIOEngine engine) + { + _engine = engine; + } + + protected override unsafe int WriteChunks(IntPtr requestHandler, int chunkCount, HttpApiTypes.HTTP_DATA_CHUNK* dataChunks, + out bool completionExpected) + { + return NativeMethods.HttpWriteResponseBytes(requestHandler, dataChunks, chunkCount, out completionExpected); + } + + protected override void ResetOperation() + { + base.ResetOperation(); + + _engine.ReturnOperation(this); + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.cs new file mode 100644 index 0000000000..dbb8bd2331 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.cs @@ -0,0 +1,172 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Buffers; +using System.Diagnostics; +using System.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + internal partial class AsyncIOEngine : IAsyncIOEngine + { + private readonly IntPtr _handler; + + private bool _stopped; + + private AsyncIOOperation _nextOperation; + private AsyncIOOperation _runningOperation; + + private AsyncReadOperation _cachedAsyncReadOperation; + private AsyncWriteOperation _cachedAsyncWriteOperation; + private AsyncFlushOperation _cachedAsyncFlushOperation; + + public AsyncIOEngine(IntPtr handler) + { + _handler = handler; + } + + public ValueTask ReadAsync(Memory memory) + { + var read = GetReadOperation(); + read.Initialize(_handler, memory); + Run(read); + return new ValueTask(read, 0); + } + + public ValueTask WriteAsync(ReadOnlySequence data) + { + var write = GetWriteOperation(); + write.Initialize(_handler, data); + Run(write); + return new ValueTask(write, 0); + } + + private void Run(AsyncIOOperation ioOperation) + { + lock (this) + { + if (_stopped) + { + throw new IOException("IO stopped", NativeMethods.ERROR_OPERATION_ABORTED); + } + + if (_runningOperation != null) + { + if (_nextOperation == null) + { + _nextOperation = ioOperation; + + // If there is an active read cancel it + if (_runningOperation is AsyncReadOperation) + { + NativeMethods.HttpTryCancelIO(_handler); + } + } + else + { + throw new InvalidOperationException("Only one queued operation is allowed"); + } + } + else + { + // we are just starting operation so there would be no + // continuation registered + var completed = ioOperation.Invoke() != null; + + // operation went async + if (!completed) + { + _runningOperation = ioOperation; + } + } + } + } + + + public ValueTask FlushAsync() + { + var flush = GetFlushOperation(); + flush.Initialize(_handler); + Run(flush); + return new ValueTask(flush, 0); + } + + public void NotifyCompletion(int hr, int bytes) + { + AsyncIOOperation.AsyncContinuation continuation; + AsyncIOOperation.AsyncContinuation? nextContinuation = null; + + lock (this) + { + Debug.Assert(_runningOperation != null); + + continuation = _runningOperation.Complete(hr, bytes); + + var next = _nextOperation; + _nextOperation = null; + _runningOperation = null; + + if (next != null) + { + if (_stopped) + { + // Abort next operation if IO is stopped + nextContinuation = next.Complete(NativeMethods.ERROR_OPERATION_ABORTED, 0); + } + else + { + nextContinuation = next.Invoke(); + + // operation went async + if (nextContinuation == null) + { + _runningOperation = next; + } + } + } + } + + continuation.Invoke(); + nextContinuation?.Invoke(); + } + + public void Dispose() + { + lock (this) + { + _stopped = true; + NativeMethods.HttpTryCancelIO(_handler); + } + } + + private AsyncReadOperation GetReadOperation() => + Interlocked.Exchange(ref _cachedAsyncReadOperation, null) ?? + new AsyncReadOperation(this); + + private AsyncWriteOperation GetWriteOperation() => + Interlocked.Exchange(ref _cachedAsyncWriteOperation, null) ?? + new AsyncWriteOperation(this); + + private AsyncFlushOperation GetFlushOperation() => + Interlocked.Exchange(ref _cachedAsyncFlushOperation, null) ?? + new AsyncFlushOperation(this); + + private void ReturnOperation(AsyncReadOperation operation) + { + Volatile.Write(ref _cachedAsyncReadOperation, operation); + } + + private void ReturnOperation(AsyncWriteOperation operation) + { + Volatile.Write(ref _cachedAsyncWriteOperation, operation); + } + + private void ReturnOperation(AsyncFlushOperation operation) + { + Volatile.Write(ref _cachedAsyncFlushOperation, operation); + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOOperation.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOOperation.cs new file mode 100644 index 0000000000..a2368b3987 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOOperation.cs @@ -0,0 +1,158 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Diagnostics; +using System.IO; +using System.Threading; +using System.Threading.Tasks.Sources; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + internal abstract class AsyncIOOperation: IValueTaskSource, IValueTaskSource + { + private static readonly Action CallbackCompleted = _ => { Debug.Assert(false, "Should not be invoked"); }; + + private Action _continuation; + private object _state; + private int _result; + + private Exception _exception; + + public ValueTaskSourceStatus GetStatus(short token) + { + if (ReferenceEquals(Volatile.Read(ref _continuation), null)) + { + return ValueTaskSourceStatus.Pending; + } + + return _exception != null ? ValueTaskSourceStatus.Succeeded : ValueTaskSourceStatus.Faulted; + } + + public void OnCompleted(Action continuation, object state, short token, ValueTaskSourceOnCompletedFlags flags) + { + if (_state != null) + { + ThrowMultipleContinuations(); + } + + _state = state; + + var previousContinuation = Interlocked.CompareExchange(ref _continuation, continuation, null); + + if (previousContinuation != null) + { + if (!ReferenceEquals(previousContinuation, CallbackCompleted)) + { + ThrowMultipleContinuations(); + } + + new AsyncContinuation(continuation, state).Invoke(); + } + } + + private static void ThrowMultipleContinuations() + { + throw new InvalidOperationException("Multiple awaiters are not allowed"); + } + + void IValueTaskSource.GetResult(short token) + { + var exception = _exception; + + ResetOperation(); + + if (exception != null) + { + throw exception; + } + } + + public int GetResult(short token) + { + var exception = _exception; + var result = _result; + + ResetOperation(); + + if (exception != null) + { + throw exception; + } + + return result; + } + + public AsyncContinuation? Invoke() + { + if (InvokeOperation(out var hr, out var bytes)) + { + return Complete(hr, bytes); + } + return null; + } + + protected abstract bool InvokeOperation(out int hr, out int bytes); + + public AsyncContinuation Complete(int hr, int bytes) + { + if (hr != NativeMethods.ERROR_OPERATION_ABORTED) + { + _result = bytes; + if (hr != NativeMethods.HR_OK) + { + _exception = new IOException("IO exception occurred", hr); + } + } + else + { + _result = -1; + _exception = null; + } + + AsyncContinuation asyncContinuation = default; + var continuation = Interlocked.CompareExchange(ref _continuation, CallbackCompleted, null); + if (continuation != null) + { + asyncContinuation = new AsyncContinuation(continuation, _state); + } + + FreeOperationResources(hr, bytes); + + return asyncContinuation; + } + + public virtual void FreeOperationResources(int hr, int bytes) { } + + protected virtual void ResetOperation() + { + _exception = null; + _result = int.MinValue; + _state = null; + _continuation = null; + } + + public readonly struct AsyncContinuation + { + public Action Continuation { get; } + public object State { get; } + + public AsyncContinuation(Action continuation, object state) + { + Continuation = continuation; + State = state; + } + + public void Invoke() + { + if (Continuation != null) + { + // TODO: use generic overload when code moved to be netcoreapp only + var continuation = Continuation; + var state = State; + ThreadPool.QueueUserWorkItem(_ => continuation(state)); + } + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncWriteOperationBase.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncWriteOperationBase.cs new file mode 100644 index 0000000000..480c34da66 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncWriteOperationBase.cs @@ -0,0 +1,119 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Buffers; +using Microsoft.AspNetCore.HttpSys.Internal; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + internal abstract class AsyncWriteOperationBase : AsyncIOOperation + { + private const int HttpDataChunkStackLimit = 128; // 16 bytes per HTTP_DATA_CHUNK + + private IntPtr _requestHandler; + private ReadOnlySequence _buffer; + private MemoryHandle[] _handles; + + public void Initialize(IntPtr requestHandler, ReadOnlySequence buffer) + { + _requestHandler = requestHandler; + _buffer = buffer; + } + + protected override unsafe bool InvokeOperation(out int hr, out int bytes) + { + if (_buffer.Length > int.MaxValue) + { + throw new InvalidOperationException($"Writes larger then {int.MaxValue} are not supported."); + } + + bool completionExpected; + var chunkCount = GetChunkCount(); + + var bufferLength = (int)_buffer.Length; + + if (chunkCount < HttpDataChunkStackLimit) + { + // To avoid stackoverflows, we will only stackalloc if the write size is less than the StackChunkLimit + // The stack size is IIS is by default 128/256 KB, so we are generous with this threshold. + var chunks = stackalloc HttpApiTypes.HTTP_DATA_CHUNK[chunkCount]; + hr = WriteSequence(chunkCount, _buffer, chunks, out completionExpected); + } + else + { + // Otherwise allocate the chunks on the heap. + var chunks = new HttpApiTypes.HTTP_DATA_CHUNK[chunkCount]; + fixed (HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks = chunks) + { + hr = WriteSequence(chunkCount, _buffer, pDataChunks, out completionExpected); + } + } + + bytes = bufferLength; + return !completionExpected; + } + + public override void FreeOperationResources(int hr, int bytes) + { + // Free the handles + foreach (var handle in _handles) + { + handle.Dispose(); + } + } + + protected override void ResetOperation() + { + base.ResetOperation(); + + _requestHandler = default; + _buffer = default; + _handles.AsSpan().Clear(); + } + + private int GetChunkCount() + { + if (_buffer.IsSingleSegment) + { + return 1; + } + + var count = 0; + + foreach (var _ in _buffer) + { + count++; + } + + return count; + } + + private unsafe int WriteSequence(int nChunks, ReadOnlySequence buffer, HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, out bool fCompletionExpected) + { + var currentChunk = 0; + + if (_handles == null || _handles.Length < nChunks) + { + _handles = new MemoryHandle[nChunks]; + } + + foreach (var readOnlyMemory in buffer) + { + ref var handle = ref _handles[currentChunk]; + ref var chunk = ref pDataChunks[currentChunk]; + handle = readOnlyMemory.Pin(); + + chunk.DataChunkType = HttpApiTypes.HTTP_DATA_CHUNK_TYPE.HttpDataChunkFromMemory; + chunk.fromMemory.BufferLength = (uint)readOnlyMemory.Length; + chunk.fromMemory.pBuffer = (IntPtr)handle.Pointer; + + currentChunk++; + } + + return WriteChunks(_requestHandler, nChunks, pDataChunks, out fCompletionExpected); + } + + protected abstract unsafe int WriteChunks(IntPtr requestHandler, int chunkCount, HttpApiTypes.HTTP_DATA_CHUNK* dataChunks, out bool completionExpected); + } +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/IAsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/IAsyncIOEngine.cs new file mode 100644 index 0000000000..99ae8d66bb --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/IAsyncIOEngine.cs @@ -0,0 +1,17 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Buffers; +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + internal interface IAsyncIOEngine: IDisposable + { + ValueTask ReadAsync(Memory memory); + ValueTask WriteAsync(ReadOnlySequence data); + ValueTask FlushAsync(); + void NotifyCompletion(int hr, int bytes); + } +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Initialize.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Initialize.cs new file mode 100644 index 0000000000..1d139e3395 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Initialize.cs @@ -0,0 +1,42 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + internal partial class WebSocketsAsyncIOEngine + { + internal class AsyncInitializeOperation : AsyncIOOperation + { + private readonly WebSocketsAsyncIOEngine _engine; + + private IntPtr _requestHandler; + + public AsyncInitializeOperation(WebSocketsAsyncIOEngine engine) + { + _engine = engine; + } + + public void Initialize(IntPtr requestHandler) + { + _requestHandler = requestHandler; + } + + protected override bool InvokeOperation(out int hr, out int bytes) + { + hr = NativeMethods.HttpFlushResponseBytes(_requestHandler, out var completionExpected); + bytes = 0; + return !completionExpected; + } + + protected override void ResetOperation() + { + base.ResetOperation(); + + _requestHandler = default; + _engine.ReturnOperation(this); + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Read.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Read.cs new file mode 100644 index 0000000000..66054f8564 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Read.cs @@ -0,0 +1,79 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Buffers; +using System.Runtime.InteropServices; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + internal partial class WebSocketsAsyncIOEngine + { + internal class WebSocketReadOperation : AsyncIOOperation + { + public static readonly NativeMethods.PFN_WEBSOCKET_ASYNC_COMPLETION ReadCallback = (httpContext, completionInfo, completionContext) => + { + var context = (WebSocketReadOperation)GCHandle.FromIntPtr(completionContext).Target; + + NativeMethods.HttpGetCompletionInfo(completionInfo, out var cbBytes, out var hr); + + var continuation = context.Complete(hr, cbBytes); + + continuation.Invoke(); + + return NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_PENDING; + }; + + private readonly WebSocketsAsyncIOEngine _engine; + private readonly GCHandle _thisHandle; + private MemoryHandle _inputHandle; + private IntPtr _requestHandler; + private Memory _memory; + + public WebSocketReadOperation(WebSocketsAsyncIOEngine engine) + { + _engine = engine; + _thisHandle = GCHandle.Alloc(this); + } + + protected override unsafe bool InvokeOperation(out int hr, out int bytes) + { + _inputHandle = _memory.Pin(); + + hr = NativeMethods.HttpWebsocketsReadBytes( + _requestHandler, + (byte*)_inputHandle.Pointer, + _memory.Length, + ReadCallback, + (IntPtr)_thisHandle, + out bytes, + out var completionExpected); + + return !completionExpected; + } + + public void Initialize(IntPtr requestHandler, Memory memory) + { + _requestHandler = requestHandler; + _memory = memory; + } + + public override void FreeOperationResources(int hr, int bytes) + { + _inputHandle.Dispose(); + } + + protected override void ResetOperation() + { + base.ResetOperation(); + + _memory = default; + _inputHandle.Dispose(); + _inputHandle = default; + _requestHandler = default; + + _engine.ReturnOperation(this); + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Write.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Write.cs new file mode 100644 index 0000000000..66631d7b63 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Write.cs @@ -0,0 +1,49 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Runtime.InteropServices; +using Microsoft.AspNetCore.HttpSys.Internal; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + internal partial class WebSocketsAsyncIOEngine + { + internal sealed class WebSocketWriteOperation : AsyncWriteOperationBase + { + + private static readonly NativeMethods.PFN_WEBSOCKET_ASYNC_COMPLETION WriteCallback = (httpContext, completionInfo, completionContext) => + { + var context = (WebSocketWriteOperation)GCHandle.FromIntPtr(completionContext).Target; + + NativeMethods.HttpGetCompletionInfo(completionInfo, out var cbBytes, out var hr); + + var continuation = context.Complete(hr, cbBytes); + continuation.Invoke(); + + return NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_PENDING; + }; + + private readonly WebSocketsAsyncIOEngine _engine; + private readonly GCHandle _thisHandle; + + public WebSocketWriteOperation(WebSocketsAsyncIOEngine engine) + { + _engine = engine; + _thisHandle = GCHandle.Alloc(this); + } + + protected override unsafe int WriteChunks(IntPtr requestHandler, int chunkCount, HttpApiTypes.HTTP_DATA_CHUNK* dataChunks, out bool completionExpected) + { + return NativeMethods.HttpWebsocketsWriteBytes(requestHandler, dataChunks, chunkCount, WriteCallback, (IntPtr)_thisHandle, out completionExpected); + } + + protected override void ResetOperation() + { + base.ResetOperation(); + + _engine.ReturnOperation(this); + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.cs new file mode 100644 index 0000000000..795a9311fe --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.cs @@ -0,0 +1,127 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Buffers; +using System.Threading; +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + internal partial class WebSocketsAsyncIOEngine: IAsyncIOEngine + { + private readonly IntPtr _handler; + + private bool _isInitialized; + + private AsyncInitializeOperation _initializationFlush; + + private WebSocketWriteOperation _cachedWebSocketWriteOperation; + + private WebSocketReadOperation _cachedWebSocketReadOperation; + + private AsyncInitializeOperation _cachedAsyncInitializeOperation; + + public WebSocketsAsyncIOEngine(IntPtr handler) + { + _handler = handler; + } + + public ValueTask ReadAsync(Memory memory) + { + ThrowIfNotInitialized(); + + var read = GetReadOperation(); + read.Initialize(_handler, memory); + read.Invoke(); + return new ValueTask(read, 0); + } + + public ValueTask WriteAsync(ReadOnlySequence data) + { + ThrowIfNotInitialized(); + + var write = GetWriteOperation(); + write.Initialize(_handler, data); + write.Invoke(); + return new ValueTask(write, 0); + } + + public ValueTask FlushAsync() + { + if (_isInitialized) + { + return new ValueTask(Task.CompletedTask); + } + + NativeMethods.HttpEnableWebsockets(_handler); + + var init = GetInitializeOperation(); + init.Initialize(_handler); + + var continuation = init.Invoke(); + + if (continuation != null) + { + _isInitialized = true; + } + else + { + _initializationFlush = init; + } + + return new ValueTask(init, 0); + } + + public void NotifyCompletion(int hr, int bytes) + { + _isInitialized = true; + + var init = _initializationFlush; + if (init == null) + { + throw new InvalidOperationException("Unexpected completion for WebSocket operation"); + } + + var continuation = init.Complete(hr, bytes); + + _initializationFlush = null; + + continuation.Invoke(); + } + + private void ThrowIfNotInitialized() + { + if (!_isInitialized) + { + throw new InvalidOperationException("Socket IO not initialized yet"); + } + } + + public void Dispose() + { + NativeMethods.HttpTryCancelIO(_handler); + } + + private WebSocketReadOperation GetReadOperation() => + Interlocked.Exchange(ref _cachedWebSocketReadOperation, null) ?? + new WebSocketReadOperation(this); + + private WebSocketWriteOperation GetWriteOperation() => + Interlocked.Exchange(ref _cachedWebSocketWriteOperation, null) ?? + new WebSocketWriteOperation(this); + + private AsyncInitializeOperation GetInitializeOperation() => + Interlocked.Exchange(ref _cachedAsyncInitializeOperation, null) ?? + new AsyncInitializeOperation(this); + + private void ReturnOperation(AsyncInitializeOperation operation) => + Volatile.Write(ref _cachedAsyncInitializeOperation, operation); + + private void ReturnOperation(WebSocketWriteOperation operation) => + Volatile.Write(ref _cachedWebSocketWriteOperation, operation); + + private void ReturnOperation(WebSocketReadOperation operation) => + Volatile.Write(ref _cachedWebSocketReadOperation, operation); + } +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/OutputProducer.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/OutputProducer.cs index fddd9db00a..af774afcb9 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/OutputProducer.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Server/OutputProducer.cs @@ -11,8 +11,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration { internal class OutputProducer { - private static readonly ArraySegment _emptyData = new ArraySegment(new byte[0]); - // This locks access to to all of the below fields private readonly object _contextLock = new object(); @@ -36,9 +34,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration public PipeReader Reader => _pipe.Reader; - public Task FlushAsync(CancellationToken cancellationToken = default(CancellationToken)) + public Task FlushAsync(CancellationToken cancellationToken) { - return WriteAsync(_emptyData, cancellationToken); + _pipe.Reader.CancelPendingRead(); + // Await backpressure + return FlushAsync(_pipe.Writer, cancellationToken); } public void Dispose() @@ -71,9 +71,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration } } - public Task WriteAsync( - ReadOnlyMemory buffer, - CancellationToken cancellationToken) + public Task WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken) { lock (_contextLock) { @@ -88,8 +86,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration return FlushAsync(_pipe.Writer, cancellationToken); } - private Task FlushAsync(PipeWriter pipeWriter, - CancellationToken cancellationToken) + private Task FlushAsync(PipeWriter pipeWriter, CancellationToken cancellationToken) { var awaitable = pipeWriter.FlushAsync(cancellationToken); if (awaitable.IsCompleted) diff --git a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj index acaebe6958..abe0a117f7 100644 --- a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj +++ b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) @@ -23,6 +23,7 @@ + diff --git a/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs index c79c8a462c..e9b7f9ad62 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs @@ -2,11 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Net; +using System.Collections.Generic; +using System.Linq; using System.Net.Http; -using System.Net.Sockets; -using System.Text; -using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Testing.xunit; using Xunit; @@ -70,55 +68,129 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] - public void ReadAndWriteSlowConnection() + public async Task ReadSetHeaderWrite() { - var ipHostEntry = Dns.GetHostEntry(_fixture.Client.BaseAddress.Host); + var body = "Body text"; + var content = new StringContent(body); + var response = await _fixture.Client.PostAsync("SetHeaderFromBody", content); + var responseText = await response.Content.ReadAsStringAsync(); - using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + Assert.Equal(body, response.Headers.GetValues("BodyAsString").Single()); + Assert.Equal(body, responseText); + } + + [ConditionalFact] + public async Task ReadAndWriteSlowConnection() + { + using (var connection = _fixture.CreateTestConnection()) { - foreach (var hostEntry in ipHostEntry.AddressList) - { - try - { - socket.Connect(hostEntry, _fixture.Client.BaseAddress.Port); - break; - } - catch (Exception) - { - // Exceptions can be thrown based on ipv6 support - } - } - - Assert.True(socket.Connected); - var testString = "hello world"; var request = $"POST /ReadAndWriteSlowConnection HTTP/1.0\r\n" + $"Content-Length: {testString.Length}\r\n" + "Host: " + "localhost\r\n" + - "\r\n"; - var bytes = 0; - var requestStringBytes = Encoding.ASCII.GetBytes(request); - var testStringBytes = Encoding.ASCII.GetBytes(testString); + "\r\n" + testString; - while ((bytes += socket.Send(requestStringBytes, bytes, 1, SocketFlags.None)) < requestStringBytes.Length) + foreach (var c in request) { + await connection.Send(c.ToString()); + await Task.Delay(10); } - bytes = 0; - while ((bytes += socket.Send(testStringBytes, bytes, 1, SocketFlags.None)) < testStringBytes.Length) + await connection.Receive( + "HTTP/1.1 200 OK", + ""); + await connection.ReceiveHeaders(); + + for (int i = 0; i < 100; i++) { - Thread.Sleep(100); + foreach (var c in testString) + { + await connection.Receive(c.ToString()); + } + await Task.Delay(10); + } + await connection.WaitForConnectionClose(); + } + } + + [ConditionalFact] + public async Task ReadAndWriteInterleaved() + { + using (var connection = _fixture.CreateTestConnection()) + { + var requestLength = 0; + var messages = new List(); + for (var i = 1; i < 100; i++) + { + var message = i + Environment.NewLine; + requestLength += message.Length; + messages.Add(message); } - var stringBuilder = new StringBuilder(); - var buffer = new byte[4096]; - int size; - while ((size = socket.Receive(buffer, buffer.Length, SocketFlags.None)) != 0) + await connection.Send( + "POST /ReadAndWriteEchoLines HTTP/1.0", + $"Content-Length: {requestLength}", + "Host: localhost", + "", + ""); + + await connection.Receive( + "HTTP/1.1 200 OK", + ""); + await connection.ReceiveHeaders(); + + foreach (var message in messages) { - stringBuilder.Append(Encoding.ASCII.GetString(buffer, 0, size)); + await connection.Send(message); + await connection.Receive(message); } - Assert.Contains(new StringBuilder().Insert(0, "hello world", 100).ToString(), stringBuilder.ToString()); + await connection.Send("\r\n"); + await connection.WaitForConnectionClose(); + } + } + + [ConditionalFact] + public async Task ConsumePartialBody() + { + using (var connection = _fixture.CreateTestConnection()) + { + var message = "Hello"; + await connection.Send( + "POST /ReadPartialBody HTTP/1.1", + $"Content-Length: {100}", + "Host: localhost", + "Connection: close", + "", + ""); + + await connection.Send(message); + + await connection.Receive( + "HTTP/1.1 200 OK", + ""); + + // This test can return both content length or chunked response + // depending on if appfunc managed to complete before write was + // issued + var headers = await connection.ReceiveHeaders(); + if (headers.Contains("Content-Length: 5")) + { + await connection.Receive("Hello"); + } + else + { + await connection.Receive( + "5", + message, + ""); + await connection.Receive( + "0", + "", + ""); + } + + await connection.WaitForConnectionClose(); } } } diff --git a/test/IISIntegration.FunctionalTests/Inprocess/WebSocketTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/WebSocketTests.cs new file mode 100644 index 0000000000..401da8c2b2 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Inprocess/WebSocketTests.cs @@ -0,0 +1,78 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Linq; +using System.Net.WebSockets; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class WebSocketsTests + { + private readonly string _webSocketUri; + + public WebSocketsTests(IISTestSiteFixture fixture) + { + _webSocketUri = fixture.BaseUri.Replace("http:", "ws:"); + } + + [ConditionalFact] + public async Task OnStartedCalledForWebSocket() + { + var cws = new ClientWebSocket(); + await cws.ConnectAsync(new Uri(_webSocketUri + "WebSocketLifetimeEvents"), default); + + await ReceiveMessage(cws, "OnStarting"); + await ReceiveMessage(cws, "Upgraded"); + } + + [ConditionalFact] + public async Task WebReadBeforeUpgrade() + { + var cws = new ClientWebSocket(); + await cws.ConnectAsync(new Uri(_webSocketUri + "WebReadBeforeUpgrade"), default); + + await ReceiveMessage(cws, "Yay"); + } + + [ConditionalFact] + public async Task CanSendAndReceieveData() + { + var cws = new ClientWebSocket(); + await cws.ConnectAsync(new Uri(_webSocketUri + "WebSocketEcho"), default); + + for (int i = 0; i < 1000; i++) + { + var mesage = i.ToString(); + await SendMessage(cws, mesage); + await ReceiveMessage(cws, mesage); + } + } + + private async Task SendMessage(ClientWebSocket webSocket, string message) + { + await webSocket.SendAsync(new ArraySegment(Encoding.ASCII.GetBytes(message)), WebSocketMessageType.Text, true, default); + } + + private async Task ReceiveMessage(ClientWebSocket webSocket, string expectedMessage) + { + var received = new byte[expectedMessage.Length]; + + var offset = 0; + WebSocketReceiveResult result; + do + { + result = await webSocket.ReceiveAsync(new ArraySegment(received, offset, received.Length - offset), default); + offset += result.Count; + } while (!result.EndOfMessage); + + Assert.Equal(expectedMessage, Encoding.ASCII.GetString(received)); + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs index 28ef7bd4c6..a097f3672d 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -40,6 +40,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public CancellationToken ShutdownToken { get; } public DeploymentResult DeploymentResult { get; } + public TestConnection CreateTestConnection() + { + return new TestConnection(Client.BaseAddress.Port); + } + public void Dispose() { _deployer.Dispose(); diff --git a/test/IISIntegration.FunctionalTests/Utilities/TestConnections.cs b/test/IISIntegration.FunctionalTests/Utilities/TestConnections.cs new file mode 100644 index 0000000000..5a722362c1 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Utilities/TestConnections.cs @@ -0,0 +1,212 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Net; +using System.Net.Sockets; +using System.Text; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + /// + /// Summary description for TestConnection + /// + public class TestConnection : IDisposable + { + private static readonly TimeSpan Timeout = TimeSpan.FromMinutes(1); + + private readonly bool _ownsSocket; + private readonly Socket _socket; + private readonly NetworkStream _stream; + private readonly StreamReader _reader; + + public TestConnection(int port) + : this(port, AddressFamily.InterNetwork) + { + } + + public TestConnection(int port, AddressFamily addressFamily) + : this(CreateConnectedLoopbackSocket(port, addressFamily), ownsSocket: true) + { + } + + public TestConnection(Socket socket) + : this(socket, ownsSocket: false) + { + } + + private TestConnection(Socket socket, bool ownsSocket) + { + _ownsSocket = ownsSocket; + _socket = socket; + _stream = new NetworkStream(_socket, ownsSocket: false); + _reader = new StreamReader(_stream, Encoding.ASCII); + } + + public Socket Socket => _socket; + + public StreamReader Reader => _reader; + + public void Dispose() + { + _stream.Dispose(); + + if (_ownsSocket) + { + _socket.Dispose(); + } + } + + public async Task Send(params string[] lines) + { + var text = string.Join("\r\n", lines); + var writer = new StreamWriter(_stream, Encoding.GetEncoding("iso-8859-1")); + for (var index = 0; index < text.Length; index++) + { + var ch = text[index]; + writer.Write(ch); + await writer.FlushAsync().ConfigureAwait(false); + // Re-add delay to help find socket input consumption bugs more consistently + //await Task.Delay(TimeSpan.FromMilliseconds(5)); + } + await writer.FlushAsync().ConfigureAwait(false); + await _stream.FlushAsync().ConfigureAwait(false); + } + + public async Task Receive(params string[] lines) + { + var expected = string.Join("\r\n", lines); + var actual = new char[expected.Length]; + var offset = 0; + + try + { + while (offset < expected.Length) + { + var data = new byte[expected.Length]; + var task = _reader.ReadAsync(actual, offset, actual.Length - offset); + if (!Debugger.IsAttached) + { + task = task.TimeoutAfter(Timeout); + } + var count = await task.ConfigureAwait(false); + if (count == 0) + { + break; + } + offset += count; + } + } + catch (TimeoutException ex) when (offset != 0) + { + throw new TimeoutException($"Did not receive a complete response within {Timeout}.{Environment.NewLine}{Environment.NewLine}" + + $"Expected:{Environment.NewLine}{expected}{Environment.NewLine}{Environment.NewLine}" + + $"Actual:{Environment.NewLine}{new string(actual, 0, offset)}{Environment.NewLine}", + ex); + } + + Assert.Equal(expected, new string(actual, 0, offset)); + } + + public async Task ReceiveStartsWith(string prefix, int maxLineLength = 1024) + { + var actual = new char[maxLineLength]; + var offset = 0; + + while (offset < maxLineLength) + { + // Read one char at a time so we don't read past the end of the line. + var task = _reader.ReadAsync(actual, offset, 1); + if (!Debugger.IsAttached) + { + Assert.True(task.Wait(4000), "timeout"); + } + var count = await task.ConfigureAwait(false); + if (count == 0) + { + break; + } + + Assert.True(count == 1); + offset++; + + if (actual[offset - 1] == '\n') + { + break; + } + } + + var actualLine = new string(actual, 0, offset); + Assert.StartsWith(prefix, actualLine); + } + + public async Task ReceiveHeaders(params string[] lines) + { + List headers = new List(); + string line; + do + { + line = await _reader.ReadLineAsync(); + headers.Add(line); + } while (line != ""); + + foreach (var s in lines) + { + Assert.Contains(s, headers); + } + + return headers.ToArray(); + } + + public Task WaitForConnectionClose() + { + var tcs = new TaskCompletionSource(); + var eventArgs = new SocketAsyncEventArgs(); + eventArgs.SetBuffer(new byte[128], 0, 128); + eventArgs.Completed += ReceiveAsyncCompleted; + eventArgs.UserToken = tcs; + + if (!_socket.ReceiveAsync(eventArgs)) + { + ReceiveAsyncCompleted(this, eventArgs); + } + + return tcs.Task; + } + + private void ReceiveAsyncCompleted(object sender, SocketAsyncEventArgs e) + { + var tcs = (TaskCompletionSource)e.UserToken; + if (e.BytesTransferred == 0) + { + tcs.SetResult(null); + } + else + { + tcs.SetException(new IOException( + $"Expected connection close, received data instead: \"{_reader.CurrentEncoding.GetString(e.Buffer, 0, e.BytesTransferred)}\"")); + } + } + + public static Socket CreateConnectedLoopbackSocket(int port, AddressFamily addressFamily) + { + if (addressFamily != AddressFamily.InterNetwork && addressFamily != AddressFamily.InterNetworkV6) + { + throw new ArgumentException($"TestConnection does not support address family of type {addressFamily}", nameof(addressFamily)); + } + + var socket = new Socket(addressFamily, SocketType.Stream, ProtocolType.Tcp); + var address = addressFamily == AddressFamily.InterNetworkV6 + ? IPAddress.IPv6Loopback + : IPAddress.Loopback; + socket.Connect(new IPEndPoint(address, port)); + return socket; + } + } +} diff --git a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj index c615d460ee..dd7cb4e794 100644 --- a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj +++ b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj @@ -4,17 +4,22 @@ $(StandardTestTfms) - + + + + + + diff --git a/test/WebSites/InProcessWebSite/Startup.WebSockets.cs b/test/WebSites/InProcessWebSite/Startup.WebSockets.cs new file mode 100644 index 0000000000..453f8db254 --- /dev/null +++ b/test/WebSites/InProcessWebSite/Startup.WebSockets.cs @@ -0,0 +1,154 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Net; +using System.Net.WebSockets; +using System.Reflection; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.IIS; +using Microsoft.AspNetCore.Server.IISIntegration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Primitives; +using Xunit; + +namespace IISTestSite +{ + public partial class Startup + { + + private void WebsocketRequest(IApplicationBuilder app) + { + app.Run(async context => + { + await context.Response.WriteAsync("test"); + }); + } + + private void WebReadBeforeUpgrade(IApplicationBuilder app) + { + app.Run(async context => { + + var singleByteArray = new byte[1]; + Assert.Equal(0, await context.Request.Body.ReadAsync(singleByteArray, 0, 1)); + + var ws = await Upgrade(context); + await SendMessages(ws, "Yay"); + }); + } + + private void WebSocketEcho(IApplicationBuilder app) + { + app.Run(async context => + { + var ws = await Upgrade(context); + + var appLifetime = app.ApplicationServices.GetRequiredService(); + + await Echo(ws, appLifetime.ApplicationStopping); + }); + } + + private void WebSocketLifetimeEvents(IApplicationBuilder app) + { + app.Run(async context => { + + var messages = new List(); + + context.Response.OnStarting(() => { + context.Response.Headers["custom-header"] = "value"; + messages.Add("OnStarting"); + return Task.CompletedTask; + }); + + var ws = await Upgrade(context); + messages.Add("Upgraded"); + + await SendMessages(ws, messages.ToArray()); + }); + } + + private static async Task SendMessages(WebSocket webSocket, params string[] messages) + { + foreach (var message in messages) + { + await webSocket.SendAsync(new ArraySegment(Encoding.ASCII.GetBytes(message)), WebSocketMessageType.Text, true, CancellationToken.None); + } + } + + private static async Task Upgrade(HttpContext context) + { + var upgradeFeature = context.Features.Get(); + + // Generate WebSocket response headers + string key = context.Request.Headers[Constants.Headers.SecWebSocketKey].ToString(); + var responseHeaders = HandshakeHelpers.GenerateResponseHeaders(key); + foreach (var headerPair in responseHeaders) + { + context.Response.Headers[headerPair.Key] = headerPair.Value; + } + + // Upgrade the connection + Stream opaqueTransport = await upgradeFeature.UpgradeAsync(); + + // Get the WebSocket object + var ws = WebSocketProtocol.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2)); + return ws; + } + + private async Task Echo(WebSocket webSocket, CancellationToken token) + { + var buffer = new byte[1024 * 4]; + var result = await webSocket.ReceiveAsync(new ArraySegment(buffer), token); + bool closeFromServer = false; + string closeFromServerCmd = "CloseFromServer"; + int closeFromServerLength = closeFromServerCmd.Length; + + while (!result.CloseStatus.HasValue && !token.IsCancellationRequested && !closeFromServer) + { + if (result.Count == closeFromServerLength && + Encoding.ASCII.GetString(buffer).Substring(0, result.Count) == closeFromServerCmd) + { + // The client sent "CloseFromServer" text message to request the server to close (a test scenario). + closeFromServer = true; + } + else + { + await webSocket.SendAsync(new ArraySegment(buffer, 0, result.Count), result.MessageType, result.EndOfMessage, token); + result = await webSocket.ReceiveAsync(new ArraySegment(buffer), token); + } + } + + if (result.CloseStatus.HasValue) + { + // Client-initiated close handshake + await webSocket.CloseAsync(result.CloseStatus.Value, result.CloseStatusDescription, CancellationToken.None); + } + else + { + // Server-initiated close handshake due to either of the two conditions: + // (1) The applicaton host is performing a graceful shutdown. + // (2) The client sent "CloseFromServer" text message to request the server to close (a test scenario). + await webSocket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, closeFromServerCmd, CancellationToken.None); + + // The server has sent the Close frame. + // Stop sending but keep receiving until we get the Close frame from the client. + while (!result.CloseStatus.HasValue) + { + result = await webSocket.ReceiveAsync(new ArraySegment(buffer), CancellationToken.None); + } + } + } + } +} diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index 23cec82f79..a872c7bc1b 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -2,25 +2,30 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Net; +using System.Net.WebSockets; using System.Reflection; using System.Text; using System.Threading; using System.Threading.Tasks; +using IISIntegration.FunctionalTests; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.IIS; using Microsoft.AspNetCore.Server.IISIntegration; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Primitives; using Xunit; namespace IISTestSite { - public class Startup + public partial class Startup { public void Configure(IApplicationBuilder app) { @@ -369,8 +374,7 @@ namespace IISTestSite private void ReadAndWriteEcho(IApplicationBuilder app) { - app.Run(async context => - { + app.Run(async context => { var readBuffer = new byte[4096]; var result = await context.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); while (result != 0) @@ -381,6 +385,51 @@ namespace IISTestSite }); } + private void ReadAndWriteEchoLines(IApplicationBuilder app) + { + app.Run(async context => { + //Send headers + await context.Response.Body.FlushAsync(); + + var reader = new StreamReader(context.Request.Body); + while (!reader.EndOfStream) + { + var line = await reader.ReadLineAsync(); + if (line == "") + { + return; + } + await context.Response.WriteAsync(line + Environment.NewLine); + await context.Response.Body.FlushAsync(); + } + }); + } + + private void ReadPartialBody(IApplicationBuilder app) + { + app.Run(async context => { + var data = new byte[5]; + var count = 0; + do + { + count += await context.Request.Body.ReadAsync(data, count, data.Length - count); + } while (count != data.Length); + await context.Response.Body.WriteAsync(data, 0, data.Length); + }); + } + + private void SetHeaderFromBody(IApplicationBuilder app) + { + app.Run(async context => { + using (var reader = new StreamReader(context.Request.Body)) + { + var value = await reader.ReadToEndAsync(); + context.Response.Headers["BodyAsString"] = value; + await context.Response.WriteAsync(value); + } + }); + } + private void ReadAndWriteEchoTwice(IApplicationBuilder app) { app.Run(async context => @@ -416,14 +465,6 @@ namespace IISTestSite } } - private void WebsocketRequest(IApplicationBuilder app) - { - app.Run(async context => - { - await context.Response.WriteAsync("test"); - }); - } - private void ReadAndWriteCopyToAsync(IApplicationBuilder app) { app.Run(async context => diff --git a/test/WebSites/StressTestWebSite/Properties/launchSettings.json b/test/WebSites/StressTestWebSite/Properties/launchSettings.json index 6d5ce43f73..aa0472a2dd 100644 --- a/test/WebSites/StressTestWebSite/Properties/launchSettings.json +++ b/test/WebSites/StressTestWebSite/Properties/launchSettings.json @@ -15,7 +15,7 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)" @@ -27,7 +27,7 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)" diff --git a/test/WebSites/StressTestWebSite/Startup.cs b/test/WebSites/StressTestWebSite/Startup.cs index be0969ec77..41eea8728c 100644 --- a/test/WebSites/StressTestWebSite/Startup.cs +++ b/test/WebSites/StressTestWebSite/Startup.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using System.Threading; using System.Text; using System.Net.WebSockets; +using IISIntegration.FunctionalTests; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; diff --git a/test/WebSites/StressTestWebSite/StressTestWebSite.csproj b/test/WebSites/StressTestWebSite/StressTestWebSite.csproj index 3566143fcd..8c1b6b08e7 100644 --- a/test/WebSites/StressTestWebSite/StressTestWebSite.csproj +++ b/test/WebSites/StressTestWebSite/StressTestWebSite.csproj @@ -1,4 +1,4 @@ - + @@ -10,6 +10,10 @@ + + + + diff --git a/test/WebSites/StressTestWebSite/WebSockets/Constants.cs b/test/WebSites/shared/WebSockets/Constants.cs similarity index 93% rename from test/WebSites/StressTestWebSite/WebSockets/Constants.cs rename to test/WebSites/shared/WebSockets/Constants.cs index bcf5462558..3a27d854f5 100644 --- a/test/WebSites/StressTestWebSite/WebSockets/Constants.cs +++ b/test/WebSites/shared/WebSockets/Constants.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace ANCMStressTestApp +namespace IISIntegration.FunctionalTests { public static class Constants { diff --git a/test/WebSites/StressTestWebSite/WebSockets/HandshakeHelpers.cs b/test/WebSites/shared/WebSockets/HandshakeHelpers.cs similarity index 97% rename from test/WebSites/StressTestWebSite/WebSockets/HandshakeHelpers.cs rename to test/WebSites/shared/WebSockets/HandshakeHelpers.cs index 331f415013..d477f9113b 100644 --- a/test/WebSites/StressTestWebSite/WebSockets/HandshakeHelpers.cs +++ b/test/WebSites/shared/WebSockets/HandshakeHelpers.cs @@ -6,9 +6,8 @@ using System.Collections.Generic; using System.Security.Cryptography; using System.Text; -namespace ANCMStressTestApp +namespace IISIntegration.FunctionalTests { - // Removed all the internal static class HandshakeHelpers { public static IEnumerable> GenerateResponseHeaders(string key) From 7cb625c25ce0971ac488fff1504711002a1cc477 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 13 May 2018 14:11:07 -0700 Subject: [PATCH 019/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 72 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index b0618b5a9b..3c87fd414e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,48 +4,48 @@ 0.10.13 - 2.2.0-preview1-17049 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 0.6.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 + 2.2.0-preview1-17051 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 0.6.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 15.6.82 15.6.82 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 - 2.2.0-preview1-34144 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 2.0.0 2.1.0-rc1 - 2.2.0-preview1-26424-04 - 2.2.0-preview1-34144 + 2.2.0-preview1-26509-06 + 2.2.0-preview1-34184 15.6.1 2.0.3 - 4.5.0-preview3-26423-04 - 4.5.0-preview3-26423-04 - 4.5.0-preview3-26423-04 - 4.5.0-preview3-26423-04 - 4.5.0-preview3-26423-04 - 4.5.0-preview3-26423-04 - 4.5.0-preview3-26423-04 + 4.6.0-preview1-26508-04 + 4.6.0-preview1-26508-04 + 4.6.0-preview1-26508-04 + 4.6.0-preview1-26508-04 + 4.6.0-preview1-26508-04 + 4.6.0-preview1-26508-04 + 4.6.0-preview1-26508-04 9.0.1 2.3.1 2.4.0-beta.1.build3945 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index eb63d54c23..56263a26fc 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17049 -commithash:9c4fefdcd2b950f8b6da5aa3784fe200eb0664c2 +version:2.2.0-preview1-17051 +commithash:253c3a480063bc3abaa5cde42f6e27b58457ef9b From 47f28fa6fabddd9c64842100793fe4cd9ffb653a Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 14 May 2018 02:57:34 -0700 Subject: [PATCH 020/363] Re-enable API check --- Directory.Build.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3bb2bcbca8..46a1159f78 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,8 +16,6 @@ true true true - - false From 0e7effa3760fc0905de67660fc8d0f473b06e6d5 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 15 May 2018 08:02:20 -0700 Subject: [PATCH 021/363] Disable websocket tests on Windows 7 (#838) --- test/IISIntegration.FunctionalTests/Inprocess/WebSocketTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/IISIntegration.FunctionalTests/Inprocess/WebSocketTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/WebSocketTests.cs index 401da8c2b2..2d97455d31 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/WebSocketTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/WebSocketTests.cs @@ -13,6 +13,7 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "No supported on this platform")] public class WebSocketsTests { private readonly string _webSocketUri; From 34c797a46b28569415db5f3ab10b2c762489a852 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 15 May 2018 15:24:17 -0700 Subject: [PATCH 022/363] Move in-process server implementation to IIS.Server (#837) --- build/dependencies.props | 2 +- .../NativeIISSample/NativeIISSample.csproj | 4 +- samples/NativeIISSample/Startup.cs | 5 +- .../AssemblyInfo.cs | 7 + .../Core}/DuplexStream.cs | 2 +- .../Core}/IISConfigurationData.cs | 2 +- .../Core}/IISHttpContext.FeatureCollection.cs | 4 +- .../Core}/IISHttpContext.Features.cs | 2 +- .../IISHttpContext.IHttpConnectionFeature.cs | 2 +- ...tpContext.IHttpRequestIdentifierFeature.cs | 2 +- .../Core}/IISHttpContext.ReadWrite.cs | 2 +- .../Core}/IISHttpContext.cs | 9 +- .../Core}/IISHttpContextOfT.cs | 4 +- .../Core}/IISHttpRequestBody.cs | 2 +- .../Core}/IISHttpResponseBody.cs | 2 +- .../Core}/IISHttpServer.cs | 12 +- .../Core}/IISServerAuthenticationHandler.cs | 2 +- .../Core}/IISServerSetupFilter.cs | 2 +- .../Core}/IO/AsyncIOEngine.Flush.cs | 2 +- .../Core}/IO/AsyncIOEngine.Read.cs | 2 +- .../Core}/IO/AsyncIOEngine.Write.cs | 2 +- .../Core}/IO/AsyncIOEngine.cs | 2 +- .../Core}/IO/AsyncIOOperation.cs | 2 +- .../Core}/IO/AsyncWriteOperationBase.cs | 2 +- .../Core}/IO/IAsyncIOEngine.cs | 2 +- .../IO/WebSocketsAsyncIOEngine.Initialize.cs | 2 +- .../Core}/IO/WebSocketsAsyncIOEngine.Read.cs | 2 +- .../Core}/IO/WebSocketsAsyncIOEngine.Write.cs | 2 +- .../Core}/IO/WebSocketsAsyncIOEngine.cs | 2 +- .../Core}/OutputProducer.cs | 2 +- .../HttpContextExtensions.cs} | 2 +- .../IISDefaults.cs | 12 + .../IISServerOptions.cs | 26 ++ .../IServerVariableFeature.cs} | 0 .../Microsoft.AspNetCore.Server.IIS.csproj | 60 ++-- .../NativeMethods.cs | 274 ++++++++++++++++++ .../WebHostBuilderIISExtensions.cs | 50 ++++ ...ft.AspNetCore.Server.IISIntegration.csproj | 5 +- .../NativeMethods.cs | 256 ---------------- .../WebHostBuilderIISExtensions.cs | 25 -- .../IISIntegration.FunctionalTests.csproj | 2 +- .../Utilities/IISTestSiteFixture.cs | 7 +- .../InProcessWebSite/InProcessWebSite.csproj | 4 +- test/WebSites/InProcessWebSite/Program.cs | 2 +- .../InProcessWebSite/Startup.WebSockets.cs | 7 - test/WebSites/InProcessWebSite/Startup.cs | 16 +- .../OverriddenServerWebSite.csproj | 6 +- .../OverriddenServerWebSite/Program.cs | 2 +- 48 files changed, 449 insertions(+), 398 deletions(-) create mode 100644 src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/DuplexStream.cs (97%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IISConfigurationData.cs (92%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IISHttpContext.FeatureCollection.cs (98%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IISHttpContext.Features.cs (99%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IISHttpContext.IHttpConnectionFeature.cs (97%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IISHttpContext.IHttpRequestIdentifierFeature.cs (96%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IISHttpContext.ReadWrite.cs (99%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IISHttpContext.cs (98%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IISHttpContextOfT.cs (97%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IISHttpRequestBody.cs (97%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IISHttpResponseBody.cs (97%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IISHttpServer.cs (95%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IISServerAuthenticationHandler.cs (97%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IISServerSetupFilter.cs (95%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IO/AsyncIOEngine.Flush.cs (95%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IO/AsyncIOEngine.Read.cs (97%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IO/AsyncIOEngine.Write.cs (95%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IO/AsyncIOEngine.cs (99%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IO/AsyncIOOperation.cs (98%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IO/AsyncWriteOperationBase.cs (98%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IO/IAsyncIOEngine.cs (90%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IO/WebSocketsAsyncIOEngine.Initialize.cs (95%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IO/WebSocketsAsyncIOEngine.Read.cs (98%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IO/WebSocketsAsyncIOEngine.Write.cs (97%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/IO/WebSocketsAsyncIOEngine.cs (98%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/Server => Microsoft.AspNetCore.Server.IIS/Core}/OutputProducer.cs (98%) rename src/{Microsoft.AspNetCore.Server.IISIntegration/IISHttpContextExtensions.cs => Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs} (96%) create mode 100644 src/Microsoft.AspNetCore.Server.IIS/IISDefaults.cs create mode 100644 src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs rename src/{Microsoft.AspNetCore.Server.IISIntegration/IServerVariablesFeature.cs => Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs} (100%) create mode 100644 src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs create mode 100644 src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs diff --git a/build/dependencies.props b/build/dependencies.props index 3c87fd414e..f454a5cd9b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/samples/NativeIISSample/NativeIISSample.csproj b/samples/NativeIISSample/NativeIISSample.csproj index 9c88fbe560..7785cbb5ac 100644 --- a/samples/NativeIISSample/NativeIISSample.csproj +++ b/samples/NativeIISSample/NativeIISSample.csproj @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/samples/NativeIISSample/Startup.cs b/samples/NativeIISSample/Startup.cs index 1a41f5a848..0744ef4cf1 100644 --- a/samples/NativeIISSample/Startup.cs +++ b/samples/NativeIISSample/Startup.cs @@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.IIS; -using Microsoft.AspNetCore.Server.IISIntegration; namespace NativeIISSample { @@ -42,7 +41,7 @@ namespace NativeIISSample await context.Response.WriteAsync(Environment.NewLine); await context.Response.WriteAsync("User: " + context.User.Identity.Name + Environment.NewLine); - var scheme = await authSchemeProvider.GetSchemeAsync(IISDefaults.AuthenticationScheme); + var scheme = await authSchemeProvider.GetSchemeAsync(IISServerDefaults.AuthenticationScheme); await context.Response.WriteAsync("DisplayName: " + scheme?.DisplayName + Environment.NewLine); await context.Response.WriteAsync(Environment.NewLine); @@ -99,7 +98,7 @@ namespace NativeIISSample public static void Main(string[] args) { var host = new WebHostBuilder() - .UseIISIntegration() + .UseIIS() .UseStartup() .Build(); diff --git a/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs new file mode 100644 index 0000000000..f08839f842 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs @@ -0,0 +1,7 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.IISIntegration.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/DuplexStream.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/DuplexStream.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs index f8ebd8d792..46cda59046 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/DuplexStream.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs @@ -6,7 +6,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { // TODO redudant file, remove // See https://github.com/aspnet/IISIntegration/issues/426 diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISConfigurationData.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs similarity index 92% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISConfigurationData.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs index 76910ca9d3..8f1f473766 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISConfigurationData.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs @@ -3,7 +3,7 @@ using System.Runtime.InteropServices; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { [StructLayout(LayoutKind.Sequential)] internal unsafe struct IISConfigurationData diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.FeatureCollection.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.FeatureCollection.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs index 1acdc3e36d..60f651acdf 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.FeatureCollection.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs @@ -6,16 +6,16 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Net; using System.Security.Claims; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Features.Authentication; +using Microsoft.AspNetCore.Server.IIS.Core.IO; using Microsoft.AspNetCore.WebUtilities; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { internal partial class IISHttpContext : IFeatureCollection, IHttpRequestFeature, diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.Features.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.Features.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs index 6733ba74c5..0064899340 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.Features.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { internal partial class IISHttpContext { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.IHttpConnectionFeature.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.IHttpConnectionFeature.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs index d5a72cf013..40b70a2b90 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.IHttpConnectionFeature.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs @@ -5,7 +5,7 @@ using System.Globalization; using System.Net; using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { internal partial class IISHttpContext : IHttpConnectionFeature { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.IHttpRequestIdentifierFeature.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs similarity index 96% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.IHttpRequestIdentifierFeature.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs index 68112f607c..2d735a7d8f 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.IHttpRequestIdentifierFeature.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { internal partial class IISHttpContext : IHttpRequestIdentifierFeature { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.ReadWrite.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.ReadWrite.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.ReadWrite.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.ReadWrite.cs index 839eefc1e9..740c2a2d3e 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.ReadWrite.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.ReadWrite.cs @@ -6,7 +6,7 @@ using System.Buffers; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { internal partial class IISHttpContext { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs index 92ccdf3326..2668fb1485 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContext.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs @@ -5,7 +5,6 @@ using System; using System.Buffers; using System.Collections.Generic; using System.Diagnostics; -using System.Globalization; using System.IO; using System.IO.Pipelines; using System.Net; @@ -18,10 +17,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpSys.Internal; +using Microsoft.AspNetCore.Server.IIS.Core.IO; using Microsoft.AspNetCore.WebUtilities; -using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { internal abstract partial class IISHttpContext : NativeRequestContext, IDisposable { @@ -32,7 +31,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration protected readonly IntPtr _pInProcessHandler; - private readonly IISOptions _options; + private readonly IISServerOptions _options; private volatile bool _hasResponseStarted; private volatile bool _hasRequestReadingStarted; @@ -64,7 +63,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration private const string BasicString = "Basic"; - internal unsafe IISHttpContext(MemoryPool memoryPool, IntPtr pInProcessHandler, IISOptions options, IISHttpServer server) + internal unsafe IISHttpContext(MemoryPool memoryPool, IntPtr pInProcessHandler, IISServerOptions options, IISHttpServer server) : base((HttpApiTypes.HTTP_REQUEST*)NativeMethods.HttpGetRawRequest(pInProcessHandler)) { _memoryPool = memoryPool; diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContextOfT.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContextOfT.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs index e3152802bc..f24c4fe93e 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpContextOfT.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs @@ -8,13 +8,13 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting.Server; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { internal class IISHttpContextOfT : IISHttpContext { private readonly IHttpApplication _application; - public IISHttpContextOfT(MemoryPool memoryPool, IHttpApplication application, IntPtr pInProcessHandler, IISOptions options, IISHttpServer server) + public IISHttpContextOfT(MemoryPool memoryPool, IHttpApplication application, IntPtr pInProcessHandler, IISServerOptions options, IISHttpServer server) : base(memoryPool, pInProcessHandler, options, server) { _application = application; diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpRequestBody.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpRequestBody.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpRequestBody.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpRequestBody.cs index 87d7742dfa..d4f6241f98 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpRequestBody.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpRequestBody.cs @@ -6,7 +6,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { internal class IISHttpRequestBody : Stream { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpResponseBody.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpResponseBody.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpResponseBody.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpResponseBody.cs index f850994a4a..76e913bb4b 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpResponseBody.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpResponseBody.cs @@ -6,7 +6,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { internal class IISHttpResponseBody : Stream { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpServer.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs similarity index 95% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpServer.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs index 49518926ce..df6b9a20b6 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpServer.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs @@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Options; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { internal class IISHttpServer : IServer { @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration private GCHandle _httpServerHandle; private readonly IApplicationLifetime _applicationLifetime; private readonly IAuthenticationSchemeProvider _authentication; - private readonly IISOptions _options; + private readonly IISServerOptions _options; private volatile int _stopping; private bool Stopping => _stopping == 1; @@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration return _websocketAvailable.Value; } - public IISHttpServer(IApplicationLifetime applicationLifetime, IAuthenticationSchemeProvider authentication, IOptions options) + public IISHttpServer(IApplicationLifetime applicationLifetime, IAuthenticationSchemeProvider authentication, IOptions options) { _applicationLifetime = applicationLifetime; _authentication = authentication; @@ -64,7 +64,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration if (_options.ForwardWindowsAuthentication) { - authentication.AddScheme(new AuthenticationScheme(IISDefaults.AuthenticationScheme, _options.AuthenticationDisplayName, typeof(IISServerAuthenticationHandler))); + authentication.AddScheme(new AuthenticationScheme(IISServerDefaults.AuthenticationScheme, _options.AuthenticationDisplayName, typeof(IISServerAuthenticationHandler))); } } @@ -197,10 +197,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration { private readonly IHttpApplication _application; private readonly MemoryPool _memoryPool; - private readonly IISOptions _options; + private readonly IISServerOptions _options; private readonly IISHttpServer _server; - public IISContextFactory(MemoryPool memoryPool, IHttpApplication application, IISOptions options, IISHttpServer server) + public IISContextFactory(MemoryPool memoryPool, IHttpApplication application, IISServerOptions options, IISHttpServer server) { _application = application; _memoryPool = memoryPool; diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISServerAuthenticationHandler.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISServerAuthenticationHandler.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs index 587490bf50..7031df34ea 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISServerAuthenticationHandler.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { public class IISServerAuthenticationHandler : IAuthenticationHandler { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISServerSetupFilter.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs similarity index 95% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISServerSetupFilter.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs index 787c979c96..f3c3613565 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISServerSetupFilter.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { internal class IISServerSetupFilter : IStartupFilter { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Flush.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs similarity index 95% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Flush.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs index f0b30dcf2f..1187c5b3f2 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Flush.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core.IO { internal partial class AsyncIOEngine { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Read.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Read.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs index 207ce9efc4..00c6709453 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Read.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs @@ -4,7 +4,7 @@ using System; using System.Buffers; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core.IO { internal partial class AsyncIOEngine { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Write.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs similarity index 95% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Write.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs index 8bd708797d..72be9f107b 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.Write.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNetCore.HttpSys.Internal; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core.IO { internal partial class AsyncIOEngine { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs similarity index 99% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs index dbb8bd2331..614367255a 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOEngine.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs @@ -8,7 +8,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core.IO { internal partial class AsyncIOEngine : IAsyncIOEngine { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOOperation.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOOperation.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs index a2368b3987..a7bea2e746 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncIOOperation.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs @@ -7,7 +7,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks.Sources; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core.IO { internal abstract class AsyncIOOperation: IValueTaskSource, IValueTaskSource { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncWriteOperationBase.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncWriteOperationBase.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs index 480c34da66..3be67095fd 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/AsyncWriteOperationBase.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs @@ -5,7 +5,7 @@ using System; using System.Buffers; using Microsoft.AspNetCore.HttpSys.Internal; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core.IO { internal abstract class AsyncWriteOperationBase : AsyncIOOperation { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/IAsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs similarity index 90% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/IAsyncIOEngine.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs index 99ae8d66bb..6e6896b8c4 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/IAsyncIOEngine.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs @@ -5,7 +5,7 @@ using System; using System.Buffers; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core.IO { internal interface IAsyncIOEngine: IDisposable { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Initialize.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs similarity index 95% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Initialize.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs index 1d139e3395..10e1f0da7d 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Initialize.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core.IO { internal partial class WebSocketsAsyncIOEngine { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Read.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Read.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs index 66054f8564..413fa77703 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Read.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs @@ -5,7 +5,7 @@ using System; using System.Buffers; using System.Runtime.InteropServices; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core.IO { internal partial class WebSocketsAsyncIOEngine { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Write.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs similarity index 97% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Write.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs index 66631d7b63..3eff3bba46 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.Write.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs @@ -5,7 +5,7 @@ using System; using System.Runtime.InteropServices; using Microsoft.AspNetCore.HttpSys.Internal; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core.IO { internal partial class WebSocketsAsyncIOEngine { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs index 795a9311fe..0c04523cb0 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/IO/WebSocketsAsyncIOEngine.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs @@ -6,7 +6,7 @@ using System.Buffers; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core.IO { internal partial class WebSocketsAsyncIOEngine: IAsyncIOEngine { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/OutputProducer.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs similarity index 98% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Server/OutputProducer.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs index af774afcb9..4bf1816329 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Server/OutputProducer.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs @@ -7,7 +7,7 @@ using System.IO.Pipelines; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.IISIntegration +namespace Microsoft.AspNetCore.Server.IIS.Core { internal class OutputProducer { diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISHttpContextExtensions.cs b/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs similarity index 96% rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISHttpContextExtensions.cs rename to src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs index fd72e9d00f..9c0092d3fe 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/IISHttpContextExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Server.IIS /// /// Extensions to that enable access to IIS features. /// - public static class IISHttpContextExtensions + public static class HttpContextExtensions { /// /// Gets the value of a server variable for the current request. diff --git a/src/Microsoft.AspNetCore.Server.IIS/IISDefaults.cs b/src/Microsoft.AspNetCore.Server.IIS/IISDefaults.cs new file mode 100644 index 0000000000..5be4a086f8 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/IISDefaults.cs @@ -0,0 +1,12 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +namespace Microsoft.AspNetCore.Server.IIS +{ + public class IISServerDefaults + { + public static readonly string AuthenticationScheme = "Windows"; + public const string Negotiate = "Negotiate"; + public const string Ntlm = "NTLM"; + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs b/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs new file mode 100644 index 0000000000..feed9180a5 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs @@ -0,0 +1,26 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +namespace Microsoft.AspNetCore.Builder +{ + public class IISServerOptions + { + /// + /// If true the server should set HttpContext.User. If false the server will only provide an + /// identity when explicitly requested by the AuthenticationScheme. + /// Note Windows Authentication must also be enabled in IIS for this to work. + /// + public bool AutomaticAuthentication { get; set; } = true; + + /// + /// Sets the display name shown to users on login pages. The default is null. + /// + public string AuthenticationDisplayName { get; set; } + + /// + /// Used to indicate if the authentication handler should be registered. This is only done if ANCM indicates + /// IIS has a non-anonymous authentication enabled, or for back compat with ANCMs that did not provide this information. + /// + internal bool ForwardWindowsAuthentication { get; set; } = true; + } +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IServerVariablesFeature.cs b/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/IServerVariablesFeature.cs rename to src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index 51cc16d958..ed8b42bc55 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -1,56 +1,36 @@ - - - + - netcoreapp2.1 + netstandard2.0 Microsoft.AspNetCore.Server.IIS Provides support for hosting ASP.NET Core in IIS using the AspNetCoreModule. false - false - false - false - false - true - $(PackageId).nuspec - true + $(NoWarn);CS1591 + true + aspnetcore;iis + true + - + + + + + + + + + - - - - id=$(PackageId); - tfm=$(TargetFramework); - tfmGroup=$(TargetFrameworkIdentifier)$(_TargetFrameworkVersionWithoutV); - configuration=$(Configuration); - copyright=$(Copyright); - author=$(Authors); - licenseUrl=$(PackageLicenseUrl); - iconUrl=$(PackageIconUrl); - projectUrl=$(PackageProjectUrl); - repositoryUrl=$(RepositoryUrl); - repositoryType=$(RepositoryType); - repositoryCommit=$(RepositoryCommit); - version=$(PackageVersion); - description=$(Description); - serviceable=$([MSBuild]::ValueOrDefault('$(Serviceable)', 'false')); - - - - - - - - - - + + + + diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs new file mode 100644 index 0000000000..a736edb2ca --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs @@ -0,0 +1,274 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Runtime.InteropServices; +using Microsoft.AspNetCore.HttpSys.Internal; +using Microsoft.AspNetCore.Server.IIS.Core; + +namespace Microsoft.AspNetCore.Server.IIS +{ + internal static class NativeMethods + { + internal const int HR_OK = 0; + internal const int ERROR_NOT_FOUND = unchecked((int)0x80070490); + internal const int ERROR_OPERATION_ABORTED = unchecked((int)0x800703E3); + + private const string KERNEL32 = "kernel32.dll"; + + private const string AspNetCoreModuleDll = "aspnetcorerh.dll"; + + [DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)] + + public static extern bool CloseHandle(IntPtr handle); + + + [DllImport("kernel32.dll")] + private static extern IntPtr GetModuleHandle(string lpModuleName); + + public static bool IsAspNetCoreModuleLoaded() + { + return GetModuleHandle(AspNetCoreModuleDll) != IntPtr.Zero; + } + + public enum REQUEST_NOTIFICATION_STATUS + { + RQ_NOTIFICATION_CONTINUE, + RQ_NOTIFICATION_PENDING, + RQ_NOTIFICATION_FINISH_REQUEST + } + + public delegate REQUEST_NOTIFICATION_STATUS PFN_REQUEST_HANDLER(IntPtr pInProcessHandler, IntPtr pvRequestContext); + public delegate bool PFN_SHUTDOWN_HANDLER(IntPtr pvRequestContext); + public delegate REQUEST_NOTIFICATION_STATUS PFN_ASYNC_COMPLETION(IntPtr pvManagedHttpContext, int hr, int bytes); + public delegate REQUEST_NOTIFICATION_STATUS PFN_WEBSOCKET_ASYNC_COMPLETION(IntPtr pInProcessHandler, IntPtr completionInfo, IntPtr pvCompletionContext); + + [DllImport(AspNetCoreModuleDll)] + private static extern int http_post_completion(IntPtr pInProcessHandler, int cbBytes); + + [DllImport(AspNetCoreModuleDll)] + private static extern int http_set_completion_status(IntPtr pInProcessHandler, REQUEST_NOTIFICATION_STATUS rquestNotificationStatus); + + [DllImport(AspNetCoreModuleDll)] + private static extern void http_indicate_completion(IntPtr pInProcessHandler, REQUEST_NOTIFICATION_STATUS notificationStatus); + + [DllImport(AspNetCoreModuleDll)] + private static extern void register_callbacks(PFN_REQUEST_HANDLER request_callback, PFN_SHUTDOWN_HANDLER shutdown_callback, PFN_ASYNC_COMPLETION managed_context_handler, IntPtr pvRequestContext, IntPtr pvShutdownContext); + + [DllImport(AspNetCoreModuleDll)] + private static extern unsafe int http_write_response_bytes(IntPtr pInProcessHandler, HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, int nChunks, out bool fCompletionExpected); + + [DllImport(AspNetCoreModuleDll)] + private static extern int http_flush_response_bytes(IntPtr pInProcessHandler, out bool fCompletionExpected); + + [DllImport(AspNetCoreModuleDll)] + private static extern unsafe HttpApiTypes.HTTP_REQUEST_V2* http_get_raw_request(IntPtr pInProcessHandler); + + [DllImport(AspNetCoreModuleDll)] + private static extern void http_stop_calls_into_managed(); + + [DllImport(AspNetCoreModuleDll)] + private static extern void http_stop_incoming_requests(); + + [DllImport(AspNetCoreModuleDll)] + private static extern unsafe HttpApiTypes.HTTP_RESPONSE_V2* http_get_raw_response(IntPtr pInProcessHandler); + + [DllImport(AspNetCoreModuleDll, CharSet = CharSet.Ansi)] + private static extern int http_set_response_status_code(IntPtr pInProcessHandler, ushort statusCode, string pszReason); + + [DllImport(AspNetCoreModuleDll)] + private static extern unsafe int http_read_request_bytes(IntPtr pInProcessHandler, byte* pvBuffer, int cbBuffer, out int dwBytesReceived, out bool fCompletionExpected); + + [DllImport(AspNetCoreModuleDll)] + private static extern void http_get_completion_info(IntPtr pCompletionInfo, out int cbBytes, out int hr); + + [DllImport(AspNetCoreModuleDll)] + private static extern int http_set_managed_context(IntPtr pInProcessHandler, IntPtr pvManagedContext); + + [DllImport(AspNetCoreModuleDll)] + private static extern int http_get_application_properties(ref IISConfigurationData iiConfigData); + + [DllImport(AspNetCoreModuleDll)] + private static extern int http_get_server_variable( + IntPtr pInProcessHandler, + [MarshalAs(UnmanagedType.LPStr)] string variableName, + [MarshalAs(UnmanagedType.BStr)] out string value); + + [DllImport(AspNetCoreModuleDll)] + private static extern unsafe int http_websockets_read_bytes( + IntPtr pInProcessHandler, + byte* pvBuffer, + int cbBuffer, + PFN_WEBSOCKET_ASYNC_COMPLETION pfnCompletionCallback, + IntPtr pvCompletionContext, + out int dwBytesReceived, + out bool fCompletionExpected); + + [DllImport(AspNetCoreModuleDll)] + private static extern unsafe int http_websockets_write_bytes( + IntPtr pInProcessHandler, + HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, + int nChunks, + PFN_WEBSOCKET_ASYNC_COMPLETION pfnCompletionCallback, + IntPtr pvCompletionContext, + out bool fCompletionExpected); + + [DllImport(AspNetCoreModuleDll)] + private static extern int http_enable_websockets(IntPtr pInProcessHandler); + + [DllImport(AspNetCoreModuleDll)] + private static extern int http_cancel_io(IntPtr pInProcessHandler); + + [DllImport(AspNetCoreModuleDll)] + private static extern unsafe int http_response_set_unknown_header(IntPtr pInProcessHandler, byte* pszHeaderName, byte* pszHeaderValue, ushort usHeaderValueLength, bool fReplace); + + [DllImport(AspNetCoreModuleDll)] + private static extern unsafe int http_response_set_known_header(IntPtr pInProcessHandler, int headerId, byte* pHeaderValue, ushort length, bool fReplace); + + [DllImport(AspNetCoreModuleDll)] + private static extern int http_get_authentication_information(IntPtr pInProcessHandler, [MarshalAs(UnmanagedType.BStr)] out string authType, out IntPtr token); + + public static void HttpPostCompletion(IntPtr pInProcessHandler, int cbBytes) + { + Validate(http_post_completion(pInProcessHandler, cbBytes)); + } + + public static void HttpSetCompletionStatus(IntPtr pInProcessHandler, REQUEST_NOTIFICATION_STATUS rquestNotificationStatus) + { + Validate(http_set_completion_status(pInProcessHandler, rquestNotificationStatus)); + } + + public static void HttpIndicateCompletion(IntPtr pInProcessHandler, REQUEST_NOTIFICATION_STATUS notificationStatus) + { + http_indicate_completion(pInProcessHandler, notificationStatus); + } + public static void HttpRegisterCallbacks(PFN_REQUEST_HANDLER request_callback, PFN_SHUTDOWN_HANDLER shutdown_callback, PFN_ASYNC_COMPLETION managed_context_handler, IntPtr pvRequestContext, IntPtr pvShutdownContext) + { + register_callbacks(request_callback, shutdown_callback, managed_context_handler, pvRequestContext, pvShutdownContext); + } + + public static unsafe int HttpWriteResponseBytes(IntPtr pInProcessHandler, HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, int nChunks, out bool fCompletionExpected) + { + return http_write_response_bytes(pInProcessHandler, pDataChunks, nChunks, out fCompletionExpected); + } + + public static int HttpFlushResponseBytes(IntPtr pInProcessHandler, out bool fCompletionExpected) + { + return http_flush_response_bytes(pInProcessHandler, out fCompletionExpected); + } + public static unsafe HttpApiTypes.HTTP_REQUEST_V2* HttpGetRawRequest(IntPtr pInProcessHandler) + { + return http_get_raw_request(pInProcessHandler); + } + + public static void HttpStopCallsIntoManaged() + { + http_stop_calls_into_managed(); + } + + public static void HttpStopIncomingRequests() + { + http_stop_incoming_requests(); + } + + public static unsafe HttpApiTypes.HTTP_RESPONSE_V2* HttpGetRawResponse(IntPtr pInProcessHandler) + { + return http_get_raw_response(pInProcessHandler); + } + + public static void HttpSetResponseStatusCode(IntPtr pInProcessHandler, ushort statusCode, string pszReason) + { + Validate(http_set_response_status_code(pInProcessHandler, statusCode, pszReason)); + } + + public static unsafe int HttpReadRequestBytes(IntPtr pInProcessHandler, byte* pvBuffer, int cbBuffer, out int dwBytesReceived, out bool fCompletionExpected) + { + return http_read_request_bytes(pInProcessHandler, pvBuffer, cbBuffer, out dwBytesReceived, out fCompletionExpected); + } + + public static void HttpGetCompletionInfo(IntPtr pCompletionInfo, out int cbBytes, out int hr) + { + http_get_completion_info(pCompletionInfo, out cbBytes, out hr); + } + + public static void HttpSetManagedContext(IntPtr pInProcessHandler, IntPtr pvManagedContext) + { + Validate(http_set_managed_context(pInProcessHandler, pvManagedContext)); + } + + public static IISConfigurationData HttpGetApplicationProperties() + { + var iisConfigurationData = new IISConfigurationData(); + Validate(http_get_application_properties(ref iisConfigurationData)); + return iisConfigurationData; + } + + public static bool HttpTryGetServerVariable(IntPtr pInProcessHandler, string variableName, out string value) + { + return http_get_server_variable(pInProcessHandler, variableName, out value) == 0; + } + + public static unsafe int HttpWebsocketsReadBytes( + IntPtr pInProcessHandler, + byte* pvBuffer, + int cbBuffer, + PFN_WEBSOCKET_ASYNC_COMPLETION pfnCompletionCallback, + IntPtr pvCompletionContext, out int dwBytesReceived, + out bool fCompletionExpected) + { + return http_websockets_read_bytes(pInProcessHandler, pvBuffer, cbBuffer, pfnCompletionCallback, pvCompletionContext, out dwBytesReceived, out fCompletionExpected); + } + + public static unsafe int HttpWebsocketsWriteBytes( + IntPtr pInProcessHandler, + HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, + int nChunks, + PFN_WEBSOCKET_ASYNC_COMPLETION pfnCompletionCallback, + IntPtr pvCompletionContext, + out bool fCompletionExpected) + { + return http_websockets_write_bytes(pInProcessHandler, pDataChunks, nChunks, pfnCompletionCallback, pvCompletionContext, out fCompletionExpected); + } + + public static void HttpEnableWebsockets(IntPtr pInProcessHandler) + { + Validate(http_enable_websockets(pInProcessHandler)); + } + + public static bool HttpTryCancelIO(IntPtr pInProcessHandler) + { + var hr = http_cancel_io(pInProcessHandler); + // Async operation finished + // https://msdn.microsoft.com/en-us/library/windows/desktop/aa363792(v=vs.85).aspx + if (hr == ERROR_NOT_FOUND) + { + return false; + } + Validate(hr); + return true; + } + + public static unsafe void HttpResponseSetUnknownHeader(IntPtr pInProcessHandler, byte* pszHeaderName, byte* pszHeaderValue, ushort usHeaderValueLength, bool fReplace) + { + Validate(http_response_set_unknown_header(pInProcessHandler, pszHeaderName, pszHeaderValue, usHeaderValueLength, fReplace)); + } + + public static unsafe void HttpResponseSetKnownHeader(IntPtr pInProcessHandler, int headerId, byte* pHeaderValue, ushort length, bool fReplace) + { + Validate(http_response_set_known_header(pInProcessHandler, headerId, pHeaderValue, length, fReplace)); + } + + public static void HttpGetAuthenticationInformation(IntPtr pInProcessHandler, out string authType, out IntPtr token) + { + Validate(http_get_authentication_information(pInProcessHandler, out authType, out token)); + } + + private static void Validate(int hr) + { + if (hr != HR_OK) + { + throw Marshal.GetExceptionForHR(hr); + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs b/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs new file mode 100644 index 0000000000..e5ca048afc --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs @@ -0,0 +1,50 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Runtime.InteropServices; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Server.IIS; +using Microsoft.AspNetCore.Server.IIS.Core; + +namespace Microsoft.AspNetCore.Hosting +{ + public static class WebHostBuilderIISExtensions + { + /// + /// Configures the port and base path the server should listen on when running behind AspNetCoreModule. + /// The app will also be configured to capture startup errors. + /// + /// + /// + public static IWebHostBuilder UseIIS(this IWebHostBuilder hostBuilder) + { + if (hostBuilder == null) + { + throw new ArgumentNullException(nameof(hostBuilder)); + } + + // Check if in process + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && NativeMethods.IsAspNetCoreModuleLoaded()) + { + hostBuilder.CaptureStartupErrors(true); + + var iisConfigData = NativeMethods.HttpGetApplicationProperties(); + hostBuilder.UseContentRoot(iisConfigData.pwzFullApplicationPath); + return hostBuilder.ConfigureServices( + services => { + services.AddSingleton(); + services.AddSingleton(new IISServerSetupFilter(iisConfigData.pwzVirtualApplicationPath)); + services.AddAuthenticationCore(); + services.Configure( + options => { options.ForwardWindowsAuthentication = iisConfigData.fWindowsAuthEnabled || iisConfigData.fBasicAuthEnabled; } + ); + }); + } + + return hostBuilder; + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj index a17b331554..f816c8de3f 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core components for working with the IIS AspNetCoreModule. @@ -21,9 +21,6 @@ - - - diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs index ece7f954c6..02fc967f1a 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs @@ -3,271 +3,15 @@ using System; using System.Runtime.InteropServices; -using Microsoft.AspNetCore.HttpSys.Internal; namespace Microsoft.AspNetCore.Server.IISIntegration { internal static class NativeMethods { - internal const int HR_OK = 0; - internal const int ERROR_NOT_FOUND = unchecked((int)0x80070490); - internal const int ERROR_OPERATION_ABORTED = unchecked((int)0x800703E3); - private const string KERNEL32 = "kernel32.dll"; - private const string AspNetCoreModuleDll = "aspnetcorerh.dll"; - [DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)] public static extern bool CloseHandle(IntPtr handle); - - - [DllImport("kernel32.dll")] - private static extern IntPtr GetModuleHandle(string lpModuleName); - - public static bool IsAspNetCoreModuleLoaded() - { - return GetModuleHandle(AspNetCoreModuleDll) != IntPtr.Zero; - } - - public enum REQUEST_NOTIFICATION_STATUS - { - RQ_NOTIFICATION_CONTINUE, - RQ_NOTIFICATION_PENDING, - RQ_NOTIFICATION_FINISH_REQUEST - } - - public delegate REQUEST_NOTIFICATION_STATUS PFN_REQUEST_HANDLER(IntPtr pInProcessHandler, IntPtr pvRequestContext); - public delegate bool PFN_SHUTDOWN_HANDLER(IntPtr pvRequestContext); - public delegate REQUEST_NOTIFICATION_STATUS PFN_ASYNC_COMPLETION(IntPtr pvManagedHttpContext, int hr, int bytes); - public delegate REQUEST_NOTIFICATION_STATUS PFN_WEBSOCKET_ASYNC_COMPLETION(IntPtr pInProcessHandler, IntPtr completionInfo, IntPtr pvCompletionContext); - - [DllImport(AspNetCoreModuleDll)] - private static extern int http_post_completion(IntPtr pInProcessHandler, int cbBytes); - - [DllImport(AspNetCoreModuleDll)] - private static extern int http_set_completion_status(IntPtr pInProcessHandler, REQUEST_NOTIFICATION_STATUS rquestNotificationStatus); - - [DllImport(AspNetCoreModuleDll)] - private static extern void http_indicate_completion(IntPtr pInProcessHandler, REQUEST_NOTIFICATION_STATUS notificationStatus); - - [DllImport(AspNetCoreModuleDll)] - private static extern void register_callbacks(PFN_REQUEST_HANDLER request_callback, PFN_SHUTDOWN_HANDLER shutdown_callback, PFN_ASYNC_COMPLETION managed_context_handler, IntPtr pvRequestContext, IntPtr pvShutdownContext); - - [DllImport(AspNetCoreModuleDll)] - private static extern unsafe int http_write_response_bytes(IntPtr pInProcessHandler, HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, int nChunks, out bool fCompletionExpected); - - [DllImport(AspNetCoreModuleDll)] - private static extern int http_flush_response_bytes(IntPtr pInProcessHandler, out bool fCompletionExpected); - - [DllImport(AspNetCoreModuleDll)] - private static extern unsafe HttpApiTypes.HTTP_REQUEST_V2* http_get_raw_request(IntPtr pInProcessHandler); - - [DllImport(AspNetCoreModuleDll)] - private static extern void http_stop_calls_into_managed(); - - [DllImport(AspNetCoreModuleDll)] - private static extern void http_stop_incoming_requests(); - - [DllImport(AspNetCoreModuleDll)] - private static extern unsafe HttpApiTypes.HTTP_RESPONSE_V2* http_get_raw_response(IntPtr pInProcessHandler); - - [DllImport(AspNetCoreModuleDll, CharSet = CharSet.Ansi)] - private static extern int http_set_response_status_code(IntPtr pInProcessHandler, ushort statusCode, string pszReason); - - [DllImport(AspNetCoreModuleDll)] - private static extern unsafe int http_read_request_bytes(IntPtr pInProcessHandler, byte* pvBuffer, int cbBuffer, out int dwBytesReceived, out bool fCompletionExpected); - - [DllImport(AspNetCoreModuleDll)] - private static extern void http_get_completion_info(IntPtr pCompletionInfo, out int cbBytes, out int hr); - - [DllImport(AspNetCoreModuleDll)] - private static extern int http_set_managed_context(IntPtr pInProcessHandler, IntPtr pvManagedContext); - - [DllImport(AspNetCoreModuleDll)] - private static extern int http_get_application_properties(ref IISConfigurationData iiConfigData); - - [DllImport(AspNetCoreModuleDll)] - private static extern int http_get_server_variable( - IntPtr pInProcessHandler, - [MarshalAs(UnmanagedType.LPStr)] string variableName, - [MarshalAs(UnmanagedType.BStr)] out string value); - - [DllImport(AspNetCoreModuleDll)] - private static extern unsafe int http_websockets_read_bytes( - IntPtr pInProcessHandler, - byte* pvBuffer, - int cbBuffer, - PFN_WEBSOCKET_ASYNC_COMPLETION pfnCompletionCallback, - IntPtr pvCompletionContext, - out int dwBytesReceived, - out bool fCompletionExpected); - - [DllImport(AspNetCoreModuleDll)] - private static extern unsafe int http_websockets_write_bytes( - IntPtr pInProcessHandler, - HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, - int nChunks, - PFN_WEBSOCKET_ASYNC_COMPLETION pfnCompletionCallback, - IntPtr pvCompletionContext, - out bool fCompletionExpected); - - [DllImport(AspNetCoreModuleDll)] - private static extern int http_enable_websockets(IntPtr pInProcessHandler); - - [DllImport(AspNetCoreModuleDll)] - private static extern int http_cancel_io(IntPtr pInProcessHandler); - - [DllImport(AspNetCoreModuleDll)] - private static extern unsafe int http_response_set_unknown_header(IntPtr pInProcessHandler, byte* pszHeaderName, byte* pszHeaderValue, ushort usHeaderValueLength, bool fReplace); - - [DllImport(AspNetCoreModuleDll)] - private static extern unsafe int http_response_set_known_header(IntPtr pInProcessHandler, int headerId, byte* pHeaderValue, ushort length, bool fReplace); - - [DllImport(AspNetCoreModuleDll)] - private static extern int http_get_authentication_information(IntPtr pInProcessHandler, [MarshalAs(UnmanagedType.BStr)] out string authType, out IntPtr token); - - public static void HttpPostCompletion(IntPtr pInProcessHandler, int cbBytes) - { - Validate(http_post_completion(pInProcessHandler, cbBytes)); - } - - public static void HttpSetCompletionStatus(IntPtr pInProcessHandler, REQUEST_NOTIFICATION_STATUS rquestNotificationStatus) - { - Validate(http_set_completion_status(pInProcessHandler, rquestNotificationStatus)); - } - - public static void HttpIndicateCompletion(IntPtr pInProcessHandler, REQUEST_NOTIFICATION_STATUS notificationStatus) - { - http_indicate_completion(pInProcessHandler, notificationStatus); - } - public static void HttpRegisterCallbacks(PFN_REQUEST_HANDLER request_callback, PFN_SHUTDOWN_HANDLER shutdown_callback, PFN_ASYNC_COMPLETION managed_context_handler, IntPtr pvRequestContext, IntPtr pvShutdownContext) - { - register_callbacks(request_callback, shutdown_callback, managed_context_handler, pvRequestContext, pvShutdownContext); - } - - public static unsafe int HttpWriteResponseBytes(IntPtr pInProcessHandler, HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, int nChunks, out bool fCompletionExpected) - { - return http_write_response_bytes(pInProcessHandler, pDataChunks, nChunks, out fCompletionExpected); - } - - public static int HttpFlushResponseBytes(IntPtr pInProcessHandler, out bool fCompletionExpected) - { - return http_flush_response_bytes(pInProcessHandler, out fCompletionExpected); - } - public static unsafe HttpApiTypes.HTTP_REQUEST_V2* HttpGetRawRequest(IntPtr pInProcessHandler) - { - return http_get_raw_request(pInProcessHandler); - } - - public static void HttpStopCallsIntoManaged() - { - http_stop_calls_into_managed(); - } - - public static void HttpStopIncomingRequests() - { - http_stop_incoming_requests(); - } - - public static unsafe HttpApiTypes.HTTP_RESPONSE_V2* HttpGetRawResponse(IntPtr pInProcessHandler) - { - return http_get_raw_response(pInProcessHandler); - } - - public static void HttpSetResponseStatusCode(IntPtr pInProcessHandler, ushort statusCode, string pszReason) - { - Validate(http_set_response_status_code(pInProcessHandler, statusCode, pszReason)); - } - - public static unsafe int HttpReadRequestBytes(IntPtr pInProcessHandler, byte* pvBuffer, int cbBuffer, out int dwBytesReceived, out bool fCompletionExpected) - { - return http_read_request_bytes(pInProcessHandler, pvBuffer, cbBuffer, out dwBytesReceived, out fCompletionExpected); - } - - public static void HttpGetCompletionInfo(IntPtr pCompletionInfo, out int cbBytes, out int hr) - { - http_get_completion_info(pCompletionInfo, out cbBytes, out hr); - } - - public static void HttpSetManagedContext(IntPtr pInProcessHandler, IntPtr pvManagedContext) - { - Validate(http_set_managed_context(pInProcessHandler, pvManagedContext)); - } - - public static IISConfigurationData HttpGetApplicationProperties() - { - var iisConfigurationData = new IISConfigurationData(); - Validate(http_get_application_properties(ref iisConfigurationData)); - return iisConfigurationData; - } - - public static bool HttpTryGetServerVariable(IntPtr pInProcessHandler, string variableName, out string value) - { - return http_get_server_variable(pInProcessHandler, variableName, out value) == 0; - } - - public static unsafe int HttpWebsocketsReadBytes( - IntPtr pInProcessHandler, - byte* pvBuffer, - int cbBuffer, - PFN_WEBSOCKET_ASYNC_COMPLETION pfnCompletionCallback, - IntPtr pvCompletionContext, out int dwBytesReceived, - out bool fCompletionExpected) - { - return http_websockets_read_bytes(pInProcessHandler, pvBuffer, cbBuffer, pfnCompletionCallback, pvCompletionContext, out dwBytesReceived, out fCompletionExpected); - } - - public static unsafe int HttpWebsocketsWriteBytes( - IntPtr pInProcessHandler, - HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, - int nChunks, - PFN_WEBSOCKET_ASYNC_COMPLETION pfnCompletionCallback, - IntPtr pvCompletionContext, - out bool fCompletionExpected) - { - return http_websockets_write_bytes(pInProcessHandler, pDataChunks, nChunks, pfnCompletionCallback, pvCompletionContext, out fCompletionExpected); - } - - public static void HttpEnableWebsockets(IntPtr pInProcessHandler) - { - Validate(http_enable_websockets(pInProcessHandler)); - } - - public static bool HttpTryCancelIO(IntPtr pInProcessHandler) - { - var hr = http_cancel_io(pInProcessHandler); - // Async operation finished - // https://msdn.microsoft.com/en-us/library/windows/desktop/aa363792(v=vs.85).aspx - if (hr == ERROR_NOT_FOUND) - { - return false; - } - Validate(hr); - return true; - } - - public static unsafe void HttpResponseSetUnknownHeader(IntPtr pInProcessHandler, byte* pszHeaderName, byte* pszHeaderValue, ushort usHeaderValueLength, bool fReplace) - { - Validate(http_response_set_unknown_header(pInProcessHandler, pszHeaderName, pszHeaderValue, usHeaderValueLength, fReplace)); - } - - public static unsafe void HttpResponseSetKnownHeader(IntPtr pInProcessHandler, int headerId, byte* pHeaderValue, ushort length, bool fReplace) - { - Validate(http_response_set_known_header(pInProcessHandler, headerId, pHeaderValue, length, fReplace)); - } - - public static void HttpGetAuthenticationInformation(IntPtr pInProcessHandler, out string authType, out IntPtr token) - { - Validate(http_get_authentication_information(pInProcessHandler, out authType, out token)); - } - - private static void Validate(int hr) - { - if (hr != HR_OK) - { - throw Marshal.GetExceptionForHR(hr); - } - } } } diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs b/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs index c236c7eac4..b57ad38b00 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs @@ -40,13 +40,6 @@ namespace Microsoft.AspNetCore.Hosting return hostBuilder; } - // Check if in process - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && NativeMethods.IsAspNetCoreModuleLoaded()) - { - - return SetupInProcessServer(hostBuilder); - } - var port = hostBuilder.GetSetting(ServerPort) ?? Environment.GetEnvironmentVariable($"ASPNETCORE_{ServerPort}"); var path = hostBuilder.GetSetting(ServerPath) ?? Environment.GetEnvironmentVariable($"ASPNETCORE_{ServerPath}"); var pairingToken = hostBuilder.GetSetting(PairingToken) ?? Environment.GetEnvironmentVariable($"ASPNETCORE_{PairingToken}"); @@ -107,23 +100,5 @@ namespace Microsoft.AspNetCore.Hosting return hostBuilder; } - - private static IWebHostBuilder SetupInProcessServer(IWebHostBuilder hostBuilder) - { - hostBuilder.UseSetting(nameof(UseIISIntegration), "true"); - hostBuilder.CaptureStartupErrors(true); - - var iisConfigData = NativeMethods.HttpGetApplicationProperties(); - hostBuilder.UseContentRoot(iisConfigData.pwzFullApplicationPath); - return hostBuilder.ConfigureServices( - services => { - services.AddSingleton(); - services.AddSingleton(new IISServerSetupFilter(iisConfigData.pwzVirtualApplicationPath)); - services.AddAuthenticationCore(); - services.Configure( - options => { options.ForwardWindowsAuthentication = iisConfigData.fWindowsAuthEnabled || iisConfigData.fBasicAuthEnabled; } - ); - }); - } } } diff --git a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj index abe0a117f7..75b4860528 100644 --- a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj +++ b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj @@ -1,7 +1,7 @@ - $(StandardTestTfms) + netcoreapp2.1 diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs index a097f3672d..5fef8660ca 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -7,6 +7,7 @@ using System.Net.Http; using System.Threading; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.Extensions.Logging.Testing; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { @@ -16,6 +17,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public IISTestSiteFixture() { + var logging = AssemblyTestLog.ForAssembly(typeof(IISTestSiteFixture).Assembly); + var deploymentParameters = new DeploymentParameters(Helpers.GetInProcessTestSitesPath(), ServerType.IISExpress, RuntimeFlavor.CoreClr, @@ -25,10 +28,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests SiteName = "HttpTestSite", TargetFramework = "netcoreapp2.1", ApplicationType = ApplicationType.Portable, - ANCMVersion = ANCMVersion.AspNetCoreModuleV2 + ANCMVersion = ANCMVersion.AspNetCoreModuleV2, }; - _deployer = ApplicationDeployerFactory.Create(deploymentParameters, NullLoggerFactory.Instance); + _deployer = ApplicationDeployerFactory.Create(deploymentParameters, logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture))); DeploymentResult = _deployer.DeployAsync().Result; Client = DeploymentResult.HttpClient; BaseUri = DeploymentResult.ApplicationBaseUri; diff --git a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj index dd7cb4e794..987b624cc9 100644 --- a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj +++ b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj @@ -2,11 +2,11 @@ - $(StandardTestTfms) + netcoreapp2.1 - + diff --git a/test/WebSites/InProcessWebSite/Program.cs b/test/WebSites/InProcessWebSite/Program.cs index 0550f0f1fd..e9db174529 100644 --- a/test/WebSites/InProcessWebSite/Program.cs +++ b/test/WebSites/InProcessWebSite/Program.cs @@ -16,7 +16,7 @@ namespace IISTestSite factory.AddConsole(); factory.AddFilter("Console", level => level >= LogLevel.Information); }) - .UseIISIntegration() + .UseIIS() .UseStartup(typeof(Program).Assembly.FullName) .Build(); diff --git a/test/WebSites/InProcessWebSite/Startup.WebSockets.cs b/test/WebSites/InProcessWebSite/Startup.WebSockets.cs index 453f8db254..f3fcdb3a1d 100644 --- a/test/WebSites/InProcessWebSite/Startup.WebSockets.cs +++ b/test/WebSites/InProcessWebSite/Startup.WebSockets.cs @@ -3,24 +3,17 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; -using System.Net; using System.Net.WebSockets; -using System.Reflection; using System.Text; using System.Threading; using System.Threading.Tasks; using IISIntegration.FunctionalTests; -using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Server.IIS; -using Microsoft.AspNetCore.Server.IISIntegration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Primitives; using Xunit; namespace IISTestSite diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index a872c7bc1b..93717f8703 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -2,24 +2,16 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Net; -using System.Net.WebSockets; using System.Reflection; using System.Text; -using System.Threading; using System.Threading.Tasks; -using IISIntegration.FunctionalTests; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.IIS; -using Microsoft.AspNetCore.Server.IISIntegration; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Primitives; using Xunit; @@ -46,7 +38,7 @@ namespace IISTestSite app.Run(async ctx => { var varName = ctx.Request.Query["q"]; - await ctx.Response.WriteAsync($"{varName}: {ctx.GetIISServerVariable(varName) ?? "(null)"}"); + await ctx.Response.WriteAsync($"{varName}: {HttpContextExtensions.GetIISServerVariable(ctx, varName) ?? "(null)"}"); }); } @@ -68,7 +60,7 @@ namespace IISTestSite } else { - await ctx.ChallengeAsync(IISDefaults.AuthenticationScheme); + await ctx.ChallengeAsync(IISServerDefaults.AuthenticationScheme); } }); } @@ -77,7 +69,7 @@ namespace IISTestSite { app.Run(async ctx => { - await ctx.ForbidAsync(IISDefaults.AuthenticationScheme); + await ctx.ForbidAsync(IISServerDefaults.AuthenticationScheme); }); } @@ -91,7 +83,7 @@ namespace IISTestSite } else { - await ctx.ChallengeAsync(IISDefaults.AuthenticationScheme); + await ctx.ChallengeAsync(IISServerDefaults.AuthenticationScheme); } }); } diff --git a/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj b/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj index 4332ea3fd1..746ac2f2d3 100644 --- a/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj +++ b/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj @@ -3,11 +3,11 @@ - $(StandardTestTfms) + netcoreapp2.1 - + - + diff --git a/test/WebSites/OverriddenServerWebSite/Program.cs b/test/WebSites/OverriddenServerWebSite/Program.cs index bb65e03004..2b68c93af4 100644 --- a/test/WebSites/OverriddenServerWebSite/Program.cs +++ b/test/WebSites/OverriddenServerWebSite/Program.cs @@ -18,7 +18,7 @@ namespace IISTestSite public static void Main(string[] args) { var host = new WebHostBuilder() - .UseIISIntegration() + .UseIIS() .ConfigureServices(services => services.AddSingleton()) .Configure(builder => builder.Run(async context => { await context.Response.WriteAsync("I shouldn't work"); })) .Build(); From e9b8bf085d04a0a0a2f59820d8d8369162b6255c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 15 May 2018 18:10:57 -0700 Subject: [PATCH 023/363] Fix dotnet publish issues with aspnetcorerh.dll (#835) --- build/dependencies.props | 2 +- build/testsite.props | 8 ++++---- .../Inprocess/StartupTests.cs | 2 +- .../OutOfProcess/HelloWorldTest.cs | 10 +++++++++- .../OutOfProcess/HttpsTest.cs | 4 ++-- .../OutOfProcess/NtlmAuthentationTest.cs | 2 +- test/TestTasks/InjectRequestHandler.cs | 6 +++--- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index f454a5cd9b..a59d3acf3e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -14,7 +14,7 @@ 2.2.0-preview1-34184 2.2.0-preview1-34184 2.2.0-preview1-34184 - 0.6.0-preview1-34184 + 0.6.0-a-preview1-portableFlag-17022 2.2.0-preview1-34184 2.2.0-preview1-34184 2.2.0-preview1-34184 diff --git a/build/testsite.props b/build/testsite.props index f45cefa7e1..aa60d852e4 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -31,10 +31,10 @@ - - - - + + + + diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index 6777c35188..de20779726 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -106,11 +106,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var logger = loggerFactory.CreateLogger("HelloWorldTest"); var deploymentParameters = GetBaseDeploymentParameters(); + deploymentParameters.ApplicationType = ApplicationType.Standalone; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) { var deploymentResult = await deployer.DeployAsync(); - deploymentParameters.ApplicationType = ApplicationType.Standalone; // Request to base address and check if various parts of the body are rendered & measure the cold startup time. var response = await RetryHelper.RetryRequest(() => diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 7cee6a6777..7160366ac2 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] + [Theory] [InlineData(ANCMVersion.AspNetCoreModule)] [InlineData(ANCMVersion.AspNetCoreModuleV2)] public Task HelloWorld_IISExpress_Clr_X64_Portable(ANCMVersion ancmVersion) @@ -35,6 +35,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, ancmVersion); } + [Theory] + [InlineData(ANCMVersion.AspNetCoreModule)] + [InlineData(ANCMVersion.AspNetCoreModuleV2)] + public Task HelloWorld_IISExpress_CoreClr_X64_Standalone(ANCMVersion ancmVersion) + { + return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Standalone, ancmVersion); + } + private async Task HelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, ANCMVersion ancmVersion) { var serverType = ServerType.IISExpress; diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs index 9066c60c72..384c890f2e 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Theory(Skip = "Full framework web.config generation is currently incorrect. See: https://github.com/aspnet/websdk/pull/322")] + [Theory] [InlineData(ANCMVersion.AspNetCoreModule)] [InlineData(ANCMVersion.AspNetCoreModuleV2)] public Task Https_HelloWorld_CLR_X64(ANCMVersion ancmVersion) @@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44397, sendClientCert: false, ancmVersion); } - [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] + [Theory] [InlineData(ANCMVersion.AspNetCoreModule)] [InlineData(ANCMVersion.AspNetCoreModuleV2)] public Task Https_HelloWorld_NoClientCert_Clr_X64(ANCMVersion ancmVersion) diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index a5ed40c7c6..d9ce75a5c5 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] + [Theory] [InlineData(ANCMVersion.AspNetCoreModule)] [InlineData(ANCMVersion.AspNetCoreModuleV2)] public Task NtlmAuthentication_Clr_X64(ANCMVersion ancmVersion) diff --git a/test/TestTasks/InjectRequestHandler.cs b/test/TestTasks/InjectRequestHandler.cs index 639428ebd1..4da8129d71 100644 --- a/test/TestTasks/InjectRequestHandler.cs +++ b/test/TestTasks/InjectRequestHandler.cs @@ -14,9 +14,9 @@ namespace TestTasks { private static void Main(string[] args) { - var depsFile = args[2]; - var rid = args[0]; - var libraryLocation = args[1]; + string rid = args[0]; + string libraryLocation = args[1]; + string depsFile = args[2]; JToken deps; using (var file = File.OpenText(depsFile)) From e824ea51370ac193e324ddf0116e15753b2fb43a Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 16 May 2018 11:11:02 -0700 Subject: [PATCH 024/363] Upgrade to netcoreapp22 --- Directory.Build.targets | 3 + build/dependencies.props | 57 ++++++++++--------- build/repo.props | 1 + korebuild-lock.txt | 4 +- samples/IISSample/IISSample.csproj | 2 +- .../NativeIISSample/NativeIISSample.csproj | 4 +- test/Directory.Build.props | 4 +- .../IISIntegration.FunctionalTests.csproj | 2 +- .../InProcessWebSite/InProcessWebSite.csproj | 4 +- .../OverriddenServerWebSite.csproj | 4 +- 10 files changed, 45 insertions(+), 40 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 78626b773e..934237b42f 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -3,8 +3,11 @@ $(MicrosoftNETCoreApp20PackageVersion) $(MicrosoftNETCoreApp21PackageVersion) $(MicrosoftNETCoreApp22PackageVersion) + $(MicrosoftNETCoreApp22PackageVersion) $(NETStandardLibrary20PackageVersion) 99.9 + + 99.9 diff --git a/build/dependencies.props b/build/dependencies.props index a59d3acf3e..bf1c028054 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,39 +4,40 @@ 0.10.13 - 2.2.0-preview1-17051 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 0.6.0-a-preview1-portableFlag-17022 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 + 2.2.0-preview1-17055 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 0.6.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 15.6.82 15.6.82 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 + 2.2.0-preview1-34217 2.0.0 2.1.0-rc1 + 2.2.0-preview1-26502-01 2.2.0-preview1-26509-06 - 2.2.0-preview1-34184 + 2.2.0-preview1-34217 15.6.1 2.0.3 4.6.0-preview1-26508-04 diff --git a/build/repo.props b/build/repo.props index 143448ce88..52a7e82f71 100644 --- a/build/repo.props +++ b/build/repo.props @@ -26,6 +26,7 @@ + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 56263a26fc..00b3bf864b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17051 -commithash:253c3a480063bc3abaa5cde42f6e27b58457ef9b +version:2.2.0-preview1-17055 +commithash:99daa5d16d9835cc5c0bed2e12f86f2716b2599f diff --git a/samples/IISSample/IISSample.csproj b/samples/IISSample/IISSample.csproj index f8dafd69ef..556945519e 100644 --- a/samples/IISSample/IISSample.csproj +++ b/samples/IISSample/IISSample.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1;net461 + netcoreapp2.2;net461 diff --git a/samples/NativeIISSample/NativeIISSample.csproj b/samples/NativeIISSample/NativeIISSample.csproj index 7785cbb5ac..d3c6d51b75 100644 --- a/samples/NativeIISSample/NativeIISSample.csproj +++ b/samples/NativeIISSample/NativeIISSample.csproj @@ -1,9 +1,9 @@ - + - netcoreapp2.1 + netcoreapp2.2 diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 179511a68d..edfd666254 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -2,9 +2,9 @@ - - netcoreapp2.1 + netcoreapp2.2 $(DeveloperBuildTestTfms) $(StandardTestTfms) $(StandardTestTfms);net461 diff --git a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj index 75b4860528..2429bb8509 100644 --- a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj +++ b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1 + netcoreapp2.2 diff --git a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj index 987b624cc9..e5158c8cad 100644 --- a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj +++ b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj @@ -1,8 +1,8 @@ - + - netcoreapp2.1 + netcoreapp2.2 diff --git a/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj b/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj index 746ac2f2d3..2b9db3ce4a 100644 --- a/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj +++ b/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj @@ -1,9 +1,9 @@ - + - netcoreapp2.1 + netcoreapp2.2 From 533e4647126d84f9f2e2579b0941ae3277930c15 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 16 May 2018 12:52:40 -0700 Subject: [PATCH 025/363] PR feedback --- Directory.Build.targets | 3 --- build/dependencies.props | 1 - build/repo.props | 1 - 3 files changed, 5 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 934237b42f..78626b773e 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -3,11 +3,8 @@ $(MicrosoftNETCoreApp20PackageVersion) $(MicrosoftNETCoreApp21PackageVersion) $(MicrosoftNETCoreApp22PackageVersion) - $(MicrosoftNETCoreApp22PackageVersion) $(NETStandardLibrary20PackageVersion) 99.9 - - 99.9 diff --git a/build/dependencies.props b/build/dependencies.props index bf1c028054..1a4d0a3d40 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -35,7 +35,6 @@ 2.2.0-preview1-34217 2.0.0 2.1.0-rc1 - 2.2.0-preview1-26502-01 2.2.0-preview1-26509-06 2.2.0-preview1-34217 15.6.1 diff --git a/build/repo.props b/build/repo.props index 52a7e82f71..143448ce88 100644 --- a/build/repo.props +++ b/build/repo.props @@ -26,7 +26,6 @@ - From 63c00b3c688c1837a865b89ce2de58f5b2f71386 Mon Sep 17 00:00:00 2001 From: "Chris Ross (ASP.NET)" Date: Fri, 11 May 2018 10:15:34 -0700 Subject: [PATCH 026/363] React to IntegrationTesting changes --- IISIntegration.sln | 1 + .../IIS.Performance/IIS.Performance.csproj | 4 +- .../IIS.Performance/StartupTimeBenchmark.cs | 6 +- build/dependencies.props | 4 +- .../IISIntegration.FunctionalTests.csproj | 2 - .../Inprocess/AuthenticationTests.cs | 10 +- .../Inprocess/EnvironmentVariableTests.cs | 2 + .../Inprocess/FeatureCollectionTests.cs | 2 + .../Inprocess/HelloWorldTests.cs | 4 +- .../InvalidReadWriteOperationTests.cs | 2 + .../Inprocess/LargeResponseBodyTests.cs | 2 + .../Inprocess/ResponseHeaderTests.cs | 3 +- .../Inprocess/ResponseInvalidOrderingTests.cs | 2 + .../Inprocess/ServerVariablesTest.cs | 2 + .../Inprocess/StartupTests.cs | 21 +---- .../Inprocess/SynchronousReadAndWriteTests.cs | 2 + .../OutOfProcess/HelloWorldTest.cs | 50 +++------- .../OutOfProcess/HttpsTest.cs | 94 +++++-------------- .../OutOfProcess/NtlmAuthentationTest.cs | 47 +++------- .../Properties/AssemblyInfo.cs | 1 - .../UpgradeFeatureDetectionTests.cs | 45 +++------ ...xpressSupportsInProcessHostingAttribute.cs | 62 ------------ .../Utilities/IISTestSiteFixture.cs | 7 +- 23 files changed, 105 insertions(+), 270 deletions(-) delete mode 100644 test/IISIntegration.FunctionalTests/Utilities/IISExpressSupportsInProcessHostingAttribute.cs diff --git a/IISIntegration.sln b/IISIntegration.sln index adccebbe1f..a5dbd5dad6 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -42,6 +42,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E build\Key.snk = build\Key.snk build\native.targets = build\native.targets build\repo.props = build\repo.props + build\sources.props = build\sources.props build\testsite.props = build\testsite.props EndProjectSection EndProject diff --git a/benchmarks/IIS.Performance/IIS.Performance.csproj b/benchmarks/IIS.Performance/IIS.Performance.csproj index 5a29058351..6fb9ab2c05 100644 --- a/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -1,10 +1,10 @@ - + IIS.Performance Microsoft.AspNetCore.Server.IIS.Performance - netcoreapp2.1 + netcoreapp2.2 Exe true true diff --git a/benchmarks/IIS.Performance/StartupTimeBenchmark.cs b/benchmarks/IIS.Performance/StartupTimeBenchmark.cs index 9797a02eba..4cbb53ffaf 100644 --- a/benchmarks/IIS.Performance/StartupTimeBenchmark.cs +++ b/benchmarks/IIS.Performance/StartupTimeBenchmark.cs @@ -1,10 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.IO; using System.Net.Http; -using System.Threading; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Running; @@ -17,7 +15,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Performance [AspNetCoreBenchmark(typeof(FirstRequestConfig))] public class StartupTimeBenchmark { - private IApplicationDeployer _deployer; + private ApplicationDeployer _deployer; public HttpClient _client; [IterationSetup] @@ -32,7 +30,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Performance SiteName = "HttpTestSite", TargetFramework = "netcoreapp2.1", ApplicationType = ApplicationType.Portable, - ANCMVersion = ANCMVersion.AspNetCoreModuleV2 + AncmVersion = AncmVersion.AspNetCoreModuleV2 }; _deployer = ApplicationDeployerFactory.Create(deploymentParameters, NullLoggerFactory.Instance); _client = _deployer.DeployAsync().Result.HttpClient; diff --git a/build/dependencies.props b/build/dependencies.props index 1a4d0a3d40..fc6f28aa40 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) @@ -14,7 +14,7 @@ 2.2.0-preview1-34217 2.2.0-preview1-34217 2.2.0-preview1-34217 - 0.6.0-preview1-34217 + 0.6.0-a-preview1-inttesting-17031 2.2.0-preview1-34217 2.2.0-preview1-34217 2.2.0-preview1-34217 diff --git a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj index 2429bb8509..be7eb2a1d4 100644 --- a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj +++ b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj @@ -19,8 +19,6 @@ - - diff --git a/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs index 511021b72d..a9cc151e6f 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs @@ -1,17 +1,17 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NET461 - using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] + [SkipIfIISExpressSchemaMissingInProcess] public class AuthenticationTests { private readonly IISTestSiteFixture _fixture; @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] - public async Task Authentication_InProcess_IISExpressAsync() + public async Task Authentication_InProcess() { var response = await _fixture.Client.GetAsync("/AuthenticationAnonymous"); @@ -61,7 +61,3 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } } -#elif NETCOREAPP2_1 -#else -#error Target frameworks need to be updated -#endif diff --git a/test/IISIntegration.FunctionalTests/Inprocess/EnvironmentVariableTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/EnvironmentVariableTests.cs index 413aa4c35f..16467095d8 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/EnvironmentVariableTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/EnvironmentVariableTests.cs @@ -2,12 +2,14 @@ // 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.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] + [SkipIfIISExpressSchemaMissingInProcess] public class EnvironmentVariableTests { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/FeatureCollectionTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/FeatureCollectionTests.cs index 8aa54716e3..b946446db7 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/FeatureCollectionTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/FeatureCollectionTests.cs @@ -3,12 +3,14 @@ using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] + [SkipIfIISExpressSchemaMissingInProcess] public class FeatureCollectionTest { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/HelloWorldTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/HelloWorldTests.cs index ce569acfe7..ebc67312df 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/HelloWorldTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/HelloWorldTests.cs @@ -3,12 +3,14 @@ using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] + [SkipIfIISExpressSchemaMissingInProcess] public class HelloWorldInProcessTests { private readonly IISTestSiteFixture _fixture; @@ -19,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] - public async Task HelloWorld_InProcess_IISExpress_CoreClr_X64_Portable() + public async Task HelloWorld_InProcess() { Assert.Equal("Hello World", await _fixture.Client.GetStringAsync("/HelloWorld")); diff --git a/test/IISIntegration.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs index 95c05308bd..ae27eb426e 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs @@ -3,12 +3,14 @@ using System.Net.Http; using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] + [SkipIfIISExpressSchemaMissingInProcess] public class InvalidReadWriteOperationTests { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/LargeResponseBodyTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/LargeResponseBodyTests.cs index 40db2cfdb8..3578718ef6 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/LargeResponseBodyTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/LargeResponseBodyTests.cs @@ -2,12 +2,14 @@ // 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.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] + [SkipIfIISExpressSchemaMissingInProcess] public class LargeResponseBodyTests { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs index 47ca0dc808..d96a0ae850 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Net; using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Net.Http.Headers; using Xunit; @@ -11,7 +12,7 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] - + [SkipIfIISExpressSchemaMissingInProcess] public class ResponseHeaders { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs index 2e484724e6..1bf0f1a483 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs @@ -2,12 +2,14 @@ // 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.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] + [SkipIfIISExpressSchemaMissingInProcess] public class ResponseInvalidOrderingTest { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs b/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs index d6fd676346..56b04c208e 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs @@ -2,12 +2,14 @@ // 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.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] + [SkipIfIISExpressSchemaMissingInProcess] public class ServerVariablesTest { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index de20779726..7ae5affc83 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -15,6 +15,7 @@ using Xunit.Sdk; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + [SkipIfIISExpressSchemaMissingInProcess] public class StartupTests : LoggedTest { public StartupTests(ITestOutputHelper output) : base(output) @@ -25,12 +26,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [Fact] public async Task ExpandEnvironmentVariableInWebConfig() { -#if NET461 - // use the dotnet on PATH - var dotnetLocation = "dotnet"; -#else var dotnetLocation = DotNetMuxer.MuxerPathOrDefault(); -#endif using (StartLog(out var loggerFactory)) { var logger = loggerFactory.CreateLogger("HelloWorldTest"); @@ -96,9 +92,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } -#if NETCOREAPP2_1 - - [Fact] // Consistently fails on CI for net461 + [Fact] public async Task StandaloneApplication_ExpectCorrectPublish() { using (StartLog(out var loggerFactory)) @@ -133,7 +127,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } - [Fact] // Consistently fails on CI for net461 + [Fact] public async Task StandaloneApplication_AbsolutePathToExe_ExpectCorrectPublish() { using (StartLog(out var loggerFactory)) @@ -170,11 +164,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } -#elif NET461 -#else -#error Target frameworks need to be updated -#endif - [Fact] public async Task DetectsOveriddenServer() { @@ -200,9 +189,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { ServerConfigTemplateContent = File.ReadAllText("AppHostConfig/Http.config"), SiteName = "HttpTestSite", // This is configured in the Http.config - TargetFramework = "netcoreapp2.1", + TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, - ANCMVersion = ANCMVersion.AspNetCoreModuleV2 + AncmVersion = AncmVersion.AspNetCoreModuleV2 }; } diff --git a/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs index e9b7f9ad62..469018acb2 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs @@ -6,12 +6,14 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] + [SkipIfIISExpressSchemaMissingInProcess] public class SynchronousReadAndWriteTests { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 7160366ac2..766b4915bc 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETCOREAPP2_1 using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; @@ -19,47 +19,27 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Theory] - [InlineData(ANCMVersion.AspNetCoreModule)] - [InlineData(ANCMVersion.AspNetCoreModuleV2)] - public Task HelloWorld_IISExpress_Clr_X64_Portable(ANCMVersion ancmVersion) - { - return HelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, ancmVersion); - } + public static TestMatrix TestVariants + => TestMatrix.ForServers(ServerType.IISExpress) + .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithAllApplicationTypes() + .WithAllAncmVersions(); - [Theory] - [InlineData(ANCMVersion.AspNetCoreModule)] - [InlineData(ANCMVersion.AspNetCoreModuleV2)] - public Task HelloWorld_IISExpress_CoreClr_X64_Portable(ANCMVersion ancmVersion) + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task HelloWorld(TestVariant variant) { - return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, ancmVersion); - } - - [Theory] - [InlineData(ANCMVersion.AspNetCoreModule)] - [InlineData(ANCMVersion.AspNetCoreModuleV2)] - public Task HelloWorld_IISExpress_CoreClr_X64_Standalone(ANCMVersion ancmVersion) - { - return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Standalone, ancmVersion); - } - - private async Task HelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, ANCMVersion ancmVersion) - { - var serverType = ServerType.IISExpress; - var architecture = RuntimeArchitecture.x64; - var testName = $"HelloWorld_{runtimeFlavor}"; + var testName = $"HelloWorld_{variant.Tfm}"; using (StartLog(out var loggerFactory, testName)) { var logger = loggerFactory.CreateLogger("HelloWorldTest"); - var deploymentParameters = new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(variant) { + ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld', - ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/Http.config") : null, + ServerConfigTemplateContent = File.ReadAllText("AppHostConfig/Http.config"), SiteName = "HttpTestSite", // This is configured in the Http.config - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.1", - ApplicationType = applicationType, - ANCMVersion = ancmVersion }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) @@ -107,7 +87,3 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } } -#elif NET461 -#else -#error Target frameworks need to be updated -#endif diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs index 384c890f2e..ddf22e726b 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -1,6 +1,5 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NETCOREAPP2_1 using System; using System.IO; @@ -8,6 +7,7 @@ using System.Net.Http; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; @@ -25,42 +25,28 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Theory] - [InlineData(ANCMVersion.AspNetCoreModule)] - [InlineData(ANCMVersion.AspNetCoreModuleV2)] - public Task Https_HelloWorld_CLR_X64(ANCMVersion ancmVersion) - { - return HttpsHelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44396, ancmVersion); - } + public static TestMatrix TestVariants + => TestMatrix.ForServers(ServerType.IISExpress) + .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithAllAncmVersions(); - [Theory] - [InlineData(ANCMVersion.AspNetCoreModule)] - [InlineData(ANCMVersion.AspNetCoreModuleV2)] - public Task Https_HelloWorld_CoreCLR_X64_Portable(ANCMVersion ancmVersion) + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task HttpsHelloWorld(TestVariant variant) { - return HttpsHelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44394, ancmVersion); - } - - private async Task HttpsHelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, int port, ANCMVersion ancmVersion) - { - var serverType = ServerType.IISExpress; - var architecture = RuntimeArchitecture.x64; - - var applicationBaseUrl = $"https://localhost:{port}/"; - var testName = $"HttpsHelloWorld_{runtimeFlavor}"; + var applicationBaseUrl = $"https://localhost:44394/"; + var testName = $"HttpsHelloWorld_{variant.Tfm}"; using (StartLog(out var loggerFactory, testName)) { var logger = loggerFactory.CreateLogger("HttpsHelloWorldTest"); - var deploymentParameters = new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(variant) { + ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), ApplicationBaseUriHint = applicationBaseUrl, EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld', - ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/Https.config") : null, + ServerConfigTemplateContent = File.ReadAllText("AppHostConfig/Https.config"), SiteName = "HttpsTestSite", // This is configured in the Https.config - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.1", - ApplicationType = applicationType, - ANCMVersion = ancmVersion }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) @@ -93,61 +79,37 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } - [Theory] - [InlineData(ANCMVersion.AspNetCoreModule)] - [InlineData(ANCMVersion.AspNetCoreModuleV2)] - public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable(ANCMVersion ancmVersion) + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public Task HttpsHelloWorld_NoClientCert(TestVariant variant) { - return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44397, sendClientCert: false, ancmVersion); - } - - [Theory] - [InlineData(ANCMVersion.AspNetCoreModule)] - [InlineData(ANCMVersion.AspNetCoreModuleV2)] - public Task Https_HelloWorld_NoClientCert_Clr_X64(ANCMVersion ancmVersion) - { - return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44398, sendClientCert: false, ancmVersion); + return HttpsHelloWorldCerts(variant, port: 44397, sendClientCert: false); } #pragma warning disable xUnit1004 // Test methods should not be skipped - [Theory(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")] - [InlineData(ANCMVersion.AspNetCoreModule)] - [InlineData(ANCMVersion.AspNetCoreModuleV2)] + [ConditionalTheory(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")] + [MemberData(nameof(TestVariants))] #pragma warning restore xUnit1004 // Test methods should not be skipped - public Task Https_HelloWorld_ClientCert_Clr_X64(ANCMVersion ancmVersion) + public Task HttpsHelloWorld_ClientCert(TestVariant variant) { - return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44301, sendClientCert: true, ancmVersion); + return HttpsHelloWorldCerts(variant, port: 44301, sendClientCert: true); } -#pragma warning disable xUnit1004 // Test methods should not be skipped - [Theory(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")] - [InlineData(ANCMVersion.AspNetCoreModule)] - [InlineData(ANCMVersion.AspNetCoreModuleV2)] -#pragma warning restore xUnit1004 // Test methods should not be skipped - public Task Https_HelloWorld_ClientCert_CoreCLR_X64_Portable(ANCMVersion ancmVersion) + private async Task HttpsHelloWorldCerts(TestVariant variant, int port, bool sendClientCert) { - return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44302, sendClientCert: true, ancmVersion); - } - - private async Task HttpsHelloWorldCerts(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, int port, bool sendClientCert, ANCMVersion ancmVersion) - { - var serverType = ServerType.IISExpress; - var architecture = RuntimeArchitecture.x64; var applicationBaseUrl = $"https://localhost:{port}/"; - var testName = $"HttpsHelloWorldCerts_{runtimeFlavor}"; + var testName = $"HttpsHelloWorldCerts_{variant.Tfm}_{sendClientCert}"; using (StartLog(out var loggerFactory, testName)) { var logger = loggerFactory.CreateLogger("HttpsHelloWorldTest"); - var deploymentParameters = new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(variant) { + ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), ApplicationBaseUriHint = applicationBaseUrl, EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld', - ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/Https.config") : null, + ServerConfigTemplateContent = File.ReadAllText("AppHostConfig/Https.config"), SiteName = "HttpsTestSite", // This is configured in the Https.config - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.1", - ApplicationType = applicationType, - ANCMVersion = ancmVersion }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) @@ -230,7 +192,3 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } } -#elif NET461 -#else -#error Target frameworks need to be updated -#endif diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index d9ce75a5c5..b8c0567f3f 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -1,16 +1,13 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NET461 -// Per https://github.com/dotnet/corefx/issues/5045, HttpClientHandler.UseDefaultCredentials does not work correctly in CoreFx. -// We'll require the desktop HttpClient to run these tests. - using System; using System.IO; using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; @@ -25,41 +22,27 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Theory] - [InlineData(ANCMVersion.AspNetCoreModule)] - [InlineData(ANCMVersion.AspNetCoreModuleV2)] - public Task NtlmAuthentication_Clr_X64(ANCMVersion ancmVersion) - { - return NtlmAuthentication(RuntimeFlavor.Clr, ApplicationType.Portable, port: 5051, ancmVersion); - } + public static TestMatrix TestVariants + => TestMatrix.ForServers(ServerType.IISExpress) + .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithAllAncmVersions(); - [Theory] - [InlineData(ANCMVersion.AspNetCoreModule)] - [InlineData(ANCMVersion.AspNetCoreModuleV2)] - public Task NtlmAuthentication_CoreClr_X64_Portable(ANCMVersion ancmVersion) + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task NtlmAuthentication(TestVariant variant) { - return NtlmAuthentication(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 5052, ancmVersion); - } - - private async Task NtlmAuthentication(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, int port, ANCMVersion ancmVersion) - { - var serverType = ServerType.IISExpress; - var architecture = RuntimeArchitecture.x64; - var testName = $"NtlmAuthentication_{runtimeFlavor}"; + var testName = $"NtlmAuthentication_{variant.Tfm}_{variant.AncmVersion}"; using (StartLog(out var loggerFactory, testName)) { var logger = loggerFactory.CreateLogger("NtlmAuthenticationTest"); - var deploymentParameters = new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(variant) { - ApplicationBaseUriHint = $"http://localhost:{port}", + ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), + ApplicationBaseUriHint = $"http://localhost:5052", EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication' - ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/NtlmAuthentation.config") : null, + ServerConfigTemplateContent = File.ReadAllText("AppHostConfig/NtlmAuthentation.config"), SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.1", - ApplicationType = applicationType, - ANCMVersion = ancmVersion, - }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) @@ -126,7 +109,3 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } } -#elif NETCOREAPP2_1 -#else -#error Target frameworks need to be updated -#endif diff --git a/test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs b/test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs index 240f2d35c0..a150572c1f 100644 --- a/test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs +++ b/test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs @@ -4,5 +4,4 @@ // All functional tests in this project require a version of IIS express with an updated schema using Xunit; -[assembly: Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.IISExpressSupportsInProcessHosting] [assembly: CollectionBehavior(DisableTestParallelization = true)] diff --git a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs index d566b4c330..de58d20cee 100644 --- a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs +++ b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs @@ -23,67 +23,52 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [Fact] - public Task UpgradeFeatureDetectionDisabled_InProcess_IISExpress_CoreClr_x64_Portable() + public Task UpgradeFeatureDetectionDisabled_InProcess_IISExpress() { - return UpgradeFeatureDetectionDeployer(RuntimeFlavor.CoreClr, - ApplicationType.Portable, - "AppHostConfig/WebsocketsNotSupported.config", + return UpgradeFeatureDetectionDeployer("AppHostConfig/WebsocketsNotSupported.config", Helpers.GetInProcessTestSitesPath(), "Disabled"); } [Fact] - public Task UpgradeFeatureDetectionEnabled_InProcess_IISExpress_CoreClr_x64_Portable() + public Task UpgradeFeatureDetectionEnabled_InProcess_IISExpress() { - return UpgradeFeatureDetectionDeployer(RuntimeFlavor.CoreClr, - ApplicationType.Portable, - "AppHostConfig/Http.config", + return UpgradeFeatureDetectionDeployer("AppHostConfig/Http.config", Helpers.GetInProcessTestSitesPath(), _isWebsocketsSupported); } [Fact] - public Task UpgradeFeatureDetectionDisabled_OutOfProcess_IISExpress_CoreClr_x64_Portable() + public Task UpgradeFeatureDetectionDisabled_OutOfProcess_IISExpress() { - return UpgradeFeatureDetectionDeployer(RuntimeFlavor.CoreClr, - ApplicationType.Portable, - "AppHostConfig/WebsocketsNotSupported.config", + return UpgradeFeatureDetectionDeployer("AppHostConfig/WebsocketsNotSupported.config", Helpers.GetOutOfProcessTestSitesPath(), "Disabled"); } - // This test is failing on win7 and win2008 [Fact] - public Task UpgradeFeatureDetectionEnabled_OutOfProcess_IISExpress_CoreClr_x64_Portable() + public Task UpgradeFeatureDetectionEnabled_OutOfProcess_IISExpress() { - return UpgradeFeatureDetectionDeployer(RuntimeFlavor.CoreClr, - ApplicationType.Portable, - "AppHostConfig/Http.config", + return UpgradeFeatureDetectionDeployer("AppHostConfig/Http.config", Helpers.GetOutOfProcessTestSitesPath(), _isWebsocketsSupported); } - private async Task UpgradeFeatureDetectionDeployer(RuntimeFlavor runtimeFlavor, - ApplicationType applicationType, - string configPath, - string sitePath, - string expected) + private async Task UpgradeFeatureDetectionDeployer(string configPath, string sitePath, string expected) { - var serverType = ServerType.IISExpress; - var architecture = RuntimeArchitecture.x64; - var testName = $"HelloWorld_{runtimeFlavor}"; + var testName = $"HelloWorld"; using (StartLog(out var loggerFactory, testName)) { var logger = loggerFactory.CreateLogger("HelloWorldTest"); - var deploymentParameters = new DeploymentParameters(sitePath, serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(sitePath, ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { EnvironmentName = "UpgradeFeatureDetection", // Will pick the Start class named 'StartupHelloWorld', - ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText(configPath) : null, + ServerConfigTemplateContent = File.ReadAllText(configPath), SiteName = "HttpTestSite", // This is configured in the Http.config - TargetFramework = "netcoreapp2.1", - ApplicationType = applicationType, - ANCMVersion = ANCMVersion.AspNetCoreModuleV2 + TargetFramework = Tfm.NetCoreApp22, + ApplicationType = ApplicationType.Portable, + AncmVersion = AncmVersion.AspNetCoreModuleV2 }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISExpressSupportsInProcessHostingAttribute.cs b/test/IISIntegration.FunctionalTests/Utilities/IISExpressSupportsInProcessHostingAttribute.cs deleted file mode 100644 index 5f2edd22f6..0000000000 --- a/test/IISIntegration.FunctionalTests/Utilities/IISExpressSupportsInProcessHostingAttribute.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices; -using System.Xml.Linq; -using Microsoft.AspNetCore.Testing.xunit; - -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests -{ - [AttributeUsage(AttributeTargets.Method | AttributeTargets.Assembly | AttributeTargets.Class)] - public sealed class IISExpressSupportsInProcessHostingAttribute : Attribute, ITestCondition - { - public bool IsMet => AncmSchema.SupportsInProcessHosting; - - public string SkipReason => AncmSchema.SkipReason; - - private class AncmSchema - { - public static bool SupportsInProcessHosting { get; } - public static string SkipReason { get; } = "IIS Express must be upgraded to support in-process hosting."; - - static AncmSchema() - { - if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - SkipReason = "IIS Express tests can only be run on Windows"; - return; - } - - var ancmConfigPath = Path.Combine( - Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), - "IIS Express", "config", "schema", "aspnetcore_schema.xml"); - - if (!File.Exists(ancmConfigPath)) - { - SkipReason = "IIS Express is not installed."; - return; - } - - XDocument ancmConfig; - - try - { - ancmConfig = XDocument.Load(ancmConfigPath); - } - catch - { - SkipReason = "Could not read ANCM schema configuration"; - return; - } - - SupportsInProcessHosting = ancmConfig - .Root - .Descendants("attribute") - .Any(n => "hostingModel".Equals(n.Attribute("name")?.Value, StringComparison.Ordinal)); - } - } - } -} diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs index 5fef8660ca..98cb337f4f 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class IISTestSiteFixture : IDisposable { - private readonly IApplicationDeployer _deployer; + private readonly ApplicationDeployer _deployer; public IISTestSiteFixture() { @@ -26,9 +26,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { ServerConfigTemplateContent = File.ReadAllText("AppHostConfig/Http.config"), SiteName = "HttpTestSite", - TargetFramework = "netcoreapp2.1", + TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, - ANCMVersion = ANCMVersion.AspNetCoreModuleV2, + AncmVersion = AncmVersion.AspNetCoreModuleV2, + HostingModel = HostingModel.InProcess, }; _deployer = ApplicationDeployerFactory.Create(deploymentParameters, logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture))); From f72d366603244be806ae8cc940d639c39683d7f2 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 16 May 2018 16:45:18 -0700 Subject: [PATCH 027/363] Split config and hostfxr parsing between shim and request handler. (#814) --- samples/IISSample/web.config | 4 +- .../AspNetCore/AspNetCore.vcxproj | 10 +- .../AspNetCore/Inc/applicationinfo.h | 20 +- .../AspNetCore/Inc/applicationmanager.h | 2 +- .../AspNetCore/Inc/aspnetcore_shim_config.h | 176 +++++++++++++ .../AspNetCore/Inc/fx_ver.h | 49 ---- .../AspNetCore/src/applicationinfo.cpp | 20 +- .../AspNetCore/src/applicationmanager.cxx | 2 +- .../AspNetCore/src/aspnetcore_shim_config.cpp | 240 ++++++++++++++++++ .../AspNetCore/src/precomp.hxx | 19 +- .../AspNetCore/src/proxymodule.cxx | 10 +- .../CommonLib/CommonLib.vcxproj | 12 +- src/AspNetCoreModuleV2/CommonLib/fx_ver.h | 1 - .../CommonLib/hostfxr_utility.cpp | 161 ++++++++---- .../CommonLib/hostfxr_utility.h | 56 ++-- .../CommonLib/iapplication.h | 6 +- .../CommonLib/irequesthandler.h | 2 - src/AspNetCoreModuleV2/CommonLib/stdafx.h | 29 +-- src/AspNetCoreModuleV2/CommonLib/utility.cxx | 48 ---- src/AspNetCoreModuleV2/CommonLib/utility.h | 14 - .../RequestHandler/RequestHandler.vcxproj | 2 + .../RequestHandler/dllmain.cxx | 23 +- .../inprocess/inprocessapplication.cpp | 28 +- .../inprocess/inprocessapplication.h | 20 +- .../inprocess/inprocesshandler.cpp | 6 +- .../inprocess/inprocesshandler.h | 3 - .../RequestHandler/managedexports.cxx | 7 +- .../outofprocess/forwardinghandler.cpp | 11 +- .../outofprocess/forwardinghandler.h | 8 +- .../outofprocess/outprocessapplication.cpp | 59 ++++- .../outofprocess/outprocessapplication.h | 29 ++- .../outofprocess/processmanager.cxx | 7 +- .../outofprocess/processmanager.h | 7 +- .../outofprocess/protocolconfig.cxx | 2 +- .../outofprocess/protocolconfig.h | 2 +- .../outofprocess/serverprocess.cxx | 8 +- .../outofprocess/serverprocess.h | 4 +- .../outofprocess/websockethandler.cxx | 4 +- .../outofprocess/winhttphelper.cxx | 11 +- .../RequestHandler/precomp.hxx | 37 +-- .../requesthandler_config.cpp} | 181 ++++++------- .../requesthandler_config.h} | 69 ++--- test/CommonLibTests/CommonLibTests.vcxproj | 11 +- test/CommonLibTests/hostfxr_utility_tests.cpp | 4 +- test/CommonLibTests/stdafx.h | 1 - 45 files changed, 919 insertions(+), 506 deletions(-) create mode 100644 src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h delete mode 100644 src/AspNetCoreModuleV2/AspNetCore/Inc/fx_ver.h create mode 100644 src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp rename src/AspNetCoreModuleV2/{CommonLib/aspnetcoreconfig.cxx => RequestHandler/requesthandler_config.cpp} (76%) rename src/AspNetCoreModuleV2/{CommonLib/aspnetcoreconfig.h => RequestHandler/requesthandler_config.h} (85%) diff --git a/samples/IISSample/web.config b/samples/IISSample/web.config index 1ee540eb0f..ca998a82a4 100644 --- a/samples/IISSample/web.config +++ b/samples/IISSample/web.config @@ -9,11 +9,11 @@ - + - + diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index e848a32af8..be9582b9df 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -82,7 +82,7 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) precomp.hxx $(IntDir)$(TargetName).pch - ..\IISLib;.\Inc + ..\IISLib;inc;..\CommonLib ProgramDatabase MultiThreadedDebug true @@ -115,7 +115,7 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) precomp.hxx $(IntDir)$(TargetName).pch - ..\IISLib;.\Inc + ..\IISLib;inc;..\CommonLib ProgramDatabase MultiThreadedDebug true @@ -148,7 +148,7 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - ..\IISLib;inc + ..\IISLib;inc;..\CommonLib precomp.hxx MultiThreaded true @@ -184,7 +184,7 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) precomp.hxx - ..\IISLib;inc + ..\IISLib;inc;..\CommonLib MultiThreaded true true @@ -213,6 +213,7 @@ + @@ -222,6 +223,7 @@ + diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h index 96532217e6..b40a16c1a9 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h @@ -9,9 +9,10 @@ extern BOOL g_fRecycleProcessCalled; typedef HRESULT (WINAPI * PFN_ASPNETCORE_CREATE_APPLICATION)( - _In_ IHttpServer *pServer, - _In_ ASPNETCORE_CONFIG *pConfig, - _Out_ IAPPLICATION **pApplication + _In_ IHttpServer *pServer, + _In_ IHttpContext *pHttpContext, + _In_ PCWSTR pwzExeLocation, // TODO remove both pwzExeLocation and pHttpContext from this api + _Out_ IAPPLICATION **pApplication ); // @@ -79,7 +80,7 @@ public: HRESULT Initialize( - _In_ ASPNETCORE_CONFIG *pConfiguration, + _In_ ASPNETCORE_SHIM_CONFIG *pConfiguration, _In_ FILE_WATCHER *pFileWatcher ); @@ -115,7 +116,7 @@ public: HRESULT StartMonitoringAppOffline(); - ASPNETCORE_CONFIG* + ASPNETCORE_SHIM_CONFIG* QueryConfig() { return m_pConfiguration; @@ -145,7 +146,10 @@ public: ShutDownApplication(); HRESULT - EnsureApplicationCreated(); + EnsureApplicationCreated( + IHttpContext *pHttpContext, + STRU* exeLocation + ); private: HRESULT FindRequestHandlerAssembly(); @@ -159,8 +163,8 @@ private: BOOL m_fAppOfflineFound; APP_OFFLINE_HTM *m_pAppOfflineHtm; FILE_WATCHER_ENTRY *m_pFileWatcherEntry; - ASPNETCORE_CONFIG *m_pConfiguration; - IAPPLICATION *m_pApplication; + ASPNETCORE_SHIM_CONFIG *m_pConfiguration; + IAPPLICATION *m_pApplication; SRWLOCK m_srwLock; IHttpServer *m_pServer; PFN_ASPNETCORE_CREATE_APPLICATION m_pfnAspNetCoreCreateApplication; diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h index 7201d7de49..3e035e2133 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h @@ -65,7 +65,7 @@ public: HRESULT GetOrCreateApplicationInfo( _In_ IHttpServer* pServer, - _In_ ASPNETCORE_CONFIG* pConfig, + _In_ ASPNETCORE_SHIM_CONFIG* pConfig, _Out_ APPLICATION_INFO ** ppApplicationInfo ); diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h new file mode 100644 index 0000000000..55cbd4ca7b --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h @@ -0,0 +1,176 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +#define CS_ASPNETCORE_SECTION L"system.webServer/aspNetCore" +#define CS_ASPNETCORE_PROCESS_EXE_PATH L"processPath" +#define CS_ASPNETCORE_PROCESS_ARGUMENTS L"arguments" +#define CS_ASPNETCORE_HOSTING_MODEL L"hostingModel" + +enum APP_HOSTING_MODEL +{ + HOSTING_UNKNOWN = 0, + HOSTING_IN_PROCESS, + HOSTING_OUT_PROCESS +}; + +class ASPNETCORE_SHIM_CONFIG : IHttpStoredContext +{ +public: + virtual + ~ASPNETCORE_SHIM_CONFIG(); + + static + HRESULT + GetConfig( + _In_ IHttpServer *pHttpServer, + _In_ HTTP_MODULE_ID pModuleId, + _In_ IHttpApplication *pHttpApplication, + _In_ HANDLE hEventLog, + _Out_ STRU *pcwzExePath, + _Out_ ASPNETCORE_SHIM_CONFIG **ppAspNetCoreConfig + ); + + HRESULT + Populate( + IHttpServer *pHttpServer, + IHttpApplication *pHttpContext + ); + + VOID + ReferenceConfiguration( + VOID + ) const; + + VOID + DereferenceConfiguration( + VOID + ) const; + + + VOID + CleanupStoredContext( + VOID + ) + { + DereferenceConfiguration(); + } + + STRU* + QueryApplicationPhysicalPath( + VOID + ) + { + return &m_struApplicationPhysicalPath; + } + + STRU* + QueryApplicationPath( + VOID + ) + { + return &m_struApplication; + } + + CONST + PCWSTR* + QueryHostFxrArguments( + VOID + ) + { + return m_ppStrArguments; + } + + CONST + DWORD + QueryHostFxrArgCount( + VOID + ) + { + return m_dwArgc; + } + + STRU* + QueryConfigPath( + VOID + ) + { + return &m_struConfigPath; + } + + STRU* + QueryProcessPath( + VOID + ) + { + return &m_struProcessPath; + } + + STRU* + QueryArguments( + VOID + ) + { + return &m_struArguments; + } + + HRESULT + SetHostFxrFullPath( + PCWSTR pStrHostFxrFullPath + ) + { + return m_struHostFxrLocation.Copy(pStrHostFxrFullPath); + } + + APP_HOSTING_MODEL + QueryHostingModel( + VOID + ) + { + return m_hostingModel; + } + + CONST + PCWSTR + QueryHostFxrFullPath( + VOID + ) + { + return m_struHostFxrLocation.QueryStr(); + } + + VOID + SetHostFxrArguments( + DWORD dwArgc, + PWSTR* ppStrArguments + ) + { + if (m_ppStrArguments != NULL) + { + delete[] m_ppStrArguments; + } + + m_dwArgc = dwArgc; + m_ppStrArguments = ppStrArguments; + } + +private: + ASPNETCORE_SHIM_CONFIG() : + m_cRefs(1), + m_hostingModel(HOSTING_UNKNOWN), + m_ppStrArguments(NULL) + { + } + + mutable LONG m_cRefs; + STRU m_struArguments; + STRU m_struProcessPath; + STRU m_struApplication; + STRU m_struApplicationPhysicalPath; + STRU m_struConfigPath; + APP_HOSTING_MODEL m_hostingModel; + STRU m_struHostFxrLocation; + PWSTR* m_ppStrArguments; + DWORD m_dwArgc; +}; + diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/fx_ver.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/fx_ver.h deleted file mode 100644 index f485ba5a6e..0000000000 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/fx_ver.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#ifndef __FX_VER_H__ -#define __FX_VER_H__ -#include - -// Note: This is not SemVer (esp., in comparing pre-release part, fx_ver_t does not -// compare multiple dot separated identifiers individually.) ex: 1.0.0-beta.2 vs. 1.0.0-beta.11 -struct fx_ver_t -{ - fx_ver_t(int major, int minor, int patch); - fx_ver_t(int major, int minor, int patch, const std::wstring& pre); - fx_ver_t(int major, int minor, int patch, const std::wstring& pre, const std::wstring& build); - - int get_major() const { return m_major; } - int get_minor() const { return m_minor; } - int get_patch() const { return m_patch; } - - void set_major(int m) { m_major = m; } - void set_minor(int m) { m_minor = m; } - void set_patch(int p) { m_patch = p; } - - bool is_prerelease() const { return !m_pre.empty(); } - - std::wstring as_str() const; - std::wstring prerelease_glob() const; - std::wstring patch_glob() const; - - bool operator ==(const fx_ver_t& b) const; - bool operator !=(const fx_ver_t& b) const; - bool operator <(const fx_ver_t& b) const; - bool operator >(const fx_ver_t& b) const; - bool operator <=(const fx_ver_t& b) const; - bool operator >=(const fx_ver_t& b) const; - - static bool parse(const std::wstring& ver, fx_ver_t* fx_ver, bool parse_only_production = false); - -private: - int m_major; - int m_minor; - int m_patch; - std::wstring m_pre; - std::wstring m_build; - - static int compare(const fx_ver_t&a, const fx_ver_t& b); -}; - -#endif // __FX_VER_H__ \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 20d8ef7915..656e903b76 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -42,8 +42,8 @@ APPLICATION_INFO::~APPLICATION_INFO() HRESULT APPLICATION_INFO::Initialize( - _In_ ASPNETCORE_CONFIG *pConfiguration, - _In_ FILE_WATCHER *pFileWatcher + _In_ ASPNETCORE_SHIM_CONFIG *pConfiguration, + _In_ FILE_WATCHER *pFileWatcher ) { HRESULT hr = S_OK; @@ -177,11 +177,14 @@ APPLICATION_INFO::UpdateAppOfflineFileHandle() } HRESULT -APPLICATION_INFO::EnsureApplicationCreated() +APPLICATION_INFO::EnsureApplicationCreated( + IHttpContext *pHttpContext, + STRU* struExeLocation +) { HRESULT hr = S_OK; BOOL fLocked = FALSE; - IAPPLICATION* pApplication = NULL; + IAPPLICATION *pApplication = NULL; STACK_STRU(struFileName, 300); // >MAX_PATH STRU struHostFxrDllLocation; @@ -222,11 +225,8 @@ APPLICATION_INFO::EnsureApplicationCreated() goto Finished; } - hr = m_pfnAspNetCoreCreateApplication(m_pServer, m_pConfiguration, &pApplication); - if (FAILED(hr)) - { - goto Finished; - } + hr = m_pfnAspNetCoreCreateApplication(m_pServer, pHttpContext, struExeLocation->QueryStr(), &pApplication); + m_pApplication = pApplication; } } @@ -314,6 +314,7 @@ APPLICATION_INFO::FindRequestHandlerAssembly() hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; } + g_fAspnetcoreRHAssemblyLoaded = TRUE; } @@ -323,6 +324,7 @@ Finished: // User needs to check whether the fuction pointer is NULL // m_pfnAspNetCoreCreateApplication = g_pfnAspNetCoreCreateApplication; + if (!g_fAspnetcoreRHLoadedError && FAILED(hr)) { g_fAspnetcoreRHLoadedError = TRUE; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx index fd83a19818..c5e52862ad 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx @@ -13,7 +13,7 @@ APPLICATION_MANAGER* APPLICATION_MANAGER::sm_pApplicationManager = NULL; HRESULT APPLICATION_MANAGER::GetOrCreateApplicationInfo( _In_ IHttpServer* pServer, - _In_ ASPNETCORE_CONFIG* pConfig, + _In_ ASPNETCORE_SHIM_CONFIG* pConfig, _Out_ APPLICATION_INFO ** ppApplicationInfo ) { diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp new file mode 100644 index 0000000000..dc100d8d21 --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp @@ -0,0 +1,240 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "precomp.hxx" + +ASPNETCORE_SHIM_CONFIG::~ASPNETCORE_SHIM_CONFIG() +{ + if (m_ppStrArguments != NULL) + { + delete[] m_ppStrArguments; + m_ppStrArguments = NULL; + } +} + +VOID +ASPNETCORE_SHIM_CONFIG::ReferenceConfiguration( + VOID +) const +{ + InterlockedIncrement(&m_cRefs); +} + +VOID +ASPNETCORE_SHIM_CONFIG::DereferenceConfiguration( + VOID +) const +{ + DBG_ASSERT(m_cRefs != 0); + LONG cRefs = 0; + if ((cRefs = InterlockedDecrement(&m_cRefs)) == 0) + { + delete this; + } +} + +HRESULT +ASPNETCORE_SHIM_CONFIG::GetConfig( + _In_ IHttpServer *pHttpServer, + _In_ HTTP_MODULE_ID pModuleId, + _In_ IHttpApplication *pHttpApplication, + _In_ HANDLE hEventLog, + _Out_ STRU *struExeLocation, + _Out_ ASPNETCORE_SHIM_CONFIG **ppAspNetCoreShimConfig +) +{ + HRESULT hr = S_OK; + ASPNETCORE_SHIM_CONFIG *pAspNetCoreShimConfig = NULL; + STRU struHostFxrDllLocation; + STRU struExeAbsolutePath; + BSTR* pwzArgv; + DWORD dwArgCount; + if (ppAspNetCoreShimConfig == NULL) + { + hr = E_INVALIDARG; + goto Finished; + } + + *ppAspNetCoreShimConfig = NULL; + + // potential bug if user sepcific config at virtual dir level + pAspNetCoreShimConfig = (ASPNETCORE_SHIM_CONFIG*) + pHttpApplication->GetModuleContextContainer()->GetModuleContext(pModuleId); + + if (pAspNetCoreShimConfig != NULL) + { + *ppAspNetCoreShimConfig = pAspNetCoreShimConfig; + pAspNetCoreShimConfig = NULL; + goto Finished; + } + + pAspNetCoreShimConfig = new ASPNETCORE_SHIM_CONFIG; + if (pAspNetCoreShimConfig == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } + + hr = pAspNetCoreShimConfig->Populate(pHttpServer, pHttpApplication); + if (FAILED(hr)) + { + goto Finished; + } + + // Modify Inprocess specific configuration here. + if (pAspNetCoreShimConfig->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) + { + if (FAILED(hr = HOSTFXR_UTILITY::GetHostFxrParameters( + hEventLog, + pAspNetCoreShimConfig->QueryProcessPath()->QueryStr(), + pAspNetCoreShimConfig->QueryApplicationPhysicalPath()->QueryStr(), + pAspNetCoreShimConfig->QueryArguments()->QueryStr(), + &struHostFxrDllLocation, + &struExeAbsolutePath, + &dwArgCount, + &pwzArgv))) + { + goto Finished; + } + + if (FAILED(hr = pAspNetCoreShimConfig->SetHostFxrFullPath(struHostFxrDllLocation.QueryStr()))) + { + goto Finished; + } + + pAspNetCoreShimConfig->SetHostFxrArguments(dwArgCount, pwzArgv); + + struExeLocation->Copy(struExeAbsolutePath); + } + + hr = pHttpApplication->GetModuleContextContainer()-> + SetModuleContext(pAspNetCoreShimConfig, pModuleId); + + if (FAILED(hr)) + { + if (hr == HRESULT_FROM_WIN32(ERROR_ALREADY_ASSIGNED)) + { + delete pAspNetCoreShimConfig; + + pAspNetCoreShimConfig = (ASPNETCORE_SHIM_CONFIG*)pHttpApplication-> + GetModuleContextContainer()-> + GetModuleContext(pModuleId); + + _ASSERT(pAspNetCoreShimConfig != NULL); + + hr = S_OK; + } + else + { + goto Finished; + } + } + else + { + DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, + "ASPNETCORE_SHIM_CONFIG::GetConfig, set config to ModuleContext"); + } + + *ppAspNetCoreShimConfig = pAspNetCoreShimConfig; + pAspNetCoreShimConfig = NULL; + +Finished: + + if (pAspNetCoreShimConfig != NULL) + { + delete pAspNetCoreShimConfig; + pAspNetCoreShimConfig = NULL; + } + + return hr; +} + + +HRESULT +ASPNETCORE_SHIM_CONFIG::Populate( + IHttpServer *pHttpServer, + IHttpApplication *pHttpApplication +) +{ + STACK_STRU(strHostingModel, 300); + HRESULT hr = S_OK; + STRU strApplicationFullPath; + IAppHostAdminManager *pAdminManager = NULL; + IAppHostElement *pAspNetCoreElement = NULL; + BSTR bstrAspNetCoreSection = NULL; + + pAdminManager = pHttpServer->GetAdminManager(); + hr = m_struConfigPath.Copy(pHttpApplication->GetAppConfigPath()); + if (FAILED(hr)) + { + goto Finished; + } + + hr = m_struApplicationPhysicalPath.Copy(pHttpApplication->GetApplicationPhysicalPath()); + if (FAILED(hr)) + { + goto Finished; + } + + bstrAspNetCoreSection = SysAllocString(CS_ASPNETCORE_SECTION); + + hr = pAdminManager->GetAdminSection(bstrAspNetCoreSection, + m_struConfigPath.QueryStr(), + &pAspNetCoreElement); + if (FAILED(hr)) + { + goto Finished; + } + + hr = GetElementStringProperty(pAspNetCoreElement, + CS_ASPNETCORE_PROCESS_EXE_PATH, + &m_struProcessPath); + if (FAILED(hr)) + { + goto Finished; + } + + hr = GetElementStringProperty(pAspNetCoreElement, + CS_ASPNETCORE_HOSTING_MODEL, + &strHostingModel); + if (FAILED(hr)) + { + // Swallow this error for backward compatability + // Use default behavior for empty string + hr = S_OK; + } + + if (strHostingModel.IsEmpty() || strHostingModel.Equals(L"outofprocess", TRUE)) + { + m_hostingModel = HOSTING_OUT_PROCESS; + } + else if (strHostingModel.Equals(L"inprocess", TRUE)) + { + m_hostingModel = HOSTING_IN_PROCESS; + } + else + { + // block unknown hosting value + hr = HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); + goto Finished; + } + + hr = GetElementStringProperty(pAspNetCoreElement, + CS_ASPNETCORE_PROCESS_ARGUMENTS, + &m_struArguments); + if (FAILED(hr)) + { + goto Finished; + } + +Finished: + + if (pAspNetCoreElement != NULL) + { + pAspNetCoreElement->Release(); + pAspNetCoreElement = NULL; + } + + return hr; +} + diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx index bd07247484..d411a47308 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx @@ -101,16 +101,17 @@ inline bool IsSpace(char ch) #include #include -#include "..\..\CommonLib\environmentvariablehash.h" -#include "..\..\CommonLib\aspnetcoreconfig.h" -#include "..\..\CommonLib\hostfxr_utility.h" -#include "..\..\CommonLib\iapplication.h" -#include "..\..\CommonLib\utility.h" -#include "..\..\CommonLib\debugutil.h" -#include "..\..\CommonLib\requesthandler.h" -#include "..\..\CommonLib\resources.h" -#include "..\..\CommonLib\aspnetcore_msg.h" +#include "environmentvariablehash.h" +#include "hostfxr_utility.h" +#include "utility.h" +#include "debugutil.h" +#include "requesthandler.h" +#include "resources.h" +#include "aspnetcore_msg.h" //#include "aspnetcore_event.h" +#include "aspnetcore_shim_config.h" +#include "fx_ver.h" + #include "appoffline.h" #include "filewatcher.h" #include "applicationinfo.h" diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index 0c295fbd0c..141f3fb36a 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -46,7 +46,6 @@ Return value: WEBSOCKET_HANDLER::StaticTerminate();*/ ALLOC_CACHE_HANDLER::StaticTerminate(); - delete this; } @@ -78,18 +77,20 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( ) { HRESULT hr = S_OK; - ASPNETCORE_CONFIG *pConfig = NULL; + ASPNETCORE_SHIM_CONFIG *pConfig = NULL; APPLICATION_MANAGER *pApplicationManager = NULL; REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; IAPPLICATION* pApplication = NULL; + STRU struExeLocation; STACK_STRU(struFileName, 256); + if (g_fInShutdown) { hr = HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS); goto Finished; } - hr = ASPNETCORE_CONFIG::GetConfig(g_pHttpServer, g_pModuleId, pHttpContext, g_hEventLog, &pConfig); + hr = ASPNETCORE_SHIM_CONFIG::GetConfig(g_pHttpServer, g_pModuleId, pHttpContext->GetApplication(), g_hEventLog, &struExeLocation, &pConfig); if (FAILED(hr)) { goto Finished; @@ -143,7 +144,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( } // make sure assmebly is loaded and application is created - hr = m_pApplicationInfo->EnsureApplicationCreated(); + hr = m_pApplicationInfo->EnsureApplicationCreated(pHttpContext, &struExeLocation); if (FAILED(hr)) { goto Finished; @@ -163,7 +164,6 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( // Create RequestHandler and process the request hr = pApplication->CreateHandler(pHttpContext, - (HTTP_MODULE_ID*) &g_pModuleId, &m_pHandler); if (FAILED(hr)) diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 525198f1b6..73b08b965e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -95,6 +95,7 @@ MultiThreadedDebug false ProgramDatabase + ..\iislib; Windows @@ -114,6 +115,7 @@ false MultiThreadedDebug false + ..\iislib; Windows @@ -133,6 +135,7 @@ true MultiThreaded false + ..\iislib; Windows @@ -152,8 +155,7 @@ false NDEBUG;_LIB;%(PreprocessorDefinitions) true - - + ..\iislib; MultiThreaded @@ -171,13 +173,12 @@ + + - - - @@ -186,7 +187,6 @@ - diff --git a/src/AspNetCoreModuleV2/CommonLib/fx_ver.h b/src/AspNetCoreModuleV2/CommonLib/fx_ver.h index 1626b2697c..a8f8e26fff 100644 --- a/src/AspNetCoreModuleV2/CommonLib/fx_ver.h +++ b/src/AspNetCoreModuleV2/CommonLib/fx_ver.h @@ -43,4 +43,3 @@ private: static int compare(const fx_ver_t&a, const fx_ver_t& b); }; - diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index 1ad02feba2..68e6ea0584 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -26,12 +26,12 @@ HOSTFXR_UTILITY::~HOSTFXR_UTILITY() HRESULT HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( PCWSTR pwzExeAbsolutePath, // includes .exe file extension. - PCWSTR pcwzApplicationPhysicalPath, + PCWSTR pcwzApplicationPhysicalPath, PCWSTR pcwzArguments, HANDLE hEventLog, - _Inout_ STRU* struHostFxrDllLocation, - _Out_ DWORD* pdwArgCount, - _Out_ PWSTR** ppwzArgv + _Inout_ STRU* pStruHostFxrDllLocation, + _Out_ DWORD* pdwArgCount, + _Out_ BSTR** ppwzArgv ) { HRESULT hr = S_OK; @@ -42,36 +42,36 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( DWORD dwPosition; // Obtain the app name from the processPath section. - if ( FAILED( hr = struDllPath.Copy( pwzExeAbsolutePath ) ) ) + if (FAILED(hr = struDllPath.Copy(pwzExeAbsolutePath))) { goto Finished; } - dwPosition = struDllPath.LastIndexOf( L'.', 0 ); - if ( dwPosition == -1 ) + dwPosition = struDllPath.LastIndexOf(L'.', 0); + if (dwPosition == -1) { hr = E_FAIL; goto Finished; } - hr = UTILITY::ConvertPathToFullPath( L".\\hostfxr.dll", pcwzApplicationPhysicalPath, &struHostFxrPath ); - if ( FAILED( hr ) ) + hr = UTILITY::ConvertPathToFullPath(L".\\hostfxr.dll", pcwzApplicationPhysicalPath, &struHostFxrPath); + if (FAILED(hr)) { goto Finished; } - struDllPath.QueryStr()[dwPosition] = L'\0'; - if (FAILED(hr = struDllPath.SyncWithBuffer())) - { - goto Finished; - } + struDllPath.QueryStr()[dwPosition] = L'\0'; + if (FAILED(hr = struDllPath.SyncWithBuffer())) + { + goto Finished; + } - if ( !UTILITY::CheckIfFileExists( struHostFxrPath.QueryStr() ) ) + if (!UTILITY::CheckIfFileExists(struHostFxrPath.QueryStr())) { // Most likely a full framework app. // Check that the runtime config file doesn't exist in the folder as another heuristic. if (FAILED(hr = struRuntimeConfigLocation.Copy(struDllPath)) || - FAILED(hr = struRuntimeConfigLocation.Append( L".runtimeconfig.json" ))) + FAILED(hr = struRuntimeConfigLocation.Append(L".runtimeconfig.json"))) { goto Finished; } @@ -80,28 +80,28 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; UTILITY::LogEventF(hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP, - ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP_MSG, - pcwzApplicationPhysicalPath, - hr); + EVENTLOG_ERROR_TYPE, + ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP, + ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP_MSG, + pcwzApplicationPhysicalPath, + hr); } else { // If a runtime config file does exist, report a file not found on the app.exe hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - UTILITY::LogEventF(hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND, - ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_MSG, - pcwzApplicationPhysicalPath, - hr); + UTILITY::LogEventF(hEventLog, + EVENTLOG_ERROR_TYPE, + ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND, + ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_MSG, + pcwzApplicationPhysicalPath, + hr); } goto Finished; } - if (FAILED(hr = struHostFxrDllLocation->Copy(struHostFxrPath))) + if (FAILED(hr = pStruHostFxrDllLocation->Copy(struHostFxrPath))) { goto Finished; } @@ -142,15 +142,26 @@ Finished: return hr; } +BOOL +HOSTFXR_UTILITY::IsDotnetExecutable(STRU *struExecutablePath) +{ + if (struExecutablePath == NULL) + { + return FALSE; + } + return struExecutablePath->EndsWith(L"dotnet.exe") || struExecutablePath->EndsWith(L"dotnet"); +} + HRESULT HOSTFXR_UTILITY::GetHostFxrParameters( - HANDLE hEventLog, - PCWSTR pcwzProcessPath, - PCWSTR pcwzApplicationPhysicalPath, - PCWSTR pcwzArguments, - _Inout_ STRU* struHostFxrDllLocation, - _Out_ DWORD* pdwArgCount, - _Out_ BSTR** pbstrArgv + _In_ HANDLE hEventLog, + _In_ PCWSTR pcwzProcessPath, + _In_ PCWSTR pcwzApplicationPhysicalPath, + _In_ PCWSTR pcwzArguments, + _Inout_ STRU *pStruHostFxrDllLocation, + _Inout_ STRU *pStruExeAbsolutePath, + _Out_ DWORD *pdwArgCount, + _Out_ BSTR **pbstrArgv ) { HRESULT hr = S_OK; @@ -182,7 +193,7 @@ HOSTFXR_UTILITY::GetHostFxrParameters( } // Check if the absolute path is to dotnet or not. - if (struAbsolutePathToDotnet.EndsWith(L"dotnet.exe") || struAbsolutePathToDotnet.EndsWith(L"dotnet")) + if (HOSTFXR_UTILITY::IsDotnetExecutable(&struAbsolutePathToDotnet)) { // // The processPath ends with dotnet.exe or dotnet @@ -199,7 +210,7 @@ HOSTFXR_UTILITY::GetHostFxrParameters( goto Finished; } - if (FAILED(hr = ParseHostfxrArguments( + if (FAILED(hr = HOSTFXR_UTILITY::ParseHostfxrArguments( struExpandedArguments.QueryStr(), struAbsolutePathToDotnet.QueryStr(), pcwzApplicationPhysicalPath, @@ -210,10 +221,14 @@ HOSTFXR_UTILITY::GetHostFxrParameters( goto Finished; } - if (FAILED(hr = struHostFxrDllLocation->Copy(struAbsolutePathToHostFxr))) + if (FAILED(hr = pStruHostFxrDllLocation->Copy(struAbsolutePathToHostFxr))) { goto Finished; } + + if (FAILED(hr = pStruExeAbsolutePath->Copy(struAbsolutePathToDotnet))) { + goto Finished; + } } else { @@ -224,14 +239,22 @@ HOSTFXR_UTILITY::GetHostFxrParameters( // if (UTILITY::CheckIfFileExists(struAbsolutePathToDotnet.QueryStr())) { - hr = GetStandaloneHostfxrParameters( + hr = HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( struAbsolutePathToDotnet.QueryStr(), pcwzApplicationPhysicalPath, struExpandedArguments.QueryStr(), hEventLog, - struHostFxrDllLocation, + pStruHostFxrDllLocation, pdwArgCount, pbstrArgv); + if (FAILED(hr)) + { + goto Finished; + } + + if (FAILED(hr = pStruExeAbsolutePath->Copy(struAbsolutePathToDotnet))) { + goto Finished; + } } else { @@ -272,10 +295,10 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( _Out_ BSTR** pbstrArgv ) { - UNREFERENCED_PARAMETER( hEventLog ); // TODO use event log to set errors. + UNREFERENCED_PARAMETER(hEventLog); // TODO use event log to set errors. - DBG_ASSERT(dwArgCount != NULL); - DBG_ASSERT(pwzArgv != NULL); + DBG_ASSERT(dwArgCount != NULL); + DBG_ASSERT(pwzArgv != NULL); HRESULT hr = S_OK; INT argc = 0; @@ -484,7 +507,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( } // As we use the logic from core-setup, we are opting to use std here. - UTILITY::FindDotNetFolders(struHostFxrSearchExpression.QueryStr(), &vVersionFolders); + HOSTFXR_UTILITY::FindDotNetFolders(struHostFxrSearchExpression.QueryStr(), &vVersionFolders); if (vVersionFolders.size() == 0) { @@ -498,7 +521,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( goto Finished; } - hr = UTILITY::FindHighestDotNetVersion(vVersionFolders, &struHighestDotnetVersion); + hr = FindHighestDotNetVersion(vVersionFolders, &struHighestDotnetVersion); if (FAILED(hr)) { goto Finished; @@ -805,3 +828,51 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnetFromProgramFiles( Finished: return hr; } + +HRESULT +HOSTFXR_UTILITY::FindHighestDotNetVersion( + _In_ std::vector vFolders, + _Out_ STRU *pstrResult +) +{ + HRESULT hr = S_OK; + fx_ver_t max_ver(-1, -1, -1); + for (const auto& dir : vFolders) + { + fx_ver_t fx_ver(-1, -1, -1); + if (fx_ver_t::parse(dir, &fx_ver, false)) + { + // TODO using max instead of std::max works + max_ver = max(max_ver, fx_ver); + } + } + + hr = pstrResult->Copy(max_ver.as_str().c_str()); + + // we check FAILED(hr) outside of function + return hr; +} + +VOID +HOSTFXR_UTILITY::FindDotNetFolders( + _In_ PCWSTR pszPath, + _Out_ std::vector *pvFolders +) +{ + HANDLE handle = NULL; + WIN32_FIND_DATAW data = { 0 }; + + handle = FindFirstFileExW(pszPath, FindExInfoStandard, &data, FindExSearchNameMatch, NULL, 0); + if (handle == INVALID_HANDLE_VALUE) + { + return; + } + + do + { + std::wstring folder(data.cFileName); + pvFolders->push_back(folder); + } while (FindNextFileW(handle, &data)); + + FindClose(handle); +} diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index e7703c5bfa..381270a222 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -11,20 +11,6 @@ typedef INT(*hostfxr_main_fn) (CONST DWORD argc, CONST PCWSTR argv[]); class HOSTFXR_UTILITY { public: - HOSTFXR_UTILITY(); - ~HOSTFXR_UTILITY(); - - static - HRESULT - GetHostFxrParameters( - HANDLE hEventLog, - PCWSTR pcwzProcessPath, - PCWSTR pcwzApplicationPhysicalPath, - PCWSTR pcwzArguments, - _Inout_ STRU* pStruHostFxrDllLocation, - _Out_ DWORD* pdwArgCount, - _Out_ BSTR** ppwzArgv - ); static HRESULT @@ -42,11 +28,30 @@ public: HRESULT ParseHostfxrArguments( PCWSTR pwzArgumentsFromConfig, - PCWSTR pwzExePath, - PCWSTR pcwzApplicationPhysicalPath, + PCWSTR pwzExePath, + PCWSTR pcwzApplicationPhysicalPath, HANDLE hEventLog, _Out_ DWORD* pdwArgCount, - _Out_ BSTR** ppwzArgv + _Out_ BSTR** pbstrArgv + ); + + static + BOOL + IsDotnetExecutable( + STRU* struExecutablePath + ); + + static + HRESULT + GetHostFxrParameters( + _In_ HANDLE hEventLog, + _In_ PCWSTR pcwzProcessPath, + _In_ PCWSTR pcwzApplicationPhysicalPath, + _In_ PCWSTR pcwzArguments, + _Inout_ STRU *pStruHostFxrDllLocation, + _Inout_ STRU *struExeAbsolutePath, + _Out_ DWORD *pdwArgCount, + _Out_ BSTR **ppwzArgv ); static @@ -74,5 +79,22 @@ public: GetAbsolutePathToDotnetFromProgramFiles( _Inout_ STRU* pStruAbsolutePathToDotnet ); + + static + HRESULT + FindHighestDotNetVersion( + _In_ std::vector vFolders, + _Out_ STRU *pstrResult + ); + + static + VOID + FindDotNetFolders( + _In_ PCWSTR pszPath, + _Out_ std::vector *pvFolders + ); + + HOSTFXR_UTILITY(); + ~HOSTFXR_UTILITY(); }; diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h index 95d726ead7..36b2b40ddb 100644 --- a/src/AspNetCoreModuleV2/CommonLib/iapplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -3,6 +3,8 @@ #pragma once +class IREQUEST_HANDLER; + enum APPLICATION_STATUS { UNKNOWN = 0, @@ -15,6 +17,7 @@ enum APPLICATION_STATUS class IAPPLICATION { public: + virtual VOID ShutDown() = 0; @@ -42,6 +45,5 @@ public: HRESULT CreateHandler( _In_ IHttpContext *pHttpContext, - _In_ HTTP_MODULE_ID *pModuleId, - _Out_ IREQUEST_HANDLER **pRequestHandler) = 0; + _Out_ IREQUEST_HANDLER **pRequestHandler) = 0; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h index fce1913c32..d3e5707063 100644 --- a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h @@ -3,8 +3,6 @@ #pragma once -#include "stdafx.h" - // // Pure abstract class // diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index 30186ed4ad..8bb2ef7406 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -14,25 +14,22 @@ #include #include #include "Shlwapi.h" -#include "..\IISLib\hashtable.h" -#include "..\IISLib\stringu.h" -#include "..\IISLib\stringa.h" -#include "..\IISLib\multisz.h" -#include "..\IISLib\dbgutil.h" -#include "..\IISLib\ahutil.h" -#include "..\IISLib\hashfn.h" +#include "hashtable.h" +#include "stringu.h" +#include "stringa.h" +#include "multisz.h" +#include "dbgutil.h" +#include "ahutil.h" +#include "hashfn.h" +#include "irequesthandler.h" +#include "requesthandler.h" +#include "iapplication.h" +#include "application.h" #include "SRWLockWrapper.h" #include "environmentvariablehash.h" #include "utility.h" -#include "aspnetcoreconfig.h" -#include "fx_ver.h" -#include "hostfxr_utility.h" #include "resources.h" #include "aspnetcore_msg.h" - -#include "irequesthandler.h" -#include "iapplication.h" -#include "requesthandler.h" -#include "application.h" - +#include "fx_ver.h" +#include "hostfxr_utility.h" diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.cxx b/src/AspNetCoreModuleV2/CommonLib/utility.cxx index cb762f21bc..ed31d17305 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.cxx +++ b/src/AspNetCoreModuleV2/CommonLib/utility.cxx @@ -506,30 +506,6 @@ Finished: return hr; } -HRESULT -UTILITY::FindHighestDotNetVersion( - _In_ std::vector vFolders, - _Out_ STRU *pstrResult -) -{ - HRESULT hr = S_OK; - fx_ver_t max_ver(-1, -1, -1); - for (const auto& dir : vFolders) - { - fx_ver_t fx_ver(-1, -1, -1); - if (fx_ver_t::parse(dir, &fx_ver, false)) - { - // TODO using max instead of std::max works - max_ver = max(max_ver, fx_ver); - } - } - - hr = pstrResult->Copy(max_ver.as_str().c_str()); - - // we check FAILED(hr) outside of function - return hr; -} - BOOL UTILITY::DirectoryExists( _In_ STRU *pstrPath @@ -545,30 +521,6 @@ UTILITY::DirectoryExists( return GetFileAttributesExW(pstrPath->QueryStr(), GetFileExInfoStandard, &data); } -VOID -UTILITY::FindDotNetFolders( - _In_ PCWSTR pszPath, - _Out_ std::vector *pvFolders -) -{ - HANDLE handle = NULL; - WIN32_FIND_DATAW data = { 0 }; - - handle = FindFirstFileExW(pszPath, FindExInfoStandard, &data, FindExSearchNameMatch, NULL, 0); - if (handle == INVALID_HANDLE_VALUE) - { - return; - } - - do - { - std::wstring folder(data.cFileName); - pvFolders->push_back(folder); - } while (FindNextFileW(handle, &data)); - - FindClose(handle); -} - BOOL UTILITY::CheckIfFileExists( _In_ PCWSTR pszFilePath diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.h b/src/AspNetCoreModuleV2/CommonLib/utility.h index 830c2a0613..58a5824044 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/utility.h @@ -91,20 +91,6 @@ public: _In_ STRU *pstrPath ); - static - VOID - FindDotNetFolders( - _In_ PCWSTR pszPath, - _Out_ std::vector *pvFolders - ); - - static - HRESULT - FindHighestDotNetVersion( - _In_ std::vector vFolders, - _Out_ STRU *pstrResult - ); - static BOOL CheckIfFileExists( diff --git a/src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj b/src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj index 955839f2b9..ff49cffd42 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj @@ -209,6 +209,7 @@ + @@ -237,6 +238,7 @@ + diff --git a/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx index 5014e3a3ef..d38d3a9417 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx @@ -4,7 +4,7 @@ #include BOOL g_fNsiApiNotSupported = FALSE; -BOOL g_fWebSocketSupported = FALSE; +BOOL g_fWebSocketStaticInitialize = FALSE; BOOL g_fEnableReferenceCountTracing = FALSE; BOOL g_fGlobalInitialize = FALSE; BOOL g_fOutOfProcessInitialize = FALSE; @@ -21,7 +21,7 @@ IHttpServer * g_pHttpServer = NULL; HINSTANCE g_hWinHttpModule; HINSTANCE g_hAspNetCoreModule; HANDLE g_hEventLog = NULL; - +PCSTR g_szDebugLabel = "ASPNET_CORE_MODULE_REQUEST_HANDLER"; VOID InitializeGlobalConfiguration( @@ -113,7 +113,7 @@ InitializeGlobalConfiguration( g_fNsiApiNotSupported = TRUE; } - g_fWebSocketSupported = IsWindows8OrGreater(); + g_fWebSocketStaticInitialize = IsWindows8OrGreater(); g_fGlobalInitialize = TRUE; } @@ -167,7 +167,7 @@ EnsureOutOfProcessInitializtion() { if (hr == HRESULT_FROM_WIN32(ERROR_PROC_NOT_FOUND)) { - g_fWebSocketSupported = FALSE; + g_fWebSocketStaticInitialize = FALSE; } else { @@ -272,20 +272,28 @@ BOOL APIENTRY DllMain(HMODULE hModule, return TRUE; } +// TODO remove pHttpContext from the CreateApplication call. HRESULT __stdcall CreateApplication( _In_ IHttpServer *pServer, - _In_ ASPNETCORE_CONFIG *pConfig, - _Out_ IAPPLICATION **ppApplication + _In_ IHttpContext *pHttpContext, + _In_ PCWSTR pwzExeLocation, + _Out_ IAPPLICATION **ppApplication ) { HRESULT hr = S_OK; IAPPLICATION *pApplication = NULL; - + REQUESTHANDLER_CONFIG *pConfig = NULL; // Initialze some global variables here InitializeGlobalConfiguration(pServer); + hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpContext->GetApplication(), pwzExeLocation, g_hEventLog, &pConfig); + if (FAILED(hr)) + { + return hr; + } + if (pConfig->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) { pApplication = new IN_PROCESS_APPLICATION(pServer, pConfig); @@ -303,7 +311,6 @@ CreateApplication( goto Finished; } - pApplication = new OUT_OF_PROCESS_APPLICATION(pConfig); if (pApplication == NULL) { diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp index ca599c9389..08e5526879 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp @@ -4,7 +4,7 @@ IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL; IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( IHttpServer* pHttpServer, - ASPNETCORE_CONFIG* pConfig) : + REQUESTHANDLER_CONFIG *pConfig) : m_pHttpServer(pHttpServer), m_ProcessExitCode(0), m_hLogFileHandle(INVALID_HANDLE_VALUE), @@ -16,15 +16,15 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( m_fInitialized(FALSE), m_fShutdownCalledFromNative(FALSE), m_fShutdownCalledFromManaged(FALSE), - m_srwLock(), - m_pConfig(pConfig) + m_srwLock() { // is it guaranteed that we have already checked app offline at this point? // If so, I don't think there is much to do here. DBG_ASSERT(pHttpServer != NULL); DBG_ASSERT(pConfig != NULL); - InitializeSRWLock(&m_srwLock); + InitializeSRWLock(&m_srwLock); + m_pConfig = pConfig; // TODO we can probably initialized as I believe we are the only ones calling recycle. m_status = APPLICATION_STATUS::STARTING; } @@ -38,6 +38,12 @@ IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION() m_hLogFileHandle = INVALID_HANDLE_VALUE; } + if (m_pConfig != NULL) + { + delete m_pConfig; + m_pConfig = NULL; + } + m_hThread = NULL; s_Application = NULL; } @@ -110,7 +116,7 @@ Finished: // Managed layer may block the shutdown and lead to shutdown timeout // Assumption: only one inprocess application is hosted. // Call process exit to force shutdown - // + // exit(hr); } } @@ -807,7 +813,9 @@ IN_PROCESS_APPLICATION::ExecuteApplication( DBG_ASSERT(m_status == APPLICATION_STATUS::STARTING); - hModule = LoadLibraryW(m_pConfig->QueryHostFxrFullPath()); + // hostfxr should already be loaded by the shim. If not, then we will need + // to load it ourselves by finding hostfxr again. + hModule = LoadLibraryW(L"hostfxr.dll"); if (hModule == NULL) { @@ -986,7 +994,7 @@ IN_PROCESS_APPLICATION::FilterException(unsigned int, struct _EXCEPTION_POINTERS return EXCEPTION_EXECUTE_HANDLER; } -ASPNETCORE_CONFIG* +REQUESTHANDLER_CONFIG* IN_PROCESS_APPLICATION::QueryConfig() const { return m_pConfig; @@ -995,12 +1003,12 @@ IN_PROCESS_APPLICATION::QueryConfig() const HRESULT IN_PROCESS_APPLICATION::CreateHandler( _In_ IHttpContext *pHttpContext, - _In_ HTTP_MODULE_ID *pModuleId, - _Out_ IREQUEST_HANDLER **pRequestHandler) + _Out_ IREQUEST_HANDLER **pRequestHandler) { HRESULT hr = S_OK; IREQUEST_HANDLER* pHandler = NULL; - pHandler = new IN_PROCESS_HANDLER(pHttpContext, pModuleId, this); + + pHandler = new IN_PROCESS_HANDLER(pHttpContext, this); if (pHandler == NULL) { diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h index 6c27d8e202..cc504cf48c 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h @@ -2,6 +2,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #pragma once +typedef INT(*hostfxr_main_fn) (CONST DWORD argc, CONST PCWSTR argv[]); // TODO these may need to be BSTRs typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_REQUEST_HANDLER) (IN_PROCESS_HANDLER* pInProcessHandler, void* pvRequestHandlerContext); typedef BOOL(WINAPI * PFN_SHUTDOWN_HANDLER) (void* pvShutdownHandlerContext); @@ -10,10 +11,15 @@ typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_MANAGED_CONTEXT_HANDLER)(void * class IN_PROCESS_APPLICATION : public APPLICATION { public: - IN_PROCESS_APPLICATION(IHttpServer* pHttpServer, ASPNETCORE_CONFIG* pConfig); + IN_PROCESS_APPLICATION(IHttpServer* pHttpServer, REQUESTHANDLER_CONFIG *pConfig); ~IN_PROCESS_APPLICATION(); + HRESULT + Initialize( + VOID + ); + __override VOID ShutDown(); @@ -37,7 +43,6 @@ public: HRESULT CreateHandler( _In_ IHttpContext *pHttpContext, - _In_ HTTP_MODULE_ID *pModuleId, _Out_ IREQUEST_HANDLER **pRequestHandler) override; @@ -106,9 +111,15 @@ public: return s_Application; } - ASPNETCORE_CONFIG* + REQUESTHANDLER_CONFIG* QueryConfig() const; + PCWSTR + QueryExeLocation() + { + return m_struExeLocation.QueryStr(); + } + private: static DWORD @@ -144,6 +155,7 @@ private: HANDLE m_hErrReadPipe; HANDLE m_hErrWritePipe; STRU m_struLogFilePath; + STRU m_struExeLocation; // The exit code of the .NET Core process INT m_ProcessExitCode; @@ -166,7 +178,7 @@ private: DWORD m_dwStdErrReadTotal; static IN_PROCESS_APPLICATION* s_Application; - ASPNETCORE_CONFIG* m_pConfig; + REQUESTHANDLER_CONFIG* m_pConfig; VOID SetStdOut( diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp index a8bce9b974..82e3328388 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp @@ -2,11 +2,9 @@ IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( _In_ IHttpContext *pW3Context, - _In_ HTTP_MODULE_ID *pModuleId, _In_ IN_PROCESS_APPLICATION *pApplication ): m_pW3Context(pW3Context), - m_pApplication(pApplication), - m_pModuleId(*pModuleId) + m_pApplication(pApplication) { m_fManagedRequestComplete = FALSE; } @@ -22,7 +20,9 @@ IN_PROCESS_HANDLER::OnExecuteRequestHandler() { // First get the in process Application HRESULT hr; + hr = m_pApplication->LoadManagedApplication(); + if (FAILED(hr)) { // TODO remove com_error? diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h index 344bde1bb0..5fbaa96940 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h +++ b/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h @@ -8,7 +8,6 @@ public: IN_PROCESS_HANDLER( _In_ IHttpContext *pW3Context, - _In_ HTTP_MODULE_ID *pModuleId, _In_ IN_PROCESS_APPLICATION *pApplication); ~IN_PROCESS_HANDLER() override; @@ -67,11 +66,9 @@ public: private: PVOID m_pManagedHttpContext; - IHttpContext* m_pHttpContext; BOOL m_fManagedRequestComplete; REQUEST_NOTIFICATION_STATUS m_requestNotificationStatus; IHttpContext* m_pW3Context; IN_PROCESS_APPLICATION* m_pApplication; - HTTP_MODULE_ID m_pModuleId; }; diff --git a/src/AspNetCoreModuleV2/RequestHandler/managedexports.cxx b/src/AspNetCoreModuleV2/RequestHandler/managedexports.cxx index 85eb5b4d47..5d7abb77da 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/managedexports.cxx +++ b/src/AspNetCoreModuleV2/RequestHandler/managedexports.cxx @@ -165,7 +165,7 @@ http_get_application_properties( _In_ IISConfigurationData* pIISCofigurationData ) { - ASPNETCORE_CONFIG* pConfiguration = NULL; + REQUESTHANDLER_CONFIG* pConfiguration = NULL; IN_PROCESS_APPLICATION* pApplication = IN_PROCESS_APPLICATION::GetInstance(); if (pApplication == NULL) @@ -373,11 +373,6 @@ http_enable_websockets( _In_ IN_PROCESS_HANDLER* pInProcessHandler ) { - //if (!g_fWebSocketSupported) - //{ - // return E_FAIL; - //} - ((IHttpContext3*)pInProcessHandler->QueryHttpContext())->EnableFullDuplex(); ((IHttpResponse2*)pInProcessHandler->QueryHttpContext()->GetResponse())->DisableBuffering(); diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp index f15be2a3f3..149b06edef 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp @@ -18,9 +18,8 @@ PROTOCOL_CONFIG FORWARDING_HANDLER::sm_ProtocolConfig; RESPONSE_HEADER_HASH * FORWARDING_HANDLER::sm_pResponseHeaderHash = NULL; FORWARDING_HANDLER::FORWARDING_HANDLER( - _In_ IHttpContext *pW3Context, - _In_ HTTP_MODULE_ID *pModuleId, - _In_ OUT_OF_PROCESS_APPLICATION *pApplication + _In_ IHttpContext *pW3Context, + _In_ OUT_OF_PROCESS_APPLICATION *pApplication ) : IREQUEST_HANDLER(), m_Signature(FORWARDING_HANDLER_SIGNATURE), m_RequestStatus(FORWARDER_START), @@ -42,14 +41,14 @@ FORWARDING_HANDLER::FORWARDING_HANDLER( m_fServerResetConn(FALSE), m_cRefs(1), m_pW3Context(pW3Context), - m_pApplication(pApplication), - m_pModuleId(*pModuleId) + m_pApplication(pApplication) { #ifdef DEBUG DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, "FORWARDING_HANDLER::FORWARDING_HANDLER"); #endif + m_fWebSocketSupported = m_pApplication->QueryWebsocketStatus(); InitializeSRWLock(&m_RequestLock); } @@ -182,7 +181,7 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() // // Mark request as websocket if upgrade header is present. // - if (pApplication->QueryConfig()->QueryWebSocketEnabled()) + if (m_fWebSocketSupported) { USHORT cchHeader = 0; PCSTR pszWebSocketHeader = pRequest->GetHeader("Upgrade", &cchHeader); diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h index 458d07dba4..725b8ea76c 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h @@ -21,10 +21,9 @@ class FORWARDING_HANDLER : public REQUEST_HANDLER { public: FORWARDING_HANDLER( - - _In_ IHttpContext *pW3Context, - _In_ HTTP_MODULE_ID *pModuleId, - _In_ OUT_OF_PROCESS_APPLICATION *pApplication); + _In_ IHttpContext *pW3Context, + _In_ OUT_OF_PROCESS_APPLICATION *pApplication + ); ~FORWARDING_HANDLER(); @@ -178,6 +177,7 @@ private: FORWARDING_REQUEST_STATUS m_RequestStatus; BOOL m_fWebSocketEnabled; + BOOL m_fWebSocketSupported; BOOL m_fResponseHeadersReceivedAndSet; BOOL m_fResetConnection; BOOL m_fDoReverseRewriteHeaders; diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp index ba6e3c9b4f..356029efd3 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp @@ -1,12 +1,13 @@ #include "..\precomp.hxx" OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION( - ASPNETCORE_CONFIG* pConfig) : + REQUESTHANDLER_CONFIG *pConfig) : + m_fWebSocketSupported(WEBSOCKET_STATUS::WEBSOCKET_UNKNOWN), m_pConfig(pConfig) { m_status = APPLICATION_STATUS::RUNNING; m_pProcessManager = NULL; - InitializeSRWLock(&rwlock); + InitializeSRWLock(&m_srwLock); } OUT_OF_PROCESS_APPLICATION::~OUT_OF_PROCESS_APPLICATION() @@ -17,6 +18,12 @@ OUT_OF_PROCESS_APPLICATION::~OUT_OF_PROCESS_APPLICATION() m_pProcessManager->DereferenceProcessManager(); m_pProcessManager = NULL; } + + if (m_pConfig != NULL) + { + delete m_pConfig; + m_pConfig = NULL; + } } HRESULT @@ -49,10 +56,10 @@ OUT_OF_PROCESS_APPLICATION::GetProcess( _Out_ SERVER_PROCESS **ppServerProcess ) { - return m_pProcessManager->GetProcess(m_pConfig, ppServerProcess); + return m_pProcessManager->GetProcess(m_pConfig, QueryWebsocketStatus(), ppServerProcess); } -ASPNETCORE_CONFIG* +REQUESTHANDLER_CONFIG* OUT_OF_PROCESS_APPLICATION::QueryConfig() const { return m_pConfig; @@ -62,7 +69,7 @@ __override VOID OUT_OF_PROCESS_APPLICATION::ShutDown() { - AcquireSRWLockExclusive(&rwlock); + AcquireSRWLockExclusive(&m_srwLock); { if (m_pProcessManager != NULL) { @@ -71,7 +78,7 @@ OUT_OF_PROCESS_APPLICATION::ShutDown() m_pProcessManager = NULL; } } - ReleaseSRWLockExclusive(&rwlock); + ReleaseSRWLockExclusive(&m_srwLock); } __override @@ -84,12 +91,18 @@ OUT_OF_PROCESS_APPLICATION::Recycle() HRESULT OUT_OF_PROCESS_APPLICATION::CreateHandler( _In_ IHttpContext *pHttpContext, - _In_ HTTP_MODULE_ID *pModuleId, - _Out_ IREQUEST_HANDLER **pRequestHandler) + _Out_ IREQUEST_HANDLER **pRequestHandler) { HRESULT hr = S_OK; IREQUEST_HANDLER* pHandler = NULL; - pHandler = new FORWARDING_HANDLER(pHttpContext, pModuleId, this); + + //add websocket check here + if (m_fWebSocketSupported == WEBSOCKET_STATUS::WEBSOCKET_UNKNOWN) + { + SetWebsocketStatus(pHttpContext); + } + + pHandler = new FORWARDING_HANDLER(pHttpContext, this); if (pHandler == NULL) { @@ -99,3 +112,31 @@ OUT_OF_PROCESS_APPLICATION::CreateHandler( *pRequestHandler = pHandler; return hr; } + +VOID +OUT_OF_PROCESS_APPLICATION::SetWebsocketStatus( + IHttpContext* pHttpContext +) +{ + // Even though the applicationhost.config file contains the websocket element, + // the websocket module may still not be enabled. + PCWSTR pszTempWebsocketValue; + DWORD cbLength; + HRESULT hr; + + hr = pHttpContext->GetServerVariable("WEBSOCKET_VERSION", &pszTempWebsocketValue, &cbLength); + if (FAILED(hr)) + { + m_fWebSocketSupported = WEBSOCKET_STATUS::WEBSOCKET_NOT_SUPPORTED; + } + else + { + m_fWebSocketSupported = WEBSOCKET_STATUS::WEBSOCKET_SUPPORTED; + } +} + +BOOL +OUT_OF_PROCESS_APPLICATION::QueryWebsocketStatus() const +{ + return m_fWebSocketSupported == WEBSOCKET_STATUS::WEBSOCKET_SUPPORTED; +} diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h index cd6f935098..9601178e63 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h @@ -1,10 +1,20 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + #pragma once class OUT_OF_PROCESS_APPLICATION : public APPLICATION { + enum WEBSOCKET_STATUS + { + WEBSOCKET_UNKNOWN = 0, + WEBSOCKET_NOT_SUPPORTED, + WEBSOCKET_SUPPORTED, + }; public: - OUT_OF_PROCESS_APPLICATION(ASPNETCORE_CONFIG *pConfig); + OUT_OF_PROCESS_APPLICATION( + REQUESTHANDLER_CONFIG *pConfig); __override ~OUT_OF_PROCESS_APPLICATION() override; @@ -31,18 +41,25 @@ public: HRESULT CreateHandler( _In_ IHttpContext *pHttpContext, - _In_ HTTP_MODULE_ID *pModuleId, _Out_ IREQUEST_HANDLER **pRequestHandler) override; - ASPNETCORE_CONFIG* + REQUESTHANDLER_CONFIG* QueryConfig() const; + BOOL + QueryWebsocketStatus() + const; + private: - PROCESS_MANAGER * m_pProcessManager; - SRWLOCK rwlock; + VOID SetWebsocketStatus(IHttpContext *pHttpContext); - ASPNETCORE_CONFIG* m_pConfig; + PROCESS_MANAGER * m_pProcessManager; + SRWLOCK m_srwLock; + IHttpServer *m_pHttpServer; + + REQUESTHANDLER_CONFIG* m_pConfig; + WEBSOCKET_STATUS m_fWebSocketSupported; }; diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.cxx b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.cxx index 7e8c58462a..7c75d65a0d 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.cxx +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.cxx @@ -103,8 +103,9 @@ PROCESS_MANAGER::~PROCESS_MANAGER() HRESULT PROCESS_MANAGER::GetProcess( - _In_ ASPNETCORE_CONFIG *pConfig, - _Out_ SERVER_PROCESS **ppServerProcess + _In_ REQUESTHANDLER_CONFIG *pConfig, + _In_ BOOL fWebsocketSupported, + _Out_ SERVER_PROCESS **ppServerProcess ) { HRESULT hr = S_OK; @@ -220,7 +221,7 @@ PROCESS_MANAGER::GetProcess( pConfig->QueryAnonymousAuthEnabled(), pConfig->QueryEnvironmentVariables(), pConfig->QueryStdoutLogEnabled(), - pConfig->QueryWebSocketEnabled(), + fWebsocketSupported, pConfig->QueryStdoutLogFile(), pConfig->QueryApplicationPhysicalPath(), // physical path pConfig->QueryApplicationPath(), // app path diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.h b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.h index 9523e8a819..b15da72486 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.h +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.h @@ -30,8 +30,9 @@ public: HRESULT GetProcess( - _In_ ASPNETCORE_CONFIG *pConfig, - _Out_ SERVER_PROCESS **ppServerProcess + _In_ REQUESTHANDLER_CONFIG *pConfig, + _In_ BOOL fWebsocketEnabled, + _Out_ SERVER_PROCESS **ppServerProcess ); HANDLE @@ -192,4 +193,4 @@ private: volatile static BOOL sm_fWSAStartupDone; volatile BOOL m_fServerProcessListReady; -}; \ No newline at end of file +}; diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.cxx b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.cxx index 9faebab82a..bb59a5ff3d 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.cxx +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.cxx @@ -41,7 +41,7 @@ Finished: VOID PROTOCOL_CONFIG::OverrideConfig( - ASPNETCORE_CONFIG *pAspNetCoreConfig + REQUESTHANDLER_CONFIG *pAspNetCoreConfig ) { m_msTimeout = pAspNetCoreConfig->QueryRequestTimeoutInMS(); diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.h b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.h index 0bb34aa53d..a31ca1ee33 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.h +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.h @@ -16,7 +16,7 @@ class PROTOCOL_CONFIG VOID OverrideConfig( - ASPNETCORE_CONFIG *pAspNetCoreConfig + REQUESTHANDLER_CONFIG *pAspNetCoreConfig ); BOOL diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx index dc4aace72b..cedbd0ba12 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx @@ -22,23 +22,23 @@ SERVER_PROCESS::Initialize( BOOL fAnonymousAuthEnabled, ENVIRONMENT_VAR_HASH *pEnvironmentVariables, BOOL fStdoutLogEnabled, - BOOL fWebsocketsEnabled, + BOOL fWebSocketSupported, STRU *pstruStdoutLogFile, STRU *pszAppPhysicalPath, STRU *pszAppPath, STRU *pszAppVirtualPath ) { - HRESULT hr = S_OK; + HRESULT hr = S_OK; m_pProcessManager = pProcessManager; m_dwStartupTimeLimitInMS = dwStartupTimeLimitInMS; m_dwShutdownTimeLimitInMS = dwShtudownTimeLimitInMS; m_fStdoutLogEnabled = fStdoutLogEnabled; + m_fWebSocketSupported = fWebSocketSupported; m_fWindowsAuthEnabled = fWindowsAuthEnabled; m_fBasicAuthEnabled = fBasicAuthEnabled; m_fAnonymousAuthEnabled = fAnonymousAuthEnabled; - m_fWebsocketsEnabled = fWebsocketsEnabled; m_pProcessManager->ReferenceProcessManager(); m_fDebuggerAttached = FALSE; @@ -790,7 +790,7 @@ SERVER_PROCESS::StartProcess( if (FAILED(hr = ENVIRONMENT_VAR_HELPERS::AddWebsocketEnabledToEnvironmentVariables( pHashTable, - m_fWebsocketsEnabled + m_fWebSocketSupported ))) { pStrStage = L"AddWebsocketEnabledToEnvironmentVariables"; diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h index e60454cac0..504232e486 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h @@ -33,7 +33,7 @@ public: _In_ BOOL fAnonymousAuthEnabled, _In_ ENVIRONMENT_VAR_HASH* pEnvironmentVariables, _In_ BOOL fStdoutLogEnabled, - _In_ BOOL fWebsocketsEnabled, + _In_ BOOL fWebSocketSupported, _In_ STRU *pstruStdoutLogFile, _In_ STRU *pszAppPhysicalPath, _In_ STRU *pszAppPath, @@ -234,10 +234,10 @@ private: FORWARDER_CONNECTION *m_pForwarderConnection; BOOL m_fStdoutLogEnabled; + BOOL m_fWebSocketSupported; BOOL m_fWindowsAuthEnabled; BOOL m_fBasicAuthEnabled; BOOL m_fAnonymousAuthEnabled; - BOOL m_fWebsocketsEnabled; BOOL m_fDebuggerAttached; STTIMER m_Timer; diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.cxx b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.cxx index ae7ecf697e..4d86fe592e 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.cxx +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.cxx @@ -94,7 +94,7 @@ WEBSOCKET_HANDLER::StaticInitialize( --*/ { - if (!g_fWebSocketSupported) + if (!g_fWebSocketStaticInitialize) { return S_OK; } @@ -120,7 +120,7 @@ WEBSOCKET_HANDLER::StaticTerminate( VOID ) { - if (!g_fWebSocketSupported) + if (!g_fWebSocketStaticInitialize) { return; } diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.cxx b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.cxx index ce4256a710..1796e63081 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.cxx +++ b/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.cxx @@ -26,14 +26,13 @@ WINHTTP_HELPER::StaticInitialize( { HRESULT hr = S_OK; - if (!g_fWebSocketSupported) - { - return S_OK; - } - // // Initialize the function pointers for WinHttp Websocket API's. // + if (!g_fWebSocketStaticInitialize) + { + return S_OK; + } HMODULE hWinHttp = GetModuleHandleA("winhttp.dll"); if (hWinHttp == NULL) @@ -173,4 +172,4 @@ WINHTTP_HELPER::GetBufferTypeFromFlags( } return; -} \ No newline at end of file +} diff --git a/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx b/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx index 64bfd09ae7..8fe43d1cdb 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx +++ b/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx @@ -26,6 +26,7 @@ #include #include #include + // This should remove our issue of compiling for win7 without header files. // We force the Windows 8 version check logic in iiswebsocket.h to succeed even though we're compiling for Windows 7. // Then, we set the version defines back to Windows 7 to for the remainder of the compilation. @@ -44,36 +45,41 @@ #define WINVER 0x0601 #define _WIN32_WINNT 0x0601 -#include "..\IISLib\acache.h" -#include "..\IISLib\multisz.h" -#include "..\IISLib\multisza.h" -#include "..\IISLib\base64.h" -#include "..\IISLib\listentry.h" -#include "..\CommonLib\fx_ver.h" -#include "..\CommonLib\debugutil.h" -#include "..\CommonLib\requesthandler.h" -#include "..\CommonLib\aspnetcoreconfig.h" -#include "..\CommonLib\utility.h" -#include "..\CommonLib\application.h" -#include "..\CommonLib\resources.h" +// IIS Lib +#include "acache.h" +#include "multisz.h" +#include "multisza.h" +#include "base64.h" +#include "listentry.h" +#include "debugutil.h" + +// Common lib +#include "hostfxr_utility.h" +#include "requesthandler.h" +#include "utility.h" +#include "application.h" +#include "resources.h" #include "aspnetcore_event.h" #include "aspnetcore_msg.h" #include "disconnectcontext.h" -#include "environmentvariablehelpers.h" + #include "sttimer.h" +#include ".\requesthandler_config.h" #include ".\inprocess\InProcessHandler.h" #include ".\inprocess\inprocessapplication.h" +#include ".\outofprocess\websockethandler.h" #include ".\outofprocess\responseheaderhash.h" #include ".\outofprocess\protocolconfig.h" #include ".\outofprocess\forwarderconnection.h" #include ".\outofprocess\serverprocess.h" #include ".\outofprocess\processmanager.h" -#include ".\outofprocess\websockethandler.h" #include ".\outofprocess\forwardinghandler.h" #include ".\outofprocess\outprocessapplication.h" #include ".\outofprocess\winhttphelper.h" #include ".\outofprocess\outprocessapplication.h" +#include "environmentvariablehelpers.h" + #ifdef max #undef max template inline T max(T a, T b) @@ -90,7 +96,6 @@ template inline T min(T a, T b) } #endif - inline bool IsSpace(char ch) { switch (ch) @@ -109,7 +114,7 @@ inline bool IsSpace(char ch) extern BOOL g_fAsyncDisconnectAvailable; extern BOOL g_fWinHttpNonBlockingCallbackAvailable; -extern BOOL g_fWebSocketSupported; +extern BOOL g_fWebSocketStaticInitialize; extern BOOL g_fNsiApiNotSupported; extern BOOL g_fEnableReferenceCountTracing; extern BOOL g_fProcessDetach; diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.cxx b/src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.cpp similarity index 76% rename from src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.cxx rename to src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.cpp index 46ec0edcfd..555e711922 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.cxx +++ b/src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.cpp @@ -2,10 +2,10 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "stdafx.h" -#include "aspnetcoreconfig.h" +#include "requesthandler_config.h" #include "debugutil.h" -ASPNETCORE_CONFIG::~ASPNETCORE_CONFIG() +REQUESTHANDLER_CONFIG::~REQUESTHANDLER_CONFIG() { if (m_ppStrArguments != NULL) { @@ -21,42 +21,21 @@ ASPNETCORE_CONFIG::~ASPNETCORE_CONFIG() } } -VOID -ASPNETCORE_CONFIG::ReferenceConfiguration( - VOID -) const -{ - InterlockedIncrement(&m_cRefs); -} - -VOID -ASPNETCORE_CONFIG::DereferenceConfiguration( - VOID -) const -{ - DBG_ASSERT(m_cRefs != 0); - LONG cRefs = 0; - if ((cRefs = InterlockedDecrement(&m_cRefs)) == 0) - { - delete this; - } -} - HRESULT -ASPNETCORE_CONFIG::GetConfig( +REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig( _In_ IHttpServer *pHttpServer, - _In_ HTTP_MODULE_ID pModuleId, - _In_ IHttpContext *pHttpContext, + _In_ IHttpApplication *pHttpApplication, + _In_ PCWSTR pwzExeLocation, _In_ HANDLE hEventLog, - _Out_ ASPNETCORE_CONFIG **ppAspNetCoreConfig + _Out_ REQUESTHANDLER_CONFIG **ppAspNetCoreConfig ) { HRESULT hr = S_OK; - IHttpApplication *pHttpApplication = pHttpContext->GetApplication(); - ASPNETCORE_CONFIG *pAspNetCoreConfig = NULL; + REQUESTHANDLER_CONFIG *pRequestHandlerConfig = NULL; STRU struHostFxrDllLocation; - PWSTR* pwzArgv; + BSTR* pwzArgv; DWORD dwArgCount; + STRU struExeLocation; if (ppAspNetCoreConfig == NULL) { @@ -66,105 +45,101 @@ ASPNETCORE_CONFIG::GetConfig( *ppAspNetCoreConfig = NULL; - // potential bug if user sepcific config at virtual dir level - pAspNetCoreConfig = (ASPNETCORE_CONFIG*) - pHttpApplication->GetModuleContextContainer()->GetModuleContext(pModuleId); - - if (pAspNetCoreConfig != NULL) - { - *ppAspNetCoreConfig = pAspNetCoreConfig; - pAspNetCoreConfig = NULL; - goto Finished; - } - - pAspNetCoreConfig = new ASPNETCORE_CONFIG; - if (pAspNetCoreConfig == NULL) + pRequestHandlerConfig = new REQUESTHANDLER_CONFIG; + if (pRequestHandlerConfig == NULL) { hr = E_OUTOFMEMORY; goto Finished; } - hr = pAspNetCoreConfig->Populate(pHttpServer, pHttpContext); + hr = pRequestHandlerConfig->Populate(pHttpServer, pHttpApplication); if (FAILED(hr)) { goto Finished; } // Modify config for inprocess. - if (pAspNetCoreConfig->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) + if (pRequestHandlerConfig->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) { - if (FAILED(hr = HOSTFXR_UTILITY::GetHostFxrParameters( - hEventLog, - pAspNetCoreConfig->QueryProcessPath()->QueryStr(), - pAspNetCoreConfig->QueryApplicationPhysicalPath()->QueryStr(), - pAspNetCoreConfig->QueryArguments()->QueryStr(), - &struHostFxrDllLocation, - &dwArgCount, - &pwzArgv))) + if (FAILED(struExeLocation.Copy(pwzExeLocation))) { goto Finished; } - - if (FAILED(hr = pAspNetCoreConfig->SetHostFxrFullPath(struHostFxrDllLocation.QueryStr()))) + // If the exe was not provided by the shim, reobtain the hostfxr parameters (which finds dotnet). + if (struExeLocation.IsEmpty()) { - goto Finished; + if (FAILED(hr = HOSTFXR_UTILITY::GetHostFxrParameters( + hEventLog, + pRequestHandlerConfig->QueryProcessPath()->QueryStr(), + pRequestHandlerConfig->QueryApplicationPhysicalPath()->QueryStr(), + pRequestHandlerConfig->QueryArguments()->QueryStr(), + &struHostFxrDllLocation, + &struExeLocation, + &dwArgCount, + &pwzArgv))) + { + goto Finished; + } } - - pAspNetCoreConfig->SetHostFxrArguments(dwArgCount, pwzArgv); - } - - hr = pHttpApplication->GetModuleContextContainer()-> - SetModuleContext(pAspNetCoreConfig, pModuleId); - if (FAILED(hr)) - { - if (hr == HRESULT_FROM_WIN32(ERROR_ALREADY_ASSIGNED)) + else if (HOSTFXR_UTILITY::IsDotnetExecutable(&struExeLocation)) { - delete pAspNetCoreConfig; - - pAspNetCoreConfig = (ASPNETCORE_CONFIG*)pHttpApplication-> - GetModuleContextContainer()-> - GetModuleContext(pModuleId); - - _ASSERT(pAspNetCoreConfig != NULL); - - hr = S_OK; + if (FAILED(hr = HOSTFXR_UTILITY::ParseHostfxrArguments( + pRequestHandlerConfig->QueryArguments()->QueryStr(), + pwzExeLocation, + pRequestHandlerConfig->QueryApplicationPhysicalPath()->QueryStr(), + hEventLog, + &dwArgCount, + &pwzArgv))) + { + goto Finished; + } } else { - goto Finished; - } - } - else - { - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "ASPNETCORE_CONFIG::GetConfig, set config to ModuleContext"); - // set appliction info here instead of inside Populate() - // as the destructor will delete the backend process - hr = pAspNetCoreConfig->QueryApplicationPath()->Copy(pHttpApplication->GetApplicationId()); - if (FAILED(hr)) - { - goto Finished; + if (FAILED(hr = HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( + pwzExeLocation, + pRequestHandlerConfig->QueryApplicationPhysicalPath()->QueryStr(), + pRequestHandlerConfig->QueryArguments()->QueryStr(), + hEventLog, + &struHostFxrDllLocation, + &dwArgCount, + &pwzArgv))) + { + goto Finished; + } } + + pRequestHandlerConfig->SetHostFxrArguments(dwArgCount, pwzArgv); } - *ppAspNetCoreConfig = pAspNetCoreConfig; - pAspNetCoreConfig = NULL; + DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, + "REQUESTHANDLER_CONFIG::GetConfig, set config to ModuleContext"); + // set appliction info here instead of inside Populate() + // as the destructor will delete the backend process + hr = pRequestHandlerConfig->QueryApplicationPath()->Copy(pHttpApplication->GetApplicationId()); + if (FAILED(hr)) + { + goto Finished; + } + + *ppAspNetCoreConfig = pRequestHandlerConfig; + pRequestHandlerConfig = NULL; Finished: - if (pAspNetCoreConfig != NULL) + if (pRequestHandlerConfig != NULL) { - delete pAspNetCoreConfig; - pAspNetCoreConfig = NULL; + delete pRequestHandlerConfig; + pRequestHandlerConfig = NULL; } return hr; } HRESULT -ASPNETCORE_CONFIG::Populate( +REQUESTHANDLER_CONFIG::Populate( IHttpServer *pHttpServer, - IHttpContext *pHttpContext + IHttpApplication *pHttpApplication ) { STACK_STRU(strHostingModel, 300); @@ -206,13 +181,13 @@ ASPNETCORE_CONFIG::Populate( } pAdminManager = pHttpServer->GetAdminManager(); - hr = m_struConfigPath.Copy(pHttpContext->GetApplication()->GetAppConfigPath()); + hr = m_struConfigPath.Copy(pHttpApplication->GetAppConfigPath()); if (FAILED(hr)) { goto Finished; } - hr = m_struApplicationPhysicalPath.Copy(pHttpContext->GetApplication()->GetApplicationPhysicalPath()); + hr = m_struApplicationPhysicalPath.Copy(pHttpApplication->GetApplicationPhysicalPath()); if (FAILED(hr)) { goto Finished; @@ -320,20 +295,6 @@ ASPNETCORE_CONFIG::Populate( } } - // Even though the applicationhost.config file contains the websocket element, - // the websocket module may still not be enabled. Check if the - PCWSTR pszVariableValue; - DWORD cbLength; - hr = pHttpContext->GetServerVariable("WEBSOCKET_VERSION", &pszVariableValue, &cbLength); - if (FAILED(hr)) - { - m_fWebSocketEnabled = FALSE; - } - else - { - m_fWebSocketEnabled = TRUE; - } - bstrAspNetCoreSection = SysAllocString(CS_ASPNETCORE_SECTION); if (bstrAspNetCoreSection == NULL) { diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.h b/src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.h similarity index 85% rename from src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.h rename to src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.h index 655dcdc385..45c9518413 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.h +++ b/src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.h @@ -50,27 +50,21 @@ enum APP_HOSTING_MODEL HOSTING_OUT_PROCESS }; -class ASPNETCORE_CONFIG : IHttpStoredContext +class REQUESTHANDLER_CONFIG { public: virtual - ~ASPNETCORE_CONFIG(); - - VOID - CleanupStoredContext() - { - DereferenceConfiguration(); - } + ~REQUESTHANDLER_CONFIG(); static HRESULT - GetConfig( + CreateRequestHandlerConfig( _In_ IHttpServer *pHttpServer, - _In_ HTTP_MODULE_ID pModuleId, - _In_ IHttpContext *pHttpContext, + _In_ IHttpApplication *pHttpApplication, + _In_ PCWSTR pwzExeLocation, _In_ HANDLE hEventLog, - _Out_ ASPNETCORE_CONFIG **ppAspNetCoreConfig + _Out_ REQUESTHANDLER_CONFIG **ppAspNetCoreConfig ); ENVIRONMENT_VAR_HASH* @@ -155,7 +149,7 @@ public: STRU* QueryProcessPath( - VOID + VOID ) { return &m_struProcessPath; @@ -175,12 +169,6 @@ public: return m_fStdoutLogEnabled; } - BOOL - QueryWebSocketEnabled() - { - return m_fWebSocketEnabled; - } - BOOL QueryForwardWindowsAuthToken() { @@ -242,22 +230,6 @@ public: } CONST - PCWSTR - QueryHostFxrFullPath( - VOID - ) - { - return m_struHostFxrLocation.QueryStr(); - } - - HRESULT - SetHostFxrFullPath( - PCWSTR pStrHostFxrFullPath - ) - { - return m_struHostFxrLocation.Copy(pStrHostFxrFullPath); - } - VOID SetHostFxrArguments( DWORD dwArgc, @@ -273,34 +245,24 @@ public: m_ppStrArguments = ppStrArguments; } - VOID - ReferenceConfiguration( - VOID - ) const; - - VOID - DereferenceConfiguration( - VOID - ) const; - private: // // private constructor // - ASPNETCORE_CONFIG(): - m_fStdoutLogEnabled( FALSE ), - m_pEnvironmentVariables( NULL ), - m_cRefs( 1 ), - m_hostingModel( HOSTING_UNKNOWN ), + REQUESTHANDLER_CONFIG() : + m_fStdoutLogEnabled(FALSE), + m_pEnvironmentVariables(NULL), + m_cRefs(1), + m_hostingModel(HOSTING_UNKNOWN), m_ppStrArguments(NULL) { } HRESULT Populate( - IHttpServer *pHttpServer, - IHttpContext *pHttpContext + IHttpServer *pHttpServer, + IHttpApplication *pHttpApplication ); mutable LONG m_cRefs; @@ -323,10 +285,9 @@ private: BOOL m_fWindowsAuthEnabled; BOOL m_fBasicAuthEnabled; BOOL m_fAnonymousAuthEnabled; - BOOL m_fWebSocketEnabled; APP_HOSTING_MODEL m_hostingModel; ENVIRONMENT_VAR_HASH* m_pEnvironmentVariables; STRU m_struHostFxrLocation; - PWSTR* m_ppStrArguments; + PWSTR* m_ppStrArguments; DWORD m_dwArgc; }; diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index c68f83af6d..1f8ad4b512 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -47,6 +47,9 @@ + + {ec82302f-d2f0-4727-99d1-eabc0dd9dc3b} + {55494e58-e061-4c4c-a0a8-837008e72f85} @@ -69,7 +72,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" @@ -91,7 +94,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" @@ -111,7 +114,7 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" @@ -133,7 +136,7 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" diff --git a/test/CommonLibTests/hostfxr_utility_tests.cpp b/test/CommonLibTests/hostfxr_utility_tests.cpp index aacb71db56..2aace524e0 100644 --- a/test/CommonLibTests/hostfxr_utility_tests.cpp +++ b/test/CommonLibTests/hostfxr_utility_tests.cpp @@ -126,6 +126,7 @@ TEST(GetHostFxrArguments, InvalidParams) DWORD retVal = 0; BSTR* bstrArray; STRU struHostFxrDllLocation; + STRU struExeLocation; HRESULT hr = HOSTFXR_UTILITY::GetHostFxrParameters( INVALID_HANDLE_VALUE, @@ -133,8 +134,9 @@ TEST(GetHostFxrArguments, InvalidParams) L"", // application physical path, ignored. L"ignored", //arguments NULL, // event log + &struExeLocation, &retVal, // arg count &bstrArray); // args array. EXPECT_EQ(E_INVALIDARG, hr); -} +} \ No newline at end of file diff --git a/test/CommonLibTests/stdafx.h b/test/CommonLibTests/stdafx.h index feb79f19fe..3ada2d330d 100644 --- a/test/CommonLibTests/stdafx.h +++ b/test/CommonLibTests/stdafx.h @@ -42,7 +42,6 @@ #include "hostfxr_utility.h" #include "environmentvariablehash.h" -#include "aspnetcoreconfig.h" #include "iapplication.h" #include "utility.h" #include "debugutil.h" From 8932383d67709ff6b888b842d666d9d83bc17f49 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 18 May 2018 10:07:40 -0700 Subject: [PATCH 028/363] Always pack Microsoft.AspNetCore.Server.IIS (#852) --- .../Microsoft.AspNetCore.Server.IIS.csproj | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index ed8b42bc55..b33643eb31 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -4,19 +4,13 @@ netstandard2.0 Microsoft.AspNetCore.Server.IIS Provides support for hosting ASP.NET Core in IIS using the AspNetCoreModule. - false $(NoWarn);CS1591 true aspnetcore;iis true + true - - - - - - @@ -30,6 +24,13 @@ + + + + + + + From 06591131cbc689aa3353d2eb175abbd6e78987be Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 18 May 2018 15:09:50 -0700 Subject: [PATCH 029/363] Cleanup functional tests (#851) --- build/dependencies.props | 54 +- .../AppHostConfig/Https.config | 1031 ---------------- .../AppHostConfig/NtlmAuthentation.config | 1042 ----------------- .../WebsocketsNotSupported.config | 1031 ---------------- .../Inprocess/StartupTests.cs | 200 +--- .../OutOfProcess/HelloWorldTest.cs | 76 +- .../OutOfProcess/HttpsTest.cs | 141 +-- .../OutOfProcess/NtlmAuthentationTest.cs | 107 +- .../UpgradeFeatureDetectionTests.cs | 76 +- .../Utilities/FunctionalTestsBase.cs | 32 + .../Utilities/Helpers.cs | 28 +- .../Utilities/IISDeploymentResult.cs | 39 + .../Utilities/IISFunctionalTestBase.cs | 53 + .../Utilities/LoggingHandler.cs | 51 + .../Utilities/RetryHandler.cs | 60 + .../Utilities/TestConnections.cs | 2 +- test/WebSites/InProcessWebSite/Startup.cs | 15 +- .../OutOfProcessWebSite.csproj | 4 + test/WebSites/OutOfProcessWebSite/Startup.cs | 88 ++ .../OutOfProcessWebSite/StartupHelloWorld.cs | 58 - .../StartupHttpsHelloWorld.cs | 25 - .../StartupNtlmAuthentication.cs | 80 -- .../StartupUpgradeFeatureDetection.cs | 32 - .../WebSites/shared/WebSockets/TestStartup.cs | 38 + 24 files changed, 586 insertions(+), 3777 deletions(-) delete mode 100644 test/IISIntegration.FunctionalTests/AppHostConfig/Https.config delete mode 100644 test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config delete mode 100644 test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config create mode 100644 test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs create mode 100644 test/IISIntegration.FunctionalTests/Utilities/IISDeploymentResult.cs create mode 100644 test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs create mode 100644 test/IISIntegration.FunctionalTests/Utilities/LoggingHandler.cs create mode 100644 test/IISIntegration.FunctionalTests/Utilities/RetryHandler.cs create mode 100644 test/WebSites/OutOfProcessWebSite/Startup.cs delete mode 100644 test/WebSites/OutOfProcessWebSite/StartupHelloWorld.cs delete mode 100644 test/WebSites/OutOfProcessWebSite/StartupHttpsHelloWorld.cs delete mode 100644 test/WebSites/OutOfProcessWebSite/StartupNtlmAuthentication.cs delete mode 100644 test/WebSites/OutOfProcessWebSite/StartupUpgradeFeatureDetection.cs create mode 100644 test/WebSites/shared/WebSockets/TestStartup.cs diff --git a/build/dependencies.props b/build/dependencies.props index fc6f28aa40..df8f6c8ef0 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,38 +5,38 @@ 0.10.13 2.2.0-preview1-17055 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 0.6.0-a-preview1-inttesting-17031 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 0.6.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 15.6.82 15.6.82 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 - 2.2.0-preview1-34217 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 + 2.2.0-preview1-34230 2.0.0 2.1.0-rc1 2.2.0-preview1-26509-06 - 2.2.0-preview1-34217 + 2.2.0-preview1-34230 15.6.1 2.0.3 4.6.0-preview1-26508-04 diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config b/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config deleted file mode 100644 index 0a1e6d29e1..0000000000 --- a/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config +++ /dev/null @@ -1,1031 +0,0 @@ - - - - - - - - -
-
-
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config b/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config deleted file mode 100644 index 2ecb42968f..0000000000 --- a/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config +++ /dev/null @@ -1,1042 +0,0 @@ - - - - - - - - -
-
-
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config b/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config deleted file mode 100644 index 8edd622936..0000000000 --- a/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config +++ /dev/null @@ -1,1031 +0,0 @@ - - - - - - - - -
-
-
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index 7ae5affc83..4d497612b7 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -2,216 +2,116 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.IO; +using System.Linq; using System.Net; using System.Threading.Tasks; +using System.Xml.Linq; +using IISIntegration.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.CommandLineUtils; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Testing; using Xunit; using Xunit.Abstractions; -using Xunit.Sdk; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [SkipIfIISExpressSchemaMissingInProcess] - public class StartupTests : LoggedTest + public class StartupTests : IISFunctionalTestBase { public StartupTests(ITestOutputHelper output) : base(output) { - } [Fact] public async Task ExpandEnvironmentVariableInWebConfig() { var dotnetLocation = DotNetMuxer.MuxerPathOrDefault(); - using (StartLog(out var loggerFactory)) - { - var logger = loggerFactory.CreateLogger("HelloWorldTest"); + var deploymentParameters = GetBaseDeploymentParameters(); - var deploymentParameters = GetBaseDeploymentParameters(); + // Point to dotnet installed in user profile. + deploymentParameters.EnvironmentVariables["DotnetPath"] = dotnetLocation; - // Point to dotnet installed in user profile. - deploymentParameters.EnvironmentVariables["DotnetPath"] = dotnetLocation; + var deploymentResult = await DeployAsync(deploymentParameters); - using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) - { - var deploymentResult = await deployer.DeployAsync(); + ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", "%DotnetPath%"); - Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", "%DotnetPath%"); + var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. - var response = await RetryHelper.RetryRequest(() => - { - return deploymentResult.HttpClient.GetAsync("HelloWorld"); - }, logger, deploymentResult.HostShutdownToken, retryCount: 30); - - var responseText = await response.Content.ReadAsStringAsync(); - try - { - Assert.Equal("Hello World", responseText); - } - catch (XunitException) - { - logger.LogWarning(response.ToString()); - logger.LogWarning(responseText); - throw; - } - } - } + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("Hello World", responseText); } [Fact] public async Task InvalidProcessPath_ExpectServerError() { var dotnetLocation = "bogus"; - using (StartLog(out var loggerFactory)) - { - var logger = loggerFactory.CreateLogger("HelloWorldTest"); - var deploymentParameters = GetBaseDeploymentParameters(); - // Point to dotnet installed in user profile. - deploymentParameters.EnvironmentVariables["DotnetPath"] = Environment.ExpandEnvironmentVariables(dotnetLocation); // Path to dotnet. + var deploymentParameters = GetBaseDeploymentParameters(); + // Point to dotnet installed in user profile. + deploymentParameters.EnvironmentVariables["DotnetPath"] = Environment.ExpandEnvironmentVariables(dotnetLocation); // Path to dotnet. - using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) - { - var deploymentResult = await deployer.DeployAsync(); + var deploymentResult = await DeployAsync(deploymentParameters); - Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", "%DotnetPath%"); + ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", "%DotnetPath%"); - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. - var response = await RetryHelper.RetryRequest(() => - { - return deploymentResult.HttpClient.GetAsync("HelloWorld"); - }, logger, deploymentResult.HostShutdownToken, retryCount: 30); + // Request to base address and check if various parts of the body are rendered & measure the cold startup time. + var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); - } - } + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); } - [Fact] - public async Task StandaloneApplication_ExpectCorrectPublish() + + public static TestMatrix TestVariants + => TestMatrix.ForServers(ServerType.IISExpress) + .WithTfms(Tfm.NetCoreApp22) + .WithAllApplicationTypes() + .WithAncmV2InProcess(); + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task HelloWorld(TestVariant variant) { - using (StartLog(out var loggerFactory)) + var deploymentParameters = new DeploymentParameters(variant) { - var logger = loggerFactory.CreateLogger("HelloWorldTest"); + ApplicationPath = Helpers.GetInProcessTestSitesPath(), + }; - var deploymentParameters = GetBaseDeploymentParameters(); - deploymentParameters.ApplicationType = ApplicationType.Standalone; + var deploymentResult = await DeployAsync(deploymentParameters); - using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) - { - var deploymentResult = await deployer.DeployAsync(); + var response = await deploymentResult.RetryingHttpClient.GetAsync("/HelloWorld"); + var responseText = await response.Content.ReadAsStringAsync(); - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. - var response = await RetryHelper.RetryRequest(() => - { - return deploymentResult.HttpClient.GetAsync("HelloWorld"); - }, logger, deploymentResult.HostShutdownToken, retryCount: 30); - - var responseText = await response.Content.ReadAsStringAsync(); - try - { - Assert.Equal("Hello World", responseText); - } - catch (XunitException) - { - logger.LogWarning(response.ToString()); - logger.LogWarning(responseText); - throw; - } - } - } - } - - [Fact] - public async Task StandaloneApplication_AbsolutePathToExe_ExpectCorrectPublish() - { - using (StartLog(out var loggerFactory)) - { - var logger = loggerFactory.CreateLogger("HelloWorldTest"); - - var deploymentParameters = GetBaseDeploymentParameters(); - deploymentParameters.ApplicationType = ApplicationType.Standalone; - - using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) - { - var deploymentResult = await deployer.DeployAsync(); - - Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", $"{deploymentResult.ContentRoot}\\InProcessWebSite.exe"); - - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. - var response = await RetryHelper.RetryRequest(() => - { - return deploymentResult.HttpClient.GetAsync("HelloWorld"); - }, logger, deploymentResult.HostShutdownToken, retryCount: 30); - - var responseText = await response.Content.ReadAsStringAsync(); - try - { - Assert.Equal("Hello World", responseText); - } - catch (XunitException) - { - logger.LogWarning(response.ToString()); - logger.LogWarning(responseText); - throw; - } - } - } + Assert.Equal("Hello World", responseText); } [Fact] public async Task DetectsOveriddenServer() { - var testSink = new TestSink(); - using (StartLog(out var loggerFactory)) - { - var testLoggerFactory = new TestLoggerFactory(testSink, true); - loggerFactory.AddProvider(new TestLoggerProvider(testLoggerFactory)); - - using (var deployer = ApplicationDeployerFactory.Create(GetBaseDeploymentParameters("OverriddenServerWebSite"), loggerFactory)) - { - var deploymentResult = await deployer.DeployAsync(); - var response = await deploymentResult.HttpClient.GetAsync("/"); - Assert.False(response.IsSuccessStatusCode); - } - } - Assert.Contains(testSink.Writes, context => context.State.ToString().Contains("Application is running inside IIS process but is not configured to use IIS server")); + var deploymentResult = await DeployAsync(GetBaseDeploymentParameters("OverriddenServerWebSite")); + var response = await deploymentResult.HttpClient.GetAsync("/"); + Assert.False(response.IsSuccessStatusCode); + Assert.Contains(TestSink.Writes, context => context.Message.Contains("Application is running inside IIS process but is not configured to use IIS server")); } private DeploymentParameters GetBaseDeploymentParameters(string site = null) { return new DeploymentParameters(Helpers.GetTestWebSitePath(site ?? "InProcessWebSite"), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { - ServerConfigTemplateContent = File.ReadAllText("AppHostConfig/Http.config"), - SiteName = "HttpTestSite", // This is configured in the Http.config TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, AncmVersion = AncmVersion.AspNetCoreModuleV2 }; } - private class TestLoggerProvider : ILoggerProvider + private static void ModifyAspNetCoreSectionInWebConfig(IISDeploymentResult deploymentResult, string key, string value) { - private readonly TestLoggerFactory _loggerFactory; - - public TestLoggerProvider(TestLoggerFactory loggerFactory) - { - _loggerFactory = loggerFactory; - } - - public void Dispose() - { - } - - public ILogger CreateLogger(string categoryName) - { - return _loggerFactory.CreateLogger(categoryName); - } + // modify the web.config after publish + var root = deploymentResult.DeploymentResult.ContentRoot; + var webConfigFile = $"{root}/web.config"; + var config = XDocument.Load(webConfigFile); + var element = config.Descendants("aspNetCore").FirstOrDefault(); + element.SetAttributeValue(key, value); + config.Save(webConfigFile); } } } diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 766b4915bc..659487f51d 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -1,21 +1,18 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.IO; using System.Threading.Tasks; +using IISIntegration.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Testing; using Xunit; using Xunit.Abstractions; -using Xunit.Sdk; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { - public class HelloWorldTests : LoggedTest + public class HelloWorldTests : IISFunctionalTestBase { - public HelloWorldTests(ITestOutputHelper output) : base(output) + public HelloWorldTests(ITestOutputHelper output = null) : base(output) { } @@ -29,61 +26,36 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [MemberData(nameof(TestVariants))] public async Task HelloWorld(TestVariant variant) { - var testName = $"HelloWorld_{variant.Tfm}"; - using (StartLog(out var loggerFactory, testName)) + var deploymentParameters = new DeploymentParameters(variant) { - var logger = loggerFactory.CreateLogger("HelloWorldTest"); + ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), + }; - var deploymentParameters = new DeploymentParameters(variant) - { - ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), - EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld', - ServerConfigTemplateContent = File.ReadAllText("AppHostConfig/Http.config"), - SiteName = "HttpTestSite", // This is configured in the Http.config - }; + var deploymentResult = await DeployAsync(deploymentParameters); - using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) - { - var deploymentResult = await deployer.DeployAsync(); + var response = await deploymentResult.RetryingHttpClient.GetAsync("/HelloWorld"); + var responseText = await response.Content.ReadAsStringAsync(); - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. - var response = await RetryHelper.RetryRequest(() => - { - return deploymentResult.HttpClient.GetAsync(string.Empty); - }, logger, deploymentResult.HostShutdownToken, retryCount: 30); + Assert.Equal("Hello World", responseText); - var responseText = await response.Content.ReadAsStringAsync(); - try - { - Assert.Equal("Hello World", responseText); + response = await deploymentResult.HttpClient.GetAsync("/Path/%3F%3F?query"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("/??", responseText); - response = await deploymentResult.HttpClient.GetAsync("/Path%3F%3F?query"); - responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal("/Path??", responseText); + response = await deploymentResult.HttpClient.GetAsync("/Query/%3FPath?query?"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("?query?", responseText); - response = await deploymentResult.HttpClient.GetAsync("/Query%3FPath?query?"); - responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal("?query?", responseText); + response = await deploymentResult.HttpClient.GetAsync("/BodyLimit"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("null", responseText); - response = await deploymentResult.HttpClient.GetAsync("/BodyLimit"); - responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal("null", responseText); + response = await deploymentResult.HttpClient.GetAsync("/Auth"); + responseText = await response.Content.ReadAsStringAsync(); - response = await deploymentResult.HttpClient.GetAsync("/Auth"); - responseText = await response.Content.ReadAsStringAsync(); - - // We adapted the Http.config file to be used for inprocess too. We specify WindowsAuth is enabled - // We now expect that windows auth is enabled rather than disabled. - Assert.True("backcompat;Windows".Equals(responseText) || "latest;Windows".Equals(responseText), "Auth"); - } - catch (XunitException) - { - logger.LogWarning(response.ToString()); - logger.LogWarning(responseText); - throw; - } - } - } + // We adapted the Http.config file to be used for inprocess too. We specify WindowsAuth is enabled + // We now expect that windows auth is enabled rather than disabled. + Assert.True("backcompat;Windows".Equals(responseText) || "latest;Windows".Equals(responseText), "Auth"); } } } diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs index ddf22e726b..5667b0b6b1 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -1,25 +1,21 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; -using System.IO; using System.Net.Http; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; +using IISIntegration.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Testing; using Xunit; using Xunit.Abstractions; -using Xunit.Sdk; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { // IIS Express preregisteres 44300-44399 ports with SSL bindings. // So these tests always have to use ports in this range, and we can't rely on OS-allocated ports without a whole lot of ceremony around // creating self-signed certificates and registering SSL bindings with HTTP.sys - public class HttpsTest : LoggedTest + public class HttpsTest : IISFunctionalTestBase { public HttpsTest(ITestOutputHelper output) : base(output) { @@ -34,49 +30,23 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [MemberData(nameof(TestVariants))] public async Task HttpsHelloWorld(TestVariant variant) { - var applicationBaseUrl = $"https://localhost:44394/"; - var testName = $"HttpsHelloWorld_{variant.Tfm}"; - using (StartLog(out var loggerFactory, testName)) + var deploymentParameters = new DeploymentParameters(variant) { - var logger = loggerFactory.CreateLogger("HttpsHelloWorldTest"); + ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), + ApplicationBaseUriHint = "https://localhost:44394/", + ServerConfigTemplateContent = GetHttpsServerConfig() + }; - var deploymentParameters = new DeploymentParameters(variant) - { - ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), - ApplicationBaseUriHint = applicationBaseUrl, - EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld', - ServerConfigTemplateContent = File.ReadAllText("AppHostConfig/Https.config"), - SiteName = "HttpsTestSite", // This is configured in the Https.config - }; + var deploymentResult = await DeployAsync(deploymentParameters); - using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) - { - var deploymentResult = await deployer.DeployAsync(); - - var handler = new HttpClientHandler(); - handler.ServerCertificateCustomValidationCallback = (a, b, c, d) => true; - var httpClient = deploymentResult.CreateHttpClient(handler); - httpClient.Timeout = TimeSpan.FromSeconds(5); - - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. - var response = await RetryHelper.RetryRequest(() => - { - return httpClient.GetAsync(string.Empty); - }, logger, deploymentResult.HostShutdownToken, retryCount: 30); - - var responseText = await response.Content.ReadAsStringAsync(); - try - { - Assert.Equal("Scheme:https; Original:http", responseText); - } - catch (XunitException) - { - logger.LogWarning(response.ToString()); - logger.LogWarning(responseText); - throw; - } - } - } + var handler = new HttpClientHandler + { + ServerCertificateCustomValidationCallback = (a, b, c, d) => true + }; + var client = deploymentResult.CreateRetryClient(handler); + var response = await client.GetAsync("HttpsHelloWorld"); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("Scheme:https; Original:http", responseText); } [ConditionalTheory] @@ -97,60 +67,41 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private async Task HttpsHelloWorldCerts(TestVariant variant, int port, bool sendClientCert) { - var applicationBaseUrl = $"https://localhost:{port}/"; - var testName = $"HttpsHelloWorldCerts_{variant.Tfm}_{sendClientCert}"; - using (StartLog(out var loggerFactory, testName)) + var deploymentParameters = new DeploymentParameters(variant) { - var logger = loggerFactory.CreateLogger("HttpsHelloWorldTest"); + ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), + ApplicationBaseUriHint = $"https://localhost:{port}/", + ServerConfigTemplateContent = GetHttpsServerConfig() + }; - var deploymentParameters = new DeploymentParameters(variant) - { - ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), - ApplicationBaseUriHint = applicationBaseUrl, - EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld', - ServerConfigTemplateContent = File.ReadAllText("AppHostConfig/Https.config"), - SiteName = "HttpsTestSite", // This is configured in the Https.config - }; + var deploymentResult = await DeployAsync(deploymentParameters); - using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) - { - var deploymentResult = await deployer.DeployAsync(); - var handler = new HttpClientHandler(); - handler.ServerCertificateCustomValidationCallback = (a, b, c, d) => true; - handler.ClientCertificateOptions = ClientCertificateOption.Manual; - if (sendClientCert) - { - X509Certificate2 clientCert = FindClientCert(); - Assert.NotNull(clientCert); - handler.ClientCertificates.Add(clientCert); - } - var httpClient = deploymentResult.CreateHttpClient(handler); + var handler = new HttpClientHandler + { + ServerCertificateCustomValidationCallback = (a, b, c, d) => true, + ClientCertificateOptions = ClientCertificateOption.Manual + }; - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. - var response = await RetryHelper.RetryRequest(() => - { - return httpClient.GetAsync("checkclientcert"); - }, logger, deploymentResult.HostShutdownToken); + if (sendClientCert) + { + X509Certificate2 clientCert = FindClientCert(); + Assert.NotNull(clientCert); + handler.ClientCertificates.Add(clientCert); + } - var responseText = await response.Content.ReadAsStringAsync(); - try - { - if (sendClientCert) - { - Assert.Equal("Scheme:https; Original:http; has cert? True", responseText); - } - else - { - Assert.Equal("Scheme:https; Original:http; has cert? False", responseText); - } - } - catch (XunitException) - { - logger.LogWarning(response.ToString()); - logger.LogWarning(responseText); - throw; - } - } + var client = deploymentResult.CreateRetryClient(handler); + + // Request to base address and check if various parts of the body are rendered & measure the cold startup time. + var response = await client.GetAsync("checkclientcert"); + + var responseText = await response.Content.ReadAsStringAsync(); + if (sendClientCert) + { + Assert.Equal("Scheme:https; Original:http; has cert? True", responseText); + } + else + { + Assert.Equal("Scheme:https; Original:http; has cert? False", responseText); } } diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index b8c0567f3f..d75223aa7b 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -1,22 +1,19 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.IO; using System.Net; using System.Net.Http; using System.Threading.Tasks; +using IISIntegration.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Testing; using Xunit; using Xunit.Abstractions; -using Xunit.Sdk; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { - public class NtlmAuthenticationTests : LoggedTest + public class NtlmAuthenticationTests : IISFunctionalTestBase { public NtlmAuthenticationTests(ITestOutputHelper output) : base(output) { @@ -31,81 +28,51 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [MemberData(nameof(TestVariants))] public async Task NtlmAuthentication(TestVariant variant) { - var testName = $"NtlmAuthentication_{variant.Tfm}_{variant.AncmVersion}"; - using (StartLog(out var loggerFactory, testName)) + var deploymentParameters = new DeploymentParameters(variant) { - var logger = loggerFactory.CreateLogger("NtlmAuthenticationTest"); + ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), + ApplicationBaseUriHint = "http://localhost:5052" + }; - var deploymentParameters = new DeploymentParameters(variant) - { - ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), - ApplicationBaseUriHint = $"http://localhost:5052", - EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication' - ServerConfigTemplateContent = File.ReadAllText("AppHostConfig/NtlmAuthentation.config"), - SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config - }; + var result = await DeployAsync(deploymentParameters); + var response = await result.RetryingHttpClient.GetAsync("/HelloWorld"); - using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) - { - var deploymentResult = await deployer.DeployAsync(); - var httpClient = deploymentResult.HttpClient; - httpClient.Timeout = TimeSpan.FromSeconds(5); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal("Hello World", responseText); - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. - var response = await RetryHelper.RetryRequest(() => - { - return httpClient.GetAsync(string.Empty); - }, logger, deploymentResult.HostShutdownToken, retryCount: 30); + var httpClient = result.HttpClient; + response = await httpClient.GetAsync("/Anonymous"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal("Anonymous?True", responseText); - var responseText = await response.Content.ReadAsStringAsync(); - try - { - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - Assert.Equal("Hello World", responseText); + response = await httpClient.GetAsync("/Restricted"); + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString()); + Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString()); - response = await httpClient.GetAsync("/Anonymous"); - responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - Assert.Equal("Anonymous?True", responseText); + response = await httpClient.GetAsync("/RestrictedNTLM"); + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString()); + // Note we can't restrict a challenge to a specific auth type, the native auth modules always add themselves. + Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString()); - response = await httpClient.GetAsync("/Restricted"); - responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); - Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString()); - Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString()); + response = await httpClient.GetAsync("/Forbidden"); + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); - response = await httpClient.GetAsync("/RestrictedNTLM"); - responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); - Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString()); - // Note we can't restrict a challenge to a specific auth type, the native auth modules always add themselves. - Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString()); + var httpClientHandler = new HttpClientHandler() { UseDefaultCredentials = true }; + httpClient = result.CreateClient(httpClientHandler); - response = await httpClient.GetAsync("/Forbidden"); - responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + response = await httpClient.GetAsync("/Anonymous"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal("Anonymous?True", responseText); - var httpClientHandler = new HttpClientHandler() { UseDefaultCredentials = true }; - httpClient = deploymentResult.CreateHttpClient(httpClientHandler); - - response = await httpClient.GetAsync("/Anonymous"); - responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - Assert.Equal("Anonymous?True", responseText); - - response = await httpClient.GetAsync("/Restricted"); - responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - Assert.NotEmpty(responseText); - } - catch (XunitException) - { - logger.LogWarning(response.ToString()); - logger.LogWarning(responseText); - throw; - } - } - } + response = await httpClient.GetAsync("/Restricted"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.NotEmpty(responseText); } } } diff --git a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs index de58d20cee..3d0822af04 100644 --- a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs +++ b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs @@ -3,20 +3,18 @@ using System; using System.IO; -using System.Threading; +using System.Linq; using System.Threading.Tasks; +using IISIntegration.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Testing; using Xunit; using Xunit.Abstractions; -using Xunit.Sdk; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { - public class UpgradeFeatureDetectionTests : LoggedTest + public class UpgradeFeatureDetectionTests : IISFunctionalTestBase { - private string _isWebsocketsSupported = Environment.OSVersion.Version >= new Version(6, 2) ? "Enabled" : "Disabled"; + private readonly string _isWebsocketsSupported = Environment.OSVersion.Version >= new Version(6, 2) ? "Enabled" : "Disabled"; public UpgradeFeatureDetectionTests(ITestOutputHelper output) : base(output) { @@ -25,7 +23,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [Fact] public Task UpgradeFeatureDetectionDisabled_InProcess_IISExpress() { - return UpgradeFeatureDetectionDeployer("AppHostConfig/WebsocketsNotSupported.config", + return UpgradeFeatureDetectionDeployer( + disableWebSocket: true, Helpers.GetInProcessTestSitesPath(), "Disabled"); } @@ -33,7 +32,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [Fact] public Task UpgradeFeatureDetectionEnabled_InProcess_IISExpress() { - return UpgradeFeatureDetectionDeployer("AppHostConfig/Http.config", + return UpgradeFeatureDetectionDeployer( + disableWebSocket: false, Helpers.GetInProcessTestSitesPath(), _isWebsocketsSupported); } @@ -41,7 +41,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [Fact] public Task UpgradeFeatureDetectionDisabled_OutOfProcess_IISExpress() { - return UpgradeFeatureDetectionDeployer("AppHostConfig/WebsocketsNotSupported.config", + return UpgradeFeatureDetectionDeployer( + disableWebSocket: true, Helpers.GetOutOfProcessTestSitesPath(), "Disabled"); } @@ -49,51 +50,34 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [Fact] public Task UpgradeFeatureDetectionEnabled_OutOfProcess_IISExpress() { - return UpgradeFeatureDetectionDeployer("AppHostConfig/Http.config", + return UpgradeFeatureDetectionDeployer( + disableWebSocket: false, Helpers.GetOutOfProcessTestSitesPath(), _isWebsocketsSupported); } - private async Task UpgradeFeatureDetectionDeployer(string configPath, string sitePath, string expected) + private async Task UpgradeFeatureDetectionDeployer(bool disableWebSocket, string sitePath, string expected) { - var testName = $"HelloWorld"; - using (StartLog(out var loggerFactory, testName)) + var deploymentParameters = new DeploymentParameters(sitePath, ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { - var logger = loggerFactory.CreateLogger("HelloWorldTest"); + TargetFramework = Tfm.NetCoreApp22, + ApplicationType = ApplicationType.Portable, + AncmVersion = AncmVersion.AspNetCoreModuleV2 + }; - var deploymentParameters = new DeploymentParameters(sitePath, ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) - { - EnvironmentName = "UpgradeFeatureDetection", // Will pick the Start class named 'StartupHelloWorld', - ServerConfigTemplateContent = File.ReadAllText(configPath), - SiteName = "HttpTestSite", // This is configured in the Http.config - TargetFramework = Tfm.NetCoreApp22, - ApplicationType = ApplicationType.Portable, - AncmVersion = AncmVersion.AspNetCoreModuleV2 - }; - - using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) - { - var deploymentResult = await deployer.DeployAsync(); - deploymentResult.HttpClient.Timeout = TimeSpan.FromSeconds(5); - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. - var response = await RetryHelper.RetryRequest(() => - { - return deploymentResult.HttpClient.GetAsync("UpgradeFeatureDetection"); - }, logger, deploymentResult.HostShutdownToken, retryCount: 30); - - var responseText = await response.Content.ReadAsStringAsync(); - try - { - Assert.Equal(expected, responseText); - } - catch (XunitException) - { - logger.LogWarning(response.ToString()); - logger.LogWarning(responseText); - throw; - } - } + if (disableWebSocket) + { + deploymentParameters.ServerConfigTemplateContent = GetServerConfig( + element => element.Descendants("webSocket") + .Single() + .SetAttributeValue("enabled", "false")); } + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.RetryingHttpClient.GetAsync("UpgradeFeatureDetection"); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(expected, responseText); } } } diff --git a/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs new file mode 100644 index 0000000000..3d2be31553 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -0,0 +1,32 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Threading.Tasks; +using Microsoft.Extensions.Logging.Testing; +using Xunit.Abstractions; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + public class FunctionalTestsBase : LoggedTest + { + public FunctionalTestsBase(ITestOutputHelper output = null) : base(output) + { + } + + private ApplicationDeployer _deployer; + + protected virtual async Task DeployAsync(DeploymentParameters parameters) + { + _deployer = ApplicationDeployerFactory.Create(parameters, LoggerFactory); + + var result = await _deployer.DeployAsync(); + + return new IISDeploymentResult(result, Logger); + } + + public override void Dispose() + { + _deployer?.Dispose(); + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs index 65a981a86f..7690a49208 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs @@ -1,42 +1,20 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Server.IntegrationTesting; -using System; using System.IO; -using System.Linq; -using System.Threading.Tasks; -using System.Xml.Linq; +using Microsoft.AspNetCore.Testing; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class Helpers { public static string GetTestWebSitePath(string name) - { - return Path.GetFullPath( - Path.Combine(AppDomain.CurrentDomain.BaseDirectory, - "..", // tfm - "..", // debug - "..", // obj - "..", // projectfolder - "WebSites", - name)); + { + return Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"),"test", "WebSites", name); } public static string GetInProcessTestSitesPath() => GetTestWebSitePath("InProcessWebSite"); public static string GetOutOfProcessTestSitesPath() => GetTestWebSitePath("OutOfProcessWebSite"); - - public static void ModifyAspNetCoreSectionInWebConfig(DeploymentResult deploymentResult, string key, string value) - { - // modify the web.config after publish - var root = deploymentResult.ContentRoot; - var webConfigFile = $"{root}/web.config"; - var config = XDocument.Load(webConfigFile); - var element = config.Descendants("aspNetCore").FirstOrDefault(); - element.SetAttributeValue(key, value); - config.Save(webConfigFile); - } } } diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISDeploymentResult.cs b/test/IISIntegration.FunctionalTests/Utilities/IISDeploymentResult.cs new file mode 100644 index 0000000000..6ea25b89ec --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Utilities/IISDeploymentResult.cs @@ -0,0 +1,39 @@ +using System.Net.Http; +using Microsoft.Extensions.Logging; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + public class IISDeploymentResult + { + public DeploymentResult DeploymentResult { get; } + public ILogger Logger { get; } + + public IISDeploymentResult(DeploymentResult deploymentResult, ILogger logger) + { + DeploymentResult = deploymentResult; + Logger = logger; + + RetryingHttpClient = CreateRetryClient(new SocketsHttpHandler()); + HttpClient = CreateClient(new SocketsHttpHandler()); + } + + public HttpClient CreateRetryClient(HttpMessageHandler messageHandler) + { + return new HttpClient(new RetryHandler(new LoggingHandler(messageHandler, Logger), Logger)) + { + BaseAddress = DeploymentResult.HttpClient.BaseAddress + }; + } + + public HttpClient CreateClient(HttpMessageHandler messageHandler) + { + return new HttpClient(new LoggingHandler(messageHandler, Logger)) + { + BaseAddress = DeploymentResult.HttpClient.BaseAddress + }; + } + + public HttpClient HttpClient { get; set; } + public HttpClient RetryingHttpClient { get; set; } + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs b/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs new file mode 100644 index 0000000000..fb6cf40be8 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs @@ -0,0 +1,53 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Linq; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Xunit.Abstractions; + +namespace IISIntegration.FunctionalTests.Utilities +{ + public class IISFunctionalTestBase : FunctionalTestsBase + { + public IISFunctionalTestBase(ITestOutputHelper output = null) : base(output) + { + } + + protected override Task DeployAsync(DeploymentParameters parameters) + { + if (parameters.SiteName == null) + { + parameters.SiteName = "HttpTestSite"; + } + if (parameters.ServerConfigTemplateContent == null) + { + parameters.ServerConfigTemplateContent = GetServerConfig(null); + } + return base.DeployAsync(parameters); + } + + protected string GetServerConfig(Action transform) + { + var doc = XDocument.Load("AppHostConfig/Http.config"); + transform?.Invoke(doc.Root); + return doc.ToString(); + } + + protected string GetHttpsServerConfig() + { + return GetServerConfig( + element => { + element.Descendants("binding") + .Single() + .SetAttributeValue("protocol", "https"); + + element.Descendants("access") + .Single() + .SetAttributeValue("sslFlags", "Ssl, SslNegotiateCert"); + }); + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/LoggingHandler.cs b/test/IISIntegration.FunctionalTests/Utilities/LoggingHandler.cs new file mode 100644 index 0000000000..9559d8106c --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Utilities/LoggingHandler.cs @@ -0,0 +1,51 @@ +using System.Net.Http; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + public class LoggingHandler: DelegatingHandler + { + private readonly int _maxBodyLogSize = 16 * 1024; + private readonly ILogger _logger; + + public LoggingHandler(HttpMessageHandler innerHandler, ILogger logger) + : base(innerHandler) + { + _logger = logger; + } + + protected override async Task SendAsync( + HttpRequestMessage request, + CancellationToken cancellationToken) + { + _logger.LogDebug(request.ToString()); + var response = await base.SendAsync(request, cancellationToken); + + await LogResponse(response.IsSuccessStatusCode ? LogLevel.Debug : LogLevel.Warning, response); + return response; + } + + private async Task LogResponse(LogLevel logLevel, HttpResponseMessage response) + { + _logger.Log(logLevel, response.ToString()); + if (response.Content != null) + { + await response.Content.LoadIntoBufferAsync(); + var readAsStreamAsync = await response.Content.ReadAsStreamAsync(); + var buffer = new byte[_maxBodyLogSize]; + var offset = 0; + var count = 0; + do + { + count = await readAsStreamAsync.ReadAsync(buffer, offset, buffer.Length - offset); + offset += count; + } while (count != 0 && offset != buffer.Length); + + _logger.Log(logLevel, Encoding.ASCII.GetString(buffer, 0, offset)); + } + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/RetryHandler.cs b/test/IISIntegration.FunctionalTests/Utilities/RetryHandler.cs new file mode 100644 index 0000000000..00e1174c7a --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Utilities/RetryHandler.cs @@ -0,0 +1,60 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Net; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + public class RetryHandler : DelegatingHandler + { + private static readonly int MaxRetries = 5; + private static readonly TimeSpan RetryDelay = TimeSpan.FromSeconds(1); + + private readonly ILogger _logger; + + public RetryHandler(HttpMessageHandler innerHandler, ILogger logger) + : base(innerHandler) + { + _logger = logger; + } + + protected override async Task SendAsync( + HttpRequestMessage request, + CancellationToken cancellationToken) + { + HttpResponseMessage response = null; + for (int i = 0; i < MaxRetries; i++) + { + response = null; + try + { + response = await base.SendAsync(request, cancellationToken); + } + catch (Exception ex) + { + _logger.LogWarning("Error sending request", ex); + if (i == MaxRetries - 1) + { + throw; + } + } + + // Retry only on 503 that is expected during IIS startup + if (response != null && + (response.IsSuccessStatusCode || response.StatusCode != (HttpStatusCode)503)) + { + break; + } + + _logger.LogDebug($"Retrying {i+1}th time after {RetryDelay.Seconds} sec."); + await Task.Delay(RetryDelay, cancellationToken); + } + return response; + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/TestConnections.cs b/test/IISIntegration.FunctionalTests/Utilities/TestConnections.cs index 5a722362c1..3c234a0f4d 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/TestConnections.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/TestConnections.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Testing; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IntegrationTesting { /// /// Summary description for TestConnection diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index 93717f8703..b6fd2ae9ca 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -4,13 +4,13 @@ using System; using System.IO; using System.Net; -using System.Reflection; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.IISIntegration.FunctionalTests; using Microsoft.AspNetCore.Server.IIS; using Microsoft.Extensions.Primitives; using Xunit; @@ -21,16 +21,7 @@ namespace IISTestSite { public void Configure(IApplicationBuilder app) { - foreach (var method in GetType().GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)) - { - var parameters = method.GetParameters(); - if (method.Name != nameof(Configure) && - parameters.Length == 1 && - parameters[0].ParameterType == typeof(IApplicationBuilder)) - { - app.Map("/" + method.Name, innerAppBuilder => method.Invoke(this, new[] { innerAppBuilder })); - } - } + TestStartup.Register(app, this); } private void ServerVariable(IApplicationBuilder app) @@ -38,7 +29,7 @@ namespace IISTestSite app.Run(async ctx => { var varName = ctx.Request.Query["q"]; - await ctx.Response.WriteAsync($"{varName}: {HttpContextExtensions.GetIISServerVariable(ctx, varName) ?? "(null)"}"); + await ctx.Response.WriteAsync($"{varName}: {ctx.GetIISServerVariable(varName) ?? "(null)"}"); }); } diff --git a/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj index 0b96c98c36..399a22e279 100644 --- a/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj +++ b/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj @@ -10,6 +10,10 @@ + + + + diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/test/WebSites/OutOfProcessWebSite/Startup.cs new file mode 100644 index 0000000000..4b26fa7ba2 --- /dev/null +++ b/test/WebSites/OutOfProcessWebSite/Startup.cs @@ -0,0 +1,88 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Linq; +using System.Security.Principal; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IISIntegration; +using Microsoft.Extensions.DependencyInjection; +using Xunit; + +namespace TestSites +{ + public class Startup + { + public void Configure(IApplicationBuilder app) + { + TestStartup.Register(app, this); + } + + public Task Path(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Request.Path.Value); + + public Task Query(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Request.QueryString.Value); + + public Task BodyLimit(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Features.Get()?.MaxRequestBodySize?.ToString() ?? "null"); + + public async Task Auth(HttpContext ctx) + { + var iisAuth = Environment.GetEnvironmentVariable("ASPNETCORE_IIS_HTTPAUTH"); + var authProvider = ctx.RequestServices.GetService(); + var authScheme = (await authProvider.GetAllSchemesAsync()).SingleOrDefault(); + if (string.IsNullOrEmpty(iisAuth)) + { + await ctx.Response.WriteAsync("backcompat;" + (authScheme?.Name ?? "null")); + } + else + { + await ctx.Response.WriteAsync("latest;" + (authScheme?.Name ?? "null")); + } + } + + public Task HelloWorld(HttpContext ctx) => ctx.Response.WriteAsync("Hello World"); + + public Task HttpsHelloWorld(HttpContext ctx) => + ctx.Response.WriteAsync("Scheme:" + ctx.Request.Scheme + "; Original:" + ctx.Request.Headers["x-original-proto"]); + + public Task CheckClientCert(HttpContext ctx) => + ctx.Response.WriteAsync("Scheme:" + ctx.Request.Scheme + "; Original:" + ctx.Request.Headers["x-original-proto"] + + "; has cert? " + (ctx.Connection.ClientCertificate != null)); + + public Task Anonymous(HttpContext context) => context.Response.WriteAsync("Anonymous?" + !context.User.Identity.IsAuthenticated); + + public Task Restricted(HttpContext context) + { + if (context.User.Identity.IsAuthenticated) + { + Assert.IsType(context.User); + return context.Response.WriteAsync(context.User.Identity.AuthenticationType); + } + else + { + return context.ChallengeAsync(IISDefaults.AuthenticationScheme); + } + } + + public Task Forbidden(HttpContext context) => context.ForbidAsync(IISDefaults.AuthenticationScheme); + + public Task RestrictedNTLM(HttpContext context) + { + if (string.Equals("NTLM", context.User.Identity.AuthenticationType, StringComparison.Ordinal)) + { + return context.Response.WriteAsync("NTLM"); + } + else + { + return context.ChallengeAsync(IISDefaults.AuthenticationScheme); + } + } + + public Task UpgradeFeatureDetection(HttpContext context) => + context.Response.WriteAsync(context.Features.Get() != null? "Enabled": "Disabled"); + } +} diff --git a/test/WebSites/OutOfProcessWebSite/StartupHelloWorld.cs b/test/WebSites/OutOfProcessWebSite/StartupHelloWorld.cs deleted file mode 100644 index a406626ede..0000000000 --- a/test/WebSites/OutOfProcessWebSite/StartupHelloWorld.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Linq; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace TestSites -{ - public class StartupHelloWorld - { - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) - { - app.Run(async ctx => - { - if (ctx.Request.Path.Value.StartsWith("/Path")) - { - await ctx.Response.WriteAsync(ctx.Request.Path.Value); - return; - } - if (ctx.Request.Path.Value.StartsWith("/Query")) - { - await ctx.Response.WriteAsync(ctx.Request.QueryString.Value); - return; - } - if (ctx.Request.Path.Value.StartsWith("/BodyLimit")) - { - await ctx.Response.WriteAsync( - ctx.Features.Get()?.MaxRequestBodySize?.ToString() ?? "null"); - return; - } - - if (ctx.Request.Path.StartsWithSegments("/Auth")) - { - var iisAuth = Environment.GetEnvironmentVariable("ASPNETCORE_IIS_HTTPAUTH"); - var authProvider = ctx.RequestServices.GetService(); - var authScheme = (await authProvider.GetAllSchemesAsync()).SingleOrDefault(); - if (string.IsNullOrEmpty(iisAuth)) - { - await ctx.Response.WriteAsync("backcompat;" + (authScheme?.Name ?? "null")); - } - else - { - await ctx.Response.WriteAsync("latest;" + (authScheme?.Name ?? "null")); - } - return; - } - - await ctx.Response.WriteAsync("Hello World"); - }); - } - } -} diff --git a/test/WebSites/OutOfProcessWebSite/StartupHttpsHelloWorld.cs b/test/WebSites/OutOfProcessWebSite/StartupHttpsHelloWorld.cs deleted file mode 100644 index 3d9c7a92f7..0000000000 --- a/test/WebSites/OutOfProcessWebSite/StartupHttpsHelloWorld.cs +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Logging; - -namespace TestSites -{ - public class StartupHttpsHelloWorld - { - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) - { - app.Run(ctx => - { - if (ctx.Request.Path.Equals(new PathString("/checkclientcert"))) - { - return ctx.Response.WriteAsync("Scheme:" + ctx.Request.Scheme + "; Original:" + ctx.Request.Headers["x-original-proto"] - + "; has cert? " + (ctx.Connection.ClientCertificate != null)); - } - return ctx.Response.WriteAsync("Scheme:" + ctx.Request.Scheme + "; Original:" + ctx.Request.Headers["x-original-proto"]); - }); - } - } -} \ No newline at end of file diff --git a/test/WebSites/OutOfProcessWebSite/StartupNtlmAuthentication.cs b/test/WebSites/OutOfProcessWebSite/StartupNtlmAuthentication.cs deleted file mode 100644 index 29098ca702..0000000000 --- a/test/WebSites/OutOfProcessWebSite/StartupNtlmAuthentication.cs +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Security.Principal; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Server.IISIntegration; -using Microsoft.Extensions.Logging; -using Xunit; - -namespace TestSites -{ - public class StartupNtlmAuthentication - { - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) - { - // Simple error page without depending on Diagnostics. - app.Use(async (context, next) => - { - try - { - await next(); - } - catch (Exception ex) - { - if (context.Response.HasStarted) - { - throw; - } - - context.Response.Clear(); - context.Response.StatusCode = 500; - await context.Response.WriteAsync(ex.ToString()); - } - }); - - app.Use((context, next) => - { - if (context.Request.Path.Equals("/Anonymous")) - { - return context.Response.WriteAsync("Anonymous?" + !context.User.Identity.IsAuthenticated); - } - - if (context.Request.Path.Equals("/Restricted")) - { - if (context.User.Identity.IsAuthenticated) - { - Assert.IsType(context.User); - return context.Response.WriteAsync(context.User.Identity.AuthenticationType); - } - else - { - return context.ChallengeAsync(IISDefaults.AuthenticationScheme); - } - } - - if (context.Request.Path.Equals("/Forbidden")) - { - return context.ForbidAsync(IISDefaults.AuthenticationScheme); - } - - if (context.Request.Path.Equals("/RestrictedNTLM")) - { - if (string.Equals("NTLM", context.User.Identity.AuthenticationType, StringComparison.Ordinal)) - { - return context.Response.WriteAsync("NTLM"); - } - else - { - return context.ChallengeAsync(IISDefaults.AuthenticationScheme); - } - } - - return context.Response.WriteAsync("Hello World"); - }); - } - } -} diff --git a/test/WebSites/OutOfProcessWebSite/StartupUpgradeFeatureDetection.cs b/test/WebSites/OutOfProcessWebSite/StartupUpgradeFeatureDetection.cs deleted file mode 100644 index 81bc3149a0..0000000000 --- a/test/WebSites/OutOfProcessWebSite/StartupUpgradeFeatureDetection.cs +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Linq; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace TestSites -{ - public class StartupUpgradeFeatureDetection - { - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) - { - app.Run(async ctx => - { - if (ctx.Features.Get() != null) - { - await ctx.Response.WriteAsync("Enabled"); - } - else - { - await ctx.Response.WriteAsync("Disabled"); - } - }); - } - } -} diff --git a/test/WebSites/shared/WebSockets/TestStartup.cs b/test/WebSites/shared/WebSockets/TestStartup.cs new file mode 100644 index 0000000000..b1604e367a --- /dev/null +++ b/test/WebSites/shared/WebSockets/TestStartup.cs @@ -0,0 +1,38 @@ +using System; +using System.Reflection; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; + +namespace Microsoft.AspNetCore.IISIntegration.FunctionalTests +{ + public static class TestStartup + { + public static void Register(IApplicationBuilder app, object startup) + { + var type = startup.GetType(); + foreach (var method in type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)) + { + var parameters = method.GetParameters(); + if (method.Name != "Configure" && + parameters.Length == 1) + { + Action appfunc = null; + if (parameters[0].ParameterType == typeof(IApplicationBuilder)) + { + appfunc = innerAppBuilder => method.Invoke(startup, new[] { innerAppBuilder }); + } + else if (parameters[0].ParameterType == typeof(HttpContext)) + { + appfunc = innerAppBuilder => innerAppBuilder.Run(ctx => (Task)method.Invoke(startup, new[] { ctx })); + } + + if (appfunc != null) + { + app.Map("/" + method.Name, appfunc); + } + } + } + } + } +} From ff1ea3cf85dc060ac3db7ec5a21e6eac1eaea3ba Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 18 May 2018 16:38:19 -0700 Subject: [PATCH 030/363] Split ANCM request handlers into two! (#839) --- .gitignore | 3 +- IISIntegration.sln | 39 ++- build/build.msbuild | 3 +- build/repo.targets | 86 ++++--- build/testsite.props | 10 +- nuget/AspNetCoreV2.nuspec | 6 +- ...icrosoft.AspNetCore.AspNetCoreModule.props | 6 +- .../AspNetCore/src/applicationinfo.cpp | 6 +- .../AspNetCore/src/dllmain.cpp | 3 +- .../AspNetCore/src/precomp.hxx | 3 +- .../CommonLib/CommonLib.vcxproj | 2 + .../aspnetcore_event.h | 0 .../disconnectcontext.h | 0 .../environmentvariablehelpers.h | 0 .../requesthandler_config.cpp | 0 .../requesthandler_config.h | 0 .../{RequestHandler => CommonLib}/sttimer.h | 0 .../InProcessRequestHandler.vcxproj | 241 ++++++++++++++++++ .../Source.def | 2 +- .../InProcessRequestHandler/dllmain.cxx | 133 ++++++++++ .../inprocess/inprocessapplication.cpp | 0 .../inprocess/inprocessapplication.h | 0 .../inprocess/inprocesshandler.cpp | 0 .../inprocess/inprocesshandler.h | 0 .../inprocessrequesthandler.rc} | 4 +- .../managedexports.cxx | 0 .../InProcessRequestHandler/precomp.hxx | 104 ++++++++ .../OutOfProcessRequestHandler.vcxproj} | 17 +- .../OutOfProcessRequestHandler/Source.def | 5 + .../dllmain.cxx | 43 +--- .../outofprocess/forwarderconnection.cxx | 0 .../outofprocess/forwarderconnection.h | 0 .../outofprocess/forwardinghandler.cpp | 0 .../outofprocess/forwardinghandler.h | 0 .../outofprocess/outprocessapplication.cpp | 0 .../outofprocess/outprocessapplication.h | 0 .../outofprocess/processmanager.cxx | 0 .../outofprocess/processmanager.h | 0 .../outofprocess/protocolconfig.cxx | 0 .../outofprocess/protocolconfig.h | 0 .../outofprocess/responseheaderhash.cxx | 0 .../outofprocess/responseheaderhash.h | 0 .../outofprocess/serverprocess.cxx | 0 .../outofprocess/serverprocess.h | 0 .../outofprocess/websockethandler.cxx | 0 .../outofprocess/websockethandler.h | 0 .../outofprocess/winhttphelper.cxx | 0 .../outofprocess/winhttphelper.h | 0 .../outofprocessrequesthandler.rc | 119 +++++++++ .../precomp.hxx | 5 +- .../Microsoft.AspNetCore.Server.IIS.csproj | 8 +- .../Microsoft.AspNetCore.Server.IIS.nuspec | 4 +- .../NativeMethods.cs | 2 +- 53 files changed, 733 insertions(+), 121 deletions(-) rename src/AspNetCoreModuleV2/{RequestHandler => CommonLib}/aspnetcore_event.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler => CommonLib}/disconnectcontext.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler => CommonLib}/environmentvariablehelpers.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler => CommonLib}/requesthandler_config.cpp (100%) rename src/AspNetCoreModuleV2/{RequestHandler => CommonLib}/requesthandler_config.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler => CommonLib}/sttimer.h (100%) create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj rename src/AspNetCoreModuleV2/{RequestHandler => InProcessRequestHandler}/Source.def (50%) create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx rename src/AspNetCoreModuleV2/{RequestHandler => InProcessRequestHandler}/inprocess/inprocessapplication.cpp (100%) rename src/AspNetCoreModuleV2/{RequestHandler => InProcessRequestHandler}/inprocess/inprocessapplication.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler => InProcessRequestHandler}/inprocess/inprocesshandler.cpp (100%) rename src/AspNetCoreModuleV2/{RequestHandler => InProcessRequestHandler}/inprocess/inprocesshandler.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler/requesthandler.rc => InProcessRequestHandler/inprocessrequesthandler.rc} (95%) rename src/AspNetCoreModuleV2/{RequestHandler => InProcessRequestHandler}/managedexports.cxx (100%) create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx rename src/AspNetCoreModuleV2/{RequestHandler/RequestHandler.vcxproj => OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj} (95%) create mode 100644 src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/dllmain.cxx (89%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/forwarderconnection.cxx (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/forwarderconnection.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/forwardinghandler.cpp (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/forwardinghandler.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/outprocessapplication.cpp (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/outprocessapplication.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/processmanager.cxx (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/processmanager.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/protocolconfig.cxx (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/protocolconfig.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/responseheaderhash.cxx (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/responseheaderhash.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/serverprocess.cxx (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/serverprocess.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/websockethandler.cxx (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/websockethandler.h (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/winhttphelper.cxx (100%) rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/outofprocess/winhttphelper.h (100%) create mode 100644 src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc rename src/AspNetCoreModuleV2/{RequestHandler => OutOfProcessRequestHandler}/precomp.hxx (94%) diff --git a/.gitignore b/.gitignore index e353a67858..74f65a6ecf 100644 --- a/.gitignore +++ b/.gitignore @@ -55,7 +55,8 @@ src/*/AspNetCore/aspnetcoremodule.h src/*/AspNetCore/aspnetcore_msg.h src/*/AspNetCore/aspnetcore_msg.rc src/*/*/version.h -src/*/RequestHandler/version.h +src/*/InProcessRequestHandler/version.h +src/*/OutOfProcessRequestHandler/version.h src/*/CommonLib/aspnetcore_msg.h src/*/CommonLib/aspnetcore_msg.rc test/*/Debug diff --git a/IISIntegration.sln b/IISIntegration.sln index a5dbd5dad6..a7b2c54b60 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -92,14 +92,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\AspNetCore EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV2\IISLib\IISLib.vcxproj", "{09D9D1D6-2951-4E14-BC35-76A23CF9391A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandler", "src\AspNetCoreModuleV2\RequestHandler\RequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\WebSites\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{42E60F88-E23F-417A-8143-0CCEC05E1D02}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{622D35C9-627B-466E-8D15-752968CC79AF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Performance", "benchmarks\IIS.Performance\IIS.Performance.csproj", "{48F46909-E76A-4788-BCE1-E543C0E140FE}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", "src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -294,16 +296,6 @@ Global {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.Build.0 = Release|x64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.ActiveCfg = Release|Win32 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.Build.0 = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.ActiveCfg = Debug|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.ActiveCfg = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.Build.0 = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.ActiveCfg = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.ActiveCfg = Release|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.ActiveCfg = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.Build.0 = Release|Win32 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.ActiveCfg = Debug|x86 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.ActiveCfg = Debug|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.Build.0 = Debug|x64 @@ -326,6 +318,26 @@ Global {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x64.Build.0 = Release|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x86.ActiveCfg = Release|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x86.Build.0 = Release|Any CPU + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.ActiveCfg = Debug|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.ActiveCfg = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.Build.0 = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.ActiveCfg = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.ActiveCfg = Release|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.ActiveCfg = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.Build.0 = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.ActiveCfg = Debug|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.Build.0 = Debug|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.ActiveCfg = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.Build.0 = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|Any CPU.ActiveCfg = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.ActiveCfg = Release|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.Build.0 = Release|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.ActiveCfg = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -351,9 +363,10 @@ Global {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {55494E58-E061-4C4C-A0A8-837008E72F85} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} - {D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {42E60F88-E23F-417A-8143-0CCEC05E1D02} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {48F46909-E76A-4788-BCE1-E543C0E140FE} = {622D35C9-627B-466E-8D15-752968CC79AF} + {D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} + {7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/build/build.msbuild b/build/build.msbuild index 86984b2cb4..c97f1a53b5 100644 --- a/build/build.msbuild +++ b/build/build.msbuild @@ -5,7 +5,8 @@ - + + diff --git a/build/repo.targets b/build/repo.targets index d56787031b..a70e25df5f 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -1,32 +1,63 @@ + InitializeComponents;$(PrepareDependsOn) BuildNativeAssets;$(CompileDependsOn) $(PackageDependsOn);PackageNativeProjects - RunNativeTest;$(TestDependsOn) + $(TestDependsOn);RunNativeTest $(RepositoryRoot)NuGetPackageVerifier.xplat.json + $(RepositoryRoot)src\ + bin\$(Configuration)\ + + + + + + + + + + + + + + + + + + + -p:Configuration=$(Configuration) -v:m -nologo -clp:NoSummary -p:CommitHash=$(CommitHash) - + - - - - @@ -54,12 +85,8 @@ - - - - - - + + @@ -76,24 +103,13 @@ BasePath="$(RepositoryRoot)" /> - - - - - - - - - - - - - - + + + - - - + + + - - - - - diff --git a/build/testsite.props b/build/testsite.props index aa60d852e4..be0f2c72cc 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -29,8 +29,10 @@ - - + + + + @@ -43,7 +45,7 @@ $(NativePlatform)\aspnetcore.dll $(NativePlatform)\aspnetcorev2.dll - $(NativePlatform)\aspnetcorerh.dll + $(NativePlatform)\aspnetcorev2_inprocess.dll $(userprofile)\.dotnet\$(NativePlatform)\dotnet.exe @@ -64,7 +66,7 @@ $(MSBuildThisFileDirectory)..\test\TestTasks\bin\$(Configuration)\$(TargetFramework)\TestTasks $(InjectDepsAssembly) - "win7-$(NativePlatform)" "$(AncmRHPath)" + "win7-$(NativePlatform)" "$(AncmInProcessRHPath)" diff --git a/nuget/AspNetCoreV2.nuspec b/nuget/AspNetCoreV2.nuspec index 6e0f6470f1..6de70ba91a 100644 --- a/nuget/AspNetCoreV2.nuspec +++ b/nuget/AspNetCoreV2.nuspec @@ -21,8 +21,10 @@ - - + + + + diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props index 5b01ee63a4..ab1379787b 100644 --- a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props +++ b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props @@ -3,8 +3,10 @@ $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcore.dll $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcore.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorerh.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorerh.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_inprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_inprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_outofprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_outofprocess.dll diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 656e903b76..6d7ea5bbf1 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -365,7 +365,7 @@ APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation(STRU* struFilename) else if ((dwReturnedSize == dwSize) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { dwSize *= 2; // smaller buffer. increase the buffer and retry - if (FAILED(hr = struFilename->Resize(dwSize + 20))) // + 20 for aspnetcorerh.dll + if (FAILED(hr = struFilename->Resize(dwSize + 40))) // + 40 for aspnetcorerh.dll { goto Finished; } @@ -385,7 +385,7 @@ APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation(STRU* struFilename) if (FAILED(hr = struFilename->SyncWithBuffer()) || FAILED(hr = struFilename->Append(L"\\")) || - FAILED(hr = struFilename->Append(g_pwzAspnetcoreRequestHandlerName))) + FAILED(hr = struFilename->Append(g_pwzAspnetcoreOutOfProcessRequestHandlerName))) { goto Finished; } @@ -498,7 +498,7 @@ APPLICATION_INFO::FindNativeAssemblyFromHostfxr( } } - if (FAILED(hr = struNativeDllLocation.Append(g_pwzAspnetcoreRequestHandlerName))) + if (FAILED(hr = struNativeDllLocation.Append(g_pwzAspnetcoreInProcessRequestHandlerName))) { goto Finished; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp index 56829cb382..3e0cffc323 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp @@ -19,7 +19,8 @@ DWORD g_dwActiveServerProcesses = 0; SRWLOCK g_srwLock; DWORD g_dwDebugFlags = 0; PCSTR g_szDebugLabel = "ASPNET_CORE_MODULE"; -PCWSTR g_pwzAspnetcoreRequestHandlerName = L"aspnetcorerh.dll"; +PCWSTR g_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; +PCWSTR g_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; VOID diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx index d411a47308..8b359c8550 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx @@ -153,7 +153,8 @@ extern DWORD g_dwActiveServerProcesses; extern HINSTANCE g_hModule; extern HMODULE g_hAspnetCoreRH; extern SRWLOCK g_srwLock; -extern PCWSTR g_pwzAspnetcoreRequestHandlerName; extern HANDLE g_hEventLog; +extern PCWSTR g_pwzAspnetcoreInProcessRequestHandlerName; +extern PCWSTR g_pwzAspnetcoreOutOfProcessRequestHandlerName; extern PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; #pragma warning( error : 4091) diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 73b08b965e..728c42bb9e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -181,6 +181,7 @@ + @@ -189,6 +190,7 @@ + Create diff --git a/src/AspNetCoreModuleV2/RequestHandler/aspnetcore_event.h b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/aspnetcore_event.h rename to src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/disconnectcontext.h b/src/AspNetCoreModuleV2/CommonLib/disconnectcontext.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/disconnectcontext.h rename to src/AspNetCoreModuleV2/CommonLib/disconnectcontext.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/environmentvariablehelpers.h b/src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/environmentvariablehelpers.h rename to src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.cpp b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.cpp rename to src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.h b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.h rename to src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/sttimer.h b/src/AspNetCoreModuleV2/CommonLib/sttimer.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/sttimer.h rename to src/AspNetCoreModuleV2/CommonLib/sttimer.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj new file mode 100644 index 0000000000..7cb549ffd1 --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -0,0 +1,241 @@ + + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {D57EA297-6DC2-4BC0-8C91-334863327863} + Win32Proj + InProcessRequestHandler + 10.0.15063.0 + InProcessRequestHandler + + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + aspnetcorev2_inprocess + + + false + + + false + + + + NotUsing + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + precomp.hxx + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + Source.def + + + + + NotUsing + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + precomp.hxx + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + Source.def + + + + + Level4 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) + precomp.hxx + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + false + true + true + Source.def + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) + + + + + Level4 + NotUsing + MaxSpeed + true + true + NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + precomp.hxx + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + false + true + true + Source.def + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/RequestHandler/Source.def b/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def similarity index 50% rename from src/AspNetCoreModuleV2/RequestHandler/Source.def rename to src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def index 86c8c2a268..c540402c00 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/Source.def +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def @@ -1,4 +1,4 @@ -LIBRARY aspnetcorerh +LIBRARY aspnetcorev2_inprocess EXPORTS CreateApplication diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx new file mode 100644 index 0000000000..aa557dfbef --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -0,0 +1,133 @@ +// dllmain.cpp : Defines the entry point for the DLL application. +#include "precomp.hxx" +#include +#include + +BOOL g_fGlobalInitialize = FALSE; +BOOL g_fProcessDetach = FALSE; +DWORD g_dwAspNetCoreDebugFlags = 0; +DWORD g_dwDebugFlags = 0; +SRWLOCK g_srwLockRH; +IHttpServer * g_pHttpServer = NULL; +HINSTANCE g_hWinHttpModule; +HINSTANCE g_hAspNetCoreModule; +HANDLE g_hEventLog = NULL; +PCSTR g_szDebugLabel = "ASPNET_CORE_MODULE_INPROCESS_REQUEST_HANDLER"; + +VOID +InitializeGlobalConfiguration( + IHttpServer * pServer +) +{ + HKEY hKey; + BOOL fLocked = FALSE; + + if (!g_fGlobalInitialize) + { + AcquireSRWLockExclusive(&g_srwLockRH); + fLocked = TRUE; + + if (g_fGlobalInitialize) + { + // Done by another thread + goto Finished; + } + + g_pHttpServer = pServer; + if (pServer->IsCommandLineLaunch()) + { + g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); + } + else + { + g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_EVENT_PROVIDER); + } + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module\\Parameters", + 0, + KEY_READ, + &hKey) == NO_ERROR) + { + DWORD dwType; + DWORD dwData; + DWORD cbData; + + cbData = sizeof(dwData); + if ((RegQueryValueEx(hKey, + L"DebugFlags", + NULL, + &dwType, + (LPBYTE)&dwData, + &cbData) == NO_ERROR) && + (dwType == REG_DWORD)) + { + g_dwAspNetCoreDebugFlags = dwData; + } + RegCloseKey(hKey); + } + + g_fGlobalInitialize = TRUE; + } +Finished: + if (fLocked) + { + ReleaseSRWLockExclusive(&g_srwLockRH); + } +} + +BOOL APIENTRY DllMain(HMODULE hModule, + DWORD ul_reason_for_call, + LPVOID lpReserved +) +{ + UNREFERENCED_PARAMETER(lpReserved); + + switch (ul_reason_for_call) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hModule); + InitializeSRWLock(&g_srwLockRH); + break; + case DLL_PROCESS_DETACH: + g_fProcessDetach = TRUE; + default: + break; + } + return TRUE; +} + +// TODO remove pHttpContext from the CreateApplication call. +HRESULT +__stdcall +CreateApplication( + _In_ IHttpServer *pServer, + _In_ IHttpContext *pHttpContext, + _In_ PCWSTR pwzExeLocation, + _Out_ IAPPLICATION **ppApplication +) +{ + HRESULT hr = S_OK; + IAPPLICATION *pApplication = NULL; + REQUESTHANDLER_CONFIG *pConfig; + // Initialze some global variables here + InitializeGlobalConfiguration(pServer); + + hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpContext->GetApplication(), pwzExeLocation, g_hEventLog, &pConfig); + if (FAILED(hr)) + { + return hr; + } + + pApplication = new IN_PROCESS_APPLICATION(pServer, pConfig); + if (pApplication == NULL) + { + hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); + goto Finished; + } + + *ppApplication = pApplication; + +Finished: + return hr; +} diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/requesthandler.rc b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc similarity index 95% rename from src/AspNetCoreModuleV2/RequestHandler/requesthandler.rc rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc index 2cc99c2331..bf1e4d5191 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/requesthandler.rc +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc @@ -78,9 +78,9 @@ BEGIN VALUE "CompanyName", "Microsoft" VALUE "FileDescription", FileDescription VALUE "FileVersion", FileVersionStr - VALUE "InternalName", "aspnetcorerh.dll" + VALUE "InternalName", "aspnetcorev2_inprocess.dll" VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation" - VALUE "OriginalFilename", "aspnetcorerh.dll" + VALUE "OriginalFilename", "aspnetcorev2_inprocess.dll" VALUE "ProductName", "ASP.NET Core Module Request Handler" VALUE "ProductVersion", ProductVersionStr END diff --git a/src/AspNetCoreModuleV2/RequestHandler/managedexports.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/managedexports.cxx rename to src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx new file mode 100644 index 0000000000..2a2c5812e7 --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx @@ -0,0 +1,104 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +#pragma warning( disable : 4091) + +// +// System related headers +// +#define _WINSOCKAPI_ + +#define NTDDI_VERSION 0x06010000 +#define WINVER 0x0601 +#define _WIN32_WINNT 0x0601 + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +// This should remove our issue of compiling for win7 without header files. +// We force the Windows 8 version check logic in iiswebsocket.h to succeed even though we're compiling for Windows 7. +// Then, we set the version defines back to Windows 7 to for the remainder of the compilation. +#undef NTDDI_VERSION +#undef WINVER +#undef _WIN32_WINNT +#define NTDDI_VERSION 0x06020000 +#define WINVER 0x0602 +#define _WIN32_WINNT 0x0602 +#include +#undef NTDDI_VERSION +#undef WINVER +#undef _WIN32_WINNT + +#define NTDDI_VERSION 0x06010000 +#define WINVER 0x0601 +#define _WIN32_WINNT 0x0601 + +#include "..\IISLib\acache.h" +#include "..\IISLib\multisz.h" +#include "..\IISLib\multisza.h" +#include "..\IISLib\base64.h" +#include "..\IISLib\listentry.h" +#include "..\CommonLib\fx_ver.h" +#include "..\CommonLib\debugutil.h" +#include "..\CommonLib\requesthandler.h" +#include "..\CommonLib\requesthandler_config.h" +#include "..\CommonLib\utility.h" +#include "..\CommonLib\application.h" +#include "..\CommonLib\resources.h" +#include "aspnetcore_event.h" +#include "aspnetcore_msg.h" +#include "disconnectcontext.h" +#include "environmentvariablehelpers.h" +#include "sttimer.h" +#include ".\inprocess\InProcessHandler.h" +#include ".\inprocess\inprocessapplication.h" + +#ifdef max +#undef max +template inline T max(T a, T b) +{ + return a > b ? a : b; +} +#endif + +#ifdef min +#undef min +template inline T min(T a, T b) +{ + return a < b ? a : b; +} +#endif + + +inline bool IsSpace(char ch) +{ + switch (ch) + { + case 32: // ' ' + case 9: // '\t' + case 10: // '\n' + case 13: // '\r' + case 11: // '\v' + case 12: // '\f' + return true; + default: + return false; + } +} + +extern BOOL g_fAsyncDisconnectAvailable; +extern BOOL g_fEnableReferenceCountTracing; +extern BOOL g_fProcessDetach; +extern SRWLOCK g_srwLockRH; +extern HANDLE g_hEventLog; diff --git a/src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj similarity index 95% rename from src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index ff49cffd42..33c8b4046a 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -21,11 +21,11 @@ 15.0 - {D57EA297-6DC2-4BC0-8C91-334863327863} + {7F87406C-A3C8-4139-A68D-E4C344294A67} Win32Proj - RequestHandler + OutOfProcessRequestHandler 10.0.15063.0 - RequestHandler + OutOfProcessRequestHandler @@ -73,7 +73,7 @@ - aspnetcorerh + aspnetcorev2_outofprocess false @@ -209,7 +209,6 @@ - @@ -219,18 +218,13 @@ - - - - - @@ -238,7 +232,6 @@ - @@ -249,7 +242,7 @@ - + diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def new file mode 100644 index 0000000000..37d763da5a --- /dev/null +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def @@ -0,0 +1,5 @@ +LIBRARY aspnetcorev2_outofprocess + +EXPORTS + CreateApplication + diff --git a/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx similarity index 89% rename from src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx index d38d3a9417..d1b3179970 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx @@ -294,41 +294,24 @@ CreateApplication( return hr; } - if (pConfig->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) + hr = EnsureOutOfProcessInitializtion(); + if (FAILED(hr)) { - pApplication = new IN_PROCESS_APPLICATION(pServer, pConfig); - if (pApplication == NULL) - { - hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); - goto Finished; - } + goto Finished; } - else if (pConfig->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_OUT_PROCESS) + + pApplication = new OUT_OF_PROCESS_APPLICATION(pConfig); + if (pApplication == NULL) { - hr = EnsureOutOfProcessInitializtion(); - if (FAILED(hr)) - { - goto Finished; - } - - pApplication = new OUT_OF_PROCESS_APPLICATION(pConfig); - if (pApplication == NULL) - { - hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); - goto Finished; - } - - hr = ((OUT_OF_PROCESS_APPLICATION*)pApplication)->Initialize(); - if (FAILED(hr)) - { - delete pApplication; - pApplication = NULL; - goto Finished; - } + hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); + goto Finished; } - else + + hr = ((OUT_OF_PROCESS_APPLICATION*)pApplication)->Initialize(); + if (FAILED(hr)) { - hr = HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); + delete pApplication; + pApplication = NULL; goto Finished; } diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc new file mode 100644 index 0000000000..eb32a08eb7 --- /dev/null +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc @@ -0,0 +1,119 @@ +// Microsoft Visual C++ generated resource script. +// +#include +#include "version.h" +#include "..\CommonLib\resources.h" +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#define FileDescription "IIS ASP.NET Core Module Request Handler. Commit: " CommitHash + +///////////////////////////////////////////////////////////////////////////// +// +// 11 +// + +//1 11 +//BEGIN +// 0x0001, 0x0000, 0x03e8, 0x0000, 0x03ed, 0x0000, 0x0010, 0x0000, 0x0010, +// 0x0001, 0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, +// 0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, +// 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, +// 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d, +// 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d, 0x000a, +// 0x0000, 0x0000 +//END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "..\CommonLib\resources.h\0" +END + +2 TEXTINCLUDE +BEGIN + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION FileVersion + PRODUCTVERSION ProductVersion + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Microsoft" + VALUE "FileDescription", FileDescription + VALUE "FileVersion", FileVersionStr + VALUE "InternalName", "aspnetcorev2_outofprocess.dll" + VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation" + VALUE "OriginalFilename", "aspnetcorev2_outofprocess.dll" + VALUE "ProductName", "ASP.NET Core Module Request Handler" + VALUE "ProductVersion", ProductVersionStr + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_INVALID_PROPERTY "Property name '%s' in system.webServer/aspNetCore section has invalid value '%s' which does not conform to the prescribed format" + IDS_SERVER_ERROR "There was a connection error while trying to route the request." +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx similarity index 94% rename from src/AspNetCoreModuleV2/RequestHandler/precomp.hxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx index 8fe43d1cdb..1cf69ec0dd 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx @@ -62,11 +62,9 @@ #include "aspnetcore_event.h" #include "aspnetcore_msg.h" #include "disconnectcontext.h" +#include "requesthandler_config.h" #include "sttimer.h" -#include ".\requesthandler_config.h" -#include ".\inprocess\InProcessHandler.h" -#include ".\inprocess\inprocessapplication.h" #include ".\outofprocess\websockethandler.h" #include ".\outofprocess\responseheaderhash.h" #include ".\outofprocess\protocolconfig.h" @@ -76,7 +74,6 @@ #include ".\outofprocess\forwardinghandler.h" #include ".\outofprocess\outprocessapplication.h" #include ".\outofprocess\winhttphelper.h" -#include ".\outofprocess\outprocessapplication.h" #include "environmentvariablehelpers.h" diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index b33643eb31..b792bfbb62 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -28,10 +28,10 @@ - - + + - - + + diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec index 3124aad25f..8e6ff9c302 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec @@ -26,7 +26,7 @@ - - + + diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs index a736edb2ca..9c5978db13 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Server.IIS private const string KERNEL32 = "kernel32.dll"; - private const string AspNetCoreModuleDll = "aspnetcorerh.dll"; + private const string AspNetCoreModuleDll = "aspnetcorev2_inprocess.dll"; [DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)] From 64db0c9e95dacf112b925965f8fd8da2baa97df0 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 18 May 2018 21:28:04 -0700 Subject: [PATCH 031/363] Fix mismatching request handler xml tags --- nuget/Microsoft.AspNetCore.AspNetCoreModule.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props index ab1379787b..38b8eafcc4 100644 --- a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props +++ b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props @@ -4,7 +4,7 @@ $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcore.dll $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcore.dll $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_inprocess.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_inprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_inprocess.dll $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_outofprocess.dll $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_outofprocess.dll From dfe8c63bf4fbdba367e1a63d70d28b1d406c06e8 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 20 May 2018 19:34:22 +0000 Subject: [PATCH 032/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 56 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index df8f6c8ef0..a179cb7665 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,39 +4,39 @@ 0.10.13 - 2.2.0-preview1-17055 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 0.6.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 + 2.2.0-preview1-17060 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 0.6.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 15.6.82 15.6.82 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 - 2.2.0-preview1-34230 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 2.0.0 2.1.0-rc1 2.2.0-preview1-26509-06 - 2.2.0-preview1-34230 + 2.2.0-preview1-34255 15.6.1 2.0.3 4.6.0-preview1-26508-04 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 00b3bf864b..06fc8a13e4 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17055 -commithash:99daa5d16d9835cc5c0bed2e12f86f2716b2599f +version:2.2.0-preview1-17060 +commithash:25b4b134d6f8f7b461928f0d495cfc695ccabb5b From 23cb0c90b26265cef178f2137c610a6def4f1164 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 23 May 2018 17:13:30 -0700 Subject: [PATCH 033/363] Enable jenkins tests (#855) --- build/buildpipeline/pipeline.groovy | 19 +++++++++++++++++++ build/buildpipeline/windows.groovy | 14 ++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 build/buildpipeline/pipeline.groovy create mode 100644 build/buildpipeline/windows.groovy diff --git a/build/buildpipeline/pipeline.groovy b/build/buildpipeline/pipeline.groovy new file mode 100644 index 0000000000..f3be6756b9 --- /dev/null +++ b/build/buildpipeline/pipeline.groovy @@ -0,0 +1,19 @@ +import org.dotnet.ci.pipelines.Pipeline + +def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') + +def configurations = [ + 'Debug', + 'Release' +] + +configurations.each { configuration -> + + def params = [ + 'Configuration': configuration + ] + + windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params) + windowsPipeline.triggerPipelineOnGithubPush(params) + +} diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy new file mode 100644 index 0000000000..f756534198 --- /dev/null +++ b/build/buildpipeline/windows.groovy @@ -0,0 +1,14 @@ +@Library('dotnet-ci') _ + +// 'node' indicates to Jenkins that the enclosed block runs on a node that matches +// the label 'windows-with-vs' +simpleNode('Windows.10.Enterprise.RS3.ASPNET') { + stage ('Checking out source') { + checkout scm + } + stage ('Build') { + def logFolder = getLogFolder() + def environment = "set ASPNETCORE_TEST_LOG_DIR=${WORKSPACE}\\${logFolder}" + bat "${environment}&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}" + } +} From 1e143c71c66ce7148d04b8d59e9bd2b0f6e2850a Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 24 May 2018 08:11:40 -0700 Subject: [PATCH 034/363] Add Hostable Web Core based inprocess test server (#853) --- .../IIS.Performance/IIS.Performance.csproj | 12 +- .../IIS.Performance/PlaintextBenchmark.cs | 73 +++ .../IIS.Performance/StartupTimeBenchmark.cs | 1 - .../AspNetCore/AspNetCore.vcxproj | 522 +++++++++--------- .../AspNetCore/Inc/applicationinfo.h | 10 +- .../AspNetCore/Inc/aspnetcore_shim_config.h | 57 +- .../AspNetCore/src/applicationinfo.cpp | 119 ++-- .../AspNetCore/src/aspnetcore_shim_config.cpp | 36 +- .../AspNetCore/src/precomp.hxx | 2 +- .../AspNetCore/src/proxymodule.cxx | 6 +- .../CommonLib/CommonLib.vcxproj | 456 +++++++-------- .../CommonLib/environmentvariablehelpers.h | 10 +- .../CommonLib/hostfxroptions.cpp | 102 ++++ .../CommonLib/hostfxroptions.h | 58 ++ .../CommonLib/requesthandler_config.cpp | 58 -- .../CommonLib/requesthandler_config.h | 38 +- src/AspNetCoreModuleV2/CommonLib/stdafx.h | 2 +- .../InProcessRequestHandler/dllmain.cxx | 4 +- .../inprocess/inprocessapplication.cpp | 77 ++- .../inprocess/inprocessapplication.h | 16 +- .../managedexports.cxx | 7 + .../OutOfProcessRequestHandler/dllmain.cxx | 4 +- .../Core/IISHttpServer.cs | 2 + .../NativeMethods.cs | 2 +- .../AppHostConfig/TestServer.config | 201 +++++++ .../IISIntegration.FunctionalTests.csproj | 22 + .../Inprocess/TestServerTest.cs | 41 ++ ...pIfHostableWebCoreNotAvailibleAttribute.cs | 17 + .../Utilities/TestServer.cs | 144 +++++ 29 files changed, 1329 insertions(+), 770 deletions(-) create mode 100644 benchmarks/IIS.Performance/PlaintextBenchmark.cs create mode 100644 src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h create mode 100644 test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config create mode 100644 test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs create mode 100644 test/IISIntegration.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs create mode 100644 test/IISIntegration.FunctionalTests/Utilities/TestServer.cs diff --git a/benchmarks/IIS.Performance/IIS.Performance.csproj b/benchmarks/IIS.Performance/IIS.Performance.csproj index 6fb9ab2c05..179e042514 100644 --- a/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -1,4 +1,4 @@ - + @@ -15,13 +15,21 @@ + + + + + + + + False - + diff --git a/benchmarks/IIS.Performance/PlaintextBenchmark.cs b/benchmarks/IIS.Performance/PlaintextBenchmark.cs new file mode 100644 index 0000000000..ff79705756 --- /dev/null +++ b/benchmarks/IIS.Performance/PlaintextBenchmark.cs @@ -0,0 +1,73 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Net.Http; +using System.Text; +using System.Threading.Tasks; +using BenchmarkDotNet.Attributes; +using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; + +namespace Microsoft.AspNetCore.Server.IIS.Performance +{ + [AspNetCoreBenchmark] + public class PlaintextBenchmark + { + private TestServer _server; + + private HttpClient _client; + + [GlobalSetup] + public void Setup() + { + _server = TestServer.Create(builder => builder.UseMiddleware(), new LoggerFactory()).GetAwaiter().GetResult(); + // Recreate client, TestServer.Client has additional logging that can hurt performance + _client = new HttpClient() + { + BaseAddress = _server.HttpClient.BaseAddress + }; + } + + [Benchmark] + public async Task Plaintext() + { + await _client.GetAsync("/plaintext"); + } + + // Copied from https://github.com/aspnet/benchmarks/blob/dev/src/Benchmarks/Middleware/PlaintextMiddleware.cs + public class PlaintextMiddleware + { + private static readonly PathString _path = new PathString("/plaintext"); + private static readonly byte[] _helloWorldPayload = Encoding.UTF8.GetBytes("Hello, World!"); + + private readonly RequestDelegate _next; + + public PlaintextMiddleware(RequestDelegate next) + { + _next = next; + } + + public Task Invoke(HttpContext httpContext) + { + if (httpContext.Request.Path.StartsWithSegments(_path, StringComparison.Ordinal)) + { + return WriteResponse(httpContext.Response); + } + + return _next(httpContext); + } + + public static Task WriteResponse(HttpResponse response) + { + var payloadLength = _helloWorldPayload.Length; + response.StatusCode = 200; + response.ContentType = "text/plain"; + response.ContentLength = payloadLength; + return response.Body.WriteAsync(_helloWorldPayload, 0, payloadLength); + } +} + } +} diff --git a/benchmarks/IIS.Performance/StartupTimeBenchmark.cs b/benchmarks/IIS.Performance/StartupTimeBenchmark.cs index 4cbb53ffaf..4e16e33b49 100644 --- a/benchmarks/IIS.Performance/StartupTimeBenchmark.cs +++ b/benchmarks/IIS.Performance/StartupTimeBenchmark.cs @@ -5,7 +5,6 @@ using System.IO; using System.Net.Http; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; -using BenchmarkDotNet.Running; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging.Abstractions; diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index be9582b9df..baa119b1e6 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -1,262 +1,262 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} - Win32Proj - AspNetCoreModule - AspNetCore - aspnetcorev2 - false - 10.0.15063.0 - - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - - NotUsing - Level4 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx - $(IntDir)$(TargetName).pch - ..\IISLib;inc;..\CommonLib - ProgramDatabase - MultiThreadedDebug - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) - Source.def - - - ..\Commonlib - - - - - NotUsing - Level4 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx - $(IntDir)$(TargetName).pch - ..\IISLib;inc;..\CommonLib - ProgramDatabase - MultiThreadedDebug - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) - Source.def - - - ..\Commonlib - - - - - Level4 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - ..\IISLib;inc;..\CommonLib - precomp.hxx - MultiThreaded - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - - - Windows - false - true - true - Source.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) - - - ..\Commonlib - - - - - Level4 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx - ..\IISLib;inc;..\CommonLib - MultiThreaded - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - - - Windows - false - true - true - Source.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) - - - ..\Commonlib - - - - - - - - - - - - - - - - - - - - - - - - {55494e58-e061-4c4c-a0a8-837008e72f85} - - - {09d9d1d6-2951-4e14-bc35-76a23cf9391a} - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - - - - - - - + + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} + Win32Proj + AspNetCoreModule + AspNetCore + aspnetcorev2 + false + 10.0.15063.0 + + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + + NotUsing + Level4 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) + precomp.hxx + $(IntDir)$(TargetName).pch + ..\IISLib;inc;..\CommonLib + ProgramDatabase + MultiThreadedDebug + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + Source.def + + + ..\Commonlib + + + + + NotUsing + Level4 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) + precomp.hxx + $(IntDir)$(TargetName).pch + ..\IISLib;inc;..\CommonLib + ProgramDatabase + MultiThreadedDebug + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + Source.def + + + ..\Commonlib + + + + + Level4 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) + ..\IISLib;inc;..\CommonLib + precomp.hxx + MultiThreaded + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + false + true + true + Source.def + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) + + + ..\Commonlib + + + + + Level4 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) + precomp.hxx + ..\IISLib;inc;..\CommonLib + MultiThreaded + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + false + true + true + Source.def + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + + + ..\Commonlib + + + + + + + + + + + + + + + + + + + + + + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {09d9d1d6-2951-4e14-bc35-76a23cf9391a} + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h index b40a16c1a9..1743f6eb29 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h @@ -2,6 +2,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #pragma once + #define API_BUFFER_TOO_SMALL 0x80008098 extern BOOL g_fRecycleProcessCalled; @@ -147,14 +148,13 @@ public: HRESULT EnsureApplicationCreated( - IHttpContext *pHttpContext, - STRU* exeLocation + IHttpContext *pHttpContext ); private: - HRESULT FindRequestHandlerAssembly(); - HRESULT FindNativeAssemblyFromGlobalLocation(STRU* struFilename); - HRESULT FindNativeAssemblyFromHostfxr(STRU* struFilename); + HRESULT FindRequestHandlerAssembly(STRU& location); + HRESULT FindNativeAssemblyFromGlobalLocation(PCWSTR libraryName, STRU* location); + HRESULT FindNativeAssemblyFromHostfxr(HOSTFXR_OPTIONS* hostfxrOptions, PCWSTR libraryName, STRU* location); static VOID DoRecycleApplication(LPVOID lpParam); diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h index 55cbd4ca7b..8a114a69b4 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h @@ -26,8 +26,6 @@ public: _In_ IHttpServer *pHttpServer, _In_ HTTP_MODULE_ID pModuleId, _In_ IHttpApplication *pHttpApplication, - _In_ HANDLE hEventLog, - _Out_ STRU *pcwzExePath, _Out_ ASPNETCORE_SHIM_CONFIG **ppAspNetCoreConfig ); @@ -72,24 +70,6 @@ public: return &m_struApplication; } - CONST - PCWSTR* - QueryHostFxrArguments( - VOID - ) - { - return m_ppStrArguments; - } - - CONST - DWORD - QueryHostFxrArgCount( - VOID - ) - { - return m_dwArgc; - } - STRU* QueryConfigPath( VOID @@ -114,14 +94,6 @@ public: return &m_struArguments; } - HRESULT - SetHostFxrFullPath( - PCWSTR pStrHostFxrFullPath - ) - { - return m_struHostFxrLocation.Copy(pStrHostFxrFullPath); - } - APP_HOSTING_MODEL QueryHostingModel( VOID @@ -130,35 +102,10 @@ public: return m_hostingModel; } - CONST - PCWSTR - QueryHostFxrFullPath( - VOID - ) - { - return m_struHostFxrLocation.QueryStr(); - } - - VOID - SetHostFxrArguments( - DWORD dwArgc, - PWSTR* ppStrArguments - ) - { - if (m_ppStrArguments != NULL) - { - delete[] m_ppStrArguments; - } - - m_dwArgc = dwArgc; - m_ppStrArguments = ppStrArguments; - } - private: ASPNETCORE_SHIM_CONFIG() : m_cRefs(1), - m_hostingModel(HOSTING_UNKNOWN), - m_ppStrArguments(NULL) + m_hostingModel(HOSTING_UNKNOWN) { } @@ -170,7 +117,5 @@ private: STRU m_struConfigPath; APP_HOSTING_MODEL m_hostingModel; STRU m_struHostFxrLocation; - PWSTR* m_ppStrArguments; - DWORD m_dwArgc; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 6d7ea5bbf1..c2671bcdda 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -106,22 +106,16 @@ APPLICATION_INFO::UpdateAppOfflineFileHandle() ReferenceApplicationInfo(); - if (INVALID_FILE_ATTRIBUTES == GetFileAttributes(strFilePath.QueryStr()) && - GetLastError() == ERROR_FILE_NOT_FOUND) + if (INVALID_FILE_ATTRIBUTES == GetFileAttributes(strFilePath.QueryStr())) { // Check if app offline was originally present. // if it was, log that app_offline has been dropped. if (m_fAppOfflineFound) { - STACK_STRU(strEventMsg, 256); - if (SUCCEEDED(strEventMsg.SafeSnwprintf( - ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_REMOVED_MSG))) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, - ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_REMOVED, - strEventMsg.QueryStr()); - } + UTILITY::LogEvent(g_hEventLog, + EVENTLOG_INFORMATION_TYPE, + ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_REMOVED, + ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_REMOVED_MSG); } m_fAppOfflineFound = FALSE; @@ -178,13 +172,13 @@ APPLICATION_INFO::UpdateAppOfflineFileHandle() HRESULT APPLICATION_INFO::EnsureApplicationCreated( - IHttpContext *pHttpContext, - STRU* struExeLocation + IHttpContext *pHttpContext ) { HRESULT hr = S_OK; BOOL fLocked = FALSE; IAPPLICATION *pApplication = NULL; + STRU struExeLocation; STACK_STRU(struFileName, 300); // >MAX_PATH STRU struHostFxrDllLocation; @@ -213,7 +207,7 @@ APPLICATION_INFO::EnsureApplicationCreated( // FindRequestHandlerAssembly obtains a global lock, but after releasing the lock, // there is a period where we could call - hr = FindRequestHandlerAssembly(); + hr = FindRequestHandlerAssembly(struExeLocation); if (FAILED(hr)) { goto Finished; @@ -225,13 +219,14 @@ APPLICATION_INFO::EnsureApplicationCreated( goto Finished; } - hr = m_pfnAspNetCoreCreateApplication(m_pServer, pHttpContext, struExeLocation->QueryStr(), &pApplication); + hr = m_pfnAspNetCoreCreateApplication(m_pServer, pHttpContext, struExeLocation.QueryStr(), &pApplication); m_pApplication = pApplication; } } Finished: + if (fLocked) { ReleaseSRWLockExclusive(&m_srwLock); @@ -240,10 +235,11 @@ Finished: } HRESULT -APPLICATION_INFO::FindRequestHandlerAssembly() +APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) { HRESULT hr = S_OK; BOOL fLocked = FALSE; + PCWSTR pstrHandlerDllName; STACK_STRU(struFileName, 256); if (g_fAspnetcoreRHLoadedError) @@ -267,46 +263,67 @@ APPLICATION_INFO::FindRequestHandlerAssembly() if (m_pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) { - if (FAILED(hr = FindNativeAssemblyFromHostfxr(&struFileName))) - { - STACK_STRU(strEventMsg, 256); - if (SUCCEEDED(strEventMsg.SafeSnwprintf( - ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG))) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, - ASPNETCORE_EVENT_INPROCESS_RH_MISSING, - strEventMsg.QueryStr()); - } - - goto Finished; - } + pstrHandlerDllName = g_pwzAspnetcoreInProcessRequestHandlerName; } else { - if (FAILED(hr = FindNativeAssemblyFromGlobalLocation(&struFileName))) + pstrHandlerDllName = g_pwzAspnetcoreOutOfProcessRequestHandlerName; + } + + // Try to see if RH is already loaded + g_hAspnetCoreRH = GetModuleHandle(pstrHandlerDllName); + + if (g_hAspnetCoreRH == NULL) + { + if (m_pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) { - STACK_STRU(strEventMsg, 256); - if (SUCCEEDED(strEventMsg.SafeSnwprintf( - ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG))) + std:: unique_ptr options; + + if (FAILED(hr = HOSTFXR_OPTIONS::Create( + NULL, + m_pConfiguration->QueryProcessPath()->QueryStr(), + m_pConfiguration->QueryApplicationPhysicalPath()->QueryStr(), + m_pConfiguration->QueryArguments()->QueryStr(), + g_hEventLog, + options))) + { + goto Finished; + } + + location.Copy(options->GetExeLocation()); + + if (FAILED(hr = FindNativeAssemblyFromHostfxr(options.get(), pstrHandlerDllName, &struFileName))) + { + UTILITY::LogEvent(g_hEventLog, + EVENTLOG_INFORMATION_TYPE, + ASPNETCORE_EVENT_INPROCESS_RH_MISSING, + ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG); + + goto Finished; + } + } + else + { + if (FAILED(hr = FindNativeAssemblyFromGlobalLocation(pstrHandlerDllName, &struFileName))) { UTILITY::LogEvent(g_hEventLog, EVENTLOG_INFORMATION_TYPE, ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, - strEventMsg.QueryStr()); - } + ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG); + goto Finished; + } + } + + g_hAspnetCoreRH = LoadLibraryW(struFileName.QueryStr()); + + if (g_hAspnetCoreRH == NULL) + { + hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; } } - g_hAspnetCoreRH = LoadLibraryW(struFileName.QueryStr()); - if (g_hAspnetCoreRH == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - g_pfnAspNetCoreCreateApplication = (PFN_ASPNETCORE_CREATE_APPLICATION) GetProcAddress(g_hAspnetCoreRH, "CreateApplication"); if (g_pfnAspNetCoreCreateApplication == NULL) @@ -338,7 +355,9 @@ Finished: } HRESULT -APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation(STRU* struFilename) +APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation( + PCWSTR libraryName, + STRU* struFilename) { HRESULT hr = S_OK; DWORD dwSize = MAX_PATH; @@ -385,7 +404,7 @@ APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation(STRU* struFilename) if (FAILED(hr = struFilename->SyncWithBuffer()) || FAILED(hr = struFilename->Append(L"\\")) || - FAILED(hr = struFilename->Append(g_pwzAspnetcoreOutOfProcessRequestHandlerName))) + FAILED(hr = struFilename->Append(libraryName))) { goto Finished; } @@ -401,6 +420,8 @@ Finished: // HRESULT APPLICATION_INFO::FindNativeAssemblyFromHostfxr( + HOSTFXR_OPTIONS* hostfxrOptions, + PCWSTR libraryName, STRU* struFilename ) { @@ -418,7 +439,7 @@ APPLICATION_INFO::FindNativeAssemblyFromHostfxr( DBG_ASSERT(struFileName != NULL); - hmHostFxrDll = LoadLibraryW(m_pConfiguration->QueryHostFxrFullPath()); + hmHostFxrDll = LoadLibraryW(hostfxrOptions->GetHostFxrLocation()); if (hmHostFxrDll == NULL) { @@ -446,8 +467,8 @@ APPLICATION_INFO::FindNativeAssemblyFromHostfxr( while (TRUE) { intHostFxrExitCode = pFnHostFxrSearchDirectories( - m_pConfiguration->QueryHostFxrArgCount(), - m_pConfiguration->QueryHostFxrArguments(), + hostfxrOptions->GetArgc(), + hostfxrOptions->GetArgv(), struNativeSearchPaths.QueryStr(), dwBufferSize, &dwRequiredBufferSize @@ -498,7 +519,7 @@ APPLICATION_INFO::FindNativeAssemblyFromHostfxr( } } - if (FAILED(hr = struNativeDllLocation.Append(g_pwzAspnetcoreInProcessRequestHandlerName))) + if (FAILED(hr = struNativeDllLocation.Append(libraryName))) { goto Finished; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp index dc100d8d21..d1cf69b705 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp @@ -5,11 +5,6 @@ ASPNETCORE_SHIM_CONFIG::~ASPNETCORE_SHIM_CONFIG() { - if (m_ppStrArguments != NULL) - { - delete[] m_ppStrArguments; - m_ppStrArguments = NULL; - } } VOID @@ -38,8 +33,6 @@ ASPNETCORE_SHIM_CONFIG::GetConfig( _In_ IHttpServer *pHttpServer, _In_ HTTP_MODULE_ID pModuleId, _In_ IHttpApplication *pHttpApplication, - _In_ HANDLE hEventLog, - _Out_ STRU *struExeLocation, _Out_ ASPNETCORE_SHIM_CONFIG **ppAspNetCoreShimConfig ) { @@ -47,8 +40,7 @@ ASPNETCORE_SHIM_CONFIG::GetConfig( ASPNETCORE_SHIM_CONFIG *pAspNetCoreShimConfig = NULL; STRU struHostFxrDllLocation; STRU struExeAbsolutePath; - BSTR* pwzArgv; - DWORD dwArgCount; + if (ppAspNetCoreShimConfig == NULL) { hr = E_INVALIDARG; @@ -81,32 +73,6 @@ ASPNETCORE_SHIM_CONFIG::GetConfig( goto Finished; } - // Modify Inprocess specific configuration here. - if (pAspNetCoreShimConfig->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) - { - if (FAILED(hr = HOSTFXR_UTILITY::GetHostFxrParameters( - hEventLog, - pAspNetCoreShimConfig->QueryProcessPath()->QueryStr(), - pAspNetCoreShimConfig->QueryApplicationPhysicalPath()->QueryStr(), - pAspNetCoreShimConfig->QueryArguments()->QueryStr(), - &struHostFxrDllLocation, - &struExeAbsolutePath, - &dwArgCount, - &pwzArgv))) - { - goto Finished; - } - - if (FAILED(hr = pAspNetCoreShimConfig->SetHostFxrFullPath(struHostFxrDllLocation.QueryStr()))) - { - goto Finished; - } - - pAspNetCoreShimConfig->SetHostFxrArguments(dwArgCount, pwzArgv); - - struExeLocation->Copy(struExeAbsolutePath); - } - hr = pHttpApplication->GetModuleContextContainer()-> SetModuleContext(pAspNetCoreShimConfig, pModuleId); diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx index 8b359c8550..6de0acdc12 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx @@ -119,7 +119,7 @@ inline bool IsSpace(char ch) #include "globalmodule.h" #include "proxymodule.h" #include "applicationinfo.h" - +#include "hostfxroptions.h" FORCEINLINE DWORD diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index 141f3fb36a..a7a708e8d3 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -2,6 +2,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "precomp.hxx" +#include "hostfxroptions.h" __override HRESULT @@ -81,7 +82,6 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( APPLICATION_MANAGER *pApplicationManager = NULL; REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; IAPPLICATION* pApplication = NULL; - STRU struExeLocation; STACK_STRU(struFileName, 256); if (g_fInShutdown) @@ -90,7 +90,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( goto Finished; } - hr = ASPNETCORE_SHIM_CONFIG::GetConfig(g_pHttpServer, g_pModuleId, pHttpContext->GetApplication(), g_hEventLog, &struExeLocation, &pConfig); + hr = ASPNETCORE_SHIM_CONFIG::GetConfig(g_pHttpServer, g_pModuleId, pHttpContext->GetApplication(), &pConfig); if (FAILED(hr)) { goto Finished; @@ -144,7 +144,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( } // make sure assmebly is loaded and application is created - hr = m_pApplicationInfo->EnsureApplicationCreated(pHttpContext, &struExeLocation); + hr = m_pApplicationInfo->EnsureApplicationCreated(pHttpContext); if (FAILED(hr)) { goto Finished; diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 728c42bb9e..3b33efff12 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -1,228 +1,230 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {55494E58-E061-4C4C-A0A8-837008E72F85} - Win32Proj - NewCommon - 10.0.15063.0 - - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - true - Unicode - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - false - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - C:\AspNetCoreModule\src\IISLib;$(IncludePath) - - - - Use - Level4 - true - Disabled - false - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - false - ProgramDatabase - ..\iislib; - - - Windows - true - - - - - Use - Level4 - true - Disabled - false - _DEBUG;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - false - MultiThreadedDebug - false - ..\iislib; - - - Windows - true - - - - - Use - Level4 - true - MaxSpeed - true - true - false - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - false - ..\iislib; - - - Windows - true - true - true - - - - - Use - Level4 - true - MaxSpeed - true - true - false - NDEBUG;_LIB;%(PreprocessorDefinitions) - true - ..\iislib; - - - MultiThreaded - false - - - Windows - true - true - true - - - ..\iislib - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - - - - - Document - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {55494E58-E061-4C4C-A0A8-837008E72F85} + Win32Proj + NewCommon + 10.0.15063.0 + + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + false + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + C:\AspNetCoreModule\src\IISLib;$(IncludePath) + + + + Use + Level4 + true + Disabled + false + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + false + ProgramDatabase + ..\iislib; + + + Windows + true + + + + + Use + Level4 + true + Disabled + false + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + ProgramDatabase + false + MultiThreadedDebug + false + ..\iislib; + + + Windows + true + + + + + Use + Level4 + true + MaxSpeed + true + true + false + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + false + ..\iislib; + + + Windows + true + true + true + + + + + Use + Level4 + true + MaxSpeed + true + true + false + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + ..\iislib; + + + MultiThreaded + false + + + Windows + true + true + true + + + ..\iislib + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + + + + Document + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h b/src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h index d7df903554..9652272d84 100644 --- a/src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h +++ b/src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h @@ -98,9 +98,10 @@ public: dwResult = GetEnvironmentVariable(struNameBuffer.QueryStr(), struValueBuffer.QueryStr(), struValueBuffer.QuerySizeCCH()); - if (struValueBuffer.IsEmpty()) + + if (dwResult <= 0) { - hr = E_UNEXPECTED; + hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; } fFound = TRUE; @@ -304,7 +305,7 @@ public: dwResult = GetEnvironmentVariable(HOSTING_STARTUP_ASSEMBLIES_ENV_STR, strStartupAssemblyEnv.QueryStr(), strStartupAssemblyEnv.QuerySizeCCH()); - if (strStartupAssemblyEnv.IsEmpty()) + if (dwResult <= 0) { hr = E_UNEXPECTED; goto Finished; @@ -317,11 +318,14 @@ public: } strStartupAssemblyEnv.SyncWithBuffer(); + if (strStartupAssemblyEnv.IndexOf(HOSTING_STARTUP_ASSEMBLIES_VALUE) == -1) + { if (fFound) { strStartupAssemblyEnv.Append(L";"); } strStartupAssemblyEnv.Append(HOSTING_STARTUP_ASSEMBLIES_VALUE); + } // the environment variable was not defined, create it and add to hashtable pHostingEntry = new ENVIRONMENT_VAR_ENTRY(); diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp new file mode 100644 index 0000000000..73493ddc1d --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp @@ -0,0 +1,102 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "stdafx.h" + +HRESULT HOSTFXR_OPTIONS::Create( + _In_ PCWSTR pcwzExeLocation, + _In_ PCWSTR pcwzProcessPath, + _In_ PCWSTR pcwzApplicationPhysicalPath, + _In_ PCWSTR pcwzArguments, + _In_ HANDLE hEventLog, + _Out_ std::unique_ptr& ppWrapper) +{ + HRESULT hr = S_OK; + STRU struHostFxrDllLocation; + STRU struExeAbsolutePath; + STRU struExeLocation; + BSTR* pwzArgv; + DWORD dwArgCount; + + if (pcwzExeLocation != NULL && FAILED(struExeLocation.Copy(pcwzExeLocation))) + { + goto Finished; + } + + // If the exe was not provided by the shim, reobtain the hostfxr parameters (which finds dotnet). + if (struExeLocation.IsEmpty()) + { + if (FAILED(hr = HOSTFXR_UTILITY::GetHostFxrParameters( + hEventLog, + pcwzProcessPath, + pcwzApplicationPhysicalPath, + pcwzArguments, + &struHostFxrDllLocation, + &struExeAbsolutePath, + &dwArgCount, + &pwzArgv))) + { + goto Finished; + } + } + else if (HOSTFXR_UTILITY::IsDotnetExecutable(&struExeLocation)) + { + if (FAILED(hr = HOSTFXR_UTILITY::ParseHostfxrArguments( + pcwzArguments, + pcwzExeLocation, + pcwzApplicationPhysicalPath, + hEventLog, + &dwArgCount, + &pwzArgv))) + { + goto Finished; + } + } + else + { + if (FAILED(hr = HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( + pcwzExeLocation, + pcwzApplicationPhysicalPath, + pcwzArguments, + hEventLog, + &struHostFxrDllLocation, + &dwArgCount, + &pwzArgv))) + { + goto Finished; + } + } + + ppWrapper = std::make_unique(); + if (FAILED(hr = ppWrapper->Populate(struHostFxrDllLocation.QueryStr(), struExeAbsolutePath.QueryStr(), dwArgCount, pwzArgv))) + { + goto Finished; + } + +Finished: + + return hr; +} + + +HRESULT HOSTFXR_OPTIONS::Populate(PCWSTR hostFxrLocation, PCWSTR struExeLocation, DWORD argc, BSTR argv[]) +{ + HRESULT hr; + + m_argc = argc; + m_argv = argv; + + if (FAILED(hr = m_hostFxrLocation.Copy(hostFxrLocation))) + { + goto Finished; + } + + if (FAILED(hr = m_exeLocation.Copy(struExeLocation))) + { + goto Finished; + } + + Finished: + + return hr; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h new file mode 100644 index 0000000000..360b392760 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h @@ -0,0 +1,58 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +class HOSTFXR_OPTIONS +{ +public: + HOSTFXR_OPTIONS() {} + + ~HOSTFXR_OPTIONS() + { + delete[] m_argv; + } + + DWORD + GetArgc() const + { + return m_argc; + } + + BSTR* + GetArgv() const + { + return m_argv; + } + + PCWSTR + GetHostFxrLocation() const + { + return m_hostFxrLocation.QueryStr(); + } + + PCWSTR + GetExeLocation() const + { + return m_exeLocation.QueryStr(); + } + + static + HRESULT Create( + _In_ PCWSTR pcwzExeLocation, + _In_ PCWSTR pcwzProcessPath, + _In_ PCWSTR pcwzApplicationPhysicalPath, + _In_ PCWSTR pcwzArguments, + _In_ HANDLE hEventLog, + _Out_ std::unique_ptr& ppWrapper); + +private: + + HRESULT Populate(PCWSTR hostFxrLocation, PCWSTR struExeLocation, DWORD argc, BSTR argv[]); + + STRU m_exeLocation; + STRU m_hostFxrLocation; + + DWORD m_argc; + BSTR* m_argv; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp index 555e711922..01ca92f1ce 100644 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp @@ -25,16 +25,12 @@ HRESULT REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig( _In_ IHttpServer *pHttpServer, _In_ IHttpApplication *pHttpApplication, - _In_ PCWSTR pwzExeLocation, - _In_ HANDLE hEventLog, _Out_ REQUESTHANDLER_CONFIG **ppAspNetCoreConfig ) { HRESULT hr = S_OK; REQUESTHANDLER_CONFIG *pRequestHandlerConfig = NULL; STRU struHostFxrDllLocation; - BSTR* pwzArgv; - DWORD dwArgCount; STRU struExeLocation; if (ppAspNetCoreConfig == NULL) @@ -58,60 +54,6 @@ REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig( goto Finished; } - // Modify config for inprocess. - if (pRequestHandlerConfig->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) - { - if (FAILED(struExeLocation.Copy(pwzExeLocation))) - { - goto Finished; - } - // If the exe was not provided by the shim, reobtain the hostfxr parameters (which finds dotnet). - if (struExeLocation.IsEmpty()) - { - if (FAILED(hr = HOSTFXR_UTILITY::GetHostFxrParameters( - hEventLog, - pRequestHandlerConfig->QueryProcessPath()->QueryStr(), - pRequestHandlerConfig->QueryApplicationPhysicalPath()->QueryStr(), - pRequestHandlerConfig->QueryArguments()->QueryStr(), - &struHostFxrDllLocation, - &struExeLocation, - &dwArgCount, - &pwzArgv))) - { - goto Finished; - } - } - else if (HOSTFXR_UTILITY::IsDotnetExecutable(&struExeLocation)) - { - if (FAILED(hr = HOSTFXR_UTILITY::ParseHostfxrArguments( - pRequestHandlerConfig->QueryArguments()->QueryStr(), - pwzExeLocation, - pRequestHandlerConfig->QueryApplicationPhysicalPath()->QueryStr(), - hEventLog, - &dwArgCount, - &pwzArgv))) - { - goto Finished; - } - } - else - { - if (FAILED(hr = HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( - pwzExeLocation, - pRequestHandlerConfig->QueryApplicationPhysicalPath()->QueryStr(), - pRequestHandlerConfig->QueryArguments()->QueryStr(), - hEventLog, - &struHostFxrDllLocation, - &dwArgCount, - &pwzArgv))) - { - goto Finished; - } - } - - pRequestHandlerConfig->SetHostFxrArguments(dwArgCount, pwzArgv); - } - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, "REQUESTHANDLER_CONFIG::GetConfig, set config to ModuleContext"); // set appliction info here instead of inside Populate() diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h index 45c9518413..d9c368468a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h +++ b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h @@ -62,8 +62,6 @@ public: CreateRequestHandlerConfig( _In_ IHttpServer *pHttpServer, _In_ IHttpApplication *pHttpApplication, - _In_ PCWSTR pwzExeLocation, - _In_ HANDLE hEventLog, _Out_ REQUESTHANDLER_CONFIG **ppAspNetCoreConfig ); @@ -211,45 +209,11 @@ public: return &m_struConfigPath; } - CONST - PCWSTR* - QueryHostFxrArguments( - VOID - ) - { - return m_ppStrArguments; - } - - CONST - DWORD - QueryHostFxrArgCount( - VOID - ) - { - return m_dwArgc; - } - - CONST - VOID - SetHostFxrArguments( - DWORD dwArgc, - PWSTR* ppStrArguments - ) - { - if (m_ppStrArguments != NULL) - { - delete[] m_ppStrArguments; - } - - m_dwArgc = dwArgc; - m_ppStrArguments = ppStrArguments; - } - private: // // private constructor - // + // REQUESTHANDLER_CONFIG() : m_fStdoutLogEnabled(FALSE), m_pEnvironmentVariables(NULL), diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index 8bb2ef7406..821d975c93 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -32,4 +32,4 @@ #include "aspnetcore_msg.h" #include "fx_ver.h" #include "hostfxr_utility.h" - +#include "hostfxroptions.h" diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx index aa557dfbef..00002cd023 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -113,13 +113,13 @@ CreateApplication( // Initialze some global variables here InitializeGlobalConfiguration(pServer); - hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpContext->GetApplication(), pwzExeLocation, g_hEventLog, &pConfig); + hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpContext->GetApplication(), &pConfig); if (FAILED(hr)) { return hr; } - pApplication = new IN_PROCESS_APPLICATION(pServer, pConfig); + pApplication = new IN_PROCESS_APPLICATION(pServer, pConfig, pwzExeLocation); if (pApplication == NULL) { hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp index 08e5526879..4551c177b3 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp @@ -1,10 +1,13 @@ #include "..\precomp.hxx" +#include "hostfxroptions.h" IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL; +hostfxr_main_fn IN_PROCESS_APPLICATION::s_fMainCallback = NULL; IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( - IHttpServer* pHttpServer, - REQUESTHANDLER_CONFIG *pConfig) : + IHttpServer *pHttpServer, + REQUESTHANDLER_CONFIG *pConfig, + PCWSTR pDotnetExeLocation) : m_pHttpServer(pHttpServer), m_ProcessExitCode(0), m_hLogFileHandle(INVALID_HANDLE_VALUE), @@ -16,7 +19,8 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( m_fInitialized(FALSE), m_fShutdownCalledFromNative(FALSE), m_fShutdownCalledFromManaged(FALSE), - m_srwLock() + m_srwLock(), + m_pstrDotnetExeLocation(pDotnetExeLocation) { // is it guaranteed that we have already checked app offline at this point? // If so, I don't think there is much to do here. @@ -116,7 +120,7 @@ Finished: // Managed layer may block the shutdown and lead to shutdown timeout // Assumption: only one inprocess application is hosted. // Call process exit to force shutdown - // + // exit(hr); } } @@ -262,7 +266,6 @@ IN_PROCESS_APPLICATION::Recycle( // IISExpress scenario // Shutdown the managed application and call exit to terminate current process ShutDown(); - exit(0); } } @@ -808,33 +811,55 @@ IN_PROCESS_APPLICATION::ExecuteApplication( ) { HRESULT hr = S_OK; - HMODULE hModule; + HMODULE hModule = nullptr; + DWORD hostfxrArgc = 0; + BSTR *hostfxrArgv = NULL; hostfxr_main_fn pProc; + std::unique_ptr hostFxrOptions = NULL; DBG_ASSERT(m_status == APPLICATION_STATUS::STARTING); - // hostfxr should already be loaded by the shim. If not, then we will need - // to load it ourselves by finding hostfxr again. - hModule = LoadLibraryW(L"hostfxr.dll"); - - if (hModule == NULL) + pProc = s_fMainCallback; + if (pProc == nullptr) { - // .NET Core not installed (we can log a more detailed error message here) - hr = ERROR_BAD_ENVIRONMENT; - goto Finished; - } + // hostfxr should already be loaded by the shim. If not, then we will need + // to load it ourselves by finding hostfxr again. + hModule = LoadLibraryW(L"hostfxr.dll"); - // Get the entry point for main - pProc = (hostfxr_main_fn)GetProcAddress(hModule, "hostfxr_main"); - if (pProc == NULL) - { - hr = ERROR_BAD_ENVIRONMENT; - goto Finished; - } + if (hModule == NULL) + { + // .NET Core not installed (we can log a more detailed error message here) + hr = ERROR_BAD_ENVIRONMENT; + goto Finished; + } - if (FAILED(hr = SetEnvironementVariablesOnWorkerProcess())) - { - goto Finished; + // Get the entry point for main + pProc = (hostfxr_main_fn)GetProcAddress(hModule, "hostfxr_main"); + if (pProc == NULL) + { + hr = ERROR_BAD_ENVIRONMENT; + goto Finished; + } + + if (FAILED(hr = HOSTFXR_OPTIONS::Create( + m_pstrDotnetExeLocation, + m_pConfig->QueryProcessPath()->QueryStr(), + m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), + m_pConfig->QueryArguments()->QueryStr(), + g_hEventLog, + hostFxrOptions + ))) + { + goto Finished; + } + + hostfxrArgc = hostFxrOptions->GetArgc(); + hostfxrArgv = hostFxrOptions->GetArgv(); + + if (FAILED(hr = SetEnvironementVariablesOnWorkerProcess())) + { + goto Finished; + } } // There can only ever be a single instance of .NET Core @@ -845,7 +870,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication( // set the callbacks s_Application = this; - hr = RunDotnetApplication(m_pConfig->QueryHostFxrArgCount(), m_pConfig->QueryHostFxrArguments(), pProc); + hr = RunDotnetApplication(hostfxrArgc, hostfxrArgv, pProc); Finished: diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h index cc504cf48c..e72d921e1d 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h @@ -11,7 +11,10 @@ typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_MANAGED_CONTEXT_HANDLER)(void * class IN_PROCESS_APPLICATION : public APPLICATION { public: - IN_PROCESS_APPLICATION(IHttpServer* pHttpServer, REQUESTHANDLER_CONFIG *pConfig); + IN_PROCESS_APPLICATION( + IHttpServer* pHttpServer, + REQUESTHANDLER_CONFIG *pConfig, + PCWSTR pDotnetExeLocation); ~IN_PROCESS_APPLICATION(); @@ -102,6 +105,12 @@ public: m_fShutdownCalledFromManaged = TRUE; } + static + VOID SetMainCallback(hostfxr_main_fn mainCallback) + { + s_fMainCallback = mainCallback; + } + static IN_PROCESS_APPLICATION* GetInstance( @@ -176,10 +185,15 @@ private: HANDLE m_hErrThread; CHAR m_pzFileContents[4096] = { 0 }; DWORD m_dwStdErrReadTotal; + PCWSTR m_pstrDotnetExeLocation; static IN_PROCESS_APPLICATION* s_Application; REQUESTHANDLER_CONFIG* m_pConfig; + // Allows to override call to hostfxr_main with custome callback + // used in testing + static hostfxr_main_fn s_fMainCallback; + VOID SetStdOut( VOID diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx index 5d7abb77da..1f4528c6b3 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx @@ -442,4 +442,11 @@ http_stop_incoming_requests() IN_PROCESS_APPLICATION::GetInstance()->StopIncomingRequests(); } +EXTERN_C __MIDL_DECLSPEC_DLLEXPORT +VOID +set_main_handler(_In_ hostfxr_main_fn main) +{ + IN_PROCESS_APPLICATION::SetMainCallback(main); +} + // End of export diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx index d1b3179970..23b7816ca6 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx @@ -285,10 +285,12 @@ CreateApplication( HRESULT hr = S_OK; IAPPLICATION *pApplication = NULL; REQUESTHANDLER_CONFIG *pConfig = NULL; + UNREFERENCED_PARAMETER(pwzExeLocation); + // Initialze some global variables here InitializeGlobalConfiguration(pServer); - hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpContext->GetApplication(), pwzExeLocation, g_hEventLog, &pConfig); + hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpContext->GetApplication(), &pConfig); if (FAILED(hr)) { return hr; diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs index df6b9a20b6..9838417df7 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs @@ -136,6 +136,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } _memoryPool.Dispose(); + + GC.SuppressFinalize(this); } private static NativeMethods.REQUEST_NOTIFICATION_STATUS HandleRequest(IntPtr pInProcessHandler, IntPtr pvRequestContext) diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs index 9c5978db13..bd4a31db78 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Server.IIS private const string KERNEL32 = "kernel32.dll"; - private const string AspNetCoreModuleDll = "aspnetcorev2_inprocess.dll"; + internal const string AspNetCoreModuleDll = "aspnetcorev2_inprocess.dll"; [DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)] diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config b/test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config new file mode 100644 index 0000000000..a0fa1187f8 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config @@ -0,0 +1,201 @@ + + + + + + + + +
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+ + +
+
+
+
+ +
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj index be7eb2a1d4..69861d7aa6 100644 --- a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj +++ b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj @@ -6,17 +6,33 @@ + + Never + + False + + + + + + + + + + + + @@ -26,4 +42,10 @@ + + + PreserveNewest + + + diff --git a/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs b/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs new file mode 100644 index 0000000000..5e78794eb1 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs @@ -0,0 +1,41 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Diagnostics; +using System.Threading; +using System.Threading.Tasks; +using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging.Testing; +using Xunit; +using Xunit.Abstractions; + +namespace IISIntegration.FunctionalTests.Inprocess +{ + [SkipIfHostableWebCoreNotAvailible] + public class TestServerTest: LoggedTest + { + public TestServerTest(ITestOutputHelper output = null) : base(output) + { + } + + [ConditionalFact] + public async Task Test() + { + var helloWorld = "Hello World"; + var expectedPath = "/Path"; + + string path = null; + using (var testServer = await TestServer.Create(ctx => { + path = ctx.Request.Path.ToString(); + return ctx.Response.WriteAsync(helloWorld); + }, LoggerFactory)) + { + var result = await testServer.HttpClient.GetAsync(expectedPath); + Assert.Equal(helloWorld, await result.Content.ReadAsStringAsync()); + Assert.Equal(expectedPath, path); + } + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs b/test/IISIntegration.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs new file mode 100644 index 0000000000..046d430317 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs @@ -0,0 +1,17 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using Microsoft.AspNetCore.Testing.xunit; + +namespace IISIntegration.FunctionalTests.Utilities +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class SkipIfHostableWebCoreNotAvailibleAttribute : Attribute, ITestCondition + { + public bool IsMet { get; } = File.Exists(TestServer.HostableWebCoreLocation); + + public string SkipReason { get; } = $"Hostable Web Core not availible, {TestServer.HostableWebCoreLocation} not found."; + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/TestServer.cs b/test/IISIntegration.FunctionalTests/Utilities/TestServer.cs new file mode 100644 index 0000000000..10f526f860 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Utilities/TestServer.cs @@ -0,0 +1,144 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Net.Http; +using System.Reflection; +using System.Runtime.InteropServices; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace IISIntegration.FunctionalTests.Utilities +{ + public class TestServer: IDisposable, IStartup + { + private const string InProcessHandlerDll = "aspnetcorev2_inprocess.dll"; + private const string AspNetCoreModuleDll = "aspnetcorev2.dll"; + private const string HWebCoreDll = "hwebcore.dll"; + + internal static string HostableWebCoreLocation => Environment.ExpandEnvironmentVariables($@"%windir%\system32\inetsrv\{HWebCoreDll}"); + + private static readonly SemaphoreSlim WebCoreLock = new SemaphoreSlim(1, 1); + + // Currently this is hardcoded in TestServer.config + private static readonly int BasePort = 50691; + private static readonly Uri BaseUri = new Uri("http://localhost:" + BasePort); + + private readonly TaskCompletionSource _startedTaskCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + private readonly Action _appBuilder; + private readonly ILoggerFactory _loggerFactory; + + public HttpClient HttpClient { get; } + public TestConnection CreateConnection() => new TestConnection(BasePort); + + private IWebHost _host; + + private TestServer(Action appBuilder, ILoggerFactory loggerFactory) + { + _appBuilder = appBuilder; + _loggerFactory = loggerFactory; + + HttpClient = new HttpClient(new LoggingHandler(new SocketsHttpHandler(), _loggerFactory.CreateLogger())) + { + BaseAddress = BaseUri + }; + } + + public static async Task Create(Action appBuilder, ILoggerFactory loggerFactory) + { + await WebCoreLock.WaitAsync(); + var server = new TestServer(appBuilder, loggerFactory); + server.Start(); + await server.HttpClient.GetAsync("/start"); + await server._startedTaskCompletionSource.Task; + return server; + } + + public static Task Create(RequestDelegate app, ILoggerFactory loggerFactory) + { + return Create(builder => builder.Run(app), loggerFactory); + } + + private void Start() + { + LoadLibrary(HostableWebCoreLocation); + LoadLibrary(InProcessHandlerDll); + LoadLibrary(AspNetCoreModuleDll); + + set_main_handler(Main); + var startResult = WebCoreActivate(Path.GetFullPath("AppHostConfig/TestServer.config"), null, "Instance"); + if (startResult != 0) + { + throw new InvalidOperationException($"Error while running WebCoreActivate: {startResult}"); + } + } + + private int Main(IntPtr argc, IntPtr argv) + { + _host = new WebHostBuilder() + .UseIIS() + .ConfigureServices(services => { + services.AddSingleton(this); + services.AddSingleton(_loggerFactory); + }) + .UseSetting(WebHostDefaults.ApplicationKey, typeof(TestServer).GetTypeInfo().Assembly.FullName) + .Build(); + + var doneEvent = new ManualResetEventSlim(); + var lifetime = _host.Services.GetService(); + + lifetime.ApplicationStopping.Register(() => doneEvent.Set()); + _host.Start(); + _startedTaskCompletionSource.SetResult(null); + doneEvent.Wait(); + _host.Dispose(); + return 0; + } + + public void Dispose() + { + HttpClient.Dispose(); + WebCoreShutdown(false); + WebCoreLock.Release(); + } + + public IServiceProvider ConfigureServices(IServiceCollection services) + { + return services.BuildServiceProvider(); + } + + public void Configure(IApplicationBuilder app) + { + app.Map("/start", builder => builder.Run(context => context.Response.WriteAsync("Done"))); + _appBuilder(app); + } + + private delegate int hostfxr_main_fn(IntPtr argc, IntPtr argv); + + [DllImport(HWebCoreDll)] + private static extern int WebCoreActivate( + [In, MarshalAs(UnmanagedType.LPWStr)] + string appHostConfigPath, + [In, MarshalAs(UnmanagedType.LPWStr)] + string rootWebConfigPath, + [In, MarshalAs(UnmanagedType.LPWStr)] + string instanceName); + + [DllImport(HWebCoreDll)] + private static extern int WebCoreShutdown(bool immediate); + + [DllImport(InProcessHandlerDll)] + private static extern int set_main_handler(hostfxr_main_fn main); + + [DllImport("kernel32", SetLastError=true, CharSet = CharSet.Ansi)] + private static extern IntPtr LoadLibrary([MarshalAs(UnmanagedType.LPStr)] string lpFileName); + } +} From 4932fca0d9ac3c0881fbf394f81839b5e0e96d1a Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 24 May 2018 11:14:04 -0700 Subject: [PATCH 035/363] Fix the build --- src/AspNetCoreModuleV2/CommonLib/stdafx.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index 821d975c93..3191f9376b 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -13,6 +13,7 @@ #include #include #include +#include #include "Shlwapi.h" #include "hashtable.h" #include "stringu.h" From 9008abdd091778d6016209ab0a43c1b501cca757 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 24 May 2018 16:02:14 -0700 Subject: [PATCH 036/363] Update gtest (#862) --- IISIntegration.sln | 2 +- test/CommonLibTests/CommonLibTests.vcxproj | 2 +- test/gtest-1.8.0/CMakeLists.txt | 54 +- test/gtest-1.8.0/Makefile.am | 91 +- test/gtest-1.8.0/README.md | 154 +- test/gtest-1.8.0/build-aux/.keep | 0 test/gtest-1.8.0/cmake/gtest.pc.in | 9 + test/gtest-1.8.0/cmake/gtest_main.pc.in | 10 + test/gtest-1.8.0/cmake/internal_utils.cmake | 70 +- test/gtest-1.8.0/codegear/gtest.cbproj | 274 +-- test/gtest-1.8.0/codegear/gtest.groupproj | 106 +- test/gtest-1.8.0/codegear/gtest_all.cc | 76 +- test/gtest-1.8.0/codegear/gtest_link.cc | 80 +- test/gtest-1.8.0/codegear/gtest_main.cbproj | 164 +- .../codegear/gtest_unittest.cbproj | 174 +- test/gtest-1.8.0/configure.ac | 2 +- test/gtest-1.8.0/docs/AdvancedGuide.md | 280 ++- test/gtest-1.8.0/docs/DevGuide.md | 126 - test/gtest-1.8.0/docs/Documentation.md | 12 +- test/gtest-1.8.0/docs/FAQ.md | 33 +- test/gtest-1.8.0/docs/Pkgconfig.md | 146 ++ test/gtest-1.8.0/docs/Primer.md | 42 +- test/gtest-1.8.0/docs/PumpManual.md | 4 +- test/gtest-1.8.0/docs/V1_5_AdvancedGuide.md | 2096 ---------------- test/gtest-1.8.0/docs/V1_5_Documentation.md | 12 - test/gtest-1.8.0/docs/V1_5_FAQ.md | 886 ------- test/gtest-1.8.0/docs/V1_5_Primer.md | 497 ---- test/gtest-1.8.0/docs/V1_5_PumpManual.md | 177 -- test/gtest-1.8.0/docs/V1_5_XcodeGuide.md | 93 - test/gtest-1.8.0/docs/V1_6_AdvancedGuide.md | 2178 ---------------- test/gtest-1.8.0/docs/V1_6_Documentation.md | 14 - test/gtest-1.8.0/docs/V1_6_FAQ.md | 1038 -------- test/gtest-1.8.0/docs/V1_6_Primer.md | 501 ---- test/gtest-1.8.0/docs/V1_6_PumpManual.md | 177 -- test/gtest-1.8.0/docs/V1_6_Samples.md | 14 - test/gtest-1.8.0/docs/V1_6_XcodeGuide.md | 93 - test/gtest-1.8.0/docs/V1_7_AdvancedGuide.md | 2181 ----------------- test/gtest-1.8.0/docs/V1_7_Documentation.md | 14 - test/gtest-1.8.0/docs/V1_7_FAQ.md | 1082 -------- test/gtest-1.8.0/docs/V1_7_Primer.md | 501 ---- test/gtest-1.8.0/docs/V1_7_PumpManual.md | 177 -- test/gtest-1.8.0/docs/V1_7_Samples.md | 14 - test/gtest-1.8.0/docs/V1_7_XcodeGuide.md | 93 - test/gtest-1.8.0/docs/XcodeGuide.md | 12 +- .../include/gtest/gtest-death-test.h | 58 +- .../gtest-1.8.0/include/gtest/gtest-message.h | 3 +- .../include/gtest/gtest-param-test.h | 64 +- .../include/gtest/gtest-param-test.h.pump | 25 +- .../include/gtest/gtest-printers.h | 187 +- test/gtest-1.8.0/include/gtest/gtest-spi.h | 5 +- .../include/gtest/gtest-typed-test.h | 7 +- test/gtest-1.8.0/include/gtest/gtest.h | 160 +- .../include/gtest/gtest_pred_impl.h | 13 +- test/gtest-1.8.0/include/gtest/gtest_prod.h | 13 +- .../gtest/internal/custom/gtest-port.h | 6 + .../include/gtest/internal/custom/gtest.h | 4 + .../internal/gtest-death-test-internal.h | 70 +- .../include/gtest/internal/gtest-filepath.h | 3 +- .../include/gtest/internal/gtest-internal.h | 157 +- .../internal/gtest-param-util-generated.h | 75 +- .../gtest-param-util-generated.h.pump | 13 +- .../include/gtest/internal/gtest-param-util.h | 26 +- .../include/gtest/internal/gtest-port-arch.h | 9 +- .../include/gtest/internal/gtest-port.h | 331 ++- .../include/gtest/internal/gtest-string.h | 6 +- .../include/gtest/internal/gtest-type-util.h | 18 +- .../gtest/internal/gtest-type-util.h.pump | 18 +- test/gtest-1.8.0/msvc/2010/gtest-md.sln | 55 + test/gtest-1.8.0/msvc/2010/gtest-md.vcxproj | 149 ++ test/gtest-1.8.0/msvc/2010/gtest.sln | 55 + .../gtest-1.8.0/msvc/{ => 2010}/gtest.vcxproj | 98 +- .../msvc/2010/gtest_main-md.vcxproj | 154 ++ test/gtest-1.8.0/msvc/2010/gtest_main.vcxproj | 162 ++ .../msvc/2010/gtest_prod_test-md.vcxproj | 199 ++ .../msvc/2010/gtest_prod_test.vcxproj | 191 ++ .../msvc/2010/gtest_unittest-md.vcxproj | 188 ++ .../msvc/2010/gtest_unittest.vcxproj | 180 ++ test/gtest-1.8.0/msvc/Debug/gtest/gtest.log | 1 - test/gtest-1.8.0/msvc/gtest-md.sln | 45 - test/gtest-1.8.0/msvc/gtest-md.vcproj | 126 - test/gtest-1.8.0/msvc/gtest.sln | 45 - test/gtest-1.8.0/msvc/gtest.vcproj | 126 - test/gtest-1.8.0/msvc/gtest/gtest.log | 1 - test/gtest-1.8.0/msvc/gtest_main-md.vcproj | 129 - test/gtest-1.8.0/msvc/gtest_main.vcproj | 129 - .../msvc/gtest_prod_test-md.vcproj | 164 -- test/gtest-1.8.0/msvc/gtest_prod_test.vcproj | 164 -- .../gtest-1.8.0/msvc/gtest_unittest-md.vcproj | 147 -- test/gtest-1.8.0/msvc/gtest_unittest.vcproj | 147 -- test/gtest-1.8.0/samples/prime_tables.h | 8 +- test/gtest-1.8.0/samples/sample1.cc | 2 +- test/gtest-1.8.0/samples/sample10_unittest.cc | 4 - test/gtest-1.8.0/samples/sample1_unittest.cc | 3 +- test/gtest-1.8.0/samples/sample2_unittest.cc | 3 +- test/gtest-1.8.0/samples/sample3_unittest.cc | 13 +- test/gtest-1.8.0/samples/sample4_unittest.cc | 6 +- test/gtest-1.8.0/samples/sample5_unittest.cc | 6 +- test/gtest-1.8.0/samples/sample6_unittest.cc | 3 +- test/gtest-1.8.0/samples/sample7_unittest.cc | 32 +- test/gtest-1.8.0/samples/sample8_unittest.cc | 3 +- test/gtest-1.8.0/samples/sample9_unittest.cc | 3 - test/gtest-1.8.0/scripts/fuse_gtest_files.py | 2 +- .../scripts/gen_gtest_pred_impl.py | 20 +- test/gtest-1.8.0/scripts/upload.py | 2 +- test/gtest-1.8.0/src/gtest-all.cc | 2 +- test/gtest-1.8.0/src/gtest-death-test.cc | 259 +- test/gtest-1.8.0/src/gtest-filepath.cc | 12 +- test/gtest-1.8.0/src/gtest-internal-inl.h | 50 +- test/gtest-1.8.0/src/gtest-port.cc | 152 +- test/gtest-1.8.0/src/gtest-printers.cc | 101 +- test/gtest-1.8.0/src/gtest-test-part.cc | 10 +- test/gtest-1.8.0/src/gtest-typed-test.cc | 1 + test/gtest-1.8.0/src/gtest.cc | 773 ++++-- test/gtest-1.8.0/src/gtest_main.cc | 2 +- test/gtest-1.8.0/test/BUILD.bazel | 380 +++ .../gtest-1.8.0/test/gtest-death-test_test.cc | 27 +- test/gtest-1.8.0/test/gtest-filepath_test.cc | 14 +- test/gtest-1.8.0/test/gtest-listener_test.cc | 2 +- test/gtest-1.8.0/test/gtest-options_test.cc | 14 +- .../test/gtest-param-test2_test.cc | 6 +- .../gtest-1.8.0/test/gtest-param-test_test.cc | 113 +- test/gtest-1.8.0/test/gtest-param-test_test.h | 6 +- test/gtest-1.8.0/test/gtest-port_test.cc | 23 +- test/gtest-1.8.0/test/gtest-printers_test.cc | 222 +- .../test/gtest-typed-test2_test.cc | 2 +- .../gtest-1.8.0/test/gtest-typed-test_test.cc | 2 +- .../test/gtest-unittest-api_test.cc | 2 +- test/gtest-1.8.0/test/gtest_all_test.cc | 26 +- .../test/gtest_assert_by_exception_test.cc | 119 + .../test/gtest_break_on_failure_unittest.py | 4 +- .../test/gtest_break_on_failure_unittest_.cc | 3 +- .../test/gtest_catch_exceptions_test.py | 2 - .../test/gtest_catch_exceptions_test_.cc | 2 +- test/gtest-1.8.0/test/gtest_color_test.py | 3 +- test/gtest-1.8.0/test/gtest_color_test_.cc | 8 - test/gtest-1.8.0/test/gtest_env_var_test.py | 10 +- test/gtest-1.8.0/test/gtest_env_var_test_.cc | 2 - .../test/gtest_environment_test.cc | 3 - .../gtest-1.8.0/test/gtest_filter_unittest.py | 38 +- .../test/gtest_filter_unittest_.cc | 2 - test/gtest-1.8.0/test/gtest_help_test.py | 2 +- .../test/gtest_json_outfiles_test.py | 162 ++ .../test/gtest_json_output_unittest.py | 611 +++++ .../gtest-1.8.0/test/gtest_json_test_utils.py | 60 + .../test/gtest_list_tests_unittest.py | 4 +- test/gtest-1.8.0/test/gtest_main_unittest.cc | 4 +- test/gtest-1.8.0/test/gtest_output_test.py | 18 +- test/gtest-1.8.0/test/gtest_output_test_.cc | 29 +- .../test/gtest_output_test_golden_lin.txt | 168 +- .../test/gtest_pred_impl_unittest.cc | 2 +- test/gtest-1.8.0/test/gtest_prod_test.cc | 4 +- test/gtest-1.8.0/test/gtest_repeat_test.cc | 21 +- test/gtest-1.8.0/test/gtest_stress_test.cc | 6 - test/gtest-1.8.0/test/gtest_test_utils.py | 26 +- .../test/gtest_throw_on_failure_test.py | 2 +- .../test/gtest_uninitialized_test.py | 9 +- .../test/gtest_uninitialized_test_.cc | 4 +- test/gtest-1.8.0/test/gtest_unittest.cc | 389 +-- .../test/gtest_xml_outfile1_test_.cc | 1 - .../test/gtest_xml_outfile2_test_.cc | 1 - .../test/gtest_xml_outfiles_test.py | 22 +- .../test/gtest_xml_output_unittest.py | 130 +- .../test/gtest_xml_output_unittest_.cc | 2 - test/gtest-1.8.0/test/gtest_xml_test_utils.py | 48 +- test/gtest-1.8.0/test/production.cc | 2 +- test/gtest-1.8.0/test/production.h | 2 +- .../xcode/Scripts/versiongenerate.py | 8 +- .../xcode/gtest.xcodeproj/project.pbxproj | 47 + 168 files changed, 6750 insertions(+), 15228 deletions(-) delete mode 100644 test/gtest-1.8.0/build-aux/.keep create mode 100644 test/gtest-1.8.0/cmake/gtest.pc.in create mode 100644 test/gtest-1.8.0/cmake/gtest_main.pc.in delete mode 100644 test/gtest-1.8.0/docs/DevGuide.md create mode 100644 test/gtest-1.8.0/docs/Pkgconfig.md delete mode 100644 test/gtest-1.8.0/docs/V1_5_AdvancedGuide.md delete mode 100644 test/gtest-1.8.0/docs/V1_5_Documentation.md delete mode 100644 test/gtest-1.8.0/docs/V1_5_FAQ.md delete mode 100644 test/gtest-1.8.0/docs/V1_5_Primer.md delete mode 100644 test/gtest-1.8.0/docs/V1_5_PumpManual.md delete mode 100644 test/gtest-1.8.0/docs/V1_5_XcodeGuide.md delete mode 100644 test/gtest-1.8.0/docs/V1_6_AdvancedGuide.md delete mode 100644 test/gtest-1.8.0/docs/V1_6_Documentation.md delete mode 100644 test/gtest-1.8.0/docs/V1_6_FAQ.md delete mode 100644 test/gtest-1.8.0/docs/V1_6_Primer.md delete mode 100644 test/gtest-1.8.0/docs/V1_6_PumpManual.md delete mode 100644 test/gtest-1.8.0/docs/V1_6_Samples.md delete mode 100644 test/gtest-1.8.0/docs/V1_6_XcodeGuide.md delete mode 100644 test/gtest-1.8.0/docs/V1_7_AdvancedGuide.md delete mode 100644 test/gtest-1.8.0/docs/V1_7_Documentation.md delete mode 100644 test/gtest-1.8.0/docs/V1_7_FAQ.md delete mode 100644 test/gtest-1.8.0/docs/V1_7_Primer.md delete mode 100644 test/gtest-1.8.0/docs/V1_7_PumpManual.md delete mode 100644 test/gtest-1.8.0/docs/V1_7_Samples.md delete mode 100644 test/gtest-1.8.0/docs/V1_7_XcodeGuide.md create mode 100644 test/gtest-1.8.0/msvc/2010/gtest-md.sln create mode 100644 test/gtest-1.8.0/msvc/2010/gtest-md.vcxproj create mode 100644 test/gtest-1.8.0/msvc/2010/gtest.sln rename test/gtest-1.8.0/msvc/{ => 2010}/gtest.vcxproj (72%) create mode 100644 test/gtest-1.8.0/msvc/2010/gtest_main-md.vcxproj create mode 100644 test/gtest-1.8.0/msvc/2010/gtest_main.vcxproj create mode 100644 test/gtest-1.8.0/msvc/2010/gtest_prod_test-md.vcxproj create mode 100644 test/gtest-1.8.0/msvc/2010/gtest_prod_test.vcxproj create mode 100644 test/gtest-1.8.0/msvc/2010/gtest_unittest-md.vcxproj create mode 100644 test/gtest-1.8.0/msvc/2010/gtest_unittest.vcxproj delete mode 100644 test/gtest-1.8.0/msvc/Debug/gtest/gtest.log delete mode 100644 test/gtest-1.8.0/msvc/gtest-md.sln delete mode 100644 test/gtest-1.8.0/msvc/gtest-md.vcproj delete mode 100644 test/gtest-1.8.0/msvc/gtest.sln delete mode 100644 test/gtest-1.8.0/msvc/gtest.vcproj delete mode 100644 test/gtest-1.8.0/msvc/gtest/gtest.log delete mode 100644 test/gtest-1.8.0/msvc/gtest_main-md.vcproj delete mode 100644 test/gtest-1.8.0/msvc/gtest_main.vcproj delete mode 100644 test/gtest-1.8.0/msvc/gtest_prod_test-md.vcproj delete mode 100644 test/gtest-1.8.0/msvc/gtest_prod_test.vcproj delete mode 100644 test/gtest-1.8.0/msvc/gtest_unittest-md.vcproj delete mode 100644 test/gtest-1.8.0/msvc/gtest_unittest.vcproj create mode 100644 test/gtest-1.8.0/test/BUILD.bazel create mode 100644 test/gtest-1.8.0/test/gtest_assert_by_exception_test.cc create mode 100644 test/gtest-1.8.0/test/gtest_json_outfiles_test.py create mode 100644 test/gtest-1.8.0/test/gtest_json_output_unittest.py create mode 100644 test/gtest-1.8.0/test/gtest_json_test_utils.py diff --git a/IISIntegration.sln b/IISIntegration.sln index a7b2c54b60..4d00cd78dd 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -76,7 +76,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OverriddenServerWebSite", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "test\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest-1.8.0\msvc\gtest.vcxproj", "{2AF210A9-5BDC-45E8-95DD-07B5A2616493}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest-1.8.0\msvc\2010\gtest.vcxproj", "{2AF210A9-5BDC-45E8-95DD-07B5A2616493}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV1", "AspNetCoreModuleV1", "{16E521CE-77F1-4B1C-A183-520A41C4F372}" EndProject diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 1f8ad4b512..03e1fbd05b 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -56,7 +56,7 @@ {09d9d1d6-2951-4e14-bc35-76a23cf9391a} - + {2af210a9-5bdc-45e8-95dd-07b5a2616493} diff --git a/test/gtest-1.8.0/CMakeLists.txt b/test/gtest-1.8.0/CMakeLists.txt index 621d0f0421..b09c46ed32 100644 --- a/test/gtest-1.8.0/CMakeLists.txt +++ b/test/gtest-1.8.0/CMakeLists.txt @@ -44,8 +44,17 @@ endif() # as ${gtest_SOURCE_DIR} and to the root binary directory as # ${gtest_BINARY_DIR}. # Language "C" is required for find_package(Threads). -project(gtest CXX C) -cmake_minimum_required(VERSION 2.6.2) +if (CMAKE_VERSION VERSION_LESS 3.0) + project(gtest CXX C) +else() + cmake_policy(SET CMP0048 NEW) + project(gtest VERSION 1.9.0 LANGUAGES CXX C) +endif() +cmake_minimum_required(VERSION 2.6.4) + +if (POLICY CMP0063) # Visibility + cmake_policy(SET CMP0063 NEW) +endif (POLICY CMP0063) if (COMMAND set_up_hermetic_build) set_up_hermetic_build() @@ -63,11 +72,8 @@ config_compiler_and_linker() # Defined in internal_utils.cmake. # Where Google Test's .h files can be found. include_directories( - ${gtest_SOURCE_DIR}/include - ${gtest_SOURCE_DIR}) - -# Where Google Test's libraries can be found. -link_directories(${gtest_BINARY_DIR}/src) + "${gtest_SOURCE_DIR}/include" + "${gtest_SOURCE_DIR}") # Summary of tuple support for Microsoft Visual Studio: # Compiler version(MS) version(cmake) Support @@ -75,10 +81,12 @@ link_directories(${gtest_BINARY_DIR}/src) # <= VS 2010 <= 10 <= 1600 Use Google Tests's own tuple. # VS 2012 11 1700 std::tr1::tuple + _VARIADIC_MAX=10 # VS 2013 12 1800 std::tr1::tuple +# VS 2015 14 1900 std::tuple +# VS 2017 15 >= 1910 std::tuple if (MSVC AND MSVC_VERSION EQUAL 1700) add_definitions(/D _VARIADIC_MAX=10) endif() - + ######################################################################## # # Defines the gtest & gtest_main libraries. User tests should link @@ -95,17 +103,33 @@ target_link_libraries(gtest_main gtest) # to the targets for when we are part of a parent build (ie being pulled # in via add_subdirectory() rather than being a standalone build). if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - target_include_directories(gtest INTERFACE "${gtest_SOURCE_DIR}/include") - target_include_directories(gtest_main INTERFACE "${gtest_SOURCE_DIR}/include") + target_include_directories(gtest SYSTEM INTERFACE "${gtest_SOURCE_DIR}/include") + target_include_directories(gtest_main SYSTEM INTERFACE "${gtest_SOURCE_DIR}/include") endif() ######################################################################## # # Install rules -install(TARGETS gtest gtest_main - DESTINATION lib) -install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest - DESTINATION include) +if(INSTALL_GTEST) + install(TARGETS gtest gtest_main + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") + install(DIRECTORY "${gtest_SOURCE_DIR}/include/gtest" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + + # configure and install pkgconfig files + configure_file( + cmake/gtest.pc.in + "${CMAKE_BINARY_DIR}/gtest.pc" + @ONLY) + configure_file( + cmake/gtest_main.pc.in + "${CMAKE_BINARY_DIR}/gtest_main.pc" + @ONLY) + install(FILES "${CMAKE_BINARY_DIR}/gtest.pc" "${CMAKE_BINARY_DIR}/gtest_main.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +endif() ######################################################################## # @@ -280,7 +304,9 @@ if (gtest_build_tests) cxx_executable(gtest_xml_outfile1_test_ test gtest_main) cxx_executable(gtest_xml_outfile2_test_ test gtest_main) py_test(gtest_xml_outfiles_test) + py_test(gtest_json_outfiles_test) cxx_executable(gtest_xml_output_unittest_ test gtest) py_test(gtest_xml_output_unittest) + py_test(gtest_json_output_unittest) endif() diff --git a/test/gtest-1.8.0/Makefile.am b/test/gtest-1.8.0/Makefile.am index 29797e4e9d..b6c7232dd4 100644 --- a/test/gtest-1.8.0/Makefile.am +++ b/test/gtest-1.8.0/Makefile.am @@ -34,6 +34,7 @@ EXTRA_DIST += $(GTEST_SRC) # Sample files that we don't compile. EXTRA_DIST += \ samples/prime_tables.h \ + samples/sample1_unittest.cc \ samples/sample2_unittest.cc \ samples/sample3_unittest.cc \ samples/sample4_unittest.cc \ @@ -120,16 +121,16 @@ EXTRA_DIST += \ # MSVC project files EXTRA_DIST += \ - msvc/gtest-md.sln \ - msvc/gtest-md.vcproj \ - msvc/gtest.sln \ - msvc/gtest.vcproj \ - msvc/gtest_main-md.vcproj \ - msvc/gtest_main.vcproj \ - msvc/gtest_prod_test-md.vcproj \ - msvc/gtest_prod_test.vcproj \ - msvc/gtest_unittest-md.vcproj \ - msvc/gtest_unittest.vcproj + msvc/2010/gtest-md.sln \ + msvc/2010/gtest-md.vcxproj \ + msvc/2010/gtest.sln \ + msvc/2010/gtest.vcxproj \ + msvc/2010/gtest_main-md.vcxproj \ + msvc/2010/gtest_main.vcxproj \ + msvc/2010/gtest_prod_test-md.vcxproj \ + msvc/2010/gtest_prod_test.vcxproj \ + msvc/2010/gtest_unittest-md.vcxproj \ + msvc/2010/gtest_unittest.vcxproj # xcode project files EXTRA_DIST += \ @@ -216,40 +217,68 @@ pkginclude_internal_HEADERS = \ lib_libgtest_main_la_SOURCES = src/gtest_main.cc lib_libgtest_main_la_LIBADD = lib/libgtest.la -# Bulid rules for samples and tests. Automake's naming for some of +# Build rules for samples and tests. Automake's naming for some of # these variables isn't terribly obvious, so this is a brief # reference: # # TESTS -- Programs run automatically by "make check" # check_PROGRAMS -- Programs built by "make check" but not necessarily run -noinst_LTLIBRARIES = samples/libsamples.la - -samples_libsamples_la_SOURCES = \ - samples/sample1.cc \ - samples/sample1.h \ - samples/sample2.cc \ - samples/sample2.h \ - samples/sample3-inl.h \ - samples/sample4.cc \ - samples/sample4.h - TESTS= TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \ GTEST_BUILD_DIR="$(top_builddir)/test" check_PROGRAMS= # A simple sample on using gtest. -TESTS += samples/sample1_unittest -check_PROGRAMS += samples/sample1_unittest -samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc -samples_sample1_unittest_LDADD = lib/libgtest_main.la \ - lib/libgtest.la \ - samples/libsamples.la +TESTS += samples/sample1_unittest \ + samples/sample2_unittest \ + samples/sample3_unittest \ + samples/sample4_unittest \ + samples/sample5_unittest \ + samples/sample6_unittest \ + samples/sample7_unittest \ + samples/sample8_unittest \ + samples/sample9_unittest \ + samples/sample10_unittest +check_PROGRAMS += samples/sample1_unittest \ + samples/sample2_unittest \ + samples/sample3_unittest \ + samples/sample4_unittest \ + samples/sample5_unittest \ + samples/sample6_unittest \ + samples/sample7_unittest \ + samples/sample8_unittest \ + samples/sample9_unittest \ + samples/sample10_unittest -# Another sample. It also verifies that libgtest works. -TESTS += samples/sample10_unittest -check_PROGRAMS += samples/sample10_unittest +samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc samples/sample1.cc +samples_sample1_unittest_LDADD = lib/libgtest_main.la \ + lib/libgtest.la +samples_sample2_unittest_SOURCES = samples/sample2_unittest.cc samples/sample2.cc +samples_sample2_unittest_LDADD = lib/libgtest_main.la \ + lib/libgtest.la +samples_sample3_unittest_SOURCES = samples/sample3_unittest.cc +samples_sample3_unittest_LDADD = lib/libgtest_main.la \ + lib/libgtest.la +samples_sample4_unittest_SOURCES = samples/sample4_unittest.cc samples/sample4.cc +samples_sample4_unittest_LDADD = lib/libgtest_main.la \ + lib/libgtest.la +samples_sample5_unittest_SOURCES = samples/sample5_unittest.cc samples/sample1.cc +samples_sample5_unittest_LDADD = lib/libgtest_main.la \ + lib/libgtest.la +samples_sample6_unittest_SOURCES = samples/sample6_unittest.cc +samples_sample6_unittest_LDADD = lib/libgtest_main.la \ + lib/libgtest.la +samples_sample7_unittest_SOURCES = samples/sample7_unittest.cc +samples_sample7_unittest_LDADD = lib/libgtest_main.la \ + lib/libgtest.la +samples_sample8_unittest_SOURCES = samples/sample8_unittest.cc +samples_sample8_unittest_LDADD = lib/libgtest_main.la \ + lib/libgtest.la + +# Also verify that libgtest works by itself. +samples_sample9_unittest_SOURCES = samples/sample9_unittest.cc +samples_sample9_unittest_LDADD = lib/libgtest.la samples_sample10_unittest_SOURCES = samples/sample10_unittest.cc samples_sample10_unittest_LDADD = lib/libgtest.la diff --git a/test/gtest-1.8.0/README.md b/test/gtest-1.8.0/README.md index edd4408054..225aba2439 100644 --- a/test/gtest-1.8.0/README.md +++ b/test/gtest-1.8.0/README.md @@ -59,7 +59,13 @@ cross-platform.). If you don't have CMake installed already, you can download it for free from . CMake works by generating native makefiles or build projects that can -be used in the compiler environment of your choice. The typical +be used in the compiler environment of your choice. You can either +build Google Test as a standalone project or it can be incorporated +into an existing CMake build for another project. + +#### Standalone CMake Project #### + +When building Google Test as a standalone project, the typical workflow starts with: mkdir mybuild # Create a directory to hold the build output. @@ -80,13 +86,122 @@ using Visual Studio. On Mac OS X with Xcode installed, a `.xcodeproj` file will be generated. +#### Incorporating Into An Existing CMake Project #### + +If you want to use gtest in a project which already uses CMake, then a +more robust and flexible approach is to build gtest as part of that +project directly. This is done by making the GoogleTest source code +available to the main build and adding it using CMake's +`add_subdirectory()` command. This has the significant advantage that +the same compiler and linker settings are used between gtest and the +rest of your project, so issues associated with using incompatible +libraries (eg debug/release), etc. are avoided. This is particularly +useful on Windows. Making GoogleTest's source code available to the +main build can be done a few different ways: + +* Download the GoogleTest source code manually and place it at a + known location. This is the least flexible approach and can make + it more difficult to use with continuous integration systems, etc. +* Embed the GoogleTest source code as a direct copy in the main + project's source tree. This is often the simplest approach, but is + also the hardest to keep up to date. Some organizations may not + permit this method. +* Add GoogleTest as a git submodule or equivalent. This may not + always be possible or appropriate. Git submodules, for example, + have their own set of advantages and drawbacks. +* Use CMake to download GoogleTest as part of the build's configure + step. This is just a little more complex, but doesn't have the + limitations of the other methods. + +The last of the above methods is implemented with a small piece +of CMake code in a separate file (e.g. `CMakeLists.txt.in`) which +is copied to the build area and then invoked as a sub-build +_during the CMake stage_. That directory is then pulled into the +main build with `add_subdirectory()`. For example: + +New file `CMakeLists.txt.in`: + + cmake_minimum_required(VERSION 2.8.2) + + project(googletest-download NONE) + + include(ExternalProject) + ExternalProject_Add(googletest + GIT_REPOSITORY https://github.com/google/googletest.git + GIT_TAG master + SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" + BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + TEST_COMMAND "" + ) + +Existing build's `CMakeLists.txt`: + + # Download and unpack googletest at configure time + configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt) + execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . + RESULT_VARIABLE result + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) + if(result) + message(FATAL_ERROR "CMake step for googletest failed: ${result}") + endif() + execute_process(COMMAND ${CMAKE_COMMAND} --build . + RESULT_VARIABLE result + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) + if(result) + message(FATAL_ERROR "Build step for googletest failed: ${result}") + endif() + + # Prevent overriding the parent project's compiler/linker + # settings on Windows + set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + + # Add googletest directly to our build. This defines + # the gtest and gtest_main targets. + add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src + ${CMAKE_BINARY_DIR}/googletest-build + EXCLUDE_FROM_ALL) + + # The gtest/gtest_main targets carry header search path + # dependencies automatically when using CMake 2.8.11 or + # later. Otherwise we have to add them here ourselves. + if (CMAKE_VERSION VERSION_LESS 2.8.11) + include_directories("${gtest_SOURCE_DIR}/include") + endif() + + # Now simply link against gtest or gtest_main as needed. Eg + add_executable(example example.cpp) + target_link_libraries(example gtest_main) + add_test(NAME example_test COMMAND example) + +Note that this approach requires CMake 2.8.2 or later due to +its use of the `ExternalProject_Add()` command. The above +technique is discussed in more detail in +[this separate article](http://crascit.com/2015/07/25/cmake-gtest/) +which also contains a link to a fully generalized implementation +of the technique. + +##### Visual Studio Dynamic vs Static Runtimes ##### + +By default, new Visual Studio projects link the C runtimes dynamically +but Google Test links them statically. +This will generate an error that looks something like the following: + gtest.lib(gtest-all.obj) : error LNK2038: mismatch detected for 'RuntimeLibrary': value 'MTd_StaticDebug' doesn't match value 'MDd_DynamicDebug' in main.obj + +Google Test already has a CMake option for this: `gtest_force_shared_crt` + +Enabling this option will make gtest link the runtimes dynamically too, +and match the project in which it is included. + ### Legacy Build Scripts ### Before settling on CMake, we have been providing hand-maintained build projects/scripts for Visual Studio, Xcode, and Autotools. While we continue to provide them for convenience, they are not actively maintained any more. We highly recommend that you follow the -instructions in the previous two sections to integrate Google Test +instructions in the above sections to integrate Google Test with your existing build system. If you still need to use the legacy build scripts, here's how: @@ -243,38 +358,3 @@ instead of TEST(SomeTest, DoesThis) { ... } in order to define a test. - -## Developing Google Test ## - -This section discusses how to make your own changes to Google Test. - -### Testing Google Test Itself ### - -To make sure your changes work as intended and don't break existing -functionality, you'll want to compile and run Google Test's own tests. -For that you can use CMake: - - mkdir mybuild - cd mybuild - cmake -Dgtest_build_tests=ON ${GTEST_DIR} - -Make sure you have Python installed, as some of Google Test's tests -are written in Python. If the cmake command complains about not being -able to find Python (`Could NOT find PythonInterp (missing: -PYTHON_EXECUTABLE)`), try telling it explicitly where your Python -executable can be found: - - cmake -DPYTHON_EXECUTABLE=path/to/python -Dgtest_build_tests=ON ${GTEST_DIR} - -Next, you can build Google Test and all of its own tests. On \*nix, -this is usually done by 'make'. To run the tests, do - - make test - -All tests should pass. - -Normally you don't need to worry about regenerating the source files, -unless you need to modify them. In that case, you should modify the -corresponding .pump files instead and run the pump.py Python script to -regenerate them. You can find pump.py in the [scripts/](scripts/) directory. -Read the [Pump manual](docs/PumpManual.md) for how to use it. diff --git a/test/gtest-1.8.0/build-aux/.keep b/test/gtest-1.8.0/build-aux/.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/gtest-1.8.0/cmake/gtest.pc.in b/test/gtest-1.8.0/cmake/gtest.pc.in new file mode 100644 index 0000000000..e7967ad56f --- /dev/null +++ b/test/gtest-1.8.0/cmake/gtest.pc.in @@ -0,0 +1,9 @@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + +Name: gtest +Description: GoogleTest (without main() function) +Version: @PROJECT_VERSION@ +URL: https://github.com/google/googletest +Libs: -L${libdir} -lgtest @CMAKE_THREAD_LIBS_INIT@ +Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ diff --git a/test/gtest-1.8.0/cmake/gtest_main.pc.in b/test/gtest-1.8.0/cmake/gtest_main.pc.in new file mode 100644 index 0000000000..fe25d9c73c --- /dev/null +++ b/test/gtest-1.8.0/cmake/gtest_main.pc.in @@ -0,0 +1,10 @@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + +Name: gtest_main +Description: GoogleTest (with main() function) +Version: @PROJECT_VERSION@ +URL: https://github.com/google/googletest +Requires: gtest +Libs: -L${libdir} -lgtest_main @CMAKE_THREAD_LIBS_INIT@ +Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ diff --git a/test/gtest-1.8.0/cmake/internal_utils.cmake b/test/gtest-1.8.0/cmake/internal_utils.cmake index 777b91ed4b..6448918f8e 100644 --- a/test/gtest-1.8.0/cmake/internal_utils.cmake +++ b/test/gtest-1.8.0/cmake/internal_utils.cmake @@ -46,9 +46,16 @@ endmacro() # Google Mock. You can tweak these definitions to suit your need. A # variable's value is empty before it's explicitly assigned to. macro(config_compiler_and_linker) - if (NOT gtest_disable_pthreads) + # Note: pthreads on MinGW is not supported, even if available + # instead, we use windows threading primitives + unset(GTEST_HAS_PTHREAD) + if (NOT gtest_disable_pthreads AND NOT MINGW) # Defines CMAKE_USE_PTHREADS_INIT and CMAKE_THREAD_LIBS_INIT. + set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads) + if (CMAKE_USE_PTHREADS_INIT) + set(GTEST_HAS_PTHREAD ON) + endif() endif() fix_default_compiler_settings_() @@ -80,18 +87,17 @@ macro(config_compiler_and_linker) # http://stackoverflow.com/questions/3232669 explains the issue. set(cxx_base_flags "${cxx_base_flags} -wd4702") endif() - if (NOT (MSVC_VERSION GREATER 1900)) # 1900 is Visual Studio 2015 - # BigObj required for tests. - set(cxx_base_flags "${cxx_base_flags} -bigobj") - endif() set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32") set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN") set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1") - set(cxx_no_exception_flags "-D_HAS_EXCEPTIONS=0") + set(cxx_no_exception_flags "-EHs-c- -D_HAS_EXCEPTIONS=0") set(cxx_no_rtti_flags "-GR-") elseif (CMAKE_COMPILER_IS_GNUCXX) - set(cxx_base_flags "-Wall -Wshadow") + set(cxx_base_flags "-Wall -Wshadow -Werror") + if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0) + set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else") + endif() set(cxx_exception_flags "-fexceptions") set(cxx_no_exception_flags "-fno-exceptions") # Until version 4.3.2, GCC doesn't define a macro to indicate @@ -123,11 +129,13 @@ macro(config_compiler_and_linker) set(cxx_no_rtti_flags "") endif() - if (CMAKE_USE_PTHREADS_INIT) # The pthreads library is available and allowed. - set(cxx_base_flags "${cxx_base_flags} -DGTEST_HAS_PTHREAD=1") + # The pthreads library is available and allowed? + if (DEFINED GTEST_HAS_PTHREAD) + set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=1") else() - set(cxx_base_flags "${cxx_base_flags} -DGTEST_HAS_PTHREAD=0") + set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=0") endif() + set(cxx_base_flags "${cxx_base_flags} ${GTEST_HAS_PTHREAD_MACRO}") # For building gtest's own tests and samples. set(cxx_exception "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_exception_flags}") @@ -150,12 +158,16 @@ function(cxx_library_with_type name type cxx_flags) set_target_properties(${name} PROPERTIES COMPILE_FLAGS "${cxx_flags}") + # Generate debug library name with a postfix. + set_target_properties(${name} + PROPERTIES + DEBUG_POSTFIX "d") if (BUILD_SHARED_LIBS OR type STREQUAL "SHARED") set_target_properties(${name} PROPERTIES COMPILE_DEFINITIONS "GTEST_CREATE_SHARED_LIBRARY=1") endif() - if (CMAKE_USE_PTHREADS_INIT) + if (DEFINED GTEST_HAS_PTHREAD) target_link_libraries(${name} ${CMAKE_THREAD_LIBS_INIT}) endif() endfunction() @@ -178,6 +190,10 @@ endfunction() # is built from the given source files with the given compiler flags. function(cxx_executable_with_flags name cxx_flags libs) add_executable(${name} ${ARGN}) + if (MSVC AND (NOT (MSVC_VERSION LESS 1700))) # 1700 is Visual Studio 2012. + # BigObj required for tests. + set(cxx_flags "${cxx_flags} -bigobj") + endif() if (cxx_flags) set_target_properties(${name} PROPERTIES @@ -232,23 +248,33 @@ endfunction() # creates a Python test with the given name whose main module is in # test/name.py. It does nothing if Python is not installed. function(py_test name) - # We are not supporting Python tests on Linux yet as they consider - # all Linux environments to be google3 and try to use google3 features. if (PYTHONINTERP_FOUND) - # ${CMAKE_BINARY_DIR} is known at configuration time, so we can - # directly bind it from cmake. ${CTEST_CONFIGURATION_TYPE} is known - # only at ctest runtime (by calling ctest -c ), so - # we have to escape $ to delay variable substitution here. if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) - add_test( - NAME ${name} - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py - --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$) + if (CMAKE_CONFIGURATION_TYPES) + # Multi-configuration build generators as for Visual Studio save + # output in a subdirectory of CMAKE_CURRENT_BINARY_DIR (Debug, + # Release etc.), so we have to provide it here. + add_test( + NAME ${name} + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py + --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$) + else (CMAKE_CONFIGURATION_TYPES) + # Single-configuration build generators like Makefile generators + # don't have subdirs below CMAKE_CURRENT_BINARY_DIR. + add_test( + NAME ${name} + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py + --build_dir=${CMAKE_CURRENT_BINARY_DIR}) + endif (CMAKE_CONFIGURATION_TYPES) else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) + # ${CMAKE_CURRENT_BINARY_DIR} is known at configuration time, so we can + # directly bind it from cmake. ${CTEST_CONFIGURATION_TYPE} is known + # only at ctest runtime (by calling ctest -c ), so + # we have to escape $ to delay variable substitution here. add_test( ${name} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE}) endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) - endif() + endif(PYTHONINTERP_FOUND) endfunction() diff --git a/test/gtest-1.8.0/codegear/gtest.cbproj b/test/gtest-1.8.0/codegear/gtest.cbproj index 285bb2a87b..95c3054b85 100644 --- a/test/gtest-1.8.0/codegear/gtest.cbproj +++ b/test/gtest-1.8.0/codegear/gtest.cbproj @@ -1,138 +1,138 @@ - - - - {bca37a72-5b07-46cf-b44e-89f8e06451a2} - Release - - - true - - - true - true - Base - - - true - true - Base - - - true - lib - JPHNE - NO_STRICT - true - true - CppStaticLibrary - true - rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi - false - $(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;.. - rtl.lib;vcl.lib - 32 - $(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk - - - false - false - true - _DEBUG;$(Defines) - true - false - true - None - DEBUG - true - Debug - true - true - true - $(BDS)\lib\debug;$(ILINK_LibraryPath) - Full - true - - - NDEBUG;$(Defines) - Release - $(BDS)\lib\release;$(ILINK_LibraryPath) - None - - - CPlusPlusBuilder.Personality - CppStaticLibrary - -FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse - - - CodeGear C++Builder Office 2000 Servers Package - CodeGear C++Builder Office XP Servers Package - FalseTrueTrue3$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include1$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk1NO_STRICT13216 - - - - - 3 - - - 4 - - - 5 - - - 6 - - - 7 - - - 8 - - - 0 - - - 1 - - - 2 - - - 9 - - - 10 - - - 11 - - - 12 - - - 14 - - - 13 - - - 15 - - - 16 - - - 17 - - - 18 - - - Cfg_1 - - - Cfg_2 - - + + + + {bca37a72-5b07-46cf-b44e-89f8e06451a2} + Release + + + true + + + true + true + Base + + + true + true + Base + + + true + lib + JPHNE + NO_STRICT + true + true + CppStaticLibrary + true + rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi + false + $(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;.. + rtl.lib;vcl.lib + 32 + $(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk + + + false + false + true + _DEBUG;$(Defines) + true + false + true + None + DEBUG + true + Debug + true + true + true + $(BDS)\lib\debug;$(ILINK_LibraryPath) + Full + true + + + NDEBUG;$(Defines) + Release + $(BDS)\lib\release;$(ILINK_LibraryPath) + None + + + CPlusPlusBuilder.Personality + CppStaticLibrary + +FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse + + + CodeGear C++Builder Office 2000 Servers Package + CodeGear C++Builder Office XP Servers Package + FalseTrueTrue3$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include1$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk1NO_STRICT13216 + + + + + 3 + + + 4 + + + 5 + + + 6 + + + 7 + + + 8 + + + 0 + + + 1 + + + 2 + + + 9 + + + 10 + + + 11 + + + 12 + + + 14 + + + 13 + + + 15 + + + 16 + + + 17 + + + 18 + + + Cfg_1 + + + Cfg_2 + + \ No newline at end of file diff --git a/test/gtest-1.8.0/codegear/gtest.groupproj b/test/gtest-1.8.0/codegear/gtest.groupproj index 849f4c4b81..faf31cab64 100644 --- a/test/gtest-1.8.0/codegear/gtest.groupproj +++ b/test/gtest-1.8.0/codegear/gtest.groupproj @@ -1,54 +1,54 @@ - - - {c1d923e0-6cba-4332-9b6f-3420acbf5091} - - - - - - - - - Default.Personality - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + {c1d923e0-6cba-4332-9b6f-3420acbf5091} + + + + + + + + + Default.Personality + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/gtest-1.8.0/codegear/gtest_all.cc b/test/gtest-1.8.0/codegear/gtest_all.cc index ba7ad68ad1..121b2d80e8 100644 --- a/test/gtest-1.8.0/codegear/gtest_all.cc +++ b/test/gtest-1.8.0/codegear/gtest_all.cc @@ -1,38 +1,38 @@ -// Copyright 2009, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: Josh Kelley (joshkel@gmail.com) -// -// Google C++ Testing Framework (Google Test) -// -// C++Builder's IDE cannot build a static library from files with hyphens -// in their name. See http://qc.codegear.com/wc/qcmain.aspx?d=70977 . -// This file serves as a workaround. - -#include "src/gtest-all.cc" +// Copyright 2009, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: Josh Kelley (joshkel@gmail.com) +// +// Google C++ Testing Framework (Google Test) +// +// C++Builder's IDE cannot build a static library from files with hyphens +// in their name. See http://qc.codegear.com/wc/qcmain.aspx?d=70977 . +// This file serves as a workaround. + +#include "src/gtest-all.cc" diff --git a/test/gtest-1.8.0/codegear/gtest_link.cc b/test/gtest-1.8.0/codegear/gtest_link.cc index b955ebf2f9..918eccd19b 100644 --- a/test/gtest-1.8.0/codegear/gtest_link.cc +++ b/test/gtest-1.8.0/codegear/gtest_link.cc @@ -1,40 +1,40 @@ -// Copyright 2009, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: Josh Kelley (joshkel@gmail.com) -// -// Google C++ Testing Framework (Google Test) -// -// Links gtest.lib and gtest_main.lib into the current project in C++Builder. -// This means that these libraries can't be renamed, but it's the only way to -// ensure that Debug versus Release test builds are linked against the -// appropriate Debug or Release build of the libraries. - -#pragma link "gtest.lib" -#pragma link "gtest_main.lib" +// Copyright 2009, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: Josh Kelley (joshkel@gmail.com) +// +// Google C++ Testing Framework (Google Test) +// +// Links gtest.lib and gtest_main.lib into the current project in C++Builder. +// This means that these libraries can't be renamed, but it's the only way to +// ensure that Debug versus Release test builds are linked against the +// appropriate Debug or Release build of the libraries. + +#pragma link "gtest.lib" +#pragma link "gtest_main.lib" diff --git a/test/gtest-1.8.0/codegear/gtest_main.cbproj b/test/gtest-1.8.0/codegear/gtest_main.cbproj index fae32cb29b..d76ce1398f 100644 --- a/test/gtest-1.8.0/codegear/gtest_main.cbproj +++ b/test/gtest-1.8.0/codegear/gtest_main.cbproj @@ -1,82 +1,82 @@ - - - - {bca37a72-5b07-46cf-b44e-89f8e06451a2} - Release - - - true - - - true - true - Base - - - true - true - Base - - - true - lib - JPHNE - NO_STRICT - true - true - CppStaticLibrary - true - rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi - false - $(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;.. - rtl.lib;vcl.lib - 32 - $(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk - - - false - false - true - _DEBUG;$(Defines) - true - false - true - None - DEBUG - true - Debug - true - true - true - $(BDS)\lib\debug;$(ILINK_LibraryPath) - Full - true - - - NDEBUG;$(Defines) - Release - $(BDS)\lib\release;$(ILINK_LibraryPath) - None - - - CPlusPlusBuilder.Personality - CppStaticLibrary - -FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse - CodeGear C++Builder Office 2000 Servers Package - CodeGear C++Builder Office XP Servers Package - FalseTrueTrue3$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include1$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk1NO_STRICT13216 - - - - - 0 - - - Cfg_1 - - - Cfg_2 - - - + + + + {bca37a72-5b07-46cf-b44e-89f8e06451a2} + Release + + + true + + + true + true + Base + + + true + true + Base + + + true + lib + JPHNE + NO_STRICT + true + true + CppStaticLibrary + true + rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi + false + $(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;.. + rtl.lib;vcl.lib + 32 + $(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk + + + false + false + true + _DEBUG;$(Defines) + true + false + true + None + DEBUG + true + Debug + true + true + true + $(BDS)\lib\debug;$(ILINK_LibraryPath) + Full + true + + + NDEBUG;$(Defines) + Release + $(BDS)\lib\release;$(ILINK_LibraryPath) + None + + + CPlusPlusBuilder.Personality + CppStaticLibrary + +FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse + CodeGear C++Builder Office 2000 Servers Package + CodeGear C++Builder Office XP Servers Package + FalseTrueTrue3$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include1$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk1NO_STRICT13216 + + + + + 0 + + + Cfg_1 + + + Cfg_2 + + + diff --git a/test/gtest-1.8.0/codegear/gtest_unittest.cbproj b/test/gtest-1.8.0/codegear/gtest_unittest.cbproj index 33f7056346..dc5db8e4da 100644 --- a/test/gtest-1.8.0/codegear/gtest_unittest.cbproj +++ b/test/gtest-1.8.0/codegear/gtest_unittest.cbproj @@ -1,88 +1,88 @@ - - - - {eea63393-5ac5-4b9c-8909-d75fef2daa41} - Release - - - true - - - true - true - Base - - - true - true - Base - - - exe - true - NO_STRICT - JPHNE - true - ..\test - true - CppConsoleApplication - true - true - rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi - false - $(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;.. - $(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test - true - - - false - false - true - _DEBUG;$(Defines) - true - false - true - None - DEBUG - true - Debug - true - true - true - $(BDS)\lib\debug;$(ILINK_LibraryPath) - Full - true - - - NDEBUG;$(Defines) - Release - $(BDS)\lib\release;$(ILINK_LibraryPath) - None - - - CPlusPlusBuilder.Personality - CppConsoleApplication - -FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse - - - CodeGear C++Builder Office 2000 Servers Package - CodeGear C++Builder Office XP Servers Package - FalseTrueTrue3$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include1$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(OUTPUTDIR);..\test2NO_STRICTSTRICT - - - - - 0 - - - 1 - - - Cfg_1 - - - Cfg_2 - - + + + + {eea63393-5ac5-4b9c-8909-d75fef2daa41} + Release + + + true + + + true + true + Base + + + true + true + Base + + + exe + true + NO_STRICT + JPHNE + true + ..\test + true + CppConsoleApplication + true + true + rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi + false + $(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;.. + $(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test + true + + + false + false + true + _DEBUG;$(Defines) + true + false + true + None + DEBUG + true + Debug + true + true + true + $(BDS)\lib\debug;$(ILINK_LibraryPath) + Full + true + + + NDEBUG;$(Defines) + Release + $(BDS)\lib\release;$(ILINK_LibraryPath) + None + + + CPlusPlusBuilder.Personality + CppConsoleApplication + +FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse + + + CodeGear C++Builder Office 2000 Servers Package + CodeGear C++Builder Office XP Servers Package + FalseTrueTrue3$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include1$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(OUTPUTDIR);..\test2NO_STRICTSTRICT + + + + + 0 + + + 1 + + + Cfg_1 + + + Cfg_2 + + \ No newline at end of file diff --git a/test/gtest-1.8.0/configure.ac b/test/gtest-1.8.0/configure.ac index cc592e1583..254c8c4b31 100644 --- a/test/gtest-1.8.0/configure.ac +++ b/test/gtest-1.8.0/configure.ac @@ -5,7 +5,7 @@ m4_include(m4/acx_pthread.m4) # "[1.0.1]"). It also asumes that there won't be any closing parenthesis # between "AC_INIT(" and the closing ")" including comments and strings. AC_INIT([Google C++ Testing Framework], - [1.7.0], + [1.8.0], [googletestframework@googlegroups.com], [gtest]) diff --git a/test/gtest-1.8.0/docs/AdvancedGuide.md b/test/gtest-1.8.0/docs/AdvancedGuide.md index 93a65200da..c1a1a4abba 100644 --- a/test/gtest-1.8.0/docs/AdvancedGuide.md +++ b/test/gtest-1.8.0/docs/AdvancedGuide.md @@ -15,7 +15,7 @@ assertions. These three assertions do not actually test a value or expression. Instead, they generate a success or failure directly. Like the macros that actually -perform a test, you may stream a custom failure message into the them. +perform a test, you may stream a custom failure message into them. | `SUCCEED();` | |:-------------| @@ -32,7 +32,7 @@ output in the future. `FAIL()` generates a fatal failure, while `ADD_FAILURE()` and `ADD_FAILURE_AT()` generate a nonfatal failure. These are useful when control flow, rather than a Boolean expression, -deteremines the test's success or failure. For example, you might want to write +determines the test's success or failure. For example, you might want to write something like: ``` @@ -128,7 +128,7 @@ c is 10
1. If you see a compiler error "no matching function to call" when using `ASSERT_PRED*` or `EXPECT_PRED*`, please see [this FAQ](FAQ.md#the-compiler-complains-no-matching-function-to-call-when-i-use-assert_predn-how-do-i-fix-it) for how to resolve it. 1. Currently we only provide predicate assertions of arity <= 5. If you need a higher-arity assertion, let us know. -_Availability_: Linux, Windows, Mac +_Availability_: Linux, Windows, Mac. ### Using a Function That Returns an AssertionResult ### @@ -306,7 +306,7 @@ carefully choose the error bound. If they don't want or care to, comparing in terms of Units in the Last Place (ULPs) is a good default, and Google Test provides assertions to do this. Full details about ULPs are quite long; if you want to learn more, see -[this article on float comparison](http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm). +[this article on float comparison](https://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/). ### Floating-Point Macros ### @@ -675,7 +675,7 @@ syntax only. ## How It Works ## Under the hood, `ASSERT_EXIT()` spawns a new process and executes the -death test statement in that process. The details of of how precisely +death test statement in that process. The details of how precisely that happens depend on the platform and the variable `::testing::GTEST_FLAG(death_test_style)` (which is initialized from the command-line flag `--gtest_death_test_style`). @@ -787,15 +787,17 @@ If a test sub-routine is called from several places, when an assertion inside it fails, it can be hard to tell which invocation of the sub-routine the failure is from. You can alleviate this problem using extra logging or custom failure messages, but that usually clutters up -your tests. A better solution is to use the `SCOPED_TRACE` macro: +your tests. A better solution is to use the `SCOPED_TRACE` macro or +the `ScopedTrace` utility: -| `SCOPED_TRACE(`_message_`);` | -|:-----------------------------| +| `SCOPED_TRACE(`_message_`);` | `::testing::ScopedTrace trace(`_"file\_path"_`, `_line\_number_`, `_message_`);` | +|:-----------------------------|:---------------------------------------------------------------------------------| -where _message_ can be anything streamable to `std::ostream`. This -macro will cause the current file name, line number, and the given -message to be added in every failure message. The effect will be -undone when the control leaves the current lexical scope. +where `message` can be anything streamable to `std::ostream`. `SCOPED_TRACE` +macro will cause the current file name, line number, and the given message to be +added in every failure message. `ScopedTrace` accepts explicit file name and +line number in arguments, which is useful for writing test helpers. The effect +will be undone when the control leaves the current lexical scope. For example, @@ -870,13 +872,33 @@ TEST(FooTest, Bar) { } ``` -Since we don't use exceptions, it is technically impossible to -implement the intended behavior here. To alleviate this, Google Test -provides two solutions. You could use either the -`(ASSERT|EXPECT)_NO_FATAL_FAILURE` assertions or the -`HasFatalFailure()` function. They are described in the following two +To alleviate this, gUnit provides three different solutions. You could use +either exceptions, the `(ASSERT|EXPECT)_NO_FATAL_FAILURE` assertions or the +`HasFatalFailure()` function. They are described in the following two subsections. +#### Asserting on Subroutines with an exception + +The following code can turn ASSERT-failure into an exception: + +```c++ +class ThrowListener : public testing::EmptyTestEventListener { + void OnTestPartResult(const testing::TestPartResult& result) override { + if (result.type() == testing::TestPartResult::kFatalFailure) { + throw testing::AssertionException(result); + } + } +}; +int main(int argc, char** argv) { + ... + testing::UnitTest::GetInstance()->listeners().Append(new ThrowListener); + return RUN_ALL_TESTS(); +} +``` + +This listener should be added after other listeners if you have any, otherwise +they won't see failed `OnTestPartResult`. + ### Asserting on Subroutines ### As shown above, if your test calls a subroutine that has an `ASSERT_*` @@ -1263,7 +1285,7 @@ known as abstract tests. As an example of its application, when you are designing an interface you can write a standard suite of abstract tests (perhaps using a factory function as the test parameter) that all implementations of the interface are expected to pass. When -someone implements the interface, he can instantiate your suite to get +someone implements the interface, they can instantiate your suite to get all the interface-conformance tests for free. To define abstract tests, you should organize your code like this: @@ -1344,7 +1366,7 @@ TYPED_TEST(FooTest, DoesBlah) { TYPED_TEST(FooTest, HasPropertyA) { ... } ``` -You can see `samples/sample6_unittest.cc` for a complete example. +You can see [`samples/sample6_unittest.cc`](../samples/sample6_unittest.cc) for a complete example. _Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac; since version 1.1.0. @@ -1444,7 +1466,7 @@ absolutely have to test non-public interface code though, you can. There are two cases to consider: * Static functions (_not_ the same as static member functions!) or unnamed namespaces, and - * Private or protected class members + * Private or protected class members. ## Static Functions ## @@ -1551,7 +1573,7 @@ exception, you could catch the exception and assert on it. But Google Test doesn't use exceptions, so how do we test that a piece of code generates an expected failure? -`"gtest/gtest-spi.h"` contains some constructs to do this. After +`"gtest/gtest-spi.h"` contains some constructs to do this. After `#include`ing this header, you can use | `EXPECT_FATAL_FAILURE(`_statement, substring_`);` | @@ -1623,8 +1645,8 @@ printf("We are in test %s of test case %s.\n", ``` `current_test_info()` returns a null pointer if no test is running. In -particular, you cannot find the test case name in `TestCaseSetUp()`, -`TestCaseTearDown()` (where you know the test case name implicitly), or +particular, you cannot find the test case name in `SetUpTestCase()`, +`TearDownTestCase()` (where you know the test case name implicitly), or functions called from them. _Availability:_ Linux, Windows, Mac. @@ -1949,6 +1971,17 @@ variable to `0` has the same effect. _Availability:_ Linux, Windows, Mac. (In Google Test 1.3.0 and lower, the default behavior is that the elapsed time is **not** printed.) +**Availability**: Linux, Windows, Mac. + +#### Suppressing UTF-8 Text Output + +In case of assertion failures, gUnit prints expected and actual values of type +`string` both as hex-encoded strings as well as in readable UTF-8 text if they +contain valid non-ASCII UTF-8 characters. If you want to suppress the UTF-8 text +because, for example, you don't have an UTF-8 compatible output medium, run the +test program with `--gunit_print_utf8=0` or set the `GUNIT_PRINT_UTF8` +environment variable to `0`. + ### Generating an XML Report ### Google Test can emit a detailed XML report to a file in addition to its normal @@ -2027,6 +2060,207 @@ Things to note: _Availability:_ Linux, Windows, Mac. +#### Generating an JSON Report {#JsonReport} + +gUnit can also emit a JSON report as an alternative format to XML. To generate +the JSON report, set the `GUNIT_OUTPUT` environment variable or the +`--gunit_output` flag to the string `"json:path_to_output_file"`, which will +create the file at the given location. You can also just use the string +`"json"`, in which case the output can be found in the `test_detail.json` file +in the current directory. + +The report format conforms to the following JSON Schema: + +```json +{ + "$schema": "http://json-schema.org/schema#", + "type": "object", + "definitions": { + "TestCase": { + "type": "object", + "properties": { + "name": { "type": "string" }, + "tests": { "type": "integer" }, + "failures": { "type": "integer" }, + "disabled": { "type": "integer" }, + "time": { "type": "string" }, + "testsuite": { + "type": "array", + "items": { + "$ref": "#/definitions/TestInfo" + } + } + } + }, + "TestInfo": { + "type": "object", + "properties": { + "name": { "type": "string" }, + "status": { + "type": "string", + "enum": ["RUN", "NOTRUN"] + }, + "time": { "type": "string" }, + "classname": { "type": "string" }, + "failures": { + "type": "array", + "items": { + "$ref": "#/definitions/Failure" + } + } + } + }, + "Failure": { + "type": "object", + "properties": { + "failures": { "type": "string" }, + "type": { "type": "string" } + } + } + }, + "properties": { + "tests": { "type": "integer" }, + "failures": { "type": "integer" }, + "disabled": { "type": "integer" }, + "errors": { "type": "integer" }, + "timestamp": { + "type": "string", + "format": "date-time" + }, + "time": { "type": "string" }, + "name": { "type": "string" }, + "testsuites": { + "type": "array", + "items": { + "$ref": "#/definitions/TestCase" + } + } + } +} +``` + +The report uses the format that conforms to the following Proto3 using the +[JSON encoding](https://developers.google.com/protocol-buffers/docs/proto3#json): + +```proto +syntax = "proto3"; + +package googletest; + +import "google/protobuf/timestamp.proto"; +import "google/protobuf/duration.proto"; + +message UnitTest { + int32 tests = 1; + int32 failures = 2; + int32 disabled = 3; + int32 errors = 4; + google.protobuf.Timestamp timestamp = 5; + google.protobuf.Duration time = 6; + string name = 7; + repeated TestCase testsuites = 8; +} + +message TestCase { + string name = 1; + int32 tests = 2; + int32 failures = 3; + int32 disabled = 4; + int32 errors = 5; + google.protobuf.Duration time = 6; + repeated TestInfo testsuite = 7; +} + +message TestInfo { + string name = 1; + enum Status { + RUN = 0; + NOTRUN = 1; + } + Status status = 2; + google.protobuf.Duration time = 3; + string classname = 4; + message Failure { + string failures = 1; + string type = 2; + } + repeated Failure failures = 5; +} +``` + +For instance, the following program + +```c++ +TEST(MathTest, Addition) { ... } +TEST(MathTest, Subtraction) { ... } +TEST(LogicTest, NonContradiction) { ... } +``` + +could generate this report: + +```json +{ + "tests": 3, + "failures": 1, + "errors": 0, + "time": "0.035s", + "timestamp": "2011-10-31T18:52:42Z" + "name": "AllTests", + "testsuites": [ + { + "name": "MathTest", + "tests": 2, + "failures": 1, + "errors": 0, + "time": "0.015s", + "testsuite": [ + { + "name": "Addition", + "status": "RUN", + "time": "0.007s", + "classname": "", + "failures": [ + { + "message": "Value of: add(1, 1)\x0A Actual: 3\x0AExpected: 2", + "type": "" + }, + { + "message": "Value of: add(1, -1)\x0A Actual: 1\x0AExpected: 0", + "type": "" + } + ] + }, + { + "name": "Subtraction", + "status": "RUN", + "time": "0.005s", + "classname": "" + } + ] + } + { + "name": "LogicTest", + "tests": 1, + "failures": 0, + "errors": 0, + "time": "0.005s", + "testsuite": [ + { + "name": "NonContradiction", + "status": "RUN", + "time": "0.005s", + "classname": "" + } + ] + } + ] +} +``` + +IMPORTANT: The exact format of the JSON document is subject to change. + +**Availability**: Linux, Windows, Mac. + ## Controlling How Failures Are Reported ## ### Turning Assertion Failures into Break-Points ### diff --git a/test/gtest-1.8.0/docs/DevGuide.md b/test/gtest-1.8.0/docs/DevGuide.md deleted file mode 100644 index 06467a3277..0000000000 --- a/test/gtest-1.8.0/docs/DevGuide.md +++ /dev/null @@ -1,126 +0,0 @@ - - -If you are interested in understanding the internals of Google Test, -building from source, or contributing ideas or modifications to the -project, then this document is for you. - -# Introduction # - -First, let's give you some background of the project. - -## Licensing ## - -All Google Test source and pre-built packages are provided under the [New BSD License](http://www.opensource.org/licenses/bsd-license.php). - -## The Google Test Community ## - -The Google Test community exists primarily through the [discussion group](http://groups.google.com/group/googletestframework) and the GitHub repository. -You are definitely encouraged to contribute to the -discussion and you can also help us to keep the effectiveness of the -group high by following and promoting the guidelines listed here. - -### Please Be Friendly ### - -Showing courtesy and respect to others is a vital part of the Google -culture, and we strongly encourage everyone participating in Google -Test development to join us in accepting nothing less. Of course, -being courteous is not the same as failing to constructively disagree -with each other, but it does mean that we should be respectful of each -other when enumerating the 42 technical reasons that a particular -proposal may not be the best choice. There's never a reason to be -antagonistic or dismissive toward anyone who is sincerely trying to -contribute to a discussion. - -Sure, C++ testing is serious business and all that, but it's also -a lot of fun. Let's keep it that way. Let's strive to be one of the -friendliest communities in all of open source. - -As always, discuss Google Test in the official GoogleTest discussion group. -You don't have to actually submit code in order to sign up. Your participation -itself is a valuable contribution. - -# Working with the Code # - -If you want to get your hands dirty with the code inside Google Test, -this is the section for you. - -## Compiling from Source ## - -Once you check out the code, you can find instructions on how to -compile it in the [README](../README.md) file. - -## Testing ## - -A testing framework is of no good if itself is not thoroughly tested. -Tests should be written for any new code, and changes should be -verified to not break existing tests before they are submitted for -review. To perform the tests, follow the instructions in -[README](../README.md) and verify that there are no failures. - -# Contributing Code # - -We are excited that Google Test is now open source, and hope to get -great patches from the community. Before you fire up your favorite IDE -and begin hammering away at that new feature, though, please take the -time to read this section and understand the process. While it seems -rigorous, we want to keep a high standard of quality in the code -base. - -## Contributor License Agreements ## - -You must sign a Contributor License Agreement (CLA) before we can -accept any code. The CLA protects you and us. - - * If you are an individual writing original source code and you're sure you own the intellectual property, then you'll need to sign an [individual CLA](http://code.google.com/legal/individual-cla-v1.0.html). - * If you work for a company that wants to allow you to contribute your work to Google Test, then you'll need to sign a [corporate CLA](http://code.google.com/legal/corporate-cla-v1.0.html). - -Follow either of the two links above to access the appropriate CLA and -instructions for how to sign and return it. - -## Coding Style ## - -To keep the source consistent, readable, diffable and easy to merge, -we use a fairly rigid coding style, as defined by the [google-styleguide](http://code.google.com/p/google-styleguide/) project. All patches will be expected -to conform to the style outlined [here](http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml). - -## Updating Generated Code ## - -Some of Google Test's source files are generated by the Pump tool (a -Python script). If you need to update such files, please modify the -source (`foo.h.pump`) and re-generate the C++ file using Pump. You -can read the PumpManual for details. - -## Submitting Patches ## - -Please do submit code. Here's what you need to do: - - 1. A submission should be a set of changes that addresses one issue in the [issue tracker](https://github.com/google/googletest/issues). Please don't mix more than one logical change per submittal, because it makes the history hard to follow. If you want to make a change that doesn't have a corresponding issue in the issue tracker, please create one. - 1. Also, coordinate with team members that are listed on the issue in question. This ensures that work isn't being duplicated and communicating your plan early also generally leads to better patches. - 1. Ensure that your code adheres to the [Google Test source code style](#Coding_Style.md). - 1. Ensure that there are unit tests for your code. - 1. Sign a Contributor License Agreement. - 1. Create a Pull Request in the usual way. - -## Google Test Committers ## - -The current members of the Google Test engineering team are the only -committers at present. In the great tradition of eating one's own -dogfood, we will be requiring each new Google Test engineering team -member to earn the right to become a committer by following the -procedures in this document, writing consistently great code, and -demonstrating repeatedly that he or she truly gets the zen of Google -Test. - -# Release Process # - -We follow a typical release process: - - 1. A release branch named `release-X.Y` is created. - 1. Bugs are fixed and features are added in trunk; those individual patches are merged into the release branch until it's stable. - 1. An individual point release (the `Z` in `X.Y.Z`) is made by creating a tag from the branch. - 1. Repeat steps 2 and 3 throughout one release cycle (as determined by features or time). - 1. Go back to step 1 to create another release branch and so on. - ---- - -This page is based on the [Making GWT Better](http://code.google.com/webtoolkit/makinggwtbetter.html) guide from the [Google Web Toolkit](http://code.google.com/webtoolkit/) project. Except as otherwise [noted](http://code.google.com/policies.html#restrictions), the content of this page is licensed under the [Creative Commons Attribution 2.5 License](http://creativecommons.org/licenses/by/2.5/). diff --git a/test/gtest-1.8.0/docs/Documentation.md b/test/gtest-1.8.0/docs/Documentation.md index 8ca1aac759..20f250399e 100644 --- a/test/gtest-1.8.0/docs/Documentation.md +++ b/test/gtest-1.8.0/docs/Documentation.md @@ -1,6 +1,8 @@ -This page lists all documentation wiki pages for Google Test **(the SVN trunk version)** --- **if you use a released version of Google Test, please read the -documentation for that specific version instead.** +This page lists all documentation markdown files for Google Test **(the +current git version)** +-- **if you use a former version of Google Test, please read the +documentation for that specific version instead (e.g. by checking out +the respective git branch/tag).** * [Primer](Primer.md) -- start here if you are new to Google Test. * [Samples](Samples.md) -- learn from examples. @@ -10,5 +12,5 @@ documentation for that specific version instead.** To contribute code to Google Test, read: - * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch. - * [PumpManual](PumpManual.md) -- how we generate some of Google Test's source files. \ No newline at end of file + * [CONTRIBUTING](../../CONTRIBUTING.md) -- read this _before_ writing your first patch. + * [PumpManual](PumpManual.md) -- how we generate some of Google Test's source files. diff --git a/test/gtest-1.8.0/docs/FAQ.md b/test/gtest-1.8.0/docs/FAQ.md index 5fd6cb7238..bd9526de21 100644 --- a/test/gtest-1.8.0/docs/FAQ.md +++ b/test/gtest-1.8.0/docs/FAQ.md @@ -54,7 +54,7 @@ Underscore (`_`) is special, as C++ reserves the following to be used by the compiler and the standard library: 1. any identifier that starts with an `_` followed by an upper-case letter, and - 1. any identifier that containers two consecutive underscores (i.e. `__`) _anywhere_ in its name. + 1. any identifier that contains two consecutive underscores (i.e. `__`) _anywhere_ in its name. User code is _prohibited_ from using such identifiers. @@ -102,9 +102,9 @@ Then every user of your machine can write tests without recompiling Google Test. This seemed like a good idea, but it has a -got-cha: every user needs to compile his tests using the _same_ compiler +got-cha: every user needs to compile their tests using the _same_ compiler flags used to compile the installed Google Test libraries; otherwise -he may run into undefined behaviors (i.e. the tests can behave +they may run into undefined behaviors (i.e. the tests can behave strangely and may even crash for no obvious reasons). Why? Because C++ has this thing called the One-Definition Rule: if @@ -460,7 +460,7 @@ following benefits: You may still want to use `SetUp()/TearDown()` in the following rare cases: * If the tear-down operation could throw an exception, you must use `TearDown()` as opposed to the destructor, as throwing in a destructor leads to undefined behavior and usually will kill your program right away. Note that many standard libraries (like STL) may throw when exceptions are enabled in the compiler. Therefore you should prefer `TearDown()` if you want to write portable tests that work with or without exceptions. * The assertion macros throw an exception when flag `--gtest_throw_on_failure` is specified. Therefore, you shouldn't use Google Test assertions in a destructor if you plan to run your tests with this flag. - * In a constructor or destructor, you cannot make a virtual function call on this object. (You can call a method declared as virtual, but it will be statically bound.) Therefore, if you need to call a method that will be overriden in a derived class, you have to use `SetUp()/TearDown()`. + * In a constructor or destructor, you cannot make a virtual function call on this object. (You can call a method declared as virtual, but it will be statically bound.) Therefore, if you need to call a method that will be overridden in a derived class, you have to use `SetUp()/TearDown()`. ## The compiler complains "no matching function to call" when I use ASSERT\_PREDn. How do I fix it? ## @@ -494,7 +494,7 @@ EXPECT_PRED1(IsPositive, 5); However, this will work: ``` cpp -EXPECT_PRED1(*static_cast*(IsPositive), 5); +EXPECT_PRED1(static_cast(IsPositive), 5); ``` (The stuff inside the angled brackets for the `static_cast` operator is the @@ -512,14 +512,14 @@ bool IsNegative(T x) { you can use it in a predicate assertion like this: ``` cpp -ASSERT_PRED1(IsNegative**, -5); +ASSERT_PRED1(IsNegative, -5); ``` Things are more interesting if your template has more than one parameters. The following won't compile: ``` cpp -ASSERT_PRED2(*GreaterThan*, 5, 0); +ASSERT_PRED2(GreaterThan, 5, 0); ``` @@ -528,7 +528,7 @@ which is one more than expected. The workaround is to wrap the predicate function in parentheses: ``` cpp -ASSERT_PRED2(*(GreaterThan)*, 5, 0); +ASSERT_PRED2((GreaterThan), 5, 0); ``` @@ -960,12 +960,11 @@ Have you read a the Google Test Primer page? ## I want to use Google Test with Visual Studio but don't know where to start. ## -Many people are in your position and one of the posted his solution to -our mailing list. +Many people are in your position and one of them posted his solution to our mailing list. ## I am seeing compile errors mentioning std::type\_traits when I try to use Google Test on Solaris. ## Google Test uses parts of the standard C++ library that SunStudio does not support. -Our users reported success using alternative implementations. Try running the build after runing this commad: +Our users reported success using alternative implementations. Try running the build after running this command: `export CC=cc CXX=CC CXXFLAGS='-library=stlport4'` @@ -1015,7 +1014,7 @@ instead of ``` in order to define a test. -Currently, the following `TEST`, `FAIL`, `SUCCEED`, and the basic comparison assertion macros can have alternative names. You can see the full list of covered macros [here](http://www.google.com/codesearch?q=if+!GTEST_DONT_DEFINE_\w%2B+package:http://googletest\.googlecode\.com+file:/include/gtest/gtest.h). More information can be found in the "Avoiding Macro Name Clashes" section of the README file. +Currently, the following `TEST`, `FAIL`, `SUCCEED`, and the basic comparison assertion macros can have . You can see the full list of covered macros [here](../include/gtest/gtest.h). More information can be found in the "Avoiding Macro Name Clashes" section of the README file. ## Is it OK if I have two separate `TEST(Foo, Bar)` test methods defined in different namespaces? ## @@ -1035,7 +1034,7 @@ namespace bar { TEST(CoolTest, DoSomething) { SUCCEED(); } -} // namespace foo +} // namespace bar ``` However, the following code is **not allowed** and will produce a runtime error from Google Test because the test methods are using different test fixture classes with the same test case name. @@ -1053,7 +1052,7 @@ class CoolTest : public ::testing::Test {}; // Fixture: bar::CoolTest TEST_F(CoolTest, DoSomething) { SUCCEED(); } -} // namespace foo +} // namespace bar ``` ## How do I build Google Testing Framework with Xcode 4? ## @@ -1061,6 +1060,12 @@ TEST_F(CoolTest, DoSomething) { If you try to build Google Test's Xcode project with Xcode 4.0 or later, you may encounter an error message that looks like "Missing SDK in target gtest\_framework: /Developer/SDKs/MacOSX10.4u.sdk". That means that Xcode does not support the SDK the project is targeting. See the Xcode section in the [README](../README.md) file on how to resolve this. +## How do I easily discover the flags needed for GoogleTest? ## + +GoogleTest (and GoogleMock) now support discovering all necessary flags using pkg-config. +See the [pkg-config guide](Pkgconfig.md) on how you can easily discover all compiler and +linker flags using pkg-config. + ## My question is not covered in your FAQ! ## If you cannot find the answer to your question in this FAQ, there are diff --git a/test/gtest-1.8.0/docs/Pkgconfig.md b/test/gtest-1.8.0/docs/Pkgconfig.md new file mode 100644 index 0000000000..97612894d2 --- /dev/null +++ b/test/gtest-1.8.0/docs/Pkgconfig.md @@ -0,0 +1,146 @@ +## Using GoogleTest from various build systems ## + +GoogleTest comes with pkg-config files that can be used to determine all +necessary flags for compiling and linking to GoogleTest (and GoogleMock). +Pkg-config is a standardised plain-text format containing + + * the includedir (-I) path + * necessary macro (-D) definitions + * further required flags (-pthread) + * the library (-L) path + * the library (-l) to link to + +All current build systems support pkg-config in one way or another. For +all examples here we assume you want to compile the sample +`samples/sample3_unittest.cc`. + + +### CMake ### + +Using `pkg-config` in CMake is fairly easy: + +``` +cmake_minimum_required(VERSION 3.0) + +cmake_policy(SET CMP0048 NEW) +project(my_gtest_pkgconfig VERSION 0.0.1 LANGUAGES CXX) + +find_package(PkgConfig) +pkg_search_module(GTEST REQUIRED gtest_main) + +add_executable(testapp samples/sample3_unittest.cc) +target_link_libraries(testapp ${GTEST_LDFLAGS}) +target_compile_options(testapp PUBLIC ${GTEST_CFLAGS}) + +include(CTest) +add_test(first_and_only_test testapp) +``` + +It is generally recommended that you use `target_compile_options` + `_CFLAGS` +over `target_include_directories` + `_INCLUDE_DIRS` as the former includes not +just -I flags (GoogleTest might require a macro indicating to internal headers +that all libraries have been compiled with threading enabled. In addition, +GoogleTest might also require `-pthread` in the compiling step, and as such +splitting the pkg-config `Cflags` variable into include dirs and macros for +`target_compile_definitions()` might still miss this). The same recommendation +goes for using `_LDFLAGS` over the more commonplace `_LIBRARIES`, which +happens to discard `-L` flags and `-pthread`. + + +### Autotools ### + +Finding GoogleTest in Autoconf and using it from Automake is also fairly easy: + +In your `configure.ac`: + +``` +AC_PREREQ([2.69]) +AC_INIT([my_gtest_pkgconfig], [0.0.1]) +AC_CONFIG_SRCDIR([samples/sample3_unittest.cc]) +AC_PROG_CXX + +PKG_CHECK_MODULES([GTEST], [gtest_main]) + +AM_INIT_AUTOMAKE([foreign subdir-objects]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT +``` + +and in your `Makefile.am`: + +``` +check_PROGRAMS = testapp +TESTS = $(check_PROGRAMS) + +testapp_SOURCES = samples/sample3_unittest.cc +testapp_CXXFLAGS = $(GTEST_CFLAGS) +testapp_LDADD = $(GTEST_LIBS) +``` + + +### Meson ### + +Meson natively uses pkgconfig to query dependencies: + +``` +project('my_gtest_pkgconfig', 'cpp', version : '0.0.1') + +gtest_dep = dependency('gtest_main') + +testapp = executable( + 'testapp', + files(['samples/sample3_unittest.cc']), + dependencies : gtest_dep, + install : false) + +test('first_and_only_test', testapp) +``` + + +### Plain Makefiles ### + +Since `pkg-config` is a small Unix command-line utility, it can be used +in handwritten `Makefile`s too: + +``` +GTEST_CFLAGS = `pkg-config --cflags gtest_main` +GTEST_LIBS = `pkg-config --libs gtest_main` + +.PHONY: tests all + +tests: all + ./testapp + +all: testapp + +testapp: testapp.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) $< -o $@ $(GTEST_LIBS) + +testapp.o: samples/sample3_unittest.cc + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $< -c -o $@ $(GTEST_CFLAGS) +``` + + +### Help! pkg-config can't find GoogleTest! ### + +Let's say you have a `CMakeLists.txt` along the lines of the one in this +tutorial and you try to run `cmake`. It is very possible that you get a +failure along the lines of: + +``` +-- Checking for one of the modules 'gtest_main' +CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:640 (message): + None of the required 'gtest_main' found +``` + +These failures are common if you installed GoogleTest yourself and have not +sourced it from a distro or other package manager. If so, you need to tell +pkg-config where it can find the `.pc` files containing the information. +Say you installed GoogleTest to `/usr/local`, then it might be that the +`.pc` files are installed under `/usr/local/lib64/pkgconfig`. If you set + +``` +export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig +``` + +pkg-config will also try to look in `PKG_CONFIG_PATH` to find `gtest_main.pc`. diff --git a/test/gtest-1.8.0/docs/Primer.md b/test/gtest-1.8.0/docs/Primer.md index 474c1d2ab6..5e8ee0c697 100644 --- a/test/gtest-1.8.0/docs/Primer.md +++ b/test/gtest-1.8.0/docs/Primer.md @@ -23,6 +23,40 @@ So let's go! _Note:_ We sometimes refer to Google C++ Testing Framework informally as _Google Test_. +# Beware of the nomenclature # + +_Note:_ There might be some confusion of idea due to different +definitions of the terms _Test_, _Test Case_ and _Test Suite_, so beware +of misunderstanding these. + +Historically, the Google C++ Testing Framework started to use the term +_Test Case_ for grouping related tests, whereas current publications +including the International Software Testing Qualifications Board +([ISTQB](http://www.istqb.org/)) and various textbooks on Software +Quality use the term _[Test +Suite](http://glossary.istqb.org/search/test%20suite)_ for this. + +The related term _Test_, as it is used in the Google C++ Testing +Framework, is corresponding to the term _[Test +Case](http://glossary.istqb.org/search/test%20case)_ of ISTQB and +others. + +The term _Test_ is commonly of broad enough sense, including ISTQB's +definition of _Test Case_, so it's not much of a problem here. But the +term _Test Case_ as used in Google Test is of contradictory sense and thus confusing. + +Unfortunately replacing the term _Test Case_ by _Test Suite_ throughout +the Google C++ Testing Framework is not easy without breaking dependent +projects, as `TestCase` is part of the public API at various places. + +So for the time being, please be aware of the different definitions of +the terms: + +Meaning | Google Test Term | [ISTQB](http://www.istqb.org/) Term +------- | ---------------- | ----------------------------------- +Exercise a particular program path with specific input values and verify the results | [TEST()](#simple-tests) | [Test Case](http://glossary.istqb.org/search/test%20case) +A set of several tests related to one component | [Test Case](#basic-concepts) | [Test Suite](http://glossary.istqb.org/search/test%20suite) + # Setting up a New Test Project # To write a test program using Google Test, you need to compile Google @@ -179,7 +213,7 @@ two `string` objects, use `EXPECT_EQ`, `EXPECT_NE`, and etc instead. | **Fatal assertion** | **Nonfatal assertion** | **Verifies** | |:--------------------|:-----------------------|:-------------| -| `ASSERT_STREQ(`_str1_`, `_str2_`);` | `EXPECT_STREQ(`_str1_`, `_str_2`);` | the two C strings have the same content | +| `ASSERT_STREQ(`_str1_`, `_str2_`);` | `EXPECT_STREQ(`_str1_`, `_str2_`);` | the two C strings have the same content | | `ASSERT_STRNE(`_str1_`, `_str2_`);` | `EXPECT_STRNE(`_str1_`, `_str2_`);` | the two C strings have different content | | `ASSERT_STRCASEEQ(`_str1_`, `_str2_`);`| `EXPECT_STRCASEEQ(`_str1_`, `_str2_`);` | the two C strings have the same content, ignoring case | | `ASSERT_STRCASENE(`_str1_`, `_str2_`);`| `EXPECT_STRCASENE(`_str1_`, `_str2_`);` | the two C strings have different content, ignoring case | @@ -205,7 +239,7 @@ To create a test: 1. The test's result is determined by the assertions; if any assertion in the test fails (either fatally or non-fatally), or if the test crashes, the entire test fails. Otherwise, it succeeds. ``` -TEST(test_case_name, test_name) { +TEST(testCaseName, testName) { ... test body ... } ``` @@ -281,7 +315,7 @@ declaration`". For each test defined with `TEST_F()`, Google Test will: 1. Create a _fresh_ test fixture at runtime - 1. Immediately initialize it via `SetUp()` , + 1. Immediately initialize it via `SetUp()` 1. Run the test 1. Clean up by calling `TearDown()` 1. Delete the test fixture. Note that different tests in the same test case have different test fixture objects, and Google Test always deletes a test fixture before it creates the next one. Google Test does not reuse the same test fixture for multiple tests. Any changes one test makes to the fixture do not affect other tests. @@ -382,7 +416,7 @@ When invoked, the `RUN_ALL_TESTS()` macro: 1. Restores the state of all Google Test flags. 1. Repeats the above steps for the next test, until all tests have run. -In addition, if the text fixture's constructor generates a fatal failure in +In addition, if the test fixture's constructor generates a fatal failure in step 2, there is no point for step 3 - 5 and they are thus skipped. Similarly, if step 3 generates a fatal failure, step 4 will be skipped. diff --git a/test/gtest-1.8.0/docs/PumpManual.md b/test/gtest-1.8.0/docs/PumpManual.md index 8184f153ca..827bb24b04 100644 --- a/test/gtest-1.8.0/docs/PumpManual.md +++ b/test/gtest-1.8.0/docs/PumpManual.md @@ -40,7 +40,7 @@ maintain. ## Highlights ## * The implementation is in a single Python script and thus ultra portable: no build or installation is needed and it works cross platforms. - * Pump tries to be smart with respect to [Google's style guide](http://code.google.com/p/google-styleguide/): it breaks long lines (easy to have when they are generated) at acceptable places to fit within 80 columns and indent the continuation lines correctly. + * Pump tries to be smart with respect to [Google's style guide](https://github.com/google/styleguide): it breaks long lines (easy to have when they are generated) at acceptable places to fit within 80 columns and indent the continuation lines correctly. * The format is human-readable and more concise than XML. * The format works relatively well with Emacs' C++ mode. @@ -169,7 +169,7 @@ improving Pump. ## Real Examples ## -You can find real-world applications of Pump in [Google Test](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgoogletest\.googlecode\.com) and [Google Mock](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgooglemock\.googlecode\.com). The source file `foo.h.pump` generates `foo.h`. +You can find real-world applications of Pump in [Google Test](https://github.com/google/googletest/tree/master/googletest) and [Google Mock](https://github.com/google/googletest/tree/master/googlemock). The source file `foo.h.pump` generates `foo.h`. ## Tips ## diff --git a/test/gtest-1.8.0/docs/V1_5_AdvancedGuide.md b/test/gtest-1.8.0/docs/V1_5_AdvancedGuide.md deleted file mode 100644 index 34e19c26fd..0000000000 --- a/test/gtest-1.8.0/docs/V1_5_AdvancedGuide.md +++ /dev/null @@ -1,2096 +0,0 @@ - - -Now that you have read [Primer](V1_5_Primer.md) and learned how to write tests -using Google Test, it's time to learn some new tricks. This document -will show you more assertions as well as how to construct complex -failure messages, propagate fatal failures, reuse and speed up your -test fixtures, and use various flags with your tests. - -# More Assertions # - -This section covers some less frequently used, but still significant, -assertions. - -## Explicit Success and Failure ## - -These three assertions do not actually test a value or expression. Instead, -they generate a success or failure directly. Like the macros that actually -perform a test, you may stream a custom failure message into the them. - -| `SUCCEED();` | -|:-------------| - -Generates a success. This does NOT make the overall test succeed. A test is -considered successful only if none of its assertions fail during its execution. - -Note: `SUCCEED()` is purely documentary and currently doesn't generate any -user-visible output. However, we may add `SUCCEED()` messages to Google Test's -output in the future. - -| `FAIL();` | `ADD_FAILURE();` | -|:-----------|:-----------------| - -`FAIL*` generates a fatal failure while `ADD_FAILURE*` generates a nonfatal -failure. These are useful when control flow, rather than a Boolean expression, -deteremines the test's success or failure. For example, you might want to write -something like: - -``` -switch(expression) { - case 1: ... some checks ... - case 2: ... some other checks - ... - default: FAIL() << "We shouldn't get here."; -} -``` - -_Availability_: Linux, Windows, Mac. - -## Exception Assertions ## - -These are for verifying that a piece of code throws (or does not -throw) an exception of the given type: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_THROW(`_statement_, _exception\_type_`);` | `EXPECT_THROW(`_statement_, _exception\_type_`);` | _statement_ throws an exception of the given type | -| `ASSERT_ANY_THROW(`_statement_`);` | `EXPECT_ANY_THROW(`_statement_`);` | _statement_ throws an exception of any type | -| `ASSERT_NO_THROW(`_statement_`);` | `EXPECT_NO_THROW(`_statement_`);` | _statement_ doesn't throw any exception | - -Examples: - -``` -ASSERT_THROW(Foo(5), bar_exception); - -EXPECT_NO_THROW({ - int n = 5; - Bar(&n); -}); -``` - -_Availability_: Linux, Windows, Mac; since version 1.1.0. - -## Predicate Assertions for Better Error Messages ## - -Even though Google Test has a rich set of assertions, they can never be -complete, as it's impossible (nor a good idea) to anticipate all the scenarios -a user might run into. Therefore, sometimes a user has to use `EXPECT_TRUE()` -to check a complex expression, for lack of a better macro. This has the problem -of not showing you the values of the parts of the expression, making it hard to -understand what went wrong. As a workaround, some users choose to construct the -failure message by themselves, streaming it into `EXPECT_TRUE()`. However, this -is awkward especially when the expression has side-effects or is expensive to -evaluate. - -Google Test gives you three different options to solve this problem: - -### Using an Existing Boolean Function ### - -If you already have a function or a functor that returns `bool` (or a type -that can be implicitly converted to `bool`), you can use it in a _predicate -assertion_ to get the function arguments printed for free: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_PRED1(`_pred1, val1_`);` | `EXPECT_PRED1(`_pred1, val1_`);` | _pred1(val1)_ returns true | -| `ASSERT_PRED2(`_pred2, val1, val2_`);` | `EXPECT_PRED2(`_pred2, val1, val2_`);` | _pred2(val1, val2)_ returns true | -| ... | ... | ... | - -In the above, _predn_ is an _n_-ary predicate function or functor, where -_val1_, _val2_, ..., and _valn_ are its arguments. The assertion succeeds -if the predicate returns `true` when applied to the given arguments, and fails -otherwise. When the assertion fails, it prints the value of each argument. In -either case, the arguments are evaluated exactly once. - -Here's an example. Given - -``` -// Returns true iff m and n have no common divisors except 1. -bool MutuallyPrime(int m, int n) { ... } -const int a = 3; -const int b = 4; -const int c = 10; -``` - -the assertion `EXPECT_PRED2(MutuallyPrime, a, b);` will succeed, while the -assertion `EXPECT_PRED2(MutuallyPrime, b, c);` will fail with the message - -
-!MutuallyPrime(b, c) is false, where

-b is 4

-c is 10

-
- -**Notes:** - - 1. If you see a compiler error "no matching function to call" when using `ASSERT_PRED*` or `EXPECT_PRED*`, please see [this](V1_5_FAQ.md#the-compiler-complains-about-undefined-references-to-some-static-const-member-variables-but-i-did-define-them-in-the-class-body-whats-wrong) for how to resolve it. - 1. Currently we only provide predicate assertions of arity <= 5. If you need a higher-arity assertion, let us know. - -_Availability_: Linux, Windows, Mac - -### Using a Function That Returns an AssertionResult ### - -While `EXPECT_PRED*()` and friends are handy for a quick job, the -syntax is not satisfactory: you have to use different macros for -different arities, and it feels more like Lisp than C++. The -`::testing::AssertionResult` class solves this problem. - -An `AssertionResult` object represents the result of an assertion -(whether it's a success or a failure, and an associated message). You -can create an `AssertionResult` using one of these factory -functions: - -``` -namespace testing { - -// Returns an AssertionResult object to indicate that an assertion has -// succeeded. -AssertionResult AssertionSuccess(); - -// Returns an AssertionResult object to indicate that an assertion has -// failed. -AssertionResult AssertionFailure(); - -} -``` - -You can then use the `<<` operator to stream messages to the -`AssertionResult` object. - -To provide more readable messages in Boolean assertions -(e.g. `EXPECT_TRUE()`), write a predicate function that returns -`AssertionResult` instead of `bool`. For example, if you define -`IsEven()` as: - -``` -::testing::AssertionResult IsEven(int n) { - if ((n % 2) == 0) - return ::testing::AssertionSuccess(); - else - return ::testing::AssertionFailure() << n << " is odd"; -} -``` - -instead of: - -``` -bool IsEven(int n) { - return (n % 2) == 0; -} -``` - -the failed assertion `EXPECT_TRUE(IsEven(Fib(4)))` will print: - -
-Value of: !IsEven(Fib(4))

-Actual: false (*3 is odd*)

-Expected: true

-
- -instead of a more opaque - -
-Value of: !IsEven(Fib(4))

-Actual: false

-Expected: true

-
- -If you want informative messages in `EXPECT_FALSE` and `ASSERT_FALSE` -as well, and are fine with making the predicate slower in the success -case, you can supply a success message: - -``` -::testing::AssertionResult IsEven(int n) { - if ((n % 2) == 0) - return ::testing::AssertionSuccess() << n << " is even"; - else - return ::testing::AssertionFailure() << n << " is odd"; -} -``` - -Then the statement `EXPECT_FALSE(IsEven(Fib(6)))` will print - -
-Value of: !IsEven(Fib(6))

-Actual: true (8 is even)

-Expected: false

-
- -_Availability_: Linux, Windows, Mac; since version 1.4.1. - -### Using a Predicate-Formatter ### - -If you find the default message generated by `(ASSERT|EXPECT)_PRED*` and -`(ASSERT|EXPECT)_(TRUE|FALSE)` unsatisfactory, or some arguments to your -predicate do not support streaming to `ostream`, you can instead use the -following _predicate-formatter assertions_ to _fully_ customize how the -message is formatted: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_PRED_FORMAT1(`_pred\_format1, val1_`);` | `EXPECT_PRED_FORMAT1(`_pred\_format1, val1_`); | _pred\_format1(val1)_ is successful | -| `ASSERT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | `EXPECT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | _pred\_format2(val1, val2)_ is successful | -| `...` | `...` | `...` | - -The difference between this and the previous two groups of macros is that instead of -a predicate, `(ASSERT|EXPECT)_PRED_FORMAT*` take a _predicate-formatter_ -(_pred\_formatn_), which is a function or functor with the signature: - -`::testing::AssertionResult PredicateFormattern(const char* `_expr1_`, const char* `_expr2_`, ... const char* `_exprn_`, T1 `_val1_`, T2 `_val2_`, ... Tn `_valn_`);` - -where _val1_, _val2_, ..., and _valn_ are the values of the predicate -arguments, and _expr1_, _expr2_, ..., and _exprn_ are the corresponding -expressions as they appear in the source code. The types `T1`, `T2`, ..., and -`Tn` can be either value types or reference types. For example, if an -argument has type `Foo`, you can declare it as either `Foo` or `const Foo&`, -whichever is appropriate. - -A predicate-formatter returns a `::testing::AssertionResult` object to indicate -whether the assertion has succeeded or not. The only way to create such an -object is to call one of these factory functions: - -As an example, let's improve the failure message in the previous example, which uses `EXPECT_PRED2()`: - -``` -// Returns the smallest prime common divisor of m and n, -// or 1 when m and n are mutually prime. -int SmallestPrimeCommonDivisor(int m, int n) { ... } - -// A predicate-formatter for asserting that two integers are mutually prime. -::testing::AssertionResult AssertMutuallyPrime(const char* m_expr, - const char* n_expr, - int m, - int n) { - if (MutuallyPrime(m, n)) - return ::testing::AssertionSuccess(); - - return ::testing::AssertionFailure() - << m_expr << " and " << n_expr << " (" << m << " and " << n - << ") are not mutually prime, " << "as they have a common divisor " - << SmallestPrimeCommonDivisor(m, n); -} -``` - -With this predicate-formatter, we can use - -``` -EXPECT_PRED_FORMAT2(AssertMutuallyPrime, b, c); -``` - -to generate the message - -
-b and c (4 and 10) are not mutually prime, as they have a common divisor 2.

-
- -As you may have realized, many of the assertions we introduced earlier are -special cases of `(EXPECT|ASSERT)_PRED_FORMAT*`. In fact, most of them are -indeed defined using `(EXPECT|ASSERT)_PRED_FORMAT*`. - -_Availability_: Linux, Windows, Mac. - - -## Floating-Point Comparison ## - -Comparing floating-point numbers is tricky. Due to round-off errors, it is -very unlikely that two floating-points will match exactly. Therefore, -`ASSERT_EQ` 's naive comparison usually doesn't work. And since floating-points -can have a wide value range, no single fixed error bound works. It's better to -compare by a fixed relative error bound, except for values close to 0 due to -the loss of precision there. - -In general, for floating-point comparison to make sense, the user needs to -carefully choose the error bound. If they don't want or care to, comparing in -terms of Units in the Last Place (ULPs) is a good default, and Google Test -provides assertions to do this. Full details about ULPs are quite long; if you -want to learn more, see -[this article on float comparison](http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm). - -### Floating-Point Macros ### - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_FLOAT_EQ(`_expected, actual_`);` | `EXPECT_FLOAT_EQ(`_expected, actual_`);` | the two `float` values are almost equal | -| `ASSERT_DOUBLE_EQ(`_expected, actual_`);` | `EXPECT_DOUBLE_EQ(`_expected, actual_`);` | the two `double` values are almost equal | - -By "almost equal", we mean the two values are within 4 ULP's from each -other. - -The following assertions allow you to choose the acceptable error bound: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_NEAR(`_val1, val2, abs\_error_`);` | `EXPECT_NEAR`_(val1, val2, abs\_error_`);` | the difference between _val1_ and _val2_ doesn't exceed the given absolute error | - -_Availability_: Linux, Windows, Mac. - -### Floating-Point Predicate-Format Functions ### - -Some floating-point operations are useful, but not that often used. In order -to avoid an explosion of new macros, we provide them as predicate-format -functions that can be used in predicate assertion macros (e.g. -`EXPECT_PRED_FORMAT2`, etc). - -``` -EXPECT_PRED_FORMAT2(::testing::FloatLE, val1, val2); -EXPECT_PRED_FORMAT2(::testing::DoubleLE, val1, val2); -``` - -Verifies that _val1_ is less than, or almost equal to, _val2_. You can -replace `EXPECT_PRED_FORMAT2` in the above table with `ASSERT_PRED_FORMAT2`. - -_Availability_: Linux, Windows, Mac. - -## Windows HRESULT assertions ## - -These assertions test for `HRESULT` success or failure. - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_HRESULT_SUCCEEDED(`_expression_`);` | `EXPECT_HRESULT_SUCCEEDED(`_expression_`);` | _expression_ is a success `HRESULT` | -| `ASSERT_HRESULT_FAILED(`_expression_`);` | `EXPECT_HRESULT_FAILED(`_expression_`);` | _expression_ is a failure `HRESULT` | - -The generated output contains the human-readable error message -associated with the `HRESULT` code returned by _expression_. - -You might use them like this: - -``` -CComPtr shell; -ASSERT_HRESULT_SUCCEEDED(shell.CoCreateInstance(L"Shell.Application")); -CComVariant empty; -ASSERT_HRESULT_SUCCEEDED(shell->ShellExecute(CComBSTR(url), empty, empty, empty, empty)); -``` - -_Availability_: Windows. - -## Type Assertions ## - -You can call the function -``` -::testing::StaticAssertTypeEq(); -``` -to assert that types `T1` and `T2` are the same. The function does -nothing if the assertion is satisfied. If the types are different, -the function call will fail to compile, and the compiler error message -will likely (depending on the compiler) show you the actual values of -`T1` and `T2`. This is mainly useful inside template code. - -_Caveat:_ When used inside a member function of a class template or a -function template, `StaticAssertTypeEq()` is effective _only if_ -the function is instantiated. For example, given: -``` -template class Foo { - public: - void Bar() { ::testing::StaticAssertTypeEq(); } -}; -``` -the code: -``` -void Test1() { Foo foo; } -``` -will _not_ generate a compiler error, as `Foo::Bar()` is never -actually instantiated. Instead, you need: -``` -void Test2() { Foo foo; foo.Bar(); } -``` -to cause a compiler error. - -_Availability:_ Linux, Windows, Mac; since version 1.3.0. - -## Assertion Placement ## - -You can use assertions in any C++ function. In particular, it doesn't -have to be a method of the test fixture class. The one constraint is -that assertions that generate a fatal failure (`FAIL*` and `ASSERT_*`) -can only be used in void-returning functions. This is a consequence of -Google Test not using exceptions. By placing it in a non-void function -you'll get a confusing compile error like -`"error: void value not ignored as it ought to be"`. - -If you need to use assertions in a function that returns non-void, one option -is to make the function return the value in an out parameter instead. For -example, you can rewrite `T2 Foo(T1 x)` to `void Foo(T1 x, T2* result)`. You -need to make sure that `*result` contains some sensible value even when the -function returns prematurely. As the function now returns `void`, you can use -any assertion inside of it. - -If changing the function's type is not an option, you should just use -assertions that generate non-fatal failures, such as `ADD_FAILURE*` and -`EXPECT_*`. - -_Note_: Constructors and destructors are not considered void-returning -functions, according to the C++ language specification, and so you may not use -fatal assertions in them. You'll get a compilation error if you try. A simple -workaround is to transfer the entire body of the constructor or destructor to a -private void-returning method. However, you should be aware that a fatal -assertion failure in a constructor does not terminate the current test, as your -intuition might suggest; it merely returns from the constructor early, possibly -leaving your object in a partially-constructed state. Likewise, a fatal -assertion failure in a destructor may leave your object in a -partially-destructed state. Use assertions carefully in these situations! - -# Death Tests # - -In many applications, there are assertions that can cause application failure -if a condition is not met. These sanity checks, which ensure that the program -is in a known good state, are there to fail at the earliest possible time after -some program state is corrupted. If the assertion checks the wrong condition, -then the program may proceed in an erroneous state, which could lead to memory -corruption, security holes, or worse. Hence it is vitally important to test -that such assertion statements work as expected. - -Since these precondition checks cause the processes to die, we call such tests -_death tests_. More generally, any test that checks that a program terminates -in an expected fashion is also a death test. - -If you want to test `EXPECT_*()/ASSERT_*()` failures in your test code, see [Catching Failures](#catching-failures). - -## How to Write a Death Test ## - -Google Test has the following macros to support death tests: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_DEATH(`_statement, regex_`); | `EXPECT_DEATH(`_statement, regex_`); | _statement_ crashes with the given error | -| `ASSERT_DEATH_IF_SUPPORTED(`_statement, regex_`); | `EXPECT_DEATH_IF_SUPPORTED(`_statement, regex_`); | if death tests are supported, verifies that _statement_ crashes with the given error; otherwise verifies nothing | -| `ASSERT_EXIT(`_statement, predicate, regex_`); | `EXPECT_EXIT(`_statement, predicate, regex_`); |_statement_ exits with the given error and its exit code matches _predicate_ | - -where _statement_ is a statement that is expected to cause the process to -die, _predicate_ is a function or function object that evaluates an integer -exit status, and _regex_ is a regular expression that the stderr output of -_statement_ is expected to match. Note that _statement_ can be _any valid -statement_ (including _compound statement_) and doesn't have to be an -expression. - -As usual, the `ASSERT` variants abort the current test function, while the -`EXPECT` variants do not. - -**Note:** We use the word "crash" here to mean that the process -terminates with a _non-zero_ exit status code. There are two -possibilities: either the process has called `exit()` or `_exit()` -with a non-zero value, or it may be killed by a signal. - -This means that if _statement_ terminates the process with a 0 exit -code, it is _not_ considered a crash by `EXPECT_DEATH`. Use -`EXPECT_EXIT` instead if this is the case, or if you want to restrict -the exit code more precisely. - -A predicate here must accept an `int` and return a `bool`. The death test -succeeds only if the predicate returns `true`. Google Test defines a few -predicates that handle the most common cases: - -``` -::testing::ExitedWithCode(exit_code) -``` - -This expression is `true` if the program exited normally with the given exit -code. - -``` -::testing::KilledBySignal(signal_number) // Not available on Windows. -``` - -This expression is `true` if the program was killed by the given signal. - -The `*_DEATH` macros are convenient wrappers for `*_EXIT` that use a predicate -that verifies the process' exit code is non-zero. - -Note that a death test only cares about three things: - - 1. does _statement_ abort or exit the process? - 1. (in the case of `ASSERT_EXIT` and `EXPECT_EXIT`) does the exit status satisfy _predicate_? Or (in the case of `ASSERT_DEATH` and `EXPECT_DEATH`) is the exit status non-zero? And - 1. does the stderr output match _regex_? - -In particular, if _statement_ generates an `ASSERT_*` or `EXPECT_*` failure, it will **not** cause the death test to fail, as Google Test assertions don't abort the process. - -To write a death test, simply use one of the above macros inside your test -function. For example, - -``` -TEST(My*DeathTest*, Foo) { - // This death test uses a compound statement. - ASSERT_DEATH({ int n = 5; Foo(&n); }, "Error on line .* of Foo()"); -} -TEST(MyDeathTest, NormalExit) { - EXPECT_EXIT(NormalExit(), ::testing::ExitedWithCode(0), "Success"); -} -TEST(MyDeathTest, KillMyself) { - EXPECT_EXIT(KillMyself(), ::testing::KilledBySignal(SIGKILL), "Sending myself unblockable signal"); -} -``` - -verifies that: - - * calling `Foo(5)` causes the process to die with the given error message, - * calling `NormalExit()` causes the process to print `"Success"` to stderr and exit with exit code 0, and - * calling `KillMyself()` kills the process with signal `SIGKILL`. - -The test function body may contain other assertions and statements as well, if -necessary. - -_Important:_ We strongly recommend you to follow the convention of naming your -test case (not test) `*DeathTest` when it contains a death test, as -demonstrated in the above example. The `Death Tests And Threads` section below -explains why. - -If a test fixture class is shared by normal tests and death tests, you -can use typedef to introduce an alias for the fixture class and avoid -duplicating its code: -``` -class FooTest : public ::testing::Test { ... }; - -typedef FooTest FooDeathTest; - -TEST_F(FooTest, DoesThis) { - // normal test -} - -TEST_F(FooDeathTest, DoesThat) { - // death test -} -``` - -_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Cygwin, and Mac (the latter three are supported since v1.3.0). `(ASSERT|EXPECT)_DEATH_IF_SUPPORTED` are new in v1.4.0. - -## Regular Expression Syntax ## - -On POSIX systems (e.g. Linux, Cygwin, and Mac), Google Test uses the -[POSIX extended regular expression](http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04) -syntax in death tests. To learn about this syntax, you may want to read this [Wikipedia entry](http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions). - -On Windows, Google Test uses its own simple regular expression -implementation. It lacks many features you can find in POSIX extended -regular expressions. For example, we don't support union (`"x|y"`), -grouping (`"(xy)"`), brackets (`"[xy]"`), and repetition count -(`"x{5,7}"`), among others. Below is what we do support (`A` denotes a -literal character, period (`.`), or a single `\\` escape sequence; `x` -and `y` denote regular expressions.): - -| `c` | matches any literal character `c` | -|:----|:----------------------------------| -| `\\d` | matches any decimal digit | -| `\\D` | matches any character that's not a decimal digit | -| `\\f` | matches `\f` | -| `\\n` | matches `\n` | -| `\\r` | matches `\r` | -| `\\s` | matches any ASCII whitespace, including `\n` | -| `\\S` | matches any character that's not a whitespace | -| `\\t` | matches `\t` | -| `\\v` | matches `\v` | -| `\\w` | matches any letter, `_`, or decimal digit | -| `\\W` | matches any character that `\\w` doesn't match | -| `\\c` | matches any literal character `c`, which must be a punctuation | -| `.` | matches any single character except `\n` | -| `A?` | matches 0 or 1 occurrences of `A` | -| `A*` | matches 0 or many occurrences of `A` | -| `A+` | matches 1 or many occurrences of `A` | -| `^` | matches the beginning of a string (not that of each line) | -| `$` | matches the end of a string (not that of each line) | -| `xy` | matches `x` followed by `y` | - -To help you determine which capability is available on your system, -Google Test defines macro `GTEST_USES_POSIX_RE=1` when it uses POSIX -extended regular expressions, or `GTEST_USES_SIMPLE_RE=1` when it uses -the simple version. If you want your death tests to work in both -cases, you can either `#if` on these macros or use the more limited -syntax only. - -## How It Works ## - -Under the hood, `ASSERT_EXIT()` spawns a new process and executes the -death test statement in that process. The details of of how precisely -that happens depend on the platform and the variable -`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the -command-line flag `--gtest_death_test_style`). - - * On POSIX systems, `fork()` (or `clone()` on Linux) is used to spawn the child, after which: - * If the variable's value is `"fast"`, the death test statement is immediately executed. - * If the variable's value is `"threadsafe"`, the child process re-executes the unit test binary just as it was originally invoked, but with some extra flags to cause just the single death test under consideration to be run. - * On Windows, the child is spawned using the `CreateProcess()` API, and re-executes the binary to cause just the single death test under consideration to be run - much like the `threadsafe` mode on POSIX. - -Other values for the variable are illegal and will cause the death test to -fail. Currently, the flag's default value is `"fast"`. However, we reserve the -right to change it in the future. Therefore, your tests should not depend on -this. - -In either case, the parent process waits for the child process to complete, and checks that - - 1. the child's exit status satisfies the predicate, and - 1. the child's stderr matches the regular expression. - -If the death test statement runs to completion without dying, the child -process will nonetheless terminate, and the assertion fails. - -## Death Tests And Threads ## - -The reason for the two death test styles has to do with thread safety. Due to -well-known problems with forking in the presence of threads, death tests should -be run in a single-threaded context. Sometimes, however, it isn't feasible to -arrange that kind of environment. For example, statically-initialized modules -may start threads before main is ever reached. Once threads have been created, -it may be difficult or impossible to clean them up. - -Google Test has three features intended to raise awareness of threading issues. - - 1. A warning is emitted if multiple threads are running when a death test is encountered. - 1. Test cases with a name ending in "DeathTest" are run before all other tests. - 1. It uses `clone()` instead of `fork()` to spawn the child process on Linux (`clone()` is not available on Cygwin and Mac), as `fork()` is more likely to cause the child to hang when the parent process has multiple threads. - -It's perfectly fine to create threads inside a death test statement; they are -executed in a separate process and cannot affect the parent. - -## Death Test Styles ## - -The "threadsafe" death test style was introduced in order to help mitigate the -risks of testing in a possibly multithreaded environment. It trades increased -test execution time (potentially dramatically so) for improved thread safety. -We suggest using the faster, default "fast" style unless your test has specific -problems with it. - -You can choose a particular style of death tests by setting the flag -programmatically: - -``` -::testing::FLAGS_gtest_death_test_style = "threadsafe"; -``` - -You can do this in `main()` to set the style for all death tests in the -binary, or in individual tests. Recall that flags are saved before running each -test and restored afterwards, so you need not do that yourself. For example: - -``` -TEST(MyDeathTest, TestOne) { - ::testing::FLAGS_gtest_death_test_style = "threadsafe"; - // This test is run in the "threadsafe" style: - ASSERT_DEATH(ThisShouldDie(), ""); -} - -TEST(MyDeathTest, TestTwo) { - // This test is run in the "fast" style: - ASSERT_DEATH(ThisShouldDie(), ""); -} - -int main(int argc, char** argv) { - ::testing::InitGoogleTest(&argc, argv); - ::testing::FLAGS_gtest_death_test_style = "fast"; - return RUN_ALL_TESTS(); -} -``` - -## Caveats ## - -The _statement_ argument of `ASSERT_EXIT()` can be any valid C++ statement -except that it can not return from the current function. This means -_statement_ should not contain `return` or a macro that might return (e.g. -`ASSERT_TRUE()` ). If _statement_ returns before it crashes, Google Test will -print an error message, and the test will fail. - -Since _statement_ runs in the child process, any in-memory side effect (e.g. -modifying a variable, releasing memory, etc) it causes will _not_ be observable -in the parent process. In particular, if you release memory in a death test, -your program will fail the heap check as the parent process will never see the -memory reclaimed. To solve this problem, you can - - 1. try not to free memory in a death test; - 1. free the memory again in the parent process; or - 1. do not use the heap checker in your program. - -Due to an implementation detail, you cannot place multiple death test -assertions on the same line; otherwise, compilation will fail with an unobvious -error message. - -Despite the improved thread safety afforded by the "threadsafe" style of death -test, thread problems such as deadlock are still possible in the presence of -handlers registered with `pthread_atfork(3)`. - -# Using Assertions in Sub-routines # - -## Adding Traces to Assertions ## - -If a test sub-routine is called from several places, when an assertion -inside it fails, it can be hard to tell which invocation of the -sub-routine the failure is from. You can alleviate this problem using -extra logging or custom failure messages, but that usually clutters up -your tests. A better solution is to use the `SCOPED_TRACE` macro: - -| `SCOPED_TRACE(`_message_`);` | -|:-----------------------------| - -where _message_ can be anything streamable to `std::ostream`. This -macro will cause the current file name, line number, and the given -message to be added in every failure message. The effect will be -undone when the control leaves the current lexical scope. - -For example, - -``` -10: void Sub1(int n) { -11: EXPECT_EQ(1, Bar(n)); -12: EXPECT_EQ(2, Bar(n + 1)); -13: } -14: -15: TEST(FooTest, Bar) { -16: { -17: SCOPED_TRACE("A"); // This trace point will be included in -18: // every failure in this scope. -19: Sub1(1); -20: } -21: // Now it won't. -22: Sub1(9); -23: } -``` - -could result in messages like these: - -``` -path/to/foo_test.cc:11: Failure -Value of: Bar(n) -Expected: 1 - Actual: 2 - Trace: -path/to/foo_test.cc:17: A - -path/to/foo_test.cc:12: Failure -Value of: Bar(n + 1) -Expected: 2 - Actual: 3 -``` - -Without the trace, it would've been difficult to know which invocation -of `Sub1()` the two failures come from respectively. (You could add an -extra message to each assertion in `Sub1()` to indicate the value of -`n`, but that's tedious.) - -Some tips on using `SCOPED_TRACE`: - - 1. With a suitable message, it's often enough to use `SCOPED_TRACE` at the beginning of a sub-routine, instead of at each call site. - 1. When calling sub-routines inside a loop, make the loop iterator part of the message in `SCOPED_TRACE` such that you can know which iteration the failure is from. - 1. Sometimes the line number of the trace point is enough for identifying the particular invocation of a sub-routine. In this case, you don't have to choose a unique message for `SCOPED_TRACE`. You can simply use `""`. - 1. You can use `SCOPED_TRACE` in an inner scope when there is one in the outer scope. In this case, all active trace points will be included in the failure messages, in reverse order they are encountered. - 1. The trace dump is clickable in Emacs' compilation buffer - hit return on a line number and you'll be taken to that line in the source file! - -_Availability:_ Linux, Windows, Mac. - -## Propagating Fatal Failures ## - -A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that -when they fail they only abort the _current function_, not the entire test. For -example, the following test will segfault: -``` -void Subroutine() { - // Generates a fatal failure and aborts the current function. - ASSERT_EQ(1, 2); - // The following won't be executed. - ... -} - -TEST(FooTest, Bar) { - Subroutine(); - // The intended behavior is for the fatal failure - // in Subroutine() to abort the entire test. - // The actual behavior: the function goes on after Subroutine() returns. - int* p = NULL; - *p = 3; // Segfault! -} -``` - -Since we don't use exceptions, it is technically impossible to -implement the intended behavior here. To alleviate this, Google Test -provides two solutions. You could use either the -`(ASSERT|EXPECT)_NO_FATAL_FAILURE` assertions or the -`HasFatalFailure()` function. They are described in the following two -subsections. - - - -### Asserting on Subroutines ### - -As shown above, if your test calls a subroutine that has an `ASSERT_*` -failure in it, the test will continue after the subroutine -returns. This may not be what you want. - -Often people want fatal failures to propagate like exceptions. For -that Google Test offers the following macros: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_NO_FATAL_FAILURE(`_statement_`);` | `EXPECT_NO_FATAL_FAILURE(`_statement_`);` | _statement_ doesn't generate any new fatal failures in the current thread. | - -Only failures in the thread that executes the assertion are checked to -determine the result of this type of assertions. If _statement_ -creates new threads, failures in these threads are ignored. - -Examples: - -``` -ASSERT_NO_FATAL_FAILURE(Foo()); - -int i; -EXPECT_NO_FATAL_FAILURE({ - i = Bar(); -}); -``` - -_Availability:_ Linux, Windows, Mac. Assertions from multiple threads -are currently not supported. - -### Checking for Failures in the Current Test ### - -`HasFatalFailure()` in the `::testing::Test` class returns `true` if an -assertion in the current test has suffered a fatal failure. This -allows functions to catch fatal failures in a sub-routine and return -early. - -``` -class Test { - public: - ... - static bool HasFatalFailure(); -}; -``` - -The typical usage, which basically simulates the behavior of a thrown -exception, is: - -``` -TEST(FooTest, Bar) { - Subroutine(); - // Aborts if Subroutine() had a fatal failure. - if (HasFatalFailure()) - return; - // The following won't be executed. - ... -} -``` - -If `HasFatalFailure()` is used outside of `TEST()` , `TEST_F()` , or a test -fixture, you must add the `::testing::Test::` prefix, as in: - -``` -if (::testing::Test::HasFatalFailure()) - return; -``` - -Similarly, `HasNonfatalFailure()` returns `true` if the current test -has at least one non-fatal failure, and `HasFailure()` returns `true` -if the current test has at least one failure of either kind. - -_Availability:_ Linux, Windows, Mac. `HasNonfatalFailure()` and -`HasFailure()` are available since version 1.4.0. - -# Logging Additional Information # - -In your test code, you can call `RecordProperty("key", value)` to log -additional information, where `value` can be either a C string or a 32-bit -integer. The _last_ value recorded for a key will be emitted to the XML output -if you specify one. For example, the test - -``` -TEST_F(WidgetUsageTest, MinAndMaxWidgets) { - RecordProperty("MaximumWidgets", ComputeMaxUsage()); - RecordProperty("MinimumWidgets", ComputeMinUsage()); -} -``` - -will output XML like this: - -``` -... - -... -``` - -_Note_: - * `RecordProperty()` is a static member of the `Test` class. Therefore it needs to be prefixed with `::testing::Test::` if used outside of the `TEST` body and the test fixture class. - * `key` must be a valid XML attribute name, and cannot conflict with the ones already used by Google Test (`name`, `status`, `time`, and `classname`). - -_Availability_: Linux, Windows, Mac. - -# Sharing Resources Between Tests in the Same Test Case # - - - -Google Test creates a new test fixture object for each test in order to make -tests independent and easier to debug. However, sometimes tests use resources -that are expensive to set up, making the one-copy-per-test model prohibitively -expensive. - -If the tests don't change the resource, there's no harm in them sharing a -single resource copy. So, in addition to per-test set-up/tear-down, Google Test -also supports per-test-case set-up/tear-down. To use it: - - 1. In your test fixture class (say `FooTest` ), define as `static` some member variables to hold the shared resources. - 1. In the same test fixture class, define a `static void SetUpTestCase()` function (remember not to spell it as **`SetupTestCase`** with a small `u`!) to set up the shared resources and a `static void TearDownTestCase()` function to tear them down. - -That's it! Google Test automatically calls `SetUpTestCase()` before running the -_first test_ in the `FooTest` test case (i.e. before creating the first -`FooTest` object), and calls `TearDownTestCase()` after running the _last test_ -in it (i.e. after deleting the last `FooTest` object). In between, the tests -can use the shared resources. - -Remember that the test order is undefined, so your code can't depend on a test -preceding or following another. Also, the tests must either not modify the -state of any shared resource, or, if they do modify the state, they must -restore the state to its original value before passing control to the next -test. - -Here's an example of per-test-case set-up and tear-down: -``` -class FooTest : public ::testing::Test { - protected: - // Per-test-case set-up. - // Called before the first test in this test case. - // Can be omitted if not needed. - static void SetUpTestCase() { - shared_resource_ = new ...; - } - - // Per-test-case tear-down. - // Called after the last test in this test case. - // Can be omitted if not needed. - static void TearDownTestCase() { - delete shared_resource_; - shared_resource_ = NULL; - } - - // You can define per-test set-up and tear-down logic as usual. - virtual void SetUp() { ... } - virtual void TearDown() { ... } - - // Some expensive resource shared by all tests. - static T* shared_resource_; -}; - -T* FooTest::shared_resource_ = NULL; - -TEST_F(FooTest, Test1) { - ... you can refer to shared_resource here ... -} -TEST_F(FooTest, Test2) { - ... you can refer to shared_resource here ... -} -``` - -_Availability:_ Linux, Windows, Mac. - -# Global Set-Up and Tear-Down # - -Just as you can do set-up and tear-down at the test level and the test case -level, you can also do it at the test program level. Here's how. - -First, you subclass the `::testing::Environment` class to define a test -environment, which knows how to set-up and tear-down: - -``` -class Environment { - public: - virtual ~Environment() {} - // Override this to define how to set up the environment. - virtual void SetUp() {} - // Override this to define how to tear down the environment. - virtual void TearDown() {} -}; -``` - -Then, you register an instance of your environment class with Google Test by -calling the `::testing::AddGlobalTestEnvironment()` function: - -``` -Environment* AddGlobalTestEnvironment(Environment* env); -``` - -Now, when `RUN_ALL_TESTS()` is called, it first calls the `SetUp()` method of -the environment object, then runs the tests if there was no fatal failures, and -finally calls `TearDown()` of the environment object. - -It's OK to register multiple environment objects. In this case, their `SetUp()` -will be called in the order they are registered, and their `TearDown()` will be -called in the reverse order. - -Note that Google Test takes ownership of the registered environment objects. -Therefore **do not delete them** by yourself. - -You should call `AddGlobalTestEnvironment()` before `RUN_ALL_TESTS()` is -called, probably in `main()`. If you use `gtest_main`, you need to call -this before `main()` starts for it to take effect. One way to do this is to -define a global variable like this: - -``` -::testing::Environment* const foo_env = ::testing::AddGlobalTestEnvironment(new FooEnvironment); -``` - -However, we strongly recommend you to write your own `main()` and call -`AddGlobalTestEnvironment()` there, as relying on initialization of global -variables makes the code harder to read and may cause problems when you -register multiple environments from different translation units and the -environments have dependencies among them (remember that the compiler doesn't -guarantee the order in which global variables from different translation units -are initialized). - -_Availability:_ Linux, Windows, Mac. - - -# Value Parameterized Tests # - -_Value-parameterized tests_ allow you to test your code with different -parameters without writing multiple copies of the same test. - -Suppose you write a test for your code and then realize that your code is affected by a presence of a Boolean command line flag. - -``` -TEST(MyCodeTest, TestFoo) { - // A code to test foo(). -} -``` - -Usually people factor their test code into a function with a Boolean parameter in such situations. The function sets the flag, then executes the testing code. - -``` -void TestFooHelper(bool flag_value) { - flag = flag_value; - // A code to test foo(). -} - -TEST(MyCodeTest, TestFooo) { - TestFooHelper(false); - TestFooHelper(true); -} -``` - -But this setup has serious drawbacks. First, when a test assertion fails in your tests, it becomes unclear what value of the parameter caused it to fail. You can stream a clarifying message into your `EXPECT`/`ASSERT` statements, but it you'll have to do it with all of them. Second, you have to add one such helper function per test. What if you have ten tests? Twenty? A hundred? - -Value-parameterized tests will let you write your test only once and then easily instantiate and run it with an arbitrary number of parameter values. - -Here are some other situations when value-parameterized tests come handy: - - * You wan to test different implementations of an OO interface. - * You want to test your code over various inputs (a.k.a. data-driven testing). This feature is easy to abuse, so please exercise your good sense when doing it! - -## How to Write Value-Parameterized Tests ## - -To write value-parameterized tests, first you should define a fixture -class. It must be derived from `::testing::TestWithParam`, where `T` -is the type of your parameter values. `TestWithParam` is itself -derived from `::testing::Test`. `T` can be any copyable type. If it's -a raw pointer, you are responsible for managing the lifespan of the -pointed values. - -``` -class FooTest : public ::testing::TestWithParam { - // You can implement all the usual fixture class members here. - // To access the test parameter, call GetParam() from class - // TestWithParam. -}; -``` - -Then, use the `TEST_P` macro to define as many test patterns using -this fixture as you want. The `_P` suffix is for "parameterized" or -"pattern", whichever you prefer to think. - -``` -TEST_P(FooTest, DoesBlah) { - // Inside a test, access the test parameter with the GetParam() method - // of the TestWithParam class: - EXPECT_TRUE(foo.Blah(GetParam())); - ... -} - -TEST_P(FooTest, HasBlahBlah) { - ... -} -``` - -Finally, you can use `INSTANTIATE_TEST_CASE_P` to instantiate the test -case with any set of parameters you want. Google Test defines a number of -functions for generating test parameters. They return what we call -(surprise!) _parameter generators_. Here is a summary of them, -which are all in the `testing` namespace: - -| `Range(begin, end[, step])` | Yields values `{begin, begin+step, begin+step+step, ...}`. The values do not include `end`. `step` defaults to 1. | -|:----------------------------|:------------------------------------------------------------------------------------------------------------------| -| `Values(v1, v2, ..., vN)` | Yields values `{v1, v2, ..., vN}`. | -| `ValuesIn(container)` and `ValuesIn(begin, end)` | Yields values from a C-style array, an STL-style container, or an iterator range `[begin, end)`. | -| `Bool()` | Yields sequence `{false, true}`. | -| `Combine(g1, g2, ..., gN)` | Yields all combinations (the Cartesian product for the math savvy) of the values generated by the `N` generators. This is only available if your system provides the `` header. If you are sure your system does, and Google Test disagrees, you can override it by defining `GTEST_HAS_TR1_TUPLE=1`. See comments in [include/gtest/internal/gtest-port.h](../include/gtest/internal/gtest-port.h) for more information. | - -For more details, see the comments at the definitions of these functions in the [source code](../include/gtest/gtest-param-test.h). - -The following statement will instantiate tests from the `FooTest` test case -each with parameter values `"meeny"`, `"miny"`, and `"moe"`. - -``` -INSTANTIATE_TEST_CASE_P(InstantiationName, - FooTest, - ::testing::Values("meeny", "miny", "moe")); -``` - -To distinguish different instances of the pattern (yes, you can -instantiate it more than once), the first argument to -`INSTANTIATE_TEST_CASE_P` is a prefix that will be added to the actual -test case name. Remember to pick unique prefixes for different -instantiations. The tests from the instantiation above will have these -names: - - * `InstantiationName/FooTest.DoesBlah/0` for `"meeny"` - * `InstantiationName/FooTest.DoesBlah/1` for `"miny"` - * `InstantiationName/FooTest.DoesBlah/2` for `"moe"` - * `InstantiationName/FooTest.HasBlahBlah/0` for `"meeny"` - * `InstantiationName/FooTest.HasBlahBlah/1` for `"miny"` - * `InstantiationName/FooTest.HasBlahBlah/2` for `"moe"` - -You can use these names in [--gtest\-filter](#running-a-subset-of-the-tests). - -This statement will instantiate all tests from `FooTest` again, each -with parameter values `"cat"` and `"dog"`: - -``` -const char* pets[] = {"cat", "dog"}; -INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, - ::testing::ValuesIn(pets)); -``` - -The tests from the instantiation above will have these names: - - * `AnotherInstantiationName/FooTest.DoesBlah/0` for `"cat"` - * `AnotherInstantiationName/FooTest.DoesBlah/1` for `"dog"` - * `AnotherInstantiationName/FooTest.HasBlahBlah/0` for `"cat"` - * `AnotherInstantiationName/FooTest.HasBlahBlah/1` for `"dog"` - -Please note that `INSTANTIATE_TEST_CASE_P` will instantiate _all_ -tests in the given test case, whether their definitions come before or -_after_ the `INSTANTIATE_TEST_CASE_P` statement. - -You can see -[these](../samples/sample7_unittest.cc) -[files](../samples/sample8_unittest.cc) for more examples. - -_Availability_: Linux, Windows (requires MSVC 8.0 or above), Mac; since version 1.2.0. - -## Creating Value-Parameterized Abstract Tests ## - -In the above, we define and instantiate `FooTest` in the same source -file. Sometimes you may want to define value-parameterized tests in a -library and let other people instantiate them later. This pattern is -known as abstract tests. As an example of its application, when you -are designing an interface you can write a standard suite of abstract -tests (perhaps using a factory function as the test parameter) that -all implementations of the interface are expected to pass. When -someone implements the interface, he can instantiate your suite to get -all the interface-conformance tests for free. - -To define abstract tests, you should organize your code like this: - - 1. Put the definition of the parameterized test fixture class (e.g. `FooTest`) in a header file, say `foo_param_test.h`. Think of this as _declaring_ your abstract tests. - 1. Put the `TEST_P` definitions in `foo_param_test.cc`, which includes `foo_param_test.h`. Think of this as _implementing_ your abstract tests. - -Once they are defined, you can instantiate them by including -`foo_param_test.h`, invoking `INSTANTIATE_TEST_CASE_P()`, and linking -with `foo_param_test.cc`. You can instantiate the same abstract test -case multiple times, possibly in different source files. - -# Typed Tests # - -Suppose you have multiple implementations of the same interface and -want to make sure that all of them satisfy some common requirements. -Or, you may have defined several types that are supposed to conform to -the same "concept" and you want to verify it. In both cases, you want -the same test logic repeated for different types. - -While you can write one `TEST` or `TEST_F` for each type you want to -test (and you may even factor the test logic into a function template -that you invoke from the `TEST`), it's tedious and doesn't scale: -if you want _m_ tests over _n_ types, you'll end up writing _m\*n_ -`TEST`s. - -_Typed tests_ allow you to repeat the same test logic over a list of -types. You only need to write the test logic once, although you must -know the type list when writing typed tests. Here's how you do it: - -First, define a fixture class template. It should be parameterized -by a type. Remember to derive it from `::testing::Test`: - -``` -template -class FooTest : public ::testing::Test { - public: - ... - typedef std::list List; - static T shared_; - T value_; -}; -``` - -Next, associate a list of types with the test case, which will be -repeated for each type in the list: - -``` -typedef ::testing::Types MyTypes; -TYPED_TEST_CASE(FooTest, MyTypes); -``` - -The `typedef` is necessary for the `TYPED_TEST_CASE` macro to parse -correctly. Otherwise the compiler will think that each comma in the -type list introduces a new macro argument. - -Then, use `TYPED_TEST()` instead of `TEST_F()` to define a typed test -for this test case. You can repeat this as many times as you want: - -``` -TYPED_TEST(FooTest, DoesBlah) { - // Inside a test, refer to the special name TypeParam to get the type - // parameter. Since we are inside a derived class template, C++ requires - // us to visit the members of FooTest via 'this'. - TypeParam n = this->value_; - - // To visit static members of the fixture, add the 'TestFixture::' - // prefix. - n += TestFixture::shared_; - - // To refer to typedefs in the fixture, add the 'typename TestFixture::' - // prefix. The 'typename' is required to satisfy the compiler. - typename TestFixture::List values; - values.push_back(n); - ... -} - -TYPED_TEST(FooTest, HasPropertyA) { ... } -``` - -You can see `samples/sample6_unittest.cc` for a complete example. - -_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac; -since version 1.1.0. - -# Type-Parameterized Tests # - -_Type-parameterized tests_ are like typed tests, except that they -don't require you to know the list of types ahead of time. Instead, -you can define the test logic first and instantiate it with different -type lists later. You can even instantiate it more than once in the -same program. - -If you are designing an interface or concept, you can define a suite -of type-parameterized tests to verify properties that any valid -implementation of the interface/concept should have. Then, the author -of each implementation can just instantiate the test suite with his -type to verify that it conforms to the requirements, without having to -write similar tests repeatedly. Here's an example: - -First, define a fixture class template, as we did with typed tests: - -``` -template -class FooTest : public ::testing::Test { - ... -}; -``` - -Next, declare that you will define a type-parameterized test case: - -``` -TYPED_TEST_CASE_P(FooTest); -``` - -The `_P` suffix is for "parameterized" or "pattern", whichever you -prefer to think. - -Then, use `TYPED_TEST_P()` to define a type-parameterized test. You -can repeat this as many times as you want: - -``` -TYPED_TEST_P(FooTest, DoesBlah) { - // Inside a test, refer to TypeParam to get the type parameter. - TypeParam n = 0; - ... -} - -TYPED_TEST_P(FooTest, HasPropertyA) { ... } -``` - -Now the tricky part: you need to register all test patterns using the -`REGISTER_TYPED_TEST_CASE_P` macro before you can instantiate them. -The first argument of the macro is the test case name; the rest are -the names of the tests in this test case: - -``` -REGISTER_TYPED_TEST_CASE_P(FooTest, - DoesBlah, HasPropertyA); -``` - -Finally, you are free to instantiate the pattern with the types you -want. If you put the above code in a header file, you can `#include` -it in multiple C++ source files and instantiate it multiple times. - -``` -typedef ::testing::Types MyTypes; -INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes); -``` - -To distinguish different instances of the pattern, the first argument -to the `INSTANTIATE_TYPED_TEST_CASE_P` macro is a prefix that will be -added to the actual test case name. Remember to pick unique prefixes -for different instances. - -In the special case where the type list contains only one type, you -can write that type directly without `::testing::Types<...>`, like this: - -``` -INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int); -``` - -You can see `samples/sample6_unittest.cc` for a complete example. - -_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac; -since version 1.1.0. - -# Testing Private Code # - -If you change your software's internal implementation, your tests should not -break as long as the change is not observable by users. Therefore, per the -_black-box testing principle_, most of the time you should test your code -through its public interfaces. - -If you still find yourself needing to test internal implementation code, -consider if there's a better design that wouldn't require you to do so. If you -absolutely have to test non-public interface code though, you can. There are -two cases to consider: - - * Static functions (_not_ the same as static member functions!) or unnamed namespaces, and - * Private or protected class members - -## Static Functions ## - -Both static functions and definitions/declarations in an unnamed namespace are -only visible within the same translation unit. To test them, you can `#include` -the entire `.cc` file being tested in your `*_test.cc` file. (`#include`ing `.cc` -files is not a good way to reuse code - you should not do this in production -code!) - -However, a better approach is to move the private code into the -`foo::internal` namespace, where `foo` is the namespace your project normally -uses, and put the private declarations in a `*-internal.h` file. Your -production `.cc` files and your tests are allowed to include this internal -header, but your clients are not. This way, you can fully test your internal -implementation without leaking it to your clients. - -## Private Class Members ## - -Private class members are only accessible from within the class or by friends. -To access a class' private members, you can declare your test fixture as a -friend to the class and define accessors in your fixture. Tests using the -fixture can then access the private members of your production class via the -accessors in the fixture. Note that even though your fixture is a friend to -your production class, your tests are not automatically friends to it, as they -are technically defined in sub-classes of the fixture. - -Another way to test private members is to refactor them into an implementation -class, which is then declared in a `*-internal.h` file. Your clients aren't -allowed to include this header but your tests can. Such is called the Pimpl -(Private Implementation) idiom. - -Or, you can declare an individual test as a friend of your class by adding this -line in the class body: - -``` -FRIEND_TEST(TestCaseName, TestName); -``` - -For example, -``` -// foo.h -#include - -// Defines FRIEND_TEST. -class Foo { - ... - private: - FRIEND_TEST(FooTest, BarReturnsZeroOnNull); - int Bar(void* x); -}; - -// foo_test.cc -... -TEST(FooTest, BarReturnsZeroOnNull) { - Foo foo; - EXPECT_EQ(0, foo.Bar(NULL)); - // Uses Foo's private member Bar(). -} -``` - -Pay special attention when your class is defined in a namespace, as you should -define your test fixtures and tests in the same namespace if you want them to -be friends of your class. For example, if the code to be tested looks like: - -``` -namespace my_namespace { - -class Foo { - friend class FooTest; - FRIEND_TEST(FooTest, Bar); - FRIEND_TEST(FooTest, Baz); - ... - definition of the class Foo - ... -}; - -} // namespace my_namespace -``` - -Your test code should be something like: - -``` -namespace my_namespace { -class FooTest : public ::testing::Test { - protected: - ... -}; - -TEST_F(FooTest, Bar) { ... } -TEST_F(FooTest, Baz) { ... } - -} // namespace my_namespace -``` - -# Catching Failures # - -If you are building a testing utility on top of Google Test, you'll -want to test your utility. What framework would you use to test it? -Google Test, of course. - -The challenge is to verify that your testing utility reports failures -correctly. In frameworks that report a failure by throwing an -exception, you could catch the exception and assert on it. But Google -Test doesn't use exceptions, so how do we test that a piece of code -generates an expected failure? - -`` contains some constructs to do this. After -`#include`ing this header, you can use - -| `EXPECT_FATAL_FAILURE(`_statement, substring_`);` | -|:--------------------------------------------------| - -to assert that _statement_ generates a fatal (e.g. `ASSERT_*`) failure -whose message contains the given _substring_, or use - -| `EXPECT_NONFATAL_FAILURE(`_statement, substring_`);` | -|:-----------------------------------------------------| - -if you are expecting a non-fatal (e.g. `EXPECT_*`) failure. - -For technical reasons, there are some caveats: - - 1. You cannot stream a failure message to either macro. - 1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot reference local non-static variables or non-static members of `this` object. - 1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot return a value. - -_Note:_ Google Test is designed with threads in mind. Once the -synchronization primitives in `` have -been implemented, Google Test will become thread-safe, meaning that -you can then use assertions in multiple threads concurrently. Before - -that, however, Google Test only supports single-threaded usage. Once -thread-safe, `EXPECT_FATAL_FAILURE()` and `EXPECT_NONFATAL_FAILURE()` -will capture failures in the current thread only. If _statement_ -creates new threads, failures in these threads will be ignored. If -you want to capture failures from all threads instead, you should use -the following macros: - -| `EXPECT_FATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` | -|:-----------------------------------------------------------------| -| `EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` | - -# Getting the Current Test's Name # - -Sometimes a function may need to know the name of the currently running test. -For example, you may be using the `SetUp()` method of your test fixture to set -the golden file name based on which test is running. The `::testing::TestInfo` -class has this information: - -``` -namespace testing { - -class TestInfo { - public: - // Returns the test case name and the test name, respectively. - // - // Do NOT delete or free the return value - it's managed by the - // TestInfo class. - const char* test_case_name() const; - const char* name() const; -}; - -} // namespace testing -``` - - -> To obtain a `TestInfo` object for the currently running test, call -`current_test_info()` on the `UnitTest` singleton object: - -``` -// Gets information about the currently running test. -// Do NOT delete the returned object - it's managed by the UnitTest class. -const ::testing::TestInfo* const test_info = - ::testing::UnitTest::GetInstance()->current_test_info(); -printf("We are in test %s of test case %s.\n", - test_info->name(), test_info->test_case_name()); -``` - -`current_test_info()` returns a null pointer if no test is running. In -particular, you cannot find the test case name in `TestCaseSetUp()`, -`TestCaseTearDown()` (where you know the test case name implicitly), or -functions called from them. - -_Availability:_ Linux, Windows, Mac. - -# Extending Google Test by Handling Test Events # - -Google Test provides an event listener API to let you receive -notifications about the progress of a test program and test -failures. The events you can listen to include the start and end of -the test program, a test case, or a test method, among others. You may -use this API to augment or replace the standard console output, -replace the XML output, or provide a completely different form of -output, such as a GUI or a database. You can also use test events as -checkpoints to implement a resource leak checker, for example. - -_Availability:_ Linux, Windows, Mac; since v1.4.0. - -## Defining Event Listeners ## - -To define a event listener, you subclass either -[testing::TestEventListener](../include/gtest/gtest.h#L855) -or [testing::EmptyTestEventListener](../include/gtest/gtest.h#L905). -The former is an (abstract) interface, where each pure virtual method
-can be overridden to handle a test event (For example, when a test -starts, the `OnTestStart()` method will be called.). The latter provides -an empty implementation of all methods in the interface, such that a -subclass only needs to override the methods it cares about. - -When an event is fired, its context is passed to the handler function -as an argument. The following argument types are used: - * [UnitTest](../include/gtest/gtest.h#L1007) reflects the state of the entire test program, - * [TestCase](../include/gtest/gtest.h#L689) has information about a test case, which can contain one or more tests, - * [TestInfo](../include/gtest/gtest.h#L599) contains the state of a test, and - * [TestPartResult](../include/gtest/gtest-test-part.h#L42) represents the result of a test assertion. - -An event handler function can examine the argument it receives to find -out interesting information about the event and the test program's -state. Here's an example: - -``` - class MinimalistPrinter : public ::testing::EmptyTestEventListener { - // Called before a test starts. - virtual void OnTestStart(const ::testing::TestInfo& test_info) { - printf("*** Test %s.%s starting.\n", - test_info.test_case_name(), test_info.name()); - } - - // Called after a failed assertion or a SUCCESS(). - virtual void OnTestPartResult( - const ::testing::TestPartResult& test_part_result) { - printf("%s in %s:%d\n%s\n", - test_part_result.failed() ? "*** Failure" : "Success", - test_part_result.file_name(), - test_part_result.line_number(), - test_part_result.summary()); - } - - // Called after a test ends. - virtual void OnTestEnd(const ::testing::TestInfo& test_info) { - printf("*** Test %s.%s ending.\n", - test_info.test_case_name(), test_info.name()); - } - }; -``` - -## Using Event Listeners ## - -To use the event listener you have defined, add an instance of it to -the Google Test event listener list (represented by class -[TestEventListeners](../include/gtest/gtest.h#L929) -- note the "s" at the end of the name) in your -`main()` function, before calling `RUN_ALL_TESTS()`: -``` -int main(int argc, char** argv) { - ::testing::InitGoogleTest(&argc, argv); - // Gets hold of the event listener list. - ::testing::TestEventListeners& listeners = - ::testing::UnitTest::GetInstance()->listeners(); - // Adds a listener to the end. Google Test takes the ownership. - listeners.Append(new MinimalistPrinter); - return RUN_ALL_TESTS(); -} -``` - -There's only one problem: the default test result printer is still in -effect, so its output will mingle with the output from your minimalist -printer. To suppress the default printer, just release it from the -event listener list and delete it. You can do so by adding one line: -``` - ... - delete listeners.Release(listeners.default_result_printer()); - listeners.Append(new MinimalistPrinter); - return RUN_ALL_TESTS(); -``` - -Now, sit back and enjoy a completely different output from your -tests. For more details, you can read this -[sample](../samples/sample9_unittest.cc). - -You may append more than one listener to the list. When an `On*Start()` -or `OnTestPartResult()` event is fired, the listeners will receive it in -the order they appear in the list (since new listeners are added to -the end of the list, the default text printer and the default XML -generator will receive the event first). An `On*End()` event will be -received by the listeners in the _reverse_ order. This allows output by -listeners added later to be framed by output from listeners added -earlier. - -## Generating Failures in Listeners ## - -You may use failure-raising macros (`EXPECT_*()`, `ASSERT_*()`, -`FAIL()`, etc) when processing an event. There are some restrictions: - - 1. You cannot generate any failure in `OnTestPartResult()` (otherwise it will cause `OnTestPartResult()` to be called recursively). - 1. A listener that handles `OnTestPartResult()` is not allowed to generate any failure. - -When you add listeners to the listener list, you should put listeners -that handle `OnTestPartResult()` _before_ listeners that can generate -failures. This ensures that failures generated by the latter are -attributed to the right test by the former. - -We have a sample of failure-raising listener -[here](../samples/sample10_unittest.cc). - -# Running Test Programs: Advanced Options # - -Google Test test programs are ordinary executables. Once built, you can run -them directly and affect their behavior via the following environment variables -and/or command line flags. For the flags to work, your programs must call -`::testing::InitGoogleTest()` before calling `RUN_ALL_TESTS()`. - -To see a list of supported flags and their usage, please run your test -program with the `--help` flag. You can also use `-h`, `-?`, or `/?` -for short. This feature is added in version 1.3.0. - -If an option is specified both by an environment variable and by a -flag, the latter takes precedence. Most of the options can also be -set/read in code: to access the value of command line flag -`--gtest_foo`, write `::testing::GTEST_FLAG(foo)`. A common pattern is -to set the value of a flag before calling `::testing::InitGoogleTest()` -to change the default value of the flag: -``` -int main(int argc, char** argv) { - // Disables elapsed time by default. - ::testing::GTEST_FLAG(print_time) = false; - - // This allows the user to override the flag on the command line. - ::testing::InitGoogleTest(&argc, argv); - - return RUN_ALL_TESTS(); -} -``` - -## Selecting Tests ## - -This section shows various options for choosing which tests to run. - -### Listing Test Names ### - -Sometimes it is necessary to list the available tests in a program before -running them so that a filter may be applied if needed. Including the flag -`--gtest_list_tests` overrides all other flags and lists tests in the following -format: -``` -TestCase1. - TestName1 - TestName2 -TestCase2. - TestName -``` - -None of the tests listed are actually run if the flag is provided. There is no -corresponding environment variable for this flag. - -_Availability:_ Linux, Windows, Mac. - -### Running a Subset of the Tests ### - -By default, a Google Test program runs all tests the user has defined. -Sometimes, you want to run only a subset of the tests (e.g. for debugging or -quickly verifying a change). If you set the `GTEST_FILTER` environment variable -or the `--gtest_filter` flag to a filter string, Google Test will only run the -tests whose full names (in the form of `TestCaseName.TestName`) match the -filter. - -The format of a filter is a '`:`'-separated list of wildcard patterns (called -the positive patterns) optionally followed by a '`-`' and another -'`:`'-separated pattern list (called the negative patterns). A test matches the -filter if and only if it matches any of the positive patterns but does not -match any of the negative patterns. - -A pattern may contain `'*'` (matches any string) or `'?'` (matches any single -character). For convenience, the filter `'*-NegativePatterns'` can be also -written as `'-NegativePatterns'`. - -For example: - - * `./foo_test` Has no flag, and thus runs all its tests. - * `./foo_test --gtest_filter=*` Also runs everything, due to the single match-everything `*` value. - * `./foo_test --gtest_filter=FooTest.*` Runs everything in test case `FooTest`. - * `./foo_test --gtest_filter=*Null*:*Constructor*` Runs any test whose full name contains either `"Null"` or `"Constructor"`. - * `./foo_test --gtest_filter=-*DeathTest.*` Runs all non-death tests. - * `./foo_test --gtest_filter=FooTest.*-FooTest.Bar` Runs everything in test case `FooTest` except `FooTest.Bar`. - -_Availability:_ Linux, Windows, Mac. - -### Temporarily Disabling Tests ### - -If you have a broken test that you cannot fix right away, you can add the -`DISABLED_` prefix to its name. This will exclude it from execution. This is -better than commenting out the code or using `#if 0`, as disabled tests are -still compiled (and thus won't rot). - -If you need to disable all tests in a test case, you can either add `DISABLED_` -to the front of the name of each test, or alternatively add it to the front of -the test case name. - -For example, the following tests won't be run by Google Test, even though they -will still be compiled: - -``` -// Tests that Foo does Abc. -TEST(FooTest, DISABLED_DoesAbc) { ... } - -class DISABLED_BarTest : public ::testing::Test { ... }; - -// Tests that Bar does Xyz. -TEST_F(DISABLED_BarTest, DoesXyz) { ... } -``` - -_Note:_ This feature should only be used for temporary pain-relief. You still -have to fix the disabled tests at a later date. As a reminder, Google Test will -print a banner warning you if a test program contains any disabled tests. - -_Tip:_ You can easily count the number of disabled tests you have -using `grep`. This number can be used as a metric for improving your -test quality. - -_Availability:_ Linux, Windows, Mac. - -### Temporarily Enabling Disabled Tests ### - -To include [disabled tests](#temporarily-disabling-tests) in test -execution, just invoke the test program with the -`--gtest_also_run_disabled_tests` flag or set the -`GTEST_ALSO_RUN_DISABLED_TESTS` environment variable to a value other -than `0`. You can combine this with the -[--gtest\_filter](#running-a-subset-of-the-tests) flag to further select -which disabled tests to run. - -_Availability:_ Linux, Windows, Mac; since version 1.3.0. - -## Repeating the Tests ## - -Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it -will fail only 1% of the time, making it rather hard to reproduce the bug under -a debugger. This can be a major source of frustration. - -The `--gtest_repeat` flag allows you to repeat all (or selected) test methods -in a program many times. Hopefully, a flaky test will eventually fail and give -you a chance to debug. Here's how to use it: - -| `$ foo_test --gtest_repeat=1000` | Repeat foo\_test 1000 times and don't stop at failures. | -|:---------------------------------|:--------------------------------------------------------| -| `$ foo_test --gtest_repeat=-1` | A negative count means repeating forever. | -| `$ foo_test --gtest_repeat=1000 --gtest_break_on_failure` | Repeat foo\_test 1000 times, stopping at the first failure. This is especially useful when running under a debugger: when the testfails, it will drop into the debugger and you can then inspect variables and stacks. | -| `$ foo_test --gtest_repeat=1000 --gtest_filter=FooBar` | Repeat the tests whose name matches the filter 1000 times. | - -If your test program contains global set-up/tear-down code registered -using `AddGlobalTestEnvironment()`, it will be repeated in each -iteration as well, as the flakiness may be in it. You can also specify -the repeat count by setting the `GTEST_REPEAT` environment variable. - -_Availability:_ Linux, Windows, Mac. - -## Shuffling the Tests ## - -You can specify the `--gtest_shuffle` flag (or set the `GTEST_SHUFFLE` -environment variable to `1`) to run the tests in a program in a random -order. This helps to reveal bad dependencies between tests. - -By default, Google Test uses a random seed calculated from the current -time. Therefore you'll get a different order every time. The console -output includes the random seed value, such that you can reproduce an -order-related test failure later. To specify the random seed -explicitly, use the `--gtest_random_seed=SEED` flag (or set the -`GTEST_RANDOM_SEED` environment variable), where `SEED` is an integer -between 0 and 99999. The seed value 0 is special: it tells Google Test -to do the default behavior of calculating the seed from the current -time. - -If you combine this with `--gtest_repeat=N`, Google Test will pick a -different random seed and re-shuffle the tests in each iteration. - -_Availability:_ Linux, Windows, Mac; since v1.4.0. - -## Controlling Test Output ## - -This section teaches how to tweak the way test results are reported. - -### Colored Terminal Output ### - -Google Test can use colors in its terminal output to make it easier to spot -the separation between tests, and whether tests passed. - -You can set the GTEST\_COLOR environment variable or set the `--gtest_color` -command line flag to `yes`, `no`, or `auto` (the default) to enable colors, -disable colors, or let Google Test decide. When the value is `auto`, Google -Test will use colors if and only if the output goes to a terminal and (on -non-Windows platforms) the `TERM` environment variable is set to `xterm` or -`xterm-color`. - -_Availability:_ Linux, Windows, Mac. - -### Suppressing the Elapsed Time ### - -By default, Google Test prints the time it takes to run each test. To -suppress that, run the test program with the `--gtest_print_time=0` -command line flag. Setting the `GTEST_PRINT_TIME` environment -variable to `0` has the same effect. - -_Availability:_ Linux, Windows, Mac. (In Google Test 1.3.0 and lower, -the default behavior is that the elapsed time is **not** printed.) - -### Generating an XML Report ### - -Google Test can emit a detailed XML report to a file in addition to its normal -textual output. The report contains the duration of each test, and thus can -help you identify slow tests. - -To generate the XML report, set the `GTEST_OUTPUT` environment variable or the -`--gtest_output` flag to the string `"xml:_path_to_output_file_"`, which will -create the file at the given location. You can also just use the string -`"xml"`, in which case the output can be found in the `test_detail.xml` file in -the current directory. - -If you specify a directory (for example, `"xml:output/directory/"` on Linux or -`"xml:output\directory\"` on Windows), Google Test will create the XML file in -that directory, named after the test executable (e.g. `foo_test.xml` for test -program `foo_test` or `foo_test.exe`). If the file already exists (perhaps left -over from a previous run), Google Test will pick a different name (e.g. -`foo_test_1.xml`) to avoid overwriting it. - -The report uses the format described here. It is based on the -`junitreport` Ant task and can be parsed by popular continuous build -systems like [Hudson](https://hudson.dev.java.net/). Since that format -was originally intended for Java, a little interpretation is required -to make it apply to Google Test tests, as shown here: - -``` - - - - - - - - - -``` - - * The root `` element corresponds to the entire test program. - * `` elements correspond to Google Test test cases. - * `` elements correspond to Google Test test functions. - -For instance, the following program - -``` -TEST(MathTest, Addition) { ... } -TEST(MathTest, Subtraction) { ... } -TEST(LogicTest, NonContradiction) { ... } -``` - -could generate this report: - -``` - - - - - - - - - - - - - - - -``` - -Things to note: - - * The `tests` attribute of a `` or `` element tells how many test functions the Google Test program or test case contains, while the `failures` attribute tells how many of them failed. - * The `time` attribute expresses the duration of the test, test case, or entire test program in milliseconds. - * Each `` element corresponds to a single failed Google Test assertion. - * Some JUnit concepts don't apply to Google Test, yet we have to conform to the DTD. Therefore you'll see some dummy elements and attributes in the report. You can safely ignore these parts. - -_Availability:_ Linux, Windows, Mac. - -## Controlling How Failures Are Reported ## - -### Turning Assertion Failures into Break-Points ### - -When running test programs under a debugger, it's very convenient if the -debugger can catch an assertion failure and automatically drop into interactive -mode. Google Test's _break-on-failure_ mode supports this behavior. - -To enable it, set the `GTEST_BREAK_ON_FAILURE` environment variable to a value -other than `0` . Alternatively, you can use the `--gtest_break_on_failure` -command line flag. - -_Availability:_ Linux, Windows, Mac. - -### Suppressing Pop-ups Caused by Exceptions ### - -On Windows, Google Test may be used with exceptions enabled. Even when -exceptions are disabled, an application can still throw structured exceptions -(SEH's). If a test throws an exception, by default Google Test doesn't try to -catch it. Instead, you'll see a pop-up dialog, at which point you can attach -the process to a debugger and easily find out what went wrong. - -However, if you don't want to see the pop-ups (for example, if you run the -tests in a batch job), set the `GTEST_CATCH_EXCEPTIONS` environment variable to -a non- `0` value, or use the `--gtest_catch_exceptions` flag. Google Test now -catches all test-thrown exceptions and logs them as failures. - -_Availability:_ Windows. `GTEST_CATCH_EXCEPTIONS` and -`--gtest_catch_exceptions` have no effect on Google Test's behavior on Linux or -Mac, even if exceptions are enabled. It is possible to add support for catching -exceptions on these platforms, but it is not implemented yet. - -### Letting Another Testing Framework Drive ### - -If you work on a project that has already been using another testing -framework and is not ready to completely switch to Google Test yet, -you can get much of Google Test's benefit by using its assertions in -your existing tests. Just change your `main()` function to look -like: - -``` -#include - -int main(int argc, char** argv) { - ::testing::GTEST_FLAG(throw_on_failure) = true; - // Important: Google Test must be initialized. - ::testing::InitGoogleTest(&argc, argv); - - ... whatever your existing testing framework requires ... -} -``` - -With that, you can use Google Test assertions in addition to the -native assertions your testing framework provides, for example: - -``` -void TestFooDoesBar() { - Foo foo; - EXPECT_LE(foo.Bar(1), 100); // A Google Test assertion. - CPPUNIT_ASSERT(foo.IsEmpty()); // A native assertion. -} -``` - -If a Google Test assertion fails, it will print an error message and -throw an exception, which will be treated as a failure by your host -testing framework. If you compile your code with exceptions disabled, -a failed Google Test assertion will instead exit your program with a -non-zero code, which will also signal a test failure to your test -runner. - -If you don't write `::testing::GTEST_FLAG(throw_on_failure) = true;` in -your `main()`, you can alternatively enable this feature by specifying -the `--gtest_throw_on_failure` flag on the command-line or setting the -`GTEST_THROW_ON_FAILURE` environment variable to a non-zero value. - -_Availability:_ Linux, Windows, Mac; since v1.3.0. - -## Distributing Test Functions to Multiple Machines ## - -If you have more than one machine you can use to run a test program, -you might want to run the test functions in parallel and get the -result faster. We call this technique _sharding_, where each machine -is called a _shard_. - -Google Test is compatible with test sharding. To take advantage of -this feature, your test runner (not part of Google Test) needs to do -the following: - - 1. Allocate a number of machines (shards) to run the tests. - 1. On each shard, set the `GTEST_TOTAL_SHARDS` environment variable to the total number of shards. It must be the same for all shards. - 1. On each shard, set the `GTEST_SHARD_INDEX` environment variable to the index of the shard. Different shards must be assigned different indices, which must be in the range `[0, GTEST_TOTAL_SHARDS - 1]`. - 1. Run the same test program on all shards. When Google Test sees the above two environment variables, it will select a subset of the test functions to run. Across all shards, each test function in the program will be run exactly once. - 1. Wait for all shards to finish, then collect and report the results. - -Your project may have tests that were written without Google Test and -thus don't understand this protocol. In order for your test runner to -figure out which test supports sharding, it can set the environment -variable `GTEST_SHARD_STATUS_FILE` to a non-existent file path. If a -test program supports sharding, it will create this file to -acknowledge the fact (the actual contents of the file are not -important at this time; although we may stick some useful information -in it in the future.); otherwise it will not create it. - -Here's an example to make it clear. Suppose you have a test program -`foo_test` that contains the following 5 test functions: -``` -TEST(A, V) -TEST(A, W) -TEST(B, X) -TEST(B, Y) -TEST(B, Z) -``` -and you have 3 machines at your disposal. To run the test functions in -parallel, you would set `GTEST_TOTAL_SHARDS` to 3 on all machines, and -set `GTEST_SHARD_INDEX` to 0, 1, and 2 on the machines respectively. -Then you would run the same `foo_test` on each machine. - -Google Test reserves the right to change how the work is distributed -across the shards, but here's one possible scenario: - - * Machine #0 runs `A.V` and `B.X`. - * Machine #1 runs `A.W` and `B.Y`. - * Machine #2 runs `B.Z`. - -_Availability:_ Linux, Windows, Mac; since version 1.3.0. - -# Fusing Google Test Source Files # - -Google Test's implementation consists of ~30 files (excluding its own -tests). Sometimes you may want them to be packaged up in two files (a -`.h` and a `.cc`) instead, such that you can easily copy them to a new -machine and start hacking there. For this we provide an experimental -Python script `fuse_gtest_files.py` in the `scripts/` directory (since release 1.3.0). -Assuming you have Python 2.4 or above installed on your machine, just -go to that directory and run -``` -python fuse_gtest_files.py OUTPUT_DIR -``` - -and you should see an `OUTPUT_DIR` directory being created with files -`gtest/gtest.h` and `gtest/gtest-all.cc` in it. These files contain -everything you need to use Google Test. Just copy them to anywhere -you want and you are ready to write tests. You can use the -[scrpts/test/Makefile](../scripts/test/Makefile) -file as an example on how to compile your tests against them. - -# Where to Go from Here # - -Congratulations! You've now learned more advanced Google Test tools and are -ready to tackle more complex testing tasks. If you want to dive even deeper, you -can read the [FAQ](V1_5_FAQ.md). diff --git a/test/gtest-1.8.0/docs/V1_5_Documentation.md b/test/gtest-1.8.0/docs/V1_5_Documentation.md deleted file mode 100644 index 46bba2ec86..0000000000 --- a/test/gtest-1.8.0/docs/V1_5_Documentation.md +++ /dev/null @@ -1,12 +0,0 @@ -This page lists all official documentation wiki pages for Google Test **1.5.0** -- **if you use a different version of Google Test, make sure to read the documentation for that version instead.** - - * [Primer](V1_5_Primer.md) -- start here if you are new to Google Test. - * [Samples](Samples.md) -- learn from examples. - * [AdvancedGuide](V1_5_AdvancedGuide.md) -- learn more about Google Test. - * [XcodeGuide](V1_5_XcodeGuide.md) -- how to use Google Test in Xcode on Mac. - * [Frequently-Asked Questions](V1_5_FAQ.md) -- check here before asking a question on the mailing list. - -To contribute code to Google Test, read: - - * DevGuide -- read this _before_ writing your first patch. - * [PumpManual](V1_5_PumpManual.md) -- how we generate some of Google Test's source files. \ No newline at end of file diff --git a/test/gtest-1.8.0/docs/V1_5_FAQ.md b/test/gtest-1.8.0/docs/V1_5_FAQ.md deleted file mode 100644 index e870aff000..0000000000 --- a/test/gtest-1.8.0/docs/V1_5_FAQ.md +++ /dev/null @@ -1,886 +0,0 @@ - - -If you cannot find the answer to your question here, and you have read -[Primer](V1_5_Primer.md) and [AdvancedGuide](V1_5_AdvancedGuide.md), send it to -googletestframework@googlegroups.com. - -## Why should I use Google Test instead of my favorite C++ testing framework? ## - -First, let's say clearly that we don't want to get into the debate of -which C++ testing framework is **the best**. There exist many fine -frameworks for writing C++ tests, and we have tremendous respect for -the developers and users of them. We don't think there is (or will -be) a single best framework - you have to pick the right tool for the -particular task you are tackling. - -We created Google Test because we couldn't find the right combination -of features and conveniences in an existing framework to satisfy _our_ -needs. The following is a list of things that _we_ like about Google -Test. We don't claim them to be unique to Google Test - rather, the -combination of them makes Google Test the choice for us. We hope this -list can help you decide whether it is for you too. - - * Google Test is designed to be portable. It works where many STL types (e.g. `std::string` and `std::vector`) don't compile. It doesn't require exceptions or RTTI. As a result, it runs on Linux, Mac OS X, Windows and several embedded operating systems. - * Nonfatal assertions (`EXPECT_*`) have proven to be great time savers, as they allow a test to report multiple failures in a single edit-compile-test cycle. - * It's easy to write assertions that generate informative messages: you just use the stream syntax to append any additional information, e.g. `ASSERT_EQ(5, Foo(i)) << " where i = " << i;`. It doesn't require a new set of macros or special functions. - * Google Test automatically detects your tests and doesn't require you to enumerate them in order to run them. - * No framework can anticipate all your needs, so Google Test provides `EXPECT_PRED*` to make it easy to extend your assertion vocabulary. For a nicer syntax, you can define your own assertion macros trivially in terms of `EXPECT_PRED*`. - * Death tests are pretty handy for ensuring that your asserts in production code are triggered by the right conditions. - * `SCOPED_TRACE` helps you understand the context of an assertion failure when it comes from inside a sub-routine or loop. - * You can decide which tests to run using name patterns. This saves time when you want to quickly reproduce a test failure. - -## How do I generate 64-bit binaries on Windows (using Visual Studio 2008)? ## - -(Answered by Trevor Robinson) - -Load the supplied Visual Studio solution file, either `msvc\gtest-md.sln` or -`msvc\gtest.sln`. Go through the migration wizard to migrate the -solution and project files to Visual Studio 2008. Select -`Configuration Manager...` from the `Build` menu. Select `` from -the `Active solution platform` dropdown. Select `x64` from the new -platform dropdown, leave `Copy settings from` set to `Win32` and -`Create new project platforms` checked, then click `OK`. You now have -`Win32` and `x64` platform configurations, selectable from the -`Standard` toolbar, which allow you to toggle between building 32-bit or -64-bit binaries (or both at once using Batch Build). - -In order to prevent build output files from overwriting one another, -you'll need to change the `Intermediate Directory` settings for the -newly created platform configuration across all the projects. To do -this, multi-select (e.g. using shift-click) all projects (but not the -solution) in the `Solution Explorer`. Right-click one of them and -select `Properties`. In the left pane, select `Configuration Properties`, -and from the `Configuration` dropdown, select `All Configurations`. -Make sure the selected platform is `x64`. For the -`Intermediate Directory` setting, change the value from -`$(PlatformName)\$(ConfigurationName)` to -`$(OutDir)\$(ProjectName)`. Click `OK` and then build the -solution. When the build is complete, the 64-bit binaries will be in -the `msvc\x64\Debug` directory. - -## Can I use Google Test on MinGW? ## - -We haven't tested this ourselves, but Per Abrahamsen reported that he -was able to compile and install Google Test successfully when using -MinGW from Cygwin. You'll need to configure it with: - -`PATH/TO/configure CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin"` - -You should be able to replace the `-mno-cygwin` option with direct links -to the real MinGW binaries, but we haven't tried that. - -Caveats: - - * There are many warnings when compiling. - * `make check` will produce some errors as not all tests for Google Test itself are compatible with MinGW. - -We also have reports on successful cross compilation of Google Test MinGW binaries on Linux using [these instructions](http://wiki.wxwidgets.org/Cross-Compiling_Under_Linux#Cross-compiling_under_Linux_for_MS_Windows) on the WxWidgets site. - -Please contact `googletestframework@googlegroups.com` if you are -interested in improving the support for MinGW. - -## Why does Google Test support EXPECT\_EQ(NULL, ptr) and ASSERT\_EQ(NULL, ptr) but not EXPECT\_NE(NULL, ptr) and ASSERT\_NE(NULL, ptr)? ## - -Due to some peculiarity of C++, it requires some non-trivial template -meta programming tricks to support using `NULL` as an argument of the -`EXPECT_XX()` and `ASSERT_XX()` macros. Therefore we only do it where -it's most needed (otherwise we make the implementation of Google Test -harder to maintain and more error-prone than necessary). - -The `EXPECT_EQ()` macro takes the _expected_ value as its first -argument and the _actual_ value as the second. It's reasonable that -someone wants to write `EXPECT_EQ(NULL, some_expression)`, and this -indeed was requested several times. Therefore we implemented it. - -The need for `EXPECT_NE(NULL, ptr)` isn't nearly as strong. When the -assertion fails, you already know that `ptr` must be `NULL`, so it -doesn't add any information to print ptr in this case. That means -`EXPECT_TRUE(ptr ! NULL)` works just as well. - -If we were to support `EXPECT_NE(NULL, ptr)`, for consistency we'll -have to support `EXPECT_NE(ptr, NULL)` as well, as unlike `EXPECT_EQ`, -we don't have a convention on the order of the two arguments for -`EXPECT_NE`. This means using the template meta programming tricks -twice in the implementation, making it even harder to understand and -maintain. We believe the benefit doesn't justify the cost. - -Finally, with the growth of Google Mock's [matcher](../../CookBook.md#using-matchers-in-google-test-assertions) library, we are -encouraging people to use the unified `EXPECT_THAT(value, matcher)` -syntax more often in tests. One significant advantage of the matcher -approach is that matchers can be easily combined to form new matchers, -while the `EXPECT_NE`, etc, macros cannot be easily -combined. Therefore we want to invest more in the matchers than in the -`EXPECT_XX()` macros. - -## Does Google Test support running tests in parallel? ## - -Test runners tend to be tightly coupled with the build/test -environment, and Google Test doesn't try to solve the problem of -running tests in parallel. Instead, we tried to make Google Test work -nicely with test runners. For example, Google Test's XML report -contains the time spent on each test, and its `gtest_list_tests` and -`gtest_filter` flags can be used for splitting the execution of test -methods into multiple processes. These functionalities can help the -test runner run the tests in parallel. - -## Why don't Google Test run the tests in different threads to speed things up? ## - -It's difficult to write thread-safe code. Most tests are not written -with thread-safety in mind, and thus may not work correctly in a -multi-threaded setting. - -If you think about it, it's already hard to make your code work when -you know what other threads are doing. It's much harder, and -sometimes even impossible, to make your code work when you don't know -what other threads are doing (remember that test methods can be added, -deleted, or modified after your test was written). If you want to run -the tests in parallel, you'd better run them in different processes. - -## Why aren't Google Test assertions implemented using exceptions? ## - -Our original motivation was to be able to use Google Test in projects -that disable exceptions. Later we realized some additional benefits -of this approach: - - 1. Throwing in a destructor is undefined behavior in C++. Not using exceptions means Google Test's assertions are safe to use in destructors. - 1. The `EXPECT_*` family of macros will continue even after a failure, allowing multiple failures in a `TEST` to be reported in a single run. This is a popular feature, as in C++ the edit-compile-test cycle is usually quite long and being able to fixing more than one thing at a time is a blessing. - 1. If assertions are implemented using exceptions, a test may falsely ignore a failure if it's caught by user code: -``` -try { ... ASSERT_TRUE(...) ... } -catch (...) { ... } -``` -The above code will pass even if the `ASSERT_TRUE` throws. While it's unlikely for someone to write this in a test, it's possible to run into this pattern when you write assertions in callbacks that are called by the code under test. - -The downside of not using exceptions is that `ASSERT_*` (implemented -using `return`) will only abort the current function, not the current -`TEST`. - -## Why do we use two different macros for tests with and without fixtures? ## - -Unfortunately, C++'s macro system doesn't allow us to use the same -macro for both cases. One possibility is to provide only one macro -for tests with fixtures, and require the user to define an empty -fixture sometimes: - -``` -class FooTest : public ::testing::Test {}; - -TEST_F(FooTest, DoesThis) { ... } -``` -or -``` -typedef ::testing::Test FooTest; - -TEST_F(FooTest, DoesThat) { ... } -``` - -Yet, many people think this is one line too many. :-) Our goal was to -make it really easy to write tests, so we tried to make simple tests -trivial to create. That means using a separate macro for such tests. - -We think neither approach is ideal, yet either of them is reasonable. -In the end, it probably doesn't matter much either way. - -## Why don't we use structs as test fixtures? ## - -We like to use structs only when representing passive data. This -distinction between structs and classes is good for documenting the -intent of the code's author. Since test fixtures have logic like -`SetUp()` and `TearDown()`, they are better defined as classes. - -## Why are death tests implemented as assertions instead of using a test runner? ## - -Our goal was to make death tests as convenient for a user as C++ -possibly allows. In particular: - - * The runner-style requires to split the information into two pieces: the definition of the death test itself, and the specification for the runner on how to run the death test and what to expect. The death test would be written in C++, while the runner spec may or may not be. A user needs to carefully keep the two in sync. `ASSERT_DEATH(statement, expected_message)` specifies all necessary information in one place, in one language, without boilerplate code. It is very declarative. - * `ASSERT_DEATH` has a similar syntax and error-reporting semantics as other Google Test assertions, and thus is easy to learn. - * `ASSERT_DEATH` can be mixed with other assertions and other logic at your will. You are not limited to one death test per test method. For example, you can write something like: -``` - if (FooCondition()) { - ASSERT_DEATH(Bar(), "blah"); - } else { - ASSERT_EQ(5, Bar()); - } -``` -If you prefer one death test per test method, you can write your tests in that style too, but we don't want to impose that on the users. The fewer artificial limitations the better. - * `ASSERT_DEATH` can reference local variables in the current function, and you can decide how many death tests you want based on run-time information. For example, -``` - const int count = GetCount(); // Only known at run time. - for (int i = 1; i <= count; i++) { - ASSERT_DEATH({ - double* buffer = new double[i]; - ... initializes buffer ... - Foo(buffer, i) - }, "blah blah"); - } -``` -The runner-based approach tends to be more static and less flexible, or requires more user effort to get this kind of flexibility. - -Another interesting thing about `ASSERT_DEATH` is that it calls `fork()` -to create a child process to run the death test. This is lightening -fast, as `fork()` uses copy-on-write pages and incurs almost zero -overhead, and the child process starts from the user-supplied -statement directly, skipping all global and local initialization and -any code leading to the given statement. If you launch the child -process from scratch, it can take seconds just to load everything and -start running if the test links to many libraries dynamically. - -## My death test modifies some state, but the change seems lost after the death test finishes. Why? ## - -Death tests (`EXPECT_DEATH`, etc) are executed in a sub-process s.t. the -expected crash won't kill the test program (i.e. the parent process). As a -result, any in-memory side effects they incur are observable in their -respective sub-processes, but not in the parent process. You can think of them -as running in a parallel universe, more or less. - -## The compiler complains about "undefined references" to some static const member variables, but I did define them in the class body. What's wrong? ## - -If your class has a static data member: - -``` -// foo.h -class Foo { - ... - static const int kBar = 100; -}; -``` - -You also need to define it _outside_ of the class body in `foo.cc`: - -``` -const int Foo::kBar; // No initializer here. -``` - -Otherwise your code is **invalid C++**, and may break in unexpected ways. In -particular, using it in Google Test comparison assertions (`EXPECT_EQ`, etc) -will generate an "undefined reference" linker error. - -## I have an interface that has several implementations. Can I write a set of tests once and repeat them over all the implementations? ## - -Google Test doesn't yet have good support for this kind of tests, or -data-driven tests in general. We hope to be able to make improvements in this -area soon. - -## Can I derive a test fixture from another? ## - -Yes. - -Each test fixture has a corresponding and same named test case. This means only -one test case can use a particular fixture. Sometimes, however, multiple test -cases may want to use the same or slightly different fixtures. For example, you -may want to make sure that all of a GUI library's test cases don't leak -important system resources like fonts and brushes. - -In Google Test, you share a fixture among test cases by putting the shared -logic in a base test fixture, then deriving from that base a separate fixture -for each test case that wants to use this common logic. You then use `TEST_F()` -to write tests using each derived fixture. - -Typically, your code looks like this: - -``` -// Defines a base test fixture. -class BaseTest : public ::testing::Test { - protected: - ... -}; - -// Derives a fixture FooTest from BaseTest. -class FooTest : public BaseTest { - protected: - virtual void SetUp() { - BaseTest::SetUp(); // Sets up the base fixture first. - ... additional set-up work ... - } - virtual void TearDown() { - ... clean-up work for FooTest ... - BaseTest::TearDown(); // Remember to tear down the base fixture - // after cleaning up FooTest! - } - ... functions and variables for FooTest ... -}; - -// Tests that use the fixture FooTest. -TEST_F(FooTest, Bar) { ... } -TEST_F(FooTest, Baz) { ... } - -... additional fixtures derived from BaseTest ... -``` - -If necessary, you can continue to derive test fixtures from a derived fixture. -Google Test has no limit on how deep the hierarchy can be. - -For a complete example using derived test fixtures, see -`samples/sample5_unittest.cc`. - -## My compiler complains "void value not ignored as it ought to be." What does this mean? ## - -You're probably using an `ASSERT_*()` in a function that doesn't return `void`. -`ASSERT_*()` can only be used in `void` functions. - -## My death test hangs (or seg-faults). How do I fix it? ## - -In Google Test, death tests are run in a child process and the way they work is -delicate. To write death tests you really need to understand how they work. -Please make sure you have read this. - -In particular, death tests don't like having multiple threads in the parent -process. So the first thing you can try is to eliminate creating threads -outside of `EXPECT_DEATH()`. - -Sometimes this is impossible as some library you must use may be creating -threads before `main()` is even reached. In this case, you can try to minimize -the chance of conflicts by either moving as many activities as possible inside -`EXPECT_DEATH()` (in the extreme case, you want to move everything inside), or -leaving as few things as possible in it. Also, you can try to set the death -test style to `"threadsafe"`, which is safer but slower, and see if it helps. - -If you go with thread-safe death tests, remember that they rerun the test -program from the beginning in the child process. Therefore make sure your -program can run side-by-side with itself and is deterministic. - -In the end, this boils down to good concurrent programming. You have to make -sure that there is no race conditions or dead locks in your program. No silver -bullet - sorry! - -## Should I use the constructor/destructor of the test fixture or the set-up/tear-down function? ## - -The first thing to remember is that Google Test does not reuse the -same test fixture object across multiple tests. For each `TEST_F`, -Google Test will create a fresh test fixture object, _immediately_ -call `SetUp()`, run the test, call `TearDown()`, and then -_immediately_ delete the test fixture object. Therefore, there is no -need to write a `SetUp()` or `TearDown()` function if the constructor -or destructor already does the job. - -You may still want to use `SetUp()/TearDown()` in the following cases: - * If the tear-down operation could throw an exception, you must use `TearDown()` as opposed to the destructor, as throwing in a destructor leads to undefined behavior and usually will kill your program right away. Note that many standard libraries (like STL) may throw when exceptions are enabled in the compiler. Therefore you should prefer `TearDown()` if you want to write portable tests that work with or without exceptions. - * The Google Test team is considering making the assertion macros throw on platforms where exceptions are enabled (e.g. Windows, Mac OS, and Linux client-side), which will eliminate the need for the user to propagate failures from a subroutine to its caller. Therefore, you shouldn't use Google Test assertions in a destructor if your code could run on such a platform. - * In a constructor or destructor, you cannot make a virtual function call on this object. (You can call a method declared as virtual, but it will be statically bound.) Therefore, if you need to call a method that will be overriden in a derived class, you have to use `SetUp()/TearDown()`. - -## The compiler complains "no matching function to call" when I use ASSERT\_PREDn. How do I fix it? ## - -If the predicate function you use in `ASSERT_PRED*` or `EXPECT_PRED*` is -overloaded or a template, the compiler will have trouble figuring out which -overloaded version it should use. `ASSERT_PRED_FORMAT*` and -`EXPECT_PRED_FORMAT*` don't have this problem. - -If you see this error, you might want to switch to -`(ASSERT|EXPECT)_PRED_FORMAT*`, which will also give you a better failure -message. If, however, that is not an option, you can resolve the problem by -explicitly telling the compiler which version to pick. - -For example, suppose you have - -``` -bool IsPositive(int n) { - return n > 0; -} -bool IsPositive(double x) { - return x > 0; -} -``` - -you will get a compiler error if you write - -``` -EXPECT_PRED1(IsPositive, 5); -``` - -However, this will work: - -``` -EXPECT_PRED1(*static_cast*(IsPositive), 5); -``` - -(The stuff inside the angled brackets for the `static_cast` operator is the -type of the function pointer for the `int`-version of `IsPositive()`.) - -As another example, when you have a template function - -``` -template -bool IsNegative(T x) { - return x < 0; -} -``` - -you can use it in a predicate assertion like this: - -``` -ASSERT_PRED1(IsNegative**, -5); -``` - -Things are more interesting if your template has more than one parameters. The -following won't compile: - -``` -ASSERT_PRED2(*GreaterThan*, 5, 0); -``` - - -as the C++ pre-processor thinks you are giving `ASSERT_PRED2` 4 arguments, -which is one more than expected. The workaround is to wrap the predicate -function in parentheses: - -``` -ASSERT_PRED2(*(GreaterThan)*, 5, 0); -``` - - -## My compiler complains about "ignoring return value" when I call RUN\_ALL\_TESTS(). Why? ## - -Some people had been ignoring the return value of `RUN_ALL_TESTS()`. That is, -instead of - -``` -return RUN_ALL_TESTS(); -``` - -they write - -``` -RUN_ALL_TESTS(); -``` - -This is wrong and dangerous. A test runner needs to see the return value of -`RUN_ALL_TESTS()` in order to determine if a test has passed. If your `main()` -function ignores it, your test will be considered successful even if it has a -Google Test assertion failure. Very bad. - -To help the users avoid this dangerous bug, the implementation of -`RUN_ALL_TESTS()` causes gcc to raise this warning, when the return value is -ignored. If you see this warning, the fix is simple: just make sure its value -is used as the return value of `main()`. - -## My compiler complains that a constructor (or destructor) cannot return a value. What's going on? ## - -Due to a peculiarity of C++, in order to support the syntax for streaming -messages to an `ASSERT_*`, e.g. - -``` -ASSERT_EQ(1, Foo()) << "blah blah" << foo; -``` - -we had to give up using `ASSERT*` and `FAIL*` (but not `EXPECT*` and -`ADD_FAILURE*`) in constructors and destructors. The workaround is to move the -content of your constructor/destructor to a private void member function, or -switch to `EXPECT_*()` if that works. This section in the user's guide explains -it. - -## My set-up function is not called. Why? ## - -C++ is case-sensitive. It should be spelled as `SetUp()`. Did you -spell it as `Setup()`? - -Similarly, sometimes people spell `SetUpTestCase()` as `SetupTestCase()` and -wonder why it's never called. - -## How do I jump to the line of a failure in Emacs directly? ## - -Google Test's failure message format is understood by Emacs and many other -IDEs, like acme and XCode. If a Google Test message is in a compilation buffer -in Emacs, then it's clickable. You can now hit `enter` on a message to jump to -the corresponding source code, or use `C-x `` to jump to the next failure. - -## I have several test cases which share the same test fixture logic, do I have to define a new test fixture class for each of them? This seems pretty tedious. ## - -You don't have to. Instead of - -``` -class FooTest : public BaseTest {}; - -TEST_F(FooTest, Abc) { ... } -TEST_F(FooTest, Def) { ... } - -class BarTest : public BaseTest {}; - -TEST_F(BarTest, Abc) { ... } -TEST_F(BarTest, Def) { ... } -``` - -you can simply `typedef` the test fixtures: -``` -typedef BaseTest FooTest; - -TEST_F(FooTest, Abc) { ... } -TEST_F(FooTest, Def) { ... } - -typedef BaseTest BarTest; - -TEST_F(BarTest, Abc) { ... } -TEST_F(BarTest, Def) { ... } -``` - -## The Google Test output is buried in a whole bunch of log messages. What do I do? ## - -The Google Test output is meant to be a concise and human-friendly report. If -your test generates textual output itself, it will mix with the Google Test -output, making it hard to read. However, there is an easy solution to this -problem. - -Since most log messages go to stderr, we decided to let Google Test output go -to stdout. This way, you can easily separate the two using redirection. For -example: -``` -./my_test > googletest_output.txt -``` - -## Why should I prefer test fixtures over global variables? ## - -There are several good reasons: - 1. It's likely your test needs to change the states of its global variables. This makes it difficult to keep side effects from escaping one test and contaminating others, making debugging difficult. By using fixtures, each test has a fresh set of variables that's different (but with the same names). Thus, tests are kept independent of each other. - 1. Global variables pollute the global namespace. - 1. Test fixtures can be reused via subclassing, which cannot be done easily with global variables. This is useful if many test cases have something in common. - -## How do I test private class members without writing FRIEND\_TEST()s? ## - -You should try to write testable code, which means classes should be easily -tested from their public interface. One way to achieve this is the Pimpl idiom: -you move all private members of a class into a helper class, and make all -members of the helper class public. - -You have several other options that don't require using `FRIEND_TEST`: - * Write the tests as members of the fixture class: -``` -class Foo { - friend class FooTest; - ... -}; - -class FooTest : public ::testing::Test { - protected: - ... - void Test1() {...} // This accesses private members of class Foo. - void Test2() {...} // So does this one. -}; - -TEST_F(FooTest, Test1) { - Test1(); -} - -TEST_F(FooTest, Test2) { - Test2(); -} -``` - * In the fixture class, write accessors for the tested class' private members, then use the accessors in your tests: -``` -class Foo { - friend class FooTest; - ... -}; - -class FooTest : public ::testing::Test { - protected: - ... - T1 get_private_member1(Foo* obj) { - return obj->private_member1_; - } -}; - -TEST_F(FooTest, Test1) { - ... - get_private_member1(x) - ... -} -``` - * If the methods are declared **protected**, you can change their access level in a test-only subclass: -``` -class YourClass { - ... - protected: // protected access for testability. - int DoSomethingReturningInt(); - ... -}; - -// in the your_class_test.cc file: -class TestableYourClass : public YourClass { - ... - public: using YourClass::DoSomethingReturningInt; // changes access rights - ... -}; - -TEST_F(YourClassTest, DoSomethingTest) { - TestableYourClass obj; - assertEquals(expected_value, obj.DoSomethingReturningInt()); -} -``` - -## How do I test private class static members without writing FRIEND\_TEST()s? ## - -We find private static methods clutter the header file. They are -implementation details and ideally should be kept out of a .h. So often I make -them free functions instead. - -Instead of: -``` -// foo.h -class Foo { - ... - private: - static bool Func(int n); -}; - -// foo.cc -bool Foo::Func(int n) { ... } - -// foo_test.cc -EXPECT_TRUE(Foo::Func(12345)); -``` - -You probably should better write: -``` -// foo.h -class Foo { - ... -}; - -// foo.cc -namespace internal { - bool Func(int n) { ... } -} - -// foo_test.cc -namespace internal { - bool Func(int n); -} - -EXPECT_TRUE(internal::Func(12345)); -``` - -## I would like to run a test several times with different parameters. Do I need to write several similar copies of it? ## - -No. You can use a feature called [value-parameterized tests](V1_5_AdvancedGuide.md#Value_Parameterized_Tests) which -lets you repeat your tests with different parameters, without defining it more than once. - -## How do I test a file that defines main()? ## - -To test a `foo.cc` file, you need to compile and link it into your unit test -program. However, when the file contains a definition for the `main()` -function, it will clash with the `main()` of your unit test, and will result in -a build error. - -The right solution is to split it into three files: - 1. `foo.h` which contains the declarations, - 1. `foo.cc` which contains the definitions except `main()`, and - 1. `foo_main.cc` which contains nothing but the definition of `main()`. - -Then `foo.cc` can be easily tested. - -If you are adding tests to an existing file and don't want an intrusive change -like this, there is a hack: just include the entire `foo.cc` file in your unit -test. For example: -``` -// File foo_unittest.cc - -// The headers section -... - -// Renames main() in foo.cc to make room for the unit test main() -#define main FooMain - -#include "a/b/foo.cc" - -// The tests start here. -... -``` - - -However, please remember this is a hack and should only be used as the last -resort. - -## What can the statement argument in ASSERT\_DEATH() be? ## - -`ASSERT_DEATH(_statement_, _regex_)` (or any death assertion macro) can be used -wherever `_statement_` is valid. So basically `_statement_` can be any C++ -statement that makes sense in the current context. In particular, it can -reference global and/or local variables, and can be: - * a simple function call (often the case), - * a complex expression, or - * a compound statement. - -> Some examples are shown here: - -``` -// A death test can be a simple function call. -TEST(MyDeathTest, FunctionCall) { - ASSERT_DEATH(Xyz(5), "Xyz failed"); -} - -// Or a complex expression that references variables and functions. -TEST(MyDeathTest, ComplexExpression) { - const bool c = Condition(); - ASSERT_DEATH((c ? Func1(0) : object2.Method("test")), - "(Func1|Method) failed"); -} - -// Death assertions can be used any where in a function. In -// particular, they can be inside a loop. -TEST(MyDeathTest, InsideLoop) { - // Verifies that Foo(0), Foo(1), ..., and Foo(4) all die. - for (int i = 0; i < 5; i++) { - EXPECT_DEATH_M(Foo(i), "Foo has \\d+ errors", - ::testing::Message() << "where i is " << i); - } -} - -// A death assertion can contain a compound statement. -TEST(MyDeathTest, CompoundStatement) { - // Verifies that at lease one of Bar(0), Bar(1), ..., and - // Bar(4) dies. - ASSERT_DEATH({ - for (int i = 0; i < 5; i++) { - Bar(i); - } - }, - "Bar has \\d+ errors");} -``` - -`googletest_unittest.cc` contains more examples if you are interested. - -## What syntax does the regular expression in ASSERT\_DEATH use? ## - -On POSIX systems, Google Test uses the POSIX Extended regular -expression syntax -(http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions). On -Windows, it uses a limited variant of regular expression syntax. For -more details, see the [regular expression syntax](V1_5_AdvancedGuide.md#Regular_Expression_Syntax). - -## I have a fixture class Foo, but TEST\_F(Foo, Bar) gives me error "no matching function for call to Foo::Foo()". Why? ## - -Google Test needs to be able to create objects of your test fixture class, so -it must have a default constructor. Normally the compiler will define one for -you. However, there are cases where you have to define your own: - * If you explicitly declare a non-default constructor for class `Foo`, then you need to define a default constructor, even if it would be empty. - * If `Foo` has a const non-static data member, then you have to define the default constructor _and_ initialize the const member in the initializer list of the constructor. (Early versions of `gcc` doesn't force you to initialize the const member. It's a bug that has been fixed in `gcc 4`.) - -## Why does ASSERT\_DEATH complain about previous threads that were already joined? ## - -With the Linux pthread library, there is no turning back once you cross the -line from single thread to multiple threads. The first time you create a -thread, a manager thread is created in addition, so you get 3, not 2, threads. -Later when the thread you create joins the main thread, the thread count -decrements by 1, but the manager thread will never be killed, so you still have -2 threads, which means you cannot safely run a death test. - -The new NPTL thread library doesn't suffer from this problem, as it doesn't -create a manager thread. However, if you don't control which machine your test -runs on, you shouldn't depend on this. - -## Why does Google Test require the entire test case, instead of individual tests, to be named FOODeathTest when it uses ASSERT\_DEATH? ## - -Google Test does not interleave tests from different test cases. That is, it -runs all tests in one test case first, and then runs all tests in the next test -case, and so on. Google Test does this because it needs to set up a test case -before the first test in it is run, and tear it down afterwords. Splitting up -the test case would require multiple set-up and tear-down processes, which is -inefficient and makes the semantics unclean. - -If we were to determine the order of tests based on test name instead of test -case name, then we would have a problem with the following situation: - -``` -TEST_F(FooTest, AbcDeathTest) { ... } -TEST_F(FooTest, Uvw) { ... } - -TEST_F(BarTest, DefDeathTest) { ... } -TEST_F(BarTest, Xyz) { ... } -``` - -Since `FooTest.AbcDeathTest` needs to run before `BarTest.Xyz`, and we don't -interleave tests from different test cases, we need to run all tests in the -`FooTest` case before running any test in the `BarTest` case. This contradicts -with the requirement to run `BarTest.DefDeathTest` before `FooTest.Uvw`. - -## But I don't like calling my entire test case FOODeathTest when it contains both death tests and non-death tests. What do I do? ## - -You don't have to, but if you like, you may split up the test case into -`FooTest` and `FooDeathTest`, where the names make it clear that they are -related: - -``` -class FooTest : public ::testing::Test { ... }; - -TEST_F(FooTest, Abc) { ... } -TEST_F(FooTest, Def) { ... } - -typedef FooTest FooDeathTest; - -TEST_F(FooDeathTest, Uvw) { ... EXPECT_DEATH(...) ... } -TEST_F(FooDeathTest, Xyz) { ... ASSERT_DEATH(...) ... } -``` - -## The compiler complains about "no match for 'operator<<'" when I use an assertion. What gives? ## - -If you use a user-defined type `FooType` in an assertion, you must make sure -there is an `std::ostream& operator<<(std::ostream&, const FooType&)` function -defined such that we can print a value of `FooType`. - -In addition, if `FooType` is declared in a name space, the `<<` operator also -needs to be defined in the _same_ name space. - -## How do I suppress the memory leak messages on Windows? ## - -Since the statically initialized Google Test singleton requires allocations on -the heap, the Visual C++ memory leak detector will report memory leaks at the -end of the program run. The easiest way to avoid this is to use the -`_CrtMemCheckpoint` and `_CrtMemDumpAllObjectsSince` calls to not report any -statically initialized heap objects. See MSDN for more details and additional -heap check/debug routines. - -## I am building my project with Google Test in Visual Studio and all I'm getting is a bunch of linker errors (or warnings). Help! ## - -You may get a number of the following linker error or warnings if you -attempt to link your test project with the Google Test library when -your project and the are not built using the same compiler settings. - - * LNK2005: symbol already defined in object - * LNK4217: locally defined symbol 'symbol' imported in function 'function' - * LNK4049: locally defined symbol 'symbol' imported - -The Google Test project (gtest.vcproj) has the Runtime Library option -set to /MT (use multi-threaded static libraries, /MTd for debug). If -your project uses something else, for example /MD (use multi-threaded -DLLs, /MDd for debug), you need to change the setting in the Google -Test project to match your project's. - -To update this setting open the project properties in the Visual -Studio IDE then select the branch Configuration Properties | C/C++ | -Code Generation and change the option "Runtime Library". You may also try -using gtest-md.vcproj instead of gtest.vcproj. - -## I put my tests in a library and Google Test doesn't run them. What's happening? ## -Have you read a -[warning](V1_5_Primer.md#important-note-for-visual-c-users) on -the Google Test Primer page? - -## I want to use Google Test with Visual Studio but don't know where to start. ## -Many people are in your position and one of the posted his solution to -our mailing list. Here is his link: -http://hassanjamilahmad.blogspot.com/2009/07/gtest-starters-help.html. - -## My question is not covered in your FAQ! ## - -If you cannot find the answer to your question in this FAQ, there are -some other resources you can use: - - 1. read other [wiki pages](http://code.google.com/p/googletest/w/list), - 1. search the mailing list [archive](http://groups.google.com/group/googletestframework/topics), - 1. ask it on [googletestframework@googlegroups.com](mailto:googletestframework@googlegroups.com) and someone will answer it (to prevent spam, we require you to join the [discussion group](http://groups.google.com/group/googletestframework) before you can post.). - -Please note that creating an issue in the -[issue tracker](http://code.google.com/p/googletest/issues/list) is _not_ -a good way to get your answer, as it is monitored infrequently by a -very small number of people. - -When asking a question, it's helpful to provide as much of the -following information as possible (people cannot help you if there's -not enough information in your question): - - * the version (or the revision number if you check out from SVN directly) of Google Test you use (Google Test is under active development, so it's possible that your problem has been solved in a later version), - * your operating system, - * the name and version of your compiler, - * the complete command line flags you give to your compiler, - * the complete compiler error messages (if the question is about compilation), - * the _actual_ code (ideally, a minimal but complete program) that has the problem you encounter. diff --git a/test/gtest-1.8.0/docs/V1_5_Primer.md b/test/gtest-1.8.0/docs/V1_5_Primer.md deleted file mode 100644 index 6960d2ce4c..0000000000 --- a/test/gtest-1.8.0/docs/V1_5_Primer.md +++ /dev/null @@ -1,497 +0,0 @@ - - -# Introduction: Why Google C++ Testing Framework? # - -_Google C++ Testing Framework_ helps you write better C++ tests. - -No matter whether you work on Linux, Windows, or a Mac, if you write C++ code, -Google Test can help you. - -So what makes a good test, and how does Google C++ Testing Framework fit in? We believe: - 1. Tests should be _independent_ and _repeatable_. It's a pain to debug a test that succeeds or fails as a result of other tests. Google C++ Testing Framework isolates the tests by running each of them on a different object. When a test fails, Google C++ Testing Framework allows you to run it in isolation for quick debugging. - 1. Tests should be well _organized_ and reflect the structure of the tested code. Google C++ Testing Framework groups related tests into test cases that can share data and subroutines. This common pattern is easy to recognize and makes tests easy to maintain. Such consistency is especially helpful when people switch projects and start to work on a new code base. - 1. Tests should be _portable_ and _reusable_. The open-source community has a lot of code that is platform-neutral, its tests should also be platform-neutral. Google C++ Testing Framework works on different OSes, with different compilers (gcc, MSVC, and others), with or without exceptions, so Google C++ Testing Framework tests can easily work with a variety of configurations. (Note that the current release only contains build scripts for Linux - we are actively working on scripts for other platforms.) - 1. When tests fail, they should provide as much _information_ about the problem as possible. Google C++ Testing Framework doesn't stop at the first test failure. Instead, it only stops the current test and continues with the next. You can also set up tests that report non-fatal failures after which the current test continues. Thus, you can detect and fix multiple bugs in a single run-edit-compile cycle. - 1. The testing framework should liberate test writers from housekeeping chores and let them focus on the test _content_. Google C++ Testing Framework automatically keeps track of all tests defined, and doesn't require the user to enumerate them in order to run them. - 1. Tests should be _fast_. With Google C++ Testing Framework, you can reuse shared resources across tests and pay for the set-up/tear-down only once, without making tests depend on each other. - -Since Google C++ Testing Framework is based on the popular xUnit -architecture, you'll feel right at home if you've used JUnit or PyUnit before. -If not, it will take you about 10 minutes to learn the basics and get started. -So let's go! - -_Note:_ We sometimes refer to Google C++ Testing Framework informally -as _Google Test_. - -# Setting up a New Test Project # - -To write a test program using Google Test, you need to compile Google -Test into a library and link your test with it. We provide build -files for some popular build systems (`msvc/` for Visual Studio, -`xcode/` for Mac Xcode, `make/` for GNU make, `codegear/` for Borland -C++ Builder, and the autotools script in the -Google Test root directory). If your build system is not on this -list, you can take a look at `make/Makefile` to learn how Google Test -should be compiled (basically you want to compile `src/gtest-all.cc` -with `GTEST_ROOT` and `GTEST_ROOT/include` in the header search path, -where `GTEST_ROOT` is the Google Test root directory). - -Once you are able to compile the Google Test library, you should -create a project or build target for your test program. Make sure you -have `GTEST_ROOT/include` in the header search path so that the -compiler can find `` when compiling your test. Set up -your test project to link with the Google Test library (for example, -in Visual Studio, this is done by adding a dependency on -`gtest.vcproj`). - -If you still have questions, take a look at how Google Test's own -tests are built and use them as examples. - -# Basic Concepts # - -When using Google Test, you start by writing _assertions_, which are statements -that check whether a condition is true. An assertion's result can be _success_, -_nonfatal failure_, or _fatal failure_. If a fatal failure occurs, it aborts -the current function; otherwise the program continues normally. - -_Tests_ use assertions to verify the tested code's behavior. If a test crashes -or has a failed assertion, then it _fails_; otherwise it _succeeds_. - -A _test case_ contains one or many tests. You should group your tests into test -cases that reflect the structure of the tested code. When multiple tests in a -test case need to share common objects and subroutines, you can put them into a -_test fixture_ class. - -A _test program_ can contain multiple test cases. - -We'll now explain how to write a test program, starting at the individual -assertion level and building up to tests and test cases. - -# Assertions # - -Google Test assertions are macros that resemble function calls. You test a -class or function by making assertions about its behavior. When an assertion -fails, Google Test prints the assertion's source file and line number location, -along with a failure message. You may also supply a custom failure message -which will be appended to Google Test's message. - -The assertions come in pairs that test the same thing but have different -effects on the current function. `ASSERT_*` versions generate fatal failures -when they fail, and **abort the current function**. `EXPECT_*` versions generate -nonfatal failures, which don't abort the current function. Usually `EXPECT_*` -are preferred, as they allow more than one failures to be reported in a test. -However, you should use `ASSERT_*` if it doesn't make sense to continue when -the assertion in question fails. - -Since a failed `ASSERT_*` returns from the current function immediately, -possibly skipping clean-up code that comes after it, it may cause a space leak. -Depending on the nature of the leak, it may or may not be worth fixing - so -keep this in mind if you get a heap checker error in addition to assertion -errors. - -To provide a custom failure message, simply stream it into the macro using the -`<<` operator, or a sequence of such operators. An example: -``` -ASSERT_EQ(x.size(), y.size()) << "Vectors x and y are of unequal length"; - -for (int i = 0; i < x.size(); ++i) { - EXPECT_EQ(x[i], y[i]) << "Vectors x and y differ at index " << i; -} -``` - -Anything that can be streamed to an `ostream` can be streamed to an assertion -macro--in particular, C strings and `string` objects. If a wide string -(`wchar_t*`, `TCHAR*` in `UNICODE` mode on Windows, or `std::wstring`) is -streamed to an assertion, it will be translated to UTF-8 when printed. - -## Basic Assertions ## - -These assertions do basic true/false condition testing. -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_TRUE(`_condition_`)`; | `EXPECT_TRUE(`_condition_`)`; | _condition_ is true | -| `ASSERT_FALSE(`_condition_`)`; | `EXPECT_FALSE(`_condition_`)`; | _condition_ is false | - -Remember, when they fail, `ASSERT_*` yields a fatal failure and -returns from the current function, while `EXPECT_*` yields a nonfatal -failure, allowing the function to continue running. In either case, an -assertion failure means its containing test fails. - -_Availability_: Linux, Windows, Mac. - -## Binary Comparison ## - -This section describes assertions that compare two values. - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -|`ASSERT_EQ(`_expected_`, `_actual_`);`|`EXPECT_EQ(`_expected_`, `_actual_`);`| _expected_ `==` _actual_ | -|`ASSERT_NE(`_val1_`, `_val2_`);` |`EXPECT_NE(`_val1_`, `_val2_`);` | _val1_ `!=` _val2_ | -|`ASSERT_LT(`_val1_`, `_val2_`);` |`EXPECT_LT(`_val1_`, `_val2_`);` | _val1_ `<` _val2_ | -|`ASSERT_LE(`_val1_`, `_val2_`);` |`EXPECT_LE(`_val1_`, `_val2_`);` | _val1_ `<=` _val2_ | -|`ASSERT_GT(`_val1_`, `_val2_`);` |`EXPECT_GT(`_val1_`, `_val2_`);` | _val1_ `>` _val2_ | -|`ASSERT_GE(`_val1_`, `_val2_`);` |`EXPECT_GE(`_val1_`, `_val2_`);` | _val1_ `>=` _val2_ | - -In the event of a failure, Google Test prints both _val1_ and _val2_ -. In `ASSERT_EQ*` and `EXPECT_EQ*` (and all other equality assertions -we'll introduce later), you should put the expression you want to test -in the position of _actual_, and put its expected value in _expected_, -as Google Test's failure messages are optimized for this convention. - -Value arguments must be comparable by the assertion's comparison operator or -you'll get a compiler error. Values must also support the `<<` operator for -streaming to an `ostream`. All built-in types support this. - -These assertions can work with a user-defined type, but only if you define the -corresponding comparison operator (e.g. `==`, `<`, etc). If the corresponding -operator is defined, prefer using the `ASSERT_*()` macros because they will -print out not only the result of the comparison, but the two operands as well. - -Arguments are always evaluated exactly once. Therefore, it's OK for the -arguments to have side effects. However, as with any ordinary C/C++ function, -the arguments' evaluation order is undefined (i.e. the compiler is free to -choose any order) and your code should not depend on any particular argument -evaluation order. - -`ASSERT_EQ()` does pointer equality on pointers. If used on two C strings, it -tests if they are in the same memory location, not if they have the same value. -Therefore, if you want to compare C strings (e.g. `const char*`) by value, use -`ASSERT_STREQ()` , which will be described later on. In particular, to assert -that a C string is `NULL`, use `ASSERT_STREQ(NULL, c_string)` . However, to -compare two `string` objects, you should use `ASSERT_EQ`. - -Macros in this section work with both narrow and wide string objects (`string` -and `wstring`). - -_Availability_: Linux, Windows, Mac. - -## String Comparison ## - -The assertions in this group compare two **C strings**. If you want to compare -two `string` objects, use `EXPECT_EQ`, `EXPECT_NE`, and etc instead. - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_STREQ(`_expected\_str_`, `_actual\_str_`);` | `EXPECT_STREQ(`_expected\_str_`, `_actual\_str_`);` | the two C strings have the same content | -| `ASSERT_STRNE(`_str1_`, `_str2_`);` | `EXPECT_STRNE(`_str1_`, `_str2_`);` | the two C strings have different content | -| `ASSERT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);`| `EXPECT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);` | the two C strings have the same content, ignoring case | -| `ASSERT_STRCASENE(`_str1_`, `_str2_`);`| `EXPECT_STRCASENE(`_str1_`, `_str2_`);` | the two C strings have different content, ignoring case | - -Note that "CASE" in an assertion name means that case is ignored. - -`*STREQ*` and `*STRNE*` also accept wide C strings (`wchar_t*`). If a -comparison of two wide strings fails, their values will be printed as UTF-8 -narrow strings. - -A `NULL` pointer and an empty string are considered _different_. - -_Availability_: Linux, Windows, Mac. - -See also: For more string comparison tricks (substring, prefix, suffix, and -regular expression matching, for example), see the [AdvancedGuide Advanced -Google Test Guide]. - -# Simple Tests # - -To create a test: - 1. Use the `TEST()` macro to define and name a test function, These are ordinary C++ functions that don't return a value. - 1. In this function, along with any valid C++ statements you want to include, use the various Google Test assertions to check values. - 1. The test's result is determined by the assertions; if any assertion in the test fails (either fatally or non-fatally), or if the test crashes, the entire test fails. Otherwise, it succeeds. - -``` -TEST(test_case_name, test_name) { - ... test body ... -} -``` - - -`TEST()` arguments go from general to specific. The _first_ argument is the -name of the test case, and the _second_ argument is the test's name within the -test case. Remember that a test case can contain any number of individual -tests. A test's _full name_ consists of its containing test case and its -individual name. Tests from different test cases can have the same individual -name. - -For example, let's take a simple integer function: -``` -int Factorial(int n); // Returns the factorial of n -``` - -A test case for this function might look like: -``` -// Tests factorial of 0. -TEST(FactorialTest, HandlesZeroInput) { - EXPECT_EQ(1, Factorial(0)); -} - -// Tests factorial of positive numbers. -TEST(FactorialTest, HandlesPositiveInput) { - EXPECT_EQ(1, Factorial(1)); - EXPECT_EQ(2, Factorial(2)); - EXPECT_EQ(6, Factorial(3)); - EXPECT_EQ(40320, Factorial(8)); -} -``` - -Google Test groups the test results by test cases, so logically-related tests -should be in the same test case; in other words, the first argument to their -`TEST()` should be the same. In the above example, we have two tests, -`HandlesZeroInput` and `HandlesPositiveInput`, that belong to the same test -case `FactorialTest`. - -_Availability_: Linux, Windows, Mac. - -# Test Fixtures: Using the Same Data Configuration for Multiple Tests # - -If you find yourself writing two or more tests that operate on similar data, -you can use a _test fixture_. It allows you to reuse the same configuration of -objects for several different tests. - -To create a fixture, just: - 1. Derive a class from `::testing::Test` . Start its body with `protected:` or `public:` as we'll want to access fixture members from sub-classes. - 1. Inside the class, declare any objects you plan to use. - 1. If necessary, write a default constructor or `SetUp()` function to prepare the objects for each test. A common mistake is to spell `SetUp()` as `Setup()` with a small `u` - don't let that happen to you. - 1. If necessary, write a destructor or `TearDown()` function to release any resources you allocated in `SetUp()` . To learn when you should use the constructor/destructor and when you should use `SetUp()/TearDown()`, read this [FAQ entry](V1_5_FAQ.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-the-set-uptear-down-function). - 1. If needed, define subroutines for your tests to share. - -When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to -access objects and subroutines in the test fixture: -``` -TEST_F(test_case_name, test_name) { - ... test body ... -} -``` - -Like `TEST()`, the first argument is the test case name, but for `TEST_F()` -this must be the name of the test fixture class. You've probably guessed: `_F` -is for fixture. - -Unfortunately, the C++ macro system does not allow us to create a single macro -that can handle both types of tests. Using the wrong macro causes a compiler -error. - -Also, you must first define a test fixture class before using it in a -`TEST_F()`, or you'll get the compiler error "`virtual outside class -declaration`". - -For each test defined with `TEST_F()`, Google Test will: - 1. Create a _fresh_ test fixture at runtime - 1. Immediately initialize it via `SetUp()` , - 1. Run the test - 1. Clean up by calling `TearDown()` - 1. Delete the test fixture. Note that different tests in the same test case have different test fixture objects, and Google Test always deletes a test fixture before it creates the next one. Google Test does not reuse the same test fixture for multiple tests. Any changes one test makes to the fixture do not affect other tests. - -As an example, let's write tests for a FIFO queue class named `Queue`, which -has the following interface: -``` -template // E is the element type. -class Queue { - public: - Queue(); - void Enqueue(const E& element); - E* Dequeue(); // Returns NULL if the queue is empty. - size_t size() const; - ... -}; -``` - -First, define a fixture class. By convention, you should give it the name -`FooTest` where `Foo` is the class being tested. -``` -class QueueTest : public ::testing::Test { - protected: - virtual void SetUp() { - q1_.Enqueue(1); - q2_.Enqueue(2); - q2_.Enqueue(3); - } - - // virtual void TearDown() {} - - Queue q0_; - Queue q1_; - Queue q2_; -}; -``` - -In this case, `TearDown()` is not needed since we don't have to clean up after -each test, other than what's already done by the destructor. - -Now we'll write tests using `TEST_F()` and this fixture. -``` -TEST_F(QueueTest, IsEmptyInitially) { - EXPECT_EQ(0, q0_.size()); -} - -TEST_F(QueueTest, DequeueWorks) { - int* n = q0_.Dequeue(); - EXPECT_EQ(NULL, n); - - n = q1_.Dequeue(); - ASSERT_TRUE(n != NULL); - EXPECT_EQ(1, *n); - EXPECT_EQ(0, q1_.size()); - delete n; - - n = q2_.Dequeue(); - ASSERT_TRUE(n != NULL); - EXPECT_EQ(2, *n); - EXPECT_EQ(1, q2_.size()); - delete n; -} -``` - -The above uses both `ASSERT_*` and `EXPECT_*` assertions. The rule of thumb is -to use `EXPECT_*` when you want the test to continue to reveal more errors -after the assertion failure, and use `ASSERT_*` when continuing after failure -doesn't make sense. For example, the second assertion in the `Dequeue` test is -`ASSERT_TRUE(n != NULL)`, as we need to dereference the pointer `n` later, -which would lead to a segfault when `n` is `NULL`. - -When these tests run, the following happens: - 1. Google Test constructs a `QueueTest` object (let's call it `t1` ). - 1. `t1.SetUp()` initializes `t1` . - 1. The first test ( `IsEmptyInitially` ) runs on `t1` . - 1. `t1.TearDown()` cleans up after the test finishes. - 1. `t1` is destructed. - 1. The above steps are repeated on another `QueueTest` object, this time running the `DequeueWorks` test. - -_Availability_: Linux, Windows, Mac. - -_Note_: Google Test automatically saves all _Google Test_ flags when a test -object is constructed, and restores them when it is destructed. - -# Invoking the Tests # - -`TEST()` and `TEST_F()` implicitly register their tests with Google Test. So, unlike with many other C++ testing frameworks, you don't have to re-list all your defined tests in order to run them. - -After defining your tests, you can run them with `RUN_ALL_TESTS()` , which returns `0` if all the tests are successful, or `1` otherwise. Note that `RUN_ALL_TESTS()` runs _all tests_ in your link unit -- they can be from different test cases, or even different source files. - -When invoked, the `RUN_ALL_TESTS()` macro: - 1. Saves the state of all Google Test flags. - 1. Creates a test fixture object for the first test. - 1. Initializes it via `SetUp()`. - 1. Runs the test on the fixture object. - 1. Cleans up the fixture via `TearDown()`. - 1. Deletes the fixture. - 1. Restores the state of all Google Test flags. - 1. Repeats the above steps for the next test, until all tests have run. - -In addition, if the text fixture's constructor generates a fatal failure in -step 2, there is no point for step 3 - 5 and they are thus skipped. Similarly, -if step 3 generates a fatal failure, step 4 will be skipped. - -_Important_: You must not ignore the return value of `RUN_ALL_TESTS()`, or `gcc` -will give you a compiler error. The rationale for this design is that the -automated testing service determines whether a test has passed based on its -exit code, not on its stdout/stderr output; thus your `main()` function must -return the value of `RUN_ALL_TESTS()`. - -Also, you should call `RUN_ALL_TESTS()` only **once**. Calling it more than once -conflicts with some advanced Google Test features (e.g. thread-safe death -tests) and thus is not supported. - -_Availability_: Linux, Windows, Mac. - -# Writing the main() Function # - -You can start from this boilerplate: -``` -#include "this/package/foo.h" -#include - -namespace { - -// The fixture for testing class Foo. -class FooTest : public ::testing::Test { - protected: - // You can remove any or all of the following functions if its body - // is empty. - - FooTest() { - // You can do set-up work for each test here. - } - - virtual ~FooTest() { - // You can do clean-up work that doesn't throw exceptions here. - } - - // If the constructor and destructor are not enough for setting up - // and cleaning up each test, you can define the following methods: - - virtual void SetUp() { - // Code here will be called immediately after the constructor (right - // before each test). - } - - virtual void TearDown() { - // Code here will be called immediately after each test (right - // before the destructor). - } - - // Objects declared here can be used by all tests in the test case for Foo. -}; - -// Tests that the Foo::Bar() method does Abc. -TEST_F(FooTest, MethodBarDoesAbc) { - const string input_filepath = "this/package/testdata/myinputfile.dat"; - const string output_filepath = "this/package/testdata/myoutputfile.dat"; - Foo f; - EXPECT_EQ(0, f.Bar(input_filepath, output_filepath)); -} - -// Tests that Foo does Xyz. -TEST_F(FooTest, DoesXyz) { - // Exercises the Xyz feature of Foo. -} - -} // namespace - -int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} -``` - -The `::testing::InitGoogleTest()` function parses the command line for Google -Test flags, and removes all recognized flags. This allows the user to control a -test program's behavior via various flags, which we'll cover in [AdvancedGuide](V1_5_AdvancedGuide.md). -You must call this function before calling `RUN_ALL_TESTS()`, or the flags -won't be properly initialized. - -On Windows, `InitGoogleTest()` also works with wide strings, so it can be used -in programs compiled in `UNICODE` mode as well. - -But maybe you think that writing all those main() functions is too much work? We agree with you completely and that's why Google Test provides a basic implementation of main(). If it fits your needs, then just link your test with gtest\_main library and you are good to go. - -## Important note for Visual C++ users ## -If you put your tests into a library and your `main()` function is in a different library or in your .exe file, those tests will not run. The reason is a [bug](https://connect.microsoft.com/feedback/viewfeedback.aspx?FeedbackID=244410&siteid=210) in Visual C++. When you define your tests, Google Test creates certain static objects to register them. These objects are not referenced from elsewhere but their constructors are still supposed to run. When Visual C++ linker sees that nothing in the library is referenced from other places it throws the library out. You have to reference your library with tests from your main program to keep the linker from discarding it. Here is how to do it. Somewhere in your library code declare a function: -``` -__declspec(dllexport) int PullInMyLibrary() { return 0; } -``` -If you put your tests in a static library (not DLL) then `__declspec(dllexport)` is not required. Now, in your main program, write a code that invokes that function: -``` -int PullInMyLibrary(); -static int dummy = PullInMyLibrary(); -``` -This will keep your tests referenced and will make them register themselves at startup. - -In addition, if you define your tests in a static library, add `/OPT:NOREF` to your main program linker options. If you use MSVC++ IDE, go to your .exe project properties/Configuration Properties/Linker/Optimization and set References setting to `Keep Unreferenced Data (/OPT:NOREF)`. This will keep Visual C++ linker from discarding individual symbols generated by your tests from the final executable. - -There is one more pitfall, though. If you use Google Test as a static library (that's how it is defined in gtest.vcproj) your tests must also reside in a static library. If you have to have them in a DLL, you _must_ change Google Test to build into a DLL as well. Otherwise your tests will not run correctly or will not run at all. The general conclusion here is: make your life easier - do not write your tests in libraries! - -# Where to Go from Here # - -Congratulations! You've learned the Google Test basics. You can start writing -and running Google Test tests, read some [samples](Samples.md), or continue with -[AdvancedGuide](V1_5_AdvancedGuide.md), which describes many more useful Google Test features. - -# Known Limitations # - -Google Test is designed to be thread-safe. The implementation is -thread-safe on systems where the `pthreads` library is available. It -is currently _unsafe_ to use Google Test assertions from two threads -concurrently on other systems (e.g. Windows). In most tests this is -not an issue as usually the assertions are done in the main thread. If -you want to help, you can volunteer to implement the necessary -synchronization primitives in `gtest-port.h` for your platform. diff --git a/test/gtest-1.8.0/docs/V1_5_PumpManual.md b/test/gtest-1.8.0/docs/V1_5_PumpManual.md deleted file mode 100644 index 15710789dd..0000000000 --- a/test/gtest-1.8.0/docs/V1_5_PumpManual.md +++ /dev/null @@ -1,177 +0,0 @@ - - -Pump is Useful for Meta Programming. - -# The Problem # - -Template and macro libraries often need to define many classes, -functions, or macros that vary only (or almost only) in the number of -arguments they take. It's a lot of repetitive, mechanical, and -error-prone work. - -Variadic templates and variadic macros can alleviate the problem. -However, while both are being considered by the C++ committee, neither -is in the standard yet or widely supported by compilers. Thus they -are often not a good choice, especially when your code needs to be -portable. And their capabilities are still limited. - -As a result, authors of such libraries often have to write scripts to -generate their implementation. However, our experience is that it's -tedious to write such scripts, which tend to reflect the structure of -the generated code poorly and are often hard to read and edit. For -example, a small change needed in the generated code may require some -non-intuitive, non-trivial changes in the script. This is especially -painful when experimenting with the code. - -# Our Solution # - -Pump (for Pump is Useful for Meta Programming, Pretty Useful for Meta -Programming, or Practical Utility for Meta Programming, whichever you -prefer) is a simple meta-programming tool for C++. The idea is that a -programmer writes a `foo.pump` file which contains C++ code plus meta -code that manipulates the C++ code. The meta code can handle -iterations over a range, nested iterations, local meta variable -definitions, simple arithmetic, and conditional expressions. You can -view it as a small Domain-Specific Language. The meta language is -designed to be non-intrusive (s.t. it won't confuse Emacs' C++ mode, -for example) and concise, making Pump code intuitive and easy to -maintain. - -## Highlights ## - - * The implementation is in a single Python script and thus ultra portable: no build or installation is needed and it works cross platforms. - * Pump tries to be smart with respect to [Google's style guide](http://code.google.com/p/google-styleguide/): it breaks long lines (easy to have when they are generated) at acceptable places to fit within 80 columns and indent the continuation lines correctly. - * The format is human-readable and more concise than XML. - * The format works relatively well with Emacs' C++ mode. - -## Examples ## - -The following Pump code (where meta keywords start with `$`, `[[` and `]]` are meta brackets, and `$$` starts a meta comment that ends with the line): - -``` -$var n = 3 $$ Defines a meta variable n. -$range i 0..n $$ Declares the range of meta iterator i (inclusive). -$for i [[ - $$ Meta loop. -// Foo$i does blah for $i-ary predicates. -$range j 1..i -template -class Foo$i { -$if i == 0 [[ - blah a; -]] $elif i <= 2 [[ - blah b; -]] $else [[ - blah c; -]] -}; - -]] -``` - -will be translated by the Pump compiler to: - -``` -// Foo0 does blah for 0-ary predicates. -template -class Foo0 { - blah a; -}; - -// Foo1 does blah for 1-ary predicates. -template -class Foo1 { - blah b; -}; - -// Foo2 does blah for 2-ary predicates. -template -class Foo2 { - blah b; -}; - -// Foo3 does blah for 3-ary predicates. -template -class Foo3 { - blah c; -}; -``` - -In another example, - -``` -$range i 1..n -Func($for i + [[a$i]]); -$$ The text between i and [[ is the separator between iterations. -``` - -will generate one of the following lines (without the comments), depending on the value of `n`: - -``` -Func(); // If n is 0. -Func(a1); // If n is 1. -Func(a1 + a2); // If n is 2. -Func(a1 + a2 + a3); // If n is 3. -// And so on... -``` - -## Constructs ## - -We support the following meta programming constructs: - -| `$var id = exp` | Defines a named constant value. `$id` is valid util the end of the current meta lexical block. | -|:----------------|:-----------------------------------------------------------------------------------------------| -| $range id exp..exp | Sets the range of an iteration variable, which can be reused in multiple loops later. | -| $for id sep [[code ](.md)] | Iteration. The range of `id` must have been defined earlier. `$id` is valid in `code`. | -| `$($)` | Generates a single `$` character. | -| `$id` | Value of the named constant or iteration variable. | -| `$(exp)` | Value of the expression. | -| `$if exp [[ code ]] else_branch` | Conditional. | -| `[[ code ]]` | Meta lexical block. | -| `cpp_code` | Raw C++ code. | -| `$$ comment` | Meta comment. | - -**Note:** To give the user some freedom in formatting the Pump source -code, Pump ignores a new-line character if it's right after `$for foo` -or next to `[[` or `]]`. Without this rule you'll often be forced to write -very long lines to get the desired output. Therefore sometimes you may -need to insert an extra new-line in such places for a new-line to show -up in your output. - -## Grammar ## - -``` -code ::= atomic_code* -atomic_code ::= $var id = exp - | $var id = [[ code ]] - | $range id exp..exp - | $for id sep [[ code ]] - | $($) - | $id - | $(exp) - | $if exp [[ code ]] else_branch - | [[ code ]] - | cpp_code -sep ::= cpp_code | empty_string -else_branch ::= $else [[ code ]] - | $elif exp [[ code ]] else_branch - | empty_string -exp ::= simple_expression_in_Python_syntax -``` - -## Code ## - -You can find the source code of Pump in [scripts/pump.py](http://code.google.com/p/googletest/source/browse/trunk/scripts/pump.py). It is still -very unpolished and lacks automated tests, although it has been -successfully used many times. If you find a chance to use it in your -project, please let us know what you think! We also welcome help on -improving Pump. - -## Real Examples ## - -You can find real-world applications of Pump in [Google Test](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgoogletest\.googlecode\.com) and [Google Mock](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgooglemock\.googlecode\.com). The source file `foo.h.pump` generates `foo.h`. - -## Tips ## - - * If a meta variable is followed by a letter or digit, you can separate them using `[[]]`, which inserts an empty string. For example `Foo$j[[]]Helper` generate `Foo1Helper` when `j` is 1. - * To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line. \ No newline at end of file diff --git a/test/gtest-1.8.0/docs/V1_5_XcodeGuide.md b/test/gtest-1.8.0/docs/V1_5_XcodeGuide.md deleted file mode 100644 index bf24bf51bf..0000000000 --- a/test/gtest-1.8.0/docs/V1_5_XcodeGuide.md +++ /dev/null @@ -1,93 +0,0 @@ - - -This guide will explain how to use the Google Testing Framework in your Xcode projects on Mac OS X. This tutorial begins by quickly explaining what to do for experienced users. After the quick start, the guide goes provides additional explanation about each step. - -# Quick Start # - -Here is the quick guide for using Google Test in your Xcode project. - - 1. Download the source from the [website](http://code.google.com/p/googletest) using this command: `svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only` - 1. Open up the `gtest.xcodeproj` in the `googletest-read-only/xcode/` directory and build the gtest.framework. - 1. Create a new "Shell Tool" target in your Xcode project called something like "UnitTests" - 1. Add the gtest.framework to your project and add it to the "Link Binary with Libraries" build phase of "UnitTests" - 1. Add your unit test source code to the "Compile Sources" build phase of "UnitTests" - 1. Edit the "UnitTests" executable and add an environment variable named "DYLD\_FRAMEWORK\_PATH" with a value equal to the path to the framework containing the gtest.framework relative to the compiled executable. - 1. Build and Go - -The following sections further explain each of the steps listed above in depth, describing in more detail how to complete it including some variations. - -# Get the Source # - -Currently, the gtest.framework discussed here isn't available in a tagged release of Google Test, it is only available in the trunk. As explained at the Google Test [site](http://code.google.com/p/googletest/source/checkout">svn), you can get the code from anonymous SVN with this command: - -``` -svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only -``` - -Alternatively, if you are working with Subversion in your own code base, you can add Google Test as an external dependency to your own Subversion repository. By following this approach, everyone that checks out your svn repository will also receive a copy of Google Test (a specific version, if you wish) without having to check it out explicitly. This makes the set up of your project simpler and reduces the copied code in the repository. - -To use `svn:externals`, decide where you would like to have the external source reside. You might choose to put the external source inside the trunk, because you want it to be part of the branch when you make a release. However, keeping it outside the trunk in a version-tagged directory called something like `third-party/googletest/1.0.1`, is another option. Once the location is established, use `svn propedit svn:externals _directory_` to set the svn:externals property on a directory in your repository. This directory won't contain the code, but be its versioned parent directory. - -The command `svn propedit` will bring up your Subversion editor, making editing the long, (potentially multi-line) property simpler. This same method can be used to check out a tagged branch, by using the appropriate URL (e.g. `http://googletest.googlecode.com/svn/tags/release-1.0.1`). Additionally, the svn:externals property allows the specification of a particular revision of the trunk with the `-r_##_` option (e.g. `externals/src/googletest -r60 http://googletest.googlecode.com/svn/trunk`). - -Here is an example of using the svn:externals properties on a trunk (read via `svn propget`) of a project. This value checks out a copy of Google Test into the `trunk/externals/src/googletest/` directory. - -``` -[Computer:svn] user$ svn propget svn:externals trunk -externals/src/googletest http://googletest.googlecode.com/svn/trunk -``` - -# Add the Framework to Your Project # - -The next step is to build and add the gtest.framework to your own project. This guide describes two common ways below. - - * **Option 1** --- The simplest way to add Google Test to your own project, is to open gtest.xcodeproj (found in the xcode/ directory of the Google Test trunk) and build the framework manually. Then, add the built framework into your project using the "Add->Existing Framework..." from the context menu or "Project->Add..." from the main menu. The gtest.framework is relocatable and contains the headers and object code that you'll need to make tests. This method requires rebuilding every time you upgrade Google Test in your project. - * **Option 2** --- If you are going to be living off the trunk of Google Test, incorporating its latest features into your unit tests (or are a Google Test developer yourself). You'll want to rebuild the framework every time the source updates. to do this, you'll need to add the gtest.xcodeproj file, not the framework itself, to your own Xcode project. Then, from the build products that are revealed by the project's disclosure triangle, you can find the gtest.framework, which can be added to your targets (discussed below). - -# Make a Test Target # - -To start writing tests, make a new "Shell Tool" target. This target template is available under BSD, Cocoa, or Carbon. Add your unit test source code to the "Compile Sources" build phase of the target. - -Next, you'll want to add gtest.framework in two different ways, depending upon which option you chose above. - - * **Option 1** --- During compilation, Xcode will need to know that you are linking against the gtest.framework. Add the gtest.framework to the "Link Binary with Libraries" build phase of your test target. This will include the Google Test headers in your header search path, and will tell the linker where to find the library. - * **Option 2** --- If your working out of the trunk, you'll also want to add gtest.framework to your "Link Binary with Libraries" build phase of your test target. In addition, you'll want to add the gtest.framework as a dependency to your unit test target. This way, Xcode will make sure that gtest.framework is up to date, every time your build your target. Finally, if you don't share build directories with Google Test, you'll have to copy the gtest.framework into your own build products directory using a "Run Script" build phase. - -# Set Up the Executable Run Environment # - -Since the unit test executable is a shell tool, it doesn't have a bundle with a `Contents/Frameworks` directory, in which to place gtest.framework. Instead, the dynamic linker must be told at runtime to search for the framework in another location. This can be accomplished by setting the "DYLD\_FRAMEWORK\_PATH" environment variable in the "Edit Active Executable ..." Arguments tab, under "Variables to be set in the environment:". The path for this value is the path (relative or absolute) of the directory containing the gtest.framework. - -If you haven't set up the DYLD\_FRAMEWORK\_PATH, correctly, you might get a message like this: - -``` -[Session started at 2008-08-15 06:23:57 -0600.] - dyld: Library not loaded: @loader_path/../Frameworks/gtest.framework/Versions/A/gtest - Referenced from: /Users/username/Documents/Sandbox/gtestSample/build/Debug/WidgetFrameworkTest - Reason: image not found -``` - -To correct this problem, got to the directory containing the executable named in "Referenced from:" value in the error message above. Then, with the terminal in this location, find the relative path to the directory containing the gtest.framework. That is the value you'll need to set as the DYLD\_FRAMEWORK\_PATH. - -# Build and Go # - -Now, when you click "Build and Go", the test will be executed. Dumping out something like this: - -``` -[Session started at 2008-08-06 06:36:13 -0600.] -[==========] Running 2 tests from 1 test case. -[----------] Global test environment set-up. -[----------] 2 tests from WidgetInitializerTest -[ RUN ] WidgetInitializerTest.TestConstructor -[ OK ] WidgetInitializerTest.TestConstructor -[ RUN ] WidgetInitializerTest.TestConversion -[ OK ] WidgetInitializerTest.TestConversion -[----------] Global test environment tear-down -[==========] 2 tests from 1 test case ran. -[ PASSED ] 2 tests. - -The Debugger has exited with status 0. -``` - -# Summary # - -Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment. \ No newline at end of file diff --git a/test/gtest-1.8.0/docs/V1_6_AdvancedGuide.md b/test/gtest-1.8.0/docs/V1_6_AdvancedGuide.md deleted file mode 100644 index 78864b1667..0000000000 --- a/test/gtest-1.8.0/docs/V1_6_AdvancedGuide.md +++ /dev/null @@ -1,2178 +0,0 @@ - - -Now that you have read [Primer](V1_6_Primer.md) and learned how to write tests -using Google Test, it's time to learn some new tricks. This document -will show you more assertions as well as how to construct complex -failure messages, propagate fatal failures, reuse and speed up your -test fixtures, and use various flags with your tests. - -# More Assertions # - -This section covers some less frequently used, but still significant, -assertions. - -## Explicit Success and Failure ## - -These three assertions do not actually test a value or expression. Instead, -they generate a success or failure directly. Like the macros that actually -perform a test, you may stream a custom failure message into the them. - -| `SUCCEED();` | -|:-------------| - -Generates a success. This does NOT make the overall test succeed. A test is -considered successful only if none of its assertions fail during its execution. - -Note: `SUCCEED()` is purely documentary and currently doesn't generate any -user-visible output. However, we may add `SUCCEED()` messages to Google Test's -output in the future. - -| `FAIL();` | `ADD_FAILURE();` | `ADD_FAILURE_AT("`_file\_path_`", `_line\_number_`);` | -|:-----------|:-----------------|:------------------------------------------------------| - -`FAIL()` generates a fatal failure, while `ADD_FAILURE()` and `ADD_FAILURE_AT()` generate a nonfatal -failure. These are useful when control flow, rather than a Boolean expression, -deteremines the test's success or failure. For example, you might want to write -something like: - -``` -switch(expression) { - case 1: ... some checks ... - case 2: ... some other checks - ... - default: FAIL() << "We shouldn't get here."; -} -``` - -_Availability_: Linux, Windows, Mac. - -## Exception Assertions ## - -These are for verifying that a piece of code throws (or does not -throw) an exception of the given type: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_THROW(`_statement_, _exception\_type_`);` | `EXPECT_THROW(`_statement_, _exception\_type_`);` | _statement_ throws an exception of the given type | -| `ASSERT_ANY_THROW(`_statement_`);` | `EXPECT_ANY_THROW(`_statement_`);` | _statement_ throws an exception of any type | -| `ASSERT_NO_THROW(`_statement_`);` | `EXPECT_NO_THROW(`_statement_`);` | _statement_ doesn't throw any exception | - -Examples: - -``` -ASSERT_THROW(Foo(5), bar_exception); - -EXPECT_NO_THROW({ - int n = 5; - Bar(&n); -}); -``` - -_Availability_: Linux, Windows, Mac; since version 1.1.0. - -## Predicate Assertions for Better Error Messages ## - -Even though Google Test has a rich set of assertions, they can never be -complete, as it's impossible (nor a good idea) to anticipate all the scenarios -a user might run into. Therefore, sometimes a user has to use `EXPECT_TRUE()` -to check a complex expression, for lack of a better macro. This has the problem -of not showing you the values of the parts of the expression, making it hard to -understand what went wrong. As a workaround, some users choose to construct the -failure message by themselves, streaming it into `EXPECT_TRUE()`. However, this -is awkward especially when the expression has side-effects or is expensive to -evaluate. - -Google Test gives you three different options to solve this problem: - -### Using an Existing Boolean Function ### - -If you already have a function or a functor that returns `bool` (or a type -that can be implicitly converted to `bool`), you can use it in a _predicate -assertion_ to get the function arguments printed for free: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_PRED1(`_pred1, val1_`);` | `EXPECT_PRED1(`_pred1, val1_`);` | _pred1(val1)_ returns true | -| `ASSERT_PRED2(`_pred2, val1, val2_`);` | `EXPECT_PRED2(`_pred2, val1, val2_`);` | _pred2(val1, val2)_ returns true | -| ... | ... | ... | - -In the above, _predn_ is an _n_-ary predicate function or functor, where -_val1_, _val2_, ..., and _valn_ are its arguments. The assertion succeeds -if the predicate returns `true` when applied to the given arguments, and fails -otherwise. When the assertion fails, it prints the value of each argument. In -either case, the arguments are evaluated exactly once. - -Here's an example. Given - -``` -// Returns true iff m and n have no common divisors except 1. -bool MutuallyPrime(int m, int n) { ... } -const int a = 3; -const int b = 4; -const int c = 10; -``` - -the assertion `EXPECT_PRED2(MutuallyPrime, a, b);` will succeed, while the -assertion `EXPECT_PRED2(MutuallyPrime, b, c);` will fail with the message - -
-!MutuallyPrime(b, c) is false, where

-b is 4

-c is 10

-
- -**Notes:** - - 1. If you see a compiler error "no matching function to call" when using `ASSERT_PRED*` or `EXPECT_PRED*`, please see [this](v1_6_FAQ.md#ithe-compiler-complains-about-undefined-references-to-some-static-const-member-variables-but-i-did-define-them-in-the-class-body-whats-wrong) for how to resolve it. - 1. Currently we only provide predicate assertions of arity <= 5. If you need a higher-arity assertion, let us know. - -_Availability_: Linux, Windows, Mac - -### Using a Function That Returns an AssertionResult ### - -While `EXPECT_PRED*()` and friends are handy for a quick job, the -syntax is not satisfactory: you have to use different macros for -different arities, and it feels more like Lisp than C++. The -`::testing::AssertionResult` class solves this problem. - -An `AssertionResult` object represents the result of an assertion -(whether it's a success or a failure, and an associated message). You -can create an `AssertionResult` using one of these factory -functions: - -``` -namespace testing { - -// Returns an AssertionResult object to indicate that an assertion has -// succeeded. -AssertionResult AssertionSuccess(); - -// Returns an AssertionResult object to indicate that an assertion has -// failed. -AssertionResult AssertionFailure(); - -} -``` - -You can then use the `<<` operator to stream messages to the -`AssertionResult` object. - -To provide more readable messages in Boolean assertions -(e.g. `EXPECT_TRUE()`), write a predicate function that returns -`AssertionResult` instead of `bool`. For example, if you define -`IsEven()` as: - -``` -::testing::AssertionResult IsEven(int n) { - if ((n % 2) == 0) - return ::testing::AssertionSuccess(); - else - return ::testing::AssertionFailure() << n << " is odd"; -} -``` - -instead of: - -``` -bool IsEven(int n) { - return (n % 2) == 0; -} -``` - -the failed assertion `EXPECT_TRUE(IsEven(Fib(4)))` will print: - -
-Value of: !IsEven(Fib(4))

-Actual: false (*3 is odd*)

-Expected: true

-
- -instead of a more opaque - -
-Value of: !IsEven(Fib(4))

-Actual: false

-Expected: true

-
- -If you want informative messages in `EXPECT_FALSE` and `ASSERT_FALSE` -as well, and are fine with making the predicate slower in the success -case, you can supply a success message: - -``` -::testing::AssertionResult IsEven(int n) { - if ((n % 2) == 0) - return ::testing::AssertionSuccess() << n << " is even"; - else - return ::testing::AssertionFailure() << n << " is odd"; -} -``` - -Then the statement `EXPECT_FALSE(IsEven(Fib(6)))` will print - -
-Value of: !IsEven(Fib(6))

-Actual: true (8 is even)

-Expected: false

-
- -_Availability_: Linux, Windows, Mac; since version 1.4.1. - -### Using a Predicate-Formatter ### - -If you find the default message generated by `(ASSERT|EXPECT)_PRED*` and -`(ASSERT|EXPECT)_(TRUE|FALSE)` unsatisfactory, or some arguments to your -predicate do not support streaming to `ostream`, you can instead use the -following _predicate-formatter assertions_ to _fully_ customize how the -message is formatted: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_PRED_FORMAT1(`_pred\_format1, val1_`);` | `EXPECT_PRED_FORMAT1(`_pred\_format1, val1_`); | _pred\_format1(val1)_ is successful | -| `ASSERT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | `EXPECT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | _pred\_format2(val1, val2)_ is successful | -| `...` | `...` | `...` | - -The difference between this and the previous two groups of macros is that instead of -a predicate, `(ASSERT|EXPECT)_PRED_FORMAT*` take a _predicate-formatter_ -(_pred\_formatn_), which is a function or functor with the signature: - -`::testing::AssertionResult PredicateFormattern(const char* `_expr1_`, const char* `_expr2_`, ... const char* `_exprn_`, T1 `_val1_`, T2 `_val2_`, ... Tn `_valn_`);` - -where _val1_, _val2_, ..., and _valn_ are the values of the predicate -arguments, and _expr1_, _expr2_, ..., and _exprn_ are the corresponding -expressions as they appear in the source code. The types `T1`, `T2`, ..., and -`Tn` can be either value types or reference types. For example, if an -argument has type `Foo`, you can declare it as either `Foo` or `const Foo&`, -whichever is appropriate. - -A predicate-formatter returns a `::testing::AssertionResult` object to indicate -whether the assertion has succeeded or not. The only way to create such an -object is to call one of these factory functions: - -As an example, let's improve the failure message in the previous example, which uses `EXPECT_PRED2()`: - -``` -// Returns the smallest prime common divisor of m and n, -// or 1 when m and n are mutually prime. -int SmallestPrimeCommonDivisor(int m, int n) { ... } - -// A predicate-formatter for asserting that two integers are mutually prime. -::testing::AssertionResult AssertMutuallyPrime(const char* m_expr, - const char* n_expr, - int m, - int n) { - if (MutuallyPrime(m, n)) - return ::testing::AssertionSuccess(); - - return ::testing::AssertionFailure() - << m_expr << " and " << n_expr << " (" << m << " and " << n - << ") are not mutually prime, " << "as they have a common divisor " - << SmallestPrimeCommonDivisor(m, n); -} -``` - -With this predicate-formatter, we can use - -``` -EXPECT_PRED_FORMAT2(AssertMutuallyPrime, b, c); -``` - -to generate the message - -
-b and c (4 and 10) are not mutually prime, as they have a common divisor 2.

-
- -As you may have realized, many of the assertions we introduced earlier are -special cases of `(EXPECT|ASSERT)_PRED_FORMAT*`. In fact, most of them are -indeed defined using `(EXPECT|ASSERT)_PRED_FORMAT*`. - -_Availability_: Linux, Windows, Mac. - - -## Floating-Point Comparison ## - -Comparing floating-point numbers is tricky. Due to round-off errors, it is -very unlikely that two floating-points will match exactly. Therefore, -`ASSERT_EQ` 's naive comparison usually doesn't work. And since floating-points -can have a wide value range, no single fixed error bound works. It's better to -compare by a fixed relative error bound, except for values close to 0 due to -the loss of precision there. - -In general, for floating-point comparison to make sense, the user needs to -carefully choose the error bound. If they don't want or care to, comparing in -terms of Units in the Last Place (ULPs) is a good default, and Google Test -provides assertions to do this. Full details about ULPs are quite long; if you -want to learn more, see -[this article on float comparison](http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm). - -### Floating-Point Macros ### - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_FLOAT_EQ(`_expected, actual_`);` | `EXPECT_FLOAT_EQ(`_expected, actual_`);` | the two `float` values are almost equal | -| `ASSERT_DOUBLE_EQ(`_expected, actual_`);` | `EXPECT_DOUBLE_EQ(`_expected, actual_`);` | the two `double` values are almost equal | - -By "almost equal", we mean the two values are within 4 ULP's from each -other. - -The following assertions allow you to choose the acceptable error bound: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_NEAR(`_val1, val2, abs\_error_`);` | `EXPECT_NEAR`_(val1, val2, abs\_error_`);` | the difference between _val1_ and _val2_ doesn't exceed the given absolute error | - -_Availability_: Linux, Windows, Mac. - -### Floating-Point Predicate-Format Functions ### - -Some floating-point operations are useful, but not that often used. In order -to avoid an explosion of new macros, we provide them as predicate-format -functions that can be used in predicate assertion macros (e.g. -`EXPECT_PRED_FORMAT2`, etc). - -``` -EXPECT_PRED_FORMAT2(::testing::FloatLE, val1, val2); -EXPECT_PRED_FORMAT2(::testing::DoubleLE, val1, val2); -``` - -Verifies that _val1_ is less than, or almost equal to, _val2_. You can -replace `EXPECT_PRED_FORMAT2` in the above table with `ASSERT_PRED_FORMAT2`. - -_Availability_: Linux, Windows, Mac. - -## Windows HRESULT assertions ## - -These assertions test for `HRESULT` success or failure. - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_HRESULT_SUCCEEDED(`_expression_`);` | `EXPECT_HRESULT_SUCCEEDED(`_expression_`);` | _expression_ is a success `HRESULT` | -| `ASSERT_HRESULT_FAILED(`_expression_`);` | `EXPECT_HRESULT_FAILED(`_expression_`);` | _expression_ is a failure `HRESULT` | - -The generated output contains the human-readable error message -associated with the `HRESULT` code returned by _expression_. - -You might use them like this: - -``` -CComPtr shell; -ASSERT_HRESULT_SUCCEEDED(shell.CoCreateInstance(L"Shell.Application")); -CComVariant empty; -ASSERT_HRESULT_SUCCEEDED(shell->ShellExecute(CComBSTR(url), empty, empty, empty, empty)); -``` - -_Availability_: Windows. - -## Type Assertions ## - -You can call the function -``` -::testing::StaticAssertTypeEq(); -``` -to assert that types `T1` and `T2` are the same. The function does -nothing if the assertion is satisfied. If the types are different, -the function call will fail to compile, and the compiler error message -will likely (depending on the compiler) show you the actual values of -`T1` and `T2`. This is mainly useful inside template code. - -_Caveat:_ When used inside a member function of a class template or a -function template, `StaticAssertTypeEq()` is effective _only if_ -the function is instantiated. For example, given: -``` -template class Foo { - public: - void Bar() { ::testing::StaticAssertTypeEq(); } -}; -``` -the code: -``` -void Test1() { Foo foo; } -``` -will _not_ generate a compiler error, as `Foo::Bar()` is never -actually instantiated. Instead, you need: -``` -void Test2() { Foo foo; foo.Bar(); } -``` -to cause a compiler error. - -_Availability:_ Linux, Windows, Mac; since version 1.3.0. - -## Assertion Placement ## - -You can use assertions in any C++ function. In particular, it doesn't -have to be a method of the test fixture class. The one constraint is -that assertions that generate a fatal failure (`FAIL*` and `ASSERT_*`) -can only be used in void-returning functions. This is a consequence of -Google Test not using exceptions. By placing it in a non-void function -you'll get a confusing compile error like -`"error: void value not ignored as it ought to be"`. - -If you need to use assertions in a function that returns non-void, one option -is to make the function return the value in an out parameter instead. For -example, you can rewrite `T2 Foo(T1 x)` to `void Foo(T1 x, T2* result)`. You -need to make sure that `*result` contains some sensible value even when the -function returns prematurely. As the function now returns `void`, you can use -any assertion inside of it. - -If changing the function's type is not an option, you should just use -assertions that generate non-fatal failures, such as `ADD_FAILURE*` and -`EXPECT_*`. - -_Note_: Constructors and destructors are not considered void-returning -functions, according to the C++ language specification, and so you may not use -fatal assertions in them. You'll get a compilation error if you try. A simple -workaround is to transfer the entire body of the constructor or destructor to a -private void-returning method. However, you should be aware that a fatal -assertion failure in a constructor does not terminate the current test, as your -intuition might suggest; it merely returns from the constructor early, possibly -leaving your object in a partially-constructed state. Likewise, a fatal -assertion failure in a destructor may leave your object in a -partially-destructed state. Use assertions carefully in these situations! - -# Teaching Google Test How to Print Your Values # - -When a test assertion such as `EXPECT_EQ` fails, Google Test prints the -argument values to help you debug. It does this using a -user-extensible value printer. - -This printer knows how to print built-in C++ types, native arrays, STL -containers, and any type that supports the `<<` operator. For other -types, it prints the raw bytes in the value and hopes that you the -user can figure it out. - -As mentioned earlier, the printer is _extensible_. That means -you can teach it to do a better job at printing your particular type -than to dump the bytes. To do that, define `<<` for your type: - -``` -#include - -namespace foo { - -class Bar { ... }; // We want Google Test to be able to print instances of this. - -// It's important that the << operator is defined in the SAME -// namespace that defines Bar. C++'s look-up rules rely on that. -::std::ostream& operator<<(::std::ostream& os, const Bar& bar) { - return os << bar.DebugString(); // whatever needed to print bar to os -} - -} // namespace foo -``` - -Sometimes, this might not be an option: your team may consider it bad -style to have a `<<` operator for `Bar`, or `Bar` may already have a -`<<` operator that doesn't do what you want (and you cannot change -it). If so, you can instead define a `PrintTo()` function like this: - -``` -#include - -namespace foo { - -class Bar { ... }; - -// It's important that PrintTo() is defined in the SAME -// namespace that defines Bar. C++'s look-up rules rely on that. -void PrintTo(const Bar& bar, ::std::ostream* os) { - *os << bar.DebugString(); // whatever needed to print bar to os -} - -} // namespace foo -``` - -If you have defined both `<<` and `PrintTo()`, the latter will be used -when Google Test is concerned. This allows you to customize how the value -appears in Google Test's output without affecting code that relies on the -behavior of its `<<` operator. - -If you want to print a value `x` using Google Test's value printer -yourself, just call `::testing::PrintToString(`_x_`)`, which -returns an `std::string`: - -``` -vector > bar_ints = GetBarIntVector(); - -EXPECT_TRUE(IsCorrectBarIntVector(bar_ints)) - << "bar_ints = " << ::testing::PrintToString(bar_ints); -``` - -# Death Tests # - -In many applications, there are assertions that can cause application failure -if a condition is not met. These sanity checks, which ensure that the program -is in a known good state, are there to fail at the earliest possible time after -some program state is corrupted. If the assertion checks the wrong condition, -then the program may proceed in an erroneous state, which could lead to memory -corruption, security holes, or worse. Hence it is vitally important to test -that such assertion statements work as expected. - -Since these precondition checks cause the processes to die, we call such tests -_death tests_. More generally, any test that checks that a program terminates -(except by throwing an exception) in an expected fashion is also a death test. - -Note that if a piece of code throws an exception, we don't consider it "death" -for the purpose of death tests, as the caller of the code could catch the exception -and avoid the crash. If you want to verify exceptions thrown by your code, -see [Exception Assertions](#exception-assertions). - -If you want to test `EXPECT_*()/ASSERT_*()` failures in your test code, see [Catching Failures](#catching-failures). - -## How to Write a Death Test ## - -Google Test has the following macros to support death tests: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_DEATH(`_statement, regex_`); | `EXPECT_DEATH(`_statement, regex_`); | _statement_ crashes with the given error | -| `ASSERT_DEATH_IF_SUPPORTED(`_statement, regex_`); | `EXPECT_DEATH_IF_SUPPORTED(`_statement, regex_`); | if death tests are supported, verifies that _statement_ crashes with the given error; otherwise verifies nothing | -| `ASSERT_EXIT(`_statement, predicate, regex_`); | `EXPECT_EXIT(`_statement, predicate, regex_`); |_statement_ exits with the given error and its exit code matches _predicate_ | - -where _statement_ is a statement that is expected to cause the process to -die, _predicate_ is a function or function object that evaluates an integer -exit status, and _regex_ is a regular expression that the stderr output of -_statement_ is expected to match. Note that _statement_ can be _any valid -statement_ (including _compound statement_) and doesn't have to be an -expression. - -As usual, the `ASSERT` variants abort the current test function, while the -`EXPECT` variants do not. - -**Note:** We use the word "crash" here to mean that the process -terminates with a _non-zero_ exit status code. There are two -possibilities: either the process has called `exit()` or `_exit()` -with a non-zero value, or it may be killed by a signal. - -This means that if _statement_ terminates the process with a 0 exit -code, it is _not_ considered a crash by `EXPECT_DEATH`. Use -`EXPECT_EXIT` instead if this is the case, or if you want to restrict -the exit code more precisely. - -A predicate here must accept an `int` and return a `bool`. The death test -succeeds only if the predicate returns `true`. Google Test defines a few -predicates that handle the most common cases: - -``` -::testing::ExitedWithCode(exit_code) -``` - -This expression is `true` if the program exited normally with the given exit -code. - -``` -::testing::KilledBySignal(signal_number) // Not available on Windows. -``` - -This expression is `true` if the program was killed by the given signal. - -The `*_DEATH` macros are convenient wrappers for `*_EXIT` that use a predicate -that verifies the process' exit code is non-zero. - -Note that a death test only cares about three things: - - 1. does _statement_ abort or exit the process? - 1. (in the case of `ASSERT_EXIT` and `EXPECT_EXIT`) does the exit status satisfy _predicate_? Or (in the case of `ASSERT_DEATH` and `EXPECT_DEATH`) is the exit status non-zero? And - 1. does the stderr output match _regex_? - -In particular, if _statement_ generates an `ASSERT_*` or `EXPECT_*` failure, it will **not** cause the death test to fail, as Google Test assertions don't abort the process. - -To write a death test, simply use one of the above macros inside your test -function. For example, - -``` -TEST(My*DeathTest*, Foo) { - // This death test uses a compound statement. - ASSERT_DEATH({ int n = 5; Foo(&n); }, "Error on line .* of Foo()"); -} -TEST(MyDeathTest, NormalExit) { - EXPECT_EXIT(NormalExit(), ::testing::ExitedWithCode(0), "Success"); -} -TEST(MyDeathTest, KillMyself) { - EXPECT_EXIT(KillMyself(), ::testing::KilledBySignal(SIGKILL), "Sending myself unblockable signal"); -} -``` - -verifies that: - - * calling `Foo(5)` causes the process to die with the given error message, - * calling `NormalExit()` causes the process to print `"Success"` to stderr and exit with exit code 0, and - * calling `KillMyself()` kills the process with signal `SIGKILL`. - -The test function body may contain other assertions and statements as well, if -necessary. - -_Important:_ We strongly recommend you to follow the convention of naming your -test case (not test) `*DeathTest` when it contains a death test, as -demonstrated in the above example. The `Death Tests And Threads` section below -explains why. - -If a test fixture class is shared by normal tests and death tests, you -can use typedef to introduce an alias for the fixture class and avoid -duplicating its code: -``` -class FooTest : public ::testing::Test { ... }; - -typedef FooTest FooDeathTest; - -TEST_F(FooTest, DoesThis) { - // normal test -} - -TEST_F(FooDeathTest, DoesThat) { - // death test -} -``` - -_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Cygwin, and Mac (the latter three are supported since v1.3.0). `(ASSERT|EXPECT)_DEATH_IF_SUPPORTED` are new in v1.4.0. - -## Regular Expression Syntax ## - -On POSIX systems (e.g. Linux, Cygwin, and Mac), Google Test uses the -[POSIX extended regular expression](http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04) -syntax in death tests. To learn about this syntax, you may want to read this [Wikipedia entry](http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions). - -On Windows, Google Test uses its own simple regular expression -implementation. It lacks many features you can find in POSIX extended -regular expressions. For example, we don't support union (`"x|y"`), -grouping (`"(xy)"`), brackets (`"[xy]"`), and repetition count -(`"x{5,7}"`), among others. Below is what we do support (`A` denotes a -literal character, period (`.`), or a single `\\` escape sequence; `x` -and `y` denote regular expressions.): - -| `c` | matches any literal character `c` | -|:----|:----------------------------------| -| `\\d` | matches any decimal digit | -| `\\D` | matches any character that's not a decimal digit | -| `\\f` | matches `\f` | -| `\\n` | matches `\n` | -| `\\r` | matches `\r` | -| `\\s` | matches any ASCII whitespace, including `\n` | -| `\\S` | matches any character that's not a whitespace | -| `\\t` | matches `\t` | -| `\\v` | matches `\v` | -| `\\w` | matches any letter, `_`, or decimal digit | -| `\\W` | matches any character that `\\w` doesn't match | -| `\\c` | matches any literal character `c`, which must be a punctuation | -| `.` | matches any single character except `\n` | -| `A?` | matches 0 or 1 occurrences of `A` | -| `A*` | matches 0 or many occurrences of `A` | -| `A+` | matches 1 or many occurrences of `A` | -| `^` | matches the beginning of a string (not that of each line) | -| `$` | matches the end of a string (not that of each line) | -| `xy` | matches `x` followed by `y` | - -To help you determine which capability is available on your system, -Google Test defines macro `GTEST_USES_POSIX_RE=1` when it uses POSIX -extended regular expressions, or `GTEST_USES_SIMPLE_RE=1` when it uses -the simple version. If you want your death tests to work in both -cases, you can either `#if` on these macros or use the more limited -syntax only. - -## How It Works ## - -Under the hood, `ASSERT_EXIT()` spawns a new process and executes the -death test statement in that process. The details of of how precisely -that happens depend on the platform and the variable -`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the -command-line flag `--gtest_death_test_style`). - - * On POSIX systems, `fork()` (or `clone()` on Linux) is used to spawn the child, after which: - * If the variable's value is `"fast"`, the death test statement is immediately executed. - * If the variable's value is `"threadsafe"`, the child process re-executes the unit test binary just as it was originally invoked, but with some extra flags to cause just the single death test under consideration to be run. - * On Windows, the child is spawned using the `CreateProcess()` API, and re-executes the binary to cause just the single death test under consideration to be run - much like the `threadsafe` mode on POSIX. - -Other values for the variable are illegal and will cause the death test to -fail. Currently, the flag's default value is `"fast"`. However, we reserve the -right to change it in the future. Therefore, your tests should not depend on -this. - -In either case, the parent process waits for the child process to complete, and checks that - - 1. the child's exit status satisfies the predicate, and - 1. the child's stderr matches the regular expression. - -If the death test statement runs to completion without dying, the child -process will nonetheless terminate, and the assertion fails. - -## Death Tests And Threads ## - -The reason for the two death test styles has to do with thread safety. Due to -well-known problems with forking in the presence of threads, death tests should -be run in a single-threaded context. Sometimes, however, it isn't feasible to -arrange that kind of environment. For example, statically-initialized modules -may start threads before main is ever reached. Once threads have been created, -it may be difficult or impossible to clean them up. - -Google Test has three features intended to raise awareness of threading issues. - - 1. A warning is emitted if multiple threads are running when a death test is encountered. - 1. Test cases with a name ending in "DeathTest" are run before all other tests. - 1. It uses `clone()` instead of `fork()` to spawn the child process on Linux (`clone()` is not available on Cygwin and Mac), as `fork()` is more likely to cause the child to hang when the parent process has multiple threads. - -It's perfectly fine to create threads inside a death test statement; they are -executed in a separate process and cannot affect the parent. - -## Death Test Styles ## - -The "threadsafe" death test style was introduced in order to help mitigate the -risks of testing in a possibly multithreaded environment. It trades increased -test execution time (potentially dramatically so) for improved thread safety. -We suggest using the faster, default "fast" style unless your test has specific -problems with it. - -You can choose a particular style of death tests by setting the flag -programmatically: - -``` -::testing::FLAGS_gtest_death_test_style = "threadsafe"; -``` - -You can do this in `main()` to set the style for all death tests in the -binary, or in individual tests. Recall that flags are saved before running each -test and restored afterwards, so you need not do that yourself. For example: - -``` -TEST(MyDeathTest, TestOne) { - ::testing::FLAGS_gtest_death_test_style = "threadsafe"; - // This test is run in the "threadsafe" style: - ASSERT_DEATH(ThisShouldDie(), ""); -} - -TEST(MyDeathTest, TestTwo) { - // This test is run in the "fast" style: - ASSERT_DEATH(ThisShouldDie(), ""); -} - -int main(int argc, char** argv) { - ::testing::InitGoogleTest(&argc, argv); - ::testing::FLAGS_gtest_death_test_style = "fast"; - return RUN_ALL_TESTS(); -} -``` - -## Caveats ## - -The _statement_ argument of `ASSERT_EXIT()` can be any valid C++ statement. -If it leaves the current function via a `return` statement or by throwing an exception, -the death test is considered to have failed. Some Google Test macros may return -from the current function (e.g. `ASSERT_TRUE()`), so be sure to avoid them in _statement_. - -Since _statement_ runs in the child process, any in-memory side effect (e.g. -modifying a variable, releasing memory, etc) it causes will _not_ be observable -in the parent process. In particular, if you release memory in a death test, -your program will fail the heap check as the parent process will never see the -memory reclaimed. To solve this problem, you can - - 1. try not to free memory in a death test; - 1. free the memory again in the parent process; or - 1. do not use the heap checker in your program. - -Due to an implementation detail, you cannot place multiple death test -assertions on the same line; otherwise, compilation will fail with an unobvious -error message. - -Despite the improved thread safety afforded by the "threadsafe" style of death -test, thread problems such as deadlock are still possible in the presence of -handlers registered with `pthread_atfork(3)`. - -# Using Assertions in Sub-routines # - -## Adding Traces to Assertions ## - -If a test sub-routine is called from several places, when an assertion -inside it fails, it can be hard to tell which invocation of the -sub-routine the failure is from. You can alleviate this problem using -extra logging or custom failure messages, but that usually clutters up -your tests. A better solution is to use the `SCOPED_TRACE` macro: - -| `SCOPED_TRACE(`_message_`);` | -|:-----------------------------| - -where _message_ can be anything streamable to `std::ostream`. This -macro will cause the current file name, line number, and the given -message to be added in every failure message. The effect will be -undone when the control leaves the current lexical scope. - -For example, - -``` -10: void Sub1(int n) { -11: EXPECT_EQ(1, Bar(n)); -12: EXPECT_EQ(2, Bar(n + 1)); -13: } -14: -15: TEST(FooTest, Bar) { -16: { -17: SCOPED_TRACE("A"); // This trace point will be included in -18: // every failure in this scope. -19: Sub1(1); -20: } -21: // Now it won't. -22: Sub1(9); -23: } -``` - -could result in messages like these: - -``` -path/to/foo_test.cc:11: Failure -Value of: Bar(n) -Expected: 1 - Actual: 2 - Trace: -path/to/foo_test.cc:17: A - -path/to/foo_test.cc:12: Failure -Value of: Bar(n + 1) -Expected: 2 - Actual: 3 -``` - -Without the trace, it would've been difficult to know which invocation -of `Sub1()` the two failures come from respectively. (You could add an -extra message to each assertion in `Sub1()` to indicate the value of -`n`, but that's tedious.) - -Some tips on using `SCOPED_TRACE`: - - 1. With a suitable message, it's often enough to use `SCOPED_TRACE` at the beginning of a sub-routine, instead of at each call site. - 1. When calling sub-routines inside a loop, make the loop iterator part of the message in `SCOPED_TRACE` such that you can know which iteration the failure is from. - 1. Sometimes the line number of the trace point is enough for identifying the particular invocation of a sub-routine. In this case, you don't have to choose a unique message for `SCOPED_TRACE`. You can simply use `""`. - 1. You can use `SCOPED_TRACE` in an inner scope when there is one in the outer scope. In this case, all active trace points will be included in the failure messages, in reverse order they are encountered. - 1. The trace dump is clickable in Emacs' compilation buffer - hit return on a line number and you'll be taken to that line in the source file! - -_Availability:_ Linux, Windows, Mac. - -## Propagating Fatal Failures ## - -A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that -when they fail they only abort the _current function_, not the entire test. For -example, the following test will segfault: -``` -void Subroutine() { - // Generates a fatal failure and aborts the current function. - ASSERT_EQ(1, 2); - // The following won't be executed. - ... -} - -TEST(FooTest, Bar) { - Subroutine(); - // The intended behavior is for the fatal failure - // in Subroutine() to abort the entire test. - // The actual behavior: the function goes on after Subroutine() returns. - int* p = NULL; - *p = 3; // Segfault! -} -``` - -Since we don't use exceptions, it is technically impossible to -implement the intended behavior here. To alleviate this, Google Test -provides two solutions. You could use either the -`(ASSERT|EXPECT)_NO_FATAL_FAILURE` assertions or the -`HasFatalFailure()` function. They are described in the following two -subsections. - -### Asserting on Subroutines ### - -As shown above, if your test calls a subroutine that has an `ASSERT_*` -failure in it, the test will continue after the subroutine -returns. This may not be what you want. - -Often people want fatal failures to propagate like exceptions. For -that Google Test offers the following macros: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_NO_FATAL_FAILURE(`_statement_`);` | `EXPECT_NO_FATAL_FAILURE(`_statement_`);` | _statement_ doesn't generate any new fatal failures in the current thread. | - -Only failures in the thread that executes the assertion are checked to -determine the result of this type of assertions. If _statement_ -creates new threads, failures in these threads are ignored. - -Examples: - -``` -ASSERT_NO_FATAL_FAILURE(Foo()); - -int i; -EXPECT_NO_FATAL_FAILURE({ - i = Bar(); -}); -``` - -_Availability:_ Linux, Windows, Mac. Assertions from multiple threads -are currently not supported. - -### Checking for Failures in the Current Test ### - -`HasFatalFailure()` in the `::testing::Test` class returns `true` if an -assertion in the current test has suffered a fatal failure. This -allows functions to catch fatal failures in a sub-routine and return -early. - -``` -class Test { - public: - ... - static bool HasFatalFailure(); -}; -``` - -The typical usage, which basically simulates the behavior of a thrown -exception, is: - -``` -TEST(FooTest, Bar) { - Subroutine(); - // Aborts if Subroutine() had a fatal failure. - if (HasFatalFailure()) - return; - // The following won't be executed. - ... -} -``` - -If `HasFatalFailure()` is used outside of `TEST()` , `TEST_F()` , or a test -fixture, you must add the `::testing::Test::` prefix, as in: - -``` -if (::testing::Test::HasFatalFailure()) - return; -``` - -Similarly, `HasNonfatalFailure()` returns `true` if the current test -has at least one non-fatal failure, and `HasFailure()` returns `true` -if the current test has at least one failure of either kind. - -_Availability:_ Linux, Windows, Mac. `HasNonfatalFailure()` and -`HasFailure()` are available since version 1.4.0. - -# Logging Additional Information # - -In your test code, you can call `RecordProperty("key", value)` to log -additional information, where `value` can be either a C string or a 32-bit -integer. The _last_ value recorded for a key will be emitted to the XML output -if you specify one. For example, the test - -``` -TEST_F(WidgetUsageTest, MinAndMaxWidgets) { - RecordProperty("MaximumWidgets", ComputeMaxUsage()); - RecordProperty("MinimumWidgets", ComputeMinUsage()); -} -``` - -will output XML like this: - -``` -... - -... -``` - -_Note_: - * `RecordProperty()` is a static member of the `Test` class. Therefore it needs to be prefixed with `::testing::Test::` if used outside of the `TEST` body and the test fixture class. - * `key` must be a valid XML attribute name, and cannot conflict with the ones already used by Google Test (`name`, `status`, `time`, and `classname`). - -_Availability_: Linux, Windows, Mac. - -# Sharing Resources Between Tests in the Same Test Case # - - - -Google Test creates a new test fixture object for each test in order to make -tests independent and easier to debug. However, sometimes tests use resources -that are expensive to set up, making the one-copy-per-test model prohibitively -expensive. - -If the tests don't change the resource, there's no harm in them sharing a -single resource copy. So, in addition to per-test set-up/tear-down, Google Test -also supports per-test-case set-up/tear-down. To use it: - - 1. In your test fixture class (say `FooTest` ), define as `static` some member variables to hold the shared resources. - 1. In the same test fixture class, define a `static void SetUpTestCase()` function (remember not to spell it as **`SetupTestCase`** with a small `u`!) to set up the shared resources and a `static void TearDownTestCase()` function to tear them down. - -That's it! Google Test automatically calls `SetUpTestCase()` before running the -_first test_ in the `FooTest` test case (i.e. before creating the first -`FooTest` object), and calls `TearDownTestCase()` after running the _last test_ -in it (i.e. after deleting the last `FooTest` object). In between, the tests -can use the shared resources. - -Remember that the test order is undefined, so your code can't depend on a test -preceding or following another. Also, the tests must either not modify the -state of any shared resource, or, if they do modify the state, they must -restore the state to its original value before passing control to the next -test. - -Here's an example of per-test-case set-up and tear-down: -``` -class FooTest : public ::testing::Test { - protected: - // Per-test-case set-up. - // Called before the first test in this test case. - // Can be omitted if not needed. - static void SetUpTestCase() { - shared_resource_ = new ...; - } - - // Per-test-case tear-down. - // Called after the last test in this test case. - // Can be omitted if not needed. - static void TearDownTestCase() { - delete shared_resource_; - shared_resource_ = NULL; - } - - // You can define per-test set-up and tear-down logic as usual. - virtual void SetUp() { ... } - virtual void TearDown() { ... } - - // Some expensive resource shared by all tests. - static T* shared_resource_; -}; - -T* FooTest::shared_resource_ = NULL; - -TEST_F(FooTest, Test1) { - ... you can refer to shared_resource here ... -} -TEST_F(FooTest, Test2) { - ... you can refer to shared_resource here ... -} -``` - -_Availability:_ Linux, Windows, Mac. - -# Global Set-Up and Tear-Down # - -Just as you can do set-up and tear-down at the test level and the test case -level, you can also do it at the test program level. Here's how. - -First, you subclass the `::testing::Environment` class to define a test -environment, which knows how to set-up and tear-down: - -``` -class Environment { - public: - virtual ~Environment() {} - // Override this to define how to set up the environment. - virtual void SetUp() {} - // Override this to define how to tear down the environment. - virtual void TearDown() {} -}; -``` - -Then, you register an instance of your environment class with Google Test by -calling the `::testing::AddGlobalTestEnvironment()` function: - -``` -Environment* AddGlobalTestEnvironment(Environment* env); -``` - -Now, when `RUN_ALL_TESTS()` is called, it first calls the `SetUp()` method of -the environment object, then runs the tests if there was no fatal failures, and -finally calls `TearDown()` of the environment object. - -It's OK to register multiple environment objects. In this case, their `SetUp()` -will be called in the order they are registered, and their `TearDown()` will be -called in the reverse order. - -Note that Google Test takes ownership of the registered environment objects. -Therefore **do not delete them** by yourself. - -You should call `AddGlobalTestEnvironment()` before `RUN_ALL_TESTS()` is -called, probably in `main()`. If you use `gtest_main`, you need to call -this before `main()` starts for it to take effect. One way to do this is to -define a global variable like this: - -``` -::testing::Environment* const foo_env = ::testing::AddGlobalTestEnvironment(new FooEnvironment); -``` - -However, we strongly recommend you to write your own `main()` and call -`AddGlobalTestEnvironment()` there, as relying on initialization of global -variables makes the code harder to read and may cause problems when you -register multiple environments from different translation units and the -environments have dependencies among them (remember that the compiler doesn't -guarantee the order in which global variables from different translation units -are initialized). - -_Availability:_ Linux, Windows, Mac. - - -# Value Parameterized Tests # - -_Value-parameterized tests_ allow you to test your code with different -parameters without writing multiple copies of the same test. - -Suppose you write a test for your code and then realize that your code is affected by a presence of a Boolean command line flag. - -``` -TEST(MyCodeTest, TestFoo) { - // A code to test foo(). -} -``` - -Usually people factor their test code into a function with a Boolean parameter in such situations. The function sets the flag, then executes the testing code. - -``` -void TestFooHelper(bool flag_value) { - flag = flag_value; - // A code to test foo(). -} - -TEST(MyCodeTest, TestFooo) { - TestFooHelper(false); - TestFooHelper(true); -} -``` - -But this setup has serious drawbacks. First, when a test assertion fails in your tests, it becomes unclear what value of the parameter caused it to fail. You can stream a clarifying message into your `EXPECT`/`ASSERT` statements, but it you'll have to do it with all of them. Second, you have to add one such helper function per test. What if you have ten tests? Twenty? A hundred? - -Value-parameterized tests will let you write your test only once and then easily instantiate and run it with an arbitrary number of parameter values. - -Here are some other situations when value-parameterized tests come handy: - - * You want to test different implementations of an OO interface. - * You want to test your code over various inputs (a.k.a. data-driven testing). This feature is easy to abuse, so please exercise your good sense when doing it! - -## How to Write Value-Parameterized Tests ## - -To write value-parameterized tests, first you should define a fixture -class. It must be derived from both `::testing::Test` and -`::testing::WithParamInterface` (the latter is a pure interface), -where `T` is the type of your parameter values. For convenience, you -can just derive the fixture class from `::testing::TestWithParam`, -which itself is derived from both `::testing::Test` and -`::testing::WithParamInterface`. `T` can be any copyable type. If -it's a raw pointer, you are responsible for managing the lifespan of -the pointed values. - -``` -class FooTest : public ::testing::TestWithParam { - // You can implement all the usual fixture class members here. - // To access the test parameter, call GetParam() from class - // TestWithParam. -}; - -// Or, when you want to add parameters to a pre-existing fixture class: -class BaseTest : public ::testing::Test { - ... -}; -class BarTest : public BaseTest, - public ::testing::WithParamInterface { - ... -}; -``` - -Then, use the `TEST_P` macro to define as many test patterns using -this fixture as you want. The `_P` suffix is for "parameterized" or -"pattern", whichever you prefer to think. - -``` -TEST_P(FooTest, DoesBlah) { - // Inside a test, access the test parameter with the GetParam() method - // of the TestWithParam class: - EXPECT_TRUE(foo.Blah(GetParam())); - ... -} - -TEST_P(FooTest, HasBlahBlah) { - ... -} -``` - -Finally, you can use `INSTANTIATE_TEST_CASE_P` to instantiate the test -case with any set of parameters you want. Google Test defines a number of -functions for generating test parameters. They return what we call -(surprise!) _parameter generators_. Here is a summary of them, -which are all in the `testing` namespace: - -| `Range(begin, end[, step])` | Yields values `{begin, begin+step, begin+step+step, ...}`. The values do not include `end`. `step` defaults to 1. | -|:----------------------------|:------------------------------------------------------------------------------------------------------------------| -| `Values(v1, v2, ..., vN)` | Yields values `{v1, v2, ..., vN}`. | -| `ValuesIn(container)` and `ValuesIn(begin, end)` | Yields values from a C-style array, an STL-style container, or an iterator range `[begin, end)`. `container`, `begin`, and `end` can be expressions whose values are determined at run time. | -| `Bool()` | Yields sequence `{false, true}`. | -| `Combine(g1, g2, ..., gN)` | Yields all combinations (the Cartesian product for the math savvy) of the values generated by the `N` generators. This is only available if your system provides the `` header. If you are sure your system does, and Google Test disagrees, you can override it by defining `GTEST_HAS_TR1_TUPLE=1`. See comments in [include/gtest/internal/gtest-port.h](../include/gtest/internal/gtest-port.h) for more information. | - -For more details, see the comments at the definitions of these functions in the [source code](../include/gtest/gtest-param-test.h). - -The following statement will instantiate tests from the `FooTest` test case -each with parameter values `"meeny"`, `"miny"`, and `"moe"`. - -``` -INSTANTIATE_TEST_CASE_P(InstantiationName, - FooTest, - ::testing::Values("meeny", "miny", "moe")); -``` - -To distinguish different instances of the pattern (yes, you can -instantiate it more than once), the first argument to -`INSTANTIATE_TEST_CASE_P` is a prefix that will be added to the actual -test case name. Remember to pick unique prefixes for different -instantiations. The tests from the instantiation above will have these -names: - - * `InstantiationName/FooTest.DoesBlah/0` for `"meeny"` - * `InstantiationName/FooTest.DoesBlah/1` for `"miny"` - * `InstantiationName/FooTest.DoesBlah/2` for `"moe"` - * `InstantiationName/FooTest.HasBlahBlah/0` for `"meeny"` - * `InstantiationName/FooTest.HasBlahBlah/1` for `"miny"` - * `InstantiationName/FooTest.HasBlahBlah/2` for `"moe"` - -You can use these names in [--gtest\-filter](#running-a-subset-of-the-tests). - -This statement will instantiate all tests from `FooTest` again, each -with parameter values `"cat"` and `"dog"`: - -``` -const char* pets[] = {"cat", "dog"}; -INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, - ::testing::ValuesIn(pets)); -``` - -The tests from the instantiation above will have these names: - - * `AnotherInstantiationName/FooTest.DoesBlah/0` for `"cat"` - * `AnotherInstantiationName/FooTest.DoesBlah/1` for `"dog"` - * `AnotherInstantiationName/FooTest.HasBlahBlah/0` for `"cat"` - * `AnotherInstantiationName/FooTest.HasBlahBlah/1` for `"dog"` - -Please note that `INSTANTIATE_TEST_CASE_P` will instantiate _all_ -tests in the given test case, whether their definitions come before or -_after_ the `INSTANTIATE_TEST_CASE_P` statement. - -You can see -[these](../samples/sample7_unittest.cc) -[files](../samples/sample8_unittest.cc) for more examples. - -_Availability_: Linux, Windows (requires MSVC 8.0 or above), Mac; since version 1.2.0. - -## Creating Value-Parameterized Abstract Tests ## - -In the above, we define and instantiate `FooTest` in the same source -file. Sometimes you may want to define value-parameterized tests in a -library and let other people instantiate them later. This pattern is -known as abstract tests. As an example of its application, when you -are designing an interface you can write a standard suite of abstract -tests (perhaps using a factory function as the test parameter) that -all implementations of the interface are expected to pass. When -someone implements the interface, he can instantiate your suite to get -all the interface-conformance tests for free. - -To define abstract tests, you should organize your code like this: - - 1. Put the definition of the parameterized test fixture class (e.g. `FooTest`) in a header file, say `foo_param_test.h`. Think of this as _declaring_ your abstract tests. - 1. Put the `TEST_P` definitions in `foo_param_test.cc`, which includes `foo_param_test.h`. Think of this as _implementing_ your abstract tests. - -Once they are defined, you can instantiate them by including -`foo_param_test.h`, invoking `INSTANTIATE_TEST_CASE_P()`, and linking -with `foo_param_test.cc`. You can instantiate the same abstract test -case multiple times, possibly in different source files. - -# Typed Tests # - -Suppose you have multiple implementations of the same interface and -want to make sure that all of them satisfy some common requirements. -Or, you may have defined several types that are supposed to conform to -the same "concept" and you want to verify it. In both cases, you want -the same test logic repeated for different types. - -While you can write one `TEST` or `TEST_F` for each type you want to -test (and you may even factor the test logic into a function template -that you invoke from the `TEST`), it's tedious and doesn't scale: -if you want _m_ tests over _n_ types, you'll end up writing _m\*n_ -`TEST`s. - -_Typed tests_ allow you to repeat the same test logic over a list of -types. You only need to write the test logic once, although you must -know the type list when writing typed tests. Here's how you do it: - -First, define a fixture class template. It should be parameterized -by a type. Remember to derive it from `::testing::Test`: - -``` -template -class FooTest : public ::testing::Test { - public: - ... - typedef std::list List; - static T shared_; - T value_; -}; -``` - -Next, associate a list of types with the test case, which will be -repeated for each type in the list: - -``` -typedef ::testing::Types MyTypes; -TYPED_TEST_CASE(FooTest, MyTypes); -``` - -The `typedef` is necessary for the `TYPED_TEST_CASE` macro to parse -correctly. Otherwise the compiler will think that each comma in the -type list introduces a new macro argument. - -Then, use `TYPED_TEST()` instead of `TEST_F()` to define a typed test -for this test case. You can repeat this as many times as you want: - -``` -TYPED_TEST(FooTest, DoesBlah) { - // Inside a test, refer to the special name TypeParam to get the type - // parameter. Since we are inside a derived class template, C++ requires - // us to visit the members of FooTest via 'this'. - TypeParam n = this->value_; - - // To visit static members of the fixture, add the 'TestFixture::' - // prefix. - n += TestFixture::shared_; - - // To refer to typedefs in the fixture, add the 'typename TestFixture::' - // prefix. The 'typename' is required to satisfy the compiler. - typename TestFixture::List values; - values.push_back(n); - ... -} - -TYPED_TEST(FooTest, HasPropertyA) { ... } -``` - -You can see `samples/sample6_unittest.cc` for a complete example. - -_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac; -since version 1.1.0. - -# Type-Parameterized Tests # - -_Type-parameterized tests_ are like typed tests, except that they -don't require you to know the list of types ahead of time. Instead, -you can define the test logic first and instantiate it with different -type lists later. You can even instantiate it more than once in the -same program. - -If you are designing an interface or concept, you can define a suite -of type-parameterized tests to verify properties that any valid -implementation of the interface/concept should have. Then, the author -of each implementation can just instantiate the test suite with his -type to verify that it conforms to the requirements, without having to -write similar tests repeatedly. Here's an example: - -First, define a fixture class template, as we did with typed tests: - -``` -template -class FooTest : public ::testing::Test { - ... -}; -``` - -Next, declare that you will define a type-parameterized test case: - -``` -TYPED_TEST_CASE_P(FooTest); -``` - -The `_P` suffix is for "parameterized" or "pattern", whichever you -prefer to think. - -Then, use `TYPED_TEST_P()` to define a type-parameterized test. You -can repeat this as many times as you want: - -``` -TYPED_TEST_P(FooTest, DoesBlah) { - // Inside a test, refer to TypeParam to get the type parameter. - TypeParam n = 0; - ... -} - -TYPED_TEST_P(FooTest, HasPropertyA) { ... } -``` - -Now the tricky part: you need to register all test patterns using the -`REGISTER_TYPED_TEST_CASE_P` macro before you can instantiate them. -The first argument of the macro is the test case name; the rest are -the names of the tests in this test case: - -``` -REGISTER_TYPED_TEST_CASE_P(FooTest, - DoesBlah, HasPropertyA); -``` - -Finally, you are free to instantiate the pattern with the types you -want. If you put the above code in a header file, you can `#include` -it in multiple C++ source files and instantiate it multiple times. - -``` -typedef ::testing::Types MyTypes; -INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes); -``` - -To distinguish different instances of the pattern, the first argument -to the `INSTANTIATE_TYPED_TEST_CASE_P` macro is a prefix that will be -added to the actual test case name. Remember to pick unique prefixes -for different instances. - -In the special case where the type list contains only one type, you -can write that type directly without `::testing::Types<...>`, like this: - -``` -INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int); -``` - -You can see `samples/sample6_unittest.cc` for a complete example. - -_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac; -since version 1.1.0. - -# Testing Private Code # - -If you change your software's internal implementation, your tests should not -break as long as the change is not observable by users. Therefore, per the -_black-box testing principle_, most of the time you should test your code -through its public interfaces. - -If you still find yourself needing to test internal implementation code, -consider if there's a better design that wouldn't require you to do so. If you -absolutely have to test non-public interface code though, you can. There are -two cases to consider: - - * Static functions (_not_ the same as static member functions!) or unnamed namespaces, and - * Private or protected class members - -## Static Functions ## - -Both static functions and definitions/declarations in an unnamed namespace are -only visible within the same translation unit. To test them, you can `#include` -the entire `.cc` file being tested in your `*_test.cc` file. (`#include`ing `.cc` -files is not a good way to reuse code - you should not do this in production -code!) - -However, a better approach is to move the private code into the -`foo::internal` namespace, where `foo` is the namespace your project normally -uses, and put the private declarations in a `*-internal.h` file. Your -production `.cc` files and your tests are allowed to include this internal -header, but your clients are not. This way, you can fully test your internal -implementation without leaking it to your clients. - -## Private Class Members ## - -Private class members are only accessible from within the class or by friends. -To access a class' private members, you can declare your test fixture as a -friend to the class and define accessors in your fixture. Tests using the -fixture can then access the private members of your production class via the -accessors in the fixture. Note that even though your fixture is a friend to -your production class, your tests are not automatically friends to it, as they -are technically defined in sub-classes of the fixture. - -Another way to test private members is to refactor them into an implementation -class, which is then declared in a `*-internal.h` file. Your clients aren't -allowed to include this header but your tests can. Such is called the Pimpl -(Private Implementation) idiom. - -Or, you can declare an individual test as a friend of your class by adding this -line in the class body: - -``` -FRIEND_TEST(TestCaseName, TestName); -``` - -For example, -``` -// foo.h -#include "gtest/gtest_prod.h" - -// Defines FRIEND_TEST. -class Foo { - ... - private: - FRIEND_TEST(FooTest, BarReturnsZeroOnNull); - int Bar(void* x); -}; - -// foo_test.cc -... -TEST(FooTest, BarReturnsZeroOnNull) { - Foo foo; - EXPECT_EQ(0, foo.Bar(NULL)); - // Uses Foo's private member Bar(). -} -``` - -Pay special attention when your class is defined in a namespace, as you should -define your test fixtures and tests in the same namespace if you want them to -be friends of your class. For example, if the code to be tested looks like: - -``` -namespace my_namespace { - -class Foo { - friend class FooTest; - FRIEND_TEST(FooTest, Bar); - FRIEND_TEST(FooTest, Baz); - ... - definition of the class Foo - ... -}; - -} // namespace my_namespace -``` - -Your test code should be something like: - -``` -namespace my_namespace { -class FooTest : public ::testing::Test { - protected: - ... -}; - -TEST_F(FooTest, Bar) { ... } -TEST_F(FooTest, Baz) { ... } - -} // namespace my_namespace -``` - -# Catching Failures # - -If you are building a testing utility on top of Google Test, you'll -want to test your utility. What framework would you use to test it? -Google Test, of course. - -The challenge is to verify that your testing utility reports failures -correctly. In frameworks that report a failure by throwing an -exception, you could catch the exception and assert on it. But Google -Test doesn't use exceptions, so how do we test that a piece of code -generates an expected failure? - -`"gtest/gtest-spi.h"` contains some constructs to do this. After -`#include`ing this header, you can use - -| `EXPECT_FATAL_FAILURE(`_statement, substring_`);` | -|:--------------------------------------------------| - -to assert that _statement_ generates a fatal (e.g. `ASSERT_*`) failure -whose message contains the given _substring_, or use - -| `EXPECT_NONFATAL_FAILURE(`_statement, substring_`);` | -|:-----------------------------------------------------| - -if you are expecting a non-fatal (e.g. `EXPECT_*`) failure. - -For technical reasons, there are some caveats: - - 1. You cannot stream a failure message to either macro. - 1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot reference local non-static variables or non-static members of `this` object. - 1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot return a value. - -_Note:_ Google Test is designed with threads in mind. Once the -synchronization primitives in `"gtest/internal/gtest-port.h"` have -been implemented, Google Test will become thread-safe, meaning that -you can then use assertions in multiple threads concurrently. Before - -that, however, Google Test only supports single-threaded usage. Once -thread-safe, `EXPECT_FATAL_FAILURE()` and `EXPECT_NONFATAL_FAILURE()` -will capture failures in the current thread only. If _statement_ -creates new threads, failures in these threads will be ignored. If -you want to capture failures from all threads instead, you should use -the following macros: - -| `EXPECT_FATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` | -|:-----------------------------------------------------------------| -| `EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` | - -# Getting the Current Test's Name # - -Sometimes a function may need to know the name of the currently running test. -For example, you may be using the `SetUp()` method of your test fixture to set -the golden file name based on which test is running. The `::testing::TestInfo` -class has this information: - -``` -namespace testing { - -class TestInfo { - public: - // Returns the test case name and the test name, respectively. - // - // Do NOT delete or free the return value - it's managed by the - // TestInfo class. - const char* test_case_name() const; - const char* name() const; -}; - -} // namespace testing -``` - - -> To obtain a `TestInfo` object for the currently running test, call -`current_test_info()` on the `UnitTest` singleton object: - -``` -// Gets information about the currently running test. -// Do NOT delete the returned object - it's managed by the UnitTest class. -const ::testing::TestInfo* const test_info = - ::testing::UnitTest::GetInstance()->current_test_info(); -printf("We are in test %s of test case %s.\n", - test_info->name(), test_info->test_case_name()); -``` - -`current_test_info()` returns a null pointer if no test is running. In -particular, you cannot find the test case name in `TestCaseSetUp()`, -`TestCaseTearDown()` (where you know the test case name implicitly), or -functions called from them. - -_Availability:_ Linux, Windows, Mac. - -# Extending Google Test by Handling Test Events # - -Google Test provides an event listener API to let you receive -notifications about the progress of a test program and test -failures. The events you can listen to include the start and end of -the test program, a test case, or a test method, among others. You may -use this API to augment or replace the standard console output, -replace the XML output, or provide a completely different form of -output, such as a GUI or a database. You can also use test events as -checkpoints to implement a resource leak checker, for example. - -_Availability:_ Linux, Windows, Mac; since v1.4.0. - -## Defining Event Listeners ## - -To define a event listener, you subclass either -[testing::TestEventListener](../include/gtest/gtest.h#L855) -or [testing::EmptyTestEventListener](../include/gtest/gtest.h#L905). -The former is an (abstract) interface, where each pure virtual method
-can be overridden to handle a test event (For example, when a test -starts, the `OnTestStart()` method will be called.). The latter provides -an empty implementation of all methods in the interface, such that a -subclass only needs to override the methods it cares about. - -When an event is fired, its context is passed to the handler function -as an argument. The following argument types are used: - * [UnitTest](../include/gtest/gtest.h#L1007) reflects the state of the entire test program, - * [TestCase](../include/gtest/gtest.h#L689) has information about a test case, which can contain one or more tests, - * [TestInfo](../include/gtest/gtest.h#L599) contains the state of a test, and - * [TestPartResult](../include/gtest/gtest-test-part.h#L42) represents the result of a test assertion. - -An event handler function can examine the argument it receives to find -out interesting information about the event and the test program's -state. Here's an example: - -``` - class MinimalistPrinter : public ::testing::EmptyTestEventListener { - // Called before a test starts. - virtual void OnTestStart(const ::testing::TestInfo& test_info) { - printf("*** Test %s.%s starting.\n", - test_info.test_case_name(), test_info.name()); - } - - // Called after a failed assertion or a SUCCEED() invocation. - virtual void OnTestPartResult( - const ::testing::TestPartResult& test_part_result) { - printf("%s in %s:%d\n%s\n", - test_part_result.failed() ? "*** Failure" : "Success", - test_part_result.file_name(), - test_part_result.line_number(), - test_part_result.summary()); - } - - // Called after a test ends. - virtual void OnTestEnd(const ::testing::TestInfo& test_info) { - printf("*** Test %s.%s ending.\n", - test_info.test_case_name(), test_info.name()); - } - }; -``` - -## Using Event Listeners ## - -To use the event listener you have defined, add an instance of it to -the Google Test event listener list (represented by class -[TestEventListeners](../include/gtest/gtest.h#L929) -- note the "s" at the end of the name) in your -`main()` function, before calling `RUN_ALL_TESTS()`: -``` -int main(int argc, char** argv) { - ::testing::InitGoogleTest(&argc, argv); - // Gets hold of the event listener list. - ::testing::TestEventListeners& listeners = - ::testing::UnitTest::GetInstance()->listeners(); - // Adds a listener to the end. Google Test takes the ownership. - listeners.Append(new MinimalistPrinter); - return RUN_ALL_TESTS(); -} -``` - -There's only one problem: the default test result printer is still in -effect, so its output will mingle with the output from your minimalist -printer. To suppress the default printer, just release it from the -event listener list and delete it. You can do so by adding one line: -``` - ... - delete listeners.Release(listeners.default_result_printer()); - listeners.Append(new MinimalistPrinter); - return RUN_ALL_TESTS(); -``` - -Now, sit back and enjoy a completely different output from your -tests. For more details, you can read this -[sample](../samples/sample9_unittest.cc). - -You may append more than one listener to the list. When an `On*Start()` -or `OnTestPartResult()` event is fired, the listeners will receive it in -the order they appear in the list (since new listeners are added to -the end of the list, the default text printer and the default XML -generator will receive the event first). An `On*End()` event will be -received by the listeners in the _reverse_ order. This allows output by -listeners added later to be framed by output from listeners added -earlier. - -## Generating Failures in Listeners ## - -You may use failure-raising macros (`EXPECT_*()`, `ASSERT_*()`, -`FAIL()`, etc) when processing an event. There are some restrictions: - - 1. You cannot generate any failure in `OnTestPartResult()` (otherwise it will cause `OnTestPartResult()` to be called recursively). - 1. A listener that handles `OnTestPartResult()` is not allowed to generate any failure. - -When you add listeners to the listener list, you should put listeners -that handle `OnTestPartResult()` _before_ listeners that can generate -failures. This ensures that failures generated by the latter are -attributed to the right test by the former. - -We have a sample of failure-raising listener -[here](../samples/sample10_unittest.cc). - -# Running Test Programs: Advanced Options # - -Google Test test programs are ordinary executables. Once built, you can run -them directly and affect their behavior via the following environment variables -and/or command line flags. For the flags to work, your programs must call -`::testing::InitGoogleTest()` before calling `RUN_ALL_TESTS()`. - -To see a list of supported flags and their usage, please run your test -program with the `--help` flag. You can also use `-h`, `-?`, or `/?` -for short. This feature is added in version 1.3.0. - -If an option is specified both by an environment variable and by a -flag, the latter takes precedence. Most of the options can also be -set/read in code: to access the value of command line flag -`--gtest_foo`, write `::testing::GTEST_FLAG(foo)`. A common pattern is -to set the value of a flag before calling `::testing::InitGoogleTest()` -to change the default value of the flag: -``` -int main(int argc, char** argv) { - // Disables elapsed time by default. - ::testing::GTEST_FLAG(print_time) = false; - - // This allows the user to override the flag on the command line. - ::testing::InitGoogleTest(&argc, argv); - - return RUN_ALL_TESTS(); -} -``` - -## Selecting Tests ## - -This section shows various options for choosing which tests to run. - -### Listing Test Names ### - -Sometimes it is necessary to list the available tests in a program before -running them so that a filter may be applied if needed. Including the flag -`--gtest_list_tests` overrides all other flags and lists tests in the following -format: -``` -TestCase1. - TestName1 - TestName2 -TestCase2. - TestName -``` - -None of the tests listed are actually run if the flag is provided. There is no -corresponding environment variable for this flag. - -_Availability:_ Linux, Windows, Mac. - -### Running a Subset of the Tests ### - -By default, a Google Test program runs all tests the user has defined. -Sometimes, you want to run only a subset of the tests (e.g. for debugging or -quickly verifying a change). If you set the `GTEST_FILTER` environment variable -or the `--gtest_filter` flag to a filter string, Google Test will only run the -tests whose full names (in the form of `TestCaseName.TestName`) match the -filter. - -The format of a filter is a '`:`'-separated list of wildcard patterns (called -the positive patterns) optionally followed by a '`-`' and another -'`:`'-separated pattern list (called the negative patterns). A test matches the -filter if and only if it matches any of the positive patterns but does not -match any of the negative patterns. - -A pattern may contain `'*'` (matches any string) or `'?'` (matches any single -character). For convenience, the filter `'*-NegativePatterns'` can be also -written as `'-NegativePatterns'`. - -For example: - - * `./foo_test` Has no flag, and thus runs all its tests. - * `./foo_test --gtest_filter=*` Also runs everything, due to the single match-everything `*` value. - * `./foo_test --gtest_filter=FooTest.*` Runs everything in test case `FooTest`. - * `./foo_test --gtest_filter=*Null*:*Constructor*` Runs any test whose full name contains either `"Null"` or `"Constructor"`. - * `./foo_test --gtest_filter=-*DeathTest.*` Runs all non-death tests. - * `./foo_test --gtest_filter=FooTest.*-FooTest.Bar` Runs everything in test case `FooTest` except `FooTest.Bar`. - -_Availability:_ Linux, Windows, Mac. - -### Temporarily Disabling Tests ### - -If you have a broken test that you cannot fix right away, you can add the -`DISABLED_` prefix to its name. This will exclude it from execution. This is -better than commenting out the code or using `#if 0`, as disabled tests are -still compiled (and thus won't rot). - -If you need to disable all tests in a test case, you can either add `DISABLED_` -to the front of the name of each test, or alternatively add it to the front of -the test case name. - -For example, the following tests won't be run by Google Test, even though they -will still be compiled: - -``` -// Tests that Foo does Abc. -TEST(FooTest, DISABLED_DoesAbc) { ... } - -class DISABLED_BarTest : public ::testing::Test { ... }; - -// Tests that Bar does Xyz. -TEST_F(DISABLED_BarTest, DoesXyz) { ... } -``` - -_Note:_ This feature should only be used for temporary pain-relief. You still -have to fix the disabled tests at a later date. As a reminder, Google Test will -print a banner warning you if a test program contains any disabled tests. - -_Tip:_ You can easily count the number of disabled tests you have -using `grep`. This number can be used as a metric for improving your -test quality. - -_Availability:_ Linux, Windows, Mac. - -### Temporarily Enabling Disabled Tests ### - -To include [disabled tests](#temporarily-disabling-tests) in test -execution, just invoke the test program with the -`--gtest_also_run_disabled_tests` flag or set the -`GTEST_ALSO_RUN_DISABLED_TESTS` environment variable to a value other -than `0`. You can combine this with the -[--gtest\-filter](#running-a-subset-of-the_tests) flag to further select -which disabled tests to run. - -_Availability:_ Linux, Windows, Mac; since version 1.3.0. - -## Repeating the Tests ## - -Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it -will fail only 1% of the time, making it rather hard to reproduce the bug under -a debugger. This can be a major source of frustration. - -The `--gtest_repeat` flag allows you to repeat all (or selected) test methods -in a program many times. Hopefully, a flaky test will eventually fail and give -you a chance to debug. Here's how to use it: - -| `$ foo_test --gtest_repeat=1000` | Repeat foo\_test 1000 times and don't stop at failures. | -|:---------------------------------|:--------------------------------------------------------| -| `$ foo_test --gtest_repeat=-1` | A negative count means repeating forever. | -| `$ foo_test --gtest_repeat=1000 --gtest_break_on_failure` | Repeat foo\_test 1000 times, stopping at the first failure. This is especially useful when running under a debugger: when the testfails, it will drop into the debugger and you can then inspect variables and stacks. | -| `$ foo_test --gtest_repeat=1000 --gtest_filter=FooBar` | Repeat the tests whose name matches the filter 1000 times. | - -If your test program contains global set-up/tear-down code registered -using `AddGlobalTestEnvironment()`, it will be repeated in each -iteration as well, as the flakiness may be in it. You can also specify -the repeat count by setting the `GTEST_REPEAT` environment variable. - -_Availability:_ Linux, Windows, Mac. - -## Shuffling the Tests ## - -You can specify the `--gtest_shuffle` flag (or set the `GTEST_SHUFFLE` -environment variable to `1`) to run the tests in a program in a random -order. This helps to reveal bad dependencies between tests. - -By default, Google Test uses a random seed calculated from the current -time. Therefore you'll get a different order every time. The console -output includes the random seed value, such that you can reproduce an -order-related test failure later. To specify the random seed -explicitly, use the `--gtest_random_seed=SEED` flag (or set the -`GTEST_RANDOM_SEED` environment variable), where `SEED` is an integer -between 0 and 99999. The seed value 0 is special: it tells Google Test -to do the default behavior of calculating the seed from the current -time. - -If you combine this with `--gtest_repeat=N`, Google Test will pick a -different random seed and re-shuffle the tests in each iteration. - -_Availability:_ Linux, Windows, Mac; since v1.4.0. - -## Controlling Test Output ## - -This section teaches how to tweak the way test results are reported. - -### Colored Terminal Output ### - -Google Test can use colors in its terminal output to make it easier to spot -the separation between tests, and whether tests passed. - -You can set the GTEST\_COLOR environment variable or set the `--gtest_color` -command line flag to `yes`, `no`, or `auto` (the default) to enable colors, -disable colors, or let Google Test decide. When the value is `auto`, Google -Test will use colors if and only if the output goes to a terminal and (on -non-Windows platforms) the `TERM` environment variable is set to `xterm` or -`xterm-color`. - -_Availability:_ Linux, Windows, Mac. - -### Suppressing the Elapsed Time ### - -By default, Google Test prints the time it takes to run each test. To -suppress that, run the test program with the `--gtest_print_time=0` -command line flag. Setting the `GTEST_PRINT_TIME` environment -variable to `0` has the same effect. - -_Availability:_ Linux, Windows, Mac. (In Google Test 1.3.0 and lower, -the default behavior is that the elapsed time is **not** printed.) - -### Generating an XML Report ### - -Google Test can emit a detailed XML report to a file in addition to its normal -textual output. The report contains the duration of each test, and thus can -help you identify slow tests. - -To generate the XML report, set the `GTEST_OUTPUT` environment variable or the -`--gtest_output` flag to the string `"xml:_path_to_output_file_"`, which will -create the file at the given location. You can also just use the string -`"xml"`, in which case the output can be found in the `test_detail.xml` file in -the current directory. - -If you specify a directory (for example, `"xml:output/directory/"` on Linux or -`"xml:output\directory\"` on Windows), Google Test will create the XML file in -that directory, named after the test executable (e.g. `foo_test.xml` for test -program `foo_test` or `foo_test.exe`). If the file already exists (perhaps left -over from a previous run), Google Test will pick a different name (e.g. -`foo_test_1.xml`) to avoid overwriting it. - -The report uses the format described here. It is based on the -`junitreport` Ant task and can be parsed by popular continuous build -systems like [Hudson](https://hudson.dev.java.net/). Since that format -was originally intended for Java, a little interpretation is required -to make it apply to Google Test tests, as shown here: - -``` - - - - - - - - - -``` - - * The root `` element corresponds to the entire test program. - * `` elements correspond to Google Test test cases. - * `` elements correspond to Google Test test functions. - -For instance, the following program - -``` -TEST(MathTest, Addition) { ... } -TEST(MathTest, Subtraction) { ... } -TEST(LogicTest, NonContradiction) { ... } -``` - -could generate this report: - -``` - - - - - - - - - - - - - - - -``` - -Things to note: - - * The `tests` attribute of a `` or `` element tells how many test functions the Google Test program or test case contains, while the `failures` attribute tells how many of them failed. - * The `time` attribute expresses the duration of the test, test case, or entire test program in milliseconds. - * Each `` element corresponds to a single failed Google Test assertion. - * Some JUnit concepts don't apply to Google Test, yet we have to conform to the DTD. Therefore you'll see some dummy elements and attributes in the report. You can safely ignore these parts. - -_Availability:_ Linux, Windows, Mac. - -## Controlling How Failures Are Reported ## - -### Turning Assertion Failures into Break-Points ### - -When running test programs under a debugger, it's very convenient if the -debugger can catch an assertion failure and automatically drop into interactive -mode. Google Test's _break-on-failure_ mode supports this behavior. - -To enable it, set the `GTEST_BREAK_ON_FAILURE` environment variable to a value -other than `0` . Alternatively, you can use the `--gtest_break_on_failure` -command line flag. - -_Availability:_ Linux, Windows, Mac. - -### Disabling Catching Test-Thrown Exceptions ### - -Google Test can be used either with or without exceptions enabled. If -a test throws a C++ exception or (on Windows) a structured exception -(SEH), by default Google Test catches it, reports it as a test -failure, and continues with the next test method. This maximizes the -coverage of a test run. Also, on Windows an uncaught exception will -cause a pop-up window, so catching the exceptions allows you to run -the tests automatically. - -When debugging the test failures, however, you may instead want the -exceptions to be handled by the debugger, such that you can examine -the call stack when an exception is thrown. To achieve that, set the -`GTEST_CATCH_EXCEPTIONS` environment variable to `0`, or use the -`--gtest_catch_exceptions=0` flag when running the tests. - -**Availability**: Linux, Windows, Mac. - -### Letting Another Testing Framework Drive ### - -If you work on a project that has already been using another testing -framework and is not ready to completely switch to Google Test yet, -you can get much of Google Test's benefit by using its assertions in -your existing tests. Just change your `main()` function to look -like: - -``` -#include "gtest/gtest.h" - -int main(int argc, char** argv) { - ::testing::GTEST_FLAG(throw_on_failure) = true; - // Important: Google Test must be initialized. - ::testing::InitGoogleTest(&argc, argv); - - ... whatever your existing testing framework requires ... -} -``` - -With that, you can use Google Test assertions in addition to the -native assertions your testing framework provides, for example: - -``` -void TestFooDoesBar() { - Foo foo; - EXPECT_LE(foo.Bar(1), 100); // A Google Test assertion. - CPPUNIT_ASSERT(foo.IsEmpty()); // A native assertion. -} -``` - -If a Google Test assertion fails, it will print an error message and -throw an exception, which will be treated as a failure by your host -testing framework. If you compile your code with exceptions disabled, -a failed Google Test assertion will instead exit your program with a -non-zero code, which will also signal a test failure to your test -runner. - -If you don't write `::testing::GTEST_FLAG(throw_on_failure) = true;` in -your `main()`, you can alternatively enable this feature by specifying -the `--gtest_throw_on_failure` flag on the command-line or setting the -`GTEST_THROW_ON_FAILURE` environment variable to a non-zero value. - -_Availability:_ Linux, Windows, Mac; since v1.3.0. - -## Distributing Test Functions to Multiple Machines ## - -If you have more than one machine you can use to run a test program, -you might want to run the test functions in parallel and get the -result faster. We call this technique _sharding_, where each machine -is called a _shard_. - -Google Test is compatible with test sharding. To take advantage of -this feature, your test runner (not part of Google Test) needs to do -the following: - - 1. Allocate a number of machines (shards) to run the tests. - 1. On each shard, set the `GTEST_TOTAL_SHARDS` environment variable to the total number of shards. It must be the same for all shards. - 1. On each shard, set the `GTEST_SHARD_INDEX` environment variable to the index of the shard. Different shards must be assigned different indices, which must be in the range `[0, GTEST_TOTAL_SHARDS - 1]`. - 1. Run the same test program on all shards. When Google Test sees the above two environment variables, it will select a subset of the test functions to run. Across all shards, each test function in the program will be run exactly once. - 1. Wait for all shards to finish, then collect and report the results. - -Your project may have tests that were written without Google Test and -thus don't understand this protocol. In order for your test runner to -figure out which test supports sharding, it can set the environment -variable `GTEST_SHARD_STATUS_FILE` to a non-existent file path. If a -test program supports sharding, it will create this file to -acknowledge the fact (the actual contents of the file are not -important at this time; although we may stick some useful information -in it in the future.); otherwise it will not create it. - -Here's an example to make it clear. Suppose you have a test program -`foo_test` that contains the following 5 test functions: -``` -TEST(A, V) -TEST(A, W) -TEST(B, X) -TEST(B, Y) -TEST(B, Z) -``` -and you have 3 machines at your disposal. To run the test functions in -parallel, you would set `GTEST_TOTAL_SHARDS` to 3 on all machines, and -set `GTEST_SHARD_INDEX` to 0, 1, and 2 on the machines respectively. -Then you would run the same `foo_test` on each machine. - -Google Test reserves the right to change how the work is distributed -across the shards, but here's one possible scenario: - - * Machine #0 runs `A.V` and `B.X`. - * Machine #1 runs `A.W` and `B.Y`. - * Machine #2 runs `B.Z`. - -_Availability:_ Linux, Windows, Mac; since version 1.3.0. - -# Fusing Google Test Source Files # - -Google Test's implementation consists of ~30 files (excluding its own -tests). Sometimes you may want them to be packaged up in two files (a -`.h` and a `.cc`) instead, such that you can easily copy them to a new -machine and start hacking there. For this we provide an experimental -Python script `fuse_gtest_files.py` in the `scripts/` directory (since release 1.3.0). -Assuming you have Python 2.4 or above installed on your machine, just -go to that directory and run -``` -python fuse_gtest_files.py OUTPUT_DIR -``` - -and you should see an `OUTPUT_DIR` directory being created with files -`gtest/gtest.h` and `gtest/gtest-all.cc` in it. These files contain -everything you need to use Google Test. Just copy them to anywhere -you want and you are ready to write tests. You can use the -[scripts/test/Makefile](../scripts/test/Makefile) -file as an example on how to compile your tests against them. - -# Where to Go from Here # - -Congratulations! You've now learned more advanced Google Test tools and are -ready to tackle more complex testing tasks. If you want to dive even deeper, you -can read the [Frequently-Asked Questions](V1_6_FAQ.md). diff --git a/test/gtest-1.8.0/docs/V1_6_Documentation.md b/test/gtest-1.8.0/docs/V1_6_Documentation.md deleted file mode 100644 index ca924660a3..0000000000 --- a/test/gtest-1.8.0/docs/V1_6_Documentation.md +++ /dev/null @@ -1,14 +0,0 @@ -This page lists all documentation wiki pages for Google Test **1.6** --- **if you use a released version of Google Test, please read the -documentation for that specific version instead.** - - * [Primer](V1_6_Primer.md) -- start here if you are new to Google Test. - * [Samples](V1_6_Samples.md) -- learn from examples. - * [AdvancedGuide](V1_6_AdvancedGuide.md) -- learn more about Google Test. - * [XcodeGuide](V1_6_XcodeGuide.md) -- how to use Google Test in Xcode on Mac. - * [Frequently-Asked Questions](V1_6_FAQ.md) -- check here before asking a question on the mailing list. - -To contribute code to Google Test, read: - - * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch. - * [PumpManual](V1_6_PumpManual.md) -- how we generate some of Google Test's source files. \ No newline at end of file diff --git a/test/gtest-1.8.0/docs/V1_6_FAQ.md b/test/gtest-1.8.0/docs/V1_6_FAQ.md deleted file mode 100644 index 2b7f784077..0000000000 --- a/test/gtest-1.8.0/docs/V1_6_FAQ.md +++ /dev/null @@ -1,1038 +0,0 @@ - - -If you cannot find the answer to your question here, and you have read -[Primer](V1_6_Primer.md) and [AdvancedGuide](V1_6_AdvancedGuide.md), send it to -googletestframework@googlegroups.com. - -## Why should I use Google Test instead of my favorite C++ testing framework? ## - -First, let us say clearly that we don't want to get into the debate of -which C++ testing framework is **the best**. There exist many fine -frameworks for writing C++ tests, and we have tremendous respect for -the developers and users of them. We don't think there is (or will -be) a single best framework - you have to pick the right tool for the -particular task you are tackling. - -We created Google Test because we couldn't find the right combination -of features and conveniences in an existing framework to satisfy _our_ -needs. The following is a list of things that _we_ like about Google -Test. We don't claim them to be unique to Google Test - rather, the -combination of them makes Google Test the choice for us. We hope this -list can help you decide whether it is for you too. - - * Google Test is designed to be portable: it doesn't require exceptions or RTTI; it works around various bugs in various compilers and environments; etc. As a result, it works on Linux, Mac OS X, Windows and several embedded operating systems. - * Nonfatal assertions (`EXPECT_*`) have proven to be great time savers, as they allow a test to report multiple failures in a single edit-compile-test cycle. - * It's easy to write assertions that generate informative messages: you just use the stream syntax to append any additional information, e.g. `ASSERT_EQ(5, Foo(i)) << " where i = " << i;`. It doesn't require a new set of macros or special functions. - * Google Test automatically detects your tests and doesn't require you to enumerate them in order to run them. - * Death tests are pretty handy for ensuring that your asserts in production code are triggered by the right conditions. - * `SCOPED_TRACE` helps you understand the context of an assertion failure when it comes from inside a sub-routine or loop. - * You can decide which tests to run using name patterns. This saves time when you want to quickly reproduce a test failure. - * Google Test can generate XML test result reports that can be parsed by popular continuous build system like Hudson. - * Simple things are easy in Google Test, while hard things are possible: in addition to advanced features like [global test environments](V1_6_AdvancedGuide.md#Global_Set-Up_and_Tear-Down) and tests parameterized by [values](V1_6_AdvancedGuide.md#value-parameterized-tests) or [types](V1_6_AdvancedGuide.md#typed-tests), Google Test supports various ways for the user to extend the framework -- if Google Test doesn't do something out of the box, chances are that a user can implement the feature using Google Test's public API, without changing Google Test itself. In particular, you can: - * expand your testing vocabulary by defining [custom predicates](V1_6_AdvancedGuide.md#predicate-assertions-for-better-error-messages), - * teach Google Test how to [print your types](V1_6_AdvancedGuide.md#teaching-google-test-how-to-print-your-values), - * define your own testing macros or utilities and verify them using Google Test's [Service Provider Interface](V1_6_AdvancedGuide.md#catching-failures), and - * reflect on the test cases or change the test output format by intercepting the [test events](V1_6_AdvancedGuide.md#extending-google-test-by-handling-test-events). - -## I'm getting warnings when compiling Google Test. Would you fix them? ## - -We strive to minimize compiler warnings Google Test generates. Before releasing a new version, we test to make sure that it doesn't generate warnings when compiled using its CMake script on Windows, Linux, and Mac OS. - -Unfortunately, this doesn't mean you are guaranteed to see no warnings when compiling Google Test in your environment: - - * You may be using a different compiler as we use, or a different version of the same compiler. We cannot possibly test for all compilers. - * You may be compiling on a different platform as we do. - * Your project may be using different compiler flags as we do. - -It is not always possible to make Google Test warning-free for everyone. Or, it may not be desirable if the warning is rarely enabled and fixing the violations makes the code more complex. - -If you see warnings when compiling Google Test, we suggest that you use the `-isystem` flag (assuming your are using GCC) to mark Google Test headers as system headers. That'll suppress warnings from Google Test headers. - -## Why should not test case names and test names contain underscore? ## - -Underscore (`_`) is special, as C++ reserves the following to be used by -the compiler and the standard library: - - 1. any identifier that starts with an `_` followed by an upper-case letter, and - 1. any identifier that containers two consecutive underscores (i.e. `__`) _anywhere_ in its name. - -User code is _prohibited_ from using such identifiers. - -Now let's look at what this means for `TEST` and `TEST_F`. - -Currently `TEST(TestCaseName, TestName)` generates a class named -`TestCaseName_TestName_Test`. What happens if `TestCaseName` or `TestName` -contains `_`? - - 1. If `TestCaseName` starts with an `_` followed by an upper-case letter (say, `_Foo`), we end up with `_Foo_TestName_Test`, which is reserved and thus invalid. - 1. If `TestCaseName` ends with an `_` (say, `Foo_`), we get `Foo__TestName_Test`, which is invalid. - 1. If `TestName` starts with an `_` (say, `_Bar`), we get `TestCaseName__Bar_Test`, which is invalid. - 1. If `TestName` ends with an `_` (say, `Bar_`), we get `TestCaseName_Bar__Test`, which is invalid. - -So clearly `TestCaseName` and `TestName` cannot start or end with `_` -(Actually, `TestCaseName` can start with `_` -- as long as the `_` isn't -followed by an upper-case letter. But that's getting complicated. So -for simplicity we just say that it cannot start with `_`.). - -It may seem fine for `TestCaseName` and `TestName` to contain `_` in the -middle. However, consider this: -``` -TEST(Time, Flies_Like_An_Arrow) { ... } -TEST(Time_Flies, Like_An_Arrow) { ... } -``` - -Now, the two `TEST`s will both generate the same class -(`Time_Files_Like_An_Arrow_Test`). That's not good. - -So for simplicity, we just ask the users to avoid `_` in `TestCaseName` -and `TestName`. The rule is more constraining than necessary, but it's -simple and easy to remember. It also gives Google Test some wiggle -room in case its implementation needs to change in the future. - -If you violate the rule, there may not be immediately consequences, -but your test may (just may) break with a new compiler (or a new -version of the compiler you are using) or with a new version of Google -Test. Therefore it's best to follow the rule. - -## Why is it not recommended to install a pre-compiled copy of Google Test (for example, into /usr/local)? ## - -In the early days, we said that you could install -compiled Google Test libraries on `*`nix systems using `make install`. -Then every user of your machine can write tests without -recompiling Google Test. - -This seemed like a good idea, but it has a -got-cha: every user needs to compile his tests using the _same_ compiler -flags used to compile the installed Google Test libraries; otherwise -he may run into undefined behaviors (i.e. the tests can behave -strangely and may even crash for no obvious reasons). - -Why? Because C++ has this thing called the One-Definition Rule: if -two C++ source files contain different definitions of the same -class/function/variable, and you link them together, you violate the -rule. The linker may or may not catch the error (in many cases it's -not required by the C++ standard to catch the violation). If it -doesn't, you get strange run-time behaviors that are unexpected and -hard to debug. - -If you compile Google Test and your test code using different compiler -flags, they may see different definitions of the same -class/function/variable (e.g. due to the use of `#if` in Google Test). -Therefore, for your sanity, we recommend to avoid installing pre-compiled -Google Test libraries. Instead, each project should compile -Google Test itself such that it can be sure that the same flags are -used for both Google Test and the tests. - -## How do I generate 64-bit binaries on Windows (using Visual Studio 2008)? ## - -(Answered by Trevor Robinson) - -Load the supplied Visual Studio solution file, either `msvc\gtest-md.sln` or -`msvc\gtest.sln`. Go through the migration wizard to migrate the -solution and project files to Visual Studio 2008. Select -`Configuration Manager...` from the `Build` menu. Select `` from -the `Active solution platform` dropdown. Select `x64` from the new -platform dropdown, leave `Copy settings from` set to `Win32` and -`Create new project platforms` checked, then click `OK`. You now have -`Win32` and `x64` platform configurations, selectable from the -`Standard` toolbar, which allow you to toggle between building 32-bit or -64-bit binaries (or both at once using Batch Build). - -In order to prevent build output files from overwriting one another, -you'll need to change the `Intermediate Directory` settings for the -newly created platform configuration across all the projects. To do -this, multi-select (e.g. using shift-click) all projects (but not the -solution) in the `Solution Explorer`. Right-click one of them and -select `Properties`. In the left pane, select `Configuration Properties`, -and from the `Configuration` dropdown, select `All Configurations`. -Make sure the selected platform is `x64`. For the -`Intermediate Directory` setting, change the value from -`$(PlatformName)\$(ConfigurationName)` to -`$(OutDir)\$(ProjectName)`. Click `OK` and then build the -solution. When the build is complete, the 64-bit binaries will be in -the `msvc\x64\Debug` directory. - -## Can I use Google Test on MinGW? ## - -We haven't tested this ourselves, but Per Abrahamsen reported that he -was able to compile and install Google Test successfully when using -MinGW from Cygwin. You'll need to configure it with: - -`PATH/TO/configure CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin"` - -You should be able to replace the `-mno-cygwin` option with direct links -to the real MinGW binaries, but we haven't tried that. - -Caveats: - - * There are many warnings when compiling. - * `make check` will produce some errors as not all tests for Google Test itself are compatible with MinGW. - -We also have reports on successful cross compilation of Google Test -MinGW binaries on Linux using -[these instructions](http://wiki.wxwidgets.org/Cross-Compiling_Under_Linux#Cross-compiling_under_Linux_for_MS_Windows) -on the WxWidgets site. - -Please contact `googletestframework@googlegroups.com` if you are -interested in improving the support for MinGW. - -## Why does Google Test support EXPECT\_EQ(NULL, ptr) and ASSERT\_EQ(NULL, ptr) but not EXPECT\_NE(NULL, ptr) and ASSERT\_NE(NULL, ptr)? ## - -Due to some peculiarity of C++, it requires some non-trivial template -meta programming tricks to support using `NULL` as an argument of the -`EXPECT_XX()` and `ASSERT_XX()` macros. Therefore we only do it where -it's most needed (otherwise we make the implementation of Google Test -harder to maintain and more error-prone than necessary). - -The `EXPECT_EQ()` macro takes the _expected_ value as its first -argument and the _actual_ value as the second. It's reasonable that -someone wants to write `EXPECT_EQ(NULL, some_expression)`, and this -indeed was requested several times. Therefore we implemented it. - -The need for `EXPECT_NE(NULL, ptr)` isn't nearly as strong. When the -assertion fails, you already know that `ptr` must be `NULL`, so it -doesn't add any information to print ptr in this case. That means -`EXPECT_TRUE(ptr ! NULL)` works just as well. - -If we were to support `EXPECT_NE(NULL, ptr)`, for consistency we'll -have to support `EXPECT_NE(ptr, NULL)` as well, as unlike `EXPECT_EQ`, -we don't have a convention on the order of the two arguments for -`EXPECT_NE`. This means using the template meta programming tricks -twice in the implementation, making it even harder to understand and -maintain. We believe the benefit doesn't justify the cost. - -Finally, with the growth of Google Mock's [matcher](../../CookBook.md#using-matchers-in-google-test-assertions) library, we are -encouraging people to use the unified `EXPECT_THAT(value, matcher)` -syntax more often in tests. One significant advantage of the matcher -approach is that matchers can be easily combined to form new matchers, -while the `EXPECT_NE`, etc, macros cannot be easily -combined. Therefore we want to invest more in the matchers than in the -`EXPECT_XX()` macros. - -## Does Google Test support running tests in parallel? ## - -Test runners tend to be tightly coupled with the build/test -environment, and Google Test doesn't try to solve the problem of -running tests in parallel. Instead, we tried to make Google Test work -nicely with test runners. For example, Google Test's XML report -contains the time spent on each test, and its `gtest_list_tests` and -`gtest_filter` flags can be used for splitting the execution of test -methods into multiple processes. These functionalities can help the -test runner run the tests in parallel. - -## Why don't Google Test run the tests in different threads to speed things up? ## - -It's difficult to write thread-safe code. Most tests are not written -with thread-safety in mind, and thus may not work correctly in a -multi-threaded setting. - -If you think about it, it's already hard to make your code work when -you know what other threads are doing. It's much harder, and -sometimes even impossible, to make your code work when you don't know -what other threads are doing (remember that test methods can be added, -deleted, or modified after your test was written). If you want to run -the tests in parallel, you'd better run them in different processes. - -## Why aren't Google Test assertions implemented using exceptions? ## - -Our original motivation was to be able to use Google Test in projects -that disable exceptions. Later we realized some additional benefits -of this approach: - - 1. Throwing in a destructor is undefined behavior in C++. Not using exceptions means Google Test's assertions are safe to use in destructors. - 1. The `EXPECT_*` family of macros will continue even after a failure, allowing multiple failures in a `TEST` to be reported in a single run. This is a popular feature, as in C++ the edit-compile-test cycle is usually quite long and being able to fixing more than one thing at a time is a blessing. - 1. If assertions are implemented using exceptions, a test may falsely ignore a failure if it's caught by user code: -``` -try { ... ASSERT_TRUE(...) ... } -catch (...) { ... } -``` -The above code will pass even if the `ASSERT_TRUE` throws. While it's unlikely for someone to write this in a test, it's possible to run into this pattern when you write assertions in callbacks that are called by the code under test. - -The downside of not using exceptions is that `ASSERT_*` (implemented -using `return`) will only abort the current function, not the current -`TEST`. - -## Why do we use two different macros for tests with and without fixtures? ## - -Unfortunately, C++'s macro system doesn't allow us to use the same -macro for both cases. One possibility is to provide only one macro -for tests with fixtures, and require the user to define an empty -fixture sometimes: - -``` -class FooTest : public ::testing::Test {}; - -TEST_F(FooTest, DoesThis) { ... } -``` -or -``` -typedef ::testing::Test FooTest; - -TEST_F(FooTest, DoesThat) { ... } -``` - -Yet, many people think this is one line too many. :-) Our goal was to -make it really easy to write tests, so we tried to make simple tests -trivial to create. That means using a separate macro for such tests. - -We think neither approach is ideal, yet either of them is reasonable. -In the end, it probably doesn't matter much either way. - -## Why don't we use structs as test fixtures? ## - -We like to use structs only when representing passive data. This -distinction between structs and classes is good for documenting the -intent of the code's author. Since test fixtures have logic like -`SetUp()` and `TearDown()`, they are better defined as classes. - -## Why are death tests implemented as assertions instead of using a test runner? ## - -Our goal was to make death tests as convenient for a user as C++ -possibly allows. In particular: - - * The runner-style requires to split the information into two pieces: the definition of the death test itself, and the specification for the runner on how to run the death test and what to expect. The death test would be written in C++, while the runner spec may or may not be. A user needs to carefully keep the two in sync. `ASSERT_DEATH(statement, expected_message)` specifies all necessary information in one place, in one language, without boilerplate code. It is very declarative. - * `ASSERT_DEATH` has a similar syntax and error-reporting semantics as other Google Test assertions, and thus is easy to learn. - * `ASSERT_DEATH` can be mixed with other assertions and other logic at your will. You are not limited to one death test per test method. For example, you can write something like: -``` - if (FooCondition()) { - ASSERT_DEATH(Bar(), "blah"); - } else { - ASSERT_EQ(5, Bar()); - } -``` -If you prefer one death test per test method, you can write your tests in that style too, but we don't want to impose that on the users. The fewer artificial limitations the better. - * `ASSERT_DEATH` can reference local variables in the current function, and you can decide how many death tests you want based on run-time information. For example, -``` - const int count = GetCount(); // Only known at run time. - for (int i = 1; i <= count; i++) { - ASSERT_DEATH({ - double* buffer = new double[i]; - ... initializes buffer ... - Foo(buffer, i) - }, "blah blah"); - } -``` -The runner-based approach tends to be more static and less flexible, or requires more user effort to get this kind of flexibility. - -Another interesting thing about `ASSERT_DEATH` is that it calls `fork()` -to create a child process to run the death test. This is lightening -fast, as `fork()` uses copy-on-write pages and incurs almost zero -overhead, and the child process starts from the user-supplied -statement directly, skipping all global and local initialization and -any code leading to the given statement. If you launch the child -process from scratch, it can take seconds just to load everything and -start running if the test links to many libraries dynamically. - -## My death test modifies some state, but the change seems lost after the death test finishes. Why? ## - -Death tests (`EXPECT_DEATH`, etc) are executed in a sub-process s.t. the -expected crash won't kill the test program (i.e. the parent process). As a -result, any in-memory side effects they incur are observable in their -respective sub-processes, but not in the parent process. You can think of them -as running in a parallel universe, more or less. - -## The compiler complains about "undefined references" to some static const member variables, but I did define them in the class body. What's wrong? ## - -If your class has a static data member: - -``` -// foo.h -class Foo { - ... - static const int kBar = 100; -}; -``` - -You also need to define it _outside_ of the class body in `foo.cc`: - -``` -const int Foo::kBar; // No initializer here. -``` - -Otherwise your code is **invalid C++**, and may break in unexpected ways. In -particular, using it in Google Test comparison assertions (`EXPECT_EQ`, etc) -will generate an "undefined reference" linker error. - -## I have an interface that has several implementations. Can I write a set of tests once and repeat them over all the implementations? ## - -Google Test doesn't yet have good support for this kind of tests, or -data-driven tests in general. We hope to be able to make improvements in this -area soon. - -## Can I derive a test fixture from another? ## - -Yes. - -Each test fixture has a corresponding and same named test case. This means only -one test case can use a particular fixture. Sometimes, however, multiple test -cases may want to use the same or slightly different fixtures. For example, you -may want to make sure that all of a GUI library's test cases don't leak -important system resources like fonts and brushes. - -In Google Test, you share a fixture among test cases by putting the shared -logic in a base test fixture, then deriving from that base a separate fixture -for each test case that wants to use this common logic. You then use `TEST_F()` -to write tests using each derived fixture. - -Typically, your code looks like this: - -``` -// Defines a base test fixture. -class BaseTest : public ::testing::Test { - protected: - ... -}; - -// Derives a fixture FooTest from BaseTest. -class FooTest : public BaseTest { - protected: - virtual void SetUp() { - BaseTest::SetUp(); // Sets up the base fixture first. - ... additional set-up work ... - } - virtual void TearDown() { - ... clean-up work for FooTest ... - BaseTest::TearDown(); // Remember to tear down the base fixture - // after cleaning up FooTest! - } - ... functions and variables for FooTest ... -}; - -// Tests that use the fixture FooTest. -TEST_F(FooTest, Bar) { ... } -TEST_F(FooTest, Baz) { ... } - -... additional fixtures derived from BaseTest ... -``` - -If necessary, you can continue to derive test fixtures from a derived fixture. -Google Test has no limit on how deep the hierarchy can be. - -For a complete example using derived test fixtures, see -[sample5](../samples/sample5_unittest.cc). - -## My compiler complains "void value not ignored as it ought to be." What does this mean? ## - -You're probably using an `ASSERT_*()` in a function that doesn't return `void`. -`ASSERT_*()` can only be used in `void` functions. - -## My death test hangs (or seg-faults). How do I fix it? ## - -In Google Test, death tests are run in a child process and the way they work is -delicate. To write death tests you really need to understand how they work. -Please make sure you have read this. - -In particular, death tests don't like having multiple threads in the parent -process. So the first thing you can try is to eliminate creating threads -outside of `EXPECT_DEATH()`. - -Sometimes this is impossible as some library you must use may be creating -threads before `main()` is even reached. In this case, you can try to minimize -the chance of conflicts by either moving as many activities as possible inside -`EXPECT_DEATH()` (in the extreme case, you want to move everything inside), or -leaving as few things as possible in it. Also, you can try to set the death -test style to `"threadsafe"`, which is safer but slower, and see if it helps. - -If you go with thread-safe death tests, remember that they rerun the test -program from the beginning in the child process. Therefore make sure your -program can run side-by-side with itself and is deterministic. - -In the end, this boils down to good concurrent programming. You have to make -sure that there is no race conditions or dead locks in your program. No silver -bullet - sorry! - -## Should I use the constructor/destructor of the test fixture or the set-up/tear-down function? ## - -The first thing to remember is that Google Test does not reuse the -same test fixture object across multiple tests. For each `TEST_F`, -Google Test will create a fresh test fixture object, _immediately_ -call `SetUp()`, run the test, call `TearDown()`, and then -_immediately_ delete the test fixture object. Therefore, there is no -need to write a `SetUp()` or `TearDown()` function if the constructor -or destructor already does the job. - -You may still want to use `SetUp()/TearDown()` in the following cases: - * If the tear-down operation could throw an exception, you must use `TearDown()` as opposed to the destructor, as throwing in a destructor leads to undefined behavior and usually will kill your program right away. Note that many standard libraries (like STL) may throw when exceptions are enabled in the compiler. Therefore you should prefer `TearDown()` if you want to write portable tests that work with or without exceptions. - * The Google Test team is considering making the assertion macros throw on platforms where exceptions are enabled (e.g. Windows, Mac OS, and Linux client-side), which will eliminate the need for the user to propagate failures from a subroutine to its caller. Therefore, you shouldn't use Google Test assertions in a destructor if your code could run on such a platform. - * In a constructor or destructor, you cannot make a virtual function call on this object. (You can call a method declared as virtual, but it will be statically bound.) Therefore, if you need to call a method that will be overriden in a derived class, you have to use `SetUp()/TearDown()`. - -## The compiler complains "no matching function to call" when I use ASSERT\_PREDn. How do I fix it? ## - -If the predicate function you use in `ASSERT_PRED*` or `EXPECT_PRED*` is -overloaded or a template, the compiler will have trouble figuring out which -overloaded version it should use. `ASSERT_PRED_FORMAT*` and -`EXPECT_PRED_FORMAT*` don't have this problem. - -If you see this error, you might want to switch to -`(ASSERT|EXPECT)_PRED_FORMAT*`, which will also give you a better failure -message. If, however, that is not an option, you can resolve the problem by -explicitly telling the compiler which version to pick. - -For example, suppose you have - -``` -bool IsPositive(int n) { - return n > 0; -} -bool IsPositive(double x) { - return x > 0; -} -``` - -you will get a compiler error if you write - -``` -EXPECT_PRED1(IsPositive, 5); -``` - -However, this will work: - -``` -EXPECT_PRED1(*static_cast*(IsPositive), 5); -``` - -(The stuff inside the angled brackets for the `static_cast` operator is the -type of the function pointer for the `int`-version of `IsPositive()`.) - -As another example, when you have a template function - -``` -template -bool IsNegative(T x) { - return x < 0; -} -``` - -you can use it in a predicate assertion like this: - -``` -ASSERT_PRED1(IsNegative**, -5); -``` - -Things are more interesting if your template has more than one parameters. The -following won't compile: - -``` -ASSERT_PRED2(*GreaterThan*, 5, 0); -``` - - -as the C++ pre-processor thinks you are giving `ASSERT_PRED2` 4 arguments, -which is one more than expected. The workaround is to wrap the predicate -function in parentheses: - -``` -ASSERT_PRED2(*(GreaterThan)*, 5, 0); -``` - - -## My compiler complains about "ignoring return value" when I call RUN\_ALL\_TESTS(). Why? ## - -Some people had been ignoring the return value of `RUN_ALL_TESTS()`. That is, -instead of - -``` -return RUN_ALL_TESTS(); -``` - -they write - -``` -RUN_ALL_TESTS(); -``` - -This is wrong and dangerous. A test runner needs to see the return value of -`RUN_ALL_TESTS()` in order to determine if a test has passed. If your `main()` -function ignores it, your test will be considered successful even if it has a -Google Test assertion failure. Very bad. - -To help the users avoid this dangerous bug, the implementation of -`RUN_ALL_TESTS()` causes gcc to raise this warning, when the return value is -ignored. If you see this warning, the fix is simple: just make sure its value -is used as the return value of `main()`. - -## My compiler complains that a constructor (or destructor) cannot return a value. What's going on? ## - -Due to a peculiarity of C++, in order to support the syntax for streaming -messages to an `ASSERT_*`, e.g. - -``` -ASSERT_EQ(1, Foo()) << "blah blah" << foo; -``` - -we had to give up using `ASSERT*` and `FAIL*` (but not `EXPECT*` and -`ADD_FAILURE*`) in constructors and destructors. The workaround is to move the -content of your constructor/destructor to a private void member function, or -switch to `EXPECT_*()` if that works. This section in the user's guide explains -it. - -## My set-up function is not called. Why? ## - -C++ is case-sensitive. It should be spelled as `SetUp()`. Did you -spell it as `Setup()`? - -Similarly, sometimes people spell `SetUpTestCase()` as `SetupTestCase()` and -wonder why it's never called. - -## How do I jump to the line of a failure in Emacs directly? ## - -Google Test's failure message format is understood by Emacs and many other -IDEs, like acme and XCode. If a Google Test message is in a compilation buffer -in Emacs, then it's clickable. You can now hit `enter` on a message to jump to -the corresponding source code, or use `C-x `` to jump to the next failure. - -## I have several test cases which share the same test fixture logic, do I have to define a new test fixture class for each of them? This seems pretty tedious. ## - -You don't have to. Instead of - -``` -class FooTest : public BaseTest {}; - -TEST_F(FooTest, Abc) { ... } -TEST_F(FooTest, Def) { ... } - -class BarTest : public BaseTest {}; - -TEST_F(BarTest, Abc) { ... } -TEST_F(BarTest, Def) { ... } -``` - -you can simply `typedef` the test fixtures: -``` -typedef BaseTest FooTest; - -TEST_F(FooTest, Abc) { ... } -TEST_F(FooTest, Def) { ... } - -typedef BaseTest BarTest; - -TEST_F(BarTest, Abc) { ... } -TEST_F(BarTest, Def) { ... } -``` - -## The Google Test output is buried in a whole bunch of log messages. What do I do? ## - -The Google Test output is meant to be a concise and human-friendly report. If -your test generates textual output itself, it will mix with the Google Test -output, making it hard to read. However, there is an easy solution to this -problem. - -Since most log messages go to stderr, we decided to let Google Test output go -to stdout. This way, you can easily separate the two using redirection. For -example: -``` -./my_test > googletest_output.txt -``` - -## Why should I prefer test fixtures over global variables? ## - -There are several good reasons: - 1. It's likely your test needs to change the states of its global variables. This makes it difficult to keep side effects from escaping one test and contaminating others, making debugging difficult. By using fixtures, each test has a fresh set of variables that's different (but with the same names). Thus, tests are kept independent of each other. - 1. Global variables pollute the global namespace. - 1. Test fixtures can be reused via subclassing, which cannot be done easily with global variables. This is useful if many test cases have something in common. - -## How do I test private class members without writing FRIEND\_TEST()s? ## - -You should try to write testable code, which means classes should be easily -tested from their public interface. One way to achieve this is the Pimpl idiom: -you move all private members of a class into a helper class, and make all -members of the helper class public. - -You have several other options that don't require using `FRIEND_TEST`: - * Write the tests as members of the fixture class: -``` -class Foo { - friend class FooTest; - ... -}; - -class FooTest : public ::testing::Test { - protected: - ... - void Test1() {...} // This accesses private members of class Foo. - void Test2() {...} // So does this one. -}; - -TEST_F(FooTest, Test1) { - Test1(); -} - -TEST_F(FooTest, Test2) { - Test2(); -} -``` - * In the fixture class, write accessors for the tested class' private members, then use the accessors in your tests: -``` -class Foo { - friend class FooTest; - ... -}; - -class FooTest : public ::testing::Test { - protected: - ... - T1 get_private_member1(Foo* obj) { - return obj->private_member1_; - } -}; - -TEST_F(FooTest, Test1) { - ... - get_private_member1(x) - ... -} -``` - * If the methods are declared **protected**, you can change their access level in a test-only subclass: -``` -class YourClass { - ... - protected: // protected access for testability. - int DoSomethingReturningInt(); - ... -}; - -// in the your_class_test.cc file: -class TestableYourClass : public YourClass { - ... - public: using YourClass::DoSomethingReturningInt; // changes access rights - ... -}; - -TEST_F(YourClassTest, DoSomethingTest) { - TestableYourClass obj; - assertEquals(expected_value, obj.DoSomethingReturningInt()); -} -``` - -## How do I test private class static members without writing FRIEND\_TEST()s? ## - -We find private static methods clutter the header file. They are -implementation details and ideally should be kept out of a .h. So often I make -them free functions instead. - -Instead of: -``` -// foo.h -class Foo { - ... - private: - static bool Func(int n); -}; - -// foo.cc -bool Foo::Func(int n) { ... } - -// foo_test.cc -EXPECT_TRUE(Foo::Func(12345)); -``` - -You probably should better write: -``` -// foo.h -class Foo { - ... -}; - -// foo.cc -namespace internal { - bool Func(int n) { ... } -} - -// foo_test.cc -namespace internal { - bool Func(int n); -} - -EXPECT_TRUE(internal::Func(12345)); -``` - -## I would like to run a test several times with different parameters. Do I need to write several similar copies of it? ## - -No. You can use a feature called [value-parameterized tests](V1_6_AdvancedGuide.md#Value_Parameterized_Tests) which -lets you repeat your tests with different parameters, without defining it more than once. - -## How do I test a file that defines main()? ## - -To test a `foo.cc` file, you need to compile and link it into your unit test -program. However, when the file contains a definition for the `main()` -function, it will clash with the `main()` of your unit test, and will result in -a build error. - -The right solution is to split it into three files: - 1. `foo.h` which contains the declarations, - 1. `foo.cc` which contains the definitions except `main()`, and - 1. `foo_main.cc` which contains nothing but the definition of `main()`. - -Then `foo.cc` can be easily tested. - -If you are adding tests to an existing file and don't want an intrusive change -like this, there is a hack: just include the entire `foo.cc` file in your unit -test. For example: -``` -// File foo_unittest.cc - -// The headers section -... - -// Renames main() in foo.cc to make room for the unit test main() -#define main FooMain - -#include "a/b/foo.cc" - -// The tests start here. -... -``` - - -However, please remember this is a hack and should only be used as the last -resort. - -## What can the statement argument in ASSERT\_DEATH() be? ## - -`ASSERT_DEATH(_statement_, _regex_)` (or any death assertion macro) can be used -wherever `_statement_` is valid. So basically `_statement_` can be any C++ -statement that makes sense in the current context. In particular, it can -reference global and/or local variables, and can be: - * a simple function call (often the case), - * a complex expression, or - * a compound statement. - -> Some examples are shown here: - -``` -// A death test can be a simple function call. -TEST(MyDeathTest, FunctionCall) { - ASSERT_DEATH(Xyz(5), "Xyz failed"); -} - -// Or a complex expression that references variables and functions. -TEST(MyDeathTest, ComplexExpression) { - const bool c = Condition(); - ASSERT_DEATH((c ? Func1(0) : object2.Method("test")), - "(Func1|Method) failed"); -} - -// Death assertions can be used any where in a function. In -// particular, they can be inside a loop. -TEST(MyDeathTest, InsideLoop) { - // Verifies that Foo(0), Foo(1), ..., and Foo(4) all die. - for (int i = 0; i < 5; i++) { - EXPECT_DEATH_M(Foo(i), "Foo has \\d+ errors", - ::testing::Message() << "where i is " << i); - } -} - -// A death assertion can contain a compound statement. -TEST(MyDeathTest, CompoundStatement) { - // Verifies that at lease one of Bar(0), Bar(1), ..., and - // Bar(4) dies. - ASSERT_DEATH({ - for (int i = 0; i < 5; i++) { - Bar(i); - } - }, - "Bar has \\d+ errors");} -``` - -`googletest_unittest.cc` contains more examples if you are interested. - -## What syntax does the regular expression in ASSERT\_DEATH use? ## - -On POSIX systems, Google Test uses the POSIX Extended regular -expression syntax -(http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions). -On Windows, it uses a limited variant of regular expression -syntax. For more details, see the -[regular expression syntax](V1_6_AdvancedGuide.md#Regular_Expression_Syntax). - -## I have a fixture class Foo, but TEST\_F(Foo, Bar) gives me error "no matching function for call to Foo::Foo()". Why? ## - -Google Test needs to be able to create objects of your test fixture class, so -it must have a default constructor. Normally the compiler will define one for -you. However, there are cases where you have to define your own: - * If you explicitly declare a non-default constructor for class `Foo`, then you need to define a default constructor, even if it would be empty. - * If `Foo` has a const non-static data member, then you have to define the default constructor _and_ initialize the const member in the initializer list of the constructor. (Early versions of `gcc` doesn't force you to initialize the const member. It's a bug that has been fixed in `gcc 4`.) - -## Why does ASSERT\_DEATH complain about previous threads that were already joined? ## - -With the Linux pthread library, there is no turning back once you cross the -line from single thread to multiple threads. The first time you create a -thread, a manager thread is created in addition, so you get 3, not 2, threads. -Later when the thread you create joins the main thread, the thread count -decrements by 1, but the manager thread will never be killed, so you still have -2 threads, which means you cannot safely run a death test. - -The new NPTL thread library doesn't suffer from this problem, as it doesn't -create a manager thread. However, if you don't control which machine your test -runs on, you shouldn't depend on this. - -## Why does Google Test require the entire test case, instead of individual tests, to be named FOODeathTest when it uses ASSERT\_DEATH? ## - -Google Test does not interleave tests from different test cases. That is, it -runs all tests in one test case first, and then runs all tests in the next test -case, and so on. Google Test does this because it needs to set up a test case -before the first test in it is run, and tear it down afterwords. Splitting up -the test case would require multiple set-up and tear-down processes, which is -inefficient and makes the semantics unclean. - -If we were to determine the order of tests based on test name instead of test -case name, then we would have a problem with the following situation: - -``` -TEST_F(FooTest, AbcDeathTest) { ... } -TEST_F(FooTest, Uvw) { ... } - -TEST_F(BarTest, DefDeathTest) { ... } -TEST_F(BarTest, Xyz) { ... } -``` - -Since `FooTest.AbcDeathTest` needs to run before `BarTest.Xyz`, and we don't -interleave tests from different test cases, we need to run all tests in the -`FooTest` case before running any test in the `BarTest` case. This contradicts -with the requirement to run `BarTest.DefDeathTest` before `FooTest.Uvw`. - -## But I don't like calling my entire test case FOODeathTest when it contains both death tests and non-death tests. What do I do? ## - -You don't have to, but if you like, you may split up the test case into -`FooTest` and `FooDeathTest`, where the names make it clear that they are -related: - -``` -class FooTest : public ::testing::Test { ... }; - -TEST_F(FooTest, Abc) { ... } -TEST_F(FooTest, Def) { ... } - -typedef FooTest FooDeathTest; - -TEST_F(FooDeathTest, Uvw) { ... EXPECT_DEATH(...) ... } -TEST_F(FooDeathTest, Xyz) { ... ASSERT_DEATH(...) ... } -``` - -## The compiler complains about "no match for 'operator<<'" when I use an assertion. What gives? ## - -If you use a user-defined type `FooType` in an assertion, you must make sure -there is an `std::ostream& operator<<(std::ostream&, const FooType&)` function -defined such that we can print a value of `FooType`. - -In addition, if `FooType` is declared in a name space, the `<<` operator also -needs to be defined in the _same_ name space. - -## How do I suppress the memory leak messages on Windows? ## - -Since the statically initialized Google Test singleton requires allocations on -the heap, the Visual C++ memory leak detector will report memory leaks at the -end of the program run. The easiest way to avoid this is to use the -`_CrtMemCheckpoint` and `_CrtMemDumpAllObjectsSince` calls to not report any -statically initialized heap objects. See MSDN for more details and additional -heap check/debug routines. - -## I am building my project with Google Test in Visual Studio and all I'm getting is a bunch of linker errors (or warnings). Help! ## - -You may get a number of the following linker error or warnings if you -attempt to link your test project with the Google Test library when -your project and the are not built using the same compiler settings. - - * LNK2005: symbol already defined in object - * LNK4217: locally defined symbol 'symbol' imported in function 'function' - * LNK4049: locally defined symbol 'symbol' imported - -The Google Test project (gtest.vcproj) has the Runtime Library option -set to /MT (use multi-threaded static libraries, /MTd for debug). If -your project uses something else, for example /MD (use multi-threaded -DLLs, /MDd for debug), you need to change the setting in the Google -Test project to match your project's. - -To update this setting open the project properties in the Visual -Studio IDE then select the branch Configuration Properties | C/C++ | -Code Generation and change the option "Runtime Library". You may also try -using gtest-md.vcproj instead of gtest.vcproj. - -## I put my tests in a library and Google Test doesn't run them. What's happening? ## -Have you read a -[warning](V1_6_Primer.md#important-note-for-visual-c-users) on -the Google Test Primer page? - -## I want to use Google Test with Visual Studio but don't know where to start. ## -Many people are in your position and one of the posted his solution to -our mailing list. Here is his link: -http://hassanjamilahmad.blogspot.com/2009/07/gtest-starters-help.html. - -## I am seeing compile errors mentioning std::type\_traits when I try to use Google Test on Solaris. ## -Google Test uses parts of the standard C++ library that SunStudio does not support. -Our users reported success using alternative implementations. Try running the build after runing this commad: - -`export CC=cc CXX=CC CXXFLAGS='-library=stlport4'` - -## How can my code detect if it is running in a test? ## - -If you write code that sniffs whether it's running in a test and does -different things accordingly, you are leaking test-only logic into -production code and there is no easy way to ensure that the test-only -code paths aren't run by mistake in production. Such cleverness also -leads to -[Heisenbugs](http://en.wikipedia.org/wiki/Unusual_software_bug#Heisenbug). -Therefore we strongly advise against the practice, and Google Test doesn't -provide a way to do it. - -In general, the recommended way to cause the code to behave -differently under test is [dependency injection](http://jamesshore.com/Blog/Dependency-Injection-Demystified.html). -You can inject different functionality from the test and from the -production code. Since your production code doesn't link in the -for-test logic at all, there is no danger in accidentally running it. - -However, if you _really_, _really_, _really_ have no choice, and if -you follow the rule of ending your test program names with `_test`, -you can use the _horrible_ hack of sniffing your executable name -(`argv[0]` in `main()`) to know whether the code is under test. - -## Google Test defines a macro that clashes with one defined by another library. How do I deal with that? ## - -In C++, macros don't obey namespaces. Therefore two libraries that -both define a macro of the same name will clash if you `#include` both -definitions. In case a Google Test macro clashes with another -library, you can force Google Test to rename its macro to avoid the -conflict. - -Specifically, if both Google Test and some other code define macro -`FOO`, you can add -``` - -DGTEST_DONT_DEFINE_FOO=1 -``` -to the compiler flags to tell Google Test to change the macro's name -from `FOO` to `GTEST_FOO`. For example, with `-DGTEST_DONT_DEFINE_TEST=1`, you'll need to write -``` - GTEST_TEST(SomeTest, DoesThis) { ... } -``` -instead of -``` - TEST(SomeTest, DoesThis) { ... } -``` -in order to define a test. - -Currently, the following `TEST`, `FAIL`, `SUCCEED`, and the basic comparison assertion macros can have alternative names. You can see the full list of covered macros [here](http://www.google.com/codesearch?q=if+!GTEST_DONT_DEFINE_\w%2B+package:http://googletest\.googlecode\.com+file:/include/gtest/gtest.h). More information can be found in the "Avoiding Macro Name Clashes" section of the README file. - -## My question is not covered in your FAQ! ## - -If you cannot find the answer to your question in this FAQ, there are -some other resources you can use: - - 1. read other [wiki pages](http://code.google.com/p/googletest/w/list), - 1. search the mailing list [archive](http://groups.google.com/group/googletestframework/topics), - 1. ask it on [googletestframework@googlegroups.com](mailto:googletestframework@googlegroups.com) and someone will answer it (to prevent spam, we require you to join the [discussion group](http://groups.google.com/group/googletestframework) before you can post.). - -Please note that creating an issue in the -[issue tracker](http://code.google.com/p/googletest/issues/list) is _not_ -a good way to get your answer, as it is monitored infrequently by a -very small number of people. - -When asking a question, it's helpful to provide as much of the -following information as possible (people cannot help you if there's -not enough information in your question): - - * the version (or the revision number if you check out from SVN directly) of Google Test you use (Google Test is under active development, so it's possible that your problem has been solved in a later version), - * your operating system, - * the name and version of your compiler, - * the complete command line flags you give to your compiler, - * the complete compiler error messages (if the question is about compilation), - * the _actual_ code (ideally, a minimal but complete program) that has the problem you encounter. diff --git a/test/gtest-1.8.0/docs/V1_6_Primer.md b/test/gtest-1.8.0/docs/V1_6_Primer.md deleted file mode 100644 index 8d840ef45b..0000000000 --- a/test/gtest-1.8.0/docs/V1_6_Primer.md +++ /dev/null @@ -1,501 +0,0 @@ - - -# Introduction: Why Google C++ Testing Framework? # - -_Google C++ Testing Framework_ helps you write better C++ tests. - -No matter whether you work on Linux, Windows, or a Mac, if you write C++ code, -Google Test can help you. - -So what makes a good test, and how does Google C++ Testing Framework fit in? We believe: - 1. Tests should be _independent_ and _repeatable_. It's a pain to debug a test that succeeds or fails as a result of other tests. Google C++ Testing Framework isolates the tests by running each of them on a different object. When a test fails, Google C++ Testing Framework allows you to run it in isolation for quick debugging. - 1. Tests should be well _organized_ and reflect the structure of the tested code. Google C++ Testing Framework groups related tests into test cases that can share data and subroutines. This common pattern is easy to recognize and makes tests easy to maintain. Such consistency is especially helpful when people switch projects and start to work on a new code base. - 1. Tests should be _portable_ and _reusable_. The open-source community has a lot of code that is platform-neutral, its tests should also be platform-neutral. Google C++ Testing Framework works on different OSes, with different compilers (gcc, MSVC, and others), with or without exceptions, so Google C++ Testing Framework tests can easily work with a variety of configurations. (Note that the current release only contains build scripts for Linux - we are actively working on scripts for other platforms.) - 1. When tests fail, they should provide as much _information_ about the problem as possible. Google C++ Testing Framework doesn't stop at the first test failure. Instead, it only stops the current test and continues with the next. You can also set up tests that report non-fatal failures after which the current test continues. Thus, you can detect and fix multiple bugs in a single run-edit-compile cycle. - 1. The testing framework should liberate test writers from housekeeping chores and let them focus on the test _content_. Google C++ Testing Framework automatically keeps track of all tests defined, and doesn't require the user to enumerate them in order to run them. - 1. Tests should be _fast_. With Google C++ Testing Framework, you can reuse shared resources across tests and pay for the set-up/tear-down only once, without making tests depend on each other. - -Since Google C++ Testing Framework is based on the popular xUnit -architecture, you'll feel right at home if you've used JUnit or PyUnit before. -If not, it will take you about 10 minutes to learn the basics and get started. -So let's go! - -_Note:_ We sometimes refer to Google C++ Testing Framework informally -as _Google Test_. - -# Setting up a New Test Project # - -To write a test program using Google Test, you need to compile Google -Test into a library and link your test with it. We provide build -files for some popular build systems: `msvc/` for Visual Studio, -`xcode/` for Mac Xcode, `make/` for GNU make, `codegear/` for Borland -C++ Builder, and the autotools script (deprecated) and -`CMakeLists.txt` for CMake (recommended) in the Google Test root -directory. If your build system is not on this list, you can take a -look at `make/Makefile` to learn how Google Test should be compiled -(basically you want to compile `src/gtest-all.cc` with `GTEST_ROOT` -and `GTEST_ROOT/include` in the header search path, where `GTEST_ROOT` -is the Google Test root directory). - -Once you are able to compile the Google Test library, you should -create a project or build target for your test program. Make sure you -have `GTEST_ROOT/include` in the header search path so that the -compiler can find `"gtest/gtest.h"` when compiling your test. Set up -your test project to link with the Google Test library (for example, -in Visual Studio, this is done by adding a dependency on -`gtest.vcproj`). - -If you still have questions, take a look at how Google Test's own -tests are built and use them as examples. - -# Basic Concepts # - -When using Google Test, you start by writing _assertions_, which are statements -that check whether a condition is true. An assertion's result can be _success_, -_nonfatal failure_, or _fatal failure_. If a fatal failure occurs, it aborts -the current function; otherwise the program continues normally. - -_Tests_ use assertions to verify the tested code's behavior. If a test crashes -or has a failed assertion, then it _fails_; otherwise it _succeeds_. - -A _test case_ contains one or many tests. You should group your tests into test -cases that reflect the structure of the tested code. When multiple tests in a -test case need to share common objects and subroutines, you can put them into a -_test fixture_ class. - -A _test program_ can contain multiple test cases. - -We'll now explain how to write a test program, starting at the individual -assertion level and building up to tests and test cases. - -# Assertions # - -Google Test assertions are macros that resemble function calls. You test a -class or function by making assertions about its behavior. When an assertion -fails, Google Test prints the assertion's source file and line number location, -along with a failure message. You may also supply a custom failure message -which will be appended to Google Test's message. - -The assertions come in pairs that test the same thing but have different -effects on the current function. `ASSERT_*` versions generate fatal failures -when they fail, and **abort the current function**. `EXPECT_*` versions generate -nonfatal failures, which don't abort the current function. Usually `EXPECT_*` -are preferred, as they allow more than one failures to be reported in a test. -However, you should use `ASSERT_*` if it doesn't make sense to continue when -the assertion in question fails. - -Since a failed `ASSERT_*` returns from the current function immediately, -possibly skipping clean-up code that comes after it, it may cause a space leak. -Depending on the nature of the leak, it may or may not be worth fixing - so -keep this in mind if you get a heap checker error in addition to assertion -errors. - -To provide a custom failure message, simply stream it into the macro using the -`<<` operator, or a sequence of such operators. An example: -``` -ASSERT_EQ(x.size(), y.size()) << "Vectors x and y are of unequal length"; - -for (int i = 0; i < x.size(); ++i) { - EXPECT_EQ(x[i], y[i]) << "Vectors x and y differ at index " << i; -} -``` - -Anything that can be streamed to an `ostream` can be streamed to an assertion -macro--in particular, C strings and `string` objects. If a wide string -(`wchar_t*`, `TCHAR*` in `UNICODE` mode on Windows, or `std::wstring`) is -streamed to an assertion, it will be translated to UTF-8 when printed. - -## Basic Assertions ## - -These assertions do basic true/false condition testing. -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_TRUE(`_condition_`)`; | `EXPECT_TRUE(`_condition_`)`; | _condition_ is true | -| `ASSERT_FALSE(`_condition_`)`; | `EXPECT_FALSE(`_condition_`)`; | _condition_ is false | - -Remember, when they fail, `ASSERT_*` yields a fatal failure and -returns from the current function, while `EXPECT_*` yields a nonfatal -failure, allowing the function to continue running. In either case, an -assertion failure means its containing test fails. - -_Availability_: Linux, Windows, Mac. - -## Binary Comparison ## - -This section describes assertions that compare two values. - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -|`ASSERT_EQ(`_expected_`, `_actual_`);`|`EXPECT_EQ(`_expected_`, `_actual_`);`| _expected_ `==` _actual_ | -|`ASSERT_NE(`_val1_`, `_val2_`);` |`EXPECT_NE(`_val1_`, `_val2_`);` | _val1_ `!=` _val2_ | -|`ASSERT_LT(`_val1_`, `_val2_`);` |`EXPECT_LT(`_val1_`, `_val2_`);` | _val1_ `<` _val2_ | -|`ASSERT_LE(`_val1_`, `_val2_`);` |`EXPECT_LE(`_val1_`, `_val2_`);` | _val1_ `<=` _val2_ | -|`ASSERT_GT(`_val1_`, `_val2_`);` |`EXPECT_GT(`_val1_`, `_val2_`);` | _val1_ `>` _val2_ | -|`ASSERT_GE(`_val1_`, `_val2_`);` |`EXPECT_GE(`_val1_`, `_val2_`);` | _val1_ `>=` _val2_ | - -In the event of a failure, Google Test prints both _val1_ and _val2_ -. In `ASSERT_EQ*` and `EXPECT_EQ*` (and all other equality assertions -we'll introduce later), you should put the expression you want to test -in the position of _actual_, and put its expected value in _expected_, -as Google Test's failure messages are optimized for this convention. - -Value arguments must be comparable by the assertion's comparison -operator or you'll get a compiler error. We used to require the -arguments to support the `<<` operator for streaming to an `ostream`, -but it's no longer necessary since v1.6.0 (if `<<` is supported, it -will be called to print the arguments when the assertion fails; -otherwise Google Test will attempt to print them in the best way it -can. For more details and how to customize the printing of the -arguments, see this Google Mock [recipe](../../googlemock/docs/CookBook.md#teaching-google-mock-how-to-print-your-values).). - -These assertions can work with a user-defined type, but only if you define the -corresponding comparison operator (e.g. `==`, `<`, etc). If the corresponding -operator is defined, prefer using the `ASSERT_*()` macros because they will -print out not only the result of the comparison, but the two operands as well. - -Arguments are always evaluated exactly once. Therefore, it's OK for the -arguments to have side effects. However, as with any ordinary C/C++ function, -the arguments' evaluation order is undefined (i.e. the compiler is free to -choose any order) and your code should not depend on any particular argument -evaluation order. - -`ASSERT_EQ()` does pointer equality on pointers. If used on two C strings, it -tests if they are in the same memory location, not if they have the same value. -Therefore, if you want to compare C strings (e.g. `const char*`) by value, use -`ASSERT_STREQ()` , which will be described later on. In particular, to assert -that a C string is `NULL`, use `ASSERT_STREQ(NULL, c_string)` . However, to -compare two `string` objects, you should use `ASSERT_EQ`. - -Macros in this section work with both narrow and wide string objects (`string` -and `wstring`). - -_Availability_: Linux, Windows, Mac. - -## String Comparison ## - -The assertions in this group compare two **C strings**. If you want to compare -two `string` objects, use `EXPECT_EQ`, `EXPECT_NE`, and etc instead. - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_STREQ(`_expected\_str_`, `_actual\_str_`);` | `EXPECT_STREQ(`_expected\_str_`, `_actual\_str_`);` | the two C strings have the same content | -| `ASSERT_STRNE(`_str1_`, `_str2_`);` | `EXPECT_STRNE(`_str1_`, `_str2_`);` | the two C strings have different content | -| `ASSERT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);`| `EXPECT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);` | the two C strings have the same content, ignoring case | -| `ASSERT_STRCASENE(`_str1_`, `_str2_`);`| `EXPECT_STRCASENE(`_str1_`, `_str2_`);` | the two C strings have different content, ignoring case | - -Note that "CASE" in an assertion name means that case is ignored. - -`*STREQ*` and `*STRNE*` also accept wide C strings (`wchar_t*`). If a -comparison of two wide strings fails, their values will be printed as UTF-8 -narrow strings. - -A `NULL` pointer and an empty string are considered _different_. - -_Availability_: Linux, Windows, Mac. - -See also: For more string comparison tricks (substring, prefix, suffix, and -regular expression matching, for example), see the [Advanced Google Test Guide](V1_6_AdvancedGuide.md). - -# Simple Tests # - -To create a test: - 1. Use the `TEST()` macro to define and name a test function, These are ordinary C++ functions that don't return a value. - 1. In this function, along with any valid C++ statements you want to include, use the various Google Test assertions to check values. - 1. The test's result is determined by the assertions; if any assertion in the test fails (either fatally or non-fatally), or if the test crashes, the entire test fails. Otherwise, it succeeds. - -``` -TEST(test_case_name, test_name) { - ... test body ... -} -``` - - -`TEST()` arguments go from general to specific. The _first_ argument is the -name of the test case, and the _second_ argument is the test's name within the -test case. Both names must be valid C++ identifiers, and they should not contain underscore (`_`). A test's _full name_ consists of its containing test case and its -individual name. Tests from different test cases can have the same individual -name. - -For example, let's take a simple integer function: -``` -int Factorial(int n); // Returns the factorial of n -``` - -A test case for this function might look like: -``` -// Tests factorial of 0. -TEST(FactorialTest, HandlesZeroInput) { - EXPECT_EQ(1, Factorial(0)); -} - -// Tests factorial of positive numbers. -TEST(FactorialTest, HandlesPositiveInput) { - EXPECT_EQ(1, Factorial(1)); - EXPECT_EQ(2, Factorial(2)); - EXPECT_EQ(6, Factorial(3)); - EXPECT_EQ(40320, Factorial(8)); -} -``` - -Google Test groups the test results by test cases, so logically-related tests -should be in the same test case; in other words, the first argument to their -`TEST()` should be the same. In the above example, we have two tests, -`HandlesZeroInput` and `HandlesPositiveInput`, that belong to the same test -case `FactorialTest`. - -_Availability_: Linux, Windows, Mac. - -# Test Fixtures: Using the Same Data Configuration for Multiple Tests # - -If you find yourself writing two or more tests that operate on similar data, -you can use a _test fixture_. It allows you to reuse the same configuration of -objects for several different tests. - -To create a fixture, just: - 1. Derive a class from `::testing::Test` . Start its body with `protected:` or `public:` as we'll want to access fixture members from sub-classes. - 1. Inside the class, declare any objects you plan to use. - 1. If necessary, write a default constructor or `SetUp()` function to prepare the objects for each test. A common mistake is to spell `SetUp()` as `Setup()` with a small `u` - don't let that happen to you. - 1. If necessary, write a destructor or `TearDown()` function to release any resources you allocated in `SetUp()` . To learn when you should use the constructor/destructor and when you should use `SetUp()/TearDown()`, read this [FAQ entry](V1_6_FAQ.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-the-set-uptear-down-function). - 1. If needed, define subroutines for your tests to share. - -When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to -access objects and subroutines in the test fixture: -``` -TEST_F(test_case_name, test_name) { - ... test body ... -} -``` - -Like `TEST()`, the first argument is the test case name, but for `TEST_F()` -this must be the name of the test fixture class. You've probably guessed: `_F` -is for fixture. - -Unfortunately, the C++ macro system does not allow us to create a single macro -that can handle both types of tests. Using the wrong macro causes a compiler -error. - -Also, you must first define a test fixture class before using it in a -`TEST_F()`, or you'll get the compiler error "`virtual outside class -declaration`". - -For each test defined with `TEST_F()`, Google Test will: - 1. Create a _fresh_ test fixture at runtime - 1. Immediately initialize it via `SetUp()` , - 1. Run the test - 1. Clean up by calling `TearDown()` - 1. Delete the test fixture. Note that different tests in the same test case have different test fixture objects, and Google Test always deletes a test fixture before it creates the next one. Google Test does not reuse the same test fixture for multiple tests. Any changes one test makes to the fixture do not affect other tests. - -As an example, let's write tests for a FIFO queue class named `Queue`, which -has the following interface: -``` -template // E is the element type. -class Queue { - public: - Queue(); - void Enqueue(const E& element); - E* Dequeue(); // Returns NULL if the queue is empty. - size_t size() const; - ... -}; -``` - -First, define a fixture class. By convention, you should give it the name -`FooTest` where `Foo` is the class being tested. -``` -class QueueTest : public ::testing::Test { - protected: - virtual void SetUp() { - q1_.Enqueue(1); - q2_.Enqueue(2); - q2_.Enqueue(3); - } - - // virtual void TearDown() {} - - Queue q0_; - Queue q1_; - Queue q2_; -}; -``` - -In this case, `TearDown()` is not needed since we don't have to clean up after -each test, other than what's already done by the destructor. - -Now we'll write tests using `TEST_F()` and this fixture. -``` -TEST_F(QueueTest, IsEmptyInitially) { - EXPECT_EQ(0, q0_.size()); -} - -TEST_F(QueueTest, DequeueWorks) { - int* n = q0_.Dequeue(); - EXPECT_EQ(NULL, n); - - n = q1_.Dequeue(); - ASSERT_TRUE(n != NULL); - EXPECT_EQ(1, *n); - EXPECT_EQ(0, q1_.size()); - delete n; - - n = q2_.Dequeue(); - ASSERT_TRUE(n != NULL); - EXPECT_EQ(2, *n); - EXPECT_EQ(1, q2_.size()); - delete n; -} -``` - -The above uses both `ASSERT_*` and `EXPECT_*` assertions. The rule of thumb is -to use `EXPECT_*` when you want the test to continue to reveal more errors -after the assertion failure, and use `ASSERT_*` when continuing after failure -doesn't make sense. For example, the second assertion in the `Dequeue` test is -`ASSERT_TRUE(n != NULL)`, as we need to dereference the pointer `n` later, -which would lead to a segfault when `n` is `NULL`. - -When these tests run, the following happens: - 1. Google Test constructs a `QueueTest` object (let's call it `t1` ). - 1. `t1.SetUp()` initializes `t1` . - 1. The first test ( `IsEmptyInitially` ) runs on `t1` . - 1. `t1.TearDown()` cleans up after the test finishes. - 1. `t1` is destructed. - 1. The above steps are repeated on another `QueueTest` object, this time running the `DequeueWorks` test. - -_Availability_: Linux, Windows, Mac. - -_Note_: Google Test automatically saves all _Google Test_ flags when a test -object is constructed, and restores them when it is destructed. - -# Invoking the Tests # - -`TEST()` and `TEST_F()` implicitly register their tests with Google Test. So, unlike with many other C++ testing frameworks, you don't have to re-list all your defined tests in order to run them. - -After defining your tests, you can run them with `RUN_ALL_TESTS()` , which returns `0` if all the tests are successful, or `1` otherwise. Note that `RUN_ALL_TESTS()` runs _all tests_ in your link unit -- they can be from different test cases, or even different source files. - -When invoked, the `RUN_ALL_TESTS()` macro: - 1. Saves the state of all Google Test flags. - 1. Creates a test fixture object for the first test. - 1. Initializes it via `SetUp()`. - 1. Runs the test on the fixture object. - 1. Cleans up the fixture via `TearDown()`. - 1. Deletes the fixture. - 1. Restores the state of all Google Test flags. - 1. Repeats the above steps for the next test, until all tests have run. - -In addition, if the text fixture's constructor generates a fatal failure in -step 2, there is no point for step 3 - 5 and they are thus skipped. Similarly, -if step 3 generates a fatal failure, step 4 will be skipped. - -_Important_: You must not ignore the return value of `RUN_ALL_TESTS()`, or `gcc` -will give you a compiler error. The rationale for this design is that the -automated testing service determines whether a test has passed based on its -exit code, not on its stdout/stderr output; thus your `main()` function must -return the value of `RUN_ALL_TESTS()`. - -Also, you should call `RUN_ALL_TESTS()` only **once**. Calling it more than once -conflicts with some advanced Google Test features (e.g. thread-safe death -tests) and thus is not supported. - -_Availability_: Linux, Windows, Mac. - -# Writing the main() Function # - -You can start from this boilerplate: -``` -#include "this/package/foo.h" -#include "gtest/gtest.h" - -namespace { - -// The fixture for testing class Foo. -class FooTest : public ::testing::Test { - protected: - // You can remove any or all of the following functions if its body - // is empty. - - FooTest() { - // You can do set-up work for each test here. - } - - virtual ~FooTest() { - // You can do clean-up work that doesn't throw exceptions here. - } - - // If the constructor and destructor are not enough for setting up - // and cleaning up each test, you can define the following methods: - - virtual void SetUp() { - // Code here will be called immediately after the constructor (right - // before each test). - } - - virtual void TearDown() { - // Code here will be called immediately after each test (right - // before the destructor). - } - - // Objects declared here can be used by all tests in the test case for Foo. -}; - -// Tests that the Foo::Bar() method does Abc. -TEST_F(FooTest, MethodBarDoesAbc) { - const string input_filepath = "this/package/testdata/myinputfile.dat"; - const string output_filepath = "this/package/testdata/myoutputfile.dat"; - Foo f; - EXPECT_EQ(0, f.Bar(input_filepath, output_filepath)); -} - -// Tests that Foo does Xyz. -TEST_F(FooTest, DoesXyz) { - // Exercises the Xyz feature of Foo. -} - -} // namespace - -int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} -``` - -The `::testing::InitGoogleTest()` function parses the command line for Google -Test flags, and removes all recognized flags. This allows the user to control a -test program's behavior via various flags, which we'll cover in [AdvancedGuide](V1_6_AdvancedGuide.md). -You must call this function before calling `RUN_ALL_TESTS()`, or the flags -won't be properly initialized. - -On Windows, `InitGoogleTest()` also works with wide strings, so it can be used -in programs compiled in `UNICODE` mode as well. - -But maybe you think that writing all those main() functions is too much work? We agree with you completely and that's why Google Test provides a basic implementation of main(). If it fits your needs, then just link your test with gtest\_main library and you are good to go. - -## Important note for Visual C++ users ## -If you put your tests into a library and your `main()` function is in a different library or in your .exe file, those tests will not run. The reason is a [bug](https://connect.microsoft.com/feedback/viewfeedback.aspx?FeedbackID=244410&siteid=210) in Visual C++. When you define your tests, Google Test creates certain static objects to register them. These objects are not referenced from elsewhere but their constructors are still supposed to run. When Visual C++ linker sees that nothing in the library is referenced from other places it throws the library out. You have to reference your library with tests from your main program to keep the linker from discarding it. Here is how to do it. Somewhere in your library code declare a function: -``` -__declspec(dllexport) int PullInMyLibrary() { return 0; } -``` -If you put your tests in a static library (not DLL) then `__declspec(dllexport)` is not required. Now, in your main program, write a code that invokes that function: -``` -int PullInMyLibrary(); -static int dummy = PullInMyLibrary(); -``` -This will keep your tests referenced and will make them register themselves at startup. - -In addition, if you define your tests in a static library, add `/OPT:NOREF` to your main program linker options. If you use MSVC++ IDE, go to your .exe project properties/Configuration Properties/Linker/Optimization and set References setting to `Keep Unreferenced Data (/OPT:NOREF)`. This will keep Visual C++ linker from discarding individual symbols generated by your tests from the final executable. - -There is one more pitfall, though. If you use Google Test as a static library (that's how it is defined in gtest.vcproj) your tests must also reside in a static library. If you have to have them in a DLL, you _must_ change Google Test to build into a DLL as well. Otherwise your tests will not run correctly or will not run at all. The general conclusion here is: make your life easier - do not write your tests in libraries! - -# Where to Go from Here # - -Congratulations! You've learned the Google Test basics. You can start writing -and running Google Test tests, read some [samples](V1_6_Samples.md), or continue with -[AdvancedGuide](V1_6_AdvancedGuide.md), which describes many more useful Google Test features. - -# Known Limitations # - -Google Test is designed to be thread-safe. The implementation is -thread-safe on systems where the `pthreads` library is available. It -is currently _unsafe_ to use Google Test assertions from two threads -concurrently on other systems (e.g. Windows). In most tests this is -not an issue as usually the assertions are done in the main thread. If -you want to help, you can volunteer to implement the necessary -synchronization primitives in `gtest-port.h` for your platform. diff --git a/test/gtest-1.8.0/docs/V1_6_PumpManual.md b/test/gtest-1.8.0/docs/V1_6_PumpManual.md deleted file mode 100644 index 8184f153ca..0000000000 --- a/test/gtest-1.8.0/docs/V1_6_PumpManual.md +++ /dev/null @@ -1,177 +0,0 @@ - - -Pump is Useful for Meta Programming. - -# The Problem # - -Template and macro libraries often need to define many classes, -functions, or macros that vary only (or almost only) in the number of -arguments they take. It's a lot of repetitive, mechanical, and -error-prone work. - -Variadic templates and variadic macros can alleviate the problem. -However, while both are being considered by the C++ committee, neither -is in the standard yet or widely supported by compilers. Thus they -are often not a good choice, especially when your code needs to be -portable. And their capabilities are still limited. - -As a result, authors of such libraries often have to write scripts to -generate their implementation. However, our experience is that it's -tedious to write such scripts, which tend to reflect the structure of -the generated code poorly and are often hard to read and edit. For -example, a small change needed in the generated code may require some -non-intuitive, non-trivial changes in the script. This is especially -painful when experimenting with the code. - -# Our Solution # - -Pump (for Pump is Useful for Meta Programming, Pretty Useful for Meta -Programming, or Practical Utility for Meta Programming, whichever you -prefer) is a simple meta-programming tool for C++. The idea is that a -programmer writes a `foo.pump` file which contains C++ code plus meta -code that manipulates the C++ code. The meta code can handle -iterations over a range, nested iterations, local meta variable -definitions, simple arithmetic, and conditional expressions. You can -view it as a small Domain-Specific Language. The meta language is -designed to be non-intrusive (s.t. it won't confuse Emacs' C++ mode, -for example) and concise, making Pump code intuitive and easy to -maintain. - -## Highlights ## - - * The implementation is in a single Python script and thus ultra portable: no build or installation is needed and it works cross platforms. - * Pump tries to be smart with respect to [Google's style guide](http://code.google.com/p/google-styleguide/): it breaks long lines (easy to have when they are generated) at acceptable places to fit within 80 columns and indent the continuation lines correctly. - * The format is human-readable and more concise than XML. - * The format works relatively well with Emacs' C++ mode. - -## Examples ## - -The following Pump code (where meta keywords start with `$`, `[[` and `]]` are meta brackets, and `$$` starts a meta comment that ends with the line): - -``` -$var n = 3 $$ Defines a meta variable n. -$range i 0..n $$ Declares the range of meta iterator i (inclusive). -$for i [[ - $$ Meta loop. -// Foo$i does blah for $i-ary predicates. -$range j 1..i -template -class Foo$i { -$if i == 0 [[ - blah a; -]] $elif i <= 2 [[ - blah b; -]] $else [[ - blah c; -]] -}; - -]] -``` - -will be translated by the Pump compiler to: - -``` -// Foo0 does blah for 0-ary predicates. -template -class Foo0 { - blah a; -}; - -// Foo1 does blah for 1-ary predicates. -template -class Foo1 { - blah b; -}; - -// Foo2 does blah for 2-ary predicates. -template -class Foo2 { - blah b; -}; - -// Foo3 does blah for 3-ary predicates. -template -class Foo3 { - blah c; -}; -``` - -In another example, - -``` -$range i 1..n -Func($for i + [[a$i]]); -$$ The text between i and [[ is the separator between iterations. -``` - -will generate one of the following lines (without the comments), depending on the value of `n`: - -``` -Func(); // If n is 0. -Func(a1); // If n is 1. -Func(a1 + a2); // If n is 2. -Func(a1 + a2 + a3); // If n is 3. -// And so on... -``` - -## Constructs ## - -We support the following meta programming constructs: - -| `$var id = exp` | Defines a named constant value. `$id` is valid util the end of the current meta lexical block. | -|:----------------|:-----------------------------------------------------------------------------------------------| -| `$range id exp..exp` | Sets the range of an iteration variable, which can be reused in multiple loops later. | -| `$for id sep [[ code ]]` | Iteration. The range of `id` must have been defined earlier. `$id` is valid in `code`. | -| `$($)` | Generates a single `$` character. | -| `$id` | Value of the named constant or iteration variable. | -| `$(exp)` | Value of the expression. | -| `$if exp [[ code ]] else_branch` | Conditional. | -| `[[ code ]]` | Meta lexical block. | -| `cpp_code` | Raw C++ code. | -| `$$ comment` | Meta comment. | - -**Note:** To give the user some freedom in formatting the Pump source -code, Pump ignores a new-line character if it's right after `$for foo` -or next to `[[` or `]]`. Without this rule you'll often be forced to write -very long lines to get the desired output. Therefore sometimes you may -need to insert an extra new-line in such places for a new-line to show -up in your output. - -## Grammar ## - -``` -code ::= atomic_code* -atomic_code ::= $var id = exp - | $var id = [[ code ]] - | $range id exp..exp - | $for id sep [[ code ]] - | $($) - | $id - | $(exp) - | $if exp [[ code ]] else_branch - | [[ code ]] - | cpp_code -sep ::= cpp_code | empty_string -else_branch ::= $else [[ code ]] - | $elif exp [[ code ]] else_branch - | empty_string -exp ::= simple_expression_in_Python_syntax -``` - -## Code ## - -You can find the source code of Pump in [scripts/pump.py](../scripts/pump.py). It is still -very unpolished and lacks automated tests, although it has been -successfully used many times. If you find a chance to use it in your -project, please let us know what you think! We also welcome help on -improving Pump. - -## Real Examples ## - -You can find real-world applications of Pump in [Google Test](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgoogletest\.googlecode\.com) and [Google Mock](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgooglemock\.googlecode\.com). The source file `foo.h.pump` generates `foo.h`. - -## Tips ## - - * If a meta variable is followed by a letter or digit, you can separate them using `[[]]`, which inserts an empty string. For example `Foo$j[[]]Helper` generate `Foo1Helper` when `j` is 1. - * To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line. diff --git a/test/gtest-1.8.0/docs/V1_6_Samples.md b/test/gtest-1.8.0/docs/V1_6_Samples.md deleted file mode 100644 index f21d200567..0000000000 --- a/test/gtest-1.8.0/docs/V1_6_Samples.md +++ /dev/null @@ -1,14 +0,0 @@ -If you're like us, you'd like to look at some Google Test sample code. The -[samples folder](../samples) has a number of well-commented samples showing how to use a -variety of Google Test features. - - * [Sample #1](../samples/sample1_unittest.cc) shows the basic steps of using Google Test to test C++ functions. - * [Sample #2](../samples/sample2_unittest.cc) shows a more complex unit test for a class with multiple member functions. - * [Sample #3](../samples/sample3_unittest.cc) uses a test fixture. - * [Sample #4](../samples/sample4_unittest.cc) is another basic example of using Google Test. - * [Sample #5](../samples/sample5_unittest.cc) teaches how to reuse a test fixture in multiple test cases by deriving sub-fixtures from it. - * [Sample #6](../samples/sample6_unittest.cc) demonstrates type-parameterized tests. - * [Sample #7](../samples/sample7_unittest.cc) teaches the basics of value-parameterized tests. - * [Sample #8](../samples/sample8_unittest.cc) shows using `Combine()` in value-parameterized tests. - * [Sample #9](../samples/sample9_unittest.cc) shows use of the listener API to modify Google Test's console output and the use of its reflection API to inspect test results. - * [Sample #10](../samples/sample10_unittest.cc) shows use of the listener API to implement a primitive memory leak checker. diff --git a/test/gtest-1.8.0/docs/V1_6_XcodeGuide.md b/test/gtest-1.8.0/docs/V1_6_XcodeGuide.md deleted file mode 100644 index bf24bf51bf..0000000000 --- a/test/gtest-1.8.0/docs/V1_6_XcodeGuide.md +++ /dev/null @@ -1,93 +0,0 @@ - - -This guide will explain how to use the Google Testing Framework in your Xcode projects on Mac OS X. This tutorial begins by quickly explaining what to do for experienced users. After the quick start, the guide goes provides additional explanation about each step. - -# Quick Start # - -Here is the quick guide for using Google Test in your Xcode project. - - 1. Download the source from the [website](http://code.google.com/p/googletest) using this command: `svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only` - 1. Open up the `gtest.xcodeproj` in the `googletest-read-only/xcode/` directory and build the gtest.framework. - 1. Create a new "Shell Tool" target in your Xcode project called something like "UnitTests" - 1. Add the gtest.framework to your project and add it to the "Link Binary with Libraries" build phase of "UnitTests" - 1. Add your unit test source code to the "Compile Sources" build phase of "UnitTests" - 1. Edit the "UnitTests" executable and add an environment variable named "DYLD\_FRAMEWORK\_PATH" with a value equal to the path to the framework containing the gtest.framework relative to the compiled executable. - 1. Build and Go - -The following sections further explain each of the steps listed above in depth, describing in more detail how to complete it including some variations. - -# Get the Source # - -Currently, the gtest.framework discussed here isn't available in a tagged release of Google Test, it is only available in the trunk. As explained at the Google Test [site](http://code.google.com/p/googletest/source/checkout">svn), you can get the code from anonymous SVN with this command: - -``` -svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only -``` - -Alternatively, if you are working with Subversion in your own code base, you can add Google Test as an external dependency to your own Subversion repository. By following this approach, everyone that checks out your svn repository will also receive a copy of Google Test (a specific version, if you wish) without having to check it out explicitly. This makes the set up of your project simpler and reduces the copied code in the repository. - -To use `svn:externals`, decide where you would like to have the external source reside. You might choose to put the external source inside the trunk, because you want it to be part of the branch when you make a release. However, keeping it outside the trunk in a version-tagged directory called something like `third-party/googletest/1.0.1`, is another option. Once the location is established, use `svn propedit svn:externals _directory_` to set the svn:externals property on a directory in your repository. This directory won't contain the code, but be its versioned parent directory. - -The command `svn propedit` will bring up your Subversion editor, making editing the long, (potentially multi-line) property simpler. This same method can be used to check out a tagged branch, by using the appropriate URL (e.g. `http://googletest.googlecode.com/svn/tags/release-1.0.1`). Additionally, the svn:externals property allows the specification of a particular revision of the trunk with the `-r_##_` option (e.g. `externals/src/googletest -r60 http://googletest.googlecode.com/svn/trunk`). - -Here is an example of using the svn:externals properties on a trunk (read via `svn propget`) of a project. This value checks out a copy of Google Test into the `trunk/externals/src/googletest/` directory. - -``` -[Computer:svn] user$ svn propget svn:externals trunk -externals/src/googletest http://googletest.googlecode.com/svn/trunk -``` - -# Add the Framework to Your Project # - -The next step is to build and add the gtest.framework to your own project. This guide describes two common ways below. - - * **Option 1** --- The simplest way to add Google Test to your own project, is to open gtest.xcodeproj (found in the xcode/ directory of the Google Test trunk) and build the framework manually. Then, add the built framework into your project using the "Add->Existing Framework..." from the context menu or "Project->Add..." from the main menu. The gtest.framework is relocatable and contains the headers and object code that you'll need to make tests. This method requires rebuilding every time you upgrade Google Test in your project. - * **Option 2** --- If you are going to be living off the trunk of Google Test, incorporating its latest features into your unit tests (or are a Google Test developer yourself). You'll want to rebuild the framework every time the source updates. to do this, you'll need to add the gtest.xcodeproj file, not the framework itself, to your own Xcode project. Then, from the build products that are revealed by the project's disclosure triangle, you can find the gtest.framework, which can be added to your targets (discussed below). - -# Make a Test Target # - -To start writing tests, make a new "Shell Tool" target. This target template is available under BSD, Cocoa, or Carbon. Add your unit test source code to the "Compile Sources" build phase of the target. - -Next, you'll want to add gtest.framework in two different ways, depending upon which option you chose above. - - * **Option 1** --- During compilation, Xcode will need to know that you are linking against the gtest.framework. Add the gtest.framework to the "Link Binary with Libraries" build phase of your test target. This will include the Google Test headers in your header search path, and will tell the linker where to find the library. - * **Option 2** --- If your working out of the trunk, you'll also want to add gtest.framework to your "Link Binary with Libraries" build phase of your test target. In addition, you'll want to add the gtest.framework as a dependency to your unit test target. This way, Xcode will make sure that gtest.framework is up to date, every time your build your target. Finally, if you don't share build directories with Google Test, you'll have to copy the gtest.framework into your own build products directory using a "Run Script" build phase. - -# Set Up the Executable Run Environment # - -Since the unit test executable is a shell tool, it doesn't have a bundle with a `Contents/Frameworks` directory, in which to place gtest.framework. Instead, the dynamic linker must be told at runtime to search for the framework in another location. This can be accomplished by setting the "DYLD\_FRAMEWORK\_PATH" environment variable in the "Edit Active Executable ..." Arguments tab, under "Variables to be set in the environment:". The path for this value is the path (relative or absolute) of the directory containing the gtest.framework. - -If you haven't set up the DYLD\_FRAMEWORK\_PATH, correctly, you might get a message like this: - -``` -[Session started at 2008-08-15 06:23:57 -0600.] - dyld: Library not loaded: @loader_path/../Frameworks/gtest.framework/Versions/A/gtest - Referenced from: /Users/username/Documents/Sandbox/gtestSample/build/Debug/WidgetFrameworkTest - Reason: image not found -``` - -To correct this problem, got to the directory containing the executable named in "Referenced from:" value in the error message above. Then, with the terminal in this location, find the relative path to the directory containing the gtest.framework. That is the value you'll need to set as the DYLD\_FRAMEWORK\_PATH. - -# Build and Go # - -Now, when you click "Build and Go", the test will be executed. Dumping out something like this: - -``` -[Session started at 2008-08-06 06:36:13 -0600.] -[==========] Running 2 tests from 1 test case. -[----------] Global test environment set-up. -[----------] 2 tests from WidgetInitializerTest -[ RUN ] WidgetInitializerTest.TestConstructor -[ OK ] WidgetInitializerTest.TestConstructor -[ RUN ] WidgetInitializerTest.TestConversion -[ OK ] WidgetInitializerTest.TestConversion -[----------] Global test environment tear-down -[==========] 2 tests from 1 test case ran. -[ PASSED ] 2 tests. - -The Debugger has exited with status 0. -``` - -# Summary # - -Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment. \ No newline at end of file diff --git a/test/gtest-1.8.0/docs/V1_7_AdvancedGuide.md b/test/gtest-1.8.0/docs/V1_7_AdvancedGuide.md deleted file mode 100644 index dd4af8f366..0000000000 --- a/test/gtest-1.8.0/docs/V1_7_AdvancedGuide.md +++ /dev/null @@ -1,2181 +0,0 @@ - - -Now that you have read [Primer](V1_7_Primer.md) and learned how to write tests -using Google Test, it's time to learn some new tricks. This document -will show you more assertions as well as how to construct complex -failure messages, propagate fatal failures, reuse and speed up your -test fixtures, and use various flags with your tests. - -# More Assertions # - -This section covers some less frequently used, but still significant, -assertions. - -## Explicit Success and Failure ## - -These three assertions do not actually test a value or expression. Instead, -they generate a success or failure directly. Like the macros that actually -perform a test, you may stream a custom failure message into the them. - -| `SUCCEED();` | -|:-------------| - -Generates a success. This does NOT make the overall test succeed. A test is -considered successful only if none of its assertions fail during its execution. - -Note: `SUCCEED()` is purely documentary and currently doesn't generate any -user-visible output. However, we may add `SUCCEED()` messages to Google Test's -output in the future. - -| `FAIL();` | `ADD_FAILURE();` | `ADD_FAILURE_AT("`_file\_path_`", `_line\_number_`);` | -|:-----------|:-----------------|:------------------------------------------------------| - -`FAIL()` generates a fatal failure, while `ADD_FAILURE()` and `ADD_FAILURE_AT()` generate a nonfatal -failure. These are useful when control flow, rather than a Boolean expression, -deteremines the test's success or failure. For example, you might want to write -something like: - -``` -switch(expression) { - case 1: ... some checks ... - case 2: ... some other checks - ... - default: FAIL() << "We shouldn't get here."; -} -``` - -_Availability_: Linux, Windows, Mac. - -## Exception Assertions ## - -These are for verifying that a piece of code throws (or does not -throw) an exception of the given type: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_THROW(`_statement_, _exception\_type_`);` | `EXPECT_THROW(`_statement_, _exception\_type_`);` | _statement_ throws an exception of the given type | -| `ASSERT_ANY_THROW(`_statement_`);` | `EXPECT_ANY_THROW(`_statement_`);` | _statement_ throws an exception of any type | -| `ASSERT_NO_THROW(`_statement_`);` | `EXPECT_NO_THROW(`_statement_`);` | _statement_ doesn't throw any exception | - -Examples: - -``` -ASSERT_THROW(Foo(5), bar_exception); - -EXPECT_NO_THROW({ - int n = 5; - Bar(&n); -}); -``` - -_Availability_: Linux, Windows, Mac; since version 1.1.0. - -## Predicate Assertions for Better Error Messages ## - -Even though Google Test has a rich set of assertions, they can never be -complete, as it's impossible (nor a good idea) to anticipate all the scenarios -a user might run into. Therefore, sometimes a user has to use `EXPECT_TRUE()` -to check a complex expression, for lack of a better macro. This has the problem -of not showing you the values of the parts of the expression, making it hard to -understand what went wrong. As a workaround, some users choose to construct the -failure message by themselves, streaming it into `EXPECT_TRUE()`. However, this -is awkward especially when the expression has side-effects or is expensive to -evaluate. - -Google Test gives you three different options to solve this problem: - -### Using an Existing Boolean Function ### - -If you already have a function or a functor that returns `bool` (or a type -that can be implicitly converted to `bool`), you can use it in a _predicate -assertion_ to get the function arguments printed for free: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_PRED1(`_pred1, val1_`);` | `EXPECT_PRED1(`_pred1, val1_`);` | _pred1(val1)_ returns true | -| `ASSERT_PRED2(`_pred2, val1, val2_`);` | `EXPECT_PRED2(`_pred2, val1, val2_`);` | _pred2(val1, val2)_ returns true | -| ... | ... | ... | - -In the above, _predn_ is an _n_-ary predicate function or functor, where -_val1_, _val2_, ..., and _valn_ are its arguments. The assertion succeeds -if the predicate returns `true` when applied to the given arguments, and fails -otherwise. When the assertion fails, it prints the value of each argument. In -either case, the arguments are evaluated exactly once. - -Here's an example. Given - -``` -// Returns true iff m and n have no common divisors except 1. -bool MutuallyPrime(int m, int n) { ... } -const int a = 3; -const int b = 4; -const int c = 10; -``` - -the assertion `EXPECT_PRED2(MutuallyPrime, a, b);` will succeed, while the -assertion `EXPECT_PRED2(MutuallyPrime, b, c);` will fail with the message - -
-!MutuallyPrime(b, c) is false, where

-b is 4

-c is 10

-
- -**Notes:** - - 1. If you see a compiler error "no matching function to call" when using `ASSERT_PRED*` or `EXPECT_PRED*`, please see [this](V1_7_FAQ.md#the-compiler-complains-about-undefined-references-to-some-static-const-member-variables-but-i-did-define-them-in-the-class-body-whats-wrong) for how to resolve it. - 1. Currently we only provide predicate assertions of arity <= 5. If you need a higher-arity assertion, let us know. - -_Availability_: Linux, Windows, Mac - -### Using a Function That Returns an AssertionResult ### - -While `EXPECT_PRED*()` and friends are handy for a quick job, the -syntax is not satisfactory: you have to use different macros for -different arities, and it feels more like Lisp than C++. The -`::testing::AssertionResult` class solves this problem. - -An `AssertionResult` object represents the result of an assertion -(whether it's a success or a failure, and an associated message). You -can create an `AssertionResult` using one of these factory -functions: - -``` -namespace testing { - -// Returns an AssertionResult object to indicate that an assertion has -// succeeded. -AssertionResult AssertionSuccess(); - -// Returns an AssertionResult object to indicate that an assertion has -// failed. -AssertionResult AssertionFailure(); - -} -``` - -You can then use the `<<` operator to stream messages to the -`AssertionResult` object. - -To provide more readable messages in Boolean assertions -(e.g. `EXPECT_TRUE()`), write a predicate function that returns -`AssertionResult` instead of `bool`. For example, if you define -`IsEven()` as: - -``` -::testing::AssertionResult IsEven(int n) { - if ((n % 2) == 0) - return ::testing::AssertionSuccess(); - else - return ::testing::AssertionFailure() << n << " is odd"; -} -``` - -instead of: - -``` -bool IsEven(int n) { - return (n % 2) == 0; -} -``` - -the failed assertion `EXPECT_TRUE(IsEven(Fib(4)))` will print: - -
-Value of: IsEven(Fib(4))

-Actual: false (*3 is odd*)

-Expected: true

-
- -instead of a more opaque - -
-Value of: IsEven(Fib(4))

-Actual: false

-Expected: true

-
- -If you want informative messages in `EXPECT_FALSE` and `ASSERT_FALSE` -as well, and are fine with making the predicate slower in the success -case, you can supply a success message: - -``` -::testing::AssertionResult IsEven(int n) { - if ((n % 2) == 0) - return ::testing::AssertionSuccess() << n << " is even"; - else - return ::testing::AssertionFailure() << n << " is odd"; -} -``` - -Then the statement `EXPECT_FALSE(IsEven(Fib(6)))` will print - -
-Value of: IsEven(Fib(6))

-Actual: true (8 is even)

-Expected: false

-
- -_Availability_: Linux, Windows, Mac; since version 1.4.1. - -### Using a Predicate-Formatter ### - -If you find the default message generated by `(ASSERT|EXPECT)_PRED*` and -`(ASSERT|EXPECT)_(TRUE|FALSE)` unsatisfactory, or some arguments to your -predicate do not support streaming to `ostream`, you can instead use the -following _predicate-formatter assertions_ to _fully_ customize how the -message is formatted: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_PRED_FORMAT1(`_pred\_format1, val1_`);` | `EXPECT_PRED_FORMAT1(`_pred\_format1, val1_`); | _pred\_format1(val1)_ is successful | -| `ASSERT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | `EXPECT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | _pred\_format2(val1, val2)_ is successful | -| `...` | `...` | `...` | - -The difference between this and the previous two groups of macros is that instead of -a predicate, `(ASSERT|EXPECT)_PRED_FORMAT*` take a _predicate-formatter_ -(_pred\_formatn_), which is a function or functor with the signature: - -`::testing::AssertionResult PredicateFormattern(const char* `_expr1_`, const char* `_expr2_`, ... const char* `_exprn_`, T1 `_val1_`, T2 `_val2_`, ... Tn `_valn_`);` - -where _val1_, _val2_, ..., and _valn_ are the values of the predicate -arguments, and _expr1_, _expr2_, ..., and _exprn_ are the corresponding -expressions as they appear in the source code. The types `T1`, `T2`, ..., and -`Tn` can be either value types or reference types. For example, if an -argument has type `Foo`, you can declare it as either `Foo` or `const Foo&`, -whichever is appropriate. - -A predicate-formatter returns a `::testing::AssertionResult` object to indicate -whether the assertion has succeeded or not. The only way to create such an -object is to call one of these factory functions: - -As an example, let's improve the failure message in the previous example, which uses `EXPECT_PRED2()`: - -``` -// Returns the smallest prime common divisor of m and n, -// or 1 when m and n are mutually prime. -int SmallestPrimeCommonDivisor(int m, int n) { ... } - -// A predicate-formatter for asserting that two integers are mutually prime. -::testing::AssertionResult AssertMutuallyPrime(const char* m_expr, - const char* n_expr, - int m, - int n) { - if (MutuallyPrime(m, n)) - return ::testing::AssertionSuccess(); - - return ::testing::AssertionFailure() - << m_expr << " and " << n_expr << " (" << m << " and " << n - << ") are not mutually prime, " << "as they have a common divisor " - << SmallestPrimeCommonDivisor(m, n); -} -``` - -With this predicate-formatter, we can use - -``` -EXPECT_PRED_FORMAT2(AssertMutuallyPrime, b, c); -``` - -to generate the message - -
-b and c (4 and 10) are not mutually prime, as they have a common divisor 2.

-
- -As you may have realized, many of the assertions we introduced earlier are -special cases of `(EXPECT|ASSERT)_PRED_FORMAT*`. In fact, most of them are -indeed defined using `(EXPECT|ASSERT)_PRED_FORMAT*`. - -_Availability_: Linux, Windows, Mac. - - -## Floating-Point Comparison ## - -Comparing floating-point numbers is tricky. Due to round-off errors, it is -very unlikely that two floating-points will match exactly. Therefore, -`ASSERT_EQ` 's naive comparison usually doesn't work. And since floating-points -can have a wide value range, no single fixed error bound works. It's better to -compare by a fixed relative error bound, except for values close to 0 due to -the loss of precision there. - -In general, for floating-point comparison to make sense, the user needs to -carefully choose the error bound. If they don't want or care to, comparing in -terms of Units in the Last Place (ULPs) is a good default, and Google Test -provides assertions to do this. Full details about ULPs are quite long; if you -want to learn more, see -[this article on float comparison](http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm). - -### Floating-Point Macros ### - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_FLOAT_EQ(`_expected, actual_`);` | `EXPECT_FLOAT_EQ(`_expected, actual_`);` | the two `float` values are almost equal | -| `ASSERT_DOUBLE_EQ(`_expected, actual_`);` | `EXPECT_DOUBLE_EQ(`_expected, actual_`);` | the two `double` values are almost equal | - -By "almost equal", we mean the two values are within 4 ULP's from each -other. - -The following assertions allow you to choose the acceptable error bound: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_NEAR(`_val1, val2, abs\_error_`);` | `EXPECT_NEAR`_(val1, val2, abs\_error_`);` | the difference between _val1_ and _val2_ doesn't exceed the given absolute error | - -_Availability_: Linux, Windows, Mac. - -### Floating-Point Predicate-Format Functions ### - -Some floating-point operations are useful, but not that often used. In order -to avoid an explosion of new macros, we provide them as predicate-format -functions that can be used in predicate assertion macros (e.g. -`EXPECT_PRED_FORMAT2`, etc). - -``` -EXPECT_PRED_FORMAT2(::testing::FloatLE, val1, val2); -EXPECT_PRED_FORMAT2(::testing::DoubleLE, val1, val2); -``` - -Verifies that _val1_ is less than, or almost equal to, _val2_. You can -replace `EXPECT_PRED_FORMAT2` in the above table with `ASSERT_PRED_FORMAT2`. - -_Availability_: Linux, Windows, Mac. - -## Windows HRESULT assertions ## - -These assertions test for `HRESULT` success or failure. - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_HRESULT_SUCCEEDED(`_expression_`);` | `EXPECT_HRESULT_SUCCEEDED(`_expression_`);` | _expression_ is a success `HRESULT` | -| `ASSERT_HRESULT_FAILED(`_expression_`);` | `EXPECT_HRESULT_FAILED(`_expression_`);` | _expression_ is a failure `HRESULT` | - -The generated output contains the human-readable error message -associated with the `HRESULT` code returned by _expression_. - -You might use them like this: - -``` -CComPtr shell; -ASSERT_HRESULT_SUCCEEDED(shell.CoCreateInstance(L"Shell.Application")); -CComVariant empty; -ASSERT_HRESULT_SUCCEEDED(shell->ShellExecute(CComBSTR(url), empty, empty, empty, empty)); -``` - -_Availability_: Windows. - -## Type Assertions ## - -You can call the function -``` -::testing::StaticAssertTypeEq(); -``` -to assert that types `T1` and `T2` are the same. The function does -nothing if the assertion is satisfied. If the types are different, -the function call will fail to compile, and the compiler error message -will likely (depending on the compiler) show you the actual values of -`T1` and `T2`. This is mainly useful inside template code. - -_Caveat:_ When used inside a member function of a class template or a -function template, `StaticAssertTypeEq()` is effective _only if_ -the function is instantiated. For example, given: -``` -template class Foo { - public: - void Bar() { ::testing::StaticAssertTypeEq(); } -}; -``` -the code: -``` -void Test1() { Foo foo; } -``` -will _not_ generate a compiler error, as `Foo::Bar()` is never -actually instantiated. Instead, you need: -``` -void Test2() { Foo foo; foo.Bar(); } -``` -to cause a compiler error. - -_Availability:_ Linux, Windows, Mac; since version 1.3.0. - -## Assertion Placement ## - -You can use assertions in any C++ function. In particular, it doesn't -have to be a method of the test fixture class. The one constraint is -that assertions that generate a fatal failure (`FAIL*` and `ASSERT_*`) -can only be used in void-returning functions. This is a consequence of -Google Test not using exceptions. By placing it in a non-void function -you'll get a confusing compile error like -`"error: void value not ignored as it ought to be"`. - -If you need to use assertions in a function that returns non-void, one option -is to make the function return the value in an out parameter instead. For -example, you can rewrite `T2 Foo(T1 x)` to `void Foo(T1 x, T2* result)`. You -need to make sure that `*result` contains some sensible value even when the -function returns prematurely. As the function now returns `void`, you can use -any assertion inside of it. - -If changing the function's type is not an option, you should just use -assertions that generate non-fatal failures, such as `ADD_FAILURE*` and -`EXPECT_*`. - -_Note_: Constructors and destructors are not considered void-returning -functions, according to the C++ language specification, and so you may not use -fatal assertions in them. You'll get a compilation error if you try. A simple -workaround is to transfer the entire body of the constructor or destructor to a -private void-returning method. However, you should be aware that a fatal -assertion failure in a constructor does not terminate the current test, as your -intuition might suggest; it merely returns from the constructor early, possibly -leaving your object in a partially-constructed state. Likewise, a fatal -assertion failure in a destructor may leave your object in a -partially-destructed state. Use assertions carefully in these situations! - -# Teaching Google Test How to Print Your Values # - -When a test assertion such as `EXPECT_EQ` fails, Google Test prints the -argument values to help you debug. It does this using a -user-extensible value printer. - -This printer knows how to print built-in C++ types, native arrays, STL -containers, and any type that supports the `<<` operator. For other -types, it prints the raw bytes in the value and hopes that you the -user can figure it out. - -As mentioned earlier, the printer is _extensible_. That means -you can teach it to do a better job at printing your particular type -than to dump the bytes. To do that, define `<<` for your type: - -``` -#include - -namespace foo { - -class Bar { ... }; // We want Google Test to be able to print instances of this. - -// It's important that the << operator is defined in the SAME -// namespace that defines Bar. C++'s look-up rules rely on that. -::std::ostream& operator<<(::std::ostream& os, const Bar& bar) { - return os << bar.DebugString(); // whatever needed to print bar to os -} - -} // namespace foo -``` - -Sometimes, this might not be an option: your team may consider it bad -style to have a `<<` operator for `Bar`, or `Bar` may already have a -`<<` operator that doesn't do what you want (and you cannot change -it). If so, you can instead define a `PrintTo()` function like this: - -``` -#include - -namespace foo { - -class Bar { ... }; - -// It's important that PrintTo() is defined in the SAME -// namespace that defines Bar. C++'s look-up rules rely on that. -void PrintTo(const Bar& bar, ::std::ostream* os) { - *os << bar.DebugString(); // whatever needed to print bar to os -} - -} // namespace foo -``` - -If you have defined both `<<` and `PrintTo()`, the latter will be used -when Google Test is concerned. This allows you to customize how the value -appears in Google Test's output without affecting code that relies on the -behavior of its `<<` operator. - -If you want to print a value `x` using Google Test's value printer -yourself, just call `::testing::PrintToString(`_x_`)`, which -returns an `std::string`: - -``` -vector > bar_ints = GetBarIntVector(); - -EXPECT_TRUE(IsCorrectBarIntVector(bar_ints)) - << "bar_ints = " << ::testing::PrintToString(bar_ints); -``` - -# Death Tests # - -In many applications, there are assertions that can cause application failure -if a condition is not met. These sanity checks, which ensure that the program -is in a known good state, are there to fail at the earliest possible time after -some program state is corrupted. If the assertion checks the wrong condition, -then the program may proceed in an erroneous state, which could lead to memory -corruption, security holes, or worse. Hence it is vitally important to test -that such assertion statements work as expected. - -Since these precondition checks cause the processes to die, we call such tests -_death tests_. More generally, any test that checks that a program terminates -(except by throwing an exception) in an expected fashion is also a death test. - -Note that if a piece of code throws an exception, we don't consider it "death" -for the purpose of death tests, as the caller of the code could catch the exception -and avoid the crash. If you want to verify exceptions thrown by your code, -see [Exception Assertions](#exception-assertions). - -If you want to test `EXPECT_*()/ASSERT_*()` failures in your test code, see [Catching Failures](#catching-failures). - -## How to Write a Death Test ## - -Google Test has the following macros to support death tests: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_DEATH(`_statement, regex_`); | `EXPECT_DEATH(`_statement, regex_`); | _statement_ crashes with the given error | -| `ASSERT_DEATH_IF_SUPPORTED(`_statement, regex_`); | `EXPECT_DEATH_IF_SUPPORTED(`_statement, regex_`); | if death tests are supported, verifies that _statement_ crashes with the given error; otherwise verifies nothing | -| `ASSERT_EXIT(`_statement, predicate, regex_`); | `EXPECT_EXIT(`_statement, predicate, regex_`); |_statement_ exits with the given error and its exit code matches _predicate_ | - -where _statement_ is a statement that is expected to cause the process to -die, _predicate_ is a function or function object that evaluates an integer -exit status, and _regex_ is a regular expression that the stderr output of -_statement_ is expected to match. Note that _statement_ can be _any valid -statement_ (including _compound statement_) and doesn't have to be an -expression. - -As usual, the `ASSERT` variants abort the current test function, while the -`EXPECT` variants do not. - -**Note:** We use the word "crash" here to mean that the process -terminates with a _non-zero_ exit status code. There are two -possibilities: either the process has called `exit()` or `_exit()` -with a non-zero value, or it may be killed by a signal. - -This means that if _statement_ terminates the process with a 0 exit -code, it is _not_ considered a crash by `EXPECT_DEATH`. Use -`EXPECT_EXIT` instead if this is the case, or if you want to restrict -the exit code more precisely. - -A predicate here must accept an `int` and return a `bool`. The death test -succeeds only if the predicate returns `true`. Google Test defines a few -predicates that handle the most common cases: - -``` -::testing::ExitedWithCode(exit_code) -``` - -This expression is `true` if the program exited normally with the given exit -code. - -``` -::testing::KilledBySignal(signal_number) // Not available on Windows. -``` - -This expression is `true` if the program was killed by the given signal. - -The `*_DEATH` macros are convenient wrappers for `*_EXIT` that use a predicate -that verifies the process' exit code is non-zero. - -Note that a death test only cares about three things: - - 1. does _statement_ abort or exit the process? - 1. (in the case of `ASSERT_EXIT` and `EXPECT_EXIT`) does the exit status satisfy _predicate_? Or (in the case of `ASSERT_DEATH` and `EXPECT_DEATH`) is the exit status non-zero? And - 1. does the stderr output match _regex_? - -In particular, if _statement_ generates an `ASSERT_*` or `EXPECT_*` failure, it will **not** cause the death test to fail, as Google Test assertions don't abort the process. - -To write a death test, simply use one of the above macros inside your test -function. For example, - -``` -TEST(MyDeathTest, Foo) { - // This death test uses a compound statement. - ASSERT_DEATH({ int n = 5; Foo(&n); }, "Error on line .* of Foo()"); -} -TEST(MyDeathTest, NormalExit) { - EXPECT_EXIT(NormalExit(), ::testing::ExitedWithCode(0), "Success"); -} -TEST(MyDeathTest, KillMyself) { - EXPECT_EXIT(KillMyself(), ::testing::KilledBySignal(SIGKILL), "Sending myself unblockable signal"); -} -``` - -verifies that: - - * calling `Foo(5)` causes the process to die with the given error message, - * calling `NormalExit()` causes the process to print `"Success"` to stderr and exit with exit code 0, and - * calling `KillMyself()` kills the process with signal `SIGKILL`. - -The test function body may contain other assertions and statements as well, if -necessary. - -_Important:_ We strongly recommend you to follow the convention of naming your -test case (not test) `*DeathTest` when it contains a death test, as -demonstrated in the above example. The `Death Tests And Threads` section below -explains why. - -If a test fixture class is shared by normal tests and death tests, you -can use typedef to introduce an alias for the fixture class and avoid -duplicating its code: -``` -class FooTest : public ::testing::Test { ... }; - -typedef FooTest FooDeathTest; - -TEST_F(FooTest, DoesThis) { - // normal test -} - -TEST_F(FooDeathTest, DoesThat) { - // death test -} -``` - -_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Cygwin, and Mac (the latter three are supported since v1.3.0). `(ASSERT|EXPECT)_DEATH_IF_SUPPORTED` are new in v1.4.0. - -## Regular Expression Syntax ## - -On POSIX systems (e.g. Linux, Cygwin, and Mac), Google Test uses the -[POSIX extended regular expression](http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04) -syntax in death tests. To learn about this syntax, you may want to read this [Wikipedia entry](http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions). - -On Windows, Google Test uses its own simple regular expression -implementation. It lacks many features you can find in POSIX extended -regular expressions. For example, we don't support union (`"x|y"`), -grouping (`"(xy)"`), brackets (`"[xy]"`), and repetition count -(`"x{5,7}"`), among others. Below is what we do support (Letter `A` denotes a -literal character, period (`.`), or a single `\\` escape sequence; `x` -and `y` denote regular expressions.): - -| `c` | matches any literal character `c` | -|:----|:----------------------------------| -| `\\d` | matches any decimal digit | -| `\\D` | matches any character that's not a decimal digit | -| `\\f` | matches `\f` | -| `\\n` | matches `\n` | -| `\\r` | matches `\r` | -| `\\s` | matches any ASCII whitespace, including `\n` | -| `\\S` | matches any character that's not a whitespace | -| `\\t` | matches `\t` | -| `\\v` | matches `\v` | -| `\\w` | matches any letter, `_`, or decimal digit | -| `\\W` | matches any character that `\\w` doesn't match | -| `\\c` | matches any literal character `c`, which must be a punctuation | -| `\\.` | matches the `.` character | -| `.` | matches any single character except `\n` | -| `A?` | matches 0 or 1 occurrences of `A` | -| `A*` | matches 0 or many occurrences of `A` | -| `A+` | matches 1 or many occurrences of `A` | -| `^` | matches the beginning of a string (not that of each line) | -| `$` | matches the end of a string (not that of each line) | -| `xy` | matches `x` followed by `y` | - -To help you determine which capability is available on your system, -Google Test defines macro `GTEST_USES_POSIX_RE=1` when it uses POSIX -extended regular expressions, or `GTEST_USES_SIMPLE_RE=1` when it uses -the simple version. If you want your death tests to work in both -cases, you can either `#if` on these macros or use the more limited -syntax only. - -## How It Works ## - -Under the hood, `ASSERT_EXIT()` spawns a new process and executes the -death test statement in that process. The details of of how precisely -that happens depend on the platform and the variable -`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the -command-line flag `--gtest_death_test_style`). - - * On POSIX systems, `fork()` (or `clone()` on Linux) is used to spawn the child, after which: - * If the variable's value is `"fast"`, the death test statement is immediately executed. - * If the variable's value is `"threadsafe"`, the child process re-executes the unit test binary just as it was originally invoked, but with some extra flags to cause just the single death test under consideration to be run. - * On Windows, the child is spawned using the `CreateProcess()` API, and re-executes the binary to cause just the single death test under consideration to be run - much like the `threadsafe` mode on POSIX. - -Other values for the variable are illegal and will cause the death test to -fail. Currently, the flag's default value is `"fast"`. However, we reserve the -right to change it in the future. Therefore, your tests should not depend on -this. - -In either case, the parent process waits for the child process to complete, and checks that - - 1. the child's exit status satisfies the predicate, and - 1. the child's stderr matches the regular expression. - -If the death test statement runs to completion without dying, the child -process will nonetheless terminate, and the assertion fails. - -## Death Tests And Threads ## - -The reason for the two death test styles has to do with thread safety. Due to -well-known problems with forking in the presence of threads, death tests should -be run in a single-threaded context. Sometimes, however, it isn't feasible to -arrange that kind of environment. For example, statically-initialized modules -may start threads before main is ever reached. Once threads have been created, -it may be difficult or impossible to clean them up. - -Google Test has three features intended to raise awareness of threading issues. - - 1. A warning is emitted if multiple threads are running when a death test is encountered. - 1. Test cases with a name ending in "DeathTest" are run before all other tests. - 1. It uses `clone()` instead of `fork()` to spawn the child process on Linux (`clone()` is not available on Cygwin and Mac), as `fork()` is more likely to cause the child to hang when the parent process has multiple threads. - -It's perfectly fine to create threads inside a death test statement; they are -executed in a separate process and cannot affect the parent. - -## Death Test Styles ## - -The "threadsafe" death test style was introduced in order to help mitigate the -risks of testing in a possibly multithreaded environment. It trades increased -test execution time (potentially dramatically so) for improved thread safety. -We suggest using the faster, default "fast" style unless your test has specific -problems with it. - -You can choose a particular style of death tests by setting the flag -programmatically: - -``` -::testing::FLAGS_gtest_death_test_style = "threadsafe"; -``` - -You can do this in `main()` to set the style for all death tests in the -binary, or in individual tests. Recall that flags are saved before running each -test and restored afterwards, so you need not do that yourself. For example: - -``` -TEST(MyDeathTest, TestOne) { - ::testing::FLAGS_gtest_death_test_style = "threadsafe"; - // This test is run in the "threadsafe" style: - ASSERT_DEATH(ThisShouldDie(), ""); -} - -TEST(MyDeathTest, TestTwo) { - // This test is run in the "fast" style: - ASSERT_DEATH(ThisShouldDie(), ""); -} - -int main(int argc, char** argv) { - ::testing::InitGoogleTest(&argc, argv); - ::testing::FLAGS_gtest_death_test_style = "fast"; - return RUN_ALL_TESTS(); -} -``` - -## Caveats ## - -The _statement_ argument of `ASSERT_EXIT()` can be any valid C++ statement. -If it leaves the current function via a `return` statement or by throwing an exception, -the death test is considered to have failed. Some Google Test macros may return -from the current function (e.g. `ASSERT_TRUE()`), so be sure to avoid them in _statement_. - -Since _statement_ runs in the child process, any in-memory side effect (e.g. -modifying a variable, releasing memory, etc) it causes will _not_ be observable -in the parent process. In particular, if you release memory in a death test, -your program will fail the heap check as the parent process will never see the -memory reclaimed. To solve this problem, you can - - 1. try not to free memory in a death test; - 1. free the memory again in the parent process; or - 1. do not use the heap checker in your program. - -Due to an implementation detail, you cannot place multiple death test -assertions on the same line; otherwise, compilation will fail with an unobvious -error message. - -Despite the improved thread safety afforded by the "threadsafe" style of death -test, thread problems such as deadlock are still possible in the presence of -handlers registered with `pthread_atfork(3)`. - -# Using Assertions in Sub-routines # - -## Adding Traces to Assertions ## - -If a test sub-routine is called from several places, when an assertion -inside it fails, it can be hard to tell which invocation of the -sub-routine the failure is from. You can alleviate this problem using -extra logging or custom failure messages, but that usually clutters up -your tests. A better solution is to use the `SCOPED_TRACE` macro: - -| `SCOPED_TRACE(`_message_`);` | -|:-----------------------------| - -where _message_ can be anything streamable to `std::ostream`. This -macro will cause the current file name, line number, and the given -message to be added in every failure message. The effect will be -undone when the control leaves the current lexical scope. - -For example, - -``` -10: void Sub1(int n) { -11: EXPECT_EQ(1, Bar(n)); -12: EXPECT_EQ(2, Bar(n + 1)); -13: } -14: -15: TEST(FooTest, Bar) { -16: { -17: SCOPED_TRACE("A"); // This trace point will be included in -18: // every failure in this scope. -19: Sub1(1); -20: } -21: // Now it won't. -22: Sub1(9); -23: } -``` - -could result in messages like these: - -``` -path/to/foo_test.cc:11: Failure -Value of: Bar(n) -Expected: 1 - Actual: 2 - Trace: -path/to/foo_test.cc:17: A - -path/to/foo_test.cc:12: Failure -Value of: Bar(n + 1) -Expected: 2 - Actual: 3 -``` - -Without the trace, it would've been difficult to know which invocation -of `Sub1()` the two failures come from respectively. (You could add an -extra message to each assertion in `Sub1()` to indicate the value of -`n`, but that's tedious.) - -Some tips on using `SCOPED_TRACE`: - - 1. With a suitable message, it's often enough to use `SCOPED_TRACE` at the beginning of a sub-routine, instead of at each call site. - 1. When calling sub-routines inside a loop, make the loop iterator part of the message in `SCOPED_TRACE` such that you can know which iteration the failure is from. - 1. Sometimes the line number of the trace point is enough for identifying the particular invocation of a sub-routine. In this case, you don't have to choose a unique message for `SCOPED_TRACE`. You can simply use `""`. - 1. You can use `SCOPED_TRACE` in an inner scope when there is one in the outer scope. In this case, all active trace points will be included in the failure messages, in reverse order they are encountered. - 1. The trace dump is clickable in Emacs' compilation buffer - hit return on a line number and you'll be taken to that line in the source file! - -_Availability:_ Linux, Windows, Mac. - -## Propagating Fatal Failures ## - -A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that -when they fail they only abort the _current function_, not the entire test. For -example, the following test will segfault: -``` -void Subroutine() { - // Generates a fatal failure and aborts the current function. - ASSERT_EQ(1, 2); - // The following won't be executed. - ... -} - -TEST(FooTest, Bar) { - Subroutine(); - // The intended behavior is for the fatal failure - // in Subroutine() to abort the entire test. - // The actual behavior: the function goes on after Subroutine() returns. - int* p = NULL; - *p = 3; // Segfault! -} -``` - -Since we don't use exceptions, it is technically impossible to -implement the intended behavior here. To alleviate this, Google Test -provides two solutions. You could use either the -`(ASSERT|EXPECT)_NO_FATAL_FAILURE` assertions or the -`HasFatalFailure()` function. They are described in the following two -subsections. - -### Asserting on Subroutines ### - -As shown above, if your test calls a subroutine that has an `ASSERT_*` -failure in it, the test will continue after the subroutine -returns. This may not be what you want. - -Often people want fatal failures to propagate like exceptions. For -that Google Test offers the following macros: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_NO_FATAL_FAILURE(`_statement_`);` | `EXPECT_NO_FATAL_FAILURE(`_statement_`);` | _statement_ doesn't generate any new fatal failures in the current thread. | - -Only failures in the thread that executes the assertion are checked to -determine the result of this type of assertions. If _statement_ -creates new threads, failures in these threads are ignored. - -Examples: - -``` -ASSERT_NO_FATAL_FAILURE(Foo()); - -int i; -EXPECT_NO_FATAL_FAILURE({ - i = Bar(); -}); -``` - -_Availability:_ Linux, Windows, Mac. Assertions from multiple threads -are currently not supported. - -### Checking for Failures in the Current Test ### - -`HasFatalFailure()` in the `::testing::Test` class returns `true` if an -assertion in the current test has suffered a fatal failure. This -allows functions to catch fatal failures in a sub-routine and return -early. - -``` -class Test { - public: - ... - static bool HasFatalFailure(); -}; -``` - -The typical usage, which basically simulates the behavior of a thrown -exception, is: - -``` -TEST(FooTest, Bar) { - Subroutine(); - // Aborts if Subroutine() had a fatal failure. - if (HasFatalFailure()) - return; - // The following won't be executed. - ... -} -``` - -If `HasFatalFailure()` is used outside of `TEST()` , `TEST_F()` , or a test -fixture, you must add the `::testing::Test::` prefix, as in: - -``` -if (::testing::Test::HasFatalFailure()) - return; -``` - -Similarly, `HasNonfatalFailure()` returns `true` if the current test -has at least one non-fatal failure, and `HasFailure()` returns `true` -if the current test has at least one failure of either kind. - -_Availability:_ Linux, Windows, Mac. `HasNonfatalFailure()` and -`HasFailure()` are available since version 1.4.0. - -# Logging Additional Information # - -In your test code, you can call `RecordProperty("key", value)` to log -additional information, where `value` can be either a string or an `int`. The _last_ value recorded for a key will be emitted to the XML output -if you specify one. For example, the test - -``` -TEST_F(WidgetUsageTest, MinAndMaxWidgets) { - RecordProperty("MaximumWidgets", ComputeMaxUsage()); - RecordProperty("MinimumWidgets", ComputeMinUsage()); -} -``` - -will output XML like this: - -``` -... - -... -``` - -_Note_: - * `RecordProperty()` is a static member of the `Test` class. Therefore it needs to be prefixed with `::testing::Test::` if used outside of the `TEST` body and the test fixture class. - * `key` must be a valid XML attribute name, and cannot conflict with the ones already used by Google Test (`name`, `status`, `time`, `classname`, `type_param`, and `value_param`). - * Calling `RecordProperty()` outside of the lifespan of a test is allowed. If it's called outside of a test but between a test case's `SetUpTestCase()` and `TearDownTestCase()` methods, it will be attributed to the XML element for the test case. If it's called outside of all test cases (e.g. in a test environment), it will be attributed to the top-level XML element. - -_Availability_: Linux, Windows, Mac. - -# Sharing Resources Between Tests in the Same Test Case # - - - -Google Test creates a new test fixture object for each test in order to make -tests independent and easier to debug. However, sometimes tests use resources -that are expensive to set up, making the one-copy-per-test model prohibitively -expensive. - -If the tests don't change the resource, there's no harm in them sharing a -single resource copy. So, in addition to per-test set-up/tear-down, Google Test -also supports per-test-case set-up/tear-down. To use it: - - 1. In your test fixture class (say `FooTest` ), define as `static` some member variables to hold the shared resources. - 1. In the same test fixture class, define a `static void SetUpTestCase()` function (remember not to spell it as **`SetupTestCase`** with a small `u`!) to set up the shared resources and a `static void TearDownTestCase()` function to tear them down. - -That's it! Google Test automatically calls `SetUpTestCase()` before running the -_first test_ in the `FooTest` test case (i.e. before creating the first -`FooTest` object), and calls `TearDownTestCase()` after running the _last test_ -in it (i.e. after deleting the last `FooTest` object). In between, the tests -can use the shared resources. - -Remember that the test order is undefined, so your code can't depend on a test -preceding or following another. Also, the tests must either not modify the -state of any shared resource, or, if they do modify the state, they must -restore the state to its original value before passing control to the next -test. - -Here's an example of per-test-case set-up and tear-down: -``` -class FooTest : public ::testing::Test { - protected: - // Per-test-case set-up. - // Called before the first test in this test case. - // Can be omitted if not needed. - static void SetUpTestCase() { - shared_resource_ = new ...; - } - - // Per-test-case tear-down. - // Called after the last test in this test case. - // Can be omitted if not needed. - static void TearDownTestCase() { - delete shared_resource_; - shared_resource_ = NULL; - } - - // You can define per-test set-up and tear-down logic as usual. - virtual void SetUp() { ... } - virtual void TearDown() { ... } - - // Some expensive resource shared by all tests. - static T* shared_resource_; -}; - -T* FooTest::shared_resource_ = NULL; - -TEST_F(FooTest, Test1) { - ... you can refer to shared_resource here ... -} -TEST_F(FooTest, Test2) { - ... you can refer to shared_resource here ... -} -``` - -_Availability:_ Linux, Windows, Mac. - -# Global Set-Up and Tear-Down # - -Just as you can do set-up and tear-down at the test level and the test case -level, you can also do it at the test program level. Here's how. - -First, you subclass the `::testing::Environment` class to define a test -environment, which knows how to set-up and tear-down: - -``` -class Environment { - public: - virtual ~Environment() {} - // Override this to define how to set up the environment. - virtual void SetUp() {} - // Override this to define how to tear down the environment. - virtual void TearDown() {} -}; -``` - -Then, you register an instance of your environment class with Google Test by -calling the `::testing::AddGlobalTestEnvironment()` function: - -``` -Environment* AddGlobalTestEnvironment(Environment* env); -``` - -Now, when `RUN_ALL_TESTS()` is called, it first calls the `SetUp()` method of -the environment object, then runs the tests if there was no fatal failures, and -finally calls `TearDown()` of the environment object. - -It's OK to register multiple environment objects. In this case, their `SetUp()` -will be called in the order they are registered, and their `TearDown()` will be -called in the reverse order. - -Note that Google Test takes ownership of the registered environment objects. -Therefore **do not delete them** by yourself. - -You should call `AddGlobalTestEnvironment()` before `RUN_ALL_TESTS()` is -called, probably in `main()`. If you use `gtest_main`, you need to call -this before `main()` starts for it to take effect. One way to do this is to -define a global variable like this: - -``` -::testing::Environment* const foo_env = ::testing::AddGlobalTestEnvironment(new FooEnvironment); -``` - -However, we strongly recommend you to write your own `main()` and call -`AddGlobalTestEnvironment()` there, as relying on initialization of global -variables makes the code harder to read and may cause problems when you -register multiple environments from different translation units and the -environments have dependencies among them (remember that the compiler doesn't -guarantee the order in which global variables from different translation units -are initialized). - -_Availability:_ Linux, Windows, Mac. - - -# Value Parameterized Tests # - -_Value-parameterized tests_ allow you to test your code with different -parameters without writing multiple copies of the same test. - -Suppose you write a test for your code and then realize that your code is affected by a presence of a Boolean command line flag. - -``` -TEST(MyCodeTest, TestFoo) { - // A code to test foo(). -} -``` - -Usually people factor their test code into a function with a Boolean parameter in such situations. The function sets the flag, then executes the testing code. - -``` -void TestFooHelper(bool flag_value) { - flag = flag_value; - // A code to test foo(). -} - -TEST(MyCodeTest, TestFoo) { - TestFooHelper(false); - TestFooHelper(true); -} -``` - -But this setup has serious drawbacks. First, when a test assertion fails in your tests, it becomes unclear what value of the parameter caused it to fail. You can stream a clarifying message into your `EXPECT`/`ASSERT` statements, but it you'll have to do it with all of them. Second, you have to add one such helper function per test. What if you have ten tests? Twenty? A hundred? - -Value-parameterized tests will let you write your test only once and then easily instantiate and run it with an arbitrary number of parameter values. - -Here are some other situations when value-parameterized tests come handy: - - * You want to test different implementations of an OO interface. - * You want to test your code over various inputs (a.k.a. data-driven testing). This feature is easy to abuse, so please exercise your good sense when doing it! - -## How to Write Value-Parameterized Tests ## - -To write value-parameterized tests, first you should define a fixture -class. It must be derived from both `::testing::Test` and -`::testing::WithParamInterface` (the latter is a pure interface), -where `T` is the type of your parameter values. For convenience, you -can just derive the fixture class from `::testing::TestWithParam`, -which itself is derived from both `::testing::Test` and -`::testing::WithParamInterface`. `T` can be any copyable type. If -it's a raw pointer, you are responsible for managing the lifespan of -the pointed values. - -``` -class FooTest : public ::testing::TestWithParam { - // You can implement all the usual fixture class members here. - // To access the test parameter, call GetParam() from class - // TestWithParam. -}; - -// Or, when you want to add parameters to a pre-existing fixture class: -class BaseTest : public ::testing::Test { - ... -}; -class BarTest : public BaseTest, - public ::testing::WithParamInterface { - ... -}; -``` - -Then, use the `TEST_P` macro to define as many test patterns using -this fixture as you want. The `_P` suffix is for "parameterized" or -"pattern", whichever you prefer to think. - -``` -TEST_P(FooTest, DoesBlah) { - // Inside a test, access the test parameter with the GetParam() method - // of the TestWithParam class: - EXPECT_TRUE(foo.Blah(GetParam())); - ... -} - -TEST_P(FooTest, HasBlahBlah) { - ... -} -``` - -Finally, you can use `INSTANTIATE_TEST_CASE_P` to instantiate the test -case with any set of parameters you want. Google Test defines a number of -functions for generating test parameters. They return what we call -(surprise!) _parameter generators_. Here is a summary of them, -which are all in the `testing` namespace: - -| `Range(begin, end[, step])` | Yields values `{begin, begin+step, begin+step+step, ...}`. The values do not include `end`. `step` defaults to 1. | -|:----------------------------|:------------------------------------------------------------------------------------------------------------------| -| `Values(v1, v2, ..., vN)` | Yields values `{v1, v2, ..., vN}`. | -| `ValuesIn(container)` and `ValuesIn(begin, end)` | Yields values from a C-style array, an STL-style container, or an iterator range `[begin, end)`. `container`, `begin`, and `end` can be expressions whose values are determined at run time. | -| `Bool()` | Yields sequence `{false, true}`. | -| `Combine(g1, g2, ..., gN)` | Yields all combinations (the Cartesian product for the math savvy) of the values generated by the `N` generators. This is only available if your system provides the `` header. If you are sure your system does, and Google Test disagrees, you can override it by defining `GTEST_HAS_TR1_TUPLE=1`. See comments in [include/gtest/internal/gtest-port.h](../include/gtest/internal/gtest-port.h) for more information. | - -For more details, see the comments at the definitions of these functions in the [source code](../include/gtest/gtest-param-test.h). - -The following statement will instantiate tests from the `FooTest` test case -each with parameter values `"meeny"`, `"miny"`, and `"moe"`. - -``` -INSTANTIATE_TEST_CASE_P(InstantiationName, - FooTest, - ::testing::Values("meeny", "miny", "moe")); -``` - -To distinguish different instances of the pattern (yes, you can -instantiate it more than once), the first argument to -`INSTANTIATE_TEST_CASE_P` is a prefix that will be added to the actual -test case name. Remember to pick unique prefixes for different -instantiations. The tests from the instantiation above will have these -names: - - * `InstantiationName/FooTest.DoesBlah/0` for `"meeny"` - * `InstantiationName/FooTest.DoesBlah/1` for `"miny"` - * `InstantiationName/FooTest.DoesBlah/2` for `"moe"` - * `InstantiationName/FooTest.HasBlahBlah/0` for `"meeny"` - * `InstantiationName/FooTest.HasBlahBlah/1` for `"miny"` - * `InstantiationName/FooTest.HasBlahBlah/2` for `"moe"` - -You can use these names in [--gtest\_filter](#running-a-subset-of-the-tests). - -This statement will instantiate all tests from `FooTest` again, each -with parameter values `"cat"` and `"dog"`: - -``` -const char* pets[] = {"cat", "dog"}; -INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, - ::testing::ValuesIn(pets)); -``` - -The tests from the instantiation above will have these names: - - * `AnotherInstantiationName/FooTest.DoesBlah/0` for `"cat"` - * `AnotherInstantiationName/FooTest.DoesBlah/1` for `"dog"` - * `AnotherInstantiationName/FooTest.HasBlahBlah/0` for `"cat"` - * `AnotherInstantiationName/FooTest.HasBlahBlah/1` for `"dog"` - -Please note that `INSTANTIATE_TEST_CASE_P` will instantiate _all_ -tests in the given test case, whether their definitions come before or -_after_ the `INSTANTIATE_TEST_CASE_P` statement. - -You can see -[these](../samples/sample7_unittest.cc) -[files](../samples/sample8_unittest.cc) for more examples. - -_Availability_: Linux, Windows (requires MSVC 8.0 or above), Mac; since version 1.2.0. - -## Creating Value-Parameterized Abstract Tests ## - -In the above, we define and instantiate `FooTest` in the same source -file. Sometimes you may want to define value-parameterized tests in a -library and let other people instantiate them later. This pattern is -known as abstract tests. As an example of its application, when you -are designing an interface you can write a standard suite of abstract -tests (perhaps using a factory function as the test parameter) that -all implementations of the interface are expected to pass. When -someone implements the interface, he can instantiate your suite to get -all the interface-conformance tests for free. - -To define abstract tests, you should organize your code like this: - - 1. Put the definition of the parameterized test fixture class (e.g. `FooTest`) in a header file, say `foo_param_test.h`. Think of this as _declaring_ your abstract tests. - 1. Put the `TEST_P` definitions in `foo_param_test.cc`, which includes `foo_param_test.h`. Think of this as _implementing_ your abstract tests. - -Once they are defined, you can instantiate them by including -`foo_param_test.h`, invoking `INSTANTIATE_TEST_CASE_P()`, and linking -with `foo_param_test.cc`. You can instantiate the same abstract test -case multiple times, possibly in different source files. - -# Typed Tests # - -Suppose you have multiple implementations of the same interface and -want to make sure that all of them satisfy some common requirements. -Or, you may have defined several types that are supposed to conform to -the same "concept" and you want to verify it. In both cases, you want -the same test logic repeated for different types. - -While you can write one `TEST` or `TEST_F` for each type you want to -test (and you may even factor the test logic into a function template -that you invoke from the `TEST`), it's tedious and doesn't scale: -if you want _m_ tests over _n_ types, you'll end up writing _m\*n_ -`TEST`s. - -_Typed tests_ allow you to repeat the same test logic over a list of -types. You only need to write the test logic once, although you must -know the type list when writing typed tests. Here's how you do it: - -First, define a fixture class template. It should be parameterized -by a type. Remember to derive it from `::testing::Test`: - -``` -template -class FooTest : public ::testing::Test { - public: - ... - typedef std::list List; - static T shared_; - T value_; -}; -``` - -Next, associate a list of types with the test case, which will be -repeated for each type in the list: - -``` -typedef ::testing::Types MyTypes; -TYPED_TEST_CASE(FooTest, MyTypes); -``` - -The `typedef` is necessary for the `TYPED_TEST_CASE` macro to parse -correctly. Otherwise the compiler will think that each comma in the -type list introduces a new macro argument. - -Then, use `TYPED_TEST()` instead of `TEST_F()` to define a typed test -for this test case. You can repeat this as many times as you want: - -``` -TYPED_TEST(FooTest, DoesBlah) { - // Inside a test, refer to the special name TypeParam to get the type - // parameter. Since we are inside a derived class template, C++ requires - // us to visit the members of FooTest via 'this'. - TypeParam n = this->value_; - - // To visit static members of the fixture, add the 'TestFixture::' - // prefix. - n += TestFixture::shared_; - - // To refer to typedefs in the fixture, add the 'typename TestFixture::' - // prefix. The 'typename' is required to satisfy the compiler. - typename TestFixture::List values; - values.push_back(n); - ... -} - -TYPED_TEST(FooTest, HasPropertyA) { ... } -``` - -You can see `samples/sample6_unittest.cc` for a complete example. - -_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac; -since version 1.1.0. - -# Type-Parameterized Tests # - -_Type-parameterized tests_ are like typed tests, except that they -don't require you to know the list of types ahead of time. Instead, -you can define the test logic first and instantiate it with different -type lists later. You can even instantiate it more than once in the -same program. - -If you are designing an interface or concept, you can define a suite -of type-parameterized tests to verify properties that any valid -implementation of the interface/concept should have. Then, the author -of each implementation can just instantiate the test suite with his -type to verify that it conforms to the requirements, without having to -write similar tests repeatedly. Here's an example: - -First, define a fixture class template, as we did with typed tests: - -``` -template -class FooTest : public ::testing::Test { - ... -}; -``` - -Next, declare that you will define a type-parameterized test case: - -``` -TYPED_TEST_CASE_P(FooTest); -``` - -The `_P` suffix is for "parameterized" or "pattern", whichever you -prefer to think. - -Then, use `TYPED_TEST_P()` to define a type-parameterized test. You -can repeat this as many times as you want: - -``` -TYPED_TEST_P(FooTest, DoesBlah) { - // Inside a test, refer to TypeParam to get the type parameter. - TypeParam n = 0; - ... -} - -TYPED_TEST_P(FooTest, HasPropertyA) { ... } -``` - -Now the tricky part: you need to register all test patterns using the -`REGISTER_TYPED_TEST_CASE_P` macro before you can instantiate them. -The first argument of the macro is the test case name; the rest are -the names of the tests in this test case: - -``` -REGISTER_TYPED_TEST_CASE_P(FooTest, - DoesBlah, HasPropertyA); -``` - -Finally, you are free to instantiate the pattern with the types you -want. If you put the above code in a header file, you can `#include` -it in multiple C++ source files and instantiate it multiple times. - -``` -typedef ::testing::Types MyTypes; -INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes); -``` - -To distinguish different instances of the pattern, the first argument -to the `INSTANTIATE_TYPED_TEST_CASE_P` macro is a prefix that will be -added to the actual test case name. Remember to pick unique prefixes -for different instances. - -In the special case where the type list contains only one type, you -can write that type directly without `::testing::Types<...>`, like this: - -``` -INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int); -``` - -You can see `samples/sample6_unittest.cc` for a complete example. - -_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac; -since version 1.1.0. - -# Testing Private Code # - -If you change your software's internal implementation, your tests should not -break as long as the change is not observable by users. Therefore, per the -_black-box testing principle_, most of the time you should test your code -through its public interfaces. - -If you still find yourself needing to test internal implementation code, -consider if there's a better design that wouldn't require you to do so. If you -absolutely have to test non-public interface code though, you can. There are -two cases to consider: - - * Static functions (_not_ the same as static member functions!) or unnamed namespaces, and - * Private or protected class members - -## Static Functions ## - -Both static functions and definitions/declarations in an unnamed namespace are -only visible within the same translation unit. To test them, you can `#include` -the entire `.cc` file being tested in your `*_test.cc` file. (`#include`ing `.cc` -files is not a good way to reuse code - you should not do this in production -code!) - -However, a better approach is to move the private code into the -`foo::internal` namespace, where `foo` is the namespace your project normally -uses, and put the private declarations in a `*-internal.h` file. Your -production `.cc` files and your tests are allowed to include this internal -header, but your clients are not. This way, you can fully test your internal -implementation without leaking it to your clients. - -## Private Class Members ## - -Private class members are only accessible from within the class or by friends. -To access a class' private members, you can declare your test fixture as a -friend to the class and define accessors in your fixture. Tests using the -fixture can then access the private members of your production class via the -accessors in the fixture. Note that even though your fixture is a friend to -your production class, your tests are not automatically friends to it, as they -are technically defined in sub-classes of the fixture. - -Another way to test private members is to refactor them into an implementation -class, which is then declared in a `*-internal.h` file. Your clients aren't -allowed to include this header but your tests can. Such is called the Pimpl -(Private Implementation) idiom. - -Or, you can declare an individual test as a friend of your class by adding this -line in the class body: - -``` -FRIEND_TEST(TestCaseName, TestName); -``` - -For example, -``` -// foo.h -#include "gtest/gtest_prod.h" - -// Defines FRIEND_TEST. -class Foo { - ... - private: - FRIEND_TEST(FooTest, BarReturnsZeroOnNull); - int Bar(void* x); -}; - -// foo_test.cc -... -TEST(FooTest, BarReturnsZeroOnNull) { - Foo foo; - EXPECT_EQ(0, foo.Bar(NULL)); - // Uses Foo's private member Bar(). -} -``` - -Pay special attention when your class is defined in a namespace, as you should -define your test fixtures and tests in the same namespace if you want them to -be friends of your class. For example, if the code to be tested looks like: - -``` -namespace my_namespace { - -class Foo { - friend class FooTest; - FRIEND_TEST(FooTest, Bar); - FRIEND_TEST(FooTest, Baz); - ... - definition of the class Foo - ... -}; - -} // namespace my_namespace -``` - -Your test code should be something like: - -``` -namespace my_namespace { -class FooTest : public ::testing::Test { - protected: - ... -}; - -TEST_F(FooTest, Bar) { ... } -TEST_F(FooTest, Baz) { ... } - -} // namespace my_namespace -``` - -# Catching Failures # - -If you are building a testing utility on top of Google Test, you'll -want to test your utility. What framework would you use to test it? -Google Test, of course. - -The challenge is to verify that your testing utility reports failures -correctly. In frameworks that report a failure by throwing an -exception, you could catch the exception and assert on it. But Google -Test doesn't use exceptions, so how do we test that a piece of code -generates an expected failure? - -`"gtest/gtest-spi.h"` contains some constructs to do this. After -`#include`ing this header, you can use - -| `EXPECT_FATAL_FAILURE(`_statement, substring_`);` | -|:--------------------------------------------------| - -to assert that _statement_ generates a fatal (e.g. `ASSERT_*`) failure -whose message contains the given _substring_, or use - -| `EXPECT_NONFATAL_FAILURE(`_statement, substring_`);` | -|:-----------------------------------------------------| - -if you are expecting a non-fatal (e.g. `EXPECT_*`) failure. - -For technical reasons, there are some caveats: - - 1. You cannot stream a failure message to either macro. - 1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot reference local non-static variables or non-static members of `this` object. - 1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot return a value. - -_Note:_ Google Test is designed with threads in mind. Once the -synchronization primitives in `"gtest/internal/gtest-port.h"` have -been implemented, Google Test will become thread-safe, meaning that -you can then use assertions in multiple threads concurrently. Before - -that, however, Google Test only supports single-threaded usage. Once -thread-safe, `EXPECT_FATAL_FAILURE()` and `EXPECT_NONFATAL_FAILURE()` -will capture failures in the current thread only. If _statement_ -creates new threads, failures in these threads will be ignored. If -you want to capture failures from all threads instead, you should use -the following macros: - -| `EXPECT_FATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` | -|:-----------------------------------------------------------------| -| `EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` | - -# Getting the Current Test's Name # - -Sometimes a function may need to know the name of the currently running test. -For example, you may be using the `SetUp()` method of your test fixture to set -the golden file name based on which test is running. The `::testing::TestInfo` -class has this information: - -``` -namespace testing { - -class TestInfo { - public: - // Returns the test case name and the test name, respectively. - // - // Do NOT delete or free the return value - it's managed by the - // TestInfo class. - const char* test_case_name() const; - const char* name() const; -}; - -} // namespace testing -``` - - -> To obtain a `TestInfo` object for the currently running test, call -`current_test_info()` on the `UnitTest` singleton object: - -``` -// Gets information about the currently running test. -// Do NOT delete the returned object - it's managed by the UnitTest class. -const ::testing::TestInfo* const test_info = - ::testing::UnitTest::GetInstance()->current_test_info(); -printf("We are in test %s of test case %s.\n", - test_info->name(), test_info->test_case_name()); -``` - -`current_test_info()` returns a null pointer if no test is running. In -particular, you cannot find the test case name in `TestCaseSetUp()`, -`TestCaseTearDown()` (where you know the test case name implicitly), or -functions called from them. - -_Availability:_ Linux, Windows, Mac. - -# Extending Google Test by Handling Test Events # - -Google Test provides an event listener API to let you receive -notifications about the progress of a test program and test -failures. The events you can listen to include the start and end of -the test program, a test case, or a test method, among others. You may -use this API to augment or replace the standard console output, -replace the XML output, or provide a completely different form of -output, such as a GUI or a database. You can also use test events as -checkpoints to implement a resource leak checker, for example. - -_Availability:_ Linux, Windows, Mac; since v1.4.0. - -## Defining Event Listeners ## - -To define a event listener, you subclass either -[testing::TestEventListener](../include/gtest/gtest.h#L855) -or [testing::EmptyTestEventListener](../include/gtest/gtest.h#L905). -The former is an (abstract) interface, where each pure virtual method
-can be overridden to handle a test event (For example, when a test -starts, the `OnTestStart()` method will be called.). The latter provides -an empty implementation of all methods in the interface, such that a -subclass only needs to override the methods it cares about. - -When an event is fired, its context is passed to the handler function -as an argument. The following argument types are used: - * [UnitTest](../include/gtest/gtest.h#L1007) reflects the state of the entire test program, - * [TestCase](../include/gtest/gtest.h#L689) has information about a test case, which can contain one or more tests, - * [TestInfo](../include/gtest/gtest.h#L599) contains the state of a test, and - * [TestPartResult](../include/gtest/gtest-test-part.h#L42) represents the result of a test assertion. - -An event handler function can examine the argument it receives to find -out interesting information about the event and the test program's -state. Here's an example: - -``` - class MinimalistPrinter : public ::testing::EmptyTestEventListener { - // Called before a test starts. - virtual void OnTestStart(const ::testing::TestInfo& test_info) { - printf("*** Test %s.%s starting.\n", - test_info.test_case_name(), test_info.name()); - } - - // Called after a failed assertion or a SUCCEED() invocation. - virtual void OnTestPartResult( - const ::testing::TestPartResult& test_part_result) { - printf("%s in %s:%d\n%s\n", - test_part_result.failed() ? "*** Failure" : "Success", - test_part_result.file_name(), - test_part_result.line_number(), - test_part_result.summary()); - } - - // Called after a test ends. - virtual void OnTestEnd(const ::testing::TestInfo& test_info) { - printf("*** Test %s.%s ending.\n", - test_info.test_case_name(), test_info.name()); - } - }; -``` - -## Using Event Listeners ## - -To use the event listener you have defined, add an instance of it to -the Google Test event listener list (represented by class -[TestEventListeners](../include/gtest/gtest.h#L929) -- note the "s" at the end of the name) in your -`main()` function, before calling `RUN_ALL_TESTS()`: -``` -int main(int argc, char** argv) { - ::testing::InitGoogleTest(&argc, argv); - // Gets hold of the event listener list. - ::testing::TestEventListeners& listeners = - ::testing::UnitTest::GetInstance()->listeners(); - // Adds a listener to the end. Google Test takes the ownership. - listeners.Append(new MinimalistPrinter); - return RUN_ALL_TESTS(); -} -``` - -There's only one problem: the default test result printer is still in -effect, so its output will mingle with the output from your minimalist -printer. To suppress the default printer, just release it from the -event listener list and delete it. You can do so by adding one line: -``` - ... - delete listeners.Release(listeners.default_result_printer()); - listeners.Append(new MinimalistPrinter); - return RUN_ALL_TESTS(); -``` - -Now, sit back and enjoy a completely different output from your -tests. For more details, you can read this -[sample](../samples/sample9_unittest.cc). - -You may append more than one listener to the list. When an `On*Start()` -or `OnTestPartResult()` event is fired, the listeners will receive it in -the order they appear in the list (since new listeners are added to -the end of the list, the default text printer and the default XML -generator will receive the event first). An `On*End()` event will be -received by the listeners in the _reverse_ order. This allows output by -listeners added later to be framed by output from listeners added -earlier. - -## Generating Failures in Listeners ## - -You may use failure-raising macros (`EXPECT_*()`, `ASSERT_*()`, -`FAIL()`, etc) when processing an event. There are some restrictions: - - 1. You cannot generate any failure in `OnTestPartResult()` (otherwise it will cause `OnTestPartResult()` to be called recursively). - 1. A listener that handles `OnTestPartResult()` is not allowed to generate any failure. - -When you add listeners to the listener list, you should put listeners -that handle `OnTestPartResult()` _before_ listeners that can generate -failures. This ensures that failures generated by the latter are -attributed to the right test by the former. - -We have a sample of failure-raising listener -[here](../samples/sample10_unittest.cc). - -# Running Test Programs: Advanced Options # - -Google Test test programs are ordinary executables. Once built, you can run -them directly and affect their behavior via the following environment variables -and/or command line flags. For the flags to work, your programs must call -`::testing::InitGoogleTest()` before calling `RUN_ALL_TESTS()`. - -To see a list of supported flags and their usage, please run your test -program with the `--help` flag. You can also use `-h`, `-?`, or `/?` -for short. This feature is added in version 1.3.0. - -If an option is specified both by an environment variable and by a -flag, the latter takes precedence. Most of the options can also be -set/read in code: to access the value of command line flag -`--gtest_foo`, write `::testing::GTEST_FLAG(foo)`. A common pattern is -to set the value of a flag before calling `::testing::InitGoogleTest()` -to change the default value of the flag: -``` -int main(int argc, char** argv) { - // Disables elapsed time by default. - ::testing::GTEST_FLAG(print_time) = false; - - // This allows the user to override the flag on the command line. - ::testing::InitGoogleTest(&argc, argv); - - return RUN_ALL_TESTS(); -} -``` - -## Selecting Tests ## - -This section shows various options for choosing which tests to run. - -### Listing Test Names ### - -Sometimes it is necessary to list the available tests in a program before -running them so that a filter may be applied if needed. Including the flag -`--gtest_list_tests` overrides all other flags and lists tests in the following -format: -``` -TestCase1. - TestName1 - TestName2 -TestCase2. - TestName -``` - -None of the tests listed are actually run if the flag is provided. There is no -corresponding environment variable for this flag. - -_Availability:_ Linux, Windows, Mac. - -### Running a Subset of the Tests ### - -By default, a Google Test program runs all tests the user has defined. -Sometimes, you want to run only a subset of the tests (e.g. for debugging or -quickly verifying a change). If you set the `GTEST_FILTER` environment variable -or the `--gtest_filter` flag to a filter string, Google Test will only run the -tests whose full names (in the form of `TestCaseName.TestName`) match the -filter. - -The format of a filter is a '`:`'-separated list of wildcard patterns (called -the positive patterns) optionally followed by a '`-`' and another -'`:`'-separated pattern list (called the negative patterns). A test matches the -filter if and only if it matches any of the positive patterns but does not -match any of the negative patterns. - -A pattern may contain `'*'` (matches any string) or `'?'` (matches any single -character). For convenience, the filter `'*-NegativePatterns'` can be also -written as `'-NegativePatterns'`. - -For example: - - * `./foo_test` Has no flag, and thus runs all its tests. - * `./foo_test --gtest_filter=*` Also runs everything, due to the single match-everything `*` value. - * `./foo_test --gtest_filter=FooTest.*` Runs everything in test case `FooTest`. - * `./foo_test --gtest_filter=*Null*:*Constructor*` Runs any test whose full name contains either `"Null"` or `"Constructor"`. - * `./foo_test --gtest_filter=-*DeathTest.*` Runs all non-death tests. - * `./foo_test --gtest_filter=FooTest.*-FooTest.Bar` Runs everything in test case `FooTest` except `FooTest.Bar`. - -_Availability:_ Linux, Windows, Mac. - -### Temporarily Disabling Tests ### - -If you have a broken test that you cannot fix right away, you can add the -`DISABLED_` prefix to its name. This will exclude it from execution. This is -better than commenting out the code or using `#if 0`, as disabled tests are -still compiled (and thus won't rot). - -If you need to disable all tests in a test case, you can either add `DISABLED_` -to the front of the name of each test, or alternatively add it to the front of -the test case name. - -For example, the following tests won't be run by Google Test, even though they -will still be compiled: - -``` -// Tests that Foo does Abc. -TEST(FooTest, DISABLED_DoesAbc) { ... } - -class DISABLED_BarTest : public ::testing::Test { ... }; - -// Tests that Bar does Xyz. -TEST_F(DISABLED_BarTest, DoesXyz) { ... } -``` - -_Note:_ This feature should only be used for temporary pain-relief. You still -have to fix the disabled tests at a later date. As a reminder, Google Test will -print a banner warning you if a test program contains any disabled tests. - -_Tip:_ You can easily count the number of disabled tests you have -using `grep`. This number can be used as a metric for improving your -test quality. - -_Availability:_ Linux, Windows, Mac. - -### Temporarily Enabling Disabled Tests ### - -To include [disabled tests](#temporarily-disabling-tests) in test -execution, just invoke the test program with the -`--gtest_also_run_disabled_tests` flag or set the -`GTEST_ALSO_RUN_DISABLED_TESTS` environment variable to a value other -than `0`. You can combine this with the -[--gtest\_filter](#running-a-subset-of-the-tests) flag to further select -which disabled tests to run. - -_Availability:_ Linux, Windows, Mac; since version 1.3.0. - -## Repeating the Tests ## - -Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it -will fail only 1% of the time, making it rather hard to reproduce the bug under -a debugger. This can be a major source of frustration. - -The `--gtest_repeat` flag allows you to repeat all (or selected) test methods -in a program many times. Hopefully, a flaky test will eventually fail and give -you a chance to debug. Here's how to use it: - -| `$ foo_test --gtest_repeat=1000` | Repeat foo\_test 1000 times and don't stop at failures. | -|:---------------------------------|:--------------------------------------------------------| -| `$ foo_test --gtest_repeat=-1` | A negative count means repeating forever. | -| `$ foo_test --gtest_repeat=1000 --gtest_break_on_failure` | Repeat foo\_test 1000 times, stopping at the first failure. This is especially useful when running under a debugger: when the testfails, it will drop into the debugger and you can then inspect variables and stacks. | -| `$ foo_test --gtest_repeat=1000 --gtest_filter=FooBar` | Repeat the tests whose name matches the filter 1000 times. | - -If your test program contains global set-up/tear-down code registered -using `AddGlobalTestEnvironment()`, it will be repeated in each -iteration as well, as the flakiness may be in it. You can also specify -the repeat count by setting the `GTEST_REPEAT` environment variable. - -_Availability:_ Linux, Windows, Mac. - -## Shuffling the Tests ## - -You can specify the `--gtest_shuffle` flag (or set the `GTEST_SHUFFLE` -environment variable to `1`) to run the tests in a program in a random -order. This helps to reveal bad dependencies between tests. - -By default, Google Test uses a random seed calculated from the current -time. Therefore you'll get a different order every time. The console -output includes the random seed value, such that you can reproduce an -order-related test failure later. To specify the random seed -explicitly, use the `--gtest_random_seed=SEED` flag (or set the -`GTEST_RANDOM_SEED` environment variable), where `SEED` is an integer -between 0 and 99999. The seed value 0 is special: it tells Google Test -to do the default behavior of calculating the seed from the current -time. - -If you combine this with `--gtest_repeat=N`, Google Test will pick a -different random seed and re-shuffle the tests in each iteration. - -_Availability:_ Linux, Windows, Mac; since v1.4.0. - -## Controlling Test Output ## - -This section teaches how to tweak the way test results are reported. - -### Colored Terminal Output ### - -Google Test can use colors in its terminal output to make it easier to spot -the separation between tests, and whether tests passed. - -You can set the GTEST\_COLOR environment variable or set the `--gtest_color` -command line flag to `yes`, `no`, or `auto` (the default) to enable colors, -disable colors, or let Google Test decide. When the value is `auto`, Google -Test will use colors if and only if the output goes to a terminal and (on -non-Windows platforms) the `TERM` environment variable is set to `xterm` or -`xterm-color`. - -_Availability:_ Linux, Windows, Mac. - -### Suppressing the Elapsed Time ### - -By default, Google Test prints the time it takes to run each test. To -suppress that, run the test program with the `--gtest_print_time=0` -command line flag. Setting the `GTEST_PRINT_TIME` environment -variable to `0` has the same effect. - -_Availability:_ Linux, Windows, Mac. (In Google Test 1.3.0 and lower, -the default behavior is that the elapsed time is **not** printed.) - -### Generating an XML Report ### - -Google Test can emit a detailed XML report to a file in addition to its normal -textual output. The report contains the duration of each test, and thus can -help you identify slow tests. - -To generate the XML report, set the `GTEST_OUTPUT` environment variable or the -`--gtest_output` flag to the string `"xml:_path_to_output_file_"`, which will -create the file at the given location. You can also just use the string -`"xml"`, in which case the output can be found in the `test_detail.xml` file in -the current directory. - -If you specify a directory (for example, `"xml:output/directory/"` on Linux or -`"xml:output\directory\"` on Windows), Google Test will create the XML file in -that directory, named after the test executable (e.g. `foo_test.xml` for test -program `foo_test` or `foo_test.exe`). If the file already exists (perhaps left -over from a previous run), Google Test will pick a different name (e.g. -`foo_test_1.xml`) to avoid overwriting it. - -The report uses the format described here. It is based on the -`junitreport` Ant task and can be parsed by popular continuous build -systems like [Jenkins](http://jenkins-ci.org/). Since that format -was originally intended for Java, a little interpretation is required -to make it apply to Google Test tests, as shown here: - -``` - - - - - - - - - -``` - - * The root `` element corresponds to the entire test program. - * `` elements correspond to Google Test test cases. - * `` elements correspond to Google Test test functions. - -For instance, the following program - -``` -TEST(MathTest, Addition) { ... } -TEST(MathTest, Subtraction) { ... } -TEST(LogicTest, NonContradiction) { ... } -``` - -could generate this report: - -``` - - - - - - - - - - - - - - - -``` - -Things to note: - - * The `tests` attribute of a `` or `` element tells how many test functions the Google Test program or test case contains, while the `failures` attribute tells how many of them failed. - * The `time` attribute expresses the duration of the test, test case, or entire test program in milliseconds. - * Each `` element corresponds to a single failed Google Test assertion. - * Some JUnit concepts don't apply to Google Test, yet we have to conform to the DTD. Therefore you'll see some dummy elements and attributes in the report. You can safely ignore these parts. - -_Availability:_ Linux, Windows, Mac. - -## Controlling How Failures Are Reported ## - -### Turning Assertion Failures into Break-Points ### - -When running test programs under a debugger, it's very convenient if the -debugger can catch an assertion failure and automatically drop into interactive -mode. Google Test's _break-on-failure_ mode supports this behavior. - -To enable it, set the `GTEST_BREAK_ON_FAILURE` environment variable to a value -other than `0` . Alternatively, you can use the `--gtest_break_on_failure` -command line flag. - -_Availability:_ Linux, Windows, Mac. - -### Disabling Catching Test-Thrown Exceptions ### - -Google Test can be used either with or without exceptions enabled. If -a test throws a C++ exception or (on Windows) a structured exception -(SEH), by default Google Test catches it, reports it as a test -failure, and continues with the next test method. This maximizes the -coverage of a test run. Also, on Windows an uncaught exception will -cause a pop-up window, so catching the exceptions allows you to run -the tests automatically. - -When debugging the test failures, however, you may instead want the -exceptions to be handled by the debugger, such that you can examine -the call stack when an exception is thrown. To achieve that, set the -`GTEST_CATCH_EXCEPTIONS` environment variable to `0`, or use the -`--gtest_catch_exceptions=0` flag when running the tests. - -**Availability**: Linux, Windows, Mac. - -### Letting Another Testing Framework Drive ### - -If you work on a project that has already been using another testing -framework and is not ready to completely switch to Google Test yet, -you can get much of Google Test's benefit by using its assertions in -your existing tests. Just change your `main()` function to look -like: - -``` -#include "gtest/gtest.h" - -int main(int argc, char** argv) { - ::testing::GTEST_FLAG(throw_on_failure) = true; - // Important: Google Test must be initialized. - ::testing::InitGoogleTest(&argc, argv); - - ... whatever your existing testing framework requires ... -} -``` - -With that, you can use Google Test assertions in addition to the -native assertions your testing framework provides, for example: - -``` -void TestFooDoesBar() { - Foo foo; - EXPECT_LE(foo.Bar(1), 100); // A Google Test assertion. - CPPUNIT_ASSERT(foo.IsEmpty()); // A native assertion. -} -``` - -If a Google Test assertion fails, it will print an error message and -throw an exception, which will be treated as a failure by your host -testing framework. If you compile your code with exceptions disabled, -a failed Google Test assertion will instead exit your program with a -non-zero code, which will also signal a test failure to your test -runner. - -If you don't write `::testing::GTEST_FLAG(throw_on_failure) = true;` in -your `main()`, you can alternatively enable this feature by specifying -the `--gtest_throw_on_failure` flag on the command-line or setting the -`GTEST_THROW_ON_FAILURE` environment variable to a non-zero value. - -Death tests are _not_ supported when other test framework is used to organize tests. - -_Availability:_ Linux, Windows, Mac; since v1.3.0. - -## Distributing Test Functions to Multiple Machines ## - -If you have more than one machine you can use to run a test program, -you might want to run the test functions in parallel and get the -result faster. We call this technique _sharding_, where each machine -is called a _shard_. - -Google Test is compatible with test sharding. To take advantage of -this feature, your test runner (not part of Google Test) needs to do -the following: - - 1. Allocate a number of machines (shards) to run the tests. - 1. On each shard, set the `GTEST_TOTAL_SHARDS` environment variable to the total number of shards. It must be the same for all shards. - 1. On each shard, set the `GTEST_SHARD_INDEX` environment variable to the index of the shard. Different shards must be assigned different indices, which must be in the range `[0, GTEST_TOTAL_SHARDS - 1]`. - 1. Run the same test program on all shards. When Google Test sees the above two environment variables, it will select a subset of the test functions to run. Across all shards, each test function in the program will be run exactly once. - 1. Wait for all shards to finish, then collect and report the results. - -Your project may have tests that were written without Google Test and -thus don't understand this protocol. In order for your test runner to -figure out which test supports sharding, it can set the environment -variable `GTEST_SHARD_STATUS_FILE` to a non-existent file path. If a -test program supports sharding, it will create this file to -acknowledge the fact (the actual contents of the file are not -important at this time; although we may stick some useful information -in it in the future.); otherwise it will not create it. - -Here's an example to make it clear. Suppose you have a test program -`foo_test` that contains the following 5 test functions: -``` -TEST(A, V) -TEST(A, W) -TEST(B, X) -TEST(B, Y) -TEST(B, Z) -``` -and you have 3 machines at your disposal. To run the test functions in -parallel, you would set `GTEST_TOTAL_SHARDS` to 3 on all machines, and -set `GTEST_SHARD_INDEX` to 0, 1, and 2 on the machines respectively. -Then you would run the same `foo_test` on each machine. - -Google Test reserves the right to change how the work is distributed -across the shards, but here's one possible scenario: - - * Machine #0 runs `A.V` and `B.X`. - * Machine #1 runs `A.W` and `B.Y`. - * Machine #2 runs `B.Z`. - -_Availability:_ Linux, Windows, Mac; since version 1.3.0. - -# Fusing Google Test Source Files # - -Google Test's implementation consists of ~30 files (excluding its own -tests). Sometimes you may want them to be packaged up in two files (a -`.h` and a `.cc`) instead, such that you can easily copy them to a new -machine and start hacking there. For this we provide an experimental -Python script `fuse_gtest_files.py` in the `scripts/` directory (since release 1.3.0). -Assuming you have Python 2.4 or above installed on your machine, just -go to that directory and run -``` -python fuse_gtest_files.py OUTPUT_DIR -``` - -and you should see an `OUTPUT_DIR` directory being created with files -`gtest/gtest.h` and `gtest/gtest-all.cc` in it. These files contain -everything you need to use Google Test. Just copy them to anywhere -you want and you are ready to write tests. You can use the -[scripts/test/Makefile](../scripts/test/Makefile) -file as an example on how to compile your tests against them. - -# Where to Go from Here # - -Congratulations! You've now learned more advanced Google Test tools and are -ready to tackle more complex testing tasks. If you want to dive even deeper, you -can read the [Frequently-Asked Questions](V1_7_FAQ.md). diff --git a/test/gtest-1.8.0/docs/V1_7_Documentation.md b/test/gtest-1.8.0/docs/V1_7_Documentation.md deleted file mode 100644 index 282697a50b..0000000000 --- a/test/gtest-1.8.0/docs/V1_7_Documentation.md +++ /dev/null @@ -1,14 +0,0 @@ -This page lists all documentation wiki pages for Google Test **(the SVN trunk version)** --- **if you use a released version of Google Test, please read the -documentation for that specific version instead.** - - * [Primer](V1_7_Primer.md) -- start here if you are new to Google Test. - * [Samples](V1_7_Samples.md) -- learn from examples. - * [AdvancedGuide](V1_7_AdvancedGuide.md) -- learn more about Google Test. - * [XcodeGuide](V1_7_XcodeGuide.md) -- how to use Google Test in Xcode on Mac. - * [Frequently-Asked Questions](V1_7_FAQ.md) -- check here before asking a question on the mailing list. - -To contribute code to Google Test, read: - - * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch. - * [PumpManual](V1_7_PumpManual.md) -- how we generate some of Google Test's source files. \ No newline at end of file diff --git a/test/gtest-1.8.0/docs/V1_7_FAQ.md b/test/gtest-1.8.0/docs/V1_7_FAQ.md deleted file mode 100644 index 3dd914dcf1..0000000000 --- a/test/gtest-1.8.0/docs/V1_7_FAQ.md +++ /dev/null @@ -1,1082 +0,0 @@ - - -If you cannot find the answer to your question here, and you have read -[Primer](V1_7_Primer.md) and [AdvancedGuide](V1_7_AdvancedGuide.md), send it to -googletestframework@googlegroups.com. - -## Why should I use Google Test instead of my favorite C++ testing framework? ## - -First, let us say clearly that we don't want to get into the debate of -which C++ testing framework is **the best**. There exist many fine -frameworks for writing C++ tests, and we have tremendous respect for -the developers and users of them. We don't think there is (or will -be) a single best framework - you have to pick the right tool for the -particular task you are tackling. - -We created Google Test because we couldn't find the right combination -of features and conveniences in an existing framework to satisfy _our_ -needs. The following is a list of things that _we_ like about Google -Test. We don't claim them to be unique to Google Test - rather, the -combination of them makes Google Test the choice for us. We hope this -list can help you decide whether it is for you too. - - * Google Test is designed to be portable: it doesn't require exceptions or RTTI; it works around various bugs in various compilers and environments; etc. As a result, it works on Linux, Mac OS X, Windows and several embedded operating systems. - * Nonfatal assertions (`EXPECT_*`) have proven to be great time savers, as they allow a test to report multiple failures in a single edit-compile-test cycle. - * It's easy to write assertions that generate informative messages: you just use the stream syntax to append any additional information, e.g. `ASSERT_EQ(5, Foo(i)) << " where i = " << i;`. It doesn't require a new set of macros or special functions. - * Google Test automatically detects your tests and doesn't require you to enumerate them in order to run them. - * Death tests are pretty handy for ensuring that your asserts in production code are triggered by the right conditions. - * `SCOPED_TRACE` helps you understand the context of an assertion failure when it comes from inside a sub-routine or loop. - * You can decide which tests to run using name patterns. This saves time when you want to quickly reproduce a test failure. - * Google Test can generate XML test result reports that can be parsed by popular continuous build system like Hudson. - * Simple things are easy in Google Test, while hard things are possible: in addition to advanced features like [global test environments](V1_7_AdvancedGuide.md#global-set-up-and-tear-down) and tests parameterized by [values](V1_7_AdvancedGuide.md#value-parameterized-tests) or [types](V1_7_AdvancedGuide.md#typed-tests), Google Test supports various ways for the user to extend the framework -- if Google Test doesn't do something out of the box, chances are that a user can implement the feature using Google Test's public API, without changing Google Test itself. In particular, you can: - * expand your testing vocabulary by defining [custom predicates](V1_7_AdvancedGuide.md#predicate-assertions-for-better-error-messages), - * teach Google Test how to [print your types](V1_7_AdvancedGuide.md#teaching-google-test-how-to-print-your-values), - * define your own testing macros or utilities and verify them using Google Test's [Service Provider Interface](V1_7_AdvancedGuide.md#catching-failures), and - * reflect on the test cases or change the test output format by intercepting the [test events](V1_7_AdvancedGuide.md#extending-google-test-by-handling-test-events). - -## I'm getting warnings when compiling Google Test. Would you fix them? ## - -We strive to minimize compiler warnings Google Test generates. Before releasing a new version, we test to make sure that it doesn't generate warnings when compiled using its CMake script on Windows, Linux, and Mac OS. - -Unfortunately, this doesn't mean you are guaranteed to see no warnings when compiling Google Test in your environment: - - * You may be using a different compiler as we use, or a different version of the same compiler. We cannot possibly test for all compilers. - * You may be compiling on a different platform as we do. - * Your project may be using different compiler flags as we do. - -It is not always possible to make Google Test warning-free for everyone. Or, it may not be desirable if the warning is rarely enabled and fixing the violations makes the code more complex. - -If you see warnings when compiling Google Test, we suggest that you use the `-isystem` flag (assuming your are using GCC) to mark Google Test headers as system headers. That'll suppress warnings from Google Test headers. - -## Why should not test case names and test names contain underscore? ## - -Underscore (`_`) is special, as C++ reserves the following to be used by -the compiler and the standard library: - - 1. any identifier that starts with an `_` followed by an upper-case letter, and - 1. any identifier that containers two consecutive underscores (i.e. `__`) _anywhere_ in its name. - -User code is _prohibited_ from using such identifiers. - -Now let's look at what this means for `TEST` and `TEST_F`. - -Currently `TEST(TestCaseName, TestName)` generates a class named -`TestCaseName_TestName_Test`. What happens if `TestCaseName` or `TestName` -contains `_`? - - 1. If `TestCaseName` starts with an `_` followed by an upper-case letter (say, `_Foo`), we end up with `_Foo_TestName_Test`, which is reserved and thus invalid. - 1. If `TestCaseName` ends with an `_` (say, `Foo_`), we get `Foo__TestName_Test`, which is invalid. - 1. If `TestName` starts with an `_` (say, `_Bar`), we get `TestCaseName__Bar_Test`, which is invalid. - 1. If `TestName` ends with an `_` (say, `Bar_`), we get `TestCaseName_Bar__Test`, which is invalid. - -So clearly `TestCaseName` and `TestName` cannot start or end with `_` -(Actually, `TestCaseName` can start with `_` -- as long as the `_` isn't -followed by an upper-case letter. But that's getting complicated. So -for simplicity we just say that it cannot start with `_`.). - -It may seem fine for `TestCaseName` and `TestName` to contain `_` in the -middle. However, consider this: -``` -TEST(Time, Flies_Like_An_Arrow) { ... } -TEST(Time_Flies, Like_An_Arrow) { ... } -``` - -Now, the two `TEST`s will both generate the same class -(`Time_Files_Like_An_Arrow_Test`). That's not good. - -So for simplicity, we just ask the users to avoid `_` in `TestCaseName` -and `TestName`. The rule is more constraining than necessary, but it's -simple and easy to remember. It also gives Google Test some wiggle -room in case its implementation needs to change in the future. - -If you violate the rule, there may not be immediately consequences, -but your test may (just may) break with a new compiler (or a new -version of the compiler you are using) or with a new version of Google -Test. Therefore it's best to follow the rule. - -## Why is it not recommended to install a pre-compiled copy of Google Test (for example, into /usr/local)? ## - -In the early days, we said that you could install -compiled Google Test libraries on `*`nix systems using `make install`. -Then every user of your machine can write tests without -recompiling Google Test. - -This seemed like a good idea, but it has a -got-cha: every user needs to compile his tests using the _same_ compiler -flags used to compile the installed Google Test libraries; otherwise -he may run into undefined behaviors (i.e. the tests can behave -strangely and may even crash for no obvious reasons). - -Why? Because C++ has this thing called the One-Definition Rule: if -two C++ source files contain different definitions of the same -class/function/variable, and you link them together, you violate the -rule. The linker may or may not catch the error (in many cases it's -not required by the C++ standard to catch the violation). If it -doesn't, you get strange run-time behaviors that are unexpected and -hard to debug. - -If you compile Google Test and your test code using different compiler -flags, they may see different definitions of the same -class/function/variable (e.g. due to the use of `#if` in Google Test). -Therefore, for your sanity, we recommend to avoid installing pre-compiled -Google Test libraries. Instead, each project should compile -Google Test itself such that it can be sure that the same flags are -used for both Google Test and the tests. - -## How do I generate 64-bit binaries on Windows (using Visual Studio 2008)? ## - -(Answered by Trevor Robinson) - -Load the supplied Visual Studio solution file, either `msvc\gtest-md.sln` or -`msvc\gtest.sln`. Go through the migration wizard to migrate the -solution and project files to Visual Studio 2008. Select -`Configuration Manager...` from the `Build` menu. Select `` from -the `Active solution platform` dropdown. Select `x64` from the new -platform dropdown, leave `Copy settings from` set to `Win32` and -`Create new project platforms` checked, then click `OK`. You now have -`Win32` and `x64` platform configurations, selectable from the -`Standard` toolbar, which allow you to toggle between building 32-bit or -64-bit binaries (or both at once using Batch Build). - -In order to prevent build output files from overwriting one another, -you'll need to change the `Intermediate Directory` settings for the -newly created platform configuration across all the projects. To do -this, multi-select (e.g. using shift-click) all projects (but not the -solution) in the `Solution Explorer`. Right-click one of them and -select `Properties`. In the left pane, select `Configuration Properties`, -and from the `Configuration` dropdown, select `All Configurations`. -Make sure the selected platform is `x64`. For the -`Intermediate Directory` setting, change the value from -`$(PlatformName)\$(ConfigurationName)` to -`$(OutDir)\$(ProjectName)`. Click `OK` and then build the -solution. When the build is complete, the 64-bit binaries will be in -the `msvc\x64\Debug` directory. - -## Can I use Google Test on MinGW? ## - -We haven't tested this ourselves, but Per Abrahamsen reported that he -was able to compile and install Google Test successfully when using -MinGW from Cygwin. You'll need to configure it with: - -`PATH/TO/configure CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin"` - -You should be able to replace the `-mno-cygwin` option with direct links -to the real MinGW binaries, but we haven't tried that. - -Caveats: - - * There are many warnings when compiling. - * `make check` will produce some errors as not all tests for Google Test itself are compatible with MinGW. - -We also have reports on successful cross compilation of Google Test -MinGW binaries on Linux using -[these instructions](http://wiki.wxwidgets.org/Cross-Compiling_Under_Linux#Cross-compiling_under_Linux_for_MS_Windows) -on the WxWidgets site. - -Please contact `googletestframework@googlegroups.com` if you are -interested in improving the support for MinGW. - -## Why does Google Test support EXPECT\_EQ(NULL, ptr) and ASSERT\_EQ(NULL, ptr) but not EXPECT\_NE(NULL, ptr) and ASSERT\_NE(NULL, ptr)? ## - -Due to some peculiarity of C++, it requires some non-trivial template -meta programming tricks to support using `NULL` as an argument of the -`EXPECT_XX()` and `ASSERT_XX()` macros. Therefore we only do it where -it's most needed (otherwise we make the implementation of Google Test -harder to maintain and more error-prone than necessary). - -The `EXPECT_EQ()` macro takes the _expected_ value as its first -argument and the _actual_ value as the second. It's reasonable that -someone wants to write `EXPECT_EQ(NULL, some_expression)`, and this -indeed was requested several times. Therefore we implemented it. - -The need for `EXPECT_NE(NULL, ptr)` isn't nearly as strong. When the -assertion fails, you already know that `ptr` must be `NULL`, so it -doesn't add any information to print ptr in this case. That means -`EXPECT_TRUE(ptr != NULL)` works just as well. - -If we were to support `EXPECT_NE(NULL, ptr)`, for consistency we'll -have to support `EXPECT_NE(ptr, NULL)` as well, as unlike `EXPECT_EQ`, -we don't have a convention on the order of the two arguments for -`EXPECT_NE`. This means using the template meta programming tricks -twice in the implementation, making it even harder to understand and -maintain. We believe the benefit doesn't justify the cost. - -Finally, with the growth of Google Mock's [matcher](../../CookBook.md#using-matchers-in-google-test-assertions) library, we are -encouraging people to use the unified `EXPECT_THAT(value, matcher)` -syntax more often in tests. One significant advantage of the matcher -approach is that matchers can be easily combined to form new matchers, -while the `EXPECT_NE`, etc, macros cannot be easily -combined. Therefore we want to invest more in the matchers than in the -`EXPECT_XX()` macros. - -## Does Google Test support running tests in parallel? ## - -Test runners tend to be tightly coupled with the build/test -environment, and Google Test doesn't try to solve the problem of -running tests in parallel. Instead, we tried to make Google Test work -nicely with test runners. For example, Google Test's XML report -contains the time spent on each test, and its `gtest_list_tests` and -`gtest_filter` flags can be used for splitting the execution of test -methods into multiple processes. These functionalities can help the -test runner run the tests in parallel. - -## Why don't Google Test run the tests in different threads to speed things up? ## - -It's difficult to write thread-safe code. Most tests are not written -with thread-safety in mind, and thus may not work correctly in a -multi-threaded setting. - -If you think about it, it's already hard to make your code work when -you know what other threads are doing. It's much harder, and -sometimes even impossible, to make your code work when you don't know -what other threads are doing (remember that test methods can be added, -deleted, or modified after your test was written). If you want to run -the tests in parallel, you'd better run them in different processes. - -## Why aren't Google Test assertions implemented using exceptions? ## - -Our original motivation was to be able to use Google Test in projects -that disable exceptions. Later we realized some additional benefits -of this approach: - - 1. Throwing in a destructor is undefined behavior in C++. Not using exceptions means Google Test's assertions are safe to use in destructors. - 1. The `EXPECT_*` family of macros will continue even after a failure, allowing multiple failures in a `TEST` to be reported in a single run. This is a popular feature, as in C++ the edit-compile-test cycle is usually quite long and being able to fixing more than one thing at a time is a blessing. - 1. If assertions are implemented using exceptions, a test may falsely ignore a failure if it's caught by user code: -``` -try { ... ASSERT_TRUE(...) ... } -catch (...) { ... } -``` -The above code will pass even if the `ASSERT_TRUE` throws. While it's unlikely for someone to write this in a test, it's possible to run into this pattern when you write assertions in callbacks that are called by the code under test. - -The downside of not using exceptions is that `ASSERT_*` (implemented -using `return`) will only abort the current function, not the current -`TEST`. - -## Why do we use two different macros for tests with and without fixtures? ## - -Unfortunately, C++'s macro system doesn't allow us to use the same -macro for both cases. One possibility is to provide only one macro -for tests with fixtures, and require the user to define an empty -fixture sometimes: - -``` -class FooTest : public ::testing::Test {}; - -TEST_F(FooTest, DoesThis) { ... } -``` -or -``` -typedef ::testing::Test FooTest; - -TEST_F(FooTest, DoesThat) { ... } -``` - -Yet, many people think this is one line too many. :-) Our goal was to -make it really easy to write tests, so we tried to make simple tests -trivial to create. That means using a separate macro for such tests. - -We think neither approach is ideal, yet either of them is reasonable. -In the end, it probably doesn't matter much either way. - -## Why don't we use structs as test fixtures? ## - -We like to use structs only when representing passive data. This -distinction between structs and classes is good for documenting the -intent of the code's author. Since test fixtures have logic like -`SetUp()` and `TearDown()`, they are better defined as classes. - -## Why are death tests implemented as assertions instead of using a test runner? ## - -Our goal was to make death tests as convenient for a user as C++ -possibly allows. In particular: - - * The runner-style requires to split the information into two pieces: the definition of the death test itself, and the specification for the runner on how to run the death test and what to expect. The death test would be written in C++, while the runner spec may or may not be. A user needs to carefully keep the two in sync. `ASSERT_DEATH(statement, expected_message)` specifies all necessary information in one place, in one language, without boilerplate code. It is very declarative. - * `ASSERT_DEATH` has a similar syntax and error-reporting semantics as other Google Test assertions, and thus is easy to learn. - * `ASSERT_DEATH` can be mixed with other assertions and other logic at your will. You are not limited to one death test per test method. For example, you can write something like: -``` - if (FooCondition()) { - ASSERT_DEATH(Bar(), "blah"); - } else { - ASSERT_EQ(5, Bar()); - } -``` -If you prefer one death test per test method, you can write your tests in that style too, but we don't want to impose that on the users. The fewer artificial limitations the better. - * `ASSERT_DEATH` can reference local variables in the current function, and you can decide how many death tests you want based on run-time information. For example, -``` - const int count = GetCount(); // Only known at run time. - for (int i = 1; i <= count; i++) { - ASSERT_DEATH({ - double* buffer = new double[i]; - ... initializes buffer ... - Foo(buffer, i) - }, "blah blah"); - } -``` -The runner-based approach tends to be more static and less flexible, or requires more user effort to get this kind of flexibility. - -Another interesting thing about `ASSERT_DEATH` is that it calls `fork()` -to create a child process to run the death test. This is lightening -fast, as `fork()` uses copy-on-write pages and incurs almost zero -overhead, and the child process starts from the user-supplied -statement directly, skipping all global and local initialization and -any code leading to the given statement. If you launch the child -process from scratch, it can take seconds just to load everything and -start running if the test links to many libraries dynamically. - -## My death test modifies some state, but the change seems lost after the death test finishes. Why? ## - -Death tests (`EXPECT_DEATH`, etc) are executed in a sub-process s.t. the -expected crash won't kill the test program (i.e. the parent process). As a -result, any in-memory side effects they incur are observable in their -respective sub-processes, but not in the parent process. You can think of them -as running in a parallel universe, more or less. - -## The compiler complains about "undefined references" to some static const member variables, but I did define them in the class body. What's wrong? ## - -If your class has a static data member: - -``` -// foo.h -class Foo { - ... - static const int kBar = 100; -}; -``` - -You also need to define it _outside_ of the class body in `foo.cc`: - -``` -const int Foo::kBar; // No initializer here. -``` - -Otherwise your code is **invalid C++**, and may break in unexpected ways. In -particular, using it in Google Test comparison assertions (`EXPECT_EQ`, etc) -will generate an "undefined reference" linker error. - -## I have an interface that has several implementations. Can I write a set of tests once and repeat them over all the implementations? ## - -Google Test doesn't yet have good support for this kind of tests, or -data-driven tests in general. We hope to be able to make improvements in this -area soon. - -## Can I derive a test fixture from another? ## - -Yes. - -Each test fixture has a corresponding and same named test case. This means only -one test case can use a particular fixture. Sometimes, however, multiple test -cases may want to use the same or slightly different fixtures. For example, you -may want to make sure that all of a GUI library's test cases don't leak -important system resources like fonts and brushes. - -In Google Test, you share a fixture among test cases by putting the shared -logic in a base test fixture, then deriving from that base a separate fixture -for each test case that wants to use this common logic. You then use `TEST_F()` -to write tests using each derived fixture. - -Typically, your code looks like this: - -``` -// Defines a base test fixture. -class BaseTest : public ::testing::Test { - protected: - ... -}; - -// Derives a fixture FooTest from BaseTest. -class FooTest : public BaseTest { - protected: - virtual void SetUp() { - BaseTest::SetUp(); // Sets up the base fixture first. - ... additional set-up work ... - } - virtual void TearDown() { - ... clean-up work for FooTest ... - BaseTest::TearDown(); // Remember to tear down the base fixture - // after cleaning up FooTest! - } - ... functions and variables for FooTest ... -}; - -// Tests that use the fixture FooTest. -TEST_F(FooTest, Bar) { ... } -TEST_F(FooTest, Baz) { ... } - -... additional fixtures derived from BaseTest ... -``` - -If necessary, you can continue to derive test fixtures from a derived fixture. -Google Test has no limit on how deep the hierarchy can be. - -For a complete example using derived test fixtures, see -[sample5](../samples/sample5_unittest.cc). - -## My compiler complains "void value not ignored as it ought to be." What does this mean? ## - -You're probably using an `ASSERT_*()` in a function that doesn't return `void`. -`ASSERT_*()` can only be used in `void` functions. - -## My death test hangs (or seg-faults). How do I fix it? ## - -In Google Test, death tests are run in a child process and the way they work is -delicate. To write death tests you really need to understand how they work. -Please make sure you have read this. - -In particular, death tests don't like having multiple threads in the parent -process. So the first thing you can try is to eliminate creating threads -outside of `EXPECT_DEATH()`. - -Sometimes this is impossible as some library you must use may be creating -threads before `main()` is even reached. In this case, you can try to minimize -the chance of conflicts by either moving as many activities as possible inside -`EXPECT_DEATH()` (in the extreme case, you want to move everything inside), or -leaving as few things as possible in it. Also, you can try to set the death -test style to `"threadsafe"`, which is safer but slower, and see if it helps. - -If you go with thread-safe death tests, remember that they rerun the test -program from the beginning in the child process. Therefore make sure your -program can run side-by-side with itself and is deterministic. - -In the end, this boils down to good concurrent programming. You have to make -sure that there is no race conditions or dead locks in your program. No silver -bullet - sorry! - -## Should I use the constructor/destructor of the test fixture or the set-up/tear-down function? ## - -The first thing to remember is that Google Test does not reuse the -same test fixture object across multiple tests. For each `TEST_F`, -Google Test will create a fresh test fixture object, _immediately_ -call `SetUp()`, run the test, call `TearDown()`, and then -_immediately_ delete the test fixture object. Therefore, there is no -need to write a `SetUp()` or `TearDown()` function if the constructor -or destructor already does the job. - -You may still want to use `SetUp()/TearDown()` in the following cases: - * If the tear-down operation could throw an exception, you must use `TearDown()` as opposed to the destructor, as throwing in a destructor leads to undefined behavior and usually will kill your program right away. Note that many standard libraries (like STL) may throw when exceptions are enabled in the compiler. Therefore you should prefer `TearDown()` if you want to write portable tests that work with or without exceptions. - * The assertion macros throw an exception when flag `--gtest_throw_on_failure` is specified. Therefore, you shouldn't use Google Test assertions in a destructor if you plan to run your tests with this flag. - * In a constructor or destructor, you cannot make a virtual function call on this object. (You can call a method declared as virtual, but it will be statically bound.) Therefore, if you need to call a method that will be overriden in a derived class, you have to use `SetUp()/TearDown()`. - -## The compiler complains "no matching function to call" when I use ASSERT\_PREDn. How do I fix it? ## - -If the predicate function you use in `ASSERT_PRED*` or `EXPECT_PRED*` is -overloaded or a template, the compiler will have trouble figuring out which -overloaded version it should use. `ASSERT_PRED_FORMAT*` and -`EXPECT_PRED_FORMAT*` don't have this problem. - -If you see this error, you might want to switch to -`(ASSERT|EXPECT)_PRED_FORMAT*`, which will also give you a better failure -message. If, however, that is not an option, you can resolve the problem by -explicitly telling the compiler which version to pick. - -For example, suppose you have - -``` -bool IsPositive(int n) { - return n > 0; -} -bool IsPositive(double x) { - return x > 0; -} -``` - -you will get a compiler error if you write - -``` -EXPECT_PRED1(IsPositive, 5); -``` - -However, this will work: - -``` -EXPECT_PRED1(*static_cast*(IsPositive), 5); -``` - -(The stuff inside the angled brackets for the `static_cast` operator is the -type of the function pointer for the `int`-version of `IsPositive()`.) - -As another example, when you have a template function - -``` -template -bool IsNegative(T x) { - return x < 0; -} -``` - -you can use it in a predicate assertion like this: - -``` -ASSERT_PRED1(IsNegative**, -5); -``` - -Things are more interesting if your template has more than one parameters. The -following won't compile: - -``` -ASSERT_PRED2(*GreaterThan*, 5, 0); -``` - - -as the C++ pre-processor thinks you are giving `ASSERT_PRED2` 4 arguments, -which is one more than expected. The workaround is to wrap the predicate -function in parentheses: - -``` -ASSERT_PRED2(*(GreaterThan)*, 5, 0); -``` - - -## My compiler complains about "ignoring return value" when I call RUN\_ALL\_TESTS(). Why? ## - -Some people had been ignoring the return value of `RUN_ALL_TESTS()`. That is, -instead of - -``` -return RUN_ALL_TESTS(); -``` - -they write - -``` -RUN_ALL_TESTS(); -``` - -This is wrong and dangerous. A test runner needs to see the return value of -`RUN_ALL_TESTS()` in order to determine if a test has passed. If your `main()` -function ignores it, your test will be considered successful even if it has a -Google Test assertion failure. Very bad. - -To help the users avoid this dangerous bug, the implementation of -`RUN_ALL_TESTS()` causes gcc to raise this warning, when the return value is -ignored. If you see this warning, the fix is simple: just make sure its value -is used as the return value of `main()`. - -## My compiler complains that a constructor (or destructor) cannot return a value. What's going on? ## - -Due to a peculiarity of C++, in order to support the syntax for streaming -messages to an `ASSERT_*`, e.g. - -``` -ASSERT_EQ(1, Foo()) << "blah blah" << foo; -``` - -we had to give up using `ASSERT*` and `FAIL*` (but not `EXPECT*` and -`ADD_FAILURE*`) in constructors and destructors. The workaround is to move the -content of your constructor/destructor to a private void member function, or -switch to `EXPECT_*()` if that works. This section in the user's guide explains -it. - -## My set-up function is not called. Why? ## - -C++ is case-sensitive. It should be spelled as `SetUp()`. Did you -spell it as `Setup()`? - -Similarly, sometimes people spell `SetUpTestCase()` as `SetupTestCase()` and -wonder why it's never called. - -## How do I jump to the line of a failure in Emacs directly? ## - -Google Test's failure message format is understood by Emacs and many other -IDEs, like acme and XCode. If a Google Test message is in a compilation buffer -in Emacs, then it's clickable. You can now hit `enter` on a message to jump to -the corresponding source code, or use `C-x `` to jump to the next failure. - -## I have several test cases which share the same test fixture logic, do I have to define a new test fixture class for each of them? This seems pretty tedious. ## - -You don't have to. Instead of - -``` -class FooTest : public BaseTest {}; - -TEST_F(FooTest, Abc) { ... } -TEST_F(FooTest, Def) { ... } - -class BarTest : public BaseTest {}; - -TEST_F(BarTest, Abc) { ... } -TEST_F(BarTest, Def) { ... } -``` - -you can simply `typedef` the test fixtures: -``` -typedef BaseTest FooTest; - -TEST_F(FooTest, Abc) { ... } -TEST_F(FooTest, Def) { ... } - -typedef BaseTest BarTest; - -TEST_F(BarTest, Abc) { ... } -TEST_F(BarTest, Def) { ... } -``` - -## The Google Test output is buried in a whole bunch of log messages. What do I do? ## - -The Google Test output is meant to be a concise and human-friendly report. If -your test generates textual output itself, it will mix with the Google Test -output, making it hard to read. However, there is an easy solution to this -problem. - -Since most log messages go to stderr, we decided to let Google Test output go -to stdout. This way, you can easily separate the two using redirection. For -example: -``` -./my_test > googletest_output.txt -``` - -## Why should I prefer test fixtures over global variables? ## - -There are several good reasons: - 1. It's likely your test needs to change the states of its global variables. This makes it difficult to keep side effects from escaping one test and contaminating others, making debugging difficult. By using fixtures, each test has a fresh set of variables that's different (but with the same names). Thus, tests are kept independent of each other. - 1. Global variables pollute the global namespace. - 1. Test fixtures can be reused via subclassing, which cannot be done easily with global variables. This is useful if many test cases have something in common. - -## How do I test private class members without writing FRIEND\_TEST()s? ## - -You should try to write testable code, which means classes should be easily -tested from their public interface. One way to achieve this is the Pimpl idiom: -you move all private members of a class into a helper class, and make all -members of the helper class public. - -You have several other options that don't require using `FRIEND_TEST`: - * Write the tests as members of the fixture class: -``` -class Foo { - friend class FooTest; - ... -}; - -class FooTest : public ::testing::Test { - protected: - ... - void Test1() {...} // This accesses private members of class Foo. - void Test2() {...} // So does this one. -}; - -TEST_F(FooTest, Test1) { - Test1(); -} - -TEST_F(FooTest, Test2) { - Test2(); -} -``` - * In the fixture class, write accessors for the tested class' private members, then use the accessors in your tests: -``` -class Foo { - friend class FooTest; - ... -}; - -class FooTest : public ::testing::Test { - protected: - ... - T1 get_private_member1(Foo* obj) { - return obj->private_member1_; - } -}; - -TEST_F(FooTest, Test1) { - ... - get_private_member1(x) - ... -} -``` - * If the methods are declared **protected**, you can change their access level in a test-only subclass: -``` -class YourClass { - ... - protected: // protected access for testability. - int DoSomethingReturningInt(); - ... -}; - -// in the your_class_test.cc file: -class TestableYourClass : public YourClass { - ... - public: using YourClass::DoSomethingReturningInt; // changes access rights - ... -}; - -TEST_F(YourClassTest, DoSomethingTest) { - TestableYourClass obj; - assertEquals(expected_value, obj.DoSomethingReturningInt()); -} -``` - -## How do I test private class static members without writing FRIEND\_TEST()s? ## - -We find private static methods clutter the header file. They are -implementation details and ideally should be kept out of a .h. So often I make -them free functions instead. - -Instead of: -``` -// foo.h -class Foo { - ... - private: - static bool Func(int n); -}; - -// foo.cc -bool Foo::Func(int n) { ... } - -// foo_test.cc -EXPECT_TRUE(Foo::Func(12345)); -``` - -You probably should better write: -``` -// foo.h -class Foo { - ... -}; - -// foo.cc -namespace internal { - bool Func(int n) { ... } -} - -// foo_test.cc -namespace internal { - bool Func(int n); -} - -EXPECT_TRUE(internal::Func(12345)); -``` - -## I would like to run a test several times with different parameters. Do I need to write several similar copies of it? ## - -No. You can use a feature called [value-parameterized tests](V1_7_AdvancedGuide.md#Value_Parameterized_Tests) which -lets you repeat your tests with different parameters, without defining it more than once. - -## How do I test a file that defines main()? ## - -To test a `foo.cc` file, you need to compile and link it into your unit test -program. However, when the file contains a definition for the `main()` -function, it will clash with the `main()` of your unit test, and will result in -a build error. - -The right solution is to split it into three files: - 1. `foo.h` which contains the declarations, - 1. `foo.cc` which contains the definitions except `main()`, and - 1. `foo_main.cc` which contains nothing but the definition of `main()`. - -Then `foo.cc` can be easily tested. - -If you are adding tests to an existing file and don't want an intrusive change -like this, there is a hack: just include the entire `foo.cc` file in your unit -test. For example: -``` -// File foo_unittest.cc - -// The headers section -... - -// Renames main() in foo.cc to make room for the unit test main() -#define main FooMain - -#include "a/b/foo.cc" - -// The tests start here. -... -``` - - -However, please remember this is a hack and should only be used as the last -resort. - -## What can the statement argument in ASSERT\_DEATH() be? ## - -`ASSERT_DEATH(_statement_, _regex_)` (or any death assertion macro) can be used -wherever `_statement_` is valid. So basically `_statement_` can be any C++ -statement that makes sense in the current context. In particular, it can -reference global and/or local variables, and can be: - * a simple function call (often the case), - * a complex expression, or - * a compound statement. - -> Some examples are shown here: - -``` -// A death test can be a simple function call. -TEST(MyDeathTest, FunctionCall) { - ASSERT_DEATH(Xyz(5), "Xyz failed"); -} - -// Or a complex expression that references variables and functions. -TEST(MyDeathTest, ComplexExpression) { - const bool c = Condition(); - ASSERT_DEATH((c ? Func1(0) : object2.Method("test")), - "(Func1|Method) failed"); -} - -// Death assertions can be used any where in a function. In -// particular, they can be inside a loop. -TEST(MyDeathTest, InsideLoop) { - // Verifies that Foo(0), Foo(1), ..., and Foo(4) all die. - for (int i = 0; i < 5; i++) { - EXPECT_DEATH_M(Foo(i), "Foo has \\d+ errors", - ::testing::Message() << "where i is " << i); - } -} - -// A death assertion can contain a compound statement. -TEST(MyDeathTest, CompoundStatement) { - // Verifies that at lease one of Bar(0), Bar(1), ..., and - // Bar(4) dies. - ASSERT_DEATH({ - for (int i = 0; i < 5; i++) { - Bar(i); - } - }, - "Bar has \\d+ errors");} -``` - -`googletest_unittest.cc` contains more examples if you are interested. - -## What syntax does the regular expression in ASSERT\_DEATH use? ## - -On POSIX systems, Google Test uses the POSIX Extended regular -expression syntax -(http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions). -On Windows, it uses a limited variant of regular expression -syntax. For more details, see the -[regular expression syntax](V1_7_AdvancedGuide.md#Regular_Expression_Syntax). - -## I have a fixture class Foo, but TEST\_F(Foo, Bar) gives me error "no matching function for call to Foo::Foo()". Why? ## - -Google Test needs to be able to create objects of your test fixture class, so -it must have a default constructor. Normally the compiler will define one for -you. However, there are cases where you have to define your own: - * If you explicitly declare a non-default constructor for class `Foo`, then you need to define a default constructor, even if it would be empty. - * If `Foo` has a const non-static data member, then you have to define the default constructor _and_ initialize the const member in the initializer list of the constructor. (Early versions of `gcc` doesn't force you to initialize the const member. It's a bug that has been fixed in `gcc 4`.) - -## Why does ASSERT\_DEATH complain about previous threads that were already joined? ## - -With the Linux pthread library, there is no turning back once you cross the -line from single thread to multiple threads. The first time you create a -thread, a manager thread is created in addition, so you get 3, not 2, threads. -Later when the thread you create joins the main thread, the thread count -decrements by 1, but the manager thread will never be killed, so you still have -2 threads, which means you cannot safely run a death test. - -The new NPTL thread library doesn't suffer from this problem, as it doesn't -create a manager thread. However, if you don't control which machine your test -runs on, you shouldn't depend on this. - -## Why does Google Test require the entire test case, instead of individual tests, to be named FOODeathTest when it uses ASSERT\_DEATH? ## - -Google Test does not interleave tests from different test cases. That is, it -runs all tests in one test case first, and then runs all tests in the next test -case, and so on. Google Test does this because it needs to set up a test case -before the first test in it is run, and tear it down afterwords. Splitting up -the test case would require multiple set-up and tear-down processes, which is -inefficient and makes the semantics unclean. - -If we were to determine the order of tests based on test name instead of test -case name, then we would have a problem with the following situation: - -``` -TEST_F(FooTest, AbcDeathTest) { ... } -TEST_F(FooTest, Uvw) { ... } - -TEST_F(BarTest, DefDeathTest) { ... } -TEST_F(BarTest, Xyz) { ... } -``` - -Since `FooTest.AbcDeathTest` needs to run before `BarTest.Xyz`, and we don't -interleave tests from different test cases, we need to run all tests in the -`FooTest` case before running any test in the `BarTest` case. This contradicts -with the requirement to run `BarTest.DefDeathTest` before `FooTest.Uvw`. - -## But I don't like calling my entire test case FOODeathTest when it contains both death tests and non-death tests. What do I do? ## - -You don't have to, but if you like, you may split up the test case into -`FooTest` and `FooDeathTest`, where the names make it clear that they are -related: - -``` -class FooTest : public ::testing::Test { ... }; - -TEST_F(FooTest, Abc) { ... } -TEST_F(FooTest, Def) { ... } - -typedef FooTest FooDeathTest; - -TEST_F(FooDeathTest, Uvw) { ... EXPECT_DEATH(...) ... } -TEST_F(FooDeathTest, Xyz) { ... ASSERT_DEATH(...) ... } -``` - -## The compiler complains about "no match for 'operator<<'" when I use an assertion. What gives? ## - -If you use a user-defined type `FooType` in an assertion, you must make sure -there is an `std::ostream& operator<<(std::ostream&, const FooType&)` function -defined such that we can print a value of `FooType`. - -In addition, if `FooType` is declared in a name space, the `<<` operator also -needs to be defined in the _same_ name space. - -## How do I suppress the memory leak messages on Windows? ## - -Since the statically initialized Google Test singleton requires allocations on -the heap, the Visual C++ memory leak detector will report memory leaks at the -end of the program run. The easiest way to avoid this is to use the -`_CrtMemCheckpoint` and `_CrtMemDumpAllObjectsSince` calls to not report any -statically initialized heap objects. See MSDN for more details and additional -heap check/debug routines. - -## I am building my project with Google Test in Visual Studio and all I'm getting is a bunch of linker errors (or warnings). Help! ## - -You may get a number of the following linker error or warnings if you -attempt to link your test project with the Google Test library when -your project and the are not built using the same compiler settings. - - * LNK2005: symbol already defined in object - * LNK4217: locally defined symbol 'symbol' imported in function 'function' - * LNK4049: locally defined symbol 'symbol' imported - -The Google Test project (gtest.vcproj) has the Runtime Library option -set to /MT (use multi-threaded static libraries, /MTd for debug). If -your project uses something else, for example /MD (use multi-threaded -DLLs, /MDd for debug), you need to change the setting in the Google -Test project to match your project's. - -To update this setting open the project properties in the Visual -Studio IDE then select the branch Configuration Properties | C/C++ | -Code Generation and change the option "Runtime Library". You may also try -using gtest-md.vcproj instead of gtest.vcproj. - -## I put my tests in a library and Google Test doesn't run them. What's happening? ## -Have you read a -[warning](V1_7_Primer.md#important-note-for-visual-c-users) on -the Google Test Primer page? - -## I want to use Google Test with Visual Studio but don't know where to start. ## -Many people are in your position and one of the posted his solution to -our mailing list. Here is his link: -http://hassanjamilahmad.blogspot.com/2009/07/gtest-starters-help.html. - -## I am seeing compile errors mentioning std::type\_traits when I try to use Google Test on Solaris. ## -Google Test uses parts of the standard C++ library that SunStudio does not support. -Our users reported success using alternative implementations. Try running the build after runing this commad: - -`export CC=cc CXX=CC CXXFLAGS='-library=stlport4'` - -## How can my code detect if it is running in a test? ## - -If you write code that sniffs whether it's running in a test and does -different things accordingly, you are leaking test-only logic into -production code and there is no easy way to ensure that the test-only -code paths aren't run by mistake in production. Such cleverness also -leads to -[Heisenbugs](http://en.wikipedia.org/wiki/Unusual_software_bug#Heisenbug). -Therefore we strongly advise against the practice, and Google Test doesn't -provide a way to do it. - -In general, the recommended way to cause the code to behave -differently under test is [dependency injection](http://jamesshore.com/Blog/Dependency-Injection-Demystified.html). -You can inject different functionality from the test and from the -production code. Since your production code doesn't link in the -for-test logic at all, there is no danger in accidentally running it. - -However, if you _really_, _really_, _really_ have no choice, and if -you follow the rule of ending your test program names with `_test`, -you can use the _horrible_ hack of sniffing your executable name -(`argv[0]` in `main()`) to know whether the code is under test. - -## Google Test defines a macro that clashes with one defined by another library. How do I deal with that? ## - -In C++, macros don't obey namespaces. Therefore two libraries that -both define a macro of the same name will clash if you `#include` both -definitions. In case a Google Test macro clashes with another -library, you can force Google Test to rename its macro to avoid the -conflict. - -Specifically, if both Google Test and some other code define macro -`FOO`, you can add -``` - -DGTEST_DONT_DEFINE_FOO=1 -``` -to the compiler flags to tell Google Test to change the macro's name -from `FOO` to `GTEST_FOO`. For example, with `-DGTEST_DONT_DEFINE_TEST=1`, you'll need to write -``` - GTEST_TEST(SomeTest, DoesThis) { ... } -``` -instead of -``` - TEST(SomeTest, DoesThis) { ... } -``` -in order to define a test. - -Currently, the following `TEST`, `FAIL`, `SUCCEED`, and the basic comparison assertion macros can have alternative names. You can see the full list of covered macros [here](http://www.google.com/codesearch?q=if+!GTEST_DONT_DEFINE_\w%2B+package:http://googletest\.googlecode\.com+file:/include/gtest/gtest.h). More information can be found in the "Avoiding Macro Name Clashes" section of the README file. - - -## Is it OK if I have two separate `TEST(Foo, Bar)` test methods defined in different namespaces? ## - -Yes. - -The rule is **all test methods in the same test case must use the same fixture class**. This means that the following is **allowed** because both tests use the same fixture class (`::testing::Test`). - -``` -namespace foo { -TEST(CoolTest, DoSomething) { - SUCCEED(); -} -} // namespace foo - -namespace bar { -TEST(CoolTest, DoSomething) { - SUCCEED(); -} -} // namespace foo -``` - -However, the following code is **not allowed** and will produce a runtime error from Google Test because the test methods are using different test fixture classes with the same test case name. - -``` -namespace foo { -class CoolTest : public ::testing::Test {}; // Fixture foo::CoolTest -TEST_F(CoolTest, DoSomething) { - SUCCEED(); -} -} // namespace foo - -namespace bar { -class CoolTest : public ::testing::Test {}; // Fixture: bar::CoolTest -TEST_F(CoolTest, DoSomething) { - SUCCEED(); -} -} // namespace foo -``` - -## How do I build Google Testing Framework with Xcode 4? ## - -If you try to build Google Test's Xcode project with Xcode 4.0 or later, you may encounter an error message that looks like -"Missing SDK in target gtest\_framework: /Developer/SDKs/MacOSX10.4u.sdk". That means that Xcode does not support the SDK the project is targeting. See the Xcode section in the [README](../../README.MD) file on how to resolve this. - -## My question is not covered in your FAQ! ## - -If you cannot find the answer to your question in this FAQ, there are -some other resources you can use: - - 1. read other [wiki pages](http://code.google.com/p/googletest/w/list), - 1. search the mailing list [archive](http://groups.google.com/group/googletestframework/topics), - 1. ask it on [googletestframework@googlegroups.com](mailto:googletestframework@googlegroups.com) and someone will answer it (to prevent spam, we require you to join the [discussion group](http://groups.google.com/group/googletestframework) before you can post.). - -Please note that creating an issue in the -[issue tracker](http://code.google.com/p/googletest/issues/list) is _not_ -a good way to get your answer, as it is monitored infrequently by a -very small number of people. - -When asking a question, it's helpful to provide as much of the -following information as possible (people cannot help you if there's -not enough information in your question): - - * the version (or the revision number if you check out from SVN directly) of Google Test you use (Google Test is under active development, so it's possible that your problem has been solved in a later version), - * your operating system, - * the name and version of your compiler, - * the complete command line flags you give to your compiler, - * the complete compiler error messages (if the question is about compilation), - * the _actual_ code (ideally, a minimal but complete program) that has the problem you encounter. diff --git a/test/gtest-1.8.0/docs/V1_7_Primer.md b/test/gtest-1.8.0/docs/V1_7_Primer.md deleted file mode 100644 index b1827c7355..0000000000 --- a/test/gtest-1.8.0/docs/V1_7_Primer.md +++ /dev/null @@ -1,501 +0,0 @@ - - -# Introduction: Why Google C++ Testing Framework? # - -_Google C++ Testing Framework_ helps you write better C++ tests. - -No matter whether you work on Linux, Windows, or a Mac, if you write C++ code, -Google Test can help you. - -So what makes a good test, and how does Google C++ Testing Framework fit in? We believe: - 1. Tests should be _independent_ and _repeatable_. It's a pain to debug a test that succeeds or fails as a result of other tests. Google C++ Testing Framework isolates the tests by running each of them on a different object. When a test fails, Google C++ Testing Framework allows you to run it in isolation for quick debugging. - 1. Tests should be well _organized_ and reflect the structure of the tested code. Google C++ Testing Framework groups related tests into test cases that can share data and subroutines. This common pattern is easy to recognize and makes tests easy to maintain. Such consistency is especially helpful when people switch projects and start to work on a new code base. - 1. Tests should be _portable_ and _reusable_. The open-source community has a lot of code that is platform-neutral, its tests should also be platform-neutral. Google C++ Testing Framework works on different OSes, with different compilers (gcc, MSVC, and others), with or without exceptions, so Google C++ Testing Framework tests can easily work with a variety of configurations. (Note that the current release only contains build scripts for Linux - we are actively working on scripts for other platforms.) - 1. When tests fail, they should provide as much _information_ about the problem as possible. Google C++ Testing Framework doesn't stop at the first test failure. Instead, it only stops the current test and continues with the next. You can also set up tests that report non-fatal failures after which the current test continues. Thus, you can detect and fix multiple bugs in a single run-edit-compile cycle. - 1. The testing framework should liberate test writers from housekeeping chores and let them focus on the test _content_. Google C++ Testing Framework automatically keeps track of all tests defined, and doesn't require the user to enumerate them in order to run them. - 1. Tests should be _fast_. With Google C++ Testing Framework, you can reuse shared resources across tests and pay for the set-up/tear-down only once, without making tests depend on each other. - -Since Google C++ Testing Framework is based on the popular xUnit -architecture, you'll feel right at home if you've used JUnit or PyUnit before. -If not, it will take you about 10 minutes to learn the basics and get started. -So let's go! - -_Note:_ We sometimes refer to Google C++ Testing Framework informally -as _Google Test_. - -# Setting up a New Test Project # - -To write a test program using Google Test, you need to compile Google -Test into a library and link your test with it. We provide build -files for some popular build systems: `msvc/` for Visual Studio, -`xcode/` for Mac Xcode, `make/` for GNU make, `codegear/` for Borland -C++ Builder, and the autotools script (deprecated) and -`CMakeLists.txt` for CMake (recommended) in the Google Test root -directory. If your build system is not on this list, you can take a -look at `make/Makefile` to learn how Google Test should be compiled -(basically you want to compile `src/gtest-all.cc` with `GTEST_ROOT` -and `GTEST_ROOT/include` in the header search path, where `GTEST_ROOT` -is the Google Test root directory). - -Once you are able to compile the Google Test library, you should -create a project or build target for your test program. Make sure you -have `GTEST_ROOT/include` in the header search path so that the -compiler can find `"gtest/gtest.h"` when compiling your test. Set up -your test project to link with the Google Test library (for example, -in Visual Studio, this is done by adding a dependency on -`gtest.vcproj`). - -If you still have questions, take a look at how Google Test's own -tests are built and use them as examples. - -# Basic Concepts # - -When using Google Test, you start by writing _assertions_, which are statements -that check whether a condition is true. An assertion's result can be _success_, -_nonfatal failure_, or _fatal failure_. If a fatal failure occurs, it aborts -the current function; otherwise the program continues normally. - -_Tests_ use assertions to verify the tested code's behavior. If a test crashes -or has a failed assertion, then it _fails_; otherwise it _succeeds_. - -A _test case_ contains one or many tests. You should group your tests into test -cases that reflect the structure of the tested code. When multiple tests in a -test case need to share common objects and subroutines, you can put them into a -_test fixture_ class. - -A _test program_ can contain multiple test cases. - -We'll now explain how to write a test program, starting at the individual -assertion level and building up to tests and test cases. - -# Assertions # - -Google Test assertions are macros that resemble function calls. You test a -class or function by making assertions about its behavior. When an assertion -fails, Google Test prints the assertion's source file and line number location, -along with a failure message. You may also supply a custom failure message -which will be appended to Google Test's message. - -The assertions come in pairs that test the same thing but have different -effects on the current function. `ASSERT_*` versions generate fatal failures -when they fail, and **abort the current function**. `EXPECT_*` versions generate -nonfatal failures, which don't abort the current function. Usually `EXPECT_*` -are preferred, as they allow more than one failures to be reported in a test. -However, you should use `ASSERT_*` if it doesn't make sense to continue when -the assertion in question fails. - -Since a failed `ASSERT_*` returns from the current function immediately, -possibly skipping clean-up code that comes after it, it may cause a space leak. -Depending on the nature of the leak, it may or may not be worth fixing - so -keep this in mind if you get a heap checker error in addition to assertion -errors. - -To provide a custom failure message, simply stream it into the macro using the -`<<` operator, or a sequence of such operators. An example: -``` -ASSERT_EQ(x.size(), y.size()) << "Vectors x and y are of unequal length"; - -for (int i = 0; i < x.size(); ++i) { - EXPECT_EQ(x[i], y[i]) << "Vectors x and y differ at index " << i; -} -``` - -Anything that can be streamed to an `ostream` can be streamed to an assertion -macro--in particular, C strings and `string` objects. If a wide string -(`wchar_t*`, `TCHAR*` in `UNICODE` mode on Windows, or `std::wstring`) is -streamed to an assertion, it will be translated to UTF-8 when printed. - -## Basic Assertions ## - -These assertions do basic true/false condition testing. -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_TRUE(`_condition_`)`; | `EXPECT_TRUE(`_condition_`)`; | _condition_ is true | -| `ASSERT_FALSE(`_condition_`)`; | `EXPECT_FALSE(`_condition_`)`; | _condition_ is false | - -Remember, when they fail, `ASSERT_*` yields a fatal failure and -returns from the current function, while `EXPECT_*` yields a nonfatal -failure, allowing the function to continue running. In either case, an -assertion failure means its containing test fails. - -_Availability_: Linux, Windows, Mac. - -## Binary Comparison ## - -This section describes assertions that compare two values. - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -|`ASSERT_EQ(`_expected_`, `_actual_`);`|`EXPECT_EQ(`_expected_`, `_actual_`);`| _expected_ `==` _actual_ | -|`ASSERT_NE(`_val1_`, `_val2_`);` |`EXPECT_NE(`_val1_`, `_val2_`);` | _val1_ `!=` _val2_ | -|`ASSERT_LT(`_val1_`, `_val2_`);` |`EXPECT_LT(`_val1_`, `_val2_`);` | _val1_ `<` _val2_ | -|`ASSERT_LE(`_val1_`, `_val2_`);` |`EXPECT_LE(`_val1_`, `_val2_`);` | _val1_ `<=` _val2_ | -|`ASSERT_GT(`_val1_`, `_val2_`);` |`EXPECT_GT(`_val1_`, `_val2_`);` | _val1_ `>` _val2_ | -|`ASSERT_GE(`_val1_`, `_val2_`);` |`EXPECT_GE(`_val1_`, `_val2_`);` | _val1_ `>=` _val2_ | - -In the event of a failure, Google Test prints both _val1_ and _val2_ -. In `ASSERT_EQ*` and `EXPECT_EQ*` (and all other equality assertions -we'll introduce later), you should put the expression you want to test -in the position of _actual_, and put its expected value in _expected_, -as Google Test's failure messages are optimized for this convention. - -Value arguments must be comparable by the assertion's comparison -operator or you'll get a compiler error. We used to require the -arguments to support the `<<` operator for streaming to an `ostream`, -but it's no longer necessary since v1.6.0 (if `<<` is supported, it -will be called to print the arguments when the assertion fails; -otherwise Google Test will attempt to print them in the best way it -can. For more details and how to customize the printing of the -arguments, see this Google Mock [recipe](../../googlemock/docs/CookBook.md#teaching-google-mock-how-to-print-your-values).). - -These assertions can work with a user-defined type, but only if you define the -corresponding comparison operator (e.g. `==`, `<`, etc). If the corresponding -operator is defined, prefer using the `ASSERT_*()` macros because they will -print out not only the result of the comparison, but the two operands as well. - -Arguments are always evaluated exactly once. Therefore, it's OK for the -arguments to have side effects. However, as with any ordinary C/C++ function, -the arguments' evaluation order is undefined (i.e. the compiler is free to -choose any order) and your code should not depend on any particular argument -evaluation order. - -`ASSERT_EQ()` does pointer equality on pointers. If used on two C strings, it -tests if they are in the same memory location, not if they have the same value. -Therefore, if you want to compare C strings (e.g. `const char*`) by value, use -`ASSERT_STREQ()` , which will be described later on. In particular, to assert -that a C string is `NULL`, use `ASSERT_STREQ(NULL, c_string)` . However, to -compare two `string` objects, you should use `ASSERT_EQ`. - -Macros in this section work with both narrow and wide string objects (`string` -and `wstring`). - -_Availability_: Linux, Windows, Mac. - -## String Comparison ## - -The assertions in this group compare two **C strings**. If you want to compare -two `string` objects, use `EXPECT_EQ`, `EXPECT_NE`, and etc instead. - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_STREQ(`_expected\_str_`, `_actual\_str_`);` | `EXPECT_STREQ(`_expected\_str_`, `_actual\_str_`);` | the two C strings have the same content | -| `ASSERT_STRNE(`_str1_`, `_str2_`);` | `EXPECT_STRNE(`_str1_`, `_str2_`);` | the two C strings have different content | -| `ASSERT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);`| `EXPECT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);` | the two C strings have the same content, ignoring case | -| `ASSERT_STRCASENE(`_str1_`, `_str2_`);`| `EXPECT_STRCASENE(`_str1_`, `_str2_`);` | the two C strings have different content, ignoring case | - -Note that "CASE" in an assertion name means that case is ignored. - -`*STREQ*` and `*STRNE*` also accept wide C strings (`wchar_t*`). If a -comparison of two wide strings fails, their values will be printed as UTF-8 -narrow strings. - -A `NULL` pointer and an empty string are considered _different_. - -_Availability_: Linux, Windows, Mac. - -See also: For more string comparison tricks (substring, prefix, suffix, and -regular expression matching, for example), see the [Advanced Google Test Guide](V1_7_AdvancedGuide.md). - -# Simple Tests # - -To create a test: - 1. Use the `TEST()` macro to define and name a test function, These are ordinary C++ functions that don't return a value. - 1. In this function, along with any valid C++ statements you want to include, use the various Google Test assertions to check values. - 1. The test's result is determined by the assertions; if any assertion in the test fails (either fatally or non-fatally), or if the test crashes, the entire test fails. Otherwise, it succeeds. - -``` -TEST(test_case_name, test_name) { - ... test body ... -} -``` - - -`TEST()` arguments go from general to specific. The _first_ argument is the -name of the test case, and the _second_ argument is the test's name within the -test case. Both names must be valid C++ identifiers, and they should not contain underscore (`_`). A test's _full name_ consists of its containing test case and its -individual name. Tests from different test cases can have the same individual -name. - -For example, let's take a simple integer function: -``` -int Factorial(int n); // Returns the factorial of n -``` - -A test case for this function might look like: -``` -// Tests factorial of 0. -TEST(FactorialTest, HandlesZeroInput) { - EXPECT_EQ(1, Factorial(0)); -} - -// Tests factorial of positive numbers. -TEST(FactorialTest, HandlesPositiveInput) { - EXPECT_EQ(1, Factorial(1)); - EXPECT_EQ(2, Factorial(2)); - EXPECT_EQ(6, Factorial(3)); - EXPECT_EQ(40320, Factorial(8)); -} -``` - -Google Test groups the test results by test cases, so logically-related tests -should be in the same test case; in other words, the first argument to their -`TEST()` should be the same. In the above example, we have two tests, -`HandlesZeroInput` and `HandlesPositiveInput`, that belong to the same test -case `FactorialTest`. - -_Availability_: Linux, Windows, Mac. - -# Test Fixtures: Using the Same Data Configuration for Multiple Tests # - -If you find yourself writing two or more tests that operate on similar data, -you can use a _test fixture_. It allows you to reuse the same configuration of -objects for several different tests. - -To create a fixture, just: - 1. Derive a class from `::testing::Test` . Start its body with `protected:` or `public:` as we'll want to access fixture members from sub-classes. - 1. Inside the class, declare any objects you plan to use. - 1. If necessary, write a default constructor or `SetUp()` function to prepare the objects for each test. A common mistake is to spell `SetUp()` as `Setup()` with a small `u` - don't let that happen to you. - 1. If necessary, write a destructor or `TearDown()` function to release any resources you allocated in `SetUp()` . To learn when you should use the constructor/destructor and when you should use `SetUp()/TearDown()`, read this [FAQ entry](V1_7_FAQ.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-the-set-uptear-down-function). - 1. If needed, define subroutines for your tests to share. - -When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to -access objects and subroutines in the test fixture: -``` -TEST_F(test_case_name, test_name) { - ... test body ... -} -``` - -Like `TEST()`, the first argument is the test case name, but for `TEST_F()` -this must be the name of the test fixture class. You've probably guessed: `_F` -is for fixture. - -Unfortunately, the C++ macro system does not allow us to create a single macro -that can handle both types of tests. Using the wrong macro causes a compiler -error. - -Also, you must first define a test fixture class before using it in a -`TEST_F()`, or you'll get the compiler error "`virtual outside class -declaration`". - -For each test defined with `TEST_F()`, Google Test will: - 1. Create a _fresh_ test fixture at runtime - 1. Immediately initialize it via `SetUp()` , - 1. Run the test - 1. Clean up by calling `TearDown()` - 1. Delete the test fixture. Note that different tests in the same test case have different test fixture objects, and Google Test always deletes a test fixture before it creates the next one. Google Test does not reuse the same test fixture for multiple tests. Any changes one test makes to the fixture do not affect other tests. - -As an example, let's write tests for a FIFO queue class named `Queue`, which -has the following interface: -``` -template // E is the element type. -class Queue { - public: - Queue(); - void Enqueue(const E& element); - E* Dequeue(); // Returns NULL if the queue is empty. - size_t size() const; - ... -}; -``` - -First, define a fixture class. By convention, you should give it the name -`FooTest` where `Foo` is the class being tested. -``` -class QueueTest : public ::testing::Test { - protected: - virtual void SetUp() { - q1_.Enqueue(1); - q2_.Enqueue(2); - q2_.Enqueue(3); - } - - // virtual void TearDown() {} - - Queue q0_; - Queue q1_; - Queue q2_; -}; -``` - -In this case, `TearDown()` is not needed since we don't have to clean up after -each test, other than what's already done by the destructor. - -Now we'll write tests using `TEST_F()` and this fixture. -``` -TEST_F(QueueTest, IsEmptyInitially) { - EXPECT_EQ(0, q0_.size()); -} - -TEST_F(QueueTest, DequeueWorks) { - int* n = q0_.Dequeue(); - EXPECT_EQ(NULL, n); - - n = q1_.Dequeue(); - ASSERT_TRUE(n != NULL); - EXPECT_EQ(1, *n); - EXPECT_EQ(0, q1_.size()); - delete n; - - n = q2_.Dequeue(); - ASSERT_TRUE(n != NULL); - EXPECT_EQ(2, *n); - EXPECT_EQ(1, q2_.size()); - delete n; -} -``` - -The above uses both `ASSERT_*` and `EXPECT_*` assertions. The rule of thumb is -to use `EXPECT_*` when you want the test to continue to reveal more errors -after the assertion failure, and use `ASSERT_*` when continuing after failure -doesn't make sense. For example, the second assertion in the `Dequeue` test is -`ASSERT_TRUE(n != NULL)`, as we need to dereference the pointer `n` later, -which would lead to a segfault when `n` is `NULL`. - -When these tests run, the following happens: - 1. Google Test constructs a `QueueTest` object (let's call it `t1` ). - 1. `t1.SetUp()` initializes `t1` . - 1. The first test ( `IsEmptyInitially` ) runs on `t1` . - 1. `t1.TearDown()` cleans up after the test finishes. - 1. `t1` is destructed. - 1. The above steps are repeated on another `QueueTest` object, this time running the `DequeueWorks` test. - -_Availability_: Linux, Windows, Mac. - -_Note_: Google Test automatically saves all _Google Test_ flags when a test -object is constructed, and restores them when it is destructed. - -# Invoking the Tests # - -`TEST()` and `TEST_F()` implicitly register their tests with Google Test. So, unlike with many other C++ testing frameworks, you don't have to re-list all your defined tests in order to run them. - -After defining your tests, you can run them with `RUN_ALL_TESTS()` , which returns `0` if all the tests are successful, or `1` otherwise. Note that `RUN_ALL_TESTS()` runs _all tests_ in your link unit -- they can be from different test cases, or even different source files. - -When invoked, the `RUN_ALL_TESTS()` macro: - 1. Saves the state of all Google Test flags. - 1. Creates a test fixture object for the first test. - 1. Initializes it via `SetUp()`. - 1. Runs the test on the fixture object. - 1. Cleans up the fixture via `TearDown()`. - 1. Deletes the fixture. - 1. Restores the state of all Google Test flags. - 1. Repeats the above steps for the next test, until all tests have run. - -In addition, if the text fixture's constructor generates a fatal failure in -step 2, there is no point for step 3 - 5 and they are thus skipped. Similarly, -if step 3 generates a fatal failure, step 4 will be skipped. - -_Important_: You must not ignore the return value of `RUN_ALL_TESTS()`, or `gcc` -will give you a compiler error. The rationale for this design is that the -automated testing service determines whether a test has passed based on its -exit code, not on its stdout/stderr output; thus your `main()` function must -return the value of `RUN_ALL_TESTS()`. - -Also, you should call `RUN_ALL_TESTS()` only **once**. Calling it more than once -conflicts with some advanced Google Test features (e.g. thread-safe death -tests) and thus is not supported. - -_Availability_: Linux, Windows, Mac. - -# Writing the main() Function # - -You can start from this boilerplate: -``` -#include "this/package/foo.h" -#include "gtest/gtest.h" - -namespace { - -// The fixture for testing class Foo. -class FooTest : public ::testing::Test { - protected: - // You can remove any or all of the following functions if its body - // is empty. - - FooTest() { - // You can do set-up work for each test here. - } - - virtual ~FooTest() { - // You can do clean-up work that doesn't throw exceptions here. - } - - // If the constructor and destructor are not enough for setting up - // and cleaning up each test, you can define the following methods: - - virtual void SetUp() { - // Code here will be called immediately after the constructor (right - // before each test). - } - - virtual void TearDown() { - // Code here will be called immediately after each test (right - // before the destructor). - } - - // Objects declared here can be used by all tests in the test case for Foo. -}; - -// Tests that the Foo::Bar() method does Abc. -TEST_F(FooTest, MethodBarDoesAbc) { - const string input_filepath = "this/package/testdata/myinputfile.dat"; - const string output_filepath = "this/package/testdata/myoutputfile.dat"; - Foo f; - EXPECT_EQ(0, f.Bar(input_filepath, output_filepath)); -} - -// Tests that Foo does Xyz. -TEST_F(FooTest, DoesXyz) { - // Exercises the Xyz feature of Foo. -} - -} // namespace - -int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} -``` - -The `::testing::InitGoogleTest()` function parses the command line for Google -Test flags, and removes all recognized flags. This allows the user to control a -test program's behavior via various flags, which we'll cover in [AdvancedGuide](V1_7_AdvancedGuide.md). -You must call this function before calling `RUN_ALL_TESTS()`, or the flags -won't be properly initialized. - -On Windows, `InitGoogleTest()` also works with wide strings, so it can be used -in programs compiled in `UNICODE` mode as well. - -But maybe you think that writing all those main() functions is too much work? We agree with you completely and that's why Google Test provides a basic implementation of main(). If it fits your needs, then just link your test with gtest\_main library and you are good to go. - -## Important note for Visual C++ users ## -If you put your tests into a library and your `main()` function is in a different library or in your .exe file, those tests will not run. The reason is a [bug](https://connect.microsoft.com/feedback/viewfeedback.aspx?FeedbackID=244410&siteid=210) in Visual C++. When you define your tests, Google Test creates certain static objects to register them. These objects are not referenced from elsewhere but their constructors are still supposed to run. When Visual C++ linker sees that nothing in the library is referenced from other places it throws the library out. You have to reference your library with tests from your main program to keep the linker from discarding it. Here is how to do it. Somewhere in your library code declare a function: -``` -__declspec(dllexport) int PullInMyLibrary() { return 0; } -``` -If you put your tests in a static library (not DLL) then `__declspec(dllexport)` is not required. Now, in your main program, write a code that invokes that function: -``` -int PullInMyLibrary(); -static int dummy = PullInMyLibrary(); -``` -This will keep your tests referenced and will make them register themselves at startup. - -In addition, if you define your tests in a static library, add `/OPT:NOREF` to your main program linker options. If you use MSVC++ IDE, go to your .exe project properties/Configuration Properties/Linker/Optimization and set References setting to `Keep Unreferenced Data (/OPT:NOREF)`. This will keep Visual C++ linker from discarding individual symbols generated by your tests from the final executable. - -There is one more pitfall, though. If you use Google Test as a static library (that's how it is defined in gtest.vcproj) your tests must also reside in a static library. If you have to have them in a DLL, you _must_ change Google Test to build into a DLL as well. Otherwise your tests will not run correctly or will not run at all. The general conclusion here is: make your life easier - do not write your tests in libraries! - -# Where to Go from Here # - -Congratulations! You've learned the Google Test basics. You can start writing -and running Google Test tests, read some [samples](V1_7_Samples.md), or continue with -[AdvancedGuide](V1_7_AdvancedGuide.md), which describes many more useful Google Test features. - -# Known Limitations # - -Google Test is designed to be thread-safe. The implementation is -thread-safe on systems where the `pthreads` library is available. It -is currently _unsafe_ to use Google Test assertions from two threads -concurrently on other systems (e.g. Windows). In most tests this is -not an issue as usually the assertions are done in the main thread. If -you want to help, you can volunteer to implement the necessary -synchronization primitives in `gtest-port.h` for your platform. diff --git a/test/gtest-1.8.0/docs/V1_7_PumpManual.md b/test/gtest-1.8.0/docs/V1_7_PumpManual.md deleted file mode 100644 index 8184f153ca..0000000000 --- a/test/gtest-1.8.0/docs/V1_7_PumpManual.md +++ /dev/null @@ -1,177 +0,0 @@ - - -Pump is Useful for Meta Programming. - -# The Problem # - -Template and macro libraries often need to define many classes, -functions, or macros that vary only (or almost only) in the number of -arguments they take. It's a lot of repetitive, mechanical, and -error-prone work. - -Variadic templates and variadic macros can alleviate the problem. -However, while both are being considered by the C++ committee, neither -is in the standard yet or widely supported by compilers. Thus they -are often not a good choice, especially when your code needs to be -portable. And their capabilities are still limited. - -As a result, authors of such libraries often have to write scripts to -generate their implementation. However, our experience is that it's -tedious to write such scripts, which tend to reflect the structure of -the generated code poorly and are often hard to read and edit. For -example, a small change needed in the generated code may require some -non-intuitive, non-trivial changes in the script. This is especially -painful when experimenting with the code. - -# Our Solution # - -Pump (for Pump is Useful for Meta Programming, Pretty Useful for Meta -Programming, or Practical Utility for Meta Programming, whichever you -prefer) is a simple meta-programming tool for C++. The idea is that a -programmer writes a `foo.pump` file which contains C++ code plus meta -code that manipulates the C++ code. The meta code can handle -iterations over a range, nested iterations, local meta variable -definitions, simple arithmetic, and conditional expressions. You can -view it as a small Domain-Specific Language. The meta language is -designed to be non-intrusive (s.t. it won't confuse Emacs' C++ mode, -for example) and concise, making Pump code intuitive and easy to -maintain. - -## Highlights ## - - * The implementation is in a single Python script and thus ultra portable: no build or installation is needed and it works cross platforms. - * Pump tries to be smart with respect to [Google's style guide](http://code.google.com/p/google-styleguide/): it breaks long lines (easy to have when they are generated) at acceptable places to fit within 80 columns and indent the continuation lines correctly. - * The format is human-readable and more concise than XML. - * The format works relatively well with Emacs' C++ mode. - -## Examples ## - -The following Pump code (where meta keywords start with `$`, `[[` and `]]` are meta brackets, and `$$` starts a meta comment that ends with the line): - -``` -$var n = 3 $$ Defines a meta variable n. -$range i 0..n $$ Declares the range of meta iterator i (inclusive). -$for i [[ - $$ Meta loop. -// Foo$i does blah for $i-ary predicates. -$range j 1..i -template -class Foo$i { -$if i == 0 [[ - blah a; -]] $elif i <= 2 [[ - blah b; -]] $else [[ - blah c; -]] -}; - -]] -``` - -will be translated by the Pump compiler to: - -``` -// Foo0 does blah for 0-ary predicates. -template -class Foo0 { - blah a; -}; - -// Foo1 does blah for 1-ary predicates. -template -class Foo1 { - blah b; -}; - -// Foo2 does blah for 2-ary predicates. -template -class Foo2 { - blah b; -}; - -// Foo3 does blah for 3-ary predicates. -template -class Foo3 { - blah c; -}; -``` - -In another example, - -``` -$range i 1..n -Func($for i + [[a$i]]); -$$ The text between i and [[ is the separator between iterations. -``` - -will generate one of the following lines (without the comments), depending on the value of `n`: - -``` -Func(); // If n is 0. -Func(a1); // If n is 1. -Func(a1 + a2); // If n is 2. -Func(a1 + a2 + a3); // If n is 3. -// And so on... -``` - -## Constructs ## - -We support the following meta programming constructs: - -| `$var id = exp` | Defines a named constant value. `$id` is valid util the end of the current meta lexical block. | -|:----------------|:-----------------------------------------------------------------------------------------------| -| `$range id exp..exp` | Sets the range of an iteration variable, which can be reused in multiple loops later. | -| `$for id sep [[ code ]]` | Iteration. The range of `id` must have been defined earlier. `$id` is valid in `code`. | -| `$($)` | Generates a single `$` character. | -| `$id` | Value of the named constant or iteration variable. | -| `$(exp)` | Value of the expression. | -| `$if exp [[ code ]] else_branch` | Conditional. | -| `[[ code ]]` | Meta lexical block. | -| `cpp_code` | Raw C++ code. | -| `$$ comment` | Meta comment. | - -**Note:** To give the user some freedom in formatting the Pump source -code, Pump ignores a new-line character if it's right after `$for foo` -or next to `[[` or `]]`. Without this rule you'll often be forced to write -very long lines to get the desired output. Therefore sometimes you may -need to insert an extra new-line in such places for a new-line to show -up in your output. - -## Grammar ## - -``` -code ::= atomic_code* -atomic_code ::= $var id = exp - | $var id = [[ code ]] - | $range id exp..exp - | $for id sep [[ code ]] - | $($) - | $id - | $(exp) - | $if exp [[ code ]] else_branch - | [[ code ]] - | cpp_code -sep ::= cpp_code | empty_string -else_branch ::= $else [[ code ]] - | $elif exp [[ code ]] else_branch - | empty_string -exp ::= simple_expression_in_Python_syntax -``` - -## Code ## - -You can find the source code of Pump in [scripts/pump.py](../scripts/pump.py). It is still -very unpolished and lacks automated tests, although it has been -successfully used many times. If you find a chance to use it in your -project, please let us know what you think! We also welcome help on -improving Pump. - -## Real Examples ## - -You can find real-world applications of Pump in [Google Test](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgoogletest\.googlecode\.com) and [Google Mock](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgooglemock\.googlecode\.com). The source file `foo.h.pump` generates `foo.h`. - -## Tips ## - - * If a meta variable is followed by a letter or digit, you can separate them using `[[]]`, which inserts an empty string. For example `Foo$j[[]]Helper` generate `Foo1Helper` when `j` is 1. - * To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line. diff --git a/test/gtest-1.8.0/docs/V1_7_Samples.md b/test/gtest-1.8.0/docs/V1_7_Samples.md deleted file mode 100644 index f21d200567..0000000000 --- a/test/gtest-1.8.0/docs/V1_7_Samples.md +++ /dev/null @@ -1,14 +0,0 @@ -If you're like us, you'd like to look at some Google Test sample code. The -[samples folder](../samples) has a number of well-commented samples showing how to use a -variety of Google Test features. - - * [Sample #1](../samples/sample1_unittest.cc) shows the basic steps of using Google Test to test C++ functions. - * [Sample #2](../samples/sample2_unittest.cc) shows a more complex unit test for a class with multiple member functions. - * [Sample #3](../samples/sample3_unittest.cc) uses a test fixture. - * [Sample #4](../samples/sample4_unittest.cc) is another basic example of using Google Test. - * [Sample #5](../samples/sample5_unittest.cc) teaches how to reuse a test fixture in multiple test cases by deriving sub-fixtures from it. - * [Sample #6](../samples/sample6_unittest.cc) demonstrates type-parameterized tests. - * [Sample #7](../samples/sample7_unittest.cc) teaches the basics of value-parameterized tests. - * [Sample #8](../samples/sample8_unittest.cc) shows using `Combine()` in value-parameterized tests. - * [Sample #9](../samples/sample9_unittest.cc) shows use of the listener API to modify Google Test's console output and the use of its reflection API to inspect test results. - * [Sample #10](../samples/sample10_unittest.cc) shows use of the listener API to implement a primitive memory leak checker. diff --git a/test/gtest-1.8.0/docs/V1_7_XcodeGuide.md b/test/gtest-1.8.0/docs/V1_7_XcodeGuide.md deleted file mode 100644 index bf24bf51bf..0000000000 --- a/test/gtest-1.8.0/docs/V1_7_XcodeGuide.md +++ /dev/null @@ -1,93 +0,0 @@ - - -This guide will explain how to use the Google Testing Framework in your Xcode projects on Mac OS X. This tutorial begins by quickly explaining what to do for experienced users. After the quick start, the guide goes provides additional explanation about each step. - -# Quick Start # - -Here is the quick guide for using Google Test in your Xcode project. - - 1. Download the source from the [website](http://code.google.com/p/googletest) using this command: `svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only` - 1. Open up the `gtest.xcodeproj` in the `googletest-read-only/xcode/` directory and build the gtest.framework. - 1. Create a new "Shell Tool" target in your Xcode project called something like "UnitTests" - 1. Add the gtest.framework to your project and add it to the "Link Binary with Libraries" build phase of "UnitTests" - 1. Add your unit test source code to the "Compile Sources" build phase of "UnitTests" - 1. Edit the "UnitTests" executable and add an environment variable named "DYLD\_FRAMEWORK\_PATH" with a value equal to the path to the framework containing the gtest.framework relative to the compiled executable. - 1. Build and Go - -The following sections further explain each of the steps listed above in depth, describing in more detail how to complete it including some variations. - -# Get the Source # - -Currently, the gtest.framework discussed here isn't available in a tagged release of Google Test, it is only available in the trunk. As explained at the Google Test [site](http://code.google.com/p/googletest/source/checkout">svn), you can get the code from anonymous SVN with this command: - -``` -svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only -``` - -Alternatively, if you are working with Subversion in your own code base, you can add Google Test as an external dependency to your own Subversion repository. By following this approach, everyone that checks out your svn repository will also receive a copy of Google Test (a specific version, if you wish) without having to check it out explicitly. This makes the set up of your project simpler and reduces the copied code in the repository. - -To use `svn:externals`, decide where you would like to have the external source reside. You might choose to put the external source inside the trunk, because you want it to be part of the branch when you make a release. However, keeping it outside the trunk in a version-tagged directory called something like `third-party/googletest/1.0.1`, is another option. Once the location is established, use `svn propedit svn:externals _directory_` to set the svn:externals property on a directory in your repository. This directory won't contain the code, but be its versioned parent directory. - -The command `svn propedit` will bring up your Subversion editor, making editing the long, (potentially multi-line) property simpler. This same method can be used to check out a tagged branch, by using the appropriate URL (e.g. `http://googletest.googlecode.com/svn/tags/release-1.0.1`). Additionally, the svn:externals property allows the specification of a particular revision of the trunk with the `-r_##_` option (e.g. `externals/src/googletest -r60 http://googletest.googlecode.com/svn/trunk`). - -Here is an example of using the svn:externals properties on a trunk (read via `svn propget`) of a project. This value checks out a copy of Google Test into the `trunk/externals/src/googletest/` directory. - -``` -[Computer:svn] user$ svn propget svn:externals trunk -externals/src/googletest http://googletest.googlecode.com/svn/trunk -``` - -# Add the Framework to Your Project # - -The next step is to build and add the gtest.framework to your own project. This guide describes two common ways below. - - * **Option 1** --- The simplest way to add Google Test to your own project, is to open gtest.xcodeproj (found in the xcode/ directory of the Google Test trunk) and build the framework manually. Then, add the built framework into your project using the "Add->Existing Framework..." from the context menu or "Project->Add..." from the main menu. The gtest.framework is relocatable and contains the headers and object code that you'll need to make tests. This method requires rebuilding every time you upgrade Google Test in your project. - * **Option 2** --- If you are going to be living off the trunk of Google Test, incorporating its latest features into your unit tests (or are a Google Test developer yourself). You'll want to rebuild the framework every time the source updates. to do this, you'll need to add the gtest.xcodeproj file, not the framework itself, to your own Xcode project. Then, from the build products that are revealed by the project's disclosure triangle, you can find the gtest.framework, which can be added to your targets (discussed below). - -# Make a Test Target # - -To start writing tests, make a new "Shell Tool" target. This target template is available under BSD, Cocoa, or Carbon. Add your unit test source code to the "Compile Sources" build phase of the target. - -Next, you'll want to add gtest.framework in two different ways, depending upon which option you chose above. - - * **Option 1** --- During compilation, Xcode will need to know that you are linking against the gtest.framework. Add the gtest.framework to the "Link Binary with Libraries" build phase of your test target. This will include the Google Test headers in your header search path, and will tell the linker where to find the library. - * **Option 2** --- If your working out of the trunk, you'll also want to add gtest.framework to your "Link Binary with Libraries" build phase of your test target. In addition, you'll want to add the gtest.framework as a dependency to your unit test target. This way, Xcode will make sure that gtest.framework is up to date, every time your build your target. Finally, if you don't share build directories with Google Test, you'll have to copy the gtest.framework into your own build products directory using a "Run Script" build phase. - -# Set Up the Executable Run Environment # - -Since the unit test executable is a shell tool, it doesn't have a bundle with a `Contents/Frameworks` directory, in which to place gtest.framework. Instead, the dynamic linker must be told at runtime to search for the framework in another location. This can be accomplished by setting the "DYLD\_FRAMEWORK\_PATH" environment variable in the "Edit Active Executable ..." Arguments tab, under "Variables to be set in the environment:". The path for this value is the path (relative or absolute) of the directory containing the gtest.framework. - -If you haven't set up the DYLD\_FRAMEWORK\_PATH, correctly, you might get a message like this: - -``` -[Session started at 2008-08-15 06:23:57 -0600.] - dyld: Library not loaded: @loader_path/../Frameworks/gtest.framework/Versions/A/gtest - Referenced from: /Users/username/Documents/Sandbox/gtestSample/build/Debug/WidgetFrameworkTest - Reason: image not found -``` - -To correct this problem, got to the directory containing the executable named in "Referenced from:" value in the error message above. Then, with the terminal in this location, find the relative path to the directory containing the gtest.framework. That is the value you'll need to set as the DYLD\_FRAMEWORK\_PATH. - -# Build and Go # - -Now, when you click "Build and Go", the test will be executed. Dumping out something like this: - -``` -[Session started at 2008-08-06 06:36:13 -0600.] -[==========] Running 2 tests from 1 test case. -[----------] Global test environment set-up. -[----------] 2 tests from WidgetInitializerTest -[ RUN ] WidgetInitializerTest.TestConstructor -[ OK ] WidgetInitializerTest.TestConstructor -[ RUN ] WidgetInitializerTest.TestConversion -[ OK ] WidgetInitializerTest.TestConversion -[----------] Global test environment tear-down -[==========] 2 tests from 1 test case ran. -[ PASSED ] 2 tests. - -The Debugger has exited with status 0. -``` - -# Summary # - -Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment. \ No newline at end of file diff --git a/test/gtest-1.8.0/docs/XcodeGuide.md b/test/gtest-1.8.0/docs/XcodeGuide.md index bf24bf51bf..117265c590 100644 --- a/test/gtest-1.8.0/docs/XcodeGuide.md +++ b/test/gtest-1.8.0/docs/XcodeGuide.md @@ -6,13 +6,13 @@ This guide will explain how to use the Google Testing Framework in your Xcode pr Here is the quick guide for using Google Test in your Xcode project. - 1. Download the source from the [website](http://code.google.com/p/googletest) using this command: `svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only` + 1. Download the source from the [website](http://code.google.com/p/googletest) using this command: `svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only`. 1. Open up the `gtest.xcodeproj` in the `googletest-read-only/xcode/` directory and build the gtest.framework. - 1. Create a new "Shell Tool" target in your Xcode project called something like "UnitTests" - 1. Add the gtest.framework to your project and add it to the "Link Binary with Libraries" build phase of "UnitTests" - 1. Add your unit test source code to the "Compile Sources" build phase of "UnitTests" + 1. Create a new "Shell Tool" target in your Xcode project called something like "UnitTests". + 1. Add the gtest.framework to your project and add it to the "Link Binary with Libraries" build phase of "UnitTests". + 1. Add your unit test source code to the "Compile Sources" build phase of "UnitTests". 1. Edit the "UnitTests" executable and add an environment variable named "DYLD\_FRAMEWORK\_PATH" with a value equal to the path to the framework containing the gtest.framework relative to the compiled executable. - 1. Build and Go + 1. Build and Go. The following sections further explain each of the steps listed above in depth, describing in more detail how to complete it including some variations. @@ -66,7 +66,7 @@ If you haven't set up the DYLD\_FRAMEWORK\_PATH, correctly, you might get a mess Reason: image not found ``` -To correct this problem, got to the directory containing the executable named in "Referenced from:" value in the error message above. Then, with the terminal in this location, find the relative path to the directory containing the gtest.framework. That is the value you'll need to set as the DYLD\_FRAMEWORK\_PATH. +To correct this problem, go to to the directory containing the executable named in "Referenced from:" value in the error message above. Then, with the terminal in this location, find the relative path to the directory containing the gtest.framework. That is the value you'll need to set as the DYLD\_FRAMEWORK\_PATH. # Build and Go # diff --git a/test/gtest-1.8.0/include/gtest/gtest-death-test.h b/test/gtest-1.8.0/include/gtest/gtest-death-test.h index 957a69c6a9..53f11d4c56 100644 --- a/test/gtest-1.8.0/include/gtest/gtest-death-test.h +++ b/test/gtest-1.8.0/include/gtest/gtest-death-test.h @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) // // This header file defines the public API for death tests. It is // #included by gtest.h so a user doesn't need to include this @@ -102,7 +102,7 @@ GTEST_API_ bool InDeathTestChild(); // On POSIX-compliant systems (*nix), we use the library, // which uses the POSIX extended regex syntax. // -// On other platforms (e.g. Windows), we only support a simple regex +// On other platforms (e.g. Windows or Mac), we only support a simple regex // syntax implemented as part of Google Test. This limited // implementation should be enough most of the time when writing // death tests; though it lacks many features you can find in PCRE @@ -198,7 +198,7 @@ class GTEST_API_ ExitedWithCode { const int exit_code_; }; -# if !GTEST_OS_WINDOWS +# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA // Tests that an exit code describes an exit due to termination by a // given signal. class GTEST_API_ KilledBySignal { @@ -272,6 +272,54 @@ class GTEST_API_ KilledBySignal { # endif // NDEBUG for EXPECT_DEBUG_DEATH #endif // GTEST_HAS_DEATH_TEST +// This macro is used for implementing macros such as +// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED on systems where +// death tests are not supported. Those macros must compile on such systems +// iff EXPECT_DEATH and ASSERT_DEATH compile with the same parameters on +// systems that support death tests. This allows one to write such a macro +// on a system that does not support death tests and be sure that it will +// compile on a death-test supporting system. It is exposed publicly so that +// systems that have death-tests with stricter requirements than +// GTEST_HAS_DEATH_TEST can write their own equivalent of +// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED. +// +// Parameters: +// statement - A statement that a macro such as EXPECT_DEATH would test +// for program termination. This macro has to make sure this +// statement is compiled but not executed, to ensure that +// EXPECT_DEATH_IF_SUPPORTED compiles with a certain +// parameter iff EXPECT_DEATH compiles with it. +// regex - A regex that a macro such as EXPECT_DEATH would use to test +// the output of statement. This parameter has to be +// compiled but not evaluated by this macro, to ensure that +// this macro only accepts expressions that a macro such as +// EXPECT_DEATH would accept. +// terminator - Must be an empty statement for EXPECT_DEATH_IF_SUPPORTED +// and a return statement for ASSERT_DEATH_IF_SUPPORTED. +// This ensures that ASSERT_DEATH_IF_SUPPORTED will not +// compile inside functions where ASSERT_DEATH doesn't +// compile. +// +// The branch that has an always false condition is used to ensure that +// statement and regex are compiled (and thus syntactically correct) but +// never executed. The unreachable code macro protects the terminator +// statement from generating an 'unreachable code' warning in case +// statement unconditionally returns or throws. The Message constructor at +// the end allows the syntax of streaming additional messages into the +// macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH. +# define GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, terminator) \ + GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ + if (::testing::internal::AlwaysTrue()) { \ + GTEST_LOG_(WARNING) \ + << "Death tests are not supported on this platform.\n" \ + << "Statement '" #statement "' cannot be verified."; \ + } else if (::testing::internal::AlwaysFalse()) { \ + ::testing::internal::RE::PartialMatch(".*", (regex)); \ + GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ + terminator; \ + } else \ + ::testing::Message() + // EXPECT_DEATH_IF_SUPPORTED(statement, regex) and // ASSERT_DEATH_IF_SUPPORTED(statement, regex) expand to real death tests if // death tests are supported; otherwise they just issue a warning. This is @@ -284,9 +332,9 @@ class GTEST_API_ KilledBySignal { ASSERT_DEATH(statement, regex) #else # define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \ - GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, ) + GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, ) # define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \ - GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, return) + GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, return) #endif } // namespace testing diff --git a/test/gtest-1.8.0/include/gtest/gtest-message.h b/test/gtest-1.8.0/include/gtest/gtest-message.h index fe879bca79..d7266baab0 100644 --- a/test/gtest-1.8.0/include/gtest/gtest-message.h +++ b/test/gtest-1.8.0/include/gtest/gtest-message.h @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) // // This header file defines the Message class. // @@ -196,7 +196,6 @@ class GTEST_API_ Message { std::string GetString() const; private: - #if GTEST_OS_SYMBIAN // These are needed as the Nokia Symbian Compiler cannot decide between // const T& and const T* in a function template. The Nokia compiler _can_ diff --git a/test/gtest-1.8.0/include/gtest/gtest-param-test.h b/test/gtest-1.8.0/include/gtest/gtest-param-test.h index 038f9ba79e..8993c1ce17 100644 --- a/test/gtest-1.8.0/include/gtest/gtest-param-test.h +++ b/test/gtest-1.8.0/include/gtest/gtest-param-test.h @@ -34,10 +34,11 @@ // Authors: vladl@google.com (Vlad Losev) // // Macros and functions for implementing parameterized tests -// in Google C++ Testing Framework (Google Test) +// in Google C++ Testing and Mocking Framework (Google Test) // // This file is generated by a SCRIPT. DO NOT EDIT BY HAND! // + #ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ #define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ @@ -79,7 +80,7 @@ TEST_P(FooTest, HasBlahBlah) { // Finally, you can use INSTANTIATE_TEST_CASE_P to instantiate the test // case with any set of parameters you want. Google Test defines a number // of functions for generating test parameters. They return what we call -// (surprise!) parameter generators. Here is a summary of them, which +// (surprise!) parameter generators. Here is a summary of them, which // are all in the testing namespace: // // @@ -185,15 +186,10 @@ TEST_P(DerivedTest, DoesBlah) { # include #endif -// scripts/fuse_gtest.py depends on gtest's own header being #included -// *unconditionally*. Therefore these #includes cannot be moved -// inside #if GTEST_HAS_PARAM_TEST. #include "gtest/internal/gtest-internal.h" #include "gtest/internal/gtest-param-util.h" #include "gtest/internal/gtest-param-util-generated.h" -#if GTEST_HAS_PARAM_TEST - namespace testing { // Functions producing parameter generators. @@ -273,7 +269,7 @@ internal::ParamGenerator Range(T start, T end) { // each with C-string values of "foo", "bar", and "baz": // // const char* strings[] = {"foo", "bar", "baz"}; -// INSTANTIATE_TEST_CASE_P(StringSequence, SrtingTest, ValuesIn(strings)); +// INSTANTIATE_TEST_CASE_P(StringSequence, StringTest, ValuesIn(strings)); // // This instantiates tests from test case StlStringTest // each with STL strings with values "a" and "b": @@ -1375,8 +1371,6 @@ internal::CartesianProductHolder10AddTestPattern(\ - #test_case_name, \ - #test_name, \ + GTEST_STRINGIFY_(test_case_name), \ + GTEST_STRINGIFY_(test_name), \ new ::testing::internal::TestMetaFactory< \ GTEST_TEST_CLASS_NAME_(\ test_case_name, test_name)>()); \ @@ -1412,33 +1406,33 @@ internal::CartesianProductHolder10, and return std::string. // // testing::PrintToStringParamName is a builtin test suffix generator that -// returns the value of testing::PrintToString(GetParam()). It does not work -// for std::string or C strings. +// returns the value of testing::PrintToString(GetParam()). // // Note: test names must be non-empty, unique, and may only contain ASCII -// alphanumeric characters or underscore. +// alphanumeric characters or underscore. Because PrintToString adds quotes +// to std::string and C strings, it won't work for these types. -# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \ - ::testing::internal::ParamGenerator \ - gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \ - ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \ - const ::testing::TestParamInfo& info) { \ - return ::testing::internal::GetParamNameGen \ - (__VA_ARGS__)(info); \ - } \ - int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \ - ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ - GetTestCasePatternHolder(\ - #test_case_name, \ - ::testing::internal::CodeLocation(\ - __FILE__, __LINE__))->AddTestCaseInstantiation(\ - #prefix, \ - >est_##prefix##test_case_name##_EvalGenerator_, \ - >est_##prefix##test_case_name##_EvalGenerateName_, \ - __FILE__, __LINE__) +#define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \ + static ::testing::internal::ParamGenerator \ + gtest_##prefix##test_case_name##_EvalGenerator_() { \ + return generator; \ + } \ + static ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \ + const ::testing::TestParamInfo& info) { \ + return ::testing::internal::GetParamNameGen( \ + __VA_ARGS__)(info); \ + } \ + static int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \ + ::testing::UnitTest::GetInstance() \ + ->parameterized_test_registry() \ + .GetTestCasePatternHolder( \ + #test_case_name, \ + ::testing::internal::CodeLocation(__FILE__, __LINE__)) \ + ->AddTestCaseInstantiation( \ + #prefix, >est_##prefix##test_case_name##_EvalGenerator_, \ + >est_##prefix##test_case_name##_EvalGenerateName_, __FILE__, \ + __LINE__) } // namespace testing -#endif // GTEST_HAS_PARAM_TEST - #endif // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ diff --git a/test/gtest-1.8.0/include/gtest/gtest-param-test.h.pump b/test/gtest-1.8.0/include/gtest/gtest-param-test.h.pump index 3078d6d2a1..7b7243f348 100644 --- a/test/gtest-1.8.0/include/gtest/gtest-param-test.h.pump +++ b/test/gtest-1.8.0/include/gtest/gtest-param-test.h.pump @@ -33,7 +33,7 @@ $var maxtuple = 10 $$ Maximum number of Combine arguments we want to support. // Authors: vladl@google.com (Vlad Losev) // // Macros and functions for implementing parameterized tests -// in Google C++ Testing Framework (Google Test) +// in Google C++ Testing and Mocking Framework (Google Test) // // This file is generated by a SCRIPT. DO NOT EDIT BY HAND! // @@ -78,7 +78,7 @@ TEST_P(FooTest, HasBlahBlah) { // Finally, you can use INSTANTIATE_TEST_CASE_P to instantiate the test // case with any set of parameters you want. Google Test defines a number // of functions for generating test parameters. They return what we call -// (surprise!) parameter generators. Here is a summary of them, which +// (surprise!) parameter generators. Here is a summary of them, which // are all in the testing namespace: // // @@ -184,15 +184,10 @@ TEST_P(DerivedTest, DoesBlah) { # include #endif -// scripts/fuse_gtest.py depends on gtest's own header being #included -// *unconditionally*. Therefore these #includes cannot be moved -// inside #if GTEST_HAS_PARAM_TEST. #include "gtest/internal/gtest-internal.h" #include "gtest/internal/gtest-param-util.h" #include "gtest/internal/gtest-param-util-generated.h" -#if GTEST_HAS_PARAM_TEST - namespace testing { // Functions producing parameter generators. @@ -272,7 +267,7 @@ internal::ParamGenerator Range(T start, T end) { // each with C-string values of "foo", "bar", and "baz": // // const char* strings[] = {"foo", "bar", "baz"}; -// INSTANTIATE_TEST_CASE_P(StringSequence, SrtingTest, ValuesIn(strings)); +// INSTANTIATE_TEST_CASE_P(StringSequence, StringTest, ValuesIn(strings)); // // This instantiates tests from test case StlStringTest // each with STL strings with values "a" and "b": @@ -441,8 +436,6 @@ internal::CartesianProductHolder$i<$for j, [[Generator$j]]> Combine( ]] # endif // GTEST_HAS_COMBINE - - # define TEST_P(test_case_name, test_name) \ class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \ : public test_case_name { \ @@ -456,8 +449,8 @@ internal::CartesianProductHolder$i<$for j, [[Generator$j]]> Combine( #test_case_name, \ ::testing::internal::CodeLocation(\ __FILE__, __LINE__))->AddTestPattern(\ - #test_case_name, \ - #test_name, \ + GTEST_STRINGIFY_(test_case_name), \ + GTEST_STRINGIFY_(test_name), \ new ::testing::internal::TestMetaFactory< \ GTEST_TEST_CLASS_NAME_(\ test_case_name, test_name)>()); \ @@ -485,14 +478,14 @@ internal::CartesianProductHolder$i<$for j, [[Generator$j]]> Combine( // to std::string and C strings, it won't work for these types. # define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \ - ::testing::internal::ParamGenerator \ + static ::testing::internal::ParamGenerator \ gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \ - ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \ + static ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \ const ::testing::TestParamInfo& info) { \ return ::testing::internal::GetParamNameGen \ (__VA_ARGS__)(info); \ } \ - int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \ + static int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \ ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ GetTestCasePatternHolder(\ #test_case_name, \ @@ -505,6 +498,4 @@ internal::CartesianProductHolder$i<$for j, [[Generator$j]]> Combine( } // namespace testing -#endif // GTEST_HAS_PARAM_TEST - #endif // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ diff --git a/test/gtest-1.8.0/include/gtest/gtest-printers.h b/test/gtest-1.8.0/include/gtest/gtest-printers.h index 8a33164cb3..e53963b42c 100644 --- a/test/gtest-1.8.0/include/gtest/gtest-printers.h +++ b/test/gtest-1.8.0/include/gtest/gtest-printers.h @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) -// Google Test - The Google C++ Testing Framework +// Google Test - The Google C++ Testing and Mocking Framework // // This file implements a universal value printer that can print a // value of any type T: @@ -46,6 +46,10 @@ // 2. operator<<(ostream&, const T&) defined in either foo or the // global namespace. // +// However if T is an STL-style container then it is printed element-wise +// unless foo::PrintTo(const T&, ostream*) is defined. Note that +// operator<<() is ignored for container types. +// // If none of the above is defined, it will print the debug string of // the value if it is a protocol buffer, or print the raw bytes in the // value otherwise. @@ -107,6 +111,11 @@ # include #endif +#if GTEST_HAS_ABSL +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" +#endif // GTEST_HAS_ABSL + namespace testing { // Definitions in the 'internal' and 'internal2' name spaces are @@ -125,7 +134,11 @@ enum TypeKind { kProtobuf, // a protobuf type kConvertibleToInteger, // a type implicitly convertible to BiggestInt // (e.g. a named or unnamed enum type) - kOtherType // anything else +#if GTEST_HAS_ABSL + kConvertibleToStringView, // a type implicitly convertible to + // absl::string_view +#endif + kOtherType // anything else }; // TypeWithoutFormatter::PrintValue(value, os) is called @@ -137,7 +150,8 @@ class TypeWithoutFormatter { public: // This default version is called when kTypeKind is kOtherType. static void PrintValue(const T& value, ::std::ostream* os) { - PrintBytesInObjectTo(reinterpret_cast(&value), + PrintBytesInObjectTo(static_cast( + reinterpret_cast(&value)), sizeof(value), os); } }; @@ -151,10 +165,10 @@ template class TypeWithoutFormatter { public: static void PrintValue(const T& value, ::std::ostream* os) { - const ::testing::internal::string short_str = value.ShortDebugString(); - const ::testing::internal::string pretty_str = - short_str.length() <= kProtobufOneLinerMaxLength ? - short_str : ("\n" + value.DebugString()); + std::string pretty_str = value.ShortDebugString(); + if (pretty_str.length() > kProtobufOneLinerMaxLength) { + pretty_str = "\n" + value.DebugString(); + } *os << ("<" + pretty_str + ">"); } }; @@ -175,6 +189,19 @@ class TypeWithoutFormatter { } }; +#if GTEST_HAS_ABSL +template +class TypeWithoutFormatter { + public: + // Since T has neither operator<< nor PrintTo() but can be implicitly + // converted to absl::string_view, we print it as a absl::string_view. + // + // Note: the implementation is further below, as it depends on + // internal::PrintTo symbol which is defined later in the file. + static void PrintValue(const T& value, ::std::ostream* os); +}; +#endif + // Prints the given value to the given ostream. If the value is a // protocol message, its debug string is printed; if it's an enum or // of a type implicitly convertible to BiggestInt, it's printed as an @@ -202,10 +229,19 @@ class TypeWithoutFormatter { template ::std::basic_ostream& operator<<( ::std::basic_ostream& os, const T& x) { - TypeWithoutFormatter::value ? kProtobuf : - internal::ImplicitlyConvertible::value ? - kConvertibleToInteger : kOtherType)>::PrintValue(x, &os); + TypeWithoutFormatter::value + ? kProtobuf + : internal::ImplicitlyConvertible< + const T&, internal::BiggestInt>::value + ? kConvertibleToInteger + : +#if GTEST_HAS_ABSL + internal::ImplicitlyConvertible< + const T&, absl::string_view>::value + ? kConvertibleToStringView + : +#endif + kOtherType)>::PrintValue(x, &os); return os; } @@ -364,11 +400,18 @@ class UniversalPrinter; template void UniversalPrint(const T& value, ::std::ostream* os); +enum DefaultPrinterType { + kPrintContainer, + kPrintPointer, + kPrintFunctionPointer, + kPrintOther, +}; +template struct WrapPrinterType {}; + // Used to print an STL-style container when the user doesn't define // a PrintTo() for it. template -void DefaultPrintTo(IsContainer /* dummy */, - false_type /* is not a pointer */, +void DefaultPrintTo(WrapPrinterType /* dummy */, const C& container, ::std::ostream* os) { const size_t kMaxCount = 32; // The maximum number of elements to print. *os << '{'; @@ -401,40 +444,34 @@ void DefaultPrintTo(IsContainer /* dummy */, // implementation-defined. Therefore they will be printed as raw // bytes.) template -void DefaultPrintTo(IsNotContainer /* dummy */, - true_type /* is a pointer */, +void DefaultPrintTo(WrapPrinterType /* dummy */, T* p, ::std::ostream* os) { if (p == NULL) { *os << "NULL"; } else { - // C++ doesn't allow casting from a function pointer to any object - // pointer. - // - // IsTrue() silences warnings: "Condition is always true", - // "unreachable code". - if (IsTrue(ImplicitlyConvertible::value)) { - // T is not a function type. We just call << to print p, - // relying on ADL to pick up user-defined << for their pointer - // types, if any. - *os << p; - } else { - // T is a function type, so '*os << p' doesn't do what we want - // (it just prints p as bool). We want to print p as a const - // void*. However, we cannot cast it to const void* directly, - // even using reinterpret_cast, as earlier versions of gcc - // (e.g. 3.4.5) cannot compile the cast when p is a function - // pointer. Casting to UInt64 first solves the problem. - *os << reinterpret_cast( - reinterpret_cast(p)); - } + // T is not a function type. We just call << to print p, + // relying on ADL to pick up user-defined << for their pointer + // types, if any. + *os << p; + } +} +template +void DefaultPrintTo(WrapPrinterType /* dummy */, + T* p, ::std::ostream* os) { + if (p == NULL) { + *os << "NULL"; + } else { + // T is a function type, so '*os << p' doesn't do what we want + // (it just prints p as bool). We want to print p as a const + // void*. + *os << reinterpret_cast(p); } } // Used to print a non-container, non-pointer value when the user // doesn't define PrintTo() for it. template -void DefaultPrintTo(IsNotContainer /* dummy */, - false_type /* is not a pointer */, +void DefaultPrintTo(WrapPrinterType /* dummy */, const T& value, ::std::ostream* os) { ::testing_internal::DefaultPrintNonContainerTo(value, os); } @@ -452,11 +489,8 @@ void DefaultPrintTo(IsNotContainer /* dummy */, // wants). template void PrintTo(const T& value, ::std::ostream* os) { - // DefaultPrintTo() is overloaded. The type of its first two - // arguments determine which version will be picked. If T is an - // STL-style container, the version for container will be called; if - // T is a pointer, the pointer version will be called; otherwise the - // generic version will be called. + // DefaultPrintTo() is overloaded. The type of its first argument + // determines which version will be picked. // // Note that we check for container types here, prior to we check // for protocol message types in our operator<<. The rationale is: @@ -468,13 +502,27 @@ void PrintTo(const T& value, ::std::ostream* os) { // elements; therefore we check for container types here to ensure // that our format is used. // - // The second argument of DefaultPrintTo() is needed to bypass a bug - // in Symbian's C++ compiler that prevents it from picking the right - // overload between: - // - // PrintTo(const T& x, ...); - // PrintTo(T* x, ...); - DefaultPrintTo(IsContainerTest(0), is_pointer(), value, os); + // Note that MSVC and clang-cl do allow an implicit conversion from + // pointer-to-function to pointer-to-object, but clang-cl warns on it. + // So don't use ImplicitlyConvertible if it can be helped since it will + // cause this warning, and use a separate overload of DefaultPrintTo for + // function pointers so that the `*os << p` in the object pointer overload + // doesn't cause that warning either. + DefaultPrintTo( + WrapPrinterType < + (sizeof(IsContainerTest(0)) == sizeof(IsContainer)) && + !IsRecursiveContainer::value + ? kPrintContainer + : !is_pointer::value + ? kPrintOther +#if GTEST_LANG_CXX11 + : std::is_function::type>::value +#else + : !internal::ImplicitlyConvertible::value +#endif + ? kPrintFunctionPointer + : kPrintPointer > (), + value, os); } // The following list of PrintTo() overloads tells @@ -581,6 +629,13 @@ inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) { } #endif // GTEST_HAS_STD_WSTRING +#if GTEST_HAS_ABSL +// Overload for absl::string_view. +inline void PrintTo(absl::string_view sp, ::std::ostream* os) { + PrintTo(::std::string(sp), os); +} +#endif // GTEST_HAS_ABSL + #if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_ // Helper function for printing a tuple. T must be instantiated with // a tuple type. @@ -710,6 +765,26 @@ class UniversalPrinter { GTEST_DISABLE_MSC_WARNINGS_POP_() }; +#if GTEST_HAS_ABSL + +// Printer for absl::optional + +template +class UniversalPrinter<::absl::optional> { + public: + static void Print(const ::absl::optional& value, ::std::ostream* os) { + *os << '('; + if (!value) { + *os << "nullopt"; + } else { + UniversalPrint(*value, os); + } + *os << ')'; + } +}; + +#endif // GTEST_HAS_ABSL + // UniversalPrintArray(begin, len, os) prints an array of 'len' // elements, starting at address 'begin'. template @@ -805,7 +880,7 @@ class UniversalTersePrinter { if (str == NULL) { *os << "NULL"; } else { - UniversalPrint(string(str), os); + UniversalPrint(std::string(str), os); } } }; @@ -856,7 +931,7 @@ void UniversalPrint(const T& value, ::std::ostream* os) { UniversalPrinter::Print(value, os); } -typedef ::std::vector Strings; +typedef ::std::vector< ::std::string> Strings; // TuplePolicy must provide: // - tuple_size @@ -976,6 +1051,16 @@ Strings UniversalTersePrintTupleFieldsToStrings(const Tuple& value) { } // namespace internal +#if GTEST_HAS_ABSL +namespace internal2 { +template +void TypeWithoutFormatter::PrintValue( + const T& value, ::std::ostream* os) { + internal::PrintTo(absl::string_view(value), os); +} +} // namespace internal2 +#endif + template ::std::string PrintToString(const T& value) { ::std::stringstream ss; diff --git a/test/gtest-1.8.0/include/gtest/gtest-spi.h b/test/gtest-1.8.0/include/gtest/gtest-spi.h index f63fa9a1b2..0e5c10cf7c 100644 --- a/test/gtest-1.8.0/include/gtest/gtest-spi.h +++ b/test/gtest-1.8.0/include/gtest/gtest-spi.h @@ -97,13 +97,12 @@ class GTEST_API_ SingleFailureChecker { public: // The constructor remembers the arguments. SingleFailureChecker(const TestPartResultArray* results, - TestPartResult::Type type, - const string& substr); + TestPartResult::Type type, const std::string& substr); ~SingleFailureChecker(); private: const TestPartResultArray* const results_; const TestPartResult::Type type_; - const string substr_; + const std::string substr_; GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker); }; diff --git a/test/gtest-1.8.0/include/gtest/gtest-typed-test.h b/test/gtest-1.8.0/include/gtest/gtest-typed-test.h index 5f69d5678e..759d1dbdf2 100644 --- a/test/gtest-1.8.0/include/gtest/gtest-typed-test.h +++ b/test/gtest-1.8.0/include/gtest/gtest-typed-test.h @@ -241,9 +241,10 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes); namespace GTEST_CASE_NAMESPACE_(CaseName) { \ typedef ::testing::internal::Templates<__VA_ARGS__>::type gtest_AllTests_; \ } \ - static const char* const GTEST_REGISTERED_TEST_NAMES_(CaseName) = \ - GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).VerifyRegisteredTestNames(\ - __FILE__, __LINE__, #__VA_ARGS__) + static const char* const GTEST_REGISTERED_TEST_NAMES_(CaseName) \ + GTEST_ATTRIBUTE_UNUSED_ = \ + GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).VerifyRegisteredTestNames( \ + __FILE__, __LINE__, #__VA_ARGS__) // The 'Types' template argument below must have spaces around it // since some compilers may choke on '>>' when passing a template diff --git a/test/gtest-1.8.0/include/gtest/gtest.h b/test/gtest-1.8.0/include/gtest/gtest.h index f846c5bd66..686750e020 100644 --- a/test/gtest-1.8.0/include/gtest/gtest.h +++ b/test/gtest-1.8.0/include/gtest/gtest.h @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) // // This header file defines the public API for Google Test. It should be // included by any test program that uses Google Test. @@ -82,6 +82,15 @@ namespace testing { +// Silence C4100 (unreferenced formal parameter) and 4805 +// unsafe mix of type 'const int' and type 'const bool' +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable:4805) +# pragma warning(disable:4100) +#endif + + // Declares the flags. // This flag temporary enables the disabled tests. @@ -115,6 +124,9 @@ GTEST_DECLARE_string_(output); // test. GTEST_DECLARE_bool_(print_time); +// This flags control whether Google Test prints UTF8 characters as text. +GTEST_DECLARE_bool_(print_utf8); + // This flag specifies the random number seed. GTEST_DECLARE_int32_(random_seed); @@ -135,7 +147,7 @@ GTEST_DECLARE_int32_(stack_trace_depth); // When this flag is specified, a failed assertion will throw an // exception if exceptions are enabled, or exit the program with a -// non-zero code otherwise. +// non-zero code otherwise. For use with an external test framework. GTEST_DECLARE_bool_(throw_on_failure); // When this flag is set with a "host:port" string, on supported @@ -160,6 +172,7 @@ class TestEventListenersAccessor; class TestEventRepeater; class UnitTestRecordPropertyTestHelper; class WindowsDeathTest; +class FuchsiaDeathTest; class UnitTestImpl* GetUnitTestImpl(); void ReportFailureInUnknownLocation(TestPartResult::Type result_type, const std::string& message); @@ -259,7 +272,9 @@ class GTEST_API_ AssertionResult { // Used in EXPECT_TRUE/FALSE(assertion_result). AssertionResult(const AssertionResult& other); +#if defined(_MSC_VER) && _MSC_VER < 1910 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */) +#endif // Used in the EXPECT_TRUE/FALSE(bool_expression). // @@ -276,7 +291,9 @@ class GTEST_API_ AssertionResult { /*enabler*/ = NULL) : success_(success) {} +#if defined(_MSC_VER) && _MSC_VER < 1910 GTEST_DISABLE_MSC_WARNINGS_POP_() +#endif // Assignment operator. AssertionResult& operator=(AssertionResult other) { @@ -345,6 +362,15 @@ GTEST_API_ AssertionResult AssertionFailure(); // Deprecated; use AssertionFailure() << msg. GTEST_API_ AssertionResult AssertionFailure(const Message& msg); +} // namespace testing + +// Includes the auto-generated header that implements a family of generic +// predicate assertion macros. This include comes late because it relies on +// APIs declared above. +#include "gtest/gtest_pred_impl.h" + +namespace testing { + // The abstract class that all tests inherit from. // // In Google Test, a unit test program contains one or many TestCases, and @@ -355,7 +381,7 @@ GTEST_API_ AssertionResult AssertionFailure(const Message& msg); // this for you. // // The only time you derive from Test is when defining a test fixture -// to be used a TEST_F. For example: +// to be used in a TEST_F. For example: // // class FooTest : public testing::Test { // protected: @@ -550,9 +576,8 @@ class GTEST_API_ TestResult { // Returns the elapsed time, in milliseconds. TimeInMillis elapsed_time() const { return elapsed_time_; } - // Returns the i-th test part result among all the results. i can range - // from 0 to test_property_count() - 1. If i is not in that range, aborts - // the program. + // Returns the i-th test part result among all the results. i can range from 0 + // to total_part_count() - 1. If i is not in that range, aborts the program. const TestPartResult& GetTestPartResult(int i) const; // Returns the i-th test property. i can range from 0 to @@ -569,6 +594,7 @@ class GTEST_API_ TestResult { friend class internal::TestResultAccessor; friend class internal::UnitTestImpl; friend class internal::WindowsDeathTest; + friend class internal::FuchsiaDeathTest; // Gets the vector of TestPartResults. const std::vector& test_part_results() const { @@ -675,6 +701,9 @@ class GTEST_API_ TestInfo { // Returns the line where this test is defined. int line() const { return location_.line; } + // Return true if this test should not be run because it's in another shard. + bool is_in_another_shard() const { return is_in_another_shard_; } + // Returns true if this test should run, that is if the test is not // disabled (or it is disabled but the also_run_disabled_tests flag has // been specified) and its full name matches the user-specified filter. @@ -695,10 +724,9 @@ class GTEST_API_ TestInfo { // Returns true iff this test will appear in the XML report. bool is_reportable() const { - // For now, the XML report includes all tests matching the filter. - // In the future, we may trim tests that are excluded because of - // sharding. - return matches_filter_; + // The XML report includes tests matching the filter, excluding those + // run in other shards. + return matches_filter_ && !is_in_another_shard_; } // Returns the result of the test. @@ -762,6 +790,7 @@ class GTEST_API_ TestInfo { bool is_disabled_; // True iff this test is disabled bool matches_filter_; // True if this test matches the // user-specified filter. + bool is_in_another_shard_; // Will be run in another shard. internal::TestFactoryBase* const factory_; // The factory that creates // the test object @@ -986,6 +1015,18 @@ class Environment { virtual Setup_should_be_spelled_SetUp* Setup() { return NULL; } }; +#if GTEST_HAS_EXCEPTIONS + +// Exception which can be thrown from TestEventListener::OnTestPartResult. +class GTEST_API_ AssertionException + : public internal::GoogleTestFailureException { + public: + explicit AssertionException(const TestPartResult& result) + : GoogleTestFailureException(result) {} +}; + +#endif // GTEST_HAS_EXCEPTIONS + // The interface for tracing execution of tests. The methods are organized in // the order the corresponding events are fired. class TestEventListener { @@ -1014,6 +1055,8 @@ class TestEventListener { virtual void OnTestStart(const TestInfo& test_info) = 0; // Fired after a failed assertion or a SUCCEED() invocation. + // If you want to throw an exception from this function to skip to the next + // TEST, it must be AssertionException defined above, or inherited from it. virtual void OnTestPartResult(const TestPartResult& test_part_result) = 0; // Fired after the test ends. @@ -1180,14 +1223,12 @@ class GTEST_API_ UnitTest { // Returns the random seed used at the start of the current test run. int random_seed() const; -#if GTEST_HAS_PARAM_TEST // Returns the ParameterizedTestCaseRegistry object used to keep track of // value-parameterized tests and instantiate and register them. // // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. internal::ParameterizedTestCaseRegistry& parameterized_test_registry() GTEST_LOCK_EXCLUDED_(mutex_); -#endif // GTEST_HAS_PARAM_TEST // Gets the number of successful test cases. int successful_test_case_count() const; @@ -1287,11 +1328,11 @@ class GTEST_API_ UnitTest { internal::UnitTestImpl* impl() { return impl_; } const internal::UnitTestImpl* impl() const { return impl_; } - // These classes and funcions are friends as they need to access private + // These classes and functions are friends as they need to access private // members of UnitTest. + friend class ScopedTrace; friend class Test; friend class internal::AssertHelper; - friend class internal::ScopedTrace; friend class internal::StreamingListenerTest; friend class internal::UnitTestRecordPropertyTestHelper; friend Environment* AddGlobalTestEnvironment(Environment* env); @@ -1388,11 +1429,9 @@ AssertionResult CmpHelperEQ(const char* lhs_expression, const char* rhs_expression, const T1& lhs, const T2& rhs) { -GTEST_DISABLE_MSC_WARNINGS_PUSH_(4389 /* signed/unsigned mismatch */) if (lhs == rhs) { return AssertionSuccess(); } -GTEST_DISABLE_MSC_WARNINGS_POP_() return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs); } @@ -1706,7 +1745,6 @@ class GTEST_API_ AssertHelper { } // namespace internal -#if GTEST_HAS_PARAM_TEST // The pure interface class that all value-parameterized tests inherit from. // A value-parameterized class must inherit from both ::testing::Test and // ::testing::WithParamInterface. In most cases that just means inheriting @@ -1783,8 +1821,6 @@ template class TestWithParam : public Test, public WithParamInterface { }; -#endif // GTEST_HAS_PARAM_TEST - // Macros for indicating success/failure in test code. // ADD_FAILURE unconditionally adds a failure to the current test. @@ -1857,22 +1893,18 @@ class TestWithParam : public Test, public WithParamInterface { // AssertionResult. For more information on how to use AssertionResult with // these macros see comments on that class. #define EXPECT_TRUE(condition) \ - GTEST_TEST_BOOLEAN_((condition), #condition, false, true, \ + GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \ GTEST_NONFATAL_FAILURE_) #define EXPECT_FALSE(condition) \ GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \ GTEST_NONFATAL_FAILURE_) #define ASSERT_TRUE(condition) \ - GTEST_TEST_BOOLEAN_((condition), #condition, false, true, \ + GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \ GTEST_FATAL_FAILURE_) #define ASSERT_FALSE(condition) \ GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \ GTEST_FATAL_FAILURE_) -// Includes the auto-generated header that implements a family of -// generic predicate assertion macros. -#include "gtest/gtest_pred_impl.h" - // Macros for testing equalities and inequalities. // // * {ASSERT|EXPECT}_EQ(v1, v2): Tests that v1 == v2 @@ -1914,8 +1946,8 @@ class TestWithParam : public Test, public WithParamInterface { // // Examples: // -// EXPECT_NE(5, Foo()); -// EXPECT_EQ(NULL, a_pointer); +// EXPECT_NE(Foo(), 5); +// EXPECT_EQ(a_pointer, NULL); // ASSERT_LT(i, array_size); // ASSERT_GT(records.size(), 0) << "There is no record left."; @@ -2101,6 +2133,57 @@ GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2, #define EXPECT_NO_FATAL_FAILURE(statement) \ GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_NONFATAL_FAILURE_) +// Causes a trace (including the given source file path and line number, +// and the given message) to be included in every test failure message generated +// by code in the scope of the lifetime of an instance of this class. The effect +// is undone with the destruction of the instance. +// +// The message argument can be anything streamable to std::ostream. +// +// Example: +// testing::ScopedTrace trace("file.cc", 123, "message"); +// +class GTEST_API_ ScopedTrace { + public: + // The c'tor pushes the given source file location and message onto + // a trace stack maintained by Google Test. + + // Template version. Uses Message() to convert the values into strings. + // Slow, but flexible. + template + ScopedTrace(const char* file, int line, const T& message) { + PushTrace(file, line, (Message() << message).GetString()); + } + + // Optimize for some known types. + ScopedTrace(const char* file, int line, const char* message) { + PushTrace(file, line, message ? message : "(null)"); + } + +#if GTEST_HAS_GLOBAL_STRING + ScopedTrace(const char* file, int line, const ::string& message) { + PushTrace(file, line, message); + } +#endif + + ScopedTrace(const char* file, int line, const std::string& message) { + PushTrace(file, line, message); + } + + // The d'tor pops the info pushed by the c'tor. + // + // Note that the d'tor is not virtual in order to be efficient. + // Don't inherit from ScopedTrace! + ~ScopedTrace(); + + private: + void PushTrace(const char* file, int line, std::string message); + + GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace); +} GTEST_ATTRIBUTE_UNUSED_; // A ScopedTrace object does its job in its + // c'tor and d'tor. Therefore it doesn't + // need to be used otherwise. + // Causes a trace (including the source file path, the current line // number, and the given message) to be included in every test failure // message generated by code in the current scope. The effect is @@ -2112,9 +2195,14 @@ GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2, // of the dummy variable name, thus allowing multiple SCOPED_TRACE()s // to appear in the same block - as long as they are on different // lines. +// +// Assuming that each thread maintains its own stack of traces. +// Therefore, a SCOPED_TRACE() would (correctly) only affect the +// assertions in its own thread. #define SCOPED_TRACE(message) \ - ::testing::internal::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\ - __FILE__, __LINE__, ::testing::Message() << (message)) + ::testing::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\ + __FILE__, __LINE__, (message)) + // Compile-time assertion for type equality. // StaticAssertTypeEq() compiles iff type1 and type2 are @@ -2194,7 +2282,7 @@ bool StaticAssertTypeEq() { // name of the test within the test case. // // A test fixture class must be declared earlier. The user should put -// his test code between braces after using this macro. Example: +// the test code between braces after using this macro. Example: // // class FooTest : public testing::Test { // protected: @@ -2209,14 +2297,22 @@ bool StaticAssertTypeEq() { // } // // TEST_F(FooTest, ReturnsElementCountCorrectly) { -// EXPECT_EQ(0, a_.size()); -// EXPECT_EQ(1, b_.size()); +// EXPECT_EQ(a_.size(), 0); +// EXPECT_EQ(b_.size(), 1); // } #define TEST_F(test_fixture, test_name)\ GTEST_TEST_(test_fixture, test_name, test_fixture, \ ::testing::internal::GetTypeId()) +// Returns a path to temporary directory. +// Tries to determine an appropriate directory for the platform. +GTEST_API_ std::string TempDir(); + +#ifdef _MSC_VER +# pragma warning(pop) +#endif + } // namespace testing // Use this function in main() to run all tests. It returns 0 if all diff --git a/test/gtest-1.8.0/include/gtest/gtest_pred_impl.h b/test/gtest-1.8.0/include/gtest/gtest_pred_impl.h index 30ae712f50..c8be230ed6 100644 --- a/test/gtest-1.8.0/include/gtest/gtest_pred_impl.h +++ b/test/gtest-1.8.0/include/gtest/gtest_pred_impl.h @@ -27,7 +27,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// This file is AUTOMATICALLY GENERATED on 10/31/2011 by command +// This file is AUTOMATICALLY GENERATED on 01/02/2018 by command // 'gen_gtest_pred_impl.py 5'. DO NOT EDIT BY HAND! // // Implements a family of generic predicate assertion macros. @@ -35,10 +35,9 @@ #ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ #define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ -// Makes sure this header is not included before gtest.h. -#ifndef GTEST_INCLUDE_GTEST_GTEST_H_ -# error Do not include gtest_pred_impl.h directly. Include gtest.h instead. -#endif // GTEST_INCLUDE_GTEST_GTEST_H_ +#include "gtest/gtest.h" + +namespace testing { // This header implements a family of generic predicate assertion // macros: @@ -66,8 +65,6 @@ // We also define the EXPECT_* variations. // // For now we only support predicates whose arity is at most 5. -// Please email googletestframework@googlegroups.com if you need -// support for higher arities. // GTEST_ASSERT_ is the basic statement to which all of the assertions // in this file reduce. Don't use this in your code. @@ -355,4 +352,6 @@ AssertionResult AssertPred5Helper(const char* pred_text, +} // namespace testing + #endif // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ diff --git a/test/gtest-1.8.0/include/gtest/gtest_prod.h b/test/gtest-1.8.0/include/gtest/gtest_prod.h index da80ddc6c7..89314f4058 100644 --- a/test/gtest-1.8.0/include/gtest/gtest_prod.h +++ b/test/gtest-1.8.0/include/gtest/gtest_prod.h @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) // -// Google C++ Testing Framework definitions useful in production code. +// Google C++ Testing and Mocking Framework definitions useful in production code. #ifndef GTEST_INCLUDE_GTEST_GTEST_PROD_H_ #define GTEST_INCLUDE_GTEST_GTEST_PROD_H_ @@ -40,17 +40,20 @@ // // class MyClass { // private: -// void MyMethod(); -// FRIEND_TEST(MyClassTest, MyMethod); +// void PrivateMethod(); +// FRIEND_TEST(MyClassTest, PrivateMethodWorks); // }; // // class MyClassTest : public testing::Test { // // ... // }; // -// TEST_F(MyClassTest, MyMethod) { -// // Can call MyClass::MyMethod() here. +// TEST_F(MyClassTest, PrivateMethodWorks) { +// // Can call MyClass::PrivateMethod() here. // } +// +// Note: The test class must be in the same namespace as the class being tested. +// For example, putting MyClassTest in an anonymous namespace will not work. #define FRIEND_TEST(test_case_name, test_name)\ friend class test_case_name##_##test_name##_Test diff --git a/test/gtest-1.8.0/include/gtest/internal/custom/gtest-port.h b/test/gtest-1.8.0/include/gtest/internal/custom/gtest-port.h index 7e744bd3bb..94884c15bc 100644 --- a/test/gtest-1.8.0/include/gtest/internal/custom/gtest-port.h +++ b/test/gtest-1.8.0/include/gtest/internal/custom/gtest-port.h @@ -61,6 +61,12 @@ // GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks) // GTEST_LOCK_EXCLUDED_(locks) // +// Underlying library support features: +// GTEST_HAS_CXXABI_H_ +// +// Exporting API symbols: +// GTEST_API_ - Specifier for exported symbols. +// // ** Custom implementation starts here ** #ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/custom/gtest.h b/test/gtest-1.8.0/include/gtest/internal/custom/gtest.h index c27412a898..6f7c5e40ad 100644 --- a/test/gtest-1.8.0/include/gtest/internal/custom/gtest.h +++ b/test/gtest-1.8.0/include/gtest/internal/custom/gtest.h @@ -33,6 +33,10 @@ // GTEST_OS_STACK_TRACE_GETTER_ - The name of an implementation of // OsStackTraceGetterInterface. // +// GTEST_CUSTOM_TEMPDIR_FUNCTION_ - An override for testing::TempDir(). +// See testing::TempDir for semantics and +// signature. +// // ** Custom implementation starts here ** #ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-death-test-internal.h b/test/gtest-1.8.0/include/gtest/internal/gtest-death-test-internal.h index 2b3a78f5bf..949c429840 100644 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-death-test-internal.h +++ b/test/gtest-1.8.0/include/gtest/internal/gtest-death-test-internal.h @@ -27,9 +27,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee) // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) // // This header file defines internal utilities needed for implementing // death tests. They are subject to change without notice. @@ -218,14 +217,18 @@ GTEST_API_ bool ExitedUnsuccessfully(int exit_status); // can be streamed. // This macro is for implementing ASSERT/EXPECT_DEBUG_DEATH when compiled in -// NDEBUG mode. In this case we need the statements to be executed, the regex is -// ignored, and the macro must accept a streamed message even though the message -// is never printed. -# define GTEST_EXECUTE_STATEMENT_(statement, regex) \ - GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ - if (::testing::internal::AlwaysTrue()) { \ - GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ - } else \ +// NDEBUG mode. In this case we need the statements to be executed and the macro +// must accept a streamed message even though the message is never printed. +// The regex object is not evaluated, but it is used to prevent "unused" +// warnings and to avoid an expression that doesn't compile in debug mode. +#define GTEST_EXECUTE_STATEMENT_(statement, regex) \ + GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ + if (::testing::internal::AlwaysTrue()) { \ + GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ + } else if (!::testing::internal::AlwaysTrue()) { \ + const ::testing::internal::RE& gtest_regex = (regex); \ + static_cast(gtest_regex); \ + } else \ ::testing::Message() // A class representing the parsed contents of the @@ -264,53 +267,6 @@ class InternalRunDeathTestFlag { // the flag is specified; otherwise returns NULL. InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag(); -#else // GTEST_HAS_DEATH_TEST - -// This macro is used for implementing macros such as -// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED on systems where -// death tests are not supported. Those macros must compile on such systems -// iff EXPECT_DEATH and ASSERT_DEATH compile with the same parameters on -// systems that support death tests. This allows one to write such a macro -// on a system that does not support death tests and be sure that it will -// compile on a death-test supporting system. -// -// Parameters: -// statement - A statement that a macro such as EXPECT_DEATH would test -// for program termination. This macro has to make sure this -// statement is compiled but not executed, to ensure that -// EXPECT_DEATH_IF_SUPPORTED compiles with a certain -// parameter iff EXPECT_DEATH compiles with it. -// regex - A regex that a macro such as EXPECT_DEATH would use to test -// the output of statement. This parameter has to be -// compiled but not evaluated by this macro, to ensure that -// this macro only accepts expressions that a macro such as -// EXPECT_DEATH would accept. -// terminator - Must be an empty statement for EXPECT_DEATH_IF_SUPPORTED -// and a return statement for ASSERT_DEATH_IF_SUPPORTED. -// This ensures that ASSERT_DEATH_IF_SUPPORTED will not -// compile inside functions where ASSERT_DEATH doesn't -// compile. -// -// The branch that has an always false condition is used to ensure that -// statement and regex are compiled (and thus syntactically correct) but -// never executed. The unreachable code macro protects the terminator -// statement from generating an 'unreachable code' warning in case -// statement unconditionally returns or throws. The Message constructor at -// the end allows the syntax of streaming additional messages into the -// macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH. -# define GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, terminator) \ - GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ - if (::testing::internal::AlwaysTrue()) { \ - GTEST_LOG_(WARNING) \ - << "Death tests are not supported on this platform.\n" \ - << "Statement '" #statement "' cannot be verified."; \ - } else if (::testing::internal::AlwaysFalse()) { \ - ::testing::internal::RE::PartialMatch(".*", (regex)); \ - GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ - terminator; \ - } else \ - ::testing::Message() - #endif // GTEST_HAS_DEATH_TEST } // namespace internal diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-filepath.h b/test/gtest-1.8.0/include/gtest/internal/gtest-filepath.h index 7a13b4b0de..406597a44f 100644 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-filepath.h +++ b/test/gtest-1.8.0/include/gtest/internal/gtest-filepath.h @@ -27,14 +27,13 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Author: keith.ray@gmail.com (Keith Ray) // // Google Test filepath utilities // // This header file declares classes and functions used internally by // Google Test. They are subject to change without notice. // -// This file is #included in . +// This file is #included in gtest/internal/gtest-internal.h. // Do not include this header file separately! #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-internal.h b/test/gtest-1.8.0/include/gtest/internal/gtest-internal.h index ebd1cf615d..fc65b1f2bd 100644 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-internal.h +++ b/test/gtest-1.8.0/include/gtest/internal/gtest-internal.h @@ -27,9 +27,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee) // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) // // This header file declares functions and macros used internally by // Google Test. They are subject to change without notice. @@ -61,8 +60,8 @@ #include #include "gtest/gtest-message.h" -#include "gtest/internal/gtest-string.h" #include "gtest/internal/gtest-filepath.h" +#include "gtest/internal/gtest-string.h" #include "gtest/internal/gtest-type-util.h" // Due to C++ preprocessor weirdness, we need double indirection to @@ -76,6 +75,9 @@ #define GTEST_CONCAT_TOKEN_(foo, bar) GTEST_CONCAT_TOKEN_IMPL_(foo, bar) #define GTEST_CONCAT_TOKEN_IMPL_(foo, bar) foo ## bar +// Stringifies its argument. +#define GTEST_STRINGIFY_(name) #name + class ProtocolMessage; namespace proto2 { class Message; } @@ -96,7 +98,6 @@ template namespace internal { struct TraceInfo; // Information about a trace point. -class ScopedTrace; // Implements scoped trace. class TestInfoImpl; // Opaque implementation of TestInfo class UnitTestImpl; // Opaque implementation of UnitTest @@ -152,30 +153,11 @@ class GTEST_API_ GoogleTestFailureException : public ::std::runtime_error { #endif // GTEST_HAS_EXCEPTIONS -// A helper class for creating scoped traces in user programs. -class GTEST_API_ ScopedTrace { - public: - // The c'tor pushes the given source file location and message onto - // a trace stack maintained by Google Test. - ScopedTrace(const char* file, int line, const Message& message); - - // The d'tor pops the info pushed by the c'tor. - // - // Note that the d'tor is not virtual in order to be efficient. - // Don't inherit from ScopedTrace! - ~ScopedTrace(); - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace); -} GTEST_ATTRIBUTE_UNUSED_; // A ScopedTrace object does its job in its - // c'tor and d'tor. Therefore it doesn't - // need to be used otherwise. - namespace edit_distance { // Returns the optimal edits to go from 'left' to 'right'. // All edits cost the same, with replace having lower priority than // add/remove. -// Simple implementation of the Wagner–Fischer algorithm. +// Simple implementation of the Wagner-Fischer algorithm. // See http://en.wikipedia.org/wiki/Wagner-Fischer_algorithm enum EditType { kMatch, kAdd, kRemove, kReplace }; GTEST_API_ std::vector CalculateOptimalEdits( @@ -502,9 +484,10 @@ typedef void (*SetUpTestCaseFunc)(); typedef void (*TearDownTestCaseFunc)(); struct CodeLocation { - CodeLocation(const string& a_file, int a_line) : file(a_file), line(a_line) {} + CodeLocation(const std::string& a_file, int a_line) + : file(a_file), line(a_line) {} - string file; + std::string file; int line; }; @@ -627,7 +610,7 @@ class TypeParameterizedTest { // Types). Valid values for 'index' are [0, N - 1] where N is the // length of Types. static bool Register(const char* prefix, - CodeLocation code_location, + const CodeLocation& code_location, const char* case_name, const char* test_names, int index) { typedef typename Types::Head Type; @@ -658,7 +641,7 @@ class TypeParameterizedTest { template class TypeParameterizedTest { public: - static bool Register(const char* /*prefix*/, CodeLocation, + static bool Register(const char* /*prefix*/, const CodeLocation&, const char* /*case_name*/, const char* /*test_names*/, int /*index*/) { return true; @@ -704,7 +687,7 @@ class TypeParameterizedTestCase { template class TypeParameterizedTestCase { public: - static bool Register(const char* /*prefix*/, CodeLocation, + static bool Register(const char* /*prefix*/, const CodeLocation&, const TypedTestCasePState* /*state*/, const char* /*case_name*/, const char* /*test_names*/) { return true; @@ -823,31 +806,6 @@ struct RemoveConst { #define GTEST_REMOVE_REFERENCE_AND_CONST_(T) \ GTEST_REMOVE_CONST_(GTEST_REMOVE_REFERENCE_(T)) -// Adds reference to a type if it is not a reference type, -// otherwise leaves it unchanged. This is the same as -// tr1::add_reference, which is not widely available yet. -template -struct AddReference { typedef T& type; }; // NOLINT -template -struct AddReference { typedef T& type; }; // NOLINT - -// A handy wrapper around AddReference that works when the argument T -// depends on template parameters. -#define GTEST_ADD_REFERENCE_(T) \ - typename ::testing::internal::AddReference::type - -// Adds a reference to const on top of T as necessary. For example, -// it transforms -// -// char ==> const char& -// const char ==> const char& -// char& ==> const char& -// const char& ==> const char& -// -// The argument T must depend on some template parameters. -#define GTEST_REFERENCE_TO_CONST_(T) \ - GTEST_ADD_REFERENCE_(const GTEST_REMOVE_REFERENCE_(T)) - // ImplicitlyConvertible::value is a compile-time bool // constant that's true iff type From can be implicitly converted to // type To. @@ -917,8 +875,11 @@ struct IsAProtocolMessage // a container class by checking the type of IsContainerTest(0). // The value of the expression is insignificant. // -// Note that we look for both C::iterator and C::const_iterator. The -// reason is that C++ injects the name of a class as a member of the +// In C++11 mode we check the existence of a const_iterator and that an +// iterator is properly implemented for the container. +// +// For pre-C++11 that we look for both C::iterator and C::const_iterator. +// The reason is that C++ injects the name of a class as a member of the // class itself (e.g. you can refer to class iterator as either // 'iterator' or 'iterator::iterator'). If we look for C::iterator // only, for example, we would mistakenly think that a class named @@ -928,17 +889,96 @@ struct IsAProtocolMessage // IsContainerTest(typename C::const_iterator*) and // IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++. typedef int IsContainer; +#if GTEST_LANG_CXX11 +template ().begin()), + class = decltype(::std::declval().end()), + class = decltype(++::std::declval()), + class = decltype(*::std::declval()), + class = typename C::const_iterator> +IsContainer IsContainerTest(int /* dummy */) { + return 0; +} +#else template IsContainer IsContainerTest(int /* dummy */, typename C::iterator* /* it */ = NULL, typename C::const_iterator* /* const_it */ = NULL) { return 0; } +#endif // GTEST_LANG_CXX11 typedef char IsNotContainer; template IsNotContainer IsContainerTest(long /* dummy */) { return '\0'; } +// Trait to detect whether a type T is a hash table. +// The heuristic used is that the type contains an inner type `hasher` and does +// not contain an inner type `reverse_iterator`. +// If the container is iterable in reverse, then order might actually matter. +template +struct IsHashTable { + private: + template + static char test(typename U::hasher*, typename U::reverse_iterator*); + template + static int test(typename U::hasher*, ...); + template + static char test(...); + + public: + static const bool value = sizeof(test(0, 0)) == sizeof(int); +}; + +template +const bool IsHashTable::value; + +template +struct VoidT { + typedef void value_type; +}; + +template +struct HasValueType : false_type {}; +template +struct HasValueType > : true_type { +}; + +template (0)) == sizeof(IsContainer), + bool = HasValueType::value> +struct IsRecursiveContainerImpl; + +template +struct IsRecursiveContainerImpl : public false_type {}; + +// Since the IsRecursiveContainerImpl depends on the IsContainerTest we need to +// obey the same inconsistencies as the IsContainerTest, namely check if +// something is a container is relying on only const_iterator in C++11 and +// is relying on both const_iterator and iterator otherwise +template +struct IsRecursiveContainerImpl : public false_type {}; + +template +struct IsRecursiveContainerImpl { + #if GTEST_LANG_CXX11 + typedef typename IteratorTraits::value_type + value_type; +#else + typedef typename IteratorTraits::value_type value_type; +#endif + typedef is_same type; +}; + +// IsRecursiveContainer is a unary compile-time predicate that +// evaluates whether C is a recursive container type. A recursive container +// type is a container type whose value_type is equal to the container type +// itself. An example for a recursive container type is +// boost::filesystem::path, whose iterator has a value_type that is equal to +// boost::filesystem::path. +template +struct IsRecursiveContainer : public IsRecursiveContainerImpl::type {}; + // EnableIf::type is void when 'Cond' is true, and // undefined when 'Cond' is false. To use SFINAE to make a function // overload only apply when a particular expression is true, add @@ -1070,7 +1110,7 @@ class NativeArray { private: enum { kCheckTypeIsNotConstOrAReference = StaticAssertTypeEqHelper< - Element, GTEST_REMOVE_REFERENCE_AND_CONST_(Element)>::value, + Element, GTEST_REMOVE_REFERENCE_AND_CONST_(Element)>::value }; // Initializes this object with a copy of the input. @@ -1115,7 +1155,7 @@ class NativeArray { #define GTEST_SUCCESS_(message) \ GTEST_MESSAGE_(message, ::testing::TestPartResult::kSuccess) -// Suppresses MSVC warnings 4072 (unreachable code) for the code following +// Suppress MSVC warning 4702 (unreachable code) for the code following // statement if it returns or throws (or doesn't return or throw in some // situations). #define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \ @@ -1235,4 +1275,3 @@ class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) : public parent_class {\ void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody() #endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_ - diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h b/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h index 4d1d81d20f..dcf90c279a 100644 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h +++ b/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h @@ -46,14 +46,9 @@ #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ -// scripts/fuse_gtest.py depends on gtest's own header being #included -// *unconditionally*. Therefore these #includes cannot be moved -// inside #if GTEST_HAS_PARAM_TEST. #include "gtest/internal/gtest-param-util.h" #include "gtest/internal/gtest-port.h" -#if GTEST_HAS_PARAM_TEST - namespace testing { // Forward declarations of ValuesIn(), which is implemented in @@ -3208,7 +3203,7 @@ class CartesianProductGenerator2 virtual ParamIteratorInterface* Clone() const { return new Iterator(*this); } - virtual const ParamType* Current() const { return ¤t_value_; } + virtual const ParamType* Current() const { return current_value_.get(); } virtual bool Equals(const ParamIteratorInterface& other) const { // Having the same base generator guarantees that the other // iterator is of the same type and we can downcast. @@ -3240,7 +3235,7 @@ class CartesianProductGenerator2 void ComputeCurrentValue() { if (!AtEnd()) - current_value_ = ParamType(*current1_, *current2_); + current_value_.reset(new ParamType(*current1_, *current2_)); } bool AtEnd() const { // We must report iterator past the end of the range when either of the @@ -3262,7 +3257,7 @@ class CartesianProductGenerator2 const typename ParamGenerator::iterator begin2_; const typename ParamGenerator::iterator end2_; typename ParamGenerator::iterator current2_; - ParamType current_value_; + linked_ptr current_value_; }; // class CartesianProductGenerator2::Iterator // No implementation - assignment is unsupported. @@ -3331,7 +3326,7 @@ class CartesianProductGenerator3 virtual ParamIteratorInterface* Clone() const { return new Iterator(*this); } - virtual const ParamType* Current() const { return ¤t_value_; } + virtual const ParamType* Current() const { return current_value_.get(); } virtual bool Equals(const ParamIteratorInterface& other) const { // Having the same base generator guarantees that the other // iterator is of the same type and we can downcast. @@ -3367,7 +3362,7 @@ class CartesianProductGenerator3 void ComputeCurrentValue() { if (!AtEnd()) - current_value_ = ParamType(*current1_, *current2_, *current3_); + current_value_.reset(new ParamType(*current1_, *current2_, *current3_)); } bool AtEnd() const { // We must report iterator past the end of the range when either of the @@ -3393,7 +3388,7 @@ class CartesianProductGenerator3 const typename ParamGenerator::iterator begin3_; const typename ParamGenerator::iterator end3_; typename ParamGenerator::iterator current3_; - ParamType current_value_; + linked_ptr current_value_; }; // class CartesianProductGenerator3::Iterator // No implementation - assignment is unsupported. @@ -3472,7 +3467,7 @@ class CartesianProductGenerator4 virtual ParamIteratorInterface* Clone() const { return new Iterator(*this); } - virtual const ParamType* Current() const { return ¤t_value_; } + virtual const ParamType* Current() const { return current_value_.get(); } virtual bool Equals(const ParamIteratorInterface& other) const { // Having the same base generator guarantees that the other // iterator is of the same type and we can downcast. @@ -3512,8 +3507,8 @@ class CartesianProductGenerator4 void ComputeCurrentValue() { if (!AtEnd()) - current_value_ = ParamType(*current1_, *current2_, *current3_, - *current4_); + current_value_.reset(new ParamType(*current1_, *current2_, *current3_, + *current4_)); } bool AtEnd() const { // We must report iterator past the end of the range when either of the @@ -3543,7 +3538,7 @@ class CartesianProductGenerator4 const typename ParamGenerator::iterator begin4_; const typename ParamGenerator::iterator end4_; typename ParamGenerator::iterator current4_; - ParamType current_value_; + linked_ptr current_value_; }; // class CartesianProductGenerator4::Iterator // No implementation - assignment is unsupported. @@ -3630,7 +3625,7 @@ class CartesianProductGenerator5 virtual ParamIteratorInterface* Clone() const { return new Iterator(*this); } - virtual const ParamType* Current() const { return ¤t_value_; } + virtual const ParamType* Current() const { return current_value_.get(); } virtual bool Equals(const ParamIteratorInterface& other) const { // Having the same base generator guarantees that the other // iterator is of the same type and we can downcast. @@ -3674,8 +3669,8 @@ class CartesianProductGenerator5 void ComputeCurrentValue() { if (!AtEnd()) - current_value_ = ParamType(*current1_, *current2_, *current3_, - *current4_, *current5_); + current_value_.reset(new ParamType(*current1_, *current2_, *current3_, + *current4_, *current5_)); } bool AtEnd() const { // We must report iterator past the end of the range when either of the @@ -3709,7 +3704,7 @@ class CartesianProductGenerator5 const typename ParamGenerator::iterator begin5_; const typename ParamGenerator::iterator end5_; typename ParamGenerator::iterator current5_; - ParamType current_value_; + linked_ptr current_value_; }; // class CartesianProductGenerator5::Iterator // No implementation - assignment is unsupported. @@ -3807,7 +3802,7 @@ class CartesianProductGenerator6 virtual ParamIteratorInterface* Clone() const { return new Iterator(*this); } - virtual const ParamType* Current() const { return ¤t_value_; } + virtual const ParamType* Current() const { return current_value_.get(); } virtual bool Equals(const ParamIteratorInterface& other) const { // Having the same base generator guarantees that the other // iterator is of the same type and we can downcast. @@ -3855,8 +3850,8 @@ class CartesianProductGenerator6 void ComputeCurrentValue() { if (!AtEnd()) - current_value_ = ParamType(*current1_, *current2_, *current3_, - *current4_, *current5_, *current6_); + current_value_.reset(new ParamType(*current1_, *current2_, *current3_, + *current4_, *current5_, *current6_)); } bool AtEnd() const { // We must report iterator past the end of the range when either of the @@ -3894,7 +3889,7 @@ class CartesianProductGenerator6 const typename ParamGenerator::iterator begin6_; const typename ParamGenerator::iterator end6_; typename ParamGenerator::iterator current6_; - ParamType current_value_; + linked_ptr current_value_; }; // class CartesianProductGenerator6::Iterator // No implementation - assignment is unsupported. @@ -4001,7 +3996,7 @@ class CartesianProductGenerator7 virtual ParamIteratorInterface* Clone() const { return new Iterator(*this); } - virtual const ParamType* Current() const { return ¤t_value_; } + virtual const ParamType* Current() const { return current_value_.get(); } virtual bool Equals(const ParamIteratorInterface& other) const { // Having the same base generator guarantees that the other // iterator is of the same type and we can downcast. @@ -4053,8 +4048,8 @@ class CartesianProductGenerator7 void ComputeCurrentValue() { if (!AtEnd()) - current_value_ = ParamType(*current1_, *current2_, *current3_, - *current4_, *current5_, *current6_, *current7_); + current_value_.reset(new ParamType(*current1_, *current2_, *current3_, + *current4_, *current5_, *current6_, *current7_)); } bool AtEnd() const { // We must report iterator past the end of the range when either of the @@ -4096,7 +4091,7 @@ class CartesianProductGenerator7 const typename ParamGenerator::iterator begin7_; const typename ParamGenerator::iterator end7_; typename ParamGenerator::iterator current7_; - ParamType current_value_; + linked_ptr current_value_; }; // class CartesianProductGenerator7::Iterator // No implementation - assignment is unsupported. @@ -4214,7 +4209,7 @@ class CartesianProductGenerator8 virtual ParamIteratorInterface* Clone() const { return new Iterator(*this); } - virtual const ParamType* Current() const { return ¤t_value_; } + virtual const ParamType* Current() const { return current_value_.get(); } virtual bool Equals(const ParamIteratorInterface& other) const { // Having the same base generator guarantees that the other // iterator is of the same type and we can downcast. @@ -4270,8 +4265,8 @@ class CartesianProductGenerator8 void ComputeCurrentValue() { if (!AtEnd()) - current_value_ = ParamType(*current1_, *current2_, *current3_, - *current4_, *current5_, *current6_, *current7_, *current8_); + current_value_.reset(new ParamType(*current1_, *current2_, *current3_, + *current4_, *current5_, *current6_, *current7_, *current8_)); } bool AtEnd() const { // We must report iterator past the end of the range when either of the @@ -4317,7 +4312,7 @@ class CartesianProductGenerator8 const typename ParamGenerator::iterator begin8_; const typename ParamGenerator::iterator end8_; typename ParamGenerator::iterator current8_; - ParamType current_value_; + linked_ptr current_value_; }; // class CartesianProductGenerator8::Iterator // No implementation - assignment is unsupported. @@ -4443,7 +4438,7 @@ class CartesianProductGenerator9 virtual ParamIteratorInterface* Clone() const { return new Iterator(*this); } - virtual const ParamType* Current() const { return ¤t_value_; } + virtual const ParamType* Current() const { return current_value_.get(); } virtual bool Equals(const ParamIteratorInterface& other) const { // Having the same base generator guarantees that the other // iterator is of the same type and we can downcast. @@ -4503,9 +4498,9 @@ class CartesianProductGenerator9 void ComputeCurrentValue() { if (!AtEnd()) - current_value_ = ParamType(*current1_, *current2_, *current3_, + current_value_.reset(new ParamType(*current1_, *current2_, *current3_, *current4_, *current5_, *current6_, *current7_, *current8_, - *current9_); + *current9_)); } bool AtEnd() const { // We must report iterator past the end of the range when either of the @@ -4555,7 +4550,7 @@ class CartesianProductGenerator9 const typename ParamGenerator::iterator begin9_; const typename ParamGenerator::iterator end9_; typename ParamGenerator::iterator current9_; - ParamType current_value_; + linked_ptr current_value_; }; // class CartesianProductGenerator9::Iterator // No implementation - assignment is unsupported. @@ -4690,7 +4685,7 @@ class CartesianProductGenerator10 virtual ParamIteratorInterface* Clone() const { return new Iterator(*this); } - virtual const ParamType* Current() const { return ¤t_value_; } + virtual const ParamType* Current() const { return current_value_.get(); } virtual bool Equals(const ParamIteratorInterface& other) const { // Having the same base generator guarantees that the other // iterator is of the same type and we can downcast. @@ -4754,9 +4749,9 @@ class CartesianProductGenerator10 void ComputeCurrentValue() { if (!AtEnd()) - current_value_ = ParamType(*current1_, *current2_, *current3_, + current_value_.reset(new ParamType(*current1_, *current2_, *current3_, *current4_, *current5_, *current6_, *current7_, *current8_, - *current9_, *current10_); + *current9_, *current10_)); } bool AtEnd() const { // We must report iterator past the end of the range when either of the @@ -4810,7 +4805,7 @@ class CartesianProductGenerator10 const typename ParamGenerator::iterator begin10_; const typename ParamGenerator::iterator end10_; typename ParamGenerator::iterator current10_; - ParamType current_value_; + linked_ptr current_value_; }; // class CartesianProductGenerator10::Iterator // No implementation - assignment is unsupported. @@ -5141,6 +5136,4 @@ CartesianProductHolder10(const Generator1& g1, const Generator2& g2, } // namespace internal } // namespace testing -#endif // GTEST_HAS_PARAM_TEST - #endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h.pump b/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h.pump index 5c7c47af0b..d65086a01e 100644 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h.pump +++ b/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h.pump @@ -45,14 +45,9 @@ $var maxtuple = 10 $$ Maximum number of Combine arguments we want to support. #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ -// scripts/fuse_gtest.py depends on gtest's own header being #included -// *unconditionally*. Therefore these #includes cannot be moved -// inside #if GTEST_HAS_PARAM_TEST. #include "gtest/internal/gtest-param-util.h" #include "gtest/internal/gtest-port.h" -#if GTEST_HAS_PARAM_TEST - namespace testing { // Forward declarations of ValuesIn(), which is implemented in @@ -165,7 +160,7 @@ $for k [[ virtual ParamIteratorInterface* Clone() const { return new Iterator(*this); } - virtual const ParamType* Current() const { return ¤t_value_; } + virtual const ParamType* Current() const { return current_value_.get(); } virtual bool Equals(const ParamIteratorInterface& other) const { // Having the same base generator guarantees that the other // iterator is of the same type and we can downcast. @@ -197,7 +192,7 @@ $for k [[ void ComputeCurrentValue() { if (!AtEnd()) - current_value_ = ParamType($for j, [[*current$(j)_]]); + current_value_.reset(new ParamType($for j, [[*current$(j)_]])); } bool AtEnd() const { // We must report iterator past the end of the range when either of the @@ -222,7 +217,7 @@ $for j [[ typename ParamGenerator::iterator current$(j)_; ]] - ParamType current_value_; + linked_ptr current_value_; }; // class CartesianProductGenerator$i::Iterator // No implementation - assignment is unsupported. @@ -281,6 +276,4 @@ $for j [[ } // namespace internal } // namespace testing -#endif // GTEST_HAS_PARAM_TEST - #endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util.h b/test/gtest-1.8.0/include/gtest/internal/gtest-param-util.h index 82cab9b020..3c80863cde 100644 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util.h +++ b/test/gtest-1.8.0/include/gtest/internal/gtest-param-util.h @@ -41,16 +41,11 @@ #include #include -// scripts/fuse_gtest.py depends on gtest's own header being #included -// *unconditionally*. Therefore these #includes cannot be moved -// inside #if GTEST_HAS_PARAM_TEST. #include "gtest/internal/gtest-internal.h" #include "gtest/internal/gtest-linked_ptr.h" #include "gtest/internal/gtest-port.h" #include "gtest/gtest-printers.h" -#if GTEST_HAS_PARAM_TEST - namespace testing { // Input to a parameterized test name generator, describing a test parameter. @@ -472,7 +467,7 @@ class ParameterizedTestCaseInfoBase { virtual ~ParameterizedTestCaseInfoBase() {} // Base part of test case name for display purposes. - virtual const string& GetTestCaseName() const = 0; + virtual const std::string& GetTestCaseName() const = 0; // Test case id to verify identity. virtual TypeId GetTestCaseTypeId() const = 0; // UnitTest class invokes this method to register tests in this @@ -511,7 +506,7 @@ class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase { : test_case_name_(name), code_location_(code_location) {} // Test case base name for display purposes. - virtual const string& GetTestCaseName() const { return test_case_name_; } + virtual const std::string& GetTestCaseName() const { return test_case_name_; } // Test case id to verify identity. virtual TypeId GetTestCaseTypeId() const { return GetTypeId(); } // TEST_P macro uses AddTestPattern() to record information @@ -529,11 +524,10 @@ class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase { } // INSTANTIATE_TEST_CASE_P macro uses AddGenerator() to record information // about a generator. - int AddTestCaseInstantiation(const string& instantiation_name, + int AddTestCaseInstantiation(const std::string& instantiation_name, GeneratorCreationFunc* func, ParamNameGeneratorFunc* name_func, - const char* file, - int line) { + const char* file, int line) { instantiations_.push_back( InstantiationInfo(instantiation_name, func, name_func, file, line)); return 0; // Return value used only to run this method in namespace scope. @@ -550,13 +544,13 @@ class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase { for (typename InstantiationContainer::iterator gen_it = instantiations_.begin(); gen_it != instantiations_.end(); ++gen_it) { - const string& instantiation_name = gen_it->name; + const std::string& instantiation_name = gen_it->name; ParamGenerator generator((*gen_it->generator)()); ParamNameGeneratorFunc* name_func = gen_it->name_func; const char* file = gen_it->file; int line = gen_it->line; - string test_case_name; + std::string test_case_name; if ( !instantiation_name.empty() ) test_case_name = instantiation_name + "/"; test_case_name += test_info->test_case_base_name; @@ -609,8 +603,8 @@ class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase { test_base_name(a_test_base_name), test_meta_factory(a_test_meta_factory) {} - const string test_case_base_name; - const string test_base_name; + const std::string test_case_base_name; + const std::string test_base_name; const scoped_ptr > test_meta_factory; }; typedef ::std::vector > TestInfoContainer; @@ -651,7 +645,7 @@ class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase { return true; } - const string test_case_name_; + const std::string test_case_name_; CodeLocation code_location_; TestInfoContainer tests_; InstantiationContainer instantiations_; @@ -726,6 +720,4 @@ class ParameterizedTestCaseRegistry { } // namespace internal } // namespace testing -#endif // GTEST_HAS_PARAM_TEST - #endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-port-arch.h b/test/gtest-1.8.0/include/gtest/internal/gtest-port-arch.h index 74ab949057..f83700e06d 100644 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-port-arch.h +++ b/test/gtest-1.8.0/include/gtest/internal/gtest-port-arch.h @@ -27,7 +27,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) // // This header file defines the GTEST_OS_* macro. // It is separate from gtest-port.h so that custom/gtest-port.h can include it. @@ -54,6 +54,9 @@ # define GTEST_OS_WINDOWS_PHONE 1 # elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) # define GTEST_OS_WINDOWS_RT 1 +# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_TV_TITLE) +# define GTEST_OS_WINDOWS_PHONE 1 +# define GTEST_OS_WINDOWS_TV_TITLE 1 # else // WINAPI_FAMILY defined but no known partition matched. // Default to desktop. @@ -69,6 +72,8 @@ # endif #elif defined __FreeBSD__ # define GTEST_OS_FREEBSD 1 +#elif defined __Fuchsia__ +# define GTEST_OS_FUCHSIA 1 #elif defined __linux__ # define GTEST_OS_LINUX 1 # if defined __ANDROID__ @@ -84,6 +89,8 @@ # define GTEST_OS_HPUX 1 #elif defined __native_client__ # define GTEST_OS_NACL 1 +#elif defined __NetBSD__ +# define GTEST_OS_NETBSD 1 #elif defined __OpenBSD__ # define GTEST_OS_OPENBSD 1 #elif defined __QNX__ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-port.h b/test/gtest-1.8.0/include/gtest/internal/gtest-port.h index 0094ed5077..437a4ed747 100644 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-port.h +++ b/test/gtest-1.8.0/include/gtest/internal/gtest-port.h @@ -73,11 +73,9 @@ // GTEST_HAS_EXCEPTIONS - Define it to 1/0 to indicate that exceptions // are enabled. // GTEST_HAS_GLOBAL_STRING - Define it to 1/0 to indicate that ::string -// is/isn't available (some systems define -// ::string, which is different to std::string). -// GTEST_HAS_GLOBAL_WSTRING - Define it to 1/0 to indicate that ::string -// is/isn't available (some systems define -// ::wstring, which is different to std::wstring). +// is/isn't available +// GTEST_HAS_GLOBAL_WSTRING - Define it to 1/0 to indicate that ::wstring +// is/isn't available // GTEST_HAS_POSIX_RE - Define it to 1/0 to indicate that POSIX regular // expressions are/aren't available. // GTEST_HAS_PTHREAD - Define it to 1/0 to indicate that @@ -109,6 +107,12 @@ // GTEST_CREATE_SHARED_LIBRARY // - Define to 1 when compiling Google Test itself // as a shared library. +// GTEST_DEFAULT_DEATH_TEST_STYLE +// - The default value of --gtest_death_test_style. +// The legacy default has been "fast" in the open +// source version since 2008. The recommended value +// is "threadsafe", and can be set in +// custom/gtest-port.h. // Platform-indicating macros // -------------------------- @@ -122,12 +126,14 @@ // GTEST_OS_AIX - IBM AIX // GTEST_OS_CYGWIN - Cygwin // GTEST_OS_FREEBSD - FreeBSD +// GTEST_OS_FUCHSIA - Fuchsia // GTEST_OS_HPUX - HP-UX // GTEST_OS_LINUX - Linux // GTEST_OS_LINUX_ANDROID - Google Android // GTEST_OS_MAC - Mac OS X // GTEST_OS_IOS - iOS // GTEST_OS_NACL - Google Native Client (NaCl) +// GTEST_OS_NETBSD - NetBSD // GTEST_OS_OPENBSD - OpenBSD // GTEST_OS_QNX - QNX // GTEST_OS_SOLARIS - Sun Solaris @@ -169,7 +175,6 @@ // GTEST_HAS_COMBINE - the Combine() function (for value-parameterized // tests) // GTEST_HAS_DEATH_TEST - death tests -// GTEST_HAS_PARAM_TEST - value-parameterized tests // GTEST_HAS_TYPED_TEST - typed tests // GTEST_HAS_TYPED_TEST_P - type-parameterized tests // GTEST_IS_THREADSAFE - Google Test is thread-safe. @@ -177,7 +182,7 @@ // GTEST_HAS_POSIX_RE (see above) which users can // define themselves. // GTEST_USES_SIMPLE_RE - our own simple regex is used; -// the above two are mutually exclusive. +// the above RE\b(s) are mutually exclusive. // GTEST_CAN_COMPARE_NULL - accepts untyped NULL in EXPECT_EQ(). // Misc public macros @@ -206,6 +211,7 @@ // // C++11 feature wrappers: // +// testing::internal::forward - portability wrapper for std::forward. // testing::internal::move - portability wrapper for std::move. // // Synchronization: @@ -222,10 +228,9 @@ // // Regular expressions: // RE - a simple regular expression class using the POSIX -// Extended Regular Expression syntax on UNIX-like -// platforms, or a reduced regular exception syntax on -// other platforms, including Windows. -// +// Extended Regular Expression syntax on UNIX-like platforms +// or a reduced regular exception syntax on other +// platforms, including Windows. // Logging: // GTEST_LOG_() - logs messages at the specified severity level. // LogToStderr() - directs all log messages to stderr. @@ -271,10 +276,12 @@ # include #endif +// Brings in the definition of HAS_GLOBAL_STRING. This must be done +// BEFORE we test HAS_GLOBAL_STRING. +#include // NOLINT #include // NOLINT #include // NOLINT #include // NOLINT -#include // NOLINT #include #include // NOLINT @@ -323,7 +330,7 @@ // -std={c,gnu}++{0x,11} is passed. The C++11 standard specifies a // value for __cplusplus, and recent versions of clang, gcc, and // probably other compilers set that too in C++11 mode. -# if __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L +# if __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L || _MSC_VER >= 1900 // Compiling in at least C++11 mode. # define GTEST_LANG_CXX11 1 # else @@ -355,12 +362,16 @@ #if GTEST_STDLIB_CXX11 # define GTEST_HAS_STD_BEGIN_AND_END_ 1 # define GTEST_HAS_STD_FORWARD_LIST_ 1 -# define GTEST_HAS_STD_FUNCTION_ 1 +# if !defined(_MSC_VER) || (_MSC_FULL_VER >= 190023824) +// works only with VS2015U2 and better +# define GTEST_HAS_STD_FUNCTION_ 1 +# endif # define GTEST_HAS_STD_INITIALIZER_LIST_ 1 # define GTEST_HAS_STD_MOVE_ 1 -# define GTEST_HAS_STD_SHARED_PTR_ 1 -# define GTEST_HAS_STD_TYPE_TRAITS_ 1 # define GTEST_HAS_STD_UNIQUE_PTR_ 1 +# define GTEST_HAS_STD_SHARED_PTR_ 1 +# define GTEST_HAS_UNORDERED_MAP_ 1 +# define GTEST_HAS_UNORDERED_SET_ 1 #endif // C++11 specifies that provides std::tuple. @@ -396,10 +407,16 @@ # include # endif // In order to avoid having to include , use forward declaration -// assuming CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION. +#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR) +// MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two +// separate (equivalent) structs, instead of using typedef +typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION; +#else +// Assume CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION. // This assumption is verified by // WindowsTypesTest.CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION. -struct _RTL_CRITICAL_SECTION; +typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; +#endif #else // This assumes that non-Windows OSes provide unistd.h. For OSes where this // is not the case, we need to include headers that provide the functions @@ -453,8 +470,11 @@ struct _RTL_CRITICAL_SECTION; #ifndef GTEST_HAS_EXCEPTIONS // The user didn't tell us whether exceptions are enabled, so we need // to figure it out. -# if defined(_MSC_VER) || defined(__BORLANDC__) -// MSVC's and C++Builder's implementations of the STL use the _HAS_EXCEPTIONS +# if defined(_MSC_VER) && defined(_CPPUNWIND) +// MSVC defines _CPPUNWIND to 1 iff exceptions are enabled. +# define GTEST_HAS_EXCEPTIONS 1 +# elif defined(__BORLANDC__) +// C++Builder's implementation of the STL uses the _HAS_EXCEPTIONS // macro to enable exceptions, so we'll do the same. // Assumes that exceptions are enabled by default. # ifndef _HAS_EXCEPTIONS @@ -498,7 +518,7 @@ struct _RTL_CRITICAL_SECTION; # define GTEST_HAS_STD_STRING 1 #elif !GTEST_HAS_STD_STRING // The user told us that ::std::string isn't available. -# error "Google Test cannot be used where ::std::string isn't available." +# error "::std::string isn't available." #endif // !defined(GTEST_HAS_STD_STRING) #ifndef GTEST_HAS_GLOBAL_STRING @@ -600,8 +620,9 @@ struct _RTL_CRITICAL_SECTION; // // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0 // to your compiler flags. -# define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \ - || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL) +#define GTEST_HAS_PTHREAD \ + (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX || GTEST_OS_QNX || \ + GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA) #endif // GTEST_HAS_PTHREAD #if GTEST_HAS_PTHREAD @@ -616,7 +637,7 @@ struct _RTL_CRITICAL_SECTION; // Determines if hash_map/hash_set are available. // Only used for testing against those containers. #if !defined(GTEST_HAS_HASH_MAP_) -# if _MSC_VER +# if defined(_MSC_VER) && (_MSC_VER < 1900) # define GTEST_HAS_HASH_MAP_ 1 // Indicates that hash_map is available. # define GTEST_HAS_HASH_SET_ 1 // Indicates that hash_set is available. # endif // _MSC_VER @@ -629,6 +650,14 @@ struct _RTL_CRITICAL_SECTION; # if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) // STLport, provided with the Android NDK, has neither or . # define GTEST_HAS_TR1_TUPLE 0 +# elif defined(_MSC_VER) && (_MSC_VER >= 1910) +// Prevent `warning C4996: 'std::tr1': warning STL4002: +// The non-Standard std::tr1 namespace and TR1-only machinery +// are deprecated and will be REMOVED.` +# define GTEST_HAS_TR1_TUPLE 0 +# elif GTEST_LANG_CXX11 && defined(_LIBCPP_VERSION) +// libc++ doesn't support TR1. +# define GTEST_HAS_TR1_TUPLE 0 # else // The user didn't tell us not to do it, so we assume it's OK. # define GTEST_HAS_TR1_TUPLE 1 @@ -638,6 +667,10 @@ struct _RTL_CRITICAL_SECTION; // Determines whether Google Test's own tr1 tuple implementation // should be used. #ifndef GTEST_USE_OWN_TR1_TUPLE +// We use our own tuple implementation on Symbian. +# if GTEST_OS_SYMBIAN +# define GTEST_USE_OWN_TR1_TUPLE 1 +# else // The user didn't tell us, so we need to figure it out. // We use our own TR1 tuple if we aren't sure the user has an @@ -651,7 +684,8 @@ struct _RTL_CRITICAL_SECTION; // support TR1 tuple. libc++ only provides std::tuple, in C++11 mode, // and it can be used with some compilers that define __GNUC__. # if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000) \ - && !GTEST_OS_QNX && !defined(_LIBCPP_VERSION)) || _MSC_VER >= 1600 + && !GTEST_OS_QNX && !defined(_LIBCPP_VERSION)) \ + || (_MSC_VER >= 1600 && _MSC_VER < 1900) # define GTEST_ENV_HAS_TR1_TUPLE_ 1 # endif @@ -667,12 +701,11 @@ struct _RTL_CRITICAL_SECTION; # else # define GTEST_USE_OWN_TR1_TUPLE 1 # endif - +# endif // GTEST_OS_SYMBIAN #endif // GTEST_USE_OWN_TR1_TUPLE -// To avoid conditional compilation everywhere, we make it -// gtest-port.h's responsibility to #include the header implementing -// tuple. +// To avoid conditional compilation we make it gtest-port.h's responsibility +// to #include the header implementing tuple. #if GTEST_HAS_STD_TUPLE_ # include // IWYU pragma: export # define GTEST_TUPLE_NAMESPACE_ ::std @@ -687,22 +720,6 @@ struct _RTL_CRITICAL_SECTION; # if GTEST_USE_OWN_TR1_TUPLE # include "gtest/internal/gtest-tuple.h" // IWYU pragma: export // NOLINT -# elif GTEST_ENV_HAS_STD_TUPLE_ -# include -// C++11 puts its tuple into the ::std namespace rather than -// ::std::tr1. gtest expects tuple to live in ::std::tr1, so put it there. -// This causes undefined behavior, but supported compilers react in -// the way we intend. -namespace std { -namespace tr1 { -using ::std::get; -using ::std::make_tuple; -using ::std::tuple; -using ::std::tuple_element; -using ::std::tuple_size; -} -} - # elif GTEST_OS_SYMBIAN // On Symbian, BOOST_HAS_TR1_TUPLE causes Boost's TR1 tuple library to @@ -732,15 +749,17 @@ using ::std::tuple_size; # define _TR1_FUNCTIONAL 1 # include # undef _TR1_FUNCTIONAL // Allows the user to #include - // if he chooses to. + // if they choose to. # else # include // NOLINT # endif // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302 -# else -// If the compiler is not GCC 4.0+, we assume the user is using a -// spec-conforming TR1 implementation. +// VS 2010 now has tr1 support. +# elif _MSC_VER >= 1600 # include // IWYU pragma: export // NOLINT + +# else // GTEST_USE_OWN_TR1_TUPLE +# include // IWYU pragma: export // NOLINT # endif // GTEST_USE_OWN_TR1_TUPLE #endif // GTEST_HAS_TR1_TUPLE @@ -754,8 +773,12 @@ using ::std::tuple_size; # if GTEST_OS_LINUX && !defined(__ia64__) # if GTEST_OS_LINUX_ANDROID -// On Android, clone() is only available on ARM starting with Gingerbread. -# if defined(__arm__) && __ANDROID_API__ >= 9 +// On Android, clone() became available at different API levels for each 32-bit +// architecture. +# if defined(__LP64__) || \ + (defined(__arm__) && __ANDROID_API__ >= 9) || \ + (defined(__mips__) && __ANDROID_API__ >= 12) || \ + (defined(__i386__) && __ANDROID_API__ >= 17) # define GTEST_HAS_CLONE 1 # else # define GTEST_HAS_CLONE 0 @@ -786,19 +809,15 @@ using ::std::tuple_size; // Google Test does not support death tests for VC 7.1 and earlier as // abort() in a VC 7.1 application compiled as GUI in debug config // pops up a dialog window that cannot be suppressed programmatically. -#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ - (GTEST_OS_MAC && !GTEST_OS_IOS) || \ - (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ +#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ + (GTEST_OS_MAC && !GTEST_OS_IOS) || \ + (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \ - GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD) + GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || \ + GTEST_OS_NETBSD || GTEST_OS_FUCHSIA) # define GTEST_HAS_DEATH_TEST 1 #endif -// We don't support MSVC 7.1 with exceptions disabled now. Therefore -// all the compilers we care about are adequate for supporting -// value-parameterized tests. -#define GTEST_HAS_PARAM_TEST 1 - // Determines whether to support type-driven tests. // Typed tests need and variadic macros, which GCC, VC++ 8.0, @@ -813,7 +832,7 @@ using ::std::tuple_size; // value-parameterized tests are enabled. The implementation doesn't // work on Sun Studio since it doesn't understand templated conversion // operators. -#if GTEST_HAS_PARAM_TEST && GTEST_HAS_TR1_TUPLE && !defined(__SUNPRO_CC) +#if (GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_) && !defined(__SUNPRO_CC) # define GTEST_HAS_COMBINE 1 #endif @@ -864,15 +883,39 @@ using ::std::tuple_size; # define GTEST_ATTRIBUTE_UNUSED_ #endif +#if GTEST_LANG_CXX11 +# define GTEST_CXX11_EQUALS_DELETE_ = delete +#else // GTEST_LANG_CXX11 +# define GTEST_CXX11_EQUALS_DELETE_ +#endif // GTEST_LANG_CXX11 + +// Use this annotation before a function that takes a printf format string. +#if (defined(__GNUC__) || defined(__clang__)) && !defined(COMPILER_ICC) +# if defined(__MINGW_PRINTF_FORMAT) +// MinGW has two different printf implementations. Ensure the format macro +// matches the selected implementation. See +// https://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/. +# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \ + __attribute__((__format__(__MINGW_PRINTF_FORMAT, string_index, \ + first_to_check))) +# else +# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \ + __attribute__((__format__(__printf__, string_index, first_to_check))) +# endif +#else +# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) +#endif + + // A macro to disallow operator= // This should be used in the private: declarations for a class. -#define GTEST_DISALLOW_ASSIGN_(type)\ - void operator=(type const &) +#define GTEST_DISALLOW_ASSIGN_(type) \ + void operator=(type const &) GTEST_CXX11_EQUALS_DELETE_ // A macro to disallow copy constructor and operator= // This should be used in the private: declarations for a class. -#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type)\ - type(type const &);\ +#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type) \ + type(type const &) GTEST_CXX11_EQUALS_DELETE_; \ GTEST_DISALLOW_ASSIGN_(type) // Tell the compiler to warn about unused return values for functions declared @@ -920,6 +963,11 @@ using ::std::tuple_size; #endif // GTEST_HAS_SEH +// GTEST_API_ qualifies all symbols that must be exported. The definitions below +// are guarded by #ifndef to give embedders a chance to define GTEST_API_ in +// gtest/internal/custom/gtest-port.h +#ifndef GTEST_API_ + #ifdef _MSC_VER # if GTEST_LINKED_AS_SHARED_LIBRARY # define GTEST_API_ __declspec(dllimport) @@ -928,11 +976,17 @@ using ::std::tuple_size; # endif #elif __GNUC__ >= 4 || defined(__clang__) # define GTEST_API_ __attribute__((visibility ("default"))) -#endif // _MSC_VER +#endif // _MSC_VER + +#endif // GTEST_API_ #ifndef GTEST_API_ # define GTEST_API_ -#endif +#endif // GTEST_API_ + +#ifndef GTEST_DEFAULT_DEATH_TEST_STYLE +# define GTEST_DEFAULT_DEATH_TEST_STYLE "fast" +#endif // GTEST_DEFAULT_DEATH_TEST_STYLE #ifdef __GNUC__ // Ask the compiler to never inline a given function. @@ -942,10 +996,12 @@ using ::std::tuple_size; #endif // _LIBCPP_VERSION is defined by the libc++ library from the LLVM project. -#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION) -# define GTEST_HAS_CXXABI_H_ 1 -#else -# define GTEST_HAS_CXXABI_H_ 0 +#if !defined(GTEST_HAS_CXXABI_H_) +# if defined(__GLIBCXX__) || (defined(_LIBCPP_VERSION) && !defined(_MSC_VER)) +# define GTEST_HAS_CXXABI_H_ 1 +# else +# define GTEST_HAS_CXXABI_H_ 0 +# endif #endif // A function level attribute to disable checking for use of uninitialized @@ -1088,6 +1144,16 @@ struct StaticAssertTypeEqHelper { enum { value = true }; }; +// Same as std::is_same<>. +template +struct IsSame { + enum { value = false }; +}; +template +struct IsSame { + enum { value = true }; +}; + // Evaluates to the number of elements in 'array'. #define GTEST_ARRAY_SIZE_(array) (sizeof(array) / sizeof(array[0])) @@ -1151,6 +1217,10 @@ class scoped_ptr { // Defines RE. +#if GTEST_USES_PCRE +using ::RE; +#elif GTEST_USES_POSIX_RE || GTEST_USES_SIMPLE_RE + // A simple C++ wrapper for . It uses the POSIX Extended // Regular Expression syntax. class GTEST_API_ RE { @@ -1162,11 +1232,11 @@ class GTEST_API_ RE { // Constructs an RE from a string. RE(const ::std::string& regex) { Init(regex.c_str()); } // NOLINT -#if GTEST_HAS_GLOBAL_STRING +# if GTEST_HAS_GLOBAL_STRING RE(const ::string& regex) { Init(regex.c_str()); } // NOLINT -#endif // GTEST_HAS_GLOBAL_STRING +# endif // GTEST_HAS_GLOBAL_STRING RE(const char* regex) { Init(regex); } // NOLINT ~RE(); @@ -1188,7 +1258,7 @@ class GTEST_API_ RE { return PartialMatch(str.c_str(), re); } -#if GTEST_HAS_GLOBAL_STRING +# if GTEST_HAS_GLOBAL_STRING static bool FullMatch(const ::string& str, const RE& re) { return FullMatch(str.c_str(), re); @@ -1197,7 +1267,7 @@ class GTEST_API_ RE { return PartialMatch(str.c_str(), re); } -#endif // GTEST_HAS_GLOBAL_STRING +# endif // GTEST_HAS_GLOBAL_STRING static bool FullMatch(const char* str, const RE& re); static bool PartialMatch(const char* str, const RE& re); @@ -1211,20 +1281,22 @@ class GTEST_API_ RE { const char* pattern_; bool is_valid_; -#if GTEST_USES_POSIX_RE +# if GTEST_USES_POSIX_RE regex_t full_regex_; // For FullMatch(). regex_t partial_regex_; // For PartialMatch(). -#else // GTEST_USES_SIMPLE_RE +# else // GTEST_USES_SIMPLE_RE const char* full_pattern_; // For FullMatch(); -#endif +# endif GTEST_DISALLOW_ASSIGN_(RE); }; +#endif // GTEST_USES_PCRE + // Formats a source file path and a line number as they would appear // in an error message from the compiler used to compile this code. GTEST_API_ ::std::string FormatFileLocation(const char* file, int line); @@ -1310,13 +1382,59 @@ inline void FlushInfoLog() { fflush(NULL); } GTEST_LOG_(FATAL) << #posix_call << "failed with error " \ << gtest_error +// Adds reference to a type if it is not a reference type, +// otherwise leaves it unchanged. This is the same as +// tr1::add_reference, which is not widely available yet. +template +struct AddReference { typedef T& type; }; // NOLINT +template +struct AddReference { typedef T& type; }; // NOLINT + +// A handy wrapper around AddReference that works when the argument T +// depends on template parameters. +#define GTEST_ADD_REFERENCE_(T) \ + typename ::testing::internal::AddReference::type + +// Transforms "T" into "const T&" according to standard reference collapsing +// rules (this is only needed as a backport for C++98 compilers that do not +// support reference collapsing). Specifically, it transforms: +// +// char ==> const char& +// const char ==> const char& +// char& ==> char& +// const char& ==> const char& +// +// Note that the non-const reference will not have "const" added. This is +// standard, and necessary so that "T" can always bind to "const T&". +template +struct ConstRef { typedef const T& type; }; +template +struct ConstRef { typedef T& type; }; + +// The argument T must depend on some template parameters. +#define GTEST_REFERENCE_TO_CONST_(T) \ + typename ::testing::internal::ConstRef::type + #if GTEST_HAS_STD_MOVE_ +using std::forward; using std::move; + +template +struct RvalueRef { + typedef T&& type; +}; #else // GTEST_HAS_STD_MOVE_ template const T& move(const T& t) { return t; } +template +GTEST_ADD_REFERENCE_(T) forward(GTEST_ADD_REFERENCE_(T) t) { return t; } + +template +struct RvalueRef { + typedef const T& type; +}; #endif // GTEST_HAS_STD_MOVE_ // INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. @@ -1417,10 +1535,6 @@ GTEST_API_ void CaptureStderr(); GTEST_API_ std::string GetCapturedStderr(); #endif // GTEST_HAS_STREAM_REDIRECTION - -// Returns a path to temporary directory. -GTEST_API_ std::string TempDir(); - // Returns the size (in bytes) of a file. GTEST_API_ size_t GetFileSize(FILE* file); @@ -1428,14 +1542,18 @@ GTEST_API_ size_t GetFileSize(FILE* file); GTEST_API_ std::string ReadEntireFile(FILE* file); // All command line arguments. -GTEST_API_ const ::std::vector& GetArgvs(); +GTEST_API_ std::vector GetArgvs(); #if GTEST_HAS_DEATH_TEST -const ::std::vector& GetInjectableArgvs(); -void SetInjectableArgvs(const ::std::vector* - new_argvs); - +std::vector GetInjectableArgvs(); +// Deprecated: pass the args vector by value instead. +void SetInjectableArgvs(const std::vector* new_argvs); +void SetInjectableArgvs(const std::vector& new_argvs); +#if GTEST_HAS_GLOBAL_STRING +void SetInjectableArgvs(const std::vector< ::string>& new_argvs); +#endif // GTEST_HAS_GLOBAL_STRING +void ClearInjectableArgvs(); #endif // GTEST_HAS_DEATH_TEST @@ -1693,7 +1811,7 @@ class GTEST_API_ Mutex { // by the linker. MutexType type_; long critical_section_init_phase_; // NOLINT - _RTL_CRITICAL_SECTION* critical_section_; + GTEST_CRITICAL_SECTION* critical_section_; GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex); }; @@ -1969,8 +2087,13 @@ class MutexBase { extern ::testing::internal::MutexBase mutex // Defines and statically (i.e. at link time) initializes a static mutex. +// The initialization list here does not explicitly initialize each field, +// instead relying on default initialization for the unspecified fields. In +// particular, the owner_ field (a pthread_t) is not explicitly initialized. +// This allows initialization to work whether pthread_t is a scalar or struct. +// The flag -Wmissing-field-initializers must not be specified for this to work. # define GTEST_DEFINE_STATIC_MUTEX_(mutex) \ - ::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false, pthread_t() } + ::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false } // The Mutex class can only be used for mutexes created at runtime. It // shares its API with MutexBase otherwise. @@ -2027,7 +2150,7 @@ extern "C" inline void DeleteThreadLocalValue(void* value_holder) { // Implements thread-local storage on pthreads-based systems. template -class ThreadLocal { +class GTEST_API_ ThreadLocal { public: ThreadLocal() : key_(CreateKey()), default_factory_(new DefaultValueHolderFactory()) {} @@ -2159,7 +2282,7 @@ class GTestMutexLock { typedef GTestMutexLock MutexLock; template -class ThreadLocal { +class GTEST_API_ ThreadLocal { public: ThreadLocal() : value_() {} explicit ThreadLocal(const T& value) : value_(value) {} @@ -2178,12 +2301,13 @@ class ThreadLocal { GTEST_API_ size_t GetThreadCount(); // Passing non-POD classes through ellipsis (...) crashes the ARM -// compiler and generates a warning in Sun Studio. The Nokia Symbian +// compiler and generates a warning in Sun Studio before 12u4. The Nokia Symbian // and the IBM XL C/C++ compiler try to instantiate a copy constructor // for objects passed through ellipsis (...), failing for uncopyable // objects. We define this to ensure that only POD is passed through // ellipsis on these systems. -#if defined(__SYMBIAN32__) || defined(__IBMCPP__) || defined(__SUNPRO_CC) +#if defined(__SYMBIAN32__) || defined(__IBMCPP__) || \ + (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x5130) // We lose support for NULL detection where the compiler doesn't like // passing non-POD classes through ellipsis (...). # define GTEST_ELLIPSIS_NEEDS_POD_ 1 @@ -2209,6 +2333,13 @@ template const bool bool_constant::value; typedef bool_constant false_type; typedef bool_constant true_type; +template +struct is_same : public false_type {}; + +template +struct is_same : public true_type {}; + + template struct is_pointer : public false_type {}; @@ -2220,6 +2351,7 @@ struct IteratorTraits { typedef typename Iterator::value_type value_type; }; + template struct IteratorTraits { typedef T value_type; @@ -2385,7 +2517,7 @@ inline int Close(int fd) { return close(fd); } inline const char* StrError(int errnum) { return strerror(errnum); } #endif inline const char* GetEnv(const char* name) { -#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE | GTEST_OS_WINDOWS_RT +#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT // We are on Windows CE, which has no environment variables. static_cast(name); // To prevent 'unused argument' warning. return NULL; @@ -2515,15 +2647,15 @@ typedef TypeWithSize<8>::Int TimeInMillis; // Represents time in milliseconds. # define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name) # define GTEST_DECLARE_int32_(name) \ GTEST_API_ extern ::testing::internal::Int32 GTEST_FLAG(name) -#define GTEST_DECLARE_string_(name) \ +# define GTEST_DECLARE_string_(name) \ GTEST_API_ extern ::std::string GTEST_FLAG(name) // Macros for defining flags. -#define GTEST_DEFINE_bool_(name, default_val, doc) \ +# define GTEST_DEFINE_bool_(name, default_val, doc) \ GTEST_API_ bool GTEST_FLAG(name) = (default_val) -#define GTEST_DEFINE_int32_(name, default_val, doc) \ +# define GTEST_DEFINE_int32_(name, default_val, doc) \ GTEST_API_ ::testing::internal::Int32 GTEST_FLAG(name) = (default_val) -#define GTEST_DEFINE_string_(name, default_val, doc) \ +# define GTEST_DEFINE_string_(name, default_val, doc) \ GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val) #endif // !defined(GTEST_DECLARE_bool_) @@ -2546,7 +2678,8 @@ bool ParseInt32(const Message& src_text, const char* str, Int32* value); // corresponding to the given Google Test flag. bool BoolFromGTestEnv(const char* flag, bool default_val); GTEST_API_ Int32 Int32FromGTestEnv(const char* flag, Int32 default_val); -std::string StringFromGTestEnv(const char* flag, const char* default_val); +std::string OutputFlagAlsoCheckEnvVar(); +const char* StringFromGTestEnv(const char* flag, const char* default_val); } // namespace internal } // namespace testing diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-string.h b/test/gtest-1.8.0/include/gtest/internal/gtest-string.h index 97f1a7fdd2..71eb840c1f 100644 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-string.h +++ b/test/gtest-1.8.0/include/gtest/internal/gtest-string.h @@ -27,15 +27,15 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee) // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) // // This header file declares the String class and functions used internally by // Google Test. They are subject to change without notice. They should not used // by code external to Google Test. // -// This header file is #included by . +// This header file is #included by +// gtest/internal/gtest-internal.h. // It should not be #included by other files. #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h b/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h index e46f7cfcb4..282b81fb0c 100644 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h +++ b/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h @@ -57,6 +57,22 @@ namespace testing { namespace internal { +// Canonicalizes a given name with respect to the Standard C++ Library. +// This handles removing the inline namespace within `std` that is +// used by various standard libraries (e.g., `std::__1`). Names outside +// of namespace std are returned unmodified. +inline std::string CanonicalizeForStdLibVersioning(std::string s) { + static const char prefix[] = "std::__"; + if (s.compare(0, strlen(prefix), prefix) == 0) { + std::string::size_type end = s.find("::", strlen(prefix)); + if (end != s.npos) { + // Erase everything between the initial `std` and the second `::`. + s.erase(strlen("std"), end - strlen("std")); + } + } + return s; +} + // GetTypeName() returns a human-readable name of type T. // NB: This function is also used in Google Mock, so don't move it inside of // the typed-test-only section below. @@ -75,7 +91,7 @@ std::string GetTypeName() { char* const readable_name = __cxa_demangle(name, 0, 0, &status); const std::string name_str(status == 0 ? readable_name : name); free(readable_name); - return name_str; + return CanonicalizeForStdLibVersioning(name_str); # else return name; # endif // GTEST_HAS_CXXABI_H_ || __HP_aCC diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h.pump b/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h.pump index 251fdf025b..eaa8880114 100644 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h.pump +++ b/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h.pump @@ -55,6 +55,22 @@ $var n = 50 $$ Maximum length of type lists we want to support. namespace testing { namespace internal { +// Canonicalizes a given name with respect to the Standard C++ Library. +// This handles removing the inline namespace within `std` that is +// used by various standard libraries (e.g., `std::__1`). Names outside +// of namespace std are returned unmodified. +inline std::string CanonicalizeForStdLibVersioning(std::string s) { + static const char prefix[] = "std::__"; + if (s.compare(0, strlen(prefix), prefix) == 0) { + std::string::size_type end = s.find("::", strlen(prefix)); + if (end != s.npos) { + // Erase everything between the initial `std` and the second `::`. + s.erase(strlen("std"), end - strlen("std")); + } + } + return s; +} + // GetTypeName() returns a human-readable name of type T. // NB: This function is also used in Google Mock, so don't move it inside of // the typed-test-only section below. @@ -73,7 +89,7 @@ std::string GetTypeName() { char* const readable_name = __cxa_demangle(name, 0, 0, &status); const std::string name_str(status == 0 ? readable_name : name); free(readable_name); - return name_str; + return CanonicalizeForStdLibVersioning(name_str); # else return name; # endif // GTEST_HAS_CXXABI_H_ || __HP_aCC diff --git a/test/gtest-1.8.0/msvc/2010/gtest-md.sln b/test/gtest-1.8.0/msvc/2010/gtest-md.sln new file mode 100644 index 0000000000..e36b33b621 --- /dev/null +++ b/test/gtest-1.8.0/msvc/2010/gtest-md.sln @@ -0,0 +1,55 @@ +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-md", "gtest-md.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main-md", "gtest_main-md.vcxproj", "{3AF54C8A-10BF-4332-9147-F68ED9862033}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test-md", "gtest_prod_test-md.vcxproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest-md", "gtest_unittest-md.vcxproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|Win32.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|Win32.Build.0 = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|x64.ActiveCfg = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|x64.Build.0 = Release|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug|Win32.Build.0 = Debug|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug|x64.ActiveCfg = Debug|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug|x64.Build.0 = Debug|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release|Win32.ActiveCfg = Release|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release|Win32.Build.0 = Release|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release|x64.ActiveCfg = Release|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release|x64.Build.0 = Release|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug|Win32.ActiveCfg = Debug|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug|Win32.Build.0 = Debug|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug|x64.ActiveCfg = Debug|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug|x64.Build.0 = Debug|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release|Win32.ActiveCfg = Release|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release|Win32.Build.0 = Release|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release|x64.ActiveCfg = Release|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release|x64.Build.0 = Release|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug|Win32.ActiveCfg = Debug|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug|Win32.Build.0 = Debug|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug|x64.ActiveCfg = Debug|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug|x64.Build.0 = Debug|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release|Win32.ActiveCfg = Release|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release|Win32.Build.0 = Release|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release|x64.ActiveCfg = Release|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/test/gtest-1.8.0/msvc/2010/gtest-md.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest-md.vcxproj new file mode 100644 index 0000000000..16a6ff12f7 --- /dev/null +++ b/test/gtest-1.8.0/msvc/2010/gtest-md.vcxproj @@ -0,0 +1,149 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8} + Win32Proj + + + + StaticLibrary + MultiByte + v100 + + + StaticLibrary + MultiByte + v100 + + + StaticLibrary + MultiByte + v100 + + + StaticLibrary + MultiByte + v100 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + gtestd + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + gtest + + + gtestd + + + gtest + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + + \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/2010/gtest.sln b/test/gtest-1.8.0/msvc/2010/gtest.sln new file mode 100644 index 0000000000..cacd5c0ce6 --- /dev/null +++ b/test/gtest-1.8.0/msvc/2010/gtest.sln @@ -0,0 +1,55 @@ +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "gtest_main.vcxproj", "{3AF54C8A-10BF-4332-9147-F68ED9862032}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest", "gtest_unittest.vcxproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test", "gtest_prod_test.vcxproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|Win32.Build.0 = Debug|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|x64.ActiveCfg = Debug|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|x64.Build.0 = Debug|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|Win32.ActiveCfg = Release|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|Win32.Build.0 = Release|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|x64.ActiveCfg = Release|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|x64.Build.0 = Release|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|Win32.ActiveCfg = Debug|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|Win32.Build.0 = Debug|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|x64.ActiveCfg = Debug|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|x64.Build.0 = Debug|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|Win32.ActiveCfg = Release|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|Win32.Build.0 = Release|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|x64.ActiveCfg = Release|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|x64.Build.0 = Release|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|Win32.ActiveCfg = Debug|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|Win32.Build.0 = Debug|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|x64.ActiveCfg = Debug|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|x64.Build.0 = Debug|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|Win32.ActiveCfg = Release|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|Win32.Build.0 = Release|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|x64.ActiveCfg = Release|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/test/gtest-1.8.0/msvc/gtest.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest.vcxproj similarity index 72% rename from test/gtest-1.8.0/msvc/gtest.vcxproj rename to test/gtest-1.8.0/msvc/2010/gtest.vcxproj index a0bda27c17..060d178074 100644 --- a/test/gtest-1.8.0/msvc/gtest.vcxproj +++ b/test/gtest-1.8.0/msvc/2010/gtest.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -19,30 +19,29 @@ - {2AF210A9-5BDC-45E8-95DD-07B5A2616493} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} Win32Proj - 10.0.15063.0 StaticLibrary - v141 MultiByte + v141 StaticLibrary - v141 MultiByte + v141 StaticLibrary - v141 MultiByte + v141 StaticLibrary - v141 MultiByte + v141 @@ -61,84 +60,83 @@ - <_ProjectFileVersion>15.0.27428.2015 - - - $(MSBuildProjectDirectory)\$(Configuration)\$(Platform)\ - - - $(ProjectName)\ - - - $(ProjectName)\ + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ - $(OutDir)\$(ProjectName)\ + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + gtestd - $(OutDir)\$(ProjectName)\ + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + gtest + + + gtestd + + + gtest Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug - + + Level3 EditAndContinue - /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" + ..\..\include;..\..;%(AdditionalIncludeDirectories) - - $(OutDir)gtest.lib - + Disabled - X64;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Level3 ProgramDatabase - /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" + ..\..\include;..\..;%(AdditionalIncludeDirectories) - - $(OutDir)gtest.lib - + - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - - - $(OutDir)gtest.lib - - - - - X64;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level3 ProgramDatabase - /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" + ..\..\include;..\..;%(AdditionalIncludeDirectories) - - $(OutDir)gtest.lib - + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + - + ..;..\include;%(AdditionalIncludeDirectories) ..;..\include;%(AdditionalIncludeDirectories) ..;..\include;%(AdditionalIncludeDirectories) diff --git a/test/gtest-1.8.0/msvc/2010/gtest_main-md.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest_main-md.vcxproj new file mode 100644 index 0000000000..3d773895b7 --- /dev/null +++ b/test/gtest-1.8.0/msvc/2010/gtest_main-md.vcxproj @@ -0,0 +1,154 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AF54C8A-10BF-4332-9147-F68ED9862033} + Win32Proj + + + + StaticLibrary + MultiByte + v100 + + + StaticLibrary + MultiByte + v100 + + + StaticLibrary + MultiByte + v100 + + + StaticLibrary + MultiByte + v100 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + gtest_maind + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + gtest_main + + + gtest_maind + + + gtest_main + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be8} + + + + + + \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/2010/gtest_main.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest_main.vcxproj new file mode 100644 index 0000000000..8fb25897c8 --- /dev/null +++ b/test/gtest-1.8.0/msvc/2010/gtest_main.vcxproj @@ -0,0 +1,162 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AF54C8A-10BF-4332-9147-F68ED9862032} + Win32Proj + + + + StaticLibrary + MultiByte + v100 + + + StaticLibrary + MultiByte + v100 + + + StaticLibrary + MultiByte + v100 + + + StaticLibrary + MultiByte + v100 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + gtest_maind + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + gtest_main + + + gtest_maind + + + gtest_main + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + $(OutDir)$(ProjectName)d.lib + + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + $(OutDir)$(ProjectName)d.lib + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + $(OutDir)$(ProjectName).lib + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + $(OutDir)$(ProjectName).lib + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + + + + \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/2010/gtest_prod_test-md.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest_prod_test-md.vcxproj new file mode 100644 index 0000000000..830e5dce41 --- /dev/null +++ b/test/gtest-1.8.0/msvc/2010/gtest_prod_test-md.vcxproj @@ -0,0 +1,199 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB} + Win32Proj + + + + Application + MultiByte + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + true + true + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + false + false + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + gtest_prod_test + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + gtest_prod_test + + + gtest_prod_test + + + gtest_prod_test + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Level3 + EditAndContinue + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + $(OutDir)gtest_prod_test.pdb + Console + MachineX86 + + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + $(OutDir)gtest_prod_test.pdb + Console + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + Console + true + true + MachineX86 + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + Console + true + true + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + + + + + + + + {3af54c8a-10bf-4332-9147-f68ed9862033} + + + + + + \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/2010/gtest_prod_test.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest_prod_test.vcxproj new file mode 100644 index 0000000000..d42e13511d --- /dev/null +++ b/test/gtest-1.8.0/msvc/2010/gtest_prod_test.vcxproj @@ -0,0 +1,191 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA} + Win32Proj + + + + Application + MultiByte + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + true + true + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + false + false + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + Level3 + EditAndContinue + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + $(OutDir)gtest_prod_test.pdb + Console + MachineX86 + + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + $(OutDir)gtest_prod_test.pdb + Console + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + Console + true + true + MachineX86 + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + Console + true + true + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + + + + + + + + {3af54c8a-10bf-4332-9147-f68ed9862032} + + + + + + \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/2010/gtest_unittest-md.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest_unittest-md.vcxproj new file mode 100644 index 0000000000..93b0dc4e1a --- /dev/null +++ b/test/gtest-1.8.0/msvc/2010/gtest_unittest-md.vcxproj @@ -0,0 +1,188 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4D9FDFB5-986A-4139-823C-F4EE0ED481A2} + Win32Proj + + + + Application + MultiByte + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + true + true + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + false + false + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + gtest_unittest + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)$(ProjectName)\ + gtest_unittest + + + gtest_unittest + + + gtest_unittest + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Level3 + EditAndContinue + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + $(OutDir)gtest_unittest.pdb + Console + MachineX86 + + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + $(OutDir)gtest_unittest.pdb + Console + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + Console + true + true + MachineX86 + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + Console + true + true + + + + + MinSpace + MinSpace + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + Default + Default + + + + + ProgramDatabase + ProgramDatabase + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + + + + + {3af54c8a-10bf-4332-9147-f68ed9862033} + + + + + + \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/2010/gtest_unittest.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest_unittest.vcxproj new file mode 100644 index 0000000000..ec6abde7da --- /dev/null +++ b/test/gtest-1.8.0/msvc/2010/gtest_unittest.vcxproj @@ -0,0 +1,180 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1} + Win32Proj + + + + Application + MultiByte + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + true + true + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + false + false + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + + + $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ + $(OutDir)temp\$(ProjectName)\ + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + Level3 + EditAndContinue + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + $(OutDir)gtest_unittest.pdb + Console + MachineX86 + + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + $(OutDir)gtest_unittest.pdb + Console + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + Console + true + true + MachineX86 + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + ..\..\include;..\..;%(AdditionalIncludeDirectories) + + + true + Console + true + true + + + + + MinSpace + MinSpace + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + Default + Default + + + + + ProgramDatabase + ProgramDatabase + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + + + + + {3af54c8a-10bf-4332-9147-f68ed9862032} + + + + + + \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/Debug/gtest/gtest.log b/test/gtest-1.8.0/msvc/Debug/gtest/gtest.log deleted file mode 100644 index fc0866ab37..0000000000 --- a/test/gtest-1.8.0/msvc/Debug/gtest/gtest.log +++ /dev/null @@ -1 +0,0 @@ - gtest.vcxproj -> C:\Users\jukotali\code\IISIntegration\test\gtest-1.8.0\msvc\Debug\gtest.lib diff --git a/test/gtest-1.8.0/msvc/gtest-md.sln b/test/gtest-1.8.0/msvc/gtest-md.sln deleted file mode 100644 index 829b4019ae..0000000000 --- a/test/gtest-1.8.0/msvc/gtest-md.sln +++ /dev/null @@ -1,45 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-md", "gtest-md.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main-md", "gtest_main-md.vcproj", "{3AF54C8A-10BF-4332-9147-F68ED9862033}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test-md", "gtest_prod_test-md.vcproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest-md", "gtest_unittest-md.vcproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release.ActiveCfg = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release.Build.0 = Release|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug.ActiveCfg = Debug|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug.Build.0 = Debug|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release.ActiveCfg = Release|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release.Build.0 = Release|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug.ActiveCfg = Debug|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug.Build.0 = Debug|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release.ActiveCfg = Release|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release.Build.0 = Release|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug.ActiveCfg = Debug|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug.Build.0 = Debug|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release.ActiveCfg = Release|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/test/gtest-1.8.0/msvc/gtest-md.vcproj b/test/gtest-1.8.0/msvc/gtest-md.vcproj deleted file mode 100644 index 1c1496ccbf..0000000000 --- a/test/gtest-1.8.0/msvc/gtest-md.vcproj +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/gtest-1.8.0/msvc/gtest.sln b/test/gtest-1.8.0/msvc/gtest.sln deleted file mode 100644 index c1b2929649..0000000000 --- a/test/gtest-1.8.0/msvc/gtest.sln +++ /dev/null @@ -1,45 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "gtest_main.vcproj", "{3AF54C8A-10BF-4332-9147-F68ED9862032}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest", "gtest_unittest.vcproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test", "gtest_prod_test.vcproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release.ActiveCfg = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release.Build.0 = Release|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug.ActiveCfg = Debug|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug.Build.0 = Debug|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release.ActiveCfg = Release|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release.Build.0 = Release|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug.ActiveCfg = Debug|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug.Build.0 = Debug|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.ActiveCfg = Release|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.Build.0 = Release|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.ActiveCfg = Debug|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.Build.0 = Debug|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.ActiveCfg = Release|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/test/gtest-1.8.0/msvc/gtest.vcproj b/test/gtest-1.8.0/msvc/gtest.vcproj deleted file mode 100644 index 449e7e09ea..0000000000 --- a/test/gtest-1.8.0/msvc/gtest.vcproj +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/gtest-1.8.0/msvc/gtest/gtest.log b/test/gtest-1.8.0/msvc/gtest/gtest.log deleted file mode 100644 index d7a722d2e2..0000000000 --- a/test/gtest-1.8.0/msvc/gtest/gtest.log +++ /dev/null @@ -1 +0,0 @@ - gtest.vcxproj -> C:\Users\jukotali\code\IISIntegration\test\gtest-1.8.0\msvc\Debug\Win32\gtest.lib diff --git a/test/gtest-1.8.0/msvc/gtest_main-md.vcproj b/test/gtest-1.8.0/msvc/gtest_main-md.vcproj deleted file mode 100644 index d00956cd3d..0000000000 --- a/test/gtest-1.8.0/msvc/gtest_main-md.vcproj +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/gtest-1.8.0/msvc/gtest_main.vcproj b/test/gtest-1.8.0/msvc/gtest_main.vcproj deleted file mode 100644 index e7e9f41768..0000000000 --- a/test/gtest-1.8.0/msvc/gtest_main.vcproj +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/gtest-1.8.0/msvc/gtest_prod_test-md.vcproj b/test/gtest-1.8.0/msvc/gtest_prod_test-md.vcproj deleted file mode 100644 index 4071d28fed..0000000000 --- a/test/gtest-1.8.0/msvc/gtest_prod_test-md.vcproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/gtest-1.8.0/msvc/gtest_prod_test.vcproj b/test/gtest-1.8.0/msvc/gtest_prod_test.vcproj deleted file mode 100644 index 998c75808a..0000000000 --- a/test/gtest-1.8.0/msvc/gtest_prod_test.vcproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/gtest-1.8.0/msvc/gtest_unittest-md.vcproj b/test/gtest-1.8.0/msvc/gtest_unittest-md.vcproj deleted file mode 100644 index 1525939750..0000000000 --- a/test/gtest-1.8.0/msvc/gtest_unittest-md.vcproj +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/gtest-1.8.0/msvc/gtest_unittest.vcproj b/test/gtest-1.8.0/msvc/gtest_unittest.vcproj deleted file mode 100644 index 2b2d743457..0000000000 --- a/test/gtest-1.8.0/msvc/gtest_unittest.vcproj +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/gtest-1.8.0/samples/prime_tables.h b/test/gtest-1.8.0/samples/prime_tables.h index 92ce16a014..55a3b44efd 100644 --- a/test/gtest-1.8.0/samples/prime_tables.h +++ b/test/gtest-1.8.0/samples/prime_tables.h @@ -103,11 +103,15 @@ class PreCalculatedPrimeTable : public PrimeTable { ::std::fill(is_prime_, is_prime_ + is_prime_size_, true); is_prime_[0] = is_prime_[1] = false; - for (int i = 2; i <= max; i++) { + // Checks every candidate for prime number (we know that 2 is the only even + // prime). + for (int i = 2; i*i <= max; i += i%2+1) { if (!is_prime_[i]) continue; // Marks all multiples of i (except i itself) as non-prime. - for (int j = 2*i; j <= max; j += i) { + // We are starting here from i-th multiplier, because all smaller + // complex numbers were already marked. + for (int j = i*i; j <= max; j += i) { is_prime_[j] = false; } } diff --git a/test/gtest-1.8.0/samples/sample1.cc b/test/gtest-1.8.0/samples/sample1.cc index f171e2609d..7c08b28f3b 100644 --- a/test/gtest-1.8.0/samples/sample1.cc +++ b/test/gtest-1.8.0/samples/sample1.cc @@ -55,7 +55,7 @@ bool IsPrime(int n) { // Try to divide n by every odd number i, starting from 3 for (int i = 3; ; i += 2) { - // We only have to try i up to the squre root of n + // We only have to try i up to the square root of n if (i > n/i) break; // Now, we have i <= n/i < n. diff --git a/test/gtest-1.8.0/samples/sample10_unittest.cc b/test/gtest-1.8.0/samples/sample10_unittest.cc index 0051cd5dcd..10aa7620f0 100644 --- a/test/gtest-1.8.0/samples/sample10_unittest.cc +++ b/test/gtest-1.8.0/samples/sample10_unittest.cc @@ -35,18 +35,15 @@ #include #include "gtest/gtest.h" - using ::testing::EmptyTestEventListener; using ::testing::InitGoogleTest; using ::testing::Test; -using ::testing::TestCase; using ::testing::TestEventListeners; using ::testing::TestInfo; using ::testing::TestPartResult; using ::testing::UnitTest; namespace { - // We will track memory used by this class. class Water { public: @@ -106,7 +103,6 @@ TEST(ListenersTest, LeaksWater) { Water* water = new Water; EXPECT_TRUE(water != NULL); } - } // namespace int main(int argc, char **argv) { diff --git a/test/gtest-1.8.0/samples/sample1_unittest.cc b/test/gtest-1.8.0/samples/sample1_unittest.cc index aefc4f1d86..8376bb4310 100644 --- a/test/gtest-1.8.0/samples/sample1_unittest.cc +++ b/test/gtest-1.8.0/samples/sample1_unittest.cc @@ -46,7 +46,7 @@ #include #include "sample1.h" #include "gtest/gtest.h" - +namespace { // Step 2. Use the TEST macro to define your tests. // @@ -139,6 +139,7 @@ TEST(IsPrimeTest, Positive) { EXPECT_FALSE(IsPrime(6)); EXPECT_TRUE(IsPrime(23)); } +} // namespace // Step 3. Call RUN_ALL_TESTS() in main(). // diff --git a/test/gtest-1.8.0/samples/sample2_unittest.cc b/test/gtest-1.8.0/samples/sample2_unittest.cc index 4fa19b71c7..df522da548 100644 --- a/test/gtest-1.8.0/samples/sample2_unittest.cc +++ b/test/gtest-1.8.0/samples/sample2_unittest.cc @@ -42,7 +42,7 @@ #include "sample2.h" #include "gtest/gtest.h" - +namespace { // In this example, we test the MyString class (a simple string). // Tests the default c'tor. @@ -107,3 +107,4 @@ TEST(MyString, Set) { s.Set(NULL); EXPECT_STREQ(NULL, s.c_string()); } +} // namespace diff --git a/test/gtest-1.8.0/samples/sample3_unittest.cc b/test/gtest-1.8.0/samples/sample3_unittest.cc index bf3877d013..7f51fd89c0 100644 --- a/test/gtest-1.8.0/samples/sample3_unittest.cc +++ b/test/gtest-1.8.0/samples/sample3_unittest.cc @@ -65,14 +65,14 @@ #include "sample3-inl.h" #include "gtest/gtest.h" - +namespace { // To use a test fixture, derive a class from testing::Test. -class QueueTest : public testing::Test { +class QueueTestSmpl3 : public testing::Test { protected: // You should make the members protected s.t. they can be // accessed from sub-classes. // virtual void SetUp() will be called before each test is run. You - // should define it if you need to initialize the varaibles. + // should define it if you need to initialize the variables. // Otherwise, this can be skipped. virtual void SetUp() { q1_.Enqueue(1); @@ -120,13 +120,13 @@ class QueueTest : public testing::Test { // instead of TEST. // Tests the default c'tor. -TEST_F(QueueTest, DefaultConstructor) { +TEST_F(QueueTestSmpl3, DefaultConstructor) { // You can access data in the test fixture here. EXPECT_EQ(0u, q0_.Size()); } // Tests Dequeue(). -TEST_F(QueueTest, Dequeue) { +TEST_F(QueueTestSmpl3, Dequeue) { int * n = q0_.Dequeue(); EXPECT_TRUE(n == NULL); @@ -144,8 +144,9 @@ TEST_F(QueueTest, Dequeue) { } // Tests the Queue::Map() function. -TEST_F(QueueTest, Map) { +TEST_F(QueueTestSmpl3, Map) { MapTester(&q0_); MapTester(&q1_); MapTester(&q2_); } +} // namespace diff --git a/test/gtest-1.8.0/samples/sample4_unittest.cc b/test/gtest-1.8.0/samples/sample4_unittest.cc index fa5afc7d5a..7bf9ea3449 100644 --- a/test/gtest-1.8.0/samples/sample4_unittest.cc +++ b/test/gtest-1.8.0/samples/sample4_unittest.cc @@ -29,10 +29,12 @@ // // Author: wan@google.com (Zhanyong Wan) -#include "gtest/gtest.h" #include "sample4.h" +#include "gtest/gtest.h" +namespace { // Tests the Increment() method. + TEST(Counter, Increment) { Counter c; @@ -43,3 +45,5 @@ TEST(Counter, Increment) { EXPECT_EQ(1, c.Increment()); EXPECT_EQ(2, c.Increment()); } + +} // namespace diff --git a/test/gtest-1.8.0/samples/sample5_unittest.cc b/test/gtest-1.8.0/samples/sample5_unittest.cc index 43d8e57775..401a58a5b7 100644 --- a/test/gtest-1.8.0/samples/sample5_unittest.cc +++ b/test/gtest-1.8.0/samples/sample5_unittest.cc @@ -46,10 +46,10 @@ #include #include -#include "sample3-inl.h" #include "gtest/gtest.h" #include "sample1.h" - +#include "sample3-inl.h" +namespace { // In this sample, we want to ensure that every test finishes within // ~5 seconds. If a test takes longer to run, we consider it a // failure. @@ -191,7 +191,7 @@ TEST_F(QueueTest, Dequeue) { EXPECT_EQ(1u, q2_.Size()); delete n; } - +} // namespace // If necessary, you can derive further test fixtures from a derived // fixture itself. For example, you can derive another fixture from // QueueTest. Google Test imposes no limit on how deep the hierarchy diff --git a/test/gtest-1.8.0/samples/sample6_unittest.cc b/test/gtest-1.8.0/samples/sample6_unittest.cc index 8f2036a516..1faf0c3d3b 100644 --- a/test/gtest-1.8.0/samples/sample6_unittest.cc +++ b/test/gtest-1.8.0/samples/sample6_unittest.cc @@ -36,7 +36,7 @@ #include "prime_tables.h" #include "gtest/gtest.h" - +namespace { // First, we define some factory functions for creating instances of // the implementations. You may be able to skip this step if all your // implementations can be constructed the same way. @@ -222,3 +222,4 @@ INSTANTIATE_TYPED_TEST_CASE_P(OnTheFlyAndPreCalculated, // Instance name PrimeTableImplementations); // Type list #endif // GTEST_HAS_TYPED_TEST_P +} // namespace diff --git a/test/gtest-1.8.0/samples/sample7_unittest.cc b/test/gtest-1.8.0/samples/sample7_unittest.cc index 1b651a21d6..efa972899e 100644 --- a/test/gtest-1.8.0/samples/sample7_unittest.cc +++ b/test/gtest-1.8.0/samples/sample7_unittest.cc @@ -39,8 +39,7 @@ #include "prime_tables.h" #include "gtest/gtest.h" - -#if GTEST_HAS_PARAM_TEST +namespace { using ::testing::TestWithParam; using ::testing::Values; @@ -65,9 +64,9 @@ PrimeTable* CreatePreCalculatedPrimeTable() { // can refer to the test parameter by GetParam(). In this case, the test // parameter is a factory function which we call in fixture's SetUp() to // create and store an instance of PrimeTable. -class PrimeTableTest : public TestWithParam { +class PrimeTableTestSmpl7 : public TestWithParam { public: - virtual ~PrimeTableTest() { delete table_; } + virtual ~PrimeTableTestSmpl7() { delete table_; } virtual void SetUp() { table_ = (*GetParam())(); } virtual void TearDown() { delete table_; @@ -78,7 +77,7 @@ class PrimeTableTest : public TestWithParam { PrimeTable* table_; }; -TEST_P(PrimeTableTest, ReturnsFalseForNonPrimes) { +TEST_P(PrimeTableTestSmpl7, ReturnsFalseForNonPrimes) { EXPECT_FALSE(table_->IsPrime(-5)); EXPECT_FALSE(table_->IsPrime(0)); EXPECT_FALSE(table_->IsPrime(1)); @@ -87,7 +86,7 @@ TEST_P(PrimeTableTest, ReturnsFalseForNonPrimes) { EXPECT_FALSE(table_->IsPrime(100)); } -TEST_P(PrimeTableTest, ReturnsTrueForPrimes) { +TEST_P(PrimeTableTestSmpl7, ReturnsTrueForPrimes) { EXPECT_TRUE(table_->IsPrime(2)); EXPECT_TRUE(table_->IsPrime(3)); EXPECT_TRUE(table_->IsPrime(5)); @@ -96,7 +95,7 @@ TEST_P(PrimeTableTest, ReturnsTrueForPrimes) { EXPECT_TRUE(table_->IsPrime(131)); } -TEST_P(PrimeTableTest, CanGetNextPrime) { +TEST_P(PrimeTableTestSmpl7, CanGetNextPrime) { EXPECT_EQ(2, table_->GetNextPrime(0)); EXPECT_EQ(3, table_->GetNextPrime(2)); EXPECT_EQ(5, table_->GetNextPrime(3)); @@ -112,19 +111,8 @@ TEST_P(PrimeTableTest, CanGetNextPrime) { // // Here, we instantiate our tests with a list of two PrimeTable object // factory functions: -INSTANTIATE_TEST_CASE_P( - OnTheFlyAndPreCalculated, - PrimeTableTest, - Values(&CreateOnTheFlyPrimeTable, &CreatePreCalculatedPrimeTable<1000>)); +INSTANTIATE_TEST_CASE_P(OnTheFlyAndPreCalculated, PrimeTableTestSmpl7, + Values(&CreateOnTheFlyPrimeTable, + &CreatePreCalculatedPrimeTable<1000>)); -#else - -// Google Test may not support value-parameterized tests with some -// compilers. If we use conditional compilation to compile out all -// code referring to the gtest_main library, MSVC linker will not link -// that library at all and consequently complain about missing entry -// point defined in that library (fatal error LNK1561: entry point -// must be defined). This dummy test keeps gtest_main linked in. -TEST(DummyTest, ValueParameterizedTestsAreNotSupportedOnThisPlatform) {} - -#endif // GTEST_HAS_PARAM_TEST +} // namespace diff --git a/test/gtest-1.8.0/samples/sample8_unittest.cc b/test/gtest-1.8.0/samples/sample8_unittest.cc index 7274334067..b0ff2d1fdc 100644 --- a/test/gtest-1.8.0/samples/sample8_unittest.cc +++ b/test/gtest-1.8.0/samples/sample8_unittest.cc @@ -37,7 +37,7 @@ #include "prime_tables.h" #include "gtest/gtest.h" - +namespace { #if GTEST_HAS_COMBINE // Suppose we want to introduce a new, improved implementation of PrimeTable @@ -171,3 +171,4 @@ INSTANTIATE_TEST_CASE_P(MeaningfulTestParameters, TEST(DummyTest, CombineIsNotSupportedOnThisPlatform) {} #endif // GTEST_HAS_COMBINE +} // namespace diff --git a/test/gtest-1.8.0/samples/sample9_unittest.cc b/test/gtest-1.8.0/samples/sample9_unittest.cc index b2e2079bf3..75584bb04a 100644 --- a/test/gtest-1.8.0/samples/sample9_unittest.cc +++ b/test/gtest-1.8.0/samples/sample9_unittest.cc @@ -44,9 +44,7 @@ using ::testing::TestEventListeners; using ::testing::TestInfo; using ::testing::TestPartResult; using ::testing::UnitTest; - namespace { - // Provides alternative output mode which produces minimal amount of // information about tests. class TersePrinter : public EmptyTestEventListener { @@ -102,7 +100,6 @@ TEST(CustomOutputTest, Fails) { EXPECT_EQ(1, 2) << "This test fails in order to demonstrate alternative failure messages"; } - } // namespace int main(int argc, char **argv) { diff --git a/test/gtest-1.8.0/scripts/fuse_gtest_files.py b/test/gtest-1.8.0/scripts/fuse_gtest_files.py index 3f3e9f36d6..9a5c8d367f 100644 --- a/test/gtest-1.8.0/scripts/fuse_gtest_files.py +++ b/test/gtest-1.8.0/scripts/fuse_gtest_files.py @@ -52,7 +52,7 @@ EXAMPLES This tool is experimental. In particular, it assumes that there is no conditional inclusion of Google Test headers. Please report any problems to googletestframework@googlegroups.com. You can read -http://code.google.com/p/googletest/wiki/GoogleTestAdvancedGuide for +https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuide.md for more information. """ diff --git a/test/gtest-1.8.0/scripts/gen_gtest_pred_impl.py b/test/gtest-1.8.0/scripts/gen_gtest_pred_impl.py index 3e7ab042ea..b43efdf41e 100644 --- a/test/gtest-1.8.0/scripts/gen_gtest_pred_impl.py +++ b/test/gtest-1.8.0/scripts/gen_gtest_pred_impl.py @@ -115,10 +115,9 @@ def HeaderPreamble(n): #ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ #define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ -// Makes sure this header is not included before gtest.h. -#ifndef GTEST_INCLUDE_GTEST_GTEST_H_ -# error Do not include gtest_pred_impl.h directly. Include gtest.h instead. -#endif // GTEST_INCLUDE_GTEST_GTEST_H_ +#include "gtest/gtest.h" + +namespace testing { // This header implements a family of generic predicate assertion // macros: @@ -295,16 +294,17 @@ def HeaderPostamble(): return """ +} // namespace testing + #endif // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ """ def GenerateFile(path, content): - """Given a file path and a content string, overwrites it with the - given content.""" - + """Given a file path and a content string + overwrites it with the given content. + """ print 'Updating file %s . . .' % path - f = file(path, 'w+') print >>f, content, f.close() @@ -314,8 +314,8 @@ def GenerateFile(path, content): def GenerateHeader(n): """Given the maximum arity n, updates the header file that implements - the predicate assertions.""" - + the predicate assertions. + """ GenerateFile(HEADER, HeaderPreamble(n) + ''.join([ImplementationForArity(i) for i in OneTo(n)]) diff --git a/test/gtest-1.8.0/scripts/upload.py b/test/gtest-1.8.0/scripts/upload.py index 6e6f9a1471..81e8e04d72 100644 --- a/test/gtest-1.8.0/scripts/upload.py +++ b/test/gtest-1.8.0/scripts/upload.py @@ -732,7 +732,7 @@ class SubversionVCS(VersionControlSystem): else: self.rev_start = self.rev_end = None # Cache output from "svn list -r REVNO dirname". - # Keys: dirname, Values: 2-tuple (ouput for start rev and end rev). + # Keys: dirname, Values: 2-tuple (output for start rev and end rev). self.svnls_cache = {} # SVN base URL is required to fetch files deleted in an older revision. # Result is cached to not guess it over and over again in GetBaseFile(). diff --git a/test/gtest-1.8.0/src/gtest-all.cc b/test/gtest-1.8.0/src/gtest-all.cc index 0a9cee5223..5872a2e62f 100644 --- a/test/gtest-1.8.0/src/gtest-all.cc +++ b/test/gtest-1.8.0/src/gtest-all.cc @@ -29,7 +29,7 @@ // // Author: mheule@google.com (Markus Heule) // -// Google C++ Testing Framework (Google Test) +// Google C++ Testing and Mocking Framework (Google Test) // // Sometimes it's desirable to build Google Test by compiling a single file. // This file serves this purpose. diff --git a/test/gtest-1.8.0/src/gtest-death-test.cc b/test/gtest-1.8.0/src/gtest-death-test.cc index a01a369830..b397992488 100644 --- a/test/gtest-1.8.0/src/gtest-death-test.cc +++ b/test/gtest-1.8.0/src/gtest-death-test.cc @@ -62,26 +62,28 @@ # include # endif // GTEST_OS_QNX +# if GTEST_OS_FUCHSIA +# include +# include +# include +# endif // GTEST_OS_FUCHSIA + #endif // GTEST_HAS_DEATH_TEST #include "gtest/gtest-message.h" #include "gtest/internal/gtest-string.h" - -// Indicates that this translation unit is part of Google Test's -// implementation. It must come before gtest-internal-inl.h is -// included, or there will be a compiler error. This trick exists to -// prevent the accidental inclusion of gtest-internal-inl.h in the -// user's code. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ namespace testing { // Constants. // The default death test style. -static const char kDefaultDeathTestStyle[] = "fast"; +// +// This is defined in internal/gtest-port.h as "fast", but can be overridden by +// a definition in internal/custom/gtest-port.h. The recommended value, which is +// used internally at Google, is "threadsafe". +static const char kDefaultDeathTestStyle[] = GTEST_DEFAULT_DEATH_TEST_STYLE; GTEST_DEFINE_string_( death_test_style, @@ -121,7 +123,7 @@ namespace internal { // Valid only for fast death tests. Indicates the code is running in the // child process of a fast style death test. -# if !GTEST_OS_WINDOWS +# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA static bool g_in_fast_death_test_child = false; # endif @@ -131,10 +133,10 @@ static bool g_in_fast_death_test_child = false; // tests. IMPORTANT: This is an internal utility. Using it may break the // implementation of death tests. User code MUST NOT use it. bool InDeathTestChild() { -# if GTEST_OS_WINDOWS +# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA - // On Windows, death tests are thread-safe regardless of the value of the - // death_test_style flag. + // On Windows and Fuchsia, death tests are thread-safe regardless of the value + // of the death_test_style flag. return !GTEST_FLAG(internal_run_death_test).empty(); # else @@ -154,7 +156,7 @@ ExitedWithCode::ExitedWithCode(int exit_code) : exit_code_(exit_code) { // ExitedWithCode function-call operator. bool ExitedWithCode::operator()(int exit_status) const { -# if GTEST_OS_WINDOWS +# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA return exit_status == exit_code_; @@ -162,10 +164,10 @@ bool ExitedWithCode::operator()(int exit_status) const { return WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == exit_code_; -# endif // GTEST_OS_WINDOWS +# endif // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA } -# if !GTEST_OS_WINDOWS +# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA // KilledBySignal constructor. KilledBySignal::KilledBySignal(int signum) : signum_(signum) { } @@ -182,7 +184,7 @@ bool KilledBySignal::operator()(int exit_status) const { # endif // defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_) return WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum_; } -# endif // !GTEST_OS_WINDOWS +# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA namespace internal { @@ -193,7 +195,7 @@ namespace internal { static std::string ExitSummary(int exit_code) { Message m; -# if GTEST_OS_WINDOWS +# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA m << "Exited with exit status " << exit_code; @@ -209,7 +211,7 @@ static std::string ExitSummary(int exit_code) { m << " (core dumped)"; } # endif -# endif // GTEST_OS_WINDOWS +# endif // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA return m.GetString(); } @@ -220,7 +222,7 @@ bool ExitedUnsuccessfully(int exit_status) { return !ExitedWithCode(0)(exit_status); } -# if !GTEST_OS_WINDOWS +# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA // Generates a textual failure message when a death test finds more than // one thread running, or cannot determine the number of threads, prior // to executing the given statement. It is the responsibility of the @@ -235,7 +237,7 @@ static std::string DeathTestThreadWarning(size_t thread_count) { msg << "detected " << thread_count << " threads."; return msg.GetString(); } -# endif // !GTEST_OS_WINDOWS +# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA // Flag characters for reporting a death test that did not die. static const char kDeathTestLived = 'L'; @@ -243,6 +245,13 @@ static const char kDeathTestReturned = 'R'; static const char kDeathTestThrew = 'T'; static const char kDeathTestInternalError = 'I'; +#if GTEST_OS_FUCHSIA + +// File descriptor used for the pipe in the child process. +static const int kFuchsiaReadPipeFd = 3; + +#endif + // An enumeration describing all of the possible ways that a death test can // conclude. DIED means that the process died while executing the test // code; LIVED means that process lived beyond the end of the test code; @@ -259,7 +268,7 @@ enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW }; // message is propagated back to the parent process. Otherwise, the // message is simply printed to stderr. In either case, the program // then exits with status 1. -void DeathTestAbort(const std::string& message) { +static void DeathTestAbort(const std::string& message) { // On a POSIX system, this function may be called from a threadsafe-style // death test child process, which operates on a very small stack. Use // the heap for any additional non-minuscule memory requirements. @@ -563,7 +572,13 @@ bool DeathTestImpl::Passed(bool status_ok) { break; case DIED: if (status_ok) { +# if GTEST_USES_PCRE + // PCRE regexes support embedded NULs. + // GTEST_USES_PCRE is defined only in google3 mode + const bool matched = RE::PartialMatch(error_message, *regex()); +# else const bool matched = RE::PartialMatch(error_message.c_str(), *regex()); +# endif // GTEST_USES_PCRE if (matched) { success = true; } else { @@ -779,7 +794,168 @@ DeathTest::TestRole WindowsDeathTest::AssumeRole() { set_spawned(true); return OVERSEE_TEST; } -# else // We are not on Windows. + +# elif GTEST_OS_FUCHSIA + +class FuchsiaDeathTest : public DeathTestImpl { + public: + FuchsiaDeathTest(const char* a_statement, + const RE* a_regex, + const char* file, + int line) + : DeathTestImpl(a_statement, a_regex), file_(file), line_(line) {} + + // All of these virtual functions are inherited from DeathTest. + virtual int Wait(); + virtual TestRole AssumeRole(); + + private: + // The name of the file in which the death test is located. + const char* const file_; + // The line number on which the death test is located. + const int line_; + + zx_handle_t child_process_; +}; + +// Utility class for accumulating command-line arguments. +class Arguments { + public: + Arguments() { + args_.push_back(NULL); + } + + ~Arguments() { + for (std::vector::iterator i = args_.begin(); i != args_.end(); + ++i) { + free(*i); + } + } + void AddArgument(const char* argument) { + args_.insert(args_.end() - 1, posix::StrDup(argument)); + } + + template + void AddArguments(const ::std::vector& arguments) { + for (typename ::std::vector::const_iterator i = arguments.begin(); + i != arguments.end(); + ++i) { + args_.insert(args_.end() - 1, posix::StrDup(i->c_str())); + } + } + char* const* Argv() { + return &args_[0]; + } + + int size() { + return args_.size() - 1; + } + + private: + std::vector args_; +}; + +// Waits for the child in a death test to exit, returning its exit +// status, or 0 if no child process exists. As a side effect, sets the +// outcome data member. +int FuchsiaDeathTest::Wait() { + if (!spawned()) + return 0; + + // Wait for child process to terminate. + zx_status_t status_zx; + zx_signals_t signals; + status_zx = zx_object_wait_one( + child_process_, + ZX_PROCESS_TERMINATED, + ZX_TIME_INFINITE, + &signals); + GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK); + + ReadAndInterpretStatusByte(); + + zx_info_process_t buffer; + status_zx = zx_object_get_info( + child_process_, + ZX_INFO_PROCESS, + &buffer, + sizeof(buffer), + nullptr, + nullptr); + GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK); + + GTEST_DEATH_TEST_CHECK_(buffer.exited); + set_status(buffer.return_code); + return status(); +} + +// The AssumeRole process for a Fuchsia death test. It creates a child +// process with the same executable as the current process to run the +// death test. The child process is given the --gtest_filter and +// --gtest_internal_run_death_test flags such that it knows to run the +// current death test only. +DeathTest::TestRole FuchsiaDeathTest::AssumeRole() { + const UnitTestImpl* const impl = GetUnitTestImpl(); + const InternalRunDeathTestFlag* const flag = + impl->internal_run_death_test_flag(); + const TestInfo* const info = impl->current_test_info(); + const int death_test_index = info->result()->death_test_count(); + + if (flag != NULL) { + // ParseInternalRunDeathTestFlag() has performed all the necessary + // processing. + set_write_fd(kFuchsiaReadPipeFd); + return EXECUTE_TEST; + } + + CaptureStderr(); + // Flush the log buffers since the log streams are shared with the child. + FlushInfoLog(); + + // Build the child process command line. + const std::string filter_flag = + std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" + + info->test_case_name() + "." + info->name(); + const std::string internal_flag = + std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "=" + + file_ + "|" + + StreamableToString(line_) + "|" + + StreamableToString(death_test_index); + Arguments args; + args.AddArguments(GetInjectableArgvs()); + args.AddArgument(filter_flag.c_str()); + args.AddArgument(internal_flag.c_str()); + + // Build the child process launcher. + zx_status_t status; + launchpad_t* lp; + status = launchpad_create(ZX_HANDLE_INVALID, args.Argv()[0], &lp); + GTEST_DEATH_TEST_CHECK_(status == ZX_OK); + + // Build the pipe for communication with the child. + int read_fd; + status = launchpad_add_pipe(lp, &read_fd, kFuchsiaReadPipeFd); + GTEST_DEATH_TEST_CHECK_(status == ZX_OK); + set_read_fd(read_fd); + + // Set the command line arguments. + status = launchpad_load_from_file(lp, args.Argv()[0]); + GTEST_DEATH_TEST_CHECK_(status == ZX_OK); + status = launchpad_set_args(lp, args.size(), args.Argv()); + GTEST_DEATH_TEST_CHECK_(status == ZX_OK); + + // Clone all the things (environment, stdio, namespace, ...). + launchpad_clone(lp, LP_CLONE_ALL); + + // Launch the child process. + status = launchpad_go(lp, &child_process_, nullptr); + GTEST_DEATH_TEST_CHECK_(status == ZX_OK); + + set_spawned(true); + return OVERSEE_TEST; +} + +#else // We are neither on Windows, nor on Fuchsia. // ForkingDeathTest provides implementations for most of the abstract // methods of the DeathTest interface. Only the AssumeRole method is @@ -883,11 +1059,10 @@ class ExecDeathTest : public ForkingDeathTest { ForkingDeathTest(a_statement, a_regex), file_(file), line_(line) { } virtual TestRole AssumeRole(); private: - static ::std::vector - GetArgvsForDeathTestChildProcess() { - ::std::vector args = GetInjectableArgvs(); + static ::std::vector GetArgvsForDeathTestChildProcess() { + ::std::vector args = GetInjectableArgvs(); # if defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_) - ::std::vector extra_args = + ::std::vector extra_args = GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_(); args.insert(args.end(), extra_args.begin(), extra_args.end()); # endif // defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_) @@ -986,6 +1161,7 @@ static int ExecDeathTestChildMain(void* child_arg) { } # endif // !GTEST_OS_QNX +# if GTEST_HAS_CLONE // Two utility routines that together determine the direction the stack // grows. // This could be accomplished more elegantly by a single recursive @@ -995,20 +1171,22 @@ static int ExecDeathTestChildMain(void* child_arg) { // GTEST_NO_INLINE_ is required to prevent GCC 4.6 from inlining // StackLowerThanAddress into StackGrowsDown, which then doesn't give // correct answer. -void StackLowerThanAddress(const void* ptr, bool* result) GTEST_NO_INLINE_; -void StackLowerThanAddress(const void* ptr, bool* result) { +static void StackLowerThanAddress(const void* ptr, + bool* result) GTEST_NO_INLINE_; +static void StackLowerThanAddress(const void* ptr, bool* result) { int dummy; *result = (&dummy < ptr); } // Make sure AddressSanitizer does not tamper with the stack here. GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ -bool StackGrowsDown() { +static bool StackGrowsDown() { int dummy; bool result; StackLowerThanAddress(&dummy, &result); return result; } +# endif // GTEST_HAS_CLONE // Spawns a child process with the same executable as the current process in // a thread-safe manner and instructs it to run the death test. The @@ -1200,6 +1378,13 @@ bool DefaultDeathTestFactory::Create(const char* statement, const RE* regex, *test = new WindowsDeathTest(statement, regex, file, line); } +# elif GTEST_OS_FUCHSIA + + if (GTEST_FLAG(death_test_style) == "threadsafe" || + GTEST_FLAG(death_test_style) == "fast") { + *test = new FuchsiaDeathTest(statement, regex, file, line); + } + # else if (GTEST_FLAG(death_test_style) == "threadsafe") { @@ -1224,7 +1409,7 @@ bool DefaultDeathTestFactory::Create(const char* statement, const RE* regex, // Recreates the pipe and event handles from the provided parameters, // signals the event, and returns a file descriptor wrapped around the pipe // handle. This function is called in the child process only. -int GetStatusFileDescriptor(unsigned int parent_process_id, +static int GetStatusFileDescriptor(unsigned int parent_process_id, size_t write_handle_as_size_t, size_t event_handle_as_size_t) { AutoHandle parent_process_handle(::OpenProcess(PROCESS_DUP_HANDLE, @@ -1243,7 +1428,7 @@ int GetStatusFileDescriptor(unsigned int parent_process_id, reinterpret_cast(write_handle_as_size_t); HANDLE dup_write_handle; - // The newly initialized handle is accessible only in in the parent + // The newly initialized handle is accessible only in the parent // process. To obtain one accessible within the child, we need to use // DuplicateHandle. if (!::DuplicateHandle(parent_process_handle.Get(), write_handle, @@ -1320,6 +1505,16 @@ InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() { write_fd = GetStatusFileDescriptor(parent_process_id, write_handle_as_size_t, event_handle_as_size_t); + +# elif GTEST_OS_FUCHSIA + + if (fields.size() != 3 + || !ParseNaturalNumber(fields[1], &line) + || !ParseNaturalNumber(fields[2], &index)) { + DeathTestAbort("Bad --gtest_internal_run_death_test flag: " + + GTEST_FLAG(internal_run_death_test)); + } + # else if (fields.size() != 4 diff --git a/test/gtest-1.8.0/src/gtest-filepath.cc b/test/gtest-1.8.0/src/gtest-filepath.cc index 0292dc1195..6b76ea0f37 100644 --- a/test/gtest-1.8.0/src/gtest-filepath.cc +++ b/test/gtest-1.8.0/src/gtest-filepath.cc @@ -26,14 +26,12 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: keith.ray@gmail.com (Keith Ray) -#include "gtest/gtest-message.h" #include "gtest/internal/gtest-filepath.h" -#include "gtest/internal/gtest-port.h" #include +#include "gtest/internal/gtest-port.h" +#include "gtest/gtest-message.h" #if GTEST_OS_WINDOWS_MOBILE # include @@ -48,6 +46,8 @@ # include // Some Linux distributions define PATH_MAX here. #endif // GTEST_OS_WINDOWS_MOBILE +#include "gtest/internal/gtest-string.h" + #if GTEST_OS_WINDOWS # define GTEST_PATH_MAX_ _MAX_PATH #elif defined(PATH_MAX) @@ -58,8 +58,6 @@ # define GTEST_PATH_MAX_ _POSIX_PATH_MAX #endif // GTEST_OS_WINDOWS -#include "gtest/internal/gtest-string.h" - namespace testing { namespace internal { @@ -130,7 +128,7 @@ FilePath FilePath::RemoveExtension(const char* extension) const { return *this; } -// Returns a pointer to the last occurence of a valid path separator in +// Returns a pointer to the last occurrence of a valid path separator in // the FilePath. On Windows, for example, both '/' and '\' are valid path // separators. Returns NULL if no path separator was found. const char* FilePath::FindLastPathSeparator() const { diff --git a/test/gtest-1.8.0/src/gtest-internal-inl.h b/test/gtest-1.8.0/src/gtest-internal-inl.h index ed8a682a96..e77c8b6caf 100644 --- a/test/gtest-1.8.0/src/gtest-internal-inl.h +++ b/test/gtest-1.8.0/src/gtest-internal-inl.h @@ -37,14 +37,6 @@ #ifndef GTEST_SRC_GTEST_INTERNAL_INL_H_ #define GTEST_SRC_GTEST_INTERNAL_INL_H_ -// GTEST_IMPLEMENTATION_ is defined to 1 iff the current translation unit is -// part of Google Test's implementation; otherwise it's undefined. -#if !GTEST_IMPLEMENTATION_ -// If this file is included from the user's code, just say no. -# error "gtest-internal-inl.h is part of Google Test's internal implementation." -# error "It must not be included except by Google Test itself." -#endif // GTEST_IMPLEMENTATION_ - #ifndef _WIN32_WCE # include #endif // !_WIN32_WCE @@ -67,7 +59,7 @@ # include // NOLINT #endif // GTEST_OS_WINDOWS -#include "gtest/gtest.h" // NOLINT +#include "gtest/gtest.h" #include "gtest/gtest-spi.h" namespace testing { @@ -94,6 +86,7 @@ const char kFilterFlag[] = "filter"; const char kListTestsFlag[] = "list_tests"; const char kOutputFlag[] = "output"; const char kPrintTimeFlag[] = "print_time"; +const char kPrintUTF8Flag[] = "print_utf8"; const char kRandomSeedFlag[] = "random_seed"; const char kRepeatFlag[] = "repeat"; const char kShuffleFlag[] = "shuffle"; @@ -174,6 +167,7 @@ class GTestFlagSaver { list_tests_ = GTEST_FLAG(list_tests); output_ = GTEST_FLAG(output); print_time_ = GTEST_FLAG(print_time); + print_utf8_ = GTEST_FLAG(print_utf8); random_seed_ = GTEST_FLAG(random_seed); repeat_ = GTEST_FLAG(repeat); shuffle_ = GTEST_FLAG(shuffle); @@ -195,6 +189,7 @@ class GTestFlagSaver { GTEST_FLAG(list_tests) = list_tests_; GTEST_FLAG(output) = output_; GTEST_FLAG(print_time) = print_time_; + GTEST_FLAG(print_utf8) = print_utf8_; GTEST_FLAG(random_seed) = random_seed_; GTEST_FLAG(repeat) = repeat_; GTEST_FLAG(shuffle) = shuffle_; @@ -216,6 +211,7 @@ class GTestFlagSaver { bool list_tests_; std::string output_; bool print_time_; + bool print_utf8_; internal::Int32 random_seed_; internal::Int32 repeat_; bool shuffle_; @@ -426,7 +422,7 @@ class OsStackTraceGetterInterface { // in the trace. // skip_count - the number of top frames to be skipped; doesn't count // against max_depth. - virtual string CurrentStackTrace(int max_depth, int skip_count) = 0; + virtual std::string CurrentStackTrace(int max_depth, int skip_count) = 0; // UponLeavingGTest() should be called immediately before Google Test calls // user code. It saves some information about the current stack that @@ -446,7 +442,7 @@ class OsStackTraceGetter : public OsStackTraceGetterInterface { public: OsStackTraceGetter() {} - virtual string CurrentStackTrace(int max_depth, int skip_count); + virtual std::string CurrentStackTrace(int max_depth, int skip_count); virtual void UponLeavingGTest(); private: @@ -664,13 +660,11 @@ class GTEST_API_ UnitTestImpl { tear_down_tc)->AddTestInfo(test_info); } -#if GTEST_HAS_PARAM_TEST // Returns ParameterizedTestCaseRegistry object used to keep track of // value-parameterized tests and instantiate and register them. internal::ParameterizedTestCaseRegistry& parameterized_test_registry() { return parameterized_test_registry_; } -#endif // GTEST_HAS_PARAM_TEST // Sets the TestCase object for the test that's currently running. void set_current_test_case(TestCase* a_current_test_case) { @@ -845,14 +839,12 @@ class GTEST_API_ UnitTestImpl { // shuffled order. std::vector test_case_indices_; -#if GTEST_HAS_PARAM_TEST // ParameterizedTestRegistry object used to register value-parameterized // tests. internal::ParameterizedTestCaseRegistry parameterized_test_registry_; // Indicates whether RegisterParameterizedTests() has been called already. bool parameterized_tests_registered_; -#endif // GTEST_HAS_PARAM_TEST // Index of the last death test case registered. Initially -1. int last_death_test_case_; @@ -1032,7 +1024,7 @@ class TestResultAccessor { #if GTEST_CAN_STREAM_RESULTS_ // Streams test results to the given port on the given host machine. -class GTEST_API_ StreamingListener : public EmptyTestEventListener { +class StreamingListener : public EmptyTestEventListener { public: // Abstract base class for writing strings to a socket. class AbstractSocketWriter { @@ -1040,21 +1032,19 @@ class GTEST_API_ StreamingListener : public EmptyTestEventListener { virtual ~AbstractSocketWriter() {} // Sends a string to the socket. - virtual void Send(const string& message) = 0; + virtual void Send(const std::string& message) = 0; // Closes the socket. virtual void CloseConnection() {} // Sends a string and a newline to the socket. - void SendLn(const string& message) { - Send(message + "\n"); - } + void SendLn(const std::string& message) { Send(message + "\n"); } }; // Concrete class for actually writing strings to a socket. class SocketWriter : public AbstractSocketWriter { public: - SocketWriter(const string& host, const string& port) + SocketWriter(const std::string& host, const std::string& port) : sockfd_(-1), host_name_(host), port_num_(port) { MakeConnection(); } @@ -1065,7 +1055,7 @@ class GTEST_API_ StreamingListener : public EmptyTestEventListener { } // Sends a string to the socket. - virtual void Send(const string& message) { + virtual void Send(const std::string& message) { GTEST_CHECK_(sockfd_ != -1) << "Send() can be called only when there is a connection."; @@ -1091,17 +1081,19 @@ class GTEST_API_ StreamingListener : public EmptyTestEventListener { } int sockfd_; // socket file descriptor - const string host_name_; - const string port_num_; + const std::string host_name_; + const std::string port_num_; GTEST_DISALLOW_COPY_AND_ASSIGN_(SocketWriter); }; // class SocketWriter // Escapes '=', '&', '%', and '\n' characters in str as "%xx". - static string UrlEncode(const char* str); + static std::string UrlEncode(const char* str); - StreamingListener(const string& host, const string& port) - : socket_writer_(new SocketWriter(host, port)) { Start(); } + StreamingListener(const std::string& host, const std::string& port) + : socket_writer_(new SocketWriter(host, port)) { + Start(); + } explicit StreamingListener(AbstractSocketWriter* socket_writer) : socket_writer_(socket_writer) { Start(); } @@ -1162,13 +1154,13 @@ class GTEST_API_ StreamingListener : public EmptyTestEventListener { private: // Sends the given message and a newline to the socket. - void SendLn(const string& message) { socket_writer_->SendLn(message); } + void SendLn(const std::string& message) { socket_writer_->SendLn(message); } // Called at the start of streaming to notify the receiver what // protocol we are using. void Start() { SendLn("gtest_streaming_protocol_version=1.0"); } - string FormatBool(bool value) { return value ? "1" : "0"; } + std::string FormatBool(bool value) { return value ? "1" : "0"; } const scoped_ptr socket_writer_; diff --git a/test/gtest-1.8.0/src/gtest-port.cc b/test/gtest-1.8.0/src/gtest-port.cc index e5bf3dd2be..f8a0ad65a9 100644 --- a/test/gtest-1.8.0/src/gtest-port.cc +++ b/test/gtest-1.8.0/src/gtest-port.cc @@ -63,19 +63,16 @@ # include #endif // GTEST_OS_AIX +#if GTEST_OS_FUCHSIA +# include +# include +#endif // GTEST_OS_FUCHSIA + #include "gtest/gtest-spi.h" #include "gtest/gtest-message.h" #include "gtest/internal/gtest-internal.h" #include "gtest/internal/gtest-string.h" - -// Indicates that this translation unit is part of Google Test's -// implementation. It must come before gtest-internal-inl.h is -// included, or there will be a compiler error. This trick exists to -// prevent the accidental inclusion of gtest-internal-inl.h in the -// user's code. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ namespace testing { namespace internal { @@ -93,7 +90,7 @@ const int kStdErrFileno = STDERR_FILENO; namespace { template -T ReadProcFileField(const string& filename, int field) { +T ReadProcFileField(const std::string& filename, int field) { std::string dummy; std::ifstream file(filename.c_str()); while (field-- > 0) { @@ -107,7 +104,7 @@ T ReadProcFileField(const string& filename, int field) { // Returns the number of active threads, or 0 when there is an error. size_t GetThreadCount() { - const string filename = + const std::string filename = (Message() << "/proc/" << getpid() << "/stat").GetString(); return ReadProcFileField(filename, 19); } @@ -164,6 +161,25 @@ size_t GetThreadCount() { } } +#elif GTEST_OS_FUCHSIA + +size_t GetThreadCount() { + int dummy_buffer; + size_t avail; + zx_status_t status = zx_object_get_info( + zx_process_self(), + ZX_INFO_PROCESS_THREADS, + &dummy_buffer, + 0, + nullptr, + &avail); + if (status == ZX_OK) { + return avail; + } else { + return 0; + } +} + #else size_t GetThreadCount() { @@ -496,7 +512,7 @@ class ThreadLocalRegistryImpl { FALSE, thread_id); GTEST_CHECK_(thread != NULL); - // We need to to pass a valid thread ID pointer into CreateThread for it + // We need to pass a valid thread ID pointer into CreateThread for it // to work correctly under Win98. DWORD watcher_thread_id; HANDLE watcher_thread = ::CreateThread( @@ -671,7 +687,7 @@ bool AtomMatchesChar(bool escaped, char pattern_char, char ch) { } // Helper function used by ValidateRegex() to format error messages. -std::string FormatRegexSyntaxError(const char* regex, int index) { +static std::string FormatRegexSyntaxError(const char* regex, int index) { return (Message() << "Syntax error at index " << index << " in simple regular expression \"" << regex << "\": ").GetString(); } @@ -923,6 +939,7 @@ GTestLog::~GTestLog() { posix::Abort(); } } + // Disable Microsoft deprecation warnings for POSIX functions called from // this class (creat, dup, dup2, and close) GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996) @@ -1015,7 +1032,8 @@ static CapturedStream* g_captured_stderr = NULL; static CapturedStream* g_captured_stdout = NULL; // Starts capturing an output stream (stdout/stderr). -void CaptureStream(int fd, const char* stream_name, CapturedStream** stream) { +static void CaptureStream(int fd, const char* stream_name, + CapturedStream** stream) { if (*stream != NULL) { GTEST_LOG_(FATAL) << "Only one " << stream_name << " capturer can exist at a time."; @@ -1024,7 +1042,7 @@ void CaptureStream(int fd, const char* stream_name, CapturedStream** stream) { } // Stops capturing the output stream and returns the captured string. -std::string GetCapturedStream(CapturedStream** captured_stream) { +static std::string GetCapturedStream(CapturedStream** captured_stream) { const std::string content = (*captured_stream)->GetCapturedString(); delete *captured_stream; @@ -1055,23 +1073,9 @@ std::string GetCapturedStderr() { #endif // GTEST_HAS_STREAM_REDIRECTION -std::string TempDir() { -#if GTEST_OS_WINDOWS_MOBILE - return "\\temp\\"; -#elif GTEST_OS_WINDOWS - const char* temp_dir = posix::GetEnv("TEMP"); - if (temp_dir == NULL || temp_dir[0] == '\0') - return "\\temp\\"; - else if (temp_dir[strlen(temp_dir) - 1] == '\\') - return temp_dir; - else - return std::string(temp_dir) + "\\"; -#elif GTEST_OS_LINUX_ANDROID - return "/sdcard/"; -#else - return "/tmp/"; -#endif // GTEST_OS_WINDOWS_MOBILE -} + + + size_t GetFileSize(FILE* file) { fseek(file, 0, SEEK_END); @@ -1101,22 +1105,36 @@ std::string ReadEntireFile(FILE* file) { } #if GTEST_HAS_DEATH_TEST +static const std::vector* g_injected_test_argvs = NULL; // Owned. -static const ::std::vector* g_injected_test_argvs = - NULL; // Owned. - -void SetInjectableArgvs(const ::std::vector* argvs) { - if (g_injected_test_argvs != argvs) - delete g_injected_test_argvs; - g_injected_test_argvs = argvs; -} - -const ::std::vector& GetInjectableArgvs() { +std::vector GetInjectableArgvs() { if (g_injected_test_argvs != NULL) { return *g_injected_test_argvs; } return GetArgvs(); } + +void SetInjectableArgvs(const std::vector* new_argvs) { + if (g_injected_test_argvs != new_argvs) delete g_injected_test_argvs; + g_injected_test_argvs = new_argvs; +} + +void SetInjectableArgvs(const std::vector& new_argvs) { + SetInjectableArgvs( + new std::vector(new_argvs.begin(), new_argvs.end())); +} + +#if GTEST_HAS_GLOBAL_STRING +void SetInjectableArgvs(const std::vector< ::string>& new_argvs) { + SetInjectableArgvs( + new std::vector(new_argvs.begin(), new_argvs.end())); +} +#endif // GTEST_HAS_GLOBAL_STRING + +void ClearInjectableArgvs() { + delete g_injected_test_argvs; + g_injected_test_argvs = NULL; +} #endif // GTEST_HAS_DEATH_TEST #if GTEST_OS_WINDOWS_MOBILE @@ -1191,11 +1209,12 @@ bool ParseInt32(const Message& src_text, const char* str, Int32* value) { bool BoolFromGTestEnv(const char* flag, bool default_value) { #if defined(GTEST_GET_BOOL_FROM_ENV_) return GTEST_GET_BOOL_FROM_ENV_(flag, default_value); -#endif // defined(GTEST_GET_BOOL_FROM_ENV_) +#else const std::string env_var = FlagToEnvVar(flag); const char* const string_value = posix::GetEnv(env_var.c_str()); return string_value == NULL ? default_value : strcmp(string_value, "0") != 0; +#endif // defined(GTEST_GET_BOOL_FROM_ENV_) } // Reads and returns a 32-bit integer stored in the environment @@ -1204,7 +1223,7 @@ bool BoolFromGTestEnv(const char* flag, bool default_value) { Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) { #if defined(GTEST_GET_INT32_FROM_ENV_) return GTEST_GET_INT32_FROM_ENV_(flag, default_value); -#endif // defined(GTEST_GET_INT32_FROM_ENV_) +#else const std::string env_var = FlagToEnvVar(flag); const char* const string_value = posix::GetEnv(env_var.c_str()); if (string_value == NULL) { @@ -1222,37 +1241,36 @@ Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) { } return result; +#endif // defined(GTEST_GET_INT32_FROM_ENV_) +} + +// As a special case for the 'output' flag, if GTEST_OUTPUT is not +// set, we look for XML_OUTPUT_FILE, which is set by the Bazel build +// system. The value of XML_OUTPUT_FILE is a filename without the +// "xml:" prefix of GTEST_OUTPUT. +// Note that this is meant to be called at the call site so it does +// not check that the flag is 'output' +// In essence this checks an env variable called XML_OUTPUT_FILE +// and if it is set we prepend "xml:" to its value, if it not set we return "" +std::string OutputFlagAlsoCheckEnvVar(){ + std::string default_value_for_output_flag = ""; + const char* xml_output_file_env = posix::GetEnv("XML_OUTPUT_FILE"); + if (NULL != xml_output_file_env) { + default_value_for_output_flag = std::string("xml:") + xml_output_file_env; + } + return default_value_for_output_flag; } // Reads and returns the string environment variable corresponding to // the given flag; if it's not set, returns default_value. -std::string StringFromGTestEnv(const char* flag, const char* default_value) { +const char* StringFromGTestEnv(const char* flag, const char* default_value) { #if defined(GTEST_GET_STRING_FROM_ENV_) return GTEST_GET_STRING_FROM_ENV_(flag, default_value); -#endif // defined(GTEST_GET_STRING_FROM_ENV_) +#else const std::string env_var = FlagToEnvVar(flag); - const char* value = posix::GetEnv(env_var.c_str()); - if (value != NULL) { - return value; - } - - // As a special case for the 'output' flag, if GTEST_OUTPUT is not - // set, we look for XML_OUTPUT_FILE, which is set by the Bazel build - // system. The value of XML_OUTPUT_FILE is a filename without the - // "xml:" prefix of GTEST_OUTPUT. - // - // The net priority order after flag processing is thus: - // --gtest_output command line flag - // GTEST_OUTPUT environment variable - // XML_OUTPUT_FILE environment variable - // 'default_value' - if (strcmp(flag, "output") == 0) { - value = posix::GetEnv("XML_OUTPUT_FILE"); - if (value != NULL) { - return std::string("xml:") + value; - } - } - return default_value; + const char* const value = posix::GetEnv(env_var.c_str()); + return value == NULL ? default_value : value; +#endif // defined(GTEST_GET_STRING_FROM_ENV_) } } // namespace internal diff --git a/test/gtest-1.8.0/src/gtest-printers.cc b/test/gtest-1.8.0/src/gtest-printers.cc index a2df412f8a..eeba17fbf9 100644 --- a/test/gtest-1.8.0/src/gtest-printers.cc +++ b/test/gtest-1.8.0/src/gtest-printers.cc @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) -// Google Test - The Google C++ Testing Framework +// Google Test - The Google C++ Testing and Mocking Framework // // This file implements a universal value printer that can print a // value of any type T: @@ -43,12 +43,13 @@ // defines Foo. #include "gtest/gtest-printers.h" -#include #include +#include #include #include // NOLINT #include #include "gtest/internal/gtest-port.h" +#include "src/gtest-internal-inl.h" namespace testing { @@ -123,7 +124,7 @@ namespace internal { // Depending on the value of a char (or wchar_t), we print it in one // of three formats: // - as is if it's a printable ASCII (e.g. 'a', '2', ' '), -// - as a hexidecimal escape sequence (e.g. '\x7F'), or +// - as a hexadecimal escape sequence (e.g. '\x7F'), or // - as a special escape sequence (e.g. '\r', '\n'). enum CharFormat { kAsIs, @@ -180,7 +181,10 @@ static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) { *os << static_cast(c); return kAsIs; } else { - *os << "\\x" + String::FormatHexInt(static_cast(c)); + ostream::fmtflags flags = os->flags(); + *os << "\\x" << std::hex << std::uppercase + << static_cast(static_cast(c)); + os->flags(flags); return kHexEscape; } } @@ -227,7 +231,7 @@ void PrintCharAndCodeTo(Char c, ostream* os) { return; *os << " (" << static_cast(c); - // For more convenience, we print c's code again in hexidecimal, + // For more convenience, we print c's code again in hexadecimal, // unless c was already printed in the form '\x##' or the code is in // [1, 9]. if (format == kHexEscape || (1 <= c && c <= 9)) { @@ -259,11 +263,12 @@ template GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ -static void PrintCharsAsStringTo( +static CharFormat PrintCharsAsStringTo( const CharType* begin, size_t len, ostream* os) { const char* const kQuoteBegin = sizeof(CharType) == 1 ? "\"" : "L\""; *os << kQuoteBegin; bool is_previous_hex = false; + CharFormat print_format = kAsIs; for (size_t index = 0; index < len; ++index) { const CharType cur = begin[index]; if (is_previous_hex && IsXDigit(cur)) { @@ -273,8 +278,13 @@ static void PrintCharsAsStringTo( *os << "\" " << kQuoteBegin; } is_previous_hex = PrintAsStringLiteralTo(cur, os) == kHexEscape; + // Remember if any characters required hex escaping. + if (is_previous_hex) { + print_format = kHexEscape; + } } *os << "\""; + return print_format; } // Prints a (const) char/wchar_t array of 'len' elements, starting at address @@ -344,15 +354,90 @@ void PrintTo(const wchar_t* s, ostream* os) { } #endif // wchar_t is native +namespace { + +bool ContainsUnprintableControlCodes(const char* str, size_t length) { + const unsigned char *s = reinterpret_cast(str); + + for (size_t i = 0; i < length; i++) { + unsigned char ch = *s++; + if (std::iscntrl(ch)) { + switch (ch) { + case '\t': + case '\n': + case '\r': + break; + default: + return true; + } + } + } + return false; +} + +bool IsUTF8TrailByte(unsigned char t) { return 0x80 <= t && t<= 0xbf; } + +bool IsValidUTF8(const char* str, size_t length) { + const unsigned char *s = reinterpret_cast(str); + + for (size_t i = 0; i < length;) { + unsigned char lead = s[i++]; + + if (lead <= 0x7f) { + continue; // single-byte character (ASCII) 0..7F + } + if (lead < 0xc2) { + return false; // trail byte or non-shortest form + } else if (lead <= 0xdf && (i + 1) <= length && IsUTF8TrailByte(s[i])) { + ++i; // 2-byte character + } else if (0xe0 <= lead && lead <= 0xef && (i + 2) <= length && + IsUTF8TrailByte(s[i]) && + IsUTF8TrailByte(s[i + 1]) && + // check for non-shortest form and surrogate + (lead != 0xe0 || s[i] >= 0xa0) && + (lead != 0xed || s[i] < 0xa0)) { + i += 2; // 3-byte character + } else if (0xf0 <= lead && lead <= 0xf4 && (i + 3) <= length && + IsUTF8TrailByte(s[i]) && + IsUTF8TrailByte(s[i + 1]) && + IsUTF8TrailByte(s[i + 2]) && + // check for non-shortest form + (lead != 0xf0 || s[i] >= 0x90) && + (lead != 0xf4 || s[i] < 0x90)) { + i += 3; // 4-byte character + } else { + return false; + } + } + return true; +} + +void ConditionalPrintAsText(const char* str, size_t length, ostream* os) { + if (!ContainsUnprintableControlCodes(str, length) && + IsValidUTF8(str, length)) { + *os << "\n As Text: \"" << str << "\""; + } +} + +} // anonymous namespace + // Prints a ::string object. #if GTEST_HAS_GLOBAL_STRING void PrintStringTo(const ::string& s, ostream* os) { - PrintCharsAsStringTo(s.data(), s.size(), os); + if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) { + if (GTEST_FLAG(print_utf8)) { + ConditionalPrintAsText(s.data(), s.size(), os); + } + } } #endif // GTEST_HAS_GLOBAL_STRING void PrintStringTo(const ::std::string& s, ostream* os) { - PrintCharsAsStringTo(s.data(), s.size(), os); + if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) { + if (GTEST_FLAG(print_utf8)) { + ConditionalPrintAsText(s.data(), s.size(), os); + } + } } // Prints a ::wstring object. diff --git a/test/gtest-1.8.0/src/gtest-test-part.cc b/test/gtest-1.8.0/src/gtest-test-part.cc index fb0e35425e..4c5f2e378e 100644 --- a/test/gtest-1.8.0/src/gtest-test-part.cc +++ b/test/gtest-1.8.0/src/gtest-test-part.cc @@ -29,18 +29,10 @@ // // Author: mheule@google.com (Markus Heule) // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) #include "gtest/gtest-test-part.h" - -// Indicates that this translation unit is part of Google Test's -// implementation. It must come before gtest-internal-inl.h is -// included, or there will be a compiler error. This trick exists to -// prevent the accidental inclusion of gtest-internal-inl.h in the -// user's code. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ namespace testing { diff --git a/test/gtest-1.8.0/src/gtest-typed-test.cc b/test/gtest-1.8.0/src/gtest-typed-test.cc index df1eef4754..b358243465 100644 --- a/test/gtest-1.8.0/src/gtest-typed-test.cc +++ b/test/gtest-1.8.0/src/gtest-typed-test.cc @@ -30,6 +30,7 @@ // Author: wan@google.com (Zhanyong Wan) #include "gtest/gtest-typed-test.h" + #include "gtest/gtest.h" namespace testing { diff --git a/test/gtest-1.8.0/src/gtest.cc b/test/gtest-1.8.0/src/gtest.cc index d882ab2e36..5406392dde 100644 --- a/test/gtest-1.8.0/src/gtest.cc +++ b/test/gtest-1.8.0/src/gtest.cc @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) #include "gtest/gtest.h" #include "gtest/internal/custom/gtest.h" @@ -133,14 +133,7 @@ # include // NOLINT #endif -// Indicates that this translation unit is part of Google Test's -// implementation. It must come before gtest-internal-inl.h is -// included, or there will be a compiler error. This trick is to -// prevent a user from accidentally including gtest-internal-inl.h in -// his code. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ #if GTEST_OS_WINDOWS # define vsnprintf _vsnprintf @@ -167,8 +160,10 @@ static const char kDeathTestCaseFilter[] = "*DeathTest:*DeathTest/*"; // A test filter that matches everything. static const char kUniversalFilter[] = "*"; -// The default output file for XML output. -static const char kDefaultOutputFile[] = "test_detail.xml"; +// The default output format. +static const char kDefaultOutputFormat[] = "xml"; +// The default output file. +static const char kDefaultOutputFile[] = "test_detail"; // The environment variable name for the test shard index. static const char kTestShardIndex[] = "GTEST_SHARD_INDEX"; @@ -235,12 +230,18 @@ GTEST_DEFINE_string_( GTEST_DEFINE_bool_(list_tests, false, "List all tests without running them."); +// The net priority order after flag processing is thus: +// --gtest_output command line flag +// GTEST_OUTPUT environment variable +// XML_OUTPUT_FILE environment variable +// '' GTEST_DEFINE_string_( output, - internal::StringFromGTestEnv("output", ""), - "A format (currently must be \"xml\"), optionally followed " - "by a colon and an output file name or directory. A directory " - "is indicated by a trailing pathname separator. " + internal::StringFromGTestEnv("output", + internal::OutputFlagAlsoCheckEnvVar().c_str()), + "A format (defaults to \"xml\" but can be specified to be \"json\"), " + "optionally followed by a colon and an output file name or directory. " + "A directory is indicated by a trailing pathname separator. " "Examples: \"xml:filename.xml\", \"xml::directoryname/\". " "If a directory is specified, output files will be created " "within that directory, with file-names based on the test " @@ -253,6 +254,12 @@ GTEST_DEFINE_bool_( "True iff " GTEST_NAME_ " should display elapsed time in text output."); +GTEST_DEFINE_bool_( + print_utf8, + internal::BoolFromGTestEnv("print_utf8", true), + "True iff " GTEST_NAME_ + " prints UTF8 characters as text."); + GTEST_DEFINE_int32_( random_seed, internal::Int32FromGTestEnv("random_seed", 0), @@ -294,7 +301,7 @@ GTEST_DEFINE_bool_( internal::BoolFromGTestEnv("throw_on_failure", false), "When this flag is specified, a failed assertion will throw an exception " "if exceptions are enabled or exit the program with a non-zero code " - "otherwise."); + "otherwise. For use with an external test framework."); #if GTEST_USE_OWN_FLAGFILE_FLAG_ GTEST_DEFINE_string_( @@ -310,7 +317,8 @@ namespace internal { // than kMaxRange. UInt32 Random::Generate(UInt32 range) { // These constants are the same as are used in glibc's rand(3). - state_ = (1103515245U*state_ + 12345U) % kMaxRange; + // Use wider types than necessary to prevent unsigned overflow diagnostics. + state_ = static_cast(1103515245ULL*state_ + 12345U) % kMaxRange; GTEST_CHECK_(range > 0) << "Cannot generate a number in the range [0, 0)."; @@ -384,12 +392,15 @@ void AssertHelper::operator=(const Message& message) const { GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_linked_ptr_mutex); // A copy of all command line arguments. Set by InitGoogleTest(). -::std::vector g_argvs; +::std::vector g_argvs; -const ::std::vector& GetArgvs() { +::std::vector GetArgvs() { #if defined(GTEST_CUSTOM_GET_ARGVS_) - return GTEST_CUSTOM_GET_ARGVS_(); -#else // defined(GTEST_CUSTOM_GET_ARGVS_) + // GTEST_CUSTOM_GET_ARGVS_() may return a container of std::string or + // ::string. This code converts it to the appropriate type. + const auto& custom = GTEST_CUSTOM_GET_ARGVS_(); + return ::std::vector(custom.begin(), custom.end()); +#else // defined(GTEST_CUSTOM_GET_ARGVS_) return g_argvs; #endif // defined(GTEST_CUSTOM_GET_ARGVS_) } @@ -428,12 +439,17 @@ std::string UnitTestOptions::GetAbsolutePathToOutputFile() { if (gtest_output_flag == NULL) return ""; + std::string format = GetOutputFormat(); + if (format.empty()) + format = std::string(kDefaultOutputFormat); + const char* const colon = strchr(gtest_output_flag, ':'); if (colon == NULL) - return internal::FilePath::ConcatPaths( + return internal::FilePath::MakeFileName( internal::FilePath( UnitTest::GetInstance()->original_working_dir()), - internal::FilePath(kDefaultOutputFile)).string(); + internal::FilePath(kDefaultOutputFile), 0, + format.c_str()).string(); internal::FilePath output_name(colon + 1); if (!output_name.IsAbsolutePath()) @@ -628,12 +644,12 @@ extern const TypeId kTestTypeIdInGoogleTest = GetTestTypeId(); // This predicate-formatter checks that 'results' contains a test part // failure of the given type and that the failure message contains the // given substring. -AssertionResult HasOneFailure(const char* /* results_expr */, - const char* /* type_expr */, - const char* /* substr_expr */, - const TestPartResultArray& results, - TestPartResult::Type type, - const string& substr) { +static AssertionResult HasOneFailure(const char* /* results_expr */, + const char* /* type_expr */, + const char* /* substr_expr */, + const TestPartResultArray& results, + TestPartResult::Type type, + const std::string& substr) { const std::string expected(type == TestPartResult::kFatalFailure ? "1 fatal failure" : "1 non-fatal failure"); @@ -667,13 +683,10 @@ AssertionResult HasOneFailure(const char* /* results_expr */, // The constructor of SingleFailureChecker remembers where to look up // test part results, what type of failure we expect, and what // substring the failure message should contain. -SingleFailureChecker:: SingleFailureChecker( - const TestPartResultArray* results, - TestPartResult::Type type, - const string& substr) - : results_(results), - type_(type), - substr_(substr) {} +SingleFailureChecker::SingleFailureChecker(const TestPartResultArray* results, + TestPartResult::Type type, + const std::string& substr) + : results_(results), type_(type), substr_(substr) {} // The destructor of SingleFailureChecker verifies that the given // TestPartResultArray contains exactly one failure that has the given @@ -1171,7 +1184,7 @@ class Hunk { // Print a unified diff header for one hunk. // The format is // "@@ -, +, @@" - // where the left/right parts are ommitted if unnecessary. + // where the left/right parts are omitted if unnecessary. void PrintHeader(std::ostream* ss) const { *ss << "@@ "; if (removes_) { @@ -1315,13 +1328,14 @@ AssertionResult EqFailure(const char* lhs_expression, const std::string& rhs_value, bool ignoring_case) { Message msg; - msg << " Expected: " << lhs_expression; + msg << "Expected equality of these values:"; + msg << "\n " << lhs_expression; if (lhs_value != lhs_expression) { - msg << "\n Which is: " << lhs_value; + msg << "\n Which is: " << lhs_value; } - msg << "\nTo be equal to: " << rhs_expression; + msg << "\n " << rhs_expression; if (rhs_value != rhs_expression) { - msg << "\n Which is: " << rhs_value; + msg << "\n Which is: " << rhs_value; } if (ignoring_case) { @@ -1663,7 +1677,7 @@ namespace { AssertionResult HRESULTFailureHelper(const char* expr, const char* expected, long hr) { // NOLINT -# if GTEST_OS_WINDOWS_MOBILE +# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_TV_TITLE // Windows CE doesn't support FormatMessage. const char error_text[] = ""; @@ -1720,7 +1734,7 @@ AssertionResult IsHRESULTFailure(const char* expr, long hr) { // NOLINT // Utility functions for encoding Unicode text (wide strings) in // UTF-8. -// A Unicode code-point can have upto 21 bits, and is encoded in UTF-8 +// A Unicode code-point can have up to 21 bits, and is encoded in UTF-8 // like this: // // Code-point length Encoding @@ -1784,7 +1798,7 @@ std::string CodePointToUtf8(UInt32 code_point) { return str; } -// The following two functions only make sense if the the system +// The following two functions only make sense if the system // uses UTF-16 for wide string encoding. All supported systems // with 16 bit wchar_t (Windows, Cygwin, Symbian OS) do use UTF-16. @@ -2138,8 +2152,9 @@ static std::string FormatWordList(const std::vector& words) { return word_list.GetString(); } -bool ValidateTestPropertyName(const std::string& property_name, - const std::vector& reserved_names) { +static bool ValidateTestPropertyName( + const std::string& property_name, + const std::vector& reserved_names) { if (std::find(reserved_names.begin(), reserved_names.end(), property_name) != reserved_names.end()) { ADD_FAILURE() << "Reserved key used in RecordProperty(): " << property_name @@ -2436,6 +2451,8 @@ Result HandleExceptionsInMethodIfSupported( #if GTEST_HAS_EXCEPTIONS try { return HandleSehExceptionsInMethodIfSupported(object, method, location); + } catch (const AssertionException&) { // NOLINT + // This failure was reported already. } catch (const internal::GoogleTestFailureException&) { // NOLINT // This exception type can only be thrown by a failed Google // Test assertion with the intention of letting another testing @@ -2557,7 +2574,6 @@ TestInfo* MakeAndRegisterTestInfo( return test_info; } -#if GTEST_HAS_PARAM_TEST void ReportInvalidTestCaseType(const char* test_case_name, CodeLocation code_location) { Message errors; @@ -2571,13 +2587,10 @@ void ReportInvalidTestCaseType(const char* test_case_name, << "probably rename one of the classes to put the tests into different\n" << "test cases."; - fprintf(stderr, "%s %s", - FormatFileLocation(code_location.file.c_str(), - code_location.line).c_str(), - errors.GetString().c_str()); + GTEST_LOG_(ERROR) << FormatFileLocation(code_location.file.c_str(), + code_location.line) + << " " << errors.GetString(); } -#endif // GTEST_HAS_PARAM_TEST - } // namespace internal namespace { @@ -2615,12 +2628,10 @@ namespace internal { // and INSTANTIATE_TEST_CASE_P into regular tests and registers those. // This will be done just once during the program runtime. void UnitTestImpl::RegisterParameterizedTests() { -#if GTEST_HAS_PARAM_TEST if (!parameterized_tests_registered_) { parameterized_test_registry_.RegisterTests(); parameterized_tests_registered_ = true; } -#endif } } // namespace internal @@ -2885,10 +2896,10 @@ enum GTestColor { }; #if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \ - !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT + !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW // Returns the character attribute for the given color. -WORD GetColorAttribute(GTestColor color) { +static WORD GetColorAttribute(GTestColor color) { switch (color) { case COLOR_RED: return FOREGROUND_RED; case COLOR_GREEN: return FOREGROUND_GREEN; @@ -2897,11 +2908,42 @@ WORD GetColorAttribute(GTestColor color) { } } +static int GetBitOffset(WORD color_mask) { + if (color_mask == 0) return 0; + + int bitOffset = 0; + while ((color_mask & 1) == 0) { + color_mask >>= 1; + ++bitOffset; + } + return bitOffset; +} + +static WORD GetNewColor(GTestColor color, WORD old_color_attrs) { + // Let's reuse the BG + static const WORD background_mask = BACKGROUND_BLUE | BACKGROUND_GREEN | + BACKGROUND_RED | BACKGROUND_INTENSITY; + static const WORD foreground_mask = FOREGROUND_BLUE | FOREGROUND_GREEN | + FOREGROUND_RED | FOREGROUND_INTENSITY; + const WORD existing_bg = old_color_attrs & background_mask; + + WORD new_color = + GetColorAttribute(color) | existing_bg | FOREGROUND_INTENSITY; + static const int bg_bitOffset = GetBitOffset(background_mask); + static const int fg_bitOffset = GetBitOffset(foreground_mask); + + if (((new_color & background_mask) >> bg_bitOffset) == + ((new_color & foreground_mask) >> fg_bitOffset)) { + new_color ^= FOREGROUND_INTENSITY; // invert intensity + } + return new_color; +} + #else // Returns the ANSI color code for the given color. COLOR_DEFAULT is // an invalid input. -const char* GetAnsiColorCode(GTestColor color) { +static const char* GetAnsiColorCode(GTestColor color) { switch (color) { case COLOR_RED: return "1"; case COLOR_GREEN: return "2"; @@ -2917,7 +2959,7 @@ bool ShouldUseColor(bool stdout_is_tty) { const char* const gtest_color = GTEST_FLAG(color).c_str(); if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) { -#if GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW // On Windows the TERM variable is usually not set, but the // console there does support colors. return stdout_is_tty; @@ -2953,7 +2995,7 @@ bool ShouldUseColor(bool stdout_is_tty) { // cannot simply emit special characters and have the terminal change colors. // This routine must actually emit the characters rather than return a string // that would be colored when printed, as can be done on Linux. -void ColoredPrintf(GTestColor color, const char* fmt, ...) { +static void ColoredPrintf(GTestColor color, const char* fmt, ...) { va_list args; va_start(args, fmt); @@ -2974,20 +3016,21 @@ void ColoredPrintf(GTestColor color, const char* fmt, ...) { } #if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \ - !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT + !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE); // Gets the current text color. CONSOLE_SCREEN_BUFFER_INFO buffer_info; GetConsoleScreenBufferInfo(stdout_handle, &buffer_info); const WORD old_color_attrs = buffer_info.wAttributes; + const WORD new_color = GetNewColor(color, old_color_attrs); // We need to flush the stream buffers into the console before each // SetConsoleTextAttribute call lest it affect the text that is already // printed but has not yet reached the console. fflush(stdout); - SetConsoleTextAttribute(stdout_handle, - GetColorAttribute(color) | FOREGROUND_INTENSITY); + SetConsoleTextAttribute(stdout_handle, new_color); + vprintf(fmt, args); fflush(stdout); @@ -3001,12 +3044,12 @@ void ColoredPrintf(GTestColor color, const char* fmt, ...) { va_end(args); } -// Text printed in Google Test's text output and --gunit_list_tests +// Text printed in Google Test's text output and --gtest_list_tests // output to label the type parameter and value parameter for a test. static const char kTypeParamLabel[] = "TypeParam"; static const char kValueParamLabel[] = "GetParam()"; -void PrintFullTestCommentIfPresent(const TestInfo& test_info) { +static void PrintFullTestCommentIfPresent(const TestInfo& test_info) { const char* const type_param = test_info.type_param(); const char* const value_param = test_info.value_param(); @@ -3080,7 +3123,6 @@ void PrettyUnitTestResultPrinter::OnTestIterationStart( "Note: Randomizing tests' orders with a seed of %d .\n", unit_test.random_seed()); } - ColoredPrintf(COLOR_GREEN, "[==========] "); printf("Running %s from %s.\n", FormatTestCount(unit_test.test_to_run_count()).c_str(), @@ -3412,6 +3454,11 @@ class XmlUnitTestResultPrinter : public EmptyTestEventListener { // to delimit this attribute from prior attributes. static std::string TestPropertiesAsXmlAttributes(const TestResult& result); + // Streams an XML representation of the test properties of a TestResult + // object. + static void OutputXmlTestProperties(std::ostream* stream, + const TestResult& result); + // The output file. const std::string output_file_; @@ -3422,9 +3469,7 @@ class XmlUnitTestResultPrinter : public EmptyTestEventListener { XmlUnitTestResultPrinter::XmlUnitTestResultPrinter(const char* output_file) : output_file_(output_file) { if (output_file_.c_str() == NULL || output_file_.empty()) { - fprintf(stderr, "XML output file may not be null\n"); - fflush(stderr); - exit(EXIT_FAILURE); + GTEST_LOG_(FATAL) << "XML output file may not be null"; } } @@ -3449,11 +3494,8 @@ void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test, // 3. To interpret the meaning of errno in a thread-safe way, // we need the strerror_r() function, which is not available on // Windows. - fprintf(stderr, - "Unable to open file \"%s\"\n", - output_file_.c_str()); - fflush(stderr); - exit(EXIT_FAILURE); + + GTEST_LOG_(FATAL) << "Unable to open file \"" << output_file_ << "\""; } std::stringstream stream; PrintXmlUnitTest(&stream, unit_test); @@ -3628,6 +3670,10 @@ void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream, const TestResult& result = *test_info.result(); const std::string kTestcase = "testcase"; + if (test_info.is_in_another_shard()) { + return; + } + *stream << " \n"; } - const string location = internal::FormatCompilerIndependentFileLocation( - part.file_name(), part.line_number()); - const string summary = location + "\n" + part.summary(); + const std::string location = + internal::FormatCompilerIndependentFileLocation(part.file_name(), + part.line_number()); + const std::string summary = location + "\n" + part.summary(); *stream << " "; - const string detail = location + "\n" + part.message(); + const std::string detail = location + "\n" + part.message(); OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str()); *stream << "\n"; } } - if (failures == 0) + if (failures == 0 && result.test_property_count() == 0) { *stream << " />\n"; - else + } else { + if (failures == 0) { + *stream << ">\n"; + } + OutputXmlTestProperties(stream, result); *stream << " \n"; + } } // Prints an XML representation of a TestCase object @@ -3723,7 +3774,6 @@ void XmlUnitTestResultPrinter::PrintXmlUnitTest(std::ostream* stream, OutputXmlAttribute(stream, kTestsuites, "random_seed", StreamableToString(unit_test.random_seed())); } - *stream << TestPropertiesAsXmlAttributes(unit_test.ad_hoc_test_result()); OutputXmlAttribute(stream, kTestsuites, "name", "AllTests"); @@ -3749,8 +3799,374 @@ std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes( return attributes.GetString(); } +void XmlUnitTestResultPrinter::OutputXmlTestProperties( + std::ostream* stream, const TestResult& result) { + const std::string kProperties = "properties"; + const std::string kProperty = "property"; + + if (result.test_property_count() <= 0) { + return; + } + + *stream << "<" << kProperties << ">\n"; + for (int i = 0; i < result.test_property_count(); ++i) { + const TestProperty& property = result.GetTestProperty(i); + *stream << "<" << kProperty; + *stream << " name=\"" << EscapeXmlAttribute(property.key()) << "\""; + *stream << " value=\"" << EscapeXmlAttribute(property.value()) << "\""; + *stream << "/>\n"; + } + *stream << "\n"; +} + // End XmlUnitTestResultPrinter + +// This class generates an JSON output file. +class JsonUnitTestResultPrinter : public EmptyTestEventListener { + public: + explicit JsonUnitTestResultPrinter(const char* output_file); + + virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration); + + private: + // Returns an JSON-escaped copy of the input string str. + static std::string EscapeJson(const std::string& str); + + //// Verifies that the given attribute belongs to the given element and + //// streams the attribute as JSON. + static void OutputJsonKey(std::ostream* stream, + const std::string& element_name, + const std::string& name, + const std::string& value, + const std::string& indent, + bool comma = true); + static void OutputJsonKey(std::ostream* stream, + const std::string& element_name, + const std::string& name, + int value, + const std::string& indent, + bool comma = true); + + // Streams a JSON representation of a TestInfo object. + static void OutputJsonTestInfo(::std::ostream* stream, + const char* test_case_name, + const TestInfo& test_info); + + // Prints a JSON representation of a TestCase object + static void PrintJsonTestCase(::std::ostream* stream, + const TestCase& test_case); + + // Prints a JSON summary of unit_test to output stream out. + static void PrintJsonUnitTest(::std::ostream* stream, + const UnitTest& unit_test); + + // Produces a string representing the test properties in a result as + // a JSON dictionary. + static std::string TestPropertiesAsJson(const TestResult& result, + const std::string& indent); + + // The output file. + const std::string output_file_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(JsonUnitTestResultPrinter); +}; + +// Creates a new JsonUnitTestResultPrinter. +JsonUnitTestResultPrinter::JsonUnitTestResultPrinter(const char* output_file) + : output_file_(output_file) { + if (output_file_.empty()) { + GTEST_LOG_(FATAL) << "JSON output file may not be null"; + } +} + +void JsonUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test, + int /*iteration*/) { + FILE* jsonout = NULL; + FilePath output_file(output_file_); + FilePath output_dir(output_file.RemoveFileName()); + + if (output_dir.CreateDirectoriesRecursively()) { + jsonout = posix::FOpen(output_file_.c_str(), "w"); + } + if (jsonout == NULL) { + // TODO(phosek): report the reason of the failure. + // + // We don't do it for now as: + // + // 1. There is no urgent need for it. + // 2. It's a bit involved to make the errno variable thread-safe on + // all three operating systems (Linux, Windows, and Mac OS). + // 3. To interpret the meaning of errno in a thread-safe way, + // we need the strerror_r() function, which is not available on + // Windows. + GTEST_LOG_(FATAL) << "Unable to open file \"" + << output_file_ << "\""; + } + std::stringstream stream; + PrintJsonUnitTest(&stream, unit_test); + fprintf(jsonout, "%s", StringStreamToString(&stream).c_str()); + fclose(jsonout); +} + +// Returns an JSON-escaped copy of the input string str. +std::string JsonUnitTestResultPrinter::EscapeJson(const std::string& str) { + Message m; + + for (size_t i = 0; i < str.size(); ++i) { + const char ch = str[i]; + switch (ch) { + case '\\': + case '"': + case '/': + m << '\\' << ch; + break; + case '\b': + m << "\\b"; + break; + case '\t': + m << "\\t"; + break; + case '\n': + m << "\\n"; + break; + case '\f': + m << "\\f"; + break; + case '\r': + m << "\\r"; + break; + default: + if (ch < ' ') { + m << "\\u00" << String::FormatByte(static_cast(ch)); + } else { + m << ch; + } + break; + } + } + + return m.GetString(); +} + +// The following routines generate an JSON representation of a UnitTest +// object. + +// Formats the given time in milliseconds as seconds. +static std::string FormatTimeInMillisAsDuration(TimeInMillis ms) { + ::std::stringstream ss; + ss << (static_cast(ms) * 1e-3) << "s"; + return ss.str(); +} + +// Converts the given epoch time in milliseconds to a date string in the +// RFC3339 format, without the timezone information. +static std::string FormatEpochTimeInMillisAsRFC3339(TimeInMillis ms) { + struct tm time_struct; + if (!PortableLocaltime(static_cast(ms / 1000), &time_struct)) + return ""; + // YYYY-MM-DDThh:mm:ss + return StreamableToString(time_struct.tm_year + 1900) + "-" + + String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" + + String::FormatIntWidth2(time_struct.tm_mday) + "T" + + String::FormatIntWidth2(time_struct.tm_hour) + ":" + + String::FormatIntWidth2(time_struct.tm_min) + ":" + + String::FormatIntWidth2(time_struct.tm_sec) + "Z"; +} + +static inline std::string Indent(int width) { + return std::string(width, ' '); +} + +void JsonUnitTestResultPrinter::OutputJsonKey( + std::ostream* stream, + const std::string& element_name, + const std::string& name, + const std::string& value, + const std::string& indent, + bool comma) { + const std::vector& allowed_names = + GetReservedAttributesForElement(element_name); + + GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) != + allowed_names.end()) + << "Key \"" << name << "\" is not allowed for value \"" << element_name + << "\"."; + + *stream << indent << "\"" << name << "\": \"" << EscapeJson(value) << "\""; + if (comma) + *stream << ",\n"; +} + +void JsonUnitTestResultPrinter::OutputJsonKey( + std::ostream* stream, + const std::string& element_name, + const std::string& name, + int value, + const std::string& indent, + bool comma) { + const std::vector& allowed_names = + GetReservedAttributesForElement(element_name); + + GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) != + allowed_names.end()) + << "Key \"" << name << "\" is not allowed for value \"" << element_name + << "\"."; + + *stream << indent << "\"" << name << "\": " << StreamableToString(value); + if (comma) + *stream << ",\n"; +} + +// Prints a JSON representation of a TestInfo object. +void JsonUnitTestResultPrinter::OutputJsonTestInfo(::std::ostream* stream, + const char* test_case_name, + const TestInfo& test_info) { + const TestResult& result = *test_info.result(); + const std::string kTestcase = "testcase"; + const std::string kIndent = Indent(10); + + *stream << Indent(8) << "{\n"; + OutputJsonKey(stream, kTestcase, "name", test_info.name(), kIndent); + + if (test_info.value_param() != NULL) { + OutputJsonKey(stream, kTestcase, "value_param", + test_info.value_param(), kIndent); + } + if (test_info.type_param() != NULL) { + OutputJsonKey(stream, kTestcase, "type_param", test_info.type_param(), + kIndent); + } + + OutputJsonKey(stream, kTestcase, "status", + test_info.should_run() ? "RUN" : "NOTRUN", kIndent); + OutputJsonKey(stream, kTestcase, "time", + FormatTimeInMillisAsDuration(result.elapsed_time()), kIndent); + OutputJsonKey(stream, kTestcase, "classname", test_case_name, kIndent, false); + *stream << TestPropertiesAsJson(result, kIndent); + + int failures = 0; + for (int i = 0; i < result.total_part_count(); ++i) { + const TestPartResult& part = result.GetTestPartResult(i); + if (part.failed()) { + *stream << ",\n"; + if (++failures == 1) { + *stream << kIndent << "\"" << "failures" << "\": [\n"; + } + const std::string location = + internal::FormatCompilerIndependentFileLocation(part.file_name(), + part.line_number()); + const std::string message = EscapeJson(location + "\n" + part.message()); + *stream << kIndent << " {\n" + << kIndent << " \"failure\": \"" << message << "\",\n" + << kIndent << " \"type\": \"\"\n" + << kIndent << " }"; + } + } + + if (failures > 0) + *stream << "\n" << kIndent << "]"; + *stream << "\n" << Indent(8) << "}"; +} + +// Prints an JSON representation of a TestCase object +void JsonUnitTestResultPrinter::PrintJsonTestCase(std::ostream* stream, + const TestCase& test_case) { + const std::string kTestsuite = "testsuite"; + const std::string kIndent = Indent(6); + + *stream << Indent(4) << "{\n"; + OutputJsonKey(stream, kTestsuite, "name", test_case.name(), kIndent); + OutputJsonKey(stream, kTestsuite, "tests", test_case.reportable_test_count(), + kIndent); + OutputJsonKey(stream, kTestsuite, "failures", test_case.failed_test_count(), + kIndent); + OutputJsonKey(stream, kTestsuite, "disabled", + test_case.reportable_disabled_test_count(), kIndent); + OutputJsonKey(stream, kTestsuite, "errors", 0, kIndent); + OutputJsonKey(stream, kTestsuite, "time", + FormatTimeInMillisAsDuration(test_case.elapsed_time()), kIndent, + false); + *stream << TestPropertiesAsJson(test_case.ad_hoc_test_result(), kIndent) + << ",\n"; + + *stream << kIndent << "\"" << kTestsuite << "\": [\n"; + + bool comma = false; + for (int i = 0; i < test_case.total_test_count(); ++i) { + if (test_case.GetTestInfo(i)->is_reportable()) { + if (comma) { + *stream << ",\n"; + } else { + comma = true; + } + OutputJsonTestInfo(stream, test_case.name(), *test_case.GetTestInfo(i)); + } + } + *stream << "\n" << kIndent << "]\n" << Indent(4) << "}"; +} + +// Prints a JSON summary of unit_test to output stream out. +void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream, + const UnitTest& unit_test) { + const std::string kTestsuites = "testsuites"; + const std::string kIndent = Indent(2); + *stream << "{\n"; + + OutputJsonKey(stream, kTestsuites, "tests", unit_test.reportable_test_count(), + kIndent); + OutputJsonKey(stream, kTestsuites, "failures", unit_test.failed_test_count(), + kIndent); + OutputJsonKey(stream, kTestsuites, "disabled", + unit_test.reportable_disabled_test_count(), kIndent); + OutputJsonKey(stream, kTestsuites, "errors", 0, kIndent); + if (GTEST_FLAG(shuffle)) { + OutputJsonKey(stream, kTestsuites, "random_seed", unit_test.random_seed(), + kIndent); + } + OutputJsonKey(stream, kTestsuites, "timestamp", + FormatEpochTimeInMillisAsRFC3339(unit_test.start_timestamp()), + kIndent); + OutputJsonKey(stream, kTestsuites, "time", + FormatTimeInMillisAsDuration(unit_test.elapsed_time()), kIndent, + false); + + *stream << TestPropertiesAsJson(unit_test.ad_hoc_test_result(), kIndent) + << ",\n"; + + OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent); + *stream << kIndent << "\"" << kTestsuites << "\": [\n"; + + bool comma = false; + for (int i = 0; i < unit_test.total_test_case_count(); ++i) { + if (unit_test.GetTestCase(i)->reportable_test_count() > 0) { + if (comma) { + *stream << ",\n"; + } else { + comma = true; + } + PrintJsonTestCase(stream, *unit_test.GetTestCase(i)); + } + } + + *stream << "\n" << kIndent << "]\n" << "}\n"; +} + +// Produces a string representing the test properties in a result as +// a JSON dictionary. +std::string JsonUnitTestResultPrinter::TestPropertiesAsJson( + const TestResult& result, const std::string& indent) { + Message attributes; + for (int i = 0; i < result.test_property_count(); ++i) { + const TestProperty& property = result.GetTestProperty(i); + attributes << ",\n" << indent << "\"" << property.key() << "\": " + << "\"" << EscapeJson(property.value()) << "\""; + } + return attributes.GetString(); +} + +// End JsonUnitTestResultPrinter + #if GTEST_CAN_STREAM_RESULTS_ // Checks if str contains '=', '&', '%' or '\n' characters. If yes, @@ -3758,8 +4174,8 @@ std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes( // example, replaces "=" with "%3D". This algorithm is O(strlen(str)) // in both time and space -- important as the input str may contain an // arbitrarily long test failure message and stack trace. -string StreamingListener::UrlEncode(const char* str) { - string result; +std::string StreamingListener::UrlEncode(const char* str) { + std::string result; result.reserve(strlen(str) + 1); for (char ch = *str; ch != '\0'; ch = *++str) { switch (ch) { @@ -3821,34 +4237,13 @@ void StreamingListener::SocketWriter::MakeConnection() { // End of class Streaming Listener #endif // GTEST_CAN_STREAM_RESULTS__ -// Class ScopedTrace - -// Pushes the given source file location and message onto a per-thread -// trace stack maintained by Google Test. -ScopedTrace::ScopedTrace(const char* file, int line, const Message& message) - GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { - TraceInfo trace; - trace.file = file; - trace.line = line; - trace.message = message.GetString(); - - UnitTest::GetInstance()->PushGTestTrace(trace); -} - -// Pops the info pushed by the c'tor. -ScopedTrace::~ScopedTrace() - GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { - UnitTest::GetInstance()->PopGTestTrace(); -} - - // class OsStackTraceGetter const char* const OsStackTraceGetterInterface::kElidedFramesMarker = "... " GTEST_NAME_ " internal frames ..."; -string OsStackTraceGetter::CurrentStackTrace(int /*max_depth*/, - int /*skip_count*/) { +std::string OsStackTraceGetter::CurrentStackTrace(int /*max_depth*/, + int /*skip_count*/) { return ""; } @@ -3859,9 +4254,10 @@ void OsStackTraceGetter::UponLeavingGTest() {} class ScopedPrematureExitFile { public: explicit ScopedPrematureExitFile(const char* premature_exit_filepath) - : premature_exit_filepath_(premature_exit_filepath) { + : premature_exit_filepath_(premature_exit_filepath ? + premature_exit_filepath : "") { // If a path to the premature-exit file is specified... - if (premature_exit_filepath != NULL && *premature_exit_filepath != '\0') { + if (!premature_exit_filepath_.empty()) { // create the file with a single "0" character in it. I/O // errors are ignored as there's nothing better we can do and we // don't want to fail the test because of this. @@ -3872,13 +4268,18 @@ class ScopedPrematureExitFile { } ~ScopedPrematureExitFile() { - if (premature_exit_filepath_ != NULL && *premature_exit_filepath_ != '\0') { - remove(premature_exit_filepath_); + if (!premature_exit_filepath_.empty()) { + int retval = remove(premature_exit_filepath_.c_str()); + if (retval) { + GTEST_LOG_(ERROR) << "Failed to remove premature exit filepath \"" + << premature_exit_filepath_ << "\" with error " + << retval; + } } } private: - const char* const premature_exit_filepath_; + const std::string premature_exit_filepath_; GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedPrematureExitFile); }; @@ -4148,6 +4549,11 @@ void UnitTest::AddTestPartResult( // when a failure happens and both the --gtest_break_on_failure and // the --gtest_catch_exceptions flags are specified. DebugBreak(); +#elif (!defined(__native_client__)) && \ + ((defined(__clang__) || defined(__GNUC__)) && \ + (defined(__x86_64__) || defined(__i386__))) + // with clang/gcc we can achieve the same effect on x86 by invoking int3 + asm("int3"); #else // Dereference NULL through a volatile pointer to prevent the compiler // from removing. We use this rather than abort() or __builtin_trap() for @@ -4285,7 +4691,6 @@ const TestInfo* UnitTest::current_test_info() const // Returns the random seed used at the start of the current test run. int UnitTest::random_seed() const { return impl_->random_seed(); } -#if GTEST_HAS_PARAM_TEST // Returns ParameterizedTestCaseRegistry object used to keep track of // value-parameterized tests and instantiate and register them. internal::ParameterizedTestCaseRegistry& @@ -4293,7 +4698,6 @@ internal::ParameterizedTestCaseRegistry& GTEST_LOCK_EXCLUDED_(mutex_) { return impl_->parameterized_test_registry(); } -#endif // GTEST_HAS_PARAM_TEST // Creates an empty UnitTest. UnitTest::UnitTest() { @@ -4332,10 +4736,8 @@ UnitTestImpl::UnitTestImpl(UnitTest* parent) &default_global_test_part_result_reporter_), per_thread_test_part_result_reporter_( &default_per_thread_test_part_result_reporter_), -#if GTEST_HAS_PARAM_TEST parameterized_test_registry_(), parameterized_tests_registered_(false), -#endif // GTEST_HAS_PARAM_TEST last_death_test_case_(-1), current_test_case_(NULL), current_test_info_(NULL), @@ -4402,10 +4804,12 @@ void UnitTestImpl::ConfigureXmlOutput() { if (output_format == "xml") { listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter( UnitTestOptions::GetAbsolutePathToOutputFile().c_str())); + } else if (output_format == "json") { + listeners()->SetDefaultXmlGenerator(new JsonUnitTestResultPrinter( + UnitTestOptions::GetAbsolutePathToOutputFile().c_str())); } else if (output_format != "") { - printf("WARNING: unrecognized output format \"%s\" ignored.\n", - output_format.c_str()); - fflush(stdout); + GTEST_LOG_(WARNING) << "WARNING: unrecognized output format \"" + << output_format << "\" ignored."; } } @@ -4420,9 +4824,8 @@ void UnitTestImpl::ConfigureStreamingOutput() { listeners()->Append(new StreamingListener(target.substr(0, pos), target.substr(pos+1))); } else { - printf("WARNING: unrecognized streaming target \"%s\" ignored.\n", - target.c_str()); - fflush(stdout); + GTEST_LOG_(WARNING) << "unrecognized streaming target \"" << target + << "\" ignored."; } } } @@ -4549,13 +4952,8 @@ static void TearDownEnvironment(Environment* env) { env->TearDown(); } // All other functions called from RunAllTests() may safely assume that // parameterized tests are ready to be counted and run. bool UnitTestImpl::RunAllTests() { - // Makes sure InitGoogleTest() was called. - if (!GTestIsInitialized()) { - printf("%s", - "\nThis test program did NOT call ::testing::InitGoogleTest " - "before calling RUN_ALL_TESTS(). Please fix it.\n"); - return false; - } + // True iff Google Test is initialized before RUN_ALL_TESTS() is called. + const bool gtest_is_initialized_before_run_all_tests = GTestIsInitialized(); // Do not run any test if the --help flag was specified. if (g_help_flag) @@ -4683,6 +5081,20 @@ bool UnitTestImpl::RunAllTests() { repeater->OnTestProgramEnd(*parent_); + if (!gtest_is_initialized_before_run_all_tests) { + ColoredPrintf( + COLOR_RED, + "\nIMPORTANT NOTICE - DO NOT IGNORE:\n" + "This test program did NOT call " GTEST_INIT_GOOGLE_TEST_NAME_ + "() before calling RUN_ALL_TESTS(). This is INVALID. Soon " GTEST_NAME_ + " will start to enforce the valid usage. " + "Please fix it ASAP, or IT WILL START TO FAIL.\n"); // NOLINT +#if GTEST_FOR_GOOGLE_ + ColoredPrintf(COLOR_RED, + "For more details, see http://wiki/Main/ValidGUnitMain.\n"); +#endif // GTEST_FOR_GOOGLE_ + } + return !failed; } @@ -4784,8 +5196,8 @@ bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) { // each TestCase and TestInfo object. // If shard_tests == true, further filters tests based on sharding // variables in the environment - see -// http://code.google.com/p/googletest/wiki/GoogleTestAdvancedGuide. -// Returns the number of tests that should run. +// https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuide.md +// . Returns the number of tests that should run. int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) { const Int32 total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ? Int32FromEnvOrDie(kTestTotalShards, -1) : -1; @@ -4824,10 +5236,11 @@ int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) { (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) && matches_filter; - const bool is_selected = is_runnable && - (shard_tests == IGNORE_SHARDING_PROTOCOL || - ShouldRunTestOnShard(total_shards, shard_index, - num_runnable_tests)); + const bool is_in_another_shard = + shard_tests != IGNORE_SHARDING_PROTOCOL && + !ShouldRunTestOnShard(total_shards, shard_index, num_runnable_tests); + test_info->is_in_another_shard_ = is_in_another_shard; + const bool is_selected = is_runnable && !is_in_another_shard; num_runnable_tests += is_runnable; num_selected_tests += is_selected; @@ -4927,11 +5340,15 @@ OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() { return os_stack_trace_getter_; } -// Returns the TestResult for the test that's currently running, or -// the TestResult for the ad hoc test if no test is running. +// Returns the most specific TestResult currently running. TestResult* UnitTestImpl::current_test_result() { - return current_test_info_ ? - &(current_test_info_->result_) : &ad_hoc_test_result_; + if (current_test_info_ != NULL) { + return ¤t_test_info_->result_; + } + if (current_test_case_ != NULL) { + return ¤t_test_case_->ad_hoc_test_result_; + } + return &ad_hoc_test_result_; } // Shuffles all test cases, and the tests within each test case, @@ -5012,9 +5429,8 @@ bool SkipPrefix(const char* prefix, const char** pstr) { // part can be omitted. // // Returns the value of the flag, or NULL if the parsing failed. -const char* ParseFlagValue(const char* str, - const char* flag, - bool def_optional) { +static const char* ParseFlagValue(const char* str, const char* flag, + bool def_optional) { // str and flag must not be NULL. if (str == NULL || flag == NULL) return NULL; @@ -5050,7 +5466,7 @@ const char* ParseFlagValue(const char* str, // // On success, stores the value of the flag in *value, and returns // true. On failure, returns false without changing *value. -bool ParseBoolFlag(const char* str, const char* flag, bool* value) { +static bool ParseBoolFlag(const char* str, const char* flag, bool* value) { // Gets the value of the flag as a string. const char* const value_str = ParseFlagValue(str, flag, true); @@ -5084,7 +5500,8 @@ bool ParseInt32Flag(const char* str, const char* flag, Int32* value) { // // On success, stores the value of the flag in *value, and returns // true. On failure, returns false without changing *value. -bool ParseStringFlag(const char* str, const char* flag, std::string* value) { +template +static bool ParseStringFlag(const char* str, const char* flag, String* value) { // Gets the value of the flag as a string. const char* const value_str = ParseFlagValue(str, flag, false); @@ -5186,24 +5603,25 @@ static const char kColorEncodedHelpMessage[] = " Enable/disable colored output. The default is @Gauto@D.\n" " -@G-" GTEST_FLAG_PREFIX_ "print_time=0@D\n" " Don't print the elapsed time of each test.\n" -" @G--" GTEST_FLAG_PREFIX_ "output=xml@Y[@G:@YDIRECTORY_PATH@G" +" @G--" GTEST_FLAG_PREFIX_ "output=@Y(@Gjson@Y|@Gxml@Y)[@G:@YDIRECTORY_PATH@G" GTEST_PATH_SEP_ "@Y|@G:@YFILE_PATH]@D\n" -" Generate an XML report in the given directory or with the given file\n" -" name. @YFILE_PATH@D defaults to @Gtest_details.xml@D.\n" -#if GTEST_CAN_STREAM_RESULTS_ +" Generate a JSON or XML report in the given directory or with the given\n" +" file name. @YFILE_PATH@D defaults to @Gtest_details.xml@D.\n" +# if GTEST_CAN_STREAM_RESULTS_ " @G--" GTEST_FLAG_PREFIX_ "stream_result_to=@YHOST@G:@YPORT@D\n" " Stream test results to the given server.\n" -#endif // GTEST_CAN_STREAM_RESULTS_ +# endif // GTEST_CAN_STREAM_RESULTS_ "\n" "Assertion Behavior:\n" -#if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS +# if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS " @G--" GTEST_FLAG_PREFIX_ "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n" " Set the default death test style.\n" -#endif // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS +# endif // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS " @G--" GTEST_FLAG_PREFIX_ "break_on_failure@D\n" " Turn assertion failures into debugger break-points.\n" " @G--" GTEST_FLAG_PREFIX_ "throw_on_failure@D\n" -" Turn assertion failures into C++ exceptions.\n" +" Turn assertion failures into C++ exceptions for use by an external\n" +" test framework.\n" " @G--" GTEST_FLAG_PREFIX_ "catch_exceptions=0@D\n" " Do not report exceptions as test failures. Instead, allow them\n" " to crash the program or throw a pop-up (on Windows).\n" @@ -5220,7 +5638,7 @@ static const char kColorEncodedHelpMessage[] = "(not one in your own code or tests), please report it to\n" "@G<" GTEST_DEV_EMAIL_ ">@D.\n"; -bool ParseGoogleTestFlag(const char* const arg) { +static bool ParseGoogleTestFlag(const char* const arg) { return ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag, >EST_FLAG(also_run_disabled_tests)) || ParseBoolFlag(arg, kBreakOnFailureFlag, @@ -5238,6 +5656,7 @@ bool ParseGoogleTestFlag(const char* const arg) { ParseBoolFlag(arg, kListTestsFlag, >EST_FLAG(list_tests)) || ParseStringFlag(arg, kOutputFlag, >EST_FLAG(output)) || ParseBoolFlag(arg, kPrintTimeFlag, >EST_FLAG(print_time)) || + ParseBoolFlag(arg, kPrintUTF8Flag, >EST_FLAG(print_utf8)) || ParseInt32Flag(arg, kRandomSeedFlag, >EST_FLAG(random_seed)) || ParseInt32Flag(arg, kRepeatFlag, >EST_FLAG(repeat)) || ParseBoolFlag(arg, kShuffleFlag, >EST_FLAG(shuffle)) || @@ -5250,14 +5669,11 @@ bool ParseGoogleTestFlag(const char* const arg) { } #if GTEST_USE_OWN_FLAGFILE_FLAG_ -void LoadFlagsFromFile(const std::string& path) { +static void LoadFlagsFromFile(const std::string& path) { FILE* flagfile = posix::FOpen(path.c_str(), "r"); if (!flagfile) { - fprintf(stderr, - "Unable to open file \"%s\"\n", - GTEST_FLAG(flagfile).c_str()); - fflush(stderr); - exit(EXIT_FAILURE); + GTEST_LOG_(FATAL) << "Unable to open file \"" << GTEST_FLAG(flagfile) + << "\""; } std::string contents(ReadEntireFile(flagfile)); posix::FClose(flagfile); @@ -5385,4 +5801,45 @@ void InitGoogleTest(int* argc, wchar_t** argv) { #endif // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) } +std::string TempDir() { +#if defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_) + return GTEST_CUSTOM_TEMPDIR_FUNCTION_(); +#endif + +#if GTEST_OS_WINDOWS_MOBILE + return "\\temp\\"; +#elif GTEST_OS_WINDOWS + const char* temp_dir = internal::posix::GetEnv("TEMP"); + if (temp_dir == NULL || temp_dir[0] == '\0') + return "\\temp\\"; + else if (temp_dir[strlen(temp_dir) - 1] == '\\') + return temp_dir; + else + return std::string(temp_dir) + "\\"; +#elif GTEST_OS_LINUX_ANDROID + return "/sdcard/"; +#else + return "/tmp/"; +#endif // GTEST_OS_WINDOWS_MOBILE +} + +// Class ScopedTrace + +// Pushes the given source file location and message onto a per-thread +// trace stack maintained by Google Test. +void ScopedTrace::PushTrace(const char* file, int line, std::string message) { + internal::TraceInfo trace; + trace.file = file; + trace.line = line; + trace.message.swap(message); + + UnitTest::GetInstance()->PushGTestTrace(trace); +} + +// Pops the info pushed by the c'tor. +ScopedTrace::~ScopedTrace() + GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { + UnitTest::GetInstance()->PopGTestTrace(); +} + } // namespace testing diff --git a/test/gtest-1.8.0/src/gtest_main.cc b/test/gtest-1.8.0/src/gtest_main.cc index f302822552..5e9c94cbb8 100644 --- a/test/gtest-1.8.0/src/gtest_main.cc +++ b/test/gtest-1.8.0/src/gtest_main.cc @@ -26,9 +26,9 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// #include - #include "gtest/gtest.h" GTEST_API_ int main(int argc, char **argv) { diff --git a/test/gtest-1.8.0/test/BUILD.bazel b/test/gtest-1.8.0/test/BUILD.bazel new file mode 100644 index 0000000000..6ea18ec691 --- /dev/null +++ b/test/gtest-1.8.0/test/BUILD.bazel @@ -0,0 +1,380 @@ +# Copyright 2017 Google Inc. +# All Rights Reserved. +# +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Author: misterg@google.com (Gennadiy Civil) +# +# Bazel BUILD for The Google C++ Testing Framework (Google Test) + +licenses(["notice"]) + +""" gtest own tests """ + +#on windows exclude gtest-tuple.h and gtest-tuple_test.cc +cc_test( + name = "gtest_all_test", + size = "small", + srcs = glob( + include = [ + "gtest-*.cc", + "*.h", + "googletest/include/gtest/**/*.h", + ], + exclude = [ + "gtest-unittest-api_test.cc", + "gtest-tuple_test.cc", + "googletest/src/gtest-all.cc", + "gtest_all_test.cc", + "gtest-death-test_ex_test.cc", + "gtest-listener_test.cc", + "gtest-unittest-api_test.cc", + "gtest-param-test_test.cc", + ], + ) + select({ + "//:windows": [], + "//:windows_msvc": [], + "//conditions:default": [ + "gtest-tuple_test.cc", + ], + }), + copts = select({ + "//:windows": ["-DGTEST_USE_OWN_TR1_TUPLE=0"], + "//:windows_msvc": ["-DGTEST_USE_OWN_TR1_TUPLE=0"], + "//conditions:default": ["-DGTEST_USE_OWN_TR1_TUPLE=1"], + }), + includes = [ + "googletest", + "googletest/include", + "googletest/include/internal", + "googletest/test", + ], + linkopts = select({ + "//:windows": [], + "//:windows_msvc": [], + "//conditions:default": [ + "-pthread", + ], + }), + deps = ["//:gtest_main"], +) + +#These googletest tests have their own main() +cc_test( + name = "gtest-listener_test", + size = "small", + srcs = [ + "gtest-listener_test.cc", + ], + deps = [ + "//:gtest", + ], +) + +cc_test( + name = "gtest-unittest-api_test", + size = "small", + srcs = [ + "gtest-unittest-api_test.cc", + ], + deps = [ + "//:gtest", + ], +) + +cc_test( + name = "gtest-param-test_test", + size = "small", + srcs = [ + "gtest-param-test2_test.cc", + "gtest-param-test_test.cc", + "gtest-param-test_test.h", + ], + deps = [ + "//:gtest", + ], +) + +cc_test( + name = "gtest_unittest", + size = "small", + srcs = ["gtest_unittest.cc"], + args = ["--heap_check=strict"], + shard_count = 2, + deps = ["//:gtest_main"], +) + +# Py tests + +py_library( + name = "gtest_test_utils", + testonly = 1, + srcs = ["gtest_test_utils.py"], + +) + +cc_binary( + name = "gtest_help_test_", + testonly = 1, + srcs = ["gtest_help_test_.cc"], + deps = ["//:gtest_main"], +) +py_test( + name = "gtest_help_test", + size = "small", + srcs = ["gtest_help_test.py"], + data = [":gtest_help_test_"], + deps = [":gtest_test_utils"], +) + +cc_binary( + name = "gtest_output_test_", + testonly = 1, + srcs = ["gtest_output_test_.cc"], + deps = ["//:gtest"], +) + +py_test( + name = "gtest_output_test", + size = "small", + srcs = ["gtest_output_test.py"], + data = [ + "gtest_output_test_golden_lin.txt", + ":gtest_output_test_", + ], + deps = [":gtest_test_utils"], +) + +cc_binary( + name = "gtest_color_test_", + testonly = 1, + srcs = ["gtest_color_test_.cc"], + deps = ["//:gtest"], +) +py_test( + name = "gtest_color_test", + size = "small", + srcs = ["gtest_color_test.py"], + data = [":gtest_color_test_"], + deps = [":gtest_test_utils"], +) + +cc_binary( + name = "gtest_env_var_test_", + testonly = 1, + srcs = ["gtest_env_var_test_.cc"], + deps = ["//:gtest"], +) + +py_test( + name = "gtest_env_var_test", + size = "small", + srcs = ["gtest_env_var_test.py"], + data = [":gtest_env_var_test_"], + deps = [":gtest_test_utils"], +) + +cc_binary( + name = "gtest_filter_unittest_", + testonly = 1, + srcs = ["gtest_filter_unittest_.cc"], + deps = ["//:gtest"], +) + +py_test( + name = "gtest_filter_unittest", + size = "small", + srcs = ["gtest_filter_unittest.py"], + data = [":gtest_filter_unittest_"], + deps = [":gtest_test_utils"], +) + +cc_binary( + name = "gtest_break_on_failure_unittest_", + testonly = 1, + srcs = ["gtest_break_on_failure_unittest_.cc"], + deps = ["//:gtest"], +) + +py_test( + name = "gtest_break_on_failure_unittest", + size = "small", + srcs = ["gtest_break_on_failure_unittest.py"], + data = [":gtest_break_on_failure_unittest_"], + deps = [":gtest_test_utils"], +) + +cc_test( + name = "gtest_assert_by_exception_test", + size = "small", + srcs = ["gtest_assert_by_exception_test.cc"], + deps = ["//:gtest"], +) + +cc_binary( + name = "gtest_throw_on_failure_test_", + testonly = 1, + srcs = ["gtest_throw_on_failure_test_.cc"], + deps = ["//:gtest"], +) + +py_test( + name = "gtest_throw_on_failure_test", + size = "small", + srcs = ["gtest_throw_on_failure_test.py"], + data = [":gtest_throw_on_failure_test_"], + deps = [":gtest_test_utils"], +) + +cc_binary( + name = "gtest_list_tests_unittest_", + testonly = 1, + srcs = ["gtest_list_tests_unittest_.cc"], + deps = ["//:gtest"], +) + +py_test( + name = "gtest_list_tests_unittest", + size = "small", + srcs = ["gtest_list_tests_unittest.py"], + data = [":gtest_list_tests_unittest_"], + deps = [":gtest_test_utils"], +) + +cc_binary( + name = "gtest_shuffle_test_", + srcs = ["gtest_shuffle_test_.cc"], + deps = ["//:gtest"], +) + +py_test( + name = "gtest_shuffle_test", + size = "small", + srcs = ["gtest_shuffle_test.py"], + data = [":gtest_shuffle_test_"], + deps = [":gtest_test_utils"], +) + +cc_binary( + name = "gtest_catch_exceptions_no_ex_test_", + testonly = 1, + srcs = ["gtest_catch_exceptions_test_.cc"], + deps = ["//:gtest_main"], +) + +cc_binary( + name = "gtest_catch_exceptions_ex_test_", + testonly = 1, + srcs = ["gtest_catch_exceptions_test_.cc"], + copts = ["-fexceptions"], + deps = ["//:gtest_main"], +) + +py_test( + name = "gtest_catch_exceptions_test", + size = "small", + srcs = ["gtest_catch_exceptions_test.py"], + data = [ + ":gtest_catch_exceptions_ex_test_", + ":gtest_catch_exceptions_no_ex_test_", + ], + deps = [":gtest_test_utils"], +) + +cc_binary( + name = "gtest_xml_output_unittest_", + testonly = 1, + srcs = ["gtest_xml_output_unittest_.cc"], + deps = ["//:gtest"], +) + +cc_test( + name = "gtest_no_test_unittest", + size = "small", + srcs = ["gtest_no_test_unittest.cc"], + deps = ["//:gtest"], +) + +py_test( + name = "gtest_xml_output_unittest", + size = "small", + srcs = [ + "gtest_xml_output_unittest.py", + "gtest_xml_test_utils.py", + ], + data = [ + # We invoke gtest_no_test_unittest to verify the XML output + # when the test program contains no test definition. + ":gtest_no_test_unittest", + ":gtest_xml_output_unittest_", + ], + deps = [":gtest_test_utils"], +) + +cc_binary( + name = "gtest_xml_outfile1_test_", + testonly = 1, + srcs = ["gtest_xml_outfile1_test_.cc"], + deps = ["//:gtest_main"], +) + +cc_binary( + name = "gtest_xml_outfile2_test_", + testonly = 1, + srcs = ["gtest_xml_outfile2_test_.cc"], + deps = ["//:gtest_main"], +) + +py_test( + name = "gtest_xml_outfiles_test", + size = "small", + srcs = [ + "gtest_xml_outfiles_test.py", + "gtest_xml_test_utils.py", + ], + data = [ + ":gtest_xml_outfile1_test_", + ":gtest_xml_outfile2_test_", + ], + deps = [":gtest_test_utils"], +) + +cc_binary( + name = "gtest_uninitialized_test_", + testonly = 1, + srcs = ["gtest_uninitialized_test_.cc"], + deps = ["//:gtest"], +) + +py_test( + name = "gtest_uninitialized_test", + size = "medium", + srcs = ["gtest_uninitialized_test.py"], + data = [":gtest_uninitialized_test_"], + deps = [":gtest_test_utils"], +) diff --git a/test/gtest-1.8.0/test/gtest-death-test_test.cc b/test/gtest-1.8.0/test/gtest-death-test_test.cc index bb4a3d1b38..37261cb63c 100644 --- a/test/gtest-1.8.0/test/gtest-death-test_test.cc +++ b/test/gtest-1.8.0/test/gtest-death-test_test.cc @@ -56,15 +56,7 @@ using testing::internal::AlwaysTrue; # endif // GTEST_OS_LINUX # include "gtest/gtest-spi.h" - -// Indicates that this translation unit is part of Google Test's -// implementation. It must come before gtest-internal-inl.h is -// included, or there will be a compiler error. This trick is to -// prevent a user from accidentally including gtest-internal-inl.h in -// his code. -# define GTEST_IMPLEMENTATION_ 1 # include "src/gtest-internal-inl.h" -# undef GTEST_IMPLEMENTATION_ namespace posix = ::testing::internal::posix; @@ -208,7 +200,7 @@ int DieInDebugElse12(int* sideeffect) { return 12; } -# if GTEST_OS_WINDOWS +# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA // Tests the ExitedWithCode predicate. TEST(ExitStatusPredicateTest, ExitedWithCode) { @@ -280,7 +272,7 @@ TEST(ExitStatusPredicateTest, KilledBySignal) { EXPECT_FALSE(pred_kill(status_segv)); } -# endif // GTEST_OS_WINDOWS +# endif // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA // Tests that the death test macros expand to code which may or may not // be followed by operator<<, and that in either case the complete text @@ -313,14 +305,14 @@ void DieWithEmbeddedNul() { } # if GTEST_USES_PCRE + // Tests that EXPECT_DEATH and ASSERT_DEATH work when the error // message has a NUL character in it. TEST_F(TestForDeathTest, EmbeddedNulInMessage) { - // TODO(wan@google.com): doesn't support matching strings - // with embedded NUL characters - find a way to workaround it. EXPECT_DEATH(DieWithEmbeddedNul(), "my null world"); ASSERT_DEATH(DieWithEmbeddedNul(), "my null world"); } + # endif // GTEST_USES_PCRE // Tests that death test macros expand to code which interacts well with switch @@ -505,7 +497,7 @@ TEST_F(TestForDeathTest, AcceptsAnythingConvertibleToRE) { # if GTEST_HAS_GLOBAL_STRING - const string regex_str(regex_c_str); + const ::string regex_str(regex_c_str); EXPECT_DEATH(GlobalFunction(), regex_str); # endif // GTEST_HAS_GLOBAL_STRING @@ -625,7 +617,11 @@ TEST_F(TestForDeathTest, ReturnIsFailure) { TEST_F(TestForDeathTest, TestExpectDebugDeath) { int sideeffect = 0; - EXPECT_DEBUG_DEATH(DieInDebugElse12(&sideeffect), "death.*DieInDebugElse12") + // Put the regex in a local variable to make sure we don't get an "unused" + // warning in opt mode. + const char* regex = "death.*DieInDebugElse12"; + + EXPECT_DEBUG_DEATH(DieInDebugElse12(&sideeffect), regex) << "Must accept a streamed message"; # ifdef NDEBUG @@ -791,8 +787,9 @@ static void TestExitMacros() { // See http://msdn.microsoft.com/en-us/library/dwwzkt4c(VS.71).aspx. EXPECT_EXIT(raise(SIGABRT), testing::ExitedWithCode(3), "") << "b_ar"; -# else +# elif !GTEST_OS_FUCHSIA + // Fuchsia has no unix signals. EXPECT_EXIT(raise(SIGKILL), testing::KilledBySignal(SIGKILL), "") << "foo"; ASSERT_EXIT(raise(SIGUSR2), testing::KilledBySignal(SIGUSR2), "") << "bar"; diff --git a/test/gtest-1.8.0/test/gtest-filepath_test.cc b/test/gtest-1.8.0/test/gtest-filepath_test.cc index da72986926..29cea3d1e9 100644 --- a/test/gtest-1.8.0/test/gtest-filepath_test.cc +++ b/test/gtest-1.8.0/test/gtest-filepath_test.cc @@ -27,28 +27,18 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Authors: keith.ray@gmail.com (Keith Ray) // // Google Test filepath utilities // // This file tests classes and functions used internally by // Google Test. They are subject to change without notice. // -// This file is #included from gtest_unittest.cc, to avoid changing -// build or make-files for some existing Google Test clients. Do not -// #include this file anywhere else! +// This file is #included from gtest-internal.h. +// Do not #include this file anywhere else! #include "gtest/internal/gtest-filepath.h" #include "gtest/gtest.h" - -// Indicates that this translation unit is part of Google Test's -// implementation. It must come before gtest-internal-inl.h is -// included, or there will be a compiler error. This trick is to -// prevent a user from accidentally including gtest-internal-inl.h in -// his code. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ #if GTEST_OS_WINDOWS_MOBILE # include // NOLINT diff --git a/test/gtest-1.8.0/test/gtest-listener_test.cc b/test/gtest-1.8.0/test/gtest-listener_test.cc index 90747685f0..639529c585 100644 --- a/test/gtest-1.8.0/test/gtest-listener_test.cc +++ b/test/gtest-1.8.0/test/gtest-listener_test.cc @@ -28,7 +28,7 @@ // // Author: vladl@google.com (Vlad Losev) // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) // // This file verifies Google Test event listeners receive events at the // right times. diff --git a/test/gtest-1.8.0/test/gtest-options_test.cc b/test/gtest-1.8.0/test/gtest-options_test.cc index 5586dc3b1b..10cb1df72b 100644 --- a/test/gtest-1.8.0/test/gtest-options_test.cc +++ b/test/gtest-1.8.0/test/gtest-options_test.cc @@ -27,7 +27,6 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Authors: keith.ray@gmail.com (Keith Ray) // // Google Test UnitTestOptions tests // @@ -46,14 +45,7 @@ # include #endif // GTEST_OS_WINDOWS_MOBILE -// Indicates that this translation unit is part of Google Test's -// implementation. It must come before gtest-internal-inl.h is -// included, or there will be a compiler error. This trick is to -// prevent a user from accidentally including gtest-internal-inl.h in -// his code. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ namespace testing { namespace internal { @@ -111,6 +103,8 @@ TEST(OutputFileHelpersTest, GetCurrentExecutableName) { _strcmpi("gtest-options-ex_test", exe_str.c_str()) == 0 || _strcmpi("gtest_all_test", exe_str.c_str()) == 0 || _strcmpi("gtest_dll_test", exe_str.c_str()) == 0; +#elif GTEST_OS_FUCHSIA + const bool success = exe_str == "app"; #else // TODO(wan@google.com): remove the hard-coded "lt-" prefix when // Chandler Carruth's libtool replacement is ready. @@ -124,6 +118,8 @@ TEST(OutputFileHelpersTest, GetCurrentExecutableName) { FAIL() << "GetCurrentExecutableName() returns " << exe_str; } +#if !GTEST_OS_FUCHSIA + class XmlOutputChangeDirTest : public Test { protected: virtual void SetUp() { @@ -210,6 +206,8 @@ TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithAbsolutePath) { #endif } +#endif // !GTEST_OS_FUCHSIA + } // namespace } // namespace internal } // namespace testing diff --git a/test/gtest-1.8.0/test/gtest-param-test2_test.cc b/test/gtest-1.8.0/test/gtest-param-test2_test.cc index 4a782fe708..c3b2d189d4 100644 --- a/test/gtest-1.8.0/test/gtest-param-test2_test.cc +++ b/test/gtest-1.8.0/test/gtest-param-test2_test.cc @@ -33,10 +33,7 @@ // Google Test work. #include "gtest/gtest.h" - -#include "test/gtest-param-test_test.h" - -#if GTEST_HAS_PARAM_TEST +#include "gtest-param-test_test.h" using ::testing::Values; using ::testing::internal::ParamGenerator; @@ -62,4 +59,3 @@ INSTANTIATE_TEST_CASE_P(Sequence2, InstantiationInMultipleTranslaionUnitsTest, Values(42*3, 42*4, 42*5)); -#endif // GTEST_HAS_PARAM_TEST diff --git a/test/gtest-1.8.0/test/gtest-param-test_test.cc b/test/gtest-1.8.0/test/gtest-param-test_test.cc index 8b278bb94b..adc4d1b526 100644 --- a/test/gtest-1.8.0/test/gtest-param-test_test.cc +++ b/test/gtest-1.8.0/test/gtest-param-test_test.cc @@ -35,8 +35,6 @@ #include "gtest/gtest.h" -#if GTEST_HAS_PARAM_TEST - # include # include # include @@ -44,11 +42,7 @@ # include # include -// To include gtest-internal-inl.h. -# define GTEST_IMPLEMENTATION_ 1 # include "src/gtest-internal-inl.h" // for UnitTestOptions -# undef GTEST_IMPLEMENTATION_ - # include "test/gtest-param-test_test.h" using ::std::vector; @@ -141,7 +135,7 @@ void VerifyGenerator(const ParamGenerator& generator, << ", expected_values[i] is " << PrintValue(expected_values[i]) << ", *it is " << PrintValue(*it) << ", and 'it' is an iterator created with the copy constructor.\n"; - it++; + ++it; } EXPECT_TRUE(it == generator.end()) << "At the presumed end of sequence when accessing via an iterator " @@ -161,7 +155,7 @@ void VerifyGenerator(const ParamGenerator& generator, << ", expected_values[i] is " << PrintValue(expected_values[i]) << ", *it is " << PrintValue(*it) << ", and 'it' is an iterator created with the copy constructor.\n"; - it++; + ++it; } EXPECT_TRUE(it == generator.end()) << "At the presumed end of sequence when accessing via an iterator " @@ -196,7 +190,7 @@ TEST(IteratorTest, ParamIteratorConformsToForwardIteratorConcept) { << "element same as its source points to"; // Verifies that iterator assignment works as expected. - it++; + ++it; EXPECT_FALSE(*it == *it2); it2 = it; EXPECT_TRUE(*it == *it2) << "Assigned iterators must point to the " @@ -215,7 +209,7 @@ TEST(IteratorTest, ParamIteratorConformsToForwardIteratorConcept) { // Verifies that prefix and postfix operator++() advance an iterator // all the same. it2 = it; - it++; + ++it; ++it2; EXPECT_TRUE(*it == *it2); } @@ -542,6 +536,51 @@ TEST(CombineTest, CombineWithMaxNumberOfParameters) { VerifyGenerator(gen, expected_values); } +#if GTEST_LANG_CXX11 + +class NonDefaultConstructAssignString { + public: + NonDefaultConstructAssignString(const std::string& s) : str_(s) {} + + const std::string& str() const { return str_; } + + private: + std::string str_; + + // Not default constructible + NonDefaultConstructAssignString(); + // Not assignable + void operator=(const NonDefaultConstructAssignString&); +}; + +TEST(CombineTest, NonDefaultConstructAssign) { + const ParamGenerator > gen = + Combine(Values(0, 1), Values(NonDefaultConstructAssignString("A"), + NonDefaultConstructAssignString("B"))); + + ParamGenerator >::iterator it = + gen.begin(); + + EXPECT_EQ(0, std::get<0>(*it)); + EXPECT_EQ("A", std::get<1>(*it).str()); + ++it; + + EXPECT_EQ(0, std::get<0>(*it)); + EXPECT_EQ("B", std::get<1>(*it).str()); + ++it; + + EXPECT_EQ(1, std::get<0>(*it)); + EXPECT_EQ("A", std::get<1>(*it).str()); + ++it; + + EXPECT_EQ(1, std::get<0>(*it)); + EXPECT_EQ("B", std::get<1>(*it).str()); + ++it; + + EXPECT_TRUE(it == gen.end()); +} + +#endif // GTEST_LANG_CXX11 # endif // GTEST_HAS_COMBINE // Tests that an generator produces correct sequence after being @@ -809,6 +848,34 @@ TEST_P(NamingTest, TestsReportCorrectNamesAndParameters) { INSTANTIATE_TEST_CASE_P(ZeroToFiveSequence, NamingTest, Range(0, 5)); +// Tests that macros in test names are expanded correctly. +class MacroNamingTest : public TestWithParam {}; + +#define PREFIX_WITH_FOO(test_name) Foo##test_name +#define PREFIX_WITH_MACRO(test_name) Macro##test_name + +TEST_P(PREFIX_WITH_MACRO(NamingTest), PREFIX_WITH_FOO(SomeTestName)) { + const ::testing::TestInfo* const test_info = + ::testing::UnitTest::GetInstance()->current_test_info(); + + EXPECT_STREQ("FortyTwo/MacroNamingTest", test_info->test_case_name()); + EXPECT_STREQ("FooSomeTestName", test_info->name()); +} + +INSTANTIATE_TEST_CASE_P(FortyTwo, MacroNamingTest, Values(42)); + +// Tests the same thing for non-parametrized tests. +class MacroNamingTestNonParametrized : public ::testing::Test {}; + +TEST_F(PREFIX_WITH_MACRO(NamingTestNonParametrized), + PREFIX_WITH_FOO(SomeTestName)) { + const ::testing::TestInfo* const test_info = + ::testing::UnitTest::GetInstance()->current_test_info(); + + EXPECT_STREQ("MacroNamingTestNonParametrized", test_info->test_case_name()); + EXPECT_STREQ("FooSomeTestName", test_info->name()); +} + // Tests that user supplied custom parameter names are working correctly. // Runs the test with a builtin helper method which uses PrintToString, // as well as a custom function and custom functor to ensure all possible @@ -817,8 +884,8 @@ class CustomFunctorNamingTest : public TestWithParam {}; TEST_P(CustomFunctorNamingTest, CustomTestNames) {} struct CustomParamNameFunctor { - std::string operator()(const ::testing::TestParamInfo& info) { - return info.param; + std::string operator()(const ::testing::TestParamInfo& inf) { + return inf.param; } }; @@ -835,8 +902,8 @@ INSTANTIATE_TEST_CASE_P(AllAllowedCharacters, CustomParamNameFunctor()); inline std::string CustomParamNameFunction( - const ::testing::TestParamInfo& info) { - return info.param; + const ::testing::TestParamInfo& inf) { + return inf.param; } class CustomFunctionNamingTest : public TestWithParam {}; @@ -854,11 +921,10 @@ INSTANTIATE_TEST_CASE_P(CustomParamNameFunction, class CustomLambdaNamingTest : public TestWithParam {}; TEST_P(CustomLambdaNamingTest, CustomTestNames) {} -INSTANTIATE_TEST_CASE_P(CustomParamNameLambda, - CustomLambdaNamingTest, +INSTANTIATE_TEST_CASE_P(CustomParamNameLambda, CustomLambdaNamingTest, Values(std::string("LambdaName")), - [](const ::testing::TestParamInfo& info) { - return info.param; + [](const ::testing::TestParamInfo& inf) { + return inf.param; }); #endif // GTEST_LANG_CXX11 @@ -1025,31 +1091,20 @@ TEST_F(ParameterizedDeathTest, GetParamDiesFromTestF) { INSTANTIATE_TEST_CASE_P(RangeZeroToFive, ParameterizedDerivedTest, Range(0, 5)); -#endif // GTEST_HAS_PARAM_TEST - -TEST(CompileTest, CombineIsDefinedOnlyWhenGtestHasParamTestIsDefined) { -#if GTEST_HAS_COMBINE && !GTEST_HAS_PARAM_TEST - FAIL() << "GTEST_HAS_COMBINE is defined while GTEST_HAS_PARAM_TEST is not\n" -#endif -} int main(int argc, char **argv) { -#if GTEST_HAS_PARAM_TEST // Used in TestGenerationTest test case. AddGlobalTestEnvironment(TestGenerationTest::Environment::Instance()); // Used in GeneratorEvaluationTest test case. Tests that the updated value // will be picked up for instantiating tests in GeneratorEvaluationTest. GeneratorEvaluationTest::set_param_value(1); -#endif // GTEST_HAS_PARAM_TEST ::testing::InitGoogleTest(&argc, argv); -#if GTEST_HAS_PARAM_TEST // Used in GeneratorEvaluationTest test case. Tests that value updated // here will NOT be used for instantiating tests in // GeneratorEvaluationTest. GeneratorEvaluationTest::set_param_value(2); -#endif // GTEST_HAS_PARAM_TEST return RUN_ALL_TESTS(); } diff --git a/test/gtest-1.8.0/test/gtest-param-test_test.h b/test/gtest-1.8.0/test/gtest-param-test_test.h index 26ea122b10..ea1e884f7c 100644 --- a/test/gtest-1.8.0/test/gtest-param-test_test.h +++ b/test/gtest-1.8.0/test/gtest-param-test_test.h @@ -29,7 +29,7 @@ // // Authors: vladl@google.com (Vlad Losev) // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) // // This header file provides classes and functions used internally // for testing Google Test itself. @@ -39,8 +39,6 @@ #include "gtest/gtest.h" -#if GTEST_HAS_PARAM_TEST - // Test fixture for testing definition and instantiation of a test // in separate translation units. class ExternalInstantiationTest : public ::testing::TestWithParam { @@ -52,6 +50,4 @@ class InstantiationInMultipleTranslaionUnitsTest : public ::testing::TestWithParam { }; -#endif // GTEST_HAS_PARAM_TEST - #endif // GTEST_TEST_GTEST_PARAM_TEST_TEST_H_ diff --git a/test/gtest-1.8.0/test/gtest-port_test.cc b/test/gtest-1.8.0/test/gtest-port_test.cc index 6ea607bc70..3801e5ee3c 100644 --- a/test/gtest-1.8.0/test/gtest-port_test.cc +++ b/test/gtest-1.8.0/test/gtest-port_test.cc @@ -45,15 +45,7 @@ #include "gtest/gtest.h" #include "gtest/gtest-spi.h" - -// Indicates that this translation unit is part of Google Test's -// implementation. It must come before gtest-internal-inl.h is -// included, or there will be a compiler error. This trick is to -// prevent a user from accidentally including gtest-internal-inl.h in -// his code. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ using std::make_pair; using std::pair; @@ -75,7 +67,7 @@ TEST(IsXDigitTest, WorksForNarrowAscii) { } TEST(IsXDigitTest, ReturnsFalseForNarrowNonAscii) { - EXPECT_FALSE(IsXDigit('\x80')); + EXPECT_FALSE(IsXDigit(static_cast('\x80'))); EXPECT_FALSE(IsXDigit(static_cast('0' | '\x80'))); } @@ -304,7 +296,7 @@ TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownFileAndLine) { EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1)); } -#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX +#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA void* ThreadFunc(void* data) { internal::Mutex* mutex = static_cast(data); mutex->Lock(); @@ -348,7 +340,7 @@ TEST(GetThreadCountTest, ReturnsCorrectValue) { TEST(GetThreadCountTest, ReturnsZeroWhenUnableToCountThreads) { EXPECT_EQ(0U, GetThreadCount()); } -#endif // GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX +#endif // GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA TEST(GtestCheckDeathTest, DiesWithCorrectOutputOnFailure) { const bool a_false_condition = false; @@ -1209,7 +1201,7 @@ class DestructorTracker { : index_(GetNewIndex()) {} ~DestructorTracker() { // We never access DestructorCall::List() concurrently, so we don't need - // to protect this acccess with a mutex. + // to protect this access with a mutex. DestructorCall::List()[index_]->ReportDestroyed(); } @@ -1295,9 +1287,16 @@ TEST(WindowsTypesTest, HANDLEIsVoidStar) { StaticAssertTypeEq(); } +#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR) +TEST(WindowsTypesTest, _CRITICAL_SECTIONIs_CRITICAL_SECTION) { + StaticAssertTypeEq(); +} +#else TEST(WindowsTypesTest, CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION) { StaticAssertTypeEq(); } +#endif + #endif // GTEST_OS_WINDOWS } // namespace internal diff --git a/test/gtest-1.8.0/test/gtest-printers_test.cc b/test/gtest-1.8.0/test/gtest-printers_test.cc index 3e97cc24ab..a373851d27 100644 --- a/test/gtest-1.8.0/test/gtest-printers_test.cc +++ b/test/gtest-1.8.0/test/gtest-printers_test.cc @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) -// Google Test - The Google C++ Testing Framework +// Google Test - The Google C++ Testing and Mocking Framework // // This file tests the universal value printer. @@ -50,13 +50,13 @@ #include "gtest/gtest.h" -// hash_map and hash_set are available under Visual C++, or on Linux. -#if GTEST_HAS_HASH_MAP_ -# include // NOLINT -#endif // GTEST_HAS_HASH_MAP_ -#if GTEST_HAS_HASH_SET_ -# include // NOLINT -#endif // GTEST_HAS_HASH_SET_ +#if GTEST_HAS_UNORDERED_MAP_ +# include // NOLINT +#endif // GTEST_HAS_UNORDERED_MAP_ + +#if GTEST_HAS_UNORDERED_SET_ +# include // NOLINT +#endif // GTEST_HAS_UNORDERED_SET_ #if GTEST_HAS_STD_FORWARD_LIST_ # include // NOLINT @@ -187,6 +187,25 @@ inline ::std::ostream& operator<<(::std::ostream& os, return os << "StreamableTemplateInFoo: " << x.value(); } +// A user-defined streamable but recursivly-defined container type in +// a user namespace, it mimics therefore std::filesystem::path or +// boost::filesystem::path. +class PathLike { + public: + struct iterator { + typedef PathLike value_type; + }; + + PathLike() {} + + iterator begin() const { return iterator(); } + iterator end() const { return iterator(); } + + friend ::std::ostream& operator<<(::std::ostream& os, const PathLike&) { + return os << "Streamable-PathLike"; + } +}; + } // namespace foo namespace testing { @@ -211,28 +230,14 @@ using ::testing::internal::Strings; using ::testing::internal::UniversalPrint; using ::testing::internal::UniversalPrinter; using ::testing::internal::UniversalTersePrint; +#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_ using ::testing::internal::UniversalTersePrintTupleFieldsToStrings; -using ::testing::internal::string; - -// The hash_* classes are not part of the C++ standard. STLport -// defines them in namespace std. MSVC defines them in ::stdext. GCC -// defines them in ::. -#ifdef _STLP_HASH_MAP // We got from STLport. -using ::std::hash_map; -using ::std::hash_set; -using ::std::hash_multimap; -using ::std::hash_multiset; -#elif _MSC_VER -using ::stdext::hash_map; -using ::stdext::hash_set; -using ::stdext::hash_multimap; -using ::stdext::hash_multiset; #endif // Prints a value to a string using the universal value printer. This // is a helper for testing UniversalPrinter::Print() for various types. template -string Print(const T& value) { +std::string Print(const T& value) { ::std::stringstream ss; UniversalPrinter::Print(value, &ss); return ss.str(); @@ -242,7 +247,7 @@ string Print(const T& value) { // value printer. This is a helper for testing // UniversalPrinter::Print() for various types. template -string PrintByRef(const T& value) { +std::string PrintByRef(const T& value) { ::std::stringstream ss; UniversalPrinter::Print(value, &ss); return ss.str(); @@ -379,7 +384,7 @@ TEST(PrintBuiltInTypeTest, FloatingPoints) { // Since ::std::stringstream::operator<<(const void *) formats the pointer // output differently with different compilers, we have to create the expected // output first and use it as our expectation. -static string PrintPointer(const void *p) { +static std::string PrintPointer(const void* p) { ::std::stringstream expected_result_stream; expected_result_stream << p; return expected_result_stream.str(); @@ -592,7 +597,7 @@ TEST(PrintPointerTest, MemberFunctionPointer) { // The difference between this and Print() is that it ensures that the // argument is a reference to an array. template -string PrintArrayHelper(T (&a)[N]) { +std::string PrintArrayHelper(T (&a)[N]) { return Print(a); } @@ -645,7 +650,7 @@ TEST(PrintArrayTest, WConstCharArrayWithTerminatingNul) { // Array of objects. TEST(PrintArrayTest, ObjectArray) { - string a[3] = { "Hi", "Hello", "Ni hao" }; + std::string a[3] = {"Hi", "Hello", "Ni hao"}; EXPECT_EQ("{ \"Hi\", \"Hello\", \"Ni hao\" }", PrintArrayHelper(a)); } @@ -782,22 +787,22 @@ TEST(PrintTypeWithGenericStreamingTest, TypeImplicitlyConvertible) { EXPECT_EQ("AllowsGenericStreamingAndImplicitConversionTemplate", Print(a)); } -#if GTEST_HAS_STRING_PIECE_ +#if GTEST_HAS_ABSL -// Tests printing StringPiece. +// Tests printing ::absl::string_view. -TEST(PrintStringPieceTest, SimpleStringPiece) { - const StringPiece sp = "Hello"; +TEST(PrintStringViewTest, SimpleStringView) { + const ::absl::string_view sp = "Hello"; EXPECT_EQ("\"Hello\"", Print(sp)); } -TEST(PrintStringPieceTest, UnprintableCharacters) { +TEST(PrintStringViewTest, UnprintableCharacters) { const char str[] = "NUL (\0) and \r\t"; - const StringPiece sp(str, sizeof(str) - 1); + const ::absl::string_view sp(str, sizeof(str) - 1); EXPECT_EQ("\"NUL (\\0) and \\r\\t\"", Print(sp)); } -#endif // GTEST_HAS_STRING_PIECE_ +#endif // GTEST_HAS_ABSL // Tests printing STL containers. @@ -813,44 +818,44 @@ TEST(PrintStlContainerTest, NonEmptyDeque) { EXPECT_EQ("{ 1, 3 }", Print(non_empty)); } -#if GTEST_HAS_HASH_MAP_ +#if GTEST_HAS_UNORDERED_MAP_ TEST(PrintStlContainerTest, OneElementHashMap) { - hash_map map1; + ::std::unordered_map map1; map1[1] = 'a'; EXPECT_EQ("{ (1, 'a' (97, 0x61)) }", Print(map1)); } TEST(PrintStlContainerTest, HashMultiMap) { - hash_multimap map1; + ::std::unordered_multimap map1; map1.insert(make_pair(5, true)); map1.insert(make_pair(5, false)); // Elements of hash_multimap can be printed in any order. - const string result = Print(map1); + const std::string result = Print(map1); EXPECT_TRUE(result == "{ (5, true), (5, false) }" || result == "{ (5, false), (5, true) }") << " where Print(map1) returns \"" << result << "\"."; } -#endif // GTEST_HAS_HASH_MAP_ +#endif // GTEST_HAS_UNORDERED_MAP_ -#if GTEST_HAS_HASH_SET_ +#if GTEST_HAS_UNORDERED_SET_ TEST(PrintStlContainerTest, HashSet) { - hash_set set1; - set1.insert("hello"); - EXPECT_EQ("{ \"hello\" }", Print(set1)); + ::std::unordered_set set1; + set1.insert(1); + EXPECT_EQ("{ 1 }", Print(set1)); } TEST(PrintStlContainerTest, HashMultiSet) { const int kSize = 5; int a[kSize] = { 1, 1, 2, 5, 1 }; - hash_multiset set1(a, a + kSize); + ::std::unordered_multiset set1(a, a + kSize); // Elements of hash_multiset can be printed in any order. - const string result = Print(set1); - const string expected_pattern = "{ d, d, d, d, d }"; // d means a digit. + const std::string result = Print(set1); + const std::string expected_pattern = "{ d, d, d, d, d }"; // d means a digit. // Verifies the result matches the expected pattern; also extracts // the numbers in the result. @@ -872,14 +877,11 @@ TEST(PrintStlContainerTest, HashMultiSet) { EXPECT_TRUE(std::equal(a, a + kSize, numbers.begin())); } -#endif // GTEST_HAS_HASH_SET_ +#endif // GTEST_HAS_UNORDERED_SET_ TEST(PrintStlContainerTest, List) { - const string a[] = { - "hello", - "world" - }; - const list strings(a, a + 2); + const std::string a[] = {"hello", "world"}; + const list strings(a, a + 2); EXPECT_EQ("{ \"hello\", \"world\" }", Print(strings)); } @@ -1035,8 +1037,9 @@ TEST(PrintTr1TupleTest, VariousSizes) { // VC++ 2010's implementation of tuple of C++0x is deficient, requiring // an explicit type cast of NULL to be used. ::std::tr1::tuple - t10(false, 'a', 3, 4, 5, 1.5F, -2.5, str, + testing::internal::Int64, float, double, const char*, void*, + std::string> + t10(false, 'a', static_cast(3), 4, 5, 1.5F, -2.5, str, // NOLINT ImplicitCast_(NULL), "10"); EXPECT_EQ("(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, " + PrintPointer(str) + " pointing to \"8\", NULL, \"10\")", @@ -1094,8 +1097,9 @@ TEST(PrintStdTupleTest, VariousSizes) { // VC++ 2010's implementation of tuple of C++0x is deficient, requiring // an explicit type cast of NULL to be used. ::std::tuple - t10(false, 'a', 3, 4, 5, 1.5F, -2.5, str, + testing::internal::Int64, float, double, const char*, void*, + std::string> + t10(false, 'a', static_cast(3), 4, 5, 1.5F, -2.5, str, // NOLINT ImplicitCast_(NULL), "10"); EXPECT_EQ("(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, " + PrintPointer(str) + " pointing to \"8\", NULL, \"10\")", @@ -1158,6 +1162,15 @@ TEST(PrintStreamableTypeTest, TemplateTypeInUserNamespace) { Print(::foo::StreamableTemplateInFoo())); } +// Tests printing a user-defined recursive container type that has a << +// operator. +TEST(PrintStreamableTypeTest, PathLikeInUserNamespace) { + ::foo::PathLike x; + EXPECT_EQ("Streamable-PathLike", Print(x)); + const ::foo::PathLike cx; + EXPECT_EQ("Streamable-PathLike", Print(cx)); +} + // Tests printing user-defined types that have a PrintTo() function. TEST(PrintPrintableTypeTest, InUserNamespace) { EXPECT_EQ("PrintableViaPrintTo: 0", @@ -1200,13 +1213,13 @@ TEST(PrintReferenceTest, PrintsAddressAndValue) { // reference. TEST(PrintReferenceTest, HandlesFunctionPointer) { void (*fp)(int n) = &MyFunction; - const string fp_pointer_string = + const std::string fp_pointer_string = PrintPointer(reinterpret_cast(&fp)); // We cannot directly cast &MyFunction to const void* because the // standard disallows casting between pointers to functions and // pointers to objects, and some compilers (e.g. GCC 3.4) enforce // this limitation. - const string fp_string = PrintPointer(reinterpret_cast( + const std::string fp_string = PrintPointer(reinterpret_cast( reinterpret_cast(fp))); EXPECT_EQ("@" + fp_pointer_string + " " + fp_string, PrintByRef(fp)); @@ -1264,7 +1277,7 @@ TEST(FormatForComparisonFailureMessageTest, FormatsNonCharArrayAsPointer) { } // Tests formatting a char pointer when it's compared with another pointer. -// In this case we want to print it as a raw pointer, as the comparision is by +// In this case we want to print it as a raw pointer, as the comparison is by // pointer. // char pointer vs pointer @@ -1489,6 +1502,78 @@ TEST(PrintToStringTest, WorksForCharArrayWithEmbeddedNul) { EXPECT_PRINT_TO_STRING_(mutable_str_with_nul, "\"hello\\0 world\""); } + TEST(PrintToStringTest, ContainsNonLatin) { + // Sanity test with valid UTF-8. Prints both in hex and as text. + std::string non_ascii_str = ::std::string("오전 4:30"); + EXPECT_PRINT_TO_STRING_(non_ascii_str, + "\"\\xEC\\x98\\xA4\\xEC\\xA0\\x84 4:30\"\n" + " As Text: \"오전 4:30\""); + non_ascii_str = ::std::string("From ä — ẑ"); + EXPECT_PRINT_TO_STRING_(non_ascii_str, + "\"From \\xC3\\xA4 \\xE2\\x80\\x94 \\xE1\\xBA\\x91\"" + "\n As Text: \"From ä — ẑ\""); +} + +TEST(IsValidUTF8Test, IllFormedUTF8) { + // The following test strings are ill-formed UTF-8 and are printed + // as hex only (or ASCII, in case of ASCII bytes) because IsValidUTF8() is + // expected to fail, thus output does not contain "As Text:". + + static const char *const kTestdata[][2] = { + // 2-byte lead byte followed by a single-byte character. + {"\xC3\x74", "\"\\xC3t\""}, + // Valid 2-byte character followed by an orphan trail byte. + {"\xC3\x84\xA4", "\"\\xC3\\x84\\xA4\""}, + // Lead byte without trail byte. + {"abc\xC3", "\"abc\\xC3\""}, + // 3-byte lead byte, single-byte character, orphan trail byte. + {"x\xE2\x70\x94", "\"x\\xE2p\\x94\""}, + // Truncated 3-byte character. + {"\xE2\x80", "\"\\xE2\\x80\""}, + // Truncated 3-byte character followed by valid 2-byte char. + {"\xE2\x80\xC3\x84", "\"\\xE2\\x80\\xC3\\x84\""}, + // Truncated 3-byte character followed by a single-byte character. + {"\xE2\x80\x7A", "\"\\xE2\\x80z\""}, + // 3-byte lead byte followed by valid 3-byte character. + {"\xE2\xE2\x80\x94", "\"\\xE2\\xE2\\x80\\x94\""}, + // 4-byte lead byte followed by valid 3-byte character. + {"\xF0\xE2\x80\x94", "\"\\xF0\\xE2\\x80\\x94\""}, + // Truncated 4-byte character. + {"\xF0\xE2\x80", "\"\\xF0\\xE2\\x80\""}, + // Invalid UTF-8 byte sequences embedded in other chars. + {"abc\xE2\x80\x94\xC3\x74xyc", "\"abc\\xE2\\x80\\x94\\xC3txyc\""}, + {"abc\xC3\x84\xE2\x80\xC3\x84xyz", + "\"abc\\xC3\\x84\\xE2\\x80\\xC3\\x84xyz\""}, + // Non-shortest UTF-8 byte sequences are also ill-formed. + // The classics: xC0, xC1 lead byte. + {"\xC0\x80", "\"\\xC0\\x80\""}, + {"\xC1\x81", "\"\\xC1\\x81\""}, + // Non-shortest sequences. + {"\xE0\x80\x80", "\"\\xE0\\x80\\x80\""}, + {"\xf0\x80\x80\x80", "\"\\xF0\\x80\\x80\\x80\""}, + // Last valid code point before surrogate range, should be printed as text, + // too. + {"\xED\x9F\xBF", "\"\\xED\\x9F\\xBF\"\n As Text: \"퟿\""}, + // Start of surrogate lead. Surrogates are not printed as text. + {"\xED\xA0\x80", "\"\\xED\\xA0\\x80\""}, + // Last non-private surrogate lead. + {"\xED\xAD\xBF", "\"\\xED\\xAD\\xBF\""}, + // First private-use surrogate lead. + {"\xED\xAE\x80", "\"\\xED\\xAE\\x80\""}, + // Last private-use surrogate lead. + {"\xED\xAF\xBF", "\"\\xED\\xAF\\xBF\""}, + // Mid-point of surrogate trail. + {"\xED\xB3\xBF", "\"\\xED\\xB3\\xBF\""}, + // First valid code point after surrogate range, should be printed as text, + // too. + {"\xEE\x80\x80", "\"\\xEE\\x80\\x80\"\n As Text: \"\""} + }; + + for (int i = 0; i < int(sizeof(kTestdata)/sizeof(kTestdata[0])); ++i) { + EXPECT_PRINT_TO_STRING_(kTestdata[i][0], kTestdata[i][1]); + } +} + #undef EXPECT_PRINT_TO_STRING_ TEST(UniversalTersePrintTest, WorksForNonReference) { @@ -1538,12 +1623,12 @@ TEST(UniversalPrintTest, WorksForCString) { const char* s1 = "abc"; ::std::stringstream ss1; UniversalPrint(s1, &ss1); - EXPECT_EQ(PrintPointer(s1) + " pointing to \"abc\"", string(ss1.str())); + EXPECT_EQ(PrintPointer(s1) + " pointing to \"abc\"", std::string(ss1.str())); char* s2 = const_cast(s1); ::std::stringstream ss2; UniversalPrint(s2, &ss2); - EXPECT_EQ(PrintPointer(s2) + " pointing to \"abc\"", string(ss2.str())); + EXPECT_EQ(PrintPointer(s2) + " pointing to \"abc\"", std::string(ss2.str())); const char* s3 = NULL; ::std::stringstream ss3; @@ -1630,6 +1715,17 @@ TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsTersely) { #endif // GTEST_HAS_STD_TUPLE_ +#if GTEST_HAS_ABSL + +TEST(PrintOptionalTest, Basic) { + absl::optional value; + EXPECT_EQ("(nullopt)", PrintToString(value)); + value = {7}; + EXPECT_EQ("(7)", PrintToString(value)); + EXPECT_EQ("(1.1)", PrintToString(absl::optional{1.1})); + EXPECT_EQ("(\"A\")", PrintToString(absl::optional{"A"})); +} +#endif // GTEST_HAS_ABSL + } // namespace gtest_printers_test } // namespace testing - diff --git a/test/gtest-1.8.0/test/gtest-typed-test2_test.cc b/test/gtest-1.8.0/test/gtest-typed-test2_test.cc index c284700b02..ad77c65c37 100644 --- a/test/gtest-1.8.0/test/gtest-typed-test2_test.cc +++ b/test/gtest-1.8.0/test/gtest-typed-test2_test.cc @@ -31,7 +31,7 @@ #include -#include "test/gtest-typed-test_test.h" +#include "gtest-typed-test_test.h" #include "gtest/gtest.h" #if GTEST_HAS_TYPED_TEST_P diff --git a/test/gtest-1.8.0/test/gtest-typed-test_test.cc b/test/gtest-1.8.0/test/gtest-typed-test_test.cc index 93628ba080..5e1b7b271e 100644 --- a/test/gtest-1.8.0/test/gtest-typed-test_test.cc +++ b/test/gtest-1.8.0/test/gtest-typed-test_test.cc @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) -#include "test/gtest-typed-test_test.h" +#include "gtest-typed-test_test.h" #include #include diff --git a/test/gtest-1.8.0/test/gtest-unittest-api_test.cc b/test/gtest-1.8.0/test/gtest-unittest-api_test.cc index b1f51688af..1ebd431ec2 100644 --- a/test/gtest-1.8.0/test/gtest-unittest-api_test.cc +++ b/test/gtest-1.8.0/test/gtest-unittest-api_test.cc @@ -28,7 +28,7 @@ // // Author: vladl@google.com (Vlad Losev) // -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) // // This file contains tests verifying correctness of data provided via // UnitTest's public methods. diff --git a/test/gtest-1.8.0/test/gtest_all_test.cc b/test/gtest-1.8.0/test/gtest_all_test.cc index 955aa62828..e6c1b01851 100644 --- a/test/gtest-1.8.0/test/gtest_all_test.cc +++ b/test/gtest-1.8.0/test/gtest_all_test.cc @@ -29,19 +29,19 @@ // // Author: wan@google.com (Zhanyong Wan) // -// Tests for Google C++ Testing Framework (Google Test) +// Tests for Google C++ Testing and Mocking Framework (Google Test) // // Sometimes it's desirable to build most of Google Test's own tests // by compiling a single file. This file serves this purpose. -#include "test/gtest-filepath_test.cc" -#include "test/gtest-linked_ptr_test.cc" -#include "test/gtest-message_test.cc" -#include "test/gtest-options_test.cc" -#include "test/gtest-port_test.cc" -#include "test/gtest_pred_impl_unittest.cc" -#include "test/gtest_prod_test.cc" -#include "test/gtest-test-part_test.cc" -#include "test/gtest-typed-test_test.cc" -#include "test/gtest-typed-test2_test.cc" -#include "test/gtest_unittest.cc" -#include "test/production.cc" +#include "gtest-filepath_test.cc" +#include "gtest-linked_ptr_test.cc" +#include "gtest-message_test.cc" +#include "gtest-options_test.cc" +#include "gtest-port_test.cc" +#include "gtest_pred_impl_unittest.cc" +#include "gtest_prod_test.cc" +#include "gtest-test-part_test.cc" +#include "gtest-typed-test_test.cc" +#include "gtest-typed-test2_test.cc" +#include "gtest_unittest.cc" +#include "production.cc" diff --git a/test/gtest-1.8.0/test/gtest_assert_by_exception_test.cc b/test/gtest-1.8.0/test/gtest_assert_by_exception_test.cc new file mode 100644 index 0000000000..2f0e34af4e --- /dev/null +++ b/test/gtest-1.8.0/test/gtest_assert_by_exception_test.cc @@ -0,0 +1,119 @@ +// Copyright 2009, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) + +// Tests Google Test's assert-by-exception mode with exceptions enabled. + +#include "gtest/gtest.h" + +#include +#include +#include +#include + +class ThrowListener : public testing::EmptyTestEventListener { + void OnTestPartResult(const testing::TestPartResult& result) override { + if (result.type() == testing::TestPartResult::kFatalFailure) { + throw testing::AssertionException(result); + } + } +}; + +// Prints the given failure message and exits the program with +// non-zero. We use this instead of a Google Test assertion to +// indicate a failure, as the latter is been tested and cannot be +// relied on. +void Fail(const char* msg) { + printf("FAILURE: %s\n", msg); + fflush(stdout); + exit(1); +} + +static void AssertFalse() { + ASSERT_EQ(2, 3) << "Expected failure"; +} + +// Tests that an assertion failure throws a subclass of +// std::runtime_error. +TEST(Test, Test) { + // A successful assertion shouldn't throw. + try { + EXPECT_EQ(3, 3); + } catch(...) { + Fail("A successful assertion wrongfully threw."); + } + + // A successful assertion shouldn't throw. + try { + EXPECT_EQ(3, 4); + } catch(...) { + Fail("A failed non-fatal assertion wrongfully threw."); + } + + // A failed assertion should throw. + try { + AssertFalse(); + } catch(const testing::AssertionException& e) { + if (strstr(e.what(), "Expected failure") != NULL) + throw; + + printf("%s", + "A failed assertion did throw an exception of the right type, " + "but the message is incorrect. Instead of containing \"Expected " + "failure\", it is:\n"); + Fail(e.what()); + } catch(...) { + Fail("A failed assertion threw the wrong type of exception."); + } + Fail("A failed assertion should've thrown but didn't."); +} + +int kTestForContinuingTest = 0; + +TEST(Test, Test2) { + // FIXME(sokolov): how to force Test2 to be after Test? + kTestForContinuingTest = 1; +} + +int main(int argc, char** argv) { + testing::InitGoogleTest(&argc, argv); + testing::UnitTest::GetInstance()->listeners().Append(new ThrowListener); + + int result = RUN_ALL_TESTS(); + if (result == 0) { + printf("RUN_ALL_TESTS returned %d\n", result); + Fail("Expected failure instead."); + } + + if (kTestForContinuingTest == 0) { + Fail("Should have continued with other tests, but did not."); + } + return 0; +} diff --git a/test/gtest-1.8.0/test/gtest_break_on_failure_unittest.py b/test/gtest-1.8.0/test/gtest_break_on_failure_unittest.py index 78f3e0f53b..16e19dbc39 100644 --- a/test/gtest-1.8.0/test/gtest_break_on_failure_unittest.py +++ b/test/gtest-1.8.0/test/gtest_break_on_failure_unittest.py @@ -40,10 +40,8 @@ Google Test) with different environments and command line flags. __author__ = 'wan@google.com (Zhanyong Wan)' -import gtest_test_utils import os -import sys - +import gtest_test_utils # Constants. diff --git a/test/gtest-1.8.0/test/gtest_break_on_failure_unittest_.cc b/test/gtest-1.8.0/test/gtest_break_on_failure_unittest_.cc index dd07478c07..1231ec2804 100644 --- a/test/gtest-1.8.0/test/gtest_break_on_failure_unittest_.cc +++ b/test/gtest-1.8.0/test/gtest_break_on_failure_unittest_.cc @@ -80,8 +80,7 @@ int main(int argc, char **argv) { SetUnhandledExceptionFilter(ExitWithExceptionCode); # endif -#endif - +#endif // GTEST_OS_WINDOWS testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/test/gtest-1.8.0/test/gtest_catch_exceptions_test.py b/test/gtest-1.8.0/test/gtest_catch_exceptions_test.py index e6fc22fd1f..760f914f8a 100644 --- a/test/gtest-1.8.0/test/gtest_catch_exceptions_test.py +++ b/test/gtest-1.8.0/test/gtest_catch_exceptions_test.py @@ -37,8 +37,6 @@ Google Test) and verifies their output. __author__ = 'vladl@google.com (Vlad Losev)' -import os - import gtest_test_utils # Constants. diff --git a/test/gtest-1.8.0/test/gtest_catch_exceptions_test_.cc b/test/gtest-1.8.0/test/gtest_catch_exceptions_test_.cc index d0fc82c998..c6d953c04a 100644 --- a/test/gtest-1.8.0/test/gtest_catch_exceptions_test_.cc +++ b/test/gtest-1.8.0/test/gtest_catch_exceptions_test_.cc @@ -138,7 +138,7 @@ TEST_F(CxxExceptionInConstructorTest, ThrowsExceptionInConstructor) { } // Exceptions in destructors are not supported in C++11. -#if !defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L +#if !GTEST_LANG_CXX11 class CxxExceptionInDestructorTest : public Test { public: static void TearDownTestCase() { diff --git a/test/gtest-1.8.0/test/gtest_color_test.py b/test/gtest-1.8.0/test/gtest_color_test.py index d02a53ed85..49b8ed2d02 100644 --- a/test/gtest-1.8.0/test/gtest_color_test.py +++ b/test/gtest-1.8.0/test/gtest_color_test.py @@ -36,8 +36,7 @@ __author__ = 'wan@google.com (Zhanyong Wan)' import os import gtest_test_utils - -IS_WINDOWS = os.name = 'nt' +IS_WINDOWS = os.name == 'nt' COLOR_ENV_VAR = 'GTEST_COLOR' COLOR_FLAG = 'gtest_color' diff --git a/test/gtest-1.8.0/test/gtest_color_test_.cc b/test/gtest-1.8.0/test/gtest_color_test_.cc index f61ebb89b8..f9a21e2d56 100644 --- a/test/gtest-1.8.0/test/gtest_color_test_.cc +++ b/test/gtest-1.8.0/test/gtest_color_test_.cc @@ -36,15 +36,7 @@ #include #include "gtest/gtest.h" - -// Indicates that this translation unit is part of Google Test's -// implementation. It must come before gtest-internal-inl.h is -// included, or there will be a compiler error. This trick is to -// prevent a user from accidentally including gtest-internal-inl.h in -// his code. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ using testing::internal::ShouldUseColor; diff --git a/test/gtest-1.8.0/test/gtest_env_var_test.py b/test/gtest-1.8.0/test/gtest_env_var_test.py index 424075cfa3..beb2a8b00b 100644 --- a/test/gtest-1.8.0/test/gtest_env_var_test.py +++ b/test/gtest-1.8.0/test/gtest_env_var_test.py @@ -47,8 +47,8 @@ environ = os.environ.copy() def AssertEq(expected, actual): if expected != actual: - print('Expected: %s' % (expected,)) - print(' Actual: %s' % (actual,)) + print 'Expected: %s' % (expected,) + print ' Actual: %s' % (actual,) raise AssertionError @@ -81,13 +81,14 @@ def TestFlag(flag, test_val, default_val): class GTestEnvVarTest(gtest_test_utils.TestCase): + def testEnvVarAffectsFlag(self): """Tests that environment variable should affect the corresponding flag.""" TestFlag('break_on_failure', '1', '0') TestFlag('color', 'yes', 'auto') TestFlag('filter', 'FooTest.Bar', '*') - SetEnvVar('XML_OUTPUT_FILE', None) # For 'output' test + SetEnvVar('XML_OUTPUT_FILE', None) # For 'output' test TestFlag('output', 'xml:tmp/foo.xml', '') TestFlag('print_time', '0', '1') TestFlag('repeat', '999', '1') @@ -99,6 +100,7 @@ class GTestEnvVarTest(gtest_test_utils.TestCase): TestFlag('death_test_use_fork', '1', '0') TestFlag('stack_trace_depth', '0', '100') + def testXmlOutputFile(self): """Tests that $XML_OUTPUT_FILE affects the output flag.""" @@ -107,7 +109,7 @@ class GTestEnvVarTest(gtest_test_utils.TestCase): AssertEq('xml:tmp/bar.xml', GetFlag('output')) def testXmlOutputFileOverride(self): - """Tests that $XML_OUTPUT_FILE is overridden by $GTEST_OUTPUT""" + """Tests that $XML_OUTPUT_FILE is overridden by $GTEST_OUTPUT.""" SetEnvVar('GTEST_OUTPUT', 'xml:tmp/foo.xml') SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml') diff --git a/test/gtest-1.8.0/test/gtest_env_var_test_.cc b/test/gtest-1.8.0/test/gtest_env_var_test_.cc index 539afc9683..9b668dc07d 100644 --- a/test/gtest-1.8.0/test/gtest_env_var_test_.cc +++ b/test/gtest-1.8.0/test/gtest_env_var_test_.cc @@ -36,9 +36,7 @@ #include -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ using ::std::cout; diff --git a/test/gtest-1.8.0/test/gtest_environment_test.cc b/test/gtest-1.8.0/test/gtest_environment_test.cc index 3cff19e70e..1d6dc12b2d 100644 --- a/test/gtest-1.8.0/test/gtest_environment_test.cc +++ b/test/gtest-1.8.0/test/gtest_environment_test.cc @@ -34,10 +34,7 @@ #include #include #include "gtest/gtest.h" - -#define GTEST_IMPLEMENTATION_ 1 // Required for the next #include. #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ namespace testing { GTEST_DECLARE_string_(filter); diff --git a/test/gtest-1.8.0/test/gtest_filter_unittest.py b/test/gtest-1.8.0/test/gtest_filter_unittest.py index ec0b151b11..92cc77c851 100644 --- a/test/gtest-1.8.0/test/gtest_filter_unittest.py +++ b/test/gtest-1.8.0/test/gtest_filter_unittest.py @@ -44,12 +44,8 @@ __author__ = 'wan@google.com (Zhanyong Wan)' import os import re -try: - from sets import Set as set # For Python 2.3 compatibility -except ImportError: - pass +import sets import sys - import gtest_test_utils # Constants. @@ -59,10 +55,12 @@ import gtest_test_utils # script in a subprocess to print whether the variable is STILL in # os.environ. We then use 'eval' to parse the child's output so that an # exception is thrown if the input is anything other than 'True' nor 'False'. -os.environ['EMPTY_VAR'] = '' -child = gtest_test_utils.Subprocess( - [sys.executable, '-c', 'import os; print(\'EMPTY_VAR\' in os.environ)']) -CAN_PASS_EMPTY_ENV = eval(child.output) +CAN_PASS_EMPTY_ENV = False +if sys.executable: + os.environ['EMPTY_VAR'] = '' + child = gtest_test_utils.Subprocess( + [sys.executable, '-c', 'import os; print \'EMPTY_VAR\' in os.environ']) + CAN_PASS_EMPTY_ENV = eval(child.output) # Check if this platform can unset environment variables in child processes. @@ -71,11 +69,14 @@ CAN_PASS_EMPTY_ENV = eval(child.output) # is NO LONGER in os.environ. # We use 'eval' to parse the child's output so that an exception # is thrown if the input is neither 'True' nor 'False'. -os.environ['UNSET_VAR'] = 'X' -del os.environ['UNSET_VAR'] -child = gtest_test_utils.Subprocess( - [sys.executable, '-c', 'import os; print(\'UNSET_VAR\' not in os.environ)']) -CAN_UNSET_ENV = eval(child.output) +CAN_UNSET_ENV = False +if sys.executable: + os.environ['UNSET_VAR'] = 'X' + del os.environ['UNSET_VAR'] + child = gtest_test_utils.Subprocess( + [sys.executable, '-c', 'import os; print \'UNSET_VAR\' not in os.environ' + ]) + CAN_UNSET_ENV = eval(child.output) # Checks if we should test with an empty filter. This doesn't @@ -97,7 +98,7 @@ SHARD_STATUS_FILE_ENV_VAR = 'GTEST_SHARD_STATUS_FILE' FILTER_FLAG = 'gtest_filter' # The command line flag for including disabled tests. -ALSO_RUN_DISABED_TESTS_FLAG = 'gtest_also_run_disabled_tests' +ALSO_RUN_DISABLED_TESTS_FLAG = 'gtest_also_run_disabled_tests' # Command to run the gtest_filter_unittest_ program. COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_filter_unittest_') @@ -246,14 +247,14 @@ class GTestFilterUnitTest(gtest_test_utils.TestCase): for slice_var in list_of_sets: full_partition.extend(slice_var) self.assertEqual(len(set_var), len(full_partition)) - self.assertEqual(set(set_var), set(full_partition)) + self.assertEqual(sets.Set(set_var), sets.Set(full_partition)) def AdjustForParameterizedTests(self, tests_to_run): """Adjust tests_to_run in case value parameterized tests are disabled.""" global param_tests_present if not param_tests_present: - return list(set(tests_to_run) - set(PARAM_TESTS)) + return list(sets.Set(tests_to_run) - sets.Set(PARAM_TESTS)) else: return tests_to_run @@ -294,6 +295,7 @@ class GTestFilterUnitTest(gtest_test_utils.TestCase): Runs all shards of gtest_filter_unittest_ with the given filter, and verifies that the right set of tests were run. The union of tests run on each shard should be identical to tests_to_run, without duplicates. + If check_exit_0, . Args: gtest_filter: A filter to apply to the tests. @@ -339,7 +341,7 @@ class GTestFilterUnitTest(gtest_test_utils.TestCase): tests_to_run = self.AdjustForParameterizedTests(tests_to_run) # Construct the command line. - args = ['--%s' % ALSO_RUN_DISABED_TESTS_FLAG] + args = ['--%s' % ALSO_RUN_DISABLED_TESTS_FLAG] if gtest_filter is not None: args.append('--%s=%s' % (FILTER_FLAG, gtest_filter)) diff --git a/test/gtest-1.8.0/test/gtest_filter_unittest_.cc b/test/gtest-1.8.0/test/gtest_filter_unittest_.cc index 77deffc38f..e74a7a386e 100644 --- a/test/gtest-1.8.0/test/gtest_filter_unittest_.cc +++ b/test/gtest-1.8.0/test/gtest_filter_unittest_.cc @@ -117,7 +117,6 @@ TEST(DISABLED_FoobarbazTest, TestA) { FAIL() << "Expected failure."; } -#if GTEST_HAS_PARAM_TEST class ParamTest : public testing::TestWithParam { }; @@ -129,7 +128,6 @@ TEST_P(ParamTest, TestY) { INSTANTIATE_TEST_CASE_P(SeqP, ParamTest, testing::Values(1, 2)); INSTANTIATE_TEST_CASE_P(SeqQ, ParamTest, testing::Values(5, 6)); -#endif // GTEST_HAS_PARAM_TEST } // namespace diff --git a/test/gtest-1.8.0/test/gtest_help_test.py b/test/gtest-1.8.0/test/gtest_help_test.py index 093c838d9e..79ffbe4e9b 100644 --- a/test/gtest-1.8.0/test/gtest_help_test.py +++ b/test/gtest-1.8.0/test/gtest_help_test.py @@ -29,7 +29,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -"""Tests the --help flag of Google C++ Testing Framework. +"""Tests the --help flag of Google C++ Testing and Mocking Framework. SYNOPSIS gtest_help_test.py --build_dir=BUILD/DIR diff --git a/test/gtest-1.8.0/test/gtest_json_outfiles_test.py b/test/gtest-1.8.0/test/gtest_json_outfiles_test.py new file mode 100644 index 0000000000..46010d8990 --- /dev/null +++ b/test/gtest-1.8.0/test/gtest_json_outfiles_test.py @@ -0,0 +1,162 @@ +#!/usr/bin/env python +# Copyright 2018, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +"""Unit test for the gtest_json_output module.""" + +import json +import os +import gtest_json_test_utils +import gtest_test_utils + +GTEST_OUTPUT_SUBDIR = 'json_outfiles' +GTEST_OUTPUT_1_TEST = 'gtest_xml_outfile1_test_' +GTEST_OUTPUT_2_TEST = 'gtest_xml_outfile2_test_' + +EXPECTED_1 = { + u'tests': 1, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'timestamp': u'*', + u'name': u'AllTests', + u'testsuites': [{ + u'name': u'PropertyOne', + u'tests': 1, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'testsuite': [{ + u'name': u'TestSomeProperties', + u'status': u'RUN', + u'time': u'*', + u'classname': u'PropertyOne', + u'SetUpProp': u'1', + u'TestSomeProperty': u'1', + u'TearDownProp': u'1', + }], + }], +} + +EXPECTED_2 = { + u'tests': 1, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'timestamp': u'*', + u'name': u'AllTests', + u'testsuites': [{ + u'name': u'PropertyTwo', + u'tests': 1, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'testsuite': [{ + u'name': u'TestSomeProperties', + u'status': u'RUN', + u'time': u'*', + u'classname': u'PropertyTwo', + u'SetUpProp': u'2', + u'TestSomeProperty': u'2', + u'TearDownProp': u'2', + }], + }], +} + + +class GTestJsonOutFilesTest(gtest_test_utils.TestCase): + """Unit test for Google Test's JSON output functionality.""" + + def setUp(self): + # We want the trailing '/' that the last "" provides in os.path.join, for + # telling Google Test to create an output directory instead of a single file + # for xml output. + self.output_dir_ = os.path.join(gtest_test_utils.GetTempDir(), + GTEST_OUTPUT_SUBDIR, '') + self.DeleteFilesAndDir() + + def tearDown(self): + self.DeleteFilesAndDir() + + def DeleteFilesAndDir(self): + try: + os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_1_TEST + '.json')) + except os.error: + pass + try: + os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_2_TEST + '.json')) + except os.error: + pass + try: + os.rmdir(self.output_dir_) + except os.error: + pass + + def testOutfile1(self): + self._TestOutFile(GTEST_OUTPUT_1_TEST, EXPECTED_1) + + def testOutfile2(self): + self._TestOutFile(GTEST_OUTPUT_2_TEST, EXPECTED_2) + + def _TestOutFile(self, test_name, expected): + gtest_prog_path = gtest_test_utils.GetTestExecutablePath(test_name) + command = [gtest_prog_path, '--gtest_output=json:%s' % self.output_dir_] + p = gtest_test_utils.Subprocess(command, + working_dir=gtest_test_utils.GetTempDir()) + self.assert_(p.exited) + self.assertEquals(0, p.exit_code) + + # TODO(wan@google.com): libtool causes the built test binary to be + # named lt-gtest_xml_outfiles_test_ instead of + # gtest_xml_outfiles_test_. To account for this possibility, we + # allow both names in the following code. We should remove this + # hack when Chandler Carruth's libtool replacement tool is ready. + output_file_name1 = test_name + '.json' + output_file1 = os.path.join(self.output_dir_, output_file_name1) + output_file_name2 = 'lt-' + output_file_name1 + output_file2 = os.path.join(self.output_dir_, output_file_name2) + self.assert_(os.path.isfile(output_file1) or os.path.isfile(output_file2), + output_file1) + + if os.path.isfile(output_file1): + with open(output_file1) as f: + actual = json.load(f) + else: + with open(output_file2) as f: + actual = json.load(f) + self.assertEqual(expected, gtest_json_test_utils.normalize(actual)) + + +if __name__ == '__main__': + os.environ['GTEST_STACK_TRACE_DEPTH'] = '0' + gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_json_output_unittest.py b/test/gtest-1.8.0/test/gtest_json_output_unittest.py new file mode 100644 index 0000000000..12047c4fee --- /dev/null +++ b/test/gtest-1.8.0/test/gtest_json_output_unittest.py @@ -0,0 +1,611 @@ +#!/usr/bin/env python +# Copyright 2018, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +"""Unit test for the gtest_json_output module.""" + +import datetime +import errno +import json +import os +import re +import sys + +import gtest_json_test_utils +import gtest_test_utils + +GTEST_FILTER_FLAG = '--gtest_filter' +GTEST_LIST_TESTS_FLAG = '--gtest_list_tests' +GTEST_OUTPUT_FLAG = '--gtest_output' +GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.json' +GTEST_PROGRAM_NAME = 'gtest_xml_output_unittest_' + +SUPPORTS_STACK_TRACES = False + +if SUPPORTS_STACK_TRACES: + STACK_TRACE_TEMPLATE = '\nStack trace:\n*' +else: + STACK_TRACE_TEMPLATE = '' + +EXPECTED_NON_EMPTY = { + u'tests': 23, + u'failures': 4, + u'disabled': 2, + u'errors': 0, + u'timestamp': u'*', + u'time': u'*', + u'ad_hoc_property': u'42', + u'name': u'AllTests', + u'testsuites': [ + { + u'name': u'SuccessfulTest', + u'tests': 1, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'testsuite': [ + { + u'name': u'Succeeds', + u'status': u'RUN', + u'time': u'*', + u'classname': u'SuccessfulTest' + } + ] + }, + { + u'name': u'FailedTest', + u'tests': 1, + u'failures': 1, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'testsuite': [ + { + u'name': u'Fails', + u'status': u'RUN', + u'time': u'*', + u'classname': u'FailedTest', + u'failures': [ + { + u'failure': + u'gtest_xml_output_unittest_.cc:*\n' + u'Expected equality of these values:\n' + u' 1\n 2' + STACK_TRACE_TEMPLATE, + u'type': u'' + } + ] + } + ] + }, + { + u'name': u'DisabledTest', + u'tests': 1, + u'failures': 0, + u'disabled': 1, + u'errors': 0, + u'time': u'*', + u'testsuite': [ + { + u'name': u'DISABLED_test_not_run', + u'status': u'NOTRUN', + u'time': u'*', + u'classname': u'DisabledTest' + } + ] + }, + { + u'name': u'MixedResultTest', + u'tests': 3, + u'failures': 1, + u'disabled': 1, + u'errors': 0, + u'time': u'*', + u'testsuite': [ + { + u'name': u'Succeeds', + u'status': u'RUN', + u'time': u'*', + u'classname': u'MixedResultTest' + }, + { + u'name': u'Fails', + u'status': u'RUN', + u'time': u'*', + u'classname': u'MixedResultTest', + u'failures': [ + { + u'failure': + u'gtest_xml_output_unittest_.cc:*\n' + u'Expected equality of these values:\n' + u' 1\n 2' + STACK_TRACE_TEMPLATE, + u'type': u'' + }, + { + u'failure': + u'gtest_xml_output_unittest_.cc:*\n' + u'Expected equality of these values:\n' + u' 2\n 3' + STACK_TRACE_TEMPLATE, + u'type': u'' + } + ] + }, + { + u'name': u'DISABLED_test', + u'status': u'NOTRUN', + u'time': u'*', + u'classname': u'MixedResultTest' + } + ] + }, + { + u'name': u'XmlQuotingTest', + u'tests': 1, + u'failures': 1, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'testsuite': [ + { + u'name': u'OutputsCData', + u'status': u'RUN', + u'time': u'*', + u'classname': u'XmlQuotingTest', + u'failures': [ + { + u'failure': + u'gtest_xml_output_unittest_.cc:*\n' + u'Failed\nXML output: ' + u'' + + STACK_TRACE_TEMPLATE, + u'type': u'' + } + ] + } + ] + }, + { + u'name': u'InvalidCharactersTest', + u'tests': 1, + u'failures': 1, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'testsuite': [ + { + u'name': u'InvalidCharactersInMessage', + u'status': u'RUN', + u'time': u'*', + u'classname': u'InvalidCharactersTest', + u'failures': [ + { + u'failure': + u'gtest_xml_output_unittest_.cc:*\n' + u'Failed\nInvalid characters in brackets' + u' [\x01\x02]' + STACK_TRACE_TEMPLATE, + u'type': u'' + } + ] + } + ] + }, + { + u'name': u'PropertyRecordingTest', + u'tests': 4, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'SetUpTestCase': u'yes', + u'TearDownTestCase': u'aye', + u'testsuite': [ + { + u'name': u'OneProperty', + u'status': u'RUN', + u'time': u'*', + u'classname': u'PropertyRecordingTest', + u'key_1': u'1' + }, + { + u'name': u'IntValuedProperty', + u'status': u'RUN', + u'time': u'*', + u'classname': u'PropertyRecordingTest', + u'key_int': u'1' + }, + { + u'name': u'ThreeProperties', + u'status': u'RUN', + u'time': u'*', + u'classname': u'PropertyRecordingTest', + u'key_1': u'1', + u'key_2': u'2', + u'key_3': u'3' + }, + { + u'name': u'TwoValuesForOneKeyUsesLastValue', + u'status': u'RUN', + u'time': u'*', + u'classname': u'PropertyRecordingTest', + u'key_1': u'2' + } + ] + }, + { + u'name': u'NoFixtureTest', + u'tests': 3, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'testsuite': [ + { + u'name': u'RecordProperty', + u'status': u'RUN', + u'time': u'*', + u'classname': u'NoFixtureTest', + u'key': u'1' + }, + { + u'name': u'ExternalUtilityThatCallsRecordIntValuedProperty', + u'status': u'RUN', + u'time': u'*', + u'classname': u'NoFixtureTest', + u'key_for_utility_int': u'1' + }, + { + u'name': + u'ExternalUtilityThatCallsRecordStringValuedProperty', + u'status': u'RUN', + u'time': u'*', + u'classname': u'NoFixtureTest', + u'key_for_utility_string': u'1' + } + ] + }, + { + u'name': u'TypedTest/0', + u'tests': 1, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'testsuite': [ + { + u'name': u'HasTypeParamAttribute', + u'type_param': u'int', + u'status': u'RUN', + u'time': u'*', + u'classname': u'TypedTest/0' + } + ] + }, + { + u'name': u'TypedTest/1', + u'tests': 1, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'testsuite': [ + { + u'name': u'HasTypeParamAttribute', + u'type_param': u'long', + u'status': u'RUN', + u'time': u'*', + u'classname': u'TypedTest/1' + } + ] + }, + { + u'name': u'Single/TypeParameterizedTestCase/0', + u'tests': 1, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'testsuite': [ + { + u'name': u'HasTypeParamAttribute', + u'type_param': u'int', + u'status': u'RUN', + u'time': u'*', + u'classname': u'Single/TypeParameterizedTestCase/0' + } + ] + }, + { + u'name': u'Single/TypeParameterizedTestCase/1', + u'tests': 1, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'testsuite': [ + { + u'name': u'HasTypeParamAttribute', + u'type_param': u'long', + u'status': u'RUN', + u'time': u'*', + u'classname': u'Single/TypeParameterizedTestCase/1' + } + ] + }, + { + u'name': u'Single/ValueParamTest', + u'tests': 4, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'testsuite': [ + { + u'name': u'HasValueParamAttribute/0', + u'value_param': u'33', + u'status': u'RUN', + u'time': u'*', + u'classname': u'Single/ValueParamTest' + }, + { + u'name': u'HasValueParamAttribute/1', + u'value_param': u'42', + u'status': u'RUN', + u'time': u'*', + u'classname': u'Single/ValueParamTest' + }, + { + u'name': u'AnotherTestThatHasValueParamAttribute/0', + u'value_param': u'33', + u'status': u'RUN', + u'time': u'*', + u'classname': u'Single/ValueParamTest' + }, + { + u'name': u'AnotherTestThatHasValueParamAttribute/1', + u'value_param': u'42', + u'status': u'RUN', + u'time': u'*', + u'classname': u'Single/ValueParamTest' + } + ] + } + ] +} + +EXPECTED_FILTERED = { + u'tests': 1, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'timestamp': u'*', + u'name': u'AllTests', + u'ad_hoc_property': u'42', + u'testsuites': [{ + u'name': u'SuccessfulTest', + u'tests': 1, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'testsuite': [{ + u'name': u'Succeeds', + u'status': u'RUN', + u'time': u'*', + u'classname': u'SuccessfulTest', + }] + }], +} + +EXPECTED_EMPTY = { + u'tests': 0, + u'failures': 0, + u'disabled': 0, + u'errors': 0, + u'time': u'*', + u'timestamp': u'*', + u'name': u'AllTests', + u'testsuites': [], +} + +GTEST_PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath(GTEST_PROGRAM_NAME) + +SUPPORTS_TYPED_TESTS = 'TypedTest' in gtest_test_utils.Subprocess( + [GTEST_PROGRAM_PATH, GTEST_LIST_TESTS_FLAG], capture_stderr=False).output + + +class GTestJsonOutputUnitTest(gtest_test_utils.TestCase): + """Unit test for Google Test's JSON output functionality. + """ + + # This test currently breaks on platforms that do not support typed and + # type-parameterized tests, so we don't run it under them. + if SUPPORTS_TYPED_TESTS: + + def testNonEmptyJsonOutput(self): + """Verifies JSON output for a Google Test binary with non-empty output. + + Runs a test program that generates a non-empty JSON output, and + tests that the JSON output is expected. + """ + self._TestJsonOutput(GTEST_PROGRAM_NAME, EXPECTED_NON_EMPTY, 1) + + def testEmptyJsonOutput(self): + """Verifies JSON output for a Google Test binary without actual tests. + + Runs a test program that generates an empty JSON output, and + tests that the JSON output is expected. + """ + + self._TestJsonOutput('gtest_no_test_unittest', EXPECTED_EMPTY, 0) + + def testTimestampValue(self): + """Checks whether the timestamp attribute in the JSON output is valid. + + Runs a test program that generates an empty JSON output, and checks if + the timestamp attribute in the testsuites tag is valid. + """ + actual = self._GetJsonOutput('gtest_no_test_unittest', [], 0) + date_time_str = actual['timestamp'] + # datetime.strptime() is only available in Python 2.5+ so we have to + # parse the expected datetime manually. + match = re.match(r'(\d+)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)', date_time_str) + self.assertTrue( + re.match, + 'JSON datettime string %s has incorrect format' % date_time_str) + date_time_from_json = datetime.datetime( + year=int(match.group(1)), month=int(match.group(2)), + day=int(match.group(3)), hour=int(match.group(4)), + minute=int(match.group(5)), second=int(match.group(6))) + + time_delta = abs(datetime.datetime.now() - date_time_from_json) + # timestamp value should be near the current local time + self.assertTrue(time_delta < datetime.timedelta(seconds=600), + 'time_delta is %s' % time_delta) + + def testDefaultOutputFile(self): + """Verifies the default output file name. + + Confirms that Google Test produces an JSON output file with the expected + default name if no name is explicitly specified. + """ + output_file = os.path.join(gtest_test_utils.GetTempDir(), + GTEST_DEFAULT_OUTPUT_FILE) + gtest_prog_path = gtest_test_utils.GetTestExecutablePath( + 'gtest_no_test_unittest') + try: + os.remove(output_file) + except OSError: + e = sys.exc_info()[1] + if e.errno != errno.ENOENT: + raise + + p = gtest_test_utils.Subprocess( + [gtest_prog_path, '%s=json' % GTEST_OUTPUT_FLAG], + working_dir=gtest_test_utils.GetTempDir()) + self.assert_(p.exited) + self.assertEquals(0, p.exit_code) + self.assert_(os.path.isfile(output_file)) + + def testSuppressedJsonOutput(self): + """Verifies that no JSON output is generated. + + Tests that no JSON file is generated if the default JSON listener is + shut down before RUN_ALL_TESTS is invoked. + """ + + json_path = os.path.join(gtest_test_utils.GetTempDir(), + GTEST_PROGRAM_NAME + 'out.json') + if os.path.isfile(json_path): + os.remove(json_path) + + command = [GTEST_PROGRAM_PATH, + '%s=json:%s' % (GTEST_OUTPUT_FLAG, json_path), + '--shut_down_xml'] + p = gtest_test_utils.Subprocess(command) + if p.terminated_by_signal: + # p.signal is available only if p.terminated_by_signal is True. + self.assertFalse( + p.terminated_by_signal, + '%s was killed by signal %d' % (GTEST_PROGRAM_NAME, p.signal)) + else: + self.assert_(p.exited) + self.assertEquals(1, p.exit_code, + "'%s' exited with code %s, which doesn't match " + 'the expected exit code %s.' + % (command, p.exit_code, 1)) + + self.assert_(not os.path.isfile(json_path)) + + def testFilteredTestJsonOutput(self): + """Verifies JSON output when a filter is applied. + + Runs a test program that executes only some tests and verifies that + non-selected tests do not show up in the JSON output. + """ + + self._TestJsonOutput(GTEST_PROGRAM_NAME, EXPECTED_FILTERED, 0, + extra_args=['%s=SuccessfulTest.*' % GTEST_FILTER_FLAG]) + + def _GetJsonOutput(self, gtest_prog_name, extra_args, expected_exit_code): + """Returns the JSON output generated by running the program gtest_prog_name. + + Furthermore, the program's exit code must be expected_exit_code. + + Args: + gtest_prog_name: Google Test binary name. + extra_args: extra arguments to binary invocation. + expected_exit_code: program's exit code. + """ + json_path = os.path.join(gtest_test_utils.GetTempDir(), + gtest_prog_name + 'out.json') + gtest_prog_path = gtest_test_utils.GetTestExecutablePath(gtest_prog_name) + + command = ( + [gtest_prog_path, '%s=json:%s' % (GTEST_OUTPUT_FLAG, json_path)] + + extra_args + ) + p = gtest_test_utils.Subprocess(command) + if p.terminated_by_signal: + self.assert_(False, + '%s was killed by signal %d' % (gtest_prog_name, p.signal)) + else: + self.assert_(p.exited) + self.assertEquals(expected_exit_code, p.exit_code, + "'%s' exited with code %s, which doesn't match " + 'the expected exit code %s.' + % (command, p.exit_code, expected_exit_code)) + with open(json_path) as f: + actual = json.load(f) + return actual + + def _TestJsonOutput(self, gtest_prog_name, expected, + expected_exit_code, extra_args=None): + """Checks the JSON output generated by the Google Test binary. + + Asserts that the JSON document generated by running the program + gtest_prog_name matches expected_json, a string containing another + JSON document. Furthermore, the program's exit code must be + expected_exit_code. + + Args: + gtest_prog_name: Google Test binary name. + expected: expected output. + expected_exit_code: program's exit code. + extra_args: extra arguments to binary invocation. + """ + + actual = self._GetJsonOutput(gtest_prog_name, extra_args or [], + expected_exit_code) + self.assertEqual(expected, gtest_json_test_utils.normalize(actual)) + + +if __name__ == '__main__': + os.environ['GTEST_STACK_TRACE_DEPTH'] = '1' + gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_json_test_utils.py b/test/gtest-1.8.0/test/gtest_json_test_utils.py new file mode 100644 index 0000000000..62bbfc288f --- /dev/null +++ b/test/gtest-1.8.0/test/gtest_json_test_utils.py @@ -0,0 +1,60 @@ +# Copyright 2018, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +"""Unit test utilities for gtest_json_output.""" + +import re + + +def normalize(obj): + """Normalize output object. + + Args: + obj: Google Test's JSON output object to normalize. + + Returns: + Normalized output without any references to transient information that may + change from run to run. + """ + def _normalize(key, value): + if key == 'time': + return re.sub(r'^\d+(\.\d+)?s$', '*', value) + elif key == 'timestamp': + return re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ$', '*', value) + elif key == 'failure': + value = re.sub(r'^.*[/\\](.*:)\d+\n', '\\1*\n', value) + return re.sub(r'Stack trace:\n(.|\n)*', 'Stack trace:\n*', value) + else: + return normalize(value) + if isinstance(obj, dict): + return {k: _normalize(k, v) for k, v in obj.items()} + if isinstance(obj, list): + return [normalize(x) for x in obj] + else: + return obj diff --git a/test/gtest-1.8.0/test/gtest_list_tests_unittest.py b/test/gtest-1.8.0/test/gtest_list_tests_unittest.py index f2d2fd1b1c..ebf1a3c915 100644 --- a/test/gtest-1.8.0/test/gtest_list_tests_unittest.py +++ b/test/gtest-1.8.0/test/gtest_list_tests_unittest.py @@ -39,9 +39,8 @@ Google Test) the command line flags. __author__ = 'phanna@google.com (Patrick Hanna)' -import gtest_test_utils import re - +import gtest_test_utils # Constants. @@ -123,6 +122,7 @@ def Run(args): # The unit test. + class GTestListTestsUnitTest(gtest_test_utils.TestCase): """Tests using the --gtest_list_tests flag to list all tests.""" diff --git a/test/gtest-1.8.0/test/gtest_main_unittest.cc b/test/gtest-1.8.0/test/gtest_main_unittest.cc index ecd9bb876f..c979fce60d 100644 --- a/test/gtest-1.8.0/test/gtest_main_unittest.cc +++ b/test/gtest-1.8.0/test/gtest_main_unittest.cc @@ -41,5 +41,5 @@ TEST(GTestMainTest, ShouldSucceed) { } // namespace -// We are using the main() function defined in src/gtest_main.cc, so -// we don't define it here. +// We are using the main() function defined in gtest_main.cc, so we +// don't define it here. diff --git a/test/gtest-1.8.0/test/gtest_output_test.py b/test/gtest-1.8.0/test/gtest_output_test.py index 06dbee0980..f83d3be679 100644 --- a/test/gtest-1.8.0/test/gtest_output_test.py +++ b/test/gtest-1.8.0/test/gtest_output_test.py @@ -29,7 +29,8 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -"""Tests the text output of Google C++ Testing Framework. +"""Tests the text output of Google C++ Testing and Mocking Framework. + SYNOPSIS gtest_output_test.py --build_dir=BUILD/DIR --gengolden @@ -51,6 +52,7 @@ import gtest_test_utils GENGOLDEN_FLAG = '--gengolden' CATCH_EXCEPTIONS_ENV_VAR_NAME = 'GTEST_CATCH_EXCEPTIONS' +IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux' IS_WINDOWS = os.name == 'nt' # TODO(vladl@google.com): remove the _lin suffix. @@ -99,7 +101,8 @@ def RemoveLocations(test_output): 'FILE_NAME:#: '. """ - return re.sub(r'.*[/\\](.+)(\:\d+|\(\d+\))\: ', r'\1:#: ', test_output) + return re.sub(r'.*[/\\]((gtest_output_test_|gtest).cc)(\:\d+|\(\d+\))\: ', + r'\1:#: ', test_output) def RemoveStackTraceDetails(output): @@ -249,11 +252,12 @@ test_list = GetShellCommandOutput(COMMAND_LIST_TESTS) SUPPORTS_DEATH_TESTS = 'DeathTest' in test_list SUPPORTS_TYPED_TESTS = 'TypedTest' in test_list SUPPORTS_THREADS = 'ExpectFailureWithThreadsTest' in test_list -SUPPORTS_STACK_TRACES = False +SUPPORTS_STACK_TRACES = IS_LINUX CAN_GENERATE_GOLDEN_FILE = (SUPPORTS_DEATH_TESTS and SUPPORTS_TYPED_TESTS and SUPPORTS_THREADS and + SUPPORTS_STACK_TRACES and not IS_WINDOWS) class GTestOutputTest(gtest_test_utils.TestCase): @@ -279,7 +283,7 @@ class GTestOutputTest(gtest_test_utils.TestCase): def testOutput(self): output = GetOutputOfAllCommands() - golden_file = open(GOLDEN_PATH, 'r') + golden_file = open(GOLDEN_PATH, 'rb') # A mis-configured source control system can cause \r appear in EOL # sequences when we read the golden file irrespective of an operating # system used. Therefore, we need to strip those \r's from newlines @@ -330,9 +334,9 @@ if __name__ == '__main__': else: message = ( """Unable to write a golden file when compiled in an environment -that does not support all the required features (death tests, typed tests, -and multiple threads). Please generate the golden file using a binary built -with those features enabled.""") +that does not support all the required features (death tests, +typed tests, stack traces, and multiple threads). +Please build this test and generate the golden file using Blaze on Linux.""") sys.stderr.write(message) sys.exit(1) diff --git a/test/gtest-1.8.0/test/gtest_output_test_.cc b/test/gtest-1.8.0/test/gtest_output_test_.cc index 1070a9f26f..9ae9dc6035 100644 --- a/test/gtest-1.8.0/test/gtest_output_test_.cc +++ b/test/gtest-1.8.0/test/gtest_output_test_.cc @@ -37,15 +37,7 @@ #include "gtest/gtest-spi.h" #include "gtest/gtest.h" - -// Indicates that this translation unit is part of Google Test's -// implementation. It must come before gtest-internal-inl.h is -// included, or there will be a compiler error. This trick is to -// prevent a user from accidentally including gtest-internal-inl.h in -// his code. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ #include @@ -176,6 +168,16 @@ void SubWithTrace(int n) { SubWithoutTrace(n); } +TEST(SCOPED_TRACETest, AcceptedValues) { + SCOPED_TRACE("literal string"); + SCOPED_TRACE(std::string("std::string")); + SCOPED_TRACE(1337); // streamable type + const char* null_value = NULL; + SCOPED_TRACE(null_value); + + ADD_FAILURE() << "Just checking that all these values work fine."; +} + // Tests that SCOPED_TRACE() obeys lexical scopes. TEST(SCOPED_TRACETest, ObeysScopes) { printf("(expected to fail)\n"); @@ -323,6 +325,13 @@ TEST(SCOPED_TRACETest, WorksConcurrently) { } #endif // GTEST_IS_THREADSAFE +// Tests basic functionality of the ScopedTrace utility (most of its features +// are already tested in SCOPED_TRACETest). +TEST(ScopedTraceTest, WithExplicitFileAndLine) { + testing::ScopedTrace trace("explicit_file.cc", 123, "expected trace message"); + ADD_FAILURE() << "Check that the trace is attached to a particular location."; +} + TEST(DisabledTestsWarningTest, DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning) { // This test body is intentionally empty. Its sole purpose is for @@ -757,8 +766,6 @@ TEST(ExpectFatalFailureTest, FailsWhenStatementThrows) { // This #ifdef block tests the output of value-parameterized tests. -#if GTEST_HAS_PARAM_TEST - std::string ParamNameFunc(const testing::TestParamInfo& info) { return info.param; } @@ -779,8 +786,6 @@ INSTANTIATE_TEST_CASE_P(PrintingStrings, testing::Values(std::string("a")), ParamNameFunc); -#endif // GTEST_HAS_PARAM_TEST - // This #ifdef block tests the output of typed tests. #if GTEST_HAS_TYPED_TEST diff --git a/test/gtest-1.8.0/test/gtest_output_test_golden_lin.txt b/test/gtest-1.8.0/test/gtest_output_test_golden_lin.txt index 2223d560e2..cbcb720bae 100644 --- a/test/gtest-1.8.0/test/gtest_output_test_golden_lin.txt +++ b/test/gtest-1.8.0/test/gtest_output_test_golden_lin.txt @@ -5,9 +5,10 @@ Value of: false Actual: false Expected: true gtest_output_test_.cc:#: Failure - Expected: 2 -To be equal to: 3 -[==========] Running 66 tests from 29 test cases. +Expected equality of these values: + 2 + 3 +[==========] Running 68 tests from 30 test cases. [----------] Global test environment set-up. FooEnvironment::SetUp() called. BarEnvironment::SetUp() called. @@ -34,21 +35,24 @@ BarEnvironment::SetUp() called. [----------] 2 tests from NonfatalFailureTest [ RUN ] NonfatalFailureTest.EscapesStringOperands gtest_output_test_.cc:#: Failure - Expected: kGoldenString - Which is: "\"Line" -To be equal to: actual - Which is: "actual \"string\"" +Expected equality of these values: + kGoldenString + Which is: "\"Line" + actual + Which is: "actual \"string\"" gtest_output_test_.cc:#: Failure - Expected: golden - Which is: "\"Line" -To be equal to: actual - Which is: "actual \"string\"" +Expected equality of these values: + golden + Which is: "\"Line" + actual + Which is: "actual \"string\"" [ FAILED ] NonfatalFailureTest.EscapesStringOperands [ RUN ] NonfatalFailureTest.DiffForLongStrings gtest_output_test_.cc:#: Failure - Expected: golden_str - Which is: "\"Line\0 1\"\nLine 2" -To be equal to: "Line 2" +Expected equality of these values: + golden_str + Which is: "\"Line\0 1\"\nLine 2" + "Line 2" With diff: @@ -1,2 @@ -\"Line\0 1\" @@ -59,16 +63,18 @@ With diff: [ RUN ] FatalFailureTest.FatalFailureInSubroutine (expecting a failure that x should be 1) gtest_output_test_.cc:#: Failure - Expected: 1 -To be equal to: x - Which is: 2 +Expected equality of these values: + 1 + x + Which is: 2 [ FAILED ] FatalFailureTest.FatalFailureInSubroutine [ RUN ] FatalFailureTest.FatalFailureInNestedSubroutine (expecting a failure that x should be 1) gtest_output_test_.cc:#: Failure - Expected: 1 -To be equal to: x - Which is: 2 +Expected equality of these values: + 1 + x + Which is: 2 [ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine [ RUN ] FatalFailureTest.NonfatalFailureInSubroutine (expecting a failure on false) @@ -89,7 +95,17 @@ i == 3 gtest_output_test_.cc:#: Failure Expected: (3) >= (a[i]), actual: 3 vs 6 [ FAILED ] LoggingTest.InterleavingLoggingAndAssertions -[----------] 6 tests from SCOPED_TRACETest +[----------] 7 tests from SCOPED_TRACETest +[ RUN ] SCOPED_TRACETest.AcceptedValues +gtest_output_test_.cc:#: Failure +Failed +Just checking that all these values work fine. +Google Test trace: +gtest_output_test_.cc:#: (null) +gtest_output_test_.cc:#: 1337 +gtest_output_test_.cc:#: std::string +gtest_output_test_.cc:#: literal string +[ FAILED ] SCOPED_TRACETest.AcceptedValues [ RUN ] SCOPED_TRACETest.ObeysScopes (expected to fail) gtest_output_test_.cc:#: Failure @@ -107,39 +123,44 @@ This failure is expected, and shouldn't have a trace. [ RUN ] SCOPED_TRACETest.WorksInLoop (expected to fail) gtest_output_test_.cc:#: Failure - Expected: 2 -To be equal to: n - Which is: 1 +Expected equality of these values: + 2 + n + Which is: 1 Google Test trace: gtest_output_test_.cc:#: i = 1 gtest_output_test_.cc:#: Failure - Expected: 1 -To be equal to: n - Which is: 2 +Expected equality of these values: + 1 + n + Which is: 2 Google Test trace: gtest_output_test_.cc:#: i = 2 [ FAILED ] SCOPED_TRACETest.WorksInLoop [ RUN ] SCOPED_TRACETest.WorksInSubroutine (expected to fail) gtest_output_test_.cc:#: Failure - Expected: 2 -To be equal to: n - Which is: 1 +Expected equality of these values: + 2 + n + Which is: 1 Google Test trace: gtest_output_test_.cc:#: n = 1 gtest_output_test_.cc:#: Failure - Expected: 1 -To be equal to: n - Which is: 2 +Expected equality of these values: + 1 + n + Which is: 2 Google Test trace: gtest_output_test_.cc:#: n = 2 [ FAILED ] SCOPED_TRACETest.WorksInSubroutine [ RUN ] SCOPED_TRACETest.CanBeNested (expected to fail) gtest_output_test_.cc:#: Failure - Expected: 1 -To be equal to: n - Which is: 2 +Expected equality of these values: + 1 + n + Which is: 2 Google Test trace: gtest_output_test_.cc:#: n = 2 gtest_output_test_.cc:#: @@ -201,6 +222,14 @@ gtest_output_test_.cc:#: Failure Failed Expected failure #6 (in thread A, no trace alive). [ FAILED ] SCOPED_TRACETest.WorksConcurrently +[----------] 1 test from ScopedTraceTest +[ RUN ] ScopedTraceTest.WithExplicitFileAndLine +gtest_output_test_.cc:#: Failure +Failed +Check that the trace is attached to a particular location. +Google Test trace: +explicit_file.cc:123: expected trace message +[ FAILED ] ScopedTraceTest.WithExplicitFileAndLine [----------] 1 test from NonFatalFailureInFixtureConstructorTest [ RUN ] NonFatalFailureInFixtureConstructorTest.FailureInConstructor (expecting 5 failures) @@ -437,9 +466,10 @@ Expected: 1 fatal failure [ OK ] TypedTest/0.Success [ RUN ] TypedTest/0.Failure gtest_output_test_.cc:#: Failure - Expected: 1 -To be equal to: TypeParam() - Which is: 0 +Expected equality of these values: + 1 + TypeParam() + Which is: 0 Expected failure [ FAILED ] TypedTest/0.Failure, where TypeParam = int [----------] 2 tests from Unsigned/TypedTestP/0, where TypeParam = unsigned char @@ -447,23 +477,25 @@ Expected failure [ OK ] Unsigned/TypedTestP/0.Success [ RUN ] Unsigned/TypedTestP/0.Failure gtest_output_test_.cc:#: Failure - Expected: 1U - Which is: 1 -To be equal to: TypeParam() - Which is: '\0' +Expected equality of these values: + 1U + Which is: 1 + TypeParam() + Which is: '\0' Expected failure [ FAILED ] Unsigned/TypedTestP/0.Failure, where TypeParam = unsigned char -[----------] 2 tests from Unsigned/TypedTestP/1, where TypeParam = unsigned int +[----------] 2 tests from Unsigned/TypedTestP/1, where TypeParam = unsigned [ RUN ] Unsigned/TypedTestP/1.Success [ OK ] Unsigned/TypedTestP/1.Success [ RUN ] Unsigned/TypedTestP/1.Failure gtest_output_test_.cc:#: Failure - Expected: 1U - Which is: 1 -To be equal to: TypeParam() - Which is: 0 +Expected equality of these values: + 1U + Which is: 1 + TypeParam() + Which is: 0 Expected failure -[ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int +[ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned [----------] 4 tests from ExpectFailureTest [ RUN ] ExpectFailureTest.ExpectFatalFailure (expecting 1 failure) @@ -597,18 +629,20 @@ Expected non-fatal failure. [----------] 1 test from PrintingFailingParams/FailingParamTest [ RUN ] PrintingFailingParams/FailingParamTest.Fails/0 gtest_output_test_.cc:#: Failure - Expected: 1 -To be equal to: GetParam() - Which is: 2 +Expected equality of these values: + 1 + GetParam() + Which is: 2 [ FAILED ] PrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2 [----------] 2 tests from PrintingStrings/ParamTest [ RUN ] PrintingStrings/ParamTest.Success/a [ OK ] PrintingStrings/ParamTest.Success/a [ RUN ] PrintingStrings/ParamTest.Failure/a gtest_output_test_.cc:#: Failure - Expected: "b" -To be equal to: GetParam() - Which is: "a" +Expected equality of these values: + "b" + GetParam() + Which is: "a" Expected failure [ FAILED ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a" [----------] Global test environment tear-down @@ -620,21 +654,23 @@ FooEnvironment::TearDown() called. gtest_output_test_.cc:#: Failure Failed Expected fatal failure. -[==========] 66 tests from 29 test cases ran. +[==========] 68 tests from 30 test cases ran. [ PASSED ] 22 tests. -[ FAILED ] 44 tests, listed below: +[ FAILED ] 46 tests, listed below: [ FAILED ] NonfatalFailureTest.EscapesStringOperands [ FAILED ] NonfatalFailureTest.DiffForLongStrings [ FAILED ] FatalFailureTest.FatalFailureInSubroutine [ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine [ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine [ FAILED ] LoggingTest.InterleavingLoggingAndAssertions +[ FAILED ] SCOPED_TRACETest.AcceptedValues [ FAILED ] SCOPED_TRACETest.ObeysScopes [ FAILED ] SCOPED_TRACETest.WorksInLoop [ FAILED ] SCOPED_TRACETest.WorksInSubroutine [ FAILED ] SCOPED_TRACETest.CanBeNested [ FAILED ] SCOPED_TRACETest.CanBeRepeated [ FAILED ] SCOPED_TRACETest.WorksConcurrently +[ FAILED ] ScopedTraceTest.WithExplicitFileAndLine [ FAILED ] NonFatalFailureInFixtureConstructorTest.FailureInConstructor [ FAILED ] FatalFailureInFixtureConstructorTest.FailureInConstructor [ FAILED ] NonFatalFailureInSetUpTest.FailureInSetUp @@ -657,7 +693,7 @@ Expected fatal failure. [ FAILED ] ExpectFatalFailureTest.FailsWhenStatementThrows [ FAILED ] TypedTest/0.Failure, where TypeParam = int [ FAILED ] Unsigned/TypedTestP/0.Failure, where TypeParam = unsigned char -[ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int +[ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned [ FAILED ] ExpectFailureTest.ExpectFatalFailure [ FAILED ] ExpectFailureTest.ExpectNonFatalFailure [ FAILED ] ExpectFailureTest.ExpectFatalFailureOnAllThreads @@ -668,7 +704,7 @@ Expected fatal failure. [ FAILED ] PrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2 [ FAILED ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a" -44 FAILED TESTS +46 FAILED TESTS  YOU HAVE 1 DISABLED TEST Note: Google Test filter = FatalFailureTest.*:LoggingTest.* @@ -678,16 +714,18 @@ Expected fatal failure. [ RUN ] FatalFailureTest.FatalFailureInSubroutine (expecting a failure that x should be 1) gtest_output_test_.cc:#: Failure - Expected: 1 -To be equal to: x - Which is: 2 +Expected equality of these values: + 1 + x + Which is: 2 [ FAILED ] FatalFailureTest.FatalFailureInSubroutine (? ms) [ RUN ] FatalFailureTest.FatalFailureInNestedSubroutine (expecting a failure that x should be 1) gtest_output_test_.cc:#: Failure - Expected: 1 -To be equal to: x - Which is: 2 +Expected equality of these values: + 1 + x + Which is: 2 [ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine (? ms) [ RUN ] FatalFailureTest.NonfatalFailureInSubroutine (expecting a failure on false) diff --git a/test/gtest-1.8.0/test/gtest_pred_impl_unittest.cc b/test/gtest-1.8.0/test/gtest_pred_impl_unittest.cc index a84eff860a..b466c150ae 100644 --- a/test/gtest-1.8.0/test/gtest_pred_impl_unittest.cc +++ b/test/gtest-1.8.0/test/gtest_pred_impl_unittest.cc @@ -27,7 +27,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// This file is AUTOMATICALLY GENERATED on 10/31/2011 by command +// This file is AUTOMATICALLY GENERATED on 01/02/2018 by command // 'gen_gtest_pred_impl.py 5'. DO NOT EDIT BY HAND! // Regression test for gtest_pred_impl.h diff --git a/test/gtest-1.8.0/test/gtest_prod_test.cc b/test/gtest-1.8.0/test/gtest_prod_test.cc index 060abce187..dfb99986ec 100644 --- a/test/gtest-1.8.0/test/gtest_prod_test.cc +++ b/test/gtest-1.8.0/test/gtest_prod_test.cc @@ -29,10 +29,10 @@ // // Author: wan@google.com (Zhanyong Wan) // -// Unit test for include/gtest/gtest_prod.h. +// Unit test for gtest/gtest_prod.h. +#include "production.h" #include "gtest/gtest.h" -#include "test/production.h" // Tests that private members can be accessed from a TEST declared as // a friend of the class. diff --git a/test/gtest-1.8.0/test/gtest_repeat_test.cc b/test/gtest-1.8.0/test/gtest_repeat_test.cc index 481012adc2..3171604302 100644 --- a/test/gtest-1.8.0/test/gtest_repeat_test.cc +++ b/test/gtest-1.8.0/test/gtest_repeat_test.cc @@ -34,15 +34,7 @@ #include #include #include "gtest/gtest.h" - -// Indicates that this translation unit is part of Google Test's -// implementation. It must come before gtest-internal-inl.h is -// included, or there will be a compiler error. This trick is to -// prevent a user from accidentally including gtest-internal-inl.h in -// his code. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ namespace testing { @@ -75,7 +67,7 @@ namespace { // Used for verifying that global environment set-up and tear-down are -// inside the gtest_repeat loop. +// inside the --gtest_repeat loop. int g_environment_set_up_count = 0; int g_environment_tear_down_count = 0; @@ -119,7 +111,6 @@ TEST(BarDeathTest, ThreadSafeAndFast) { EXPECT_DEATH_IF_SUPPORTED(::testing::internal::posix::Abort(), ""); } -#if GTEST_HAS_PARAM_TEST int g_param_test_count = 0; const int kNumberOfParamTests = 10; @@ -135,7 +126,6 @@ TEST_P(MyParamTest, ShouldPass) { INSTANTIATE_TEST_CASE_P(MyParamSequence, MyParamTest, testing::Range(0, kNumberOfParamTests)); -#endif // GTEST_HAS_PARAM_TEST // Resets the count for each test. void ResetCounts() { @@ -144,9 +134,7 @@ void ResetCounts() { g_should_fail_count = 0; g_should_pass_count = 0; g_death_test_count = 0; -#if GTEST_HAS_PARAM_TEST g_param_test_count = 0; -#endif // GTEST_HAS_PARAM_TEST } // Checks that the count for each test is expected. @@ -156,9 +144,7 @@ void CheckCounts(int expected) { GTEST_CHECK_INT_EQ_(expected, g_should_fail_count); GTEST_CHECK_INT_EQ_(expected, g_should_pass_count); GTEST_CHECK_INT_EQ_(expected, g_death_test_count); -#if GTEST_HAS_PARAM_TEST GTEST_CHECK_INT_EQ_(expected * kNumberOfParamTests, g_param_test_count); -#endif // GTEST_HAS_PARAM_TEST } // Tests the behavior of Google Test when --gtest_repeat is not specified. @@ -201,9 +187,7 @@ void TestRepeatWithFilterForSuccessfulTests(int repeat) { GTEST_CHECK_INT_EQ_(0, g_should_fail_count); GTEST_CHECK_INT_EQ_(repeat, g_should_pass_count); GTEST_CHECK_INT_EQ_(repeat, g_death_test_count); -#if GTEST_HAS_PARAM_TEST GTEST_CHECK_INT_EQ_(repeat * kNumberOfParamTests, g_param_test_count); -#endif // GTEST_HAS_PARAM_TEST } // Tests using --gtest_repeat when --gtest_filter specifies a set of @@ -219,15 +203,14 @@ void TestRepeatWithFilterForFailedTests(int repeat) { GTEST_CHECK_INT_EQ_(repeat, g_should_fail_count); GTEST_CHECK_INT_EQ_(0, g_should_pass_count); GTEST_CHECK_INT_EQ_(0, g_death_test_count); -#if GTEST_HAS_PARAM_TEST GTEST_CHECK_INT_EQ_(0, g_param_test_count); -#endif // GTEST_HAS_PARAM_TEST } } // namespace int main(int argc, char **argv) { testing::InitGoogleTest(&argc, argv); + testing::AddGlobalTestEnvironment(new MyEnvironment); TestRepeatUnspecified(); diff --git a/test/gtest-1.8.0/test/gtest_stress_test.cc b/test/gtest-1.8.0/test/gtest_stress_test.cc index e7daa430df..cac405f808 100644 --- a/test/gtest-1.8.0/test/gtest_stress_test.cc +++ b/test/gtest-1.8.0/test/gtest_stress_test.cc @@ -34,15 +34,9 @@ #include "gtest/gtest.h" -#include #include -// We must define this macro in order to #include -// gtest-internal-inl.h. This is how Google Test prevents a user from -// accidentally depending on its internal implementation. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ #if GTEST_IS_THREADSAFE diff --git a/test/gtest-1.8.0/test/gtest_test_utils.py b/test/gtest-1.8.0/test/gtest_test_utils.py index 4acd36c975..d7fc0990d3 100644 --- a/test/gtest-1.8.0/test/gtest_test_utils.py +++ b/test/gtest-1.8.0/test/gtest_test_utils.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python -# # Copyright 2006, Google Inc. # All rights reserved. # @@ -29,20 +27,25 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -"""Unit test utilities for Google C++ Testing Framework.""" +"""Unit test utilities for Google C++ Testing and Mocking Framework.""" +# Suppresses the 'Import not at the top of the file' lint complaint. +# pylint: disable-msg=C6204 __author__ = 'wan@google.com (Zhanyong Wan)' -import atexit import os -import shutil import sys + +IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux' +IS_WINDOWS = os.name == 'nt' +IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0] + +import atexit +import shutil import tempfile import unittest _test_module = unittest -# Suppresses the 'Import not at the top of the file' lint complaint. -# pylint: disable-msg=C6204 try: import subprocess _SUBPROCESS_MODULE_AVAILABLE = True @@ -53,9 +56,6 @@ except: GTEST_OUTPUT_VAR_NAME = 'GTEST_OUTPUT' -IS_WINDOWS = os.name == 'nt' -IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0] - # The environment variable for specifying the path to the premature-exit file. PREMATURE_EXIT_FILE_ENV_VAR = 'TEST_PREMATURE_EXIT_FILE' @@ -145,8 +145,6 @@ atexit.register(_RemoveTempDir) def GetTempDir(): - """Returns a directory for temporary files.""" - global _temp_dir if not _temp_dir: _temp_dir = tempfile.mkdtemp() @@ -178,7 +176,7 @@ def GetTestExecutablePath(executable_name, build_dir=None): 'Unable to find the test binary "%s". Please make sure to provide\n' 'a path to the binary via the --build_dir flag or the BUILD_DIR\n' 'environment variable.' % path) - sys.stdout.write(message) + print >> sys.stderr, message sys.exit(1) return path @@ -245,7 +243,7 @@ class Subprocess: p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=stderr, cwd=working_dir, universal_newlines=True, env=env) - # communicate returns a tuple with the file obect for the child's + # communicate returns a tuple with the file object for the child's # output. self.output = p.communicate()[0] self._return_code = p.returncode diff --git a/test/gtest-1.8.0/test/gtest_throw_on_failure_test.py b/test/gtest-1.8.0/test/gtest_throw_on_failure_test.py index 3e7740cabb..5678ffeaf6 100644 --- a/test/gtest-1.8.0/test/gtest_throw_on_failure_test.py +++ b/test/gtest-1.8.0/test/gtest_throw_on_failure_test.py @@ -70,7 +70,7 @@ def SetEnvVar(env_var, value): def Run(command): """Runs a command; returns True/False if its exit code is/isn't 0.""" - print('Running "%s". . .' % ' '.join(command)) + print 'Running "%s". . .' % ' '.join(command) p = gtest_test_utils.Subprocess(command) return p.exited and p.exit_code == 0 diff --git a/test/gtest-1.8.0/test/gtest_uninitialized_test.py b/test/gtest-1.8.0/test/gtest_uninitialized_test.py index 4358370097..ae91f2aae8 100644 --- a/test/gtest-1.8.0/test/gtest_uninitialized_test.py +++ b/test/gtest-1.8.0/test/gtest_uninitialized_test.py @@ -35,7 +35,6 @@ __author__ = 'wan@google.com (Zhanyong Wan)' import gtest_test_utils - COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_uninitialized_test_') @@ -46,8 +45,8 @@ def Assert(condition): def AssertEq(expected, actual): if expected != actual: - print('Expected: %s' % (expected,)) - print(' Actual: %s' % (actual,)) + print 'Expected: %s' % (expected,) + print ' Actual: %s' % (actual,) raise AssertionError @@ -56,8 +55,8 @@ def TestExitCodeAndOutput(command): # Verifies that 'command' exits with code 1. p = gtest_test_utils.Subprocess(command) - Assert(p.exited) - AssertEq(1, p.exit_code) + if p.exited and p.exit_code == 0: + Assert('IMPORTANT NOTICE' in p.output); Assert('InitGoogleTest' in p.output) diff --git a/test/gtest-1.8.0/test/gtest_uninitialized_test_.cc b/test/gtest-1.8.0/test/gtest_uninitialized_test_.cc index 44316987fb..2ba0e8b809 100644 --- a/test/gtest-1.8.0/test/gtest_uninitialized_test_.cc +++ b/test/gtest-1.8.0/test/gtest_uninitialized_test_.cc @@ -34,8 +34,8 @@ TEST(DummyTest, Dummy) { // This test doesn't verify anything. We just need it to create a // realistic stage for testing the behavior of Google Test when - // RUN_ALL_TESTS() is called without testing::InitGoogleTest() being - // called first. + // RUN_ALL_TESTS() is called without + // testing::InitGoogleTest() being called first. } int main() { diff --git a/test/gtest-1.8.0/test/gtest_unittest.cc b/test/gtest-1.8.0/test/gtest_unittest.cc index 88e94134b9..39b68413a6 100644 --- a/test/gtest-1.8.0/test/gtest_unittest.cc +++ b/test/gtest-1.8.0/test/gtest_unittest.cc @@ -34,9 +34,9 @@ #include "gtest/gtest.h" -// Verifies that the command line flag variables can be accessed -// in code once has been #included. -// Do not move it after other #includes. +// Verifies that the command line flag variables can be accessed in +// code once "gtest/gtest.h" has been +// #included. Do not move it after other gtest #includes. TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) { bool dummy = testing::GTEST_FLAG(also_run_disabled_tests) || testing::GTEST_FLAG(break_on_failure) @@ -64,17 +64,12 @@ TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) { #include #include #include +#if GTEST_LANG_CXX11 +#include +#endif // GTEST_LANG_CXX11 #include "gtest/gtest-spi.h" - -// Indicates that this translation unit is part of Google Test's -// implementation. It must come before gtest-internal-inl.h is -// included, or there will be a compiler error. This trick is to -// prevent a user from accidentally including gtest-internal-inl.h in -// his code. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ namespace testing { namespace internal { @@ -86,9 +81,9 @@ class StreamingListenerTest : public Test { class FakeSocketWriter : public StreamingListener::AbstractSocketWriter { public: // Sends a string to the socket. - virtual void Send(const string& message) { output_ += message; } + virtual void Send(const std::string& message) { output_ += message; } - string output_; + std::string output_; }; StreamingListenerTest() @@ -98,7 +93,7 @@ class StreamingListenerTest : public Test { CodeLocation(__FILE__, __LINE__), 0, NULL) {} protected: - string* output() { return &(fake_sock_writer_->output_); } + std::string* output() { return &(fake_sock_writer_->output_); } FakeSocketWriter* const fake_sock_writer_; StreamingListener streamer_; @@ -266,6 +261,8 @@ using testing::internal::IsContainer; using testing::internal::IsContainerTest; using testing::internal::IsNotContainer; using testing::internal::NativeArray; +using testing::internal::OsStackTraceGetter; +using testing::internal::OsStackTraceGetterInterface; using testing::internal::ParseInt32Flag; using testing::internal::RelationToSourceCopy; using testing::internal::RelationToSourceReference; @@ -282,6 +279,7 @@ using testing::internal::String; using testing::internal::TestEventListenersAccessor; using testing::internal::TestResultAccessor; using testing::internal::UInt32; +using testing::internal::UnitTestImpl; using testing::internal::WideStringToUtf8; using testing::internal::edit_distance::CalculateOptimalEdits; using testing::internal::edit_distance::CreateUnifiedDiff; @@ -382,6 +380,31 @@ TEST(GetTestTypeIdTest, ReturnsTheSameValueInsideOrOutsideOfGoogleTest) { EXPECT_EQ(kTestTypeIdInGoogleTest, GetTestTypeId()); } +// Tests CanonicalizeForStdLibVersioning. + +using ::testing::internal::CanonicalizeForStdLibVersioning; + +TEST(CanonicalizeForStdLibVersioning, LeavesUnversionedNamesUnchanged) { + EXPECT_EQ("std::bind", CanonicalizeForStdLibVersioning("std::bind")); + EXPECT_EQ("std::_", CanonicalizeForStdLibVersioning("std::_")); + EXPECT_EQ("std::__foo", CanonicalizeForStdLibVersioning("std::__foo")); + EXPECT_EQ("gtl::__1::x", CanonicalizeForStdLibVersioning("gtl::__1::x")); + EXPECT_EQ("__1::x", CanonicalizeForStdLibVersioning("__1::x")); + EXPECT_EQ("::__1::x", CanonicalizeForStdLibVersioning("::__1::x")); +} + +TEST(CanonicalizeForStdLibVersioning, ElidesDoubleUnderNames) { + EXPECT_EQ("std::bind", CanonicalizeForStdLibVersioning("std::__1::bind")); + EXPECT_EQ("std::_", CanonicalizeForStdLibVersioning("std::__1::_")); + + EXPECT_EQ("std::bind", CanonicalizeForStdLibVersioning("std::__g::bind")); + EXPECT_EQ("std::_", CanonicalizeForStdLibVersioning("std::__g::_")); + + EXPECT_EQ("std::bind", + CanonicalizeForStdLibVersioning("std::__google::bind")); + EXPECT_EQ("std::_", CanonicalizeForStdLibVersioning("std::__google::_")); +} + // Tests FormatTimeInMillisAsSeconds(). TEST(FormatTimeInMillisAsSecondsTest, FormatsZero) { @@ -442,7 +465,7 @@ class FormatEpochTimeInMillisAsIso8601Test : public Test { // tzset() distinguishes between the TZ variable being present and empty // and not being present, so we have to consider the case of time_zone // being NULL. -#if _MSC_VER +#if _MSC_VER || GTEST_OS_WINDOWS_MINGW // ...Unless it's MSVC, whose standard library's _putenv doesn't // distinguish between an empty and a missing variable. const std::string env_var = @@ -546,7 +569,7 @@ TEST(CodePointToUtf8Test, CanEncode8To11Bits) { // 101 0111 0110 => 110-10101 10-110110 // Some compilers (e.g., GCC on MinGW) cannot handle non-ASCII codepoints - // in wide strings and wide chars. In order to accomodate them, we have to + // in wide strings and wide chars. In order to accommodate them, we have to // introduce such character constants as integers. EXPECT_EQ("\xD5\xB6", CodePointToUtf8(static_cast(0x576))); @@ -1388,7 +1411,7 @@ class TestResultTest : public Test { delete r2; } - // Helper that compares two two TestPartResults. + // Helper that compares two TestPartResults. static void CompareTestPartResult(const TestPartResult& expected, const TestPartResult& actual) { EXPECT_EQ(expected.type(), actual.type()); @@ -1787,7 +1810,7 @@ TEST(Int32FromEnvOrDieDeathTest, AbortsOnFailure) { } // Tests that Int32FromEnvOrDie() aborts with an error message -// if the variable cannot be represnted by an Int32. +// if the variable cannot be represented by an Int32. TEST(Int32FromEnvOrDieDeathTest, AbortsOnInt32Overflow) { SetEnv(GTEST_FLAG_PREFIX_UPPER_ "VAR", "1234567891234567891234"); EXPECT_DEATH_IF_SUPPORTED( @@ -2430,7 +2453,7 @@ TEST(StringAssertionTest, ASSERT_STREQ) { ASSERT_STREQ(p1, p2); EXPECT_FATAL_FAILURE(ASSERT_STREQ("bad", "good"), - "Expected: \"bad\""); + " \"bad\"\n \"good\""); } // Tests ASSERT_STREQ with NULL arguments. @@ -3115,13 +3138,13 @@ TEST(DISABLED_TestCase, DISABLED_TestShouldNotRun) { FAIL() << "Unexpected failure: Test in disabled test case should not be run."; } -// Check that when all tests in a test case are disabled, SetupTestCase() and +// Check that when all tests in a test case are disabled, SetUpTestCase() and // TearDownTestCase() are not called. class DisabledTestsTest : public Test { protected: static void SetUpTestCase() { FAIL() << "Unexpected failure: All tests disabled in test case. " - "SetupTestCase() should not be called."; + "SetUpTestCase() should not be called."; } static void TearDownTestCase() { @@ -3368,7 +3391,7 @@ class NoFatalFailureTest : public Test { void DoAssertNoFatalFailureOnFails() { ASSERT_NO_FATAL_FAILURE(Fails()); - ADD_FAILURE() << "shold not reach here."; + ADD_FAILURE() << "should not reach here."; } void DoExpectNoFatalFailureOnFails() { @@ -3528,35 +3551,39 @@ TEST(AssertionTest, EqFailure) { EqFailure("foo", "bar", foo_val, bar_val, false) .failure_message()); EXPECT_STREQ( - " Expected: foo\n" - " Which is: 5\n" - "To be equal to: bar\n" - " Which is: 6", + "Expected equality of these values:\n" + " foo\n" + " Which is: 5\n" + " bar\n" + " Which is: 6", msg1.c_str()); const std::string msg2( EqFailure("foo", "6", foo_val, bar_val, false) .failure_message()); EXPECT_STREQ( - " Expected: foo\n" - " Which is: 5\n" - "To be equal to: 6", + "Expected equality of these values:\n" + " foo\n" + " Which is: 5\n" + " 6", msg2.c_str()); const std::string msg3( EqFailure("5", "bar", foo_val, bar_val, false) .failure_message()); EXPECT_STREQ( - " Expected: 5\n" - "To be equal to: bar\n" - " Which is: 6", + "Expected equality of these values:\n" + " 5\n" + " bar\n" + " Which is: 6", msg3.c_str()); const std::string msg4( EqFailure("5", "6", foo_val, bar_val, false).failure_message()); EXPECT_STREQ( - " Expected: 5\n" - "To be equal to: 6", + "Expected equality of these values:\n" + " 5\n" + " 6", msg4.c_str()); const std::string msg5( @@ -3564,10 +3591,11 @@ TEST(AssertionTest, EqFailure) { std::string("\"x\""), std::string("\"y\""), true).failure_message()); EXPECT_STREQ( - " Expected: foo\n" - " Which is: \"x\"\n" - "To be equal to: bar\n" - " Which is: \"y\"\n" + "Expected equality of these values:\n" + " foo\n" + " Which is: \"x\"\n" + " bar\n" + " Which is: \"y\"\n" "Ignoring case", msg5.c_str()); } @@ -3580,11 +3608,12 @@ TEST(AssertionTest, EqFailureWithDiff) { const std::string msg1( EqFailure("left", "right", left, right, false).failure_message()); EXPECT_STREQ( - " Expected: left\n" - " Which is: " + "Expected equality of these values:\n" + " left\n" + " Which is: " "1\\n2XXX\\n3\\n5\\n6\\n7\\n8\\n9\\n10\\n11\\n12XXX\\n13\\n14\\n15\n" - "To be equal to: right\n" - " Which is: 1\\n2\\n3\\n4\\n5\\n6\\n7\\n8\\n9\\n11\\n12\\n13\\n14\n" + " right\n" + " Which is: 1\\n2\\n3\\n4\\n5\\n6\\n7\\n8\\n9\\n11\\n12\\n13\\n14\n" "With diff:\n@@ -1,5 +1,6 @@\n 1\n-2XXX\n+2\n 3\n+4\n 5\n 6\n" "@@ -7,8 +8,6 @@\n 8\n 9\n-10\n 11\n-12XXX\n+12\n 13\n 14\n-15\n", msg1.c_str()); @@ -3659,7 +3688,7 @@ TEST(AssertionTest, AssertFalseWithAssertionResult) { } #ifdef __BORLANDC__ -// Restores warnings after previous "#pragma option push" supressed them +// Restores warnings after previous "#pragma option push" suppressed them # pragma option pop #endif @@ -3679,9 +3708,10 @@ TEST(ExpectTest, ASSERT_EQ_Double) { TEST(AssertionTest, ASSERT_EQ) { ASSERT_EQ(5, 2 + 3); EXPECT_FATAL_FAILURE(ASSERT_EQ(5, 2*3), - " Expected: 5\n" - "To be equal to: 2*3\n" - " Which is: 6"); + "Expected equality of these values:\n" + " 5\n" + " 2*3\n" + " Which is: 6"); } // Tests ASSERT_EQ(NULL, pointer). @@ -3689,7 +3719,7 @@ TEST(AssertionTest, ASSERT_EQ) { TEST(AssertionTest, ASSERT_EQ_NULL) { // A success. const char* p = NULL; - // Some older GCC versions may issue a spurious waring in this or the next + // Some older GCC versions may issue a spurious warning in this or the next // assertion statement. This warning should not be suppressed with // static_cast since the test verifies the ability to use bare NULL as the // expected parameter to the macro. @@ -3698,7 +3728,7 @@ TEST(AssertionTest, ASSERT_EQ_NULL) { // A failure. static int n = 0; EXPECT_FATAL_FAILURE(ASSERT_EQ(NULL, &n), - "To be equal to: &n\n"); + " &n\n Which is:"); } #endif // GTEST_CAN_COMPARE_NULL @@ -3714,7 +3744,7 @@ TEST(ExpectTest, ASSERT_EQ_0) { // A failure. EXPECT_FATAL_FAILURE(ASSERT_EQ(0, 5.6), - "Expected: 0"); + " 0\n 5.6"); } // Tests ASSERT_NE. @@ -3813,7 +3843,7 @@ void TestEq1(int x) { // Tests calling a test subroutine that's not part of a fixture. TEST(AssertionTest, NonFixtureSubroutine) { EXPECT_FATAL_FAILURE(TestEq1(2), - "To be equal to: x"); + " x\n Which is: 2"); } // An uncopyable class. @@ -3862,7 +3892,8 @@ TEST(AssertionTest, AssertWorksWithUncopyableObject) { EXPECT_FATAL_FAILURE(TestAssertNonPositive(), "IsPositiveUncopyable(y) evaluates to false, where\ny evaluates to -1"); EXPECT_FATAL_FAILURE(TestAssertEqualsUncopyable(), - "Expected: x\n Which is: 5\nTo be equal to: y\n Which is: -1"); + "Expected equality of these values:\n" + " x\n Which is: 5\n y\n Which is: -1"); } // Tests that uncopyable objects can be used in expects. @@ -3874,7 +3905,8 @@ TEST(AssertionTest, ExpectWorksWithUncopyableObject) { "IsPositiveUncopyable(y) evaluates to false, where\ny evaluates to -1"); EXPECT_EQ(x, x); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(x, y), - "Expected: x\n Which is: 5\nTo be equal to: y\n Which is: -1"); + "Expected equality of these values:\n" + " x\n Which is: 5\n y\n Which is: -1"); } enum NamedEnum { @@ -3950,13 +3982,13 @@ TEST(AssertionTest, AnonymousEnum) { // ICE's in C++Builder. EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseB), - "To be equal to: kCaseB"); + " kCaseB\n Which is: "); EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC), - "Which is: 42"); + "\n Which is: 42"); # endif EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC), - "Which is: -1"); + "\n Which is: -1"); } #endif // !GTEST_OS_MAC && !defined(__SUNPRO_CC) @@ -4382,7 +4414,7 @@ TEST(ExpectTest, ExpectFalseWithAssertionResult) { } #ifdef __BORLANDC__ -// Restores warnings after previous "#pragma option push" supressed them +// Restores warnings after previous "#pragma option push" suppressed them # pragma option pop #endif @@ -4390,9 +4422,10 @@ TEST(ExpectTest, ExpectFalseWithAssertionResult) { TEST(ExpectTest, EXPECT_EQ) { EXPECT_EQ(5, 2 + 3); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5, 2*3), - " Expected: 5\n" - "To be equal to: 2*3\n" - " Which is: 6"); + "Expected equality of these values:\n" + " 5\n" + " 2*3\n" + " Which is: 6"); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5, 2 - 3), "2 - 3"); } @@ -4423,7 +4456,7 @@ TEST(ExpectTest, EXPECT_EQ_NULL) { // A failure. int n = 0; EXPECT_NONFATAL_FAILURE(EXPECT_EQ(NULL, &n), - "To be equal to: &n\n"); + " &n\n Which is:"); } #endif // GTEST_CAN_COMPARE_NULL @@ -4439,7 +4472,7 @@ TEST(ExpectTest, EXPECT_EQ_0) { // A failure. EXPECT_NONFATAL_FAILURE(EXPECT_EQ(0, 5.6), - "Expected: 0"); + " 0\n 5.6"); } // Tests EXPECT_NE. @@ -4539,7 +4572,7 @@ TEST(ExpectTest, EXPECT_ANY_THROW) { TEST(ExpectTest, ExpectPrecedence) { EXPECT_EQ(1 < 2, true); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(true, true && false), - "To be equal to: true && false"); + " true && false\n Which is: false"); } @@ -4686,14 +4719,14 @@ TEST(EqAssertionTest, Bool) { EXPECT_FATAL_FAILURE({ bool false_value = false; ASSERT_EQ(false_value, true); - }, "To be equal to: true"); + }, " false_value\n Which is: false\n true"); } // Tests using int values in {EXPECT|ASSERT}_EQ. TEST(EqAssertionTest, Int) { ASSERT_EQ(32, 32); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(32, 33), - "33"); + " 32\n 33"); } // Tests using time_t values in {EXPECT|ASSERT}_EQ. @@ -4710,9 +4743,9 @@ TEST(EqAssertionTest, Char) { ASSERT_EQ('z', 'z'); const char ch = 'b'; EXPECT_NONFATAL_FAILURE(EXPECT_EQ('\0', ch), - "ch"); + " ch\n Which is: 'b'"); EXPECT_NONFATAL_FAILURE(EXPECT_EQ('a', ch), - "ch"); + " ch\n Which is: 'b'"); } // Tests using wchar_t values in {EXPECT|ASSERT}_EQ. @@ -4720,10 +4753,11 @@ TEST(EqAssertionTest, WideChar) { EXPECT_EQ(L'b', L'b'); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(L'\0', L'x'), - " Expected: L'\0'\n" - " Which is: L'\0' (0, 0x0)\n" - "To be equal to: L'x'\n" - " Which is: L'x' (120, 0x78)"); + "Expected equality of these values:\n" + " L'\0'\n" + " Which is: L'\0' (0, 0x0)\n" + " L'x'\n" + " Which is: L'x' (120, 0x78)"); static wchar_t wchar; wchar = L'b'; @@ -4731,7 +4765,7 @@ TEST(EqAssertionTest, WideChar) { "wchar"); wchar = 0x8119; EXPECT_FATAL_FAILURE(ASSERT_EQ(static_cast(0x8120), wchar), - "To be equal to: wchar"); + " wchar\n Which is: L'"); } // Tests using ::std::string values in {EXPECT|ASSERT}_EQ. @@ -4760,8 +4794,7 @@ TEST(EqAssertionTest, StdString) { static ::std::string str3(str1); str3.at(2) = '\0'; EXPECT_FATAL_FAILURE(ASSERT_EQ(str1, str3), - "To be equal to: str3\n" - " Which is: \"A \\0 in the middle\""); + " str3\n Which is: \"A \\0 in the middle\""); } #if GTEST_HAS_STD_WSTRING @@ -4881,9 +4914,9 @@ TEST(EqAssertionTest, CharPointer) { ASSERT_EQ(p1, p1); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2), - "To be equal to: p2"); + " p2\n Which is:"); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2), - "p2"); + " p2\n Which is:"); EXPECT_FATAL_FAILURE(ASSERT_EQ(reinterpret_cast(0x1234), reinterpret_cast(0xABC0)), "ABC0"); @@ -4903,9 +4936,9 @@ TEST(EqAssertionTest, WideCharPointer) { EXPECT_EQ(p0, p0); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2), - "To be equal to: p2"); + " p2\n Which is:"); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2), - "p2"); + " p2\n Which is:"); void* pv3 = (void*)0x1234; // NOLINT void* pv4 = (void*)0xABC0; // NOLINT const wchar_t* p3 = reinterpret_cast(pv3); @@ -5450,7 +5483,8 @@ TEST_F(SetUpTestCaseTest, Test2) { EXPECT_STREQ("123", shared_resource_); } -// The InitGoogleTestTest test case tests testing::InitGoogleTest(). + +// The ParseFlagsTest test case tests ParseGoogleTestFlagsOnly. // The Flags struct stores a copy of all Google Test flags. struct Flags { @@ -5536,8 +5570,8 @@ struct Flags { return flags; } - // Creates a Flags struct where the gtest_random_seed flag has - // the given value. + // Creates a Flags struct where the gtest_random_seed flag has the given + // value. static Flags RandomSeed(Int32 random_seed) { Flags flags; flags.random_seed = random_seed; @@ -5552,8 +5586,8 @@ struct Flags { return flags; } - // Creates a Flags struct where the gtest_shuffle flag has - // the given value. + // Creates a Flags struct where the gtest_shuffle flag has the given + // value. static Flags Shuffle(bool shuffle) { Flags flags; flags.shuffle = shuffle; @@ -5601,8 +5635,8 @@ struct Flags { bool throw_on_failure; }; -// Fixture for testing InitGoogleTest(). -class InitGoogleTestTest : public Test { +// Fixture for testing ParseGoogleTestFlagsOnly(). +class ParseFlagsTest : public Test { protected: // Clears the flags before each test. virtual void SetUp() { @@ -5663,16 +5697,16 @@ class InitGoogleTestTest : public Test { const bool saved_help_flag = ::testing::internal::g_help_flag; ::testing::internal::g_help_flag = false; -#if GTEST_HAS_STREAM_REDIRECTION +# if GTEST_HAS_STREAM_REDIRECTION CaptureStdout(); -#endif +# endif // Parses the command line. internal::ParseGoogleTestFlagsOnly(&argc1, const_cast(argv1)); -#if GTEST_HAS_STREAM_REDIRECTION +# if GTEST_HAS_STREAM_REDIRECTION const std::string captured_stdout = GetCapturedStdout(); -#endif +# endif // Verifies the flag values. CheckFlags(expected); @@ -5685,7 +5719,7 @@ class InitGoogleTestTest : public Test { // help message for the flags it recognizes. EXPECT_EQ(should_print_help, ::testing::internal::g_help_flag); -#if GTEST_HAS_STREAM_REDIRECTION +# if GTEST_HAS_STREAM_REDIRECTION const char* const expected_help_fragment = "This program contains tests written using"; if (should_print_help) { @@ -5694,7 +5728,7 @@ class InitGoogleTestTest : public Test { EXPECT_PRED_FORMAT2(IsNotSubstring, expected_help_fragment, captured_stdout); } -#endif // GTEST_HAS_STREAM_REDIRECTION +# endif // GTEST_HAS_STREAM_REDIRECTION ::testing::internal::g_help_flag = saved_help_flag; } @@ -5702,14 +5736,14 @@ class InitGoogleTestTest : public Test { // This macro wraps TestParsingFlags s.t. the user doesn't need // to specify the array sizes. -#define GTEST_TEST_PARSING_FLAGS_(argv1, argv2, expected, should_print_help) \ +# define GTEST_TEST_PARSING_FLAGS_(argv1, argv2, expected, should_print_help) \ TestParsingFlags(sizeof(argv1)/sizeof(*argv1) - 1, argv1, \ sizeof(argv2)/sizeof(*argv2) - 1, argv2, \ expected, should_print_help) }; // Tests parsing an empty command line. -TEST_F(InitGoogleTestTest, Empty) { +TEST_F(ParseFlagsTest, Empty) { const char* argv[] = { NULL }; @@ -5722,7 +5756,7 @@ TEST_F(InitGoogleTestTest, Empty) { } // Tests parsing a command line that has no flag. -TEST_F(InitGoogleTestTest, NoFlag) { +TEST_F(ParseFlagsTest, NoFlag) { const char* argv[] = { "foo.exe", NULL @@ -5737,7 +5771,7 @@ TEST_F(InitGoogleTestTest, NoFlag) { } // Tests parsing a bad --gtest_filter flag. -TEST_F(InitGoogleTestTest, FilterBad) { +TEST_F(ParseFlagsTest, FilterBad) { const char* argv[] = { "foo.exe", "--gtest_filter", @@ -5754,7 +5788,7 @@ TEST_F(InitGoogleTestTest, FilterBad) { } // Tests parsing an empty --gtest_filter flag. -TEST_F(InitGoogleTestTest, FilterEmpty) { +TEST_F(ParseFlagsTest, FilterEmpty) { const char* argv[] = { "foo.exe", "--gtest_filter=", @@ -5770,7 +5804,7 @@ TEST_F(InitGoogleTestTest, FilterEmpty) { } // Tests parsing a non-empty --gtest_filter flag. -TEST_F(InitGoogleTestTest, FilterNonEmpty) { +TEST_F(ParseFlagsTest, FilterNonEmpty) { const char* argv[] = { "foo.exe", "--gtest_filter=abc", @@ -5786,7 +5820,7 @@ TEST_F(InitGoogleTestTest, FilterNonEmpty) { } // Tests parsing --gtest_break_on_failure. -TEST_F(InitGoogleTestTest, BreakOnFailureWithoutValue) { +TEST_F(ParseFlagsTest, BreakOnFailureWithoutValue) { const char* argv[] = { "foo.exe", "--gtest_break_on_failure", @@ -5802,7 +5836,7 @@ TEST_F(InitGoogleTestTest, BreakOnFailureWithoutValue) { } // Tests parsing --gtest_break_on_failure=0. -TEST_F(InitGoogleTestTest, BreakOnFailureFalse_0) { +TEST_F(ParseFlagsTest, BreakOnFailureFalse_0) { const char* argv[] = { "foo.exe", "--gtest_break_on_failure=0", @@ -5818,7 +5852,7 @@ TEST_F(InitGoogleTestTest, BreakOnFailureFalse_0) { } // Tests parsing --gtest_break_on_failure=f. -TEST_F(InitGoogleTestTest, BreakOnFailureFalse_f) { +TEST_F(ParseFlagsTest, BreakOnFailureFalse_f) { const char* argv[] = { "foo.exe", "--gtest_break_on_failure=f", @@ -5834,7 +5868,7 @@ TEST_F(InitGoogleTestTest, BreakOnFailureFalse_f) { } // Tests parsing --gtest_break_on_failure=F. -TEST_F(InitGoogleTestTest, BreakOnFailureFalse_F) { +TEST_F(ParseFlagsTest, BreakOnFailureFalse_F) { const char* argv[] = { "foo.exe", "--gtest_break_on_failure=F", @@ -5851,7 +5885,7 @@ TEST_F(InitGoogleTestTest, BreakOnFailureFalse_F) { // Tests parsing a --gtest_break_on_failure flag that has a "true" // definition. -TEST_F(InitGoogleTestTest, BreakOnFailureTrue) { +TEST_F(ParseFlagsTest, BreakOnFailureTrue) { const char* argv[] = { "foo.exe", "--gtest_break_on_failure=1", @@ -5867,7 +5901,7 @@ TEST_F(InitGoogleTestTest, BreakOnFailureTrue) { } // Tests parsing --gtest_catch_exceptions. -TEST_F(InitGoogleTestTest, CatchExceptions) { +TEST_F(ParseFlagsTest, CatchExceptions) { const char* argv[] = { "foo.exe", "--gtest_catch_exceptions", @@ -5883,7 +5917,7 @@ TEST_F(InitGoogleTestTest, CatchExceptions) { } // Tests parsing --gtest_death_test_use_fork. -TEST_F(InitGoogleTestTest, DeathTestUseFork) { +TEST_F(ParseFlagsTest, DeathTestUseFork) { const char* argv[] = { "foo.exe", "--gtest_death_test_use_fork", @@ -5900,7 +5934,7 @@ TEST_F(InitGoogleTestTest, DeathTestUseFork) { // Tests having the same flag twice with different values. The // expected behavior is that the one coming last takes precedence. -TEST_F(InitGoogleTestTest, DuplicatedFlags) { +TEST_F(ParseFlagsTest, DuplicatedFlags) { const char* argv[] = { "foo.exe", "--gtest_filter=a", @@ -5917,7 +5951,7 @@ TEST_F(InitGoogleTestTest, DuplicatedFlags) { } // Tests having an unrecognized flag on the command line. -TEST_F(InitGoogleTestTest, UnrecognizedFlag) { +TEST_F(ParseFlagsTest, UnrecognizedFlag) { const char* argv[] = { "foo.exe", "--gtest_break_on_failure", @@ -5939,7 +5973,7 @@ TEST_F(InitGoogleTestTest, UnrecognizedFlag) { } // Tests having a --gtest_list_tests flag -TEST_F(InitGoogleTestTest, ListTestsFlag) { +TEST_F(ParseFlagsTest, ListTestsFlag) { const char* argv[] = { "foo.exe", "--gtest_list_tests", @@ -5955,7 +5989,7 @@ TEST_F(InitGoogleTestTest, ListTestsFlag) { } // Tests having a --gtest_list_tests flag with a "true" value -TEST_F(InitGoogleTestTest, ListTestsTrue) { +TEST_F(ParseFlagsTest, ListTestsTrue) { const char* argv[] = { "foo.exe", "--gtest_list_tests=1", @@ -5971,7 +6005,7 @@ TEST_F(InitGoogleTestTest, ListTestsTrue) { } // Tests having a --gtest_list_tests flag with a "false" value -TEST_F(InitGoogleTestTest, ListTestsFalse) { +TEST_F(ParseFlagsTest, ListTestsFalse) { const char* argv[] = { "foo.exe", "--gtest_list_tests=0", @@ -5987,7 +6021,7 @@ TEST_F(InitGoogleTestTest, ListTestsFalse) { } // Tests parsing --gtest_list_tests=f. -TEST_F(InitGoogleTestTest, ListTestsFalse_f) { +TEST_F(ParseFlagsTest, ListTestsFalse_f) { const char* argv[] = { "foo.exe", "--gtest_list_tests=f", @@ -6003,7 +6037,7 @@ TEST_F(InitGoogleTestTest, ListTestsFalse_f) { } // Tests parsing --gtest_list_tests=F. -TEST_F(InitGoogleTestTest, ListTestsFalse_F) { +TEST_F(ParseFlagsTest, ListTestsFalse_F) { const char* argv[] = { "foo.exe", "--gtest_list_tests=F", @@ -6019,7 +6053,7 @@ TEST_F(InitGoogleTestTest, ListTestsFalse_F) { } // Tests parsing --gtest_output (invalid). -TEST_F(InitGoogleTestTest, OutputEmpty) { +TEST_F(ParseFlagsTest, OutputEmpty) { const char* argv[] = { "foo.exe", "--gtest_output", @@ -6036,7 +6070,7 @@ TEST_F(InitGoogleTestTest, OutputEmpty) { } // Tests parsing --gtest_output=xml -TEST_F(InitGoogleTestTest, OutputXml) { +TEST_F(ParseFlagsTest, OutputXml) { const char* argv[] = { "foo.exe", "--gtest_output=xml", @@ -6052,7 +6086,7 @@ TEST_F(InitGoogleTestTest, OutputXml) { } // Tests parsing --gtest_output=xml:file -TEST_F(InitGoogleTestTest, OutputXmlFile) { +TEST_F(ParseFlagsTest, OutputXmlFile) { const char* argv[] = { "foo.exe", "--gtest_output=xml:file", @@ -6068,7 +6102,7 @@ TEST_F(InitGoogleTestTest, OutputXmlFile) { } // Tests parsing --gtest_output=xml:directory/path/ -TEST_F(InitGoogleTestTest, OutputXmlDirectory) { +TEST_F(ParseFlagsTest, OutputXmlDirectory) { const char* argv[] = { "foo.exe", "--gtest_output=xml:directory/path/", @@ -6085,7 +6119,7 @@ TEST_F(InitGoogleTestTest, OutputXmlDirectory) { } // Tests having a --gtest_print_time flag -TEST_F(InitGoogleTestTest, PrintTimeFlag) { +TEST_F(ParseFlagsTest, PrintTimeFlag) { const char* argv[] = { "foo.exe", "--gtest_print_time", @@ -6101,7 +6135,7 @@ TEST_F(InitGoogleTestTest, PrintTimeFlag) { } // Tests having a --gtest_print_time flag with a "true" value -TEST_F(InitGoogleTestTest, PrintTimeTrue) { +TEST_F(ParseFlagsTest, PrintTimeTrue) { const char* argv[] = { "foo.exe", "--gtest_print_time=1", @@ -6117,7 +6151,7 @@ TEST_F(InitGoogleTestTest, PrintTimeTrue) { } // Tests having a --gtest_print_time flag with a "false" value -TEST_F(InitGoogleTestTest, PrintTimeFalse) { +TEST_F(ParseFlagsTest, PrintTimeFalse) { const char* argv[] = { "foo.exe", "--gtest_print_time=0", @@ -6133,7 +6167,7 @@ TEST_F(InitGoogleTestTest, PrintTimeFalse) { } // Tests parsing --gtest_print_time=f. -TEST_F(InitGoogleTestTest, PrintTimeFalse_f) { +TEST_F(ParseFlagsTest, PrintTimeFalse_f) { const char* argv[] = { "foo.exe", "--gtest_print_time=f", @@ -6149,7 +6183,7 @@ TEST_F(InitGoogleTestTest, PrintTimeFalse_f) { } // Tests parsing --gtest_print_time=F. -TEST_F(InitGoogleTestTest, PrintTimeFalse_F) { +TEST_F(ParseFlagsTest, PrintTimeFalse_F) { const char* argv[] = { "foo.exe", "--gtest_print_time=F", @@ -6165,7 +6199,7 @@ TEST_F(InitGoogleTestTest, PrintTimeFalse_F) { } // Tests parsing --gtest_random_seed=number -TEST_F(InitGoogleTestTest, RandomSeed) { +TEST_F(ParseFlagsTest, RandomSeed) { const char* argv[] = { "foo.exe", "--gtest_random_seed=1000", @@ -6181,7 +6215,7 @@ TEST_F(InitGoogleTestTest, RandomSeed) { } // Tests parsing --gtest_repeat=number -TEST_F(InitGoogleTestTest, Repeat) { +TEST_F(ParseFlagsTest, Repeat) { const char* argv[] = { "foo.exe", "--gtest_repeat=1000", @@ -6197,7 +6231,7 @@ TEST_F(InitGoogleTestTest, Repeat) { } // Tests having a --gtest_also_run_disabled_tests flag -TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsFlag) { +TEST_F(ParseFlagsTest, AlsoRunDisabledTestsFlag) { const char* argv[] = { "foo.exe", "--gtest_also_run_disabled_tests", @@ -6214,7 +6248,7 @@ TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsFlag) { } // Tests having a --gtest_also_run_disabled_tests flag with a "true" value -TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsTrue) { +TEST_F(ParseFlagsTest, AlsoRunDisabledTestsTrue) { const char* argv[] = { "foo.exe", "--gtest_also_run_disabled_tests=1", @@ -6231,7 +6265,7 @@ TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsTrue) { } // Tests having a --gtest_also_run_disabled_tests flag with a "false" value -TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsFalse) { +TEST_F(ParseFlagsTest, AlsoRunDisabledTestsFalse) { const char* argv[] = { "foo.exe", "--gtest_also_run_disabled_tests=0", @@ -6248,7 +6282,7 @@ TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsFalse) { } // Tests parsing --gtest_shuffle. -TEST_F(InitGoogleTestTest, ShuffleWithoutValue) { +TEST_F(ParseFlagsTest, ShuffleWithoutValue) { const char* argv[] = { "foo.exe", "--gtest_shuffle", @@ -6264,7 +6298,7 @@ TEST_F(InitGoogleTestTest, ShuffleWithoutValue) { } // Tests parsing --gtest_shuffle=0. -TEST_F(InitGoogleTestTest, ShuffleFalse_0) { +TEST_F(ParseFlagsTest, ShuffleFalse_0) { const char* argv[] = { "foo.exe", "--gtest_shuffle=0", @@ -6279,9 +6313,8 @@ TEST_F(InitGoogleTestTest, ShuffleFalse_0) { GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Shuffle(false), false); } -// Tests parsing a --gtest_shuffle flag that has a "true" -// definition. -TEST_F(InitGoogleTestTest, ShuffleTrue) { +// Tests parsing a --gtest_shuffle flag that has a "true" definition. +TEST_F(ParseFlagsTest, ShuffleTrue) { const char* argv[] = { "foo.exe", "--gtest_shuffle=1", @@ -6297,7 +6330,7 @@ TEST_F(InitGoogleTestTest, ShuffleTrue) { } // Tests parsing --gtest_stack_trace_depth=number. -TEST_F(InitGoogleTestTest, StackTraceDepth) { +TEST_F(ParseFlagsTest, StackTraceDepth) { const char* argv[] = { "foo.exe", "--gtest_stack_trace_depth=5", @@ -6312,7 +6345,7 @@ TEST_F(InitGoogleTestTest, StackTraceDepth) { GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::StackTraceDepth(5), false); } -TEST_F(InitGoogleTestTest, StreamResultTo) { +TEST_F(ParseFlagsTest, StreamResultTo) { const char* argv[] = { "foo.exe", "--gtest_stream_result_to=localhost:1234", @@ -6329,7 +6362,7 @@ TEST_F(InitGoogleTestTest, StreamResultTo) { } // Tests parsing --gtest_throw_on_failure. -TEST_F(InitGoogleTestTest, ThrowOnFailureWithoutValue) { +TEST_F(ParseFlagsTest, ThrowOnFailureWithoutValue) { const char* argv[] = { "foo.exe", "--gtest_throw_on_failure", @@ -6345,7 +6378,7 @@ TEST_F(InitGoogleTestTest, ThrowOnFailureWithoutValue) { } // Tests parsing --gtest_throw_on_failure=0. -TEST_F(InitGoogleTestTest, ThrowOnFailureFalse_0) { +TEST_F(ParseFlagsTest, ThrowOnFailureFalse_0) { const char* argv[] = { "foo.exe", "--gtest_throw_on_failure=0", @@ -6362,7 +6395,7 @@ TEST_F(InitGoogleTestTest, ThrowOnFailureFalse_0) { // Tests parsing a --gtest_throw_on_failure flag that has a "true" // definition. -TEST_F(InitGoogleTestTest, ThrowOnFailureTrue) { +TEST_F(ParseFlagsTest, ThrowOnFailureTrue) { const char* argv[] = { "foo.exe", "--gtest_throw_on_failure=1", @@ -6377,9 +6410,9 @@ TEST_F(InitGoogleTestTest, ThrowOnFailureTrue) { GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ThrowOnFailure(true), false); } -#if GTEST_OS_WINDOWS +# if GTEST_OS_WINDOWS // Tests parsing wide strings. -TEST_F(InitGoogleTestTest, WideStrings) { +TEST_F(ParseFlagsTest, WideStrings) { const wchar_t* argv[] = { L"foo.exe", L"--gtest_filter=Foo*", @@ -6405,13 +6438,13 @@ TEST_F(InitGoogleTestTest, WideStrings) { # endif // GTEST_OS_WINDOWS #if GTEST_USE_OWN_FLAGFILE_FLAG_ -class FlagfileTest : public InitGoogleTestTest { +class FlagfileTest : public ParseFlagsTest { public: virtual void SetUp() { - InitGoogleTestTest::SetUp(); + ParseFlagsTest::SetUp(); testdata_path_.Set(internal::FilePath( - internal::TempDir() + internal::GetCurrentExecutableName().string() + + testing::TempDir() + internal::GetCurrentExecutableName().string() + "_flagfile_test")); testing::internal::posix::RmDir(testdata_path_.c_str()); EXPECT_TRUE(testdata_path_.CreateFolder()); @@ -6419,7 +6452,7 @@ class FlagfileTest : public InitGoogleTestTest { virtual void TearDown() { testing::internal::posix::RmDir(testdata_path_.c_str()); - InitGoogleTestTest::TearDown(); + ParseFlagsTest::TearDown(); } internal::FilePath CreateFlagfile(const char* contents) { @@ -6558,6 +6591,7 @@ TEST_F(CurrentTestInfoTest, WorksForSecondTestInATestCase) { } // namespace testing + // These two lines test that we can define tests in a namespace that // has the name "testing" and is nested in another namespace. namespace my_namespace { @@ -6638,7 +6672,7 @@ TEST(StreamingAssertionsTest, Truth2) { } #ifdef __BORLANDC__ -// Restores warnings after previous "#pragma option push" supressed them +// Restores warnings after previous "#pragma option push" suppressed them # pragma option pop #endif @@ -6888,14 +6922,6 @@ TEST(StaticAssertTypeEqTest, CompilesForEqualTypes) { StaticAssertTypeEq(); } -TEST(GetCurrentOsStackTraceExceptTopTest, ReturnsTheStackTrace) { - testing::UnitTest* const unit_test = testing::UnitTest::GetInstance(); - - // We don't have a stack walker in Google Test yet. - EXPECT_STREQ("", GetCurrentOsStackTraceExceptTop(unit_test, 0).c_str()); - EXPECT_STREQ("", GetCurrentOsStackTraceExceptTop(unit_test, 1).c_str()); -} - TEST(HasNonfatalFailureTest, ReturnsFalseWhenThereIsNoFailure) { EXPECT_FALSE(HasNonfatalFailure()); } @@ -7531,6 +7557,50 @@ TEST(IsContainerTestTest, WorksForContainer) { sizeof(IsContainerTest >(0))); } +#if GTEST_LANG_CXX11 +struct ConstOnlyContainerWithPointerIterator { + using const_iterator = int*; + const_iterator begin() const; + const_iterator end() const; +}; + +struct ConstOnlyContainerWithClassIterator { + struct const_iterator { + const int& operator*() const; + const_iterator& operator++(/* pre-increment */); + }; + const_iterator begin() const; + const_iterator end() const; +}; + +TEST(IsContainerTestTest, ConstOnlyContainer) { + EXPECT_EQ(sizeof(IsContainer), + sizeof(IsContainerTest(0))); + EXPECT_EQ(sizeof(IsContainer), + sizeof(IsContainerTest(0))); +} +#endif // GTEST_LANG_CXX11 + +// Tests IsHashTable. +struct AHashTable { + typedef void hasher; +}; +struct NotReallyAHashTable { + typedef void hasher; + typedef void reverse_iterator; +}; +TEST(IsHashTable, Basic) { + EXPECT_TRUE(testing::internal::IsHashTable::value); + EXPECT_FALSE(testing::internal::IsHashTable::value); +#if GTEST_LANG_CXX11 + EXPECT_FALSE(testing::internal::IsHashTable>::value); + EXPECT_TRUE(testing::internal::IsHashTable>::value); +#endif // GTEST_LANG_CXX11 +#if GTEST_HAS_HASH_SET_ + EXPECT_TRUE(testing::internal::IsHashTable<__gnu_cxx::hash_set>::value); +#endif // GTEST_HAS_HASH_SET_ +} + // Tests ArrayEq(). TEST(ArrayEqTest, WorksForDegeneratedArrays) { @@ -7704,3 +7774,24 @@ TEST(SkipPrefixTest, DoesNotSkipWhenPrefixDoesNotMatch) { EXPECT_EQ(str, p); } +// Tests ad_hoc_test_result(). + +class AdHocTestResultTest : public testing::Test { + protected: + static void SetUpTestCase() { + FAIL() << "A failure happened inside SetUpTestCase()."; + } +}; + +TEST_F(AdHocTestResultTest, AdHocTestResultForTestCaseShowsFailure) { + const testing::TestResult& test_result = testing::UnitTest::GetInstance() + ->current_test_case() + ->ad_hoc_test_result(); + EXPECT_TRUE(test_result.Failed()); +} + +TEST_F(AdHocTestResultTest, AdHocTestResultTestForUnitTestDoesNotShowFailure) { + const testing::TestResult& test_result = + testing::UnitTest::GetInstance()->ad_hoc_test_result(); + EXPECT_FALSE(test_result.Failed()); +} diff --git a/test/gtest-1.8.0/test/gtest_xml_outfile1_test_.cc b/test/gtest-1.8.0/test/gtest_xml_outfile1_test_.cc index 531ced49d4..e3d1dd1ef9 100644 --- a/test/gtest-1.8.0/test/gtest_xml_outfile1_test_.cc +++ b/test/gtest-1.8.0/test/gtest_xml_outfile1_test_.cc @@ -27,7 +27,6 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Author: keith.ray@gmail.com (Keith Ray) // // gtest_xml_outfile1_test_ writes some xml via TestProperty used by // gtest_xml_outfiles_test.py diff --git a/test/gtest-1.8.0/test/gtest_xml_outfile2_test_.cc b/test/gtest-1.8.0/test/gtest_xml_outfile2_test_.cc index 7b400b2760..55eb8f394f 100644 --- a/test/gtest-1.8.0/test/gtest_xml_outfile2_test_.cc +++ b/test/gtest-1.8.0/test/gtest_xml_outfile2_test_.cc @@ -27,7 +27,6 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Author: keith.ray@gmail.com (Keith Ray) // // gtest_xml_outfile2_test_ writes some xml via TestProperty used by // gtest_xml_outfiles_test.py diff --git a/test/gtest-1.8.0/test/gtest_xml_outfiles_test.py b/test/gtest-1.8.0/test/gtest_xml_outfiles_test.py index 524e437e6c..c7d3413481 100644 --- a/test/gtest-1.8.0/test/gtest_xml_outfiles_test.py +++ b/test/gtest-1.8.0/test/gtest_xml_outfiles_test.py @@ -31,15 +31,11 @@ """Unit test for the gtest_xml_output module.""" -__author__ = "keith.ray@gmail.com (Keith Ray)" - import os from xml.dom import minidom, Node - import gtest_test_utils import gtest_xml_test_utils - GTEST_OUTPUT_SUBDIR = "xml_outfiles" GTEST_OUTPUT_1_TEST = "gtest_xml_outfile1_test_" GTEST_OUTPUT_2_TEST = "gtest_xml_outfile2_test_" @@ -47,7 +43,13 @@ GTEST_OUTPUT_2_TEST = "gtest_xml_outfile2_test_" EXPECTED_XML_1 = """ - + + + + + + + """ @@ -55,7 +57,13 @@ EXPECTED_XML_1 = """ EXPECTED_XML_2 = """ - + + + + + + + """ @@ -105,7 +113,7 @@ class GTestXMLOutFilesTest(gtest_xml_test_utils.GTestXMLTestCase): # TODO(wan@google.com): libtool causes the built test binary to be # named lt-gtest_xml_outfiles_test_ instead of - # gtest_xml_outfiles_test_. To account for this possibillity, we + # gtest_xml_outfiles_test_. To account for this possibility, we # allow both names in the following code. We should remove this # hack when Chandler Carruth's libtool replacement tool is ready. output_file_name1 = test_name + ".xml" diff --git a/test/gtest-1.8.0/test/gtest_xml_output_unittest.py b/test/gtest-1.8.0/test/gtest_xml_output_unittest.py index bcd5975991..6ffb6e3f71 100644 --- a/test/gtest-1.8.0/test/gtest_xml_output_unittest.py +++ b/test/gtest-1.8.0/test/gtest_xml_output_unittest.py @@ -31,8 +31,6 @@ """Unit test for the gtest_xml_output module""" -__author__ = 'eefacm@gmail.com (Sean Mcafee)' - import datetime import errno import os @@ -43,12 +41,16 @@ from xml.dom import minidom, Node import gtest_test_utils import gtest_xml_test_utils - GTEST_FILTER_FLAG = '--gtest_filter' GTEST_LIST_TESTS_FLAG = '--gtest_list_tests' -GTEST_OUTPUT_FLAG = "--gtest_output" -GTEST_DEFAULT_OUTPUT_FILE = "test_detail.xml" -GTEST_PROGRAM_NAME = "gtest_xml_output_unittest_" +GTEST_OUTPUT_FLAG = '--gtest_output' +GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.xml' +GTEST_PROGRAM_NAME = 'gtest_xml_output_unittest_' + +# The environment variables for test sharding. +TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS' +SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX' +SHARD_STATUS_FILE_ENV_VAR = 'GTEST_SHARD_STATUS_FILE' SUPPORTS_STACK_TRACES = False @@ -64,20 +66,23 @@ EXPECTED_NON_EMPTY_XML = """ - + - - + + @@ -99,15 +104,45 @@ Invalid characters in brackets []%(stack)s]]> - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + @@ -138,6 +173,23 @@ EXPECTED_FILTERED_TEST_XML = """ """ +EXPECTED_SHARDED_TEST_XML = """ + + + + + + + + + + + + + + +""" + EXPECTED_EMPTY_XML = """ @@ -179,7 +231,7 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase): Runs a test program that generates an empty XML output, and checks if the timestamp attribute in the testsuites tag is valid. """ - actual = self._GetXmlOutput('gtest_no_test_unittest', [], 0) + actual = self._GetXmlOutput('gtest_no_test_unittest', [], {}, 0) date_time_str = actual.documentElement.getAttributeNode('timestamp').value # datetime.strptime() is only available in Python 2.5+ so we have to # parse the expected datetime manually. @@ -209,8 +261,7 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase): 'gtest_no_test_unittest') try: os.remove(output_file) - except OSError: - e = sys.exc_info()[1] + except OSError, e: if e.errno != errno.ENOENT: raise @@ -237,7 +288,7 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase): '--shut_down_xml'] p = gtest_test_utils.Subprocess(command) if p.terminated_by_signal: - # p.signal is avalable only if p.terminated_by_signal is True. + # p.signal is available only if p.terminated_by_signal is True. self.assertFalse( p.terminated_by_signal, '%s was killed by signal %d' % (GTEST_PROGRAM_NAME, p.signal)) @@ -260,7 +311,22 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase): self._TestXmlOutput(GTEST_PROGRAM_NAME, EXPECTED_FILTERED_TEST_XML, 0, extra_args=['%s=SuccessfulTest.*' % GTEST_FILTER_FLAG]) - def _GetXmlOutput(self, gtest_prog_name, extra_args, expected_exit_code): + def testShardedTestXmlOutput(self): + """Verifies XML output when run using multiple shards. + + Runs a test program that executes only one shard and verifies that tests + from other shards do not show up in the XML output. + """ + + self._TestXmlOutput( + GTEST_PROGRAM_NAME, + EXPECTED_SHARDED_TEST_XML, + 0, + extra_env={SHARD_INDEX_ENV_VAR: '0', + TOTAL_SHARDS_ENV_VAR: '10'}) + + def _GetXmlOutput(self, gtest_prog_name, extra_args, extra_env, + expected_exit_code): """ Returns the xml output generated by running the program gtest_prog_name. Furthermore, the program's exit code must be expected_exit_code. @@ -271,7 +337,11 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase): command = ([gtest_prog_path, '%s=xml:%s' % (GTEST_OUTPUT_FLAG, xml_path)] + extra_args) - p = gtest_test_utils.Subprocess(command) + environ_copy = os.environ.copy() + if extra_env: + environ_copy.update(extra_env) + p = gtest_test_utils.Subprocess(command, env=environ_copy) + if p.terminated_by_signal: self.assert_(False, '%s was killed by signal %d' % (gtest_prog_name, p.signal)) @@ -285,7 +355,7 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase): return actual def _TestXmlOutput(self, gtest_prog_name, expected_xml, - expected_exit_code, extra_args=None): + expected_exit_code, extra_args=None, extra_env=None): """ Asserts that the XML document generated by running the program gtest_prog_name matches expected_xml, a string containing another @@ -294,7 +364,7 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase): """ actual = self._GetXmlOutput(gtest_prog_name, extra_args or [], - expected_exit_code) + extra_env or {}, expected_exit_code) expected = minidom.parseString(expected_xml) self.NormalizeXml(actual.documentElement) self.AssertEquivalentNodes(expected.documentElement, diff --git a/test/gtest-1.8.0/test/gtest_xml_output_unittest_.cc b/test/gtest-1.8.0/test/gtest_xml_output_unittest_.cc index 48b8771b52..2ee8838005 100644 --- a/test/gtest-1.8.0/test/gtest_xml_output_unittest_.cc +++ b/test/gtest-1.8.0/test/gtest_xml_output_unittest_.cc @@ -27,8 +27,6 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Author: eefacm@gmail.com (Sean Mcafee) - // Unit test for Google Test XML output. // // A user can specify XML output in a Google Test program to run via diff --git a/test/gtest-1.8.0/test/gtest_xml_test_utils.py b/test/gtest-1.8.0/test/gtest_xml_test_utils.py index 341956b54d..1e0358592f 100644 --- a/test/gtest-1.8.0/test/gtest_xml_test_utils.py +++ b/test/gtest-1.8.0/test/gtest_xml_test_utils.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python -# # Copyright 2006, Google Inc. # All rights reserved. # @@ -31,15 +29,10 @@ """Unit test utilities for gtest_xml_output""" -__author__ = 'eefacm@gmail.com (Sean Mcafee)' - import re from xml.dom import minidom, Node - import gtest_test_utils - -GTEST_OUTPUT_FLAG = '--gtest_output' GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.xml' class GTestXMLTestCase(gtest_test_utils.TestCase): @@ -101,26 +94,29 @@ class GTestXMLTestCase(gtest_test_utils.TestCase): self.assertEquals( len(expected_children), len(actual_children), 'number of child elements differ in element ' + actual_node.tagName) - for child_id, child in expected_children.items(): + for child_id, child in expected_children.iteritems(): self.assert_(child_id in actual_children, '<%s> is not in <%s> (in element %s)' % (child_id, actual_children, actual_node.tagName)) self.AssertEquivalentNodes(child, actual_children[child_id]) identifying_attribute = { - 'testsuites': 'name', - 'testsuite': 'name', - 'testcase': 'name', - 'failure': 'message', - } + 'testsuites': 'name', + 'testsuite': 'name', + 'testcase': 'name', + 'failure': 'message', + 'property': 'name', + } def _GetChildren(self, element): """ Fetches all of the child nodes of element, a DOM Element object. Returns them as the values of a dictionary keyed by the IDs of the - children. For , and elements, the ID - is the value of their "name" attribute; for elements, it is - the value of the "message" attribute; CDATA sections and non-whitespace + children. For , , , and + elements, the ID is the value of their "name" attribute; for + elements, it is the value of the "message" attribute; for + elements, it is the value of their parent's "name" attribute plus the + literal string "properties"; CDATA sections and non-whitespace text nodes are concatenated into a single CDATA section with ID "detail". An exception is raised if any element other than the above four is encountered, if two child elements with the same identifying @@ -130,11 +126,17 @@ class GTestXMLTestCase(gtest_test_utils.TestCase): children = {} for child in element.childNodes: if child.nodeType == Node.ELEMENT_NODE: - self.assert_(child.tagName in self.identifying_attribute, - 'Encountered unknown element <%s>' % child.tagName) - childID = child.getAttribute(self.identifying_attribute[child.tagName]) - self.assert_(childID not in children) - children[childID] = child + if child.tagName == 'properties': + self.assert_(child.parentNode is not None, + 'Encountered element without a parent') + child_id = child.parentNode.getAttribute('name') + '-properties' + else: + self.assert_(child.tagName in self.identifying_attribute, + 'Encountered unknown element <%s>' % child.tagName) + child_id = child.getAttribute( + self.identifying_attribute[child.tagName]) + self.assert_(child_id not in children) + children[child_id] = child elif child.nodeType in [Node.TEXT_NODE, Node.CDATA_SECTION_NODE]: if 'detail' not in children: if (child.nodeType == Node.CDATA_SECTION_NODE or @@ -187,8 +189,8 @@ class GTestXMLTestCase(gtest_test_utils.TestCase): # Replaces the source line information with a normalized form. cdata = re.sub(source_line_pat, '\\1*\n', child.nodeValue) # Removes the actual stack trace. - child.nodeValue = re.sub(r'\nStack trace:\n(.|\n)*', - '', cdata) + child.nodeValue = re.sub(r'Stack trace:\n(.|\n)*', + 'Stack trace:\n*', cdata) for child in element.childNodes: if child.nodeType == Node.ELEMENT_NODE: self.NormalizeXml(child) diff --git a/test/gtest-1.8.0/test/production.cc b/test/gtest-1.8.0/test/production.cc index 8b8a40b44e..006bb970e3 100644 --- a/test/gtest-1.8.0/test/production.cc +++ b/test/gtest-1.8.0/test/production.cc @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) // -// This is part of the unit test for include/gtest/gtest_prod.h. +// This is part of the unit test for gtest_prod.h. #include "production.h" diff --git a/test/gtest-1.8.0/test/production.h b/test/gtest-1.8.0/test/production.h index 98fd5e476c..0f01d83e4e 100644 --- a/test/gtest-1.8.0/test/production.h +++ b/test/gtest-1.8.0/test/production.h @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) // -// This is part of the unit test for include/gtest/gtest_prod.h. +// This is part of the unit test for gtest_prod.h. #ifndef GTEST_TEST_PRODUCTION_H_ #define GTEST_TEST_PRODUCTION_H_ diff --git a/test/gtest-1.8.0/xcode/Scripts/versiongenerate.py b/test/gtest-1.8.0/xcode/Scripts/versiongenerate.py index 81de8c96ac..bdd7541ad7 100644 --- a/test/gtest-1.8.0/xcode/Scripts/versiongenerate.py +++ b/test/gtest-1.8.0/xcode/Scripts/versiongenerate.py @@ -29,7 +29,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -"""A script to prepare version informtion for use the gtest Info.plist file. +"""A script to prepare version information for use the gtest Info.plist file. This script extracts the version information from the configure.ac file and uses it to generate a header file containing the same information. The @@ -42,7 +42,7 @@ 1. The AC_INIT macro will be contained within the first 1024 characters of configure.ac 2. The version string will be 3 integers separated by periods and will be - surrounded by squre brackets, "[" and "]" (e.g. [1.0.1]). The first + surrounded by square brackets, "[" and "]" (e.g. [1.0.1]). The first segment represents the major version, the second represents the minor version and the third represents the fix version. 3. No ")" character exists between the opening "(" and closing ")" of @@ -68,7 +68,7 @@ config_file.close() # Extract the version string from the AC_INIT macro # The following init_expression means: -# Extract three integers separated by periods and surrounded by squre +# Extract three integers separated by periods and surrounded by square # brackets(e.g. "[1.0.1]") between "AC_INIT(" and ")". Do not be greedy # (*? is the non-greedy flag) since that would pull in everything between # the first "(" and the last ")" in the file. @@ -88,7 +88,7 @@ file_data = """// // is executed in a "Run Script" build phase when creating gtest.framework. This // header file is not used during compilation of C-source. Rather, it simply // defines some version strings for substitution in the Info.plist. Because of -// this, we are not not restricted to C-syntax nor are we using include guards. +// this, we are not restricted to C-syntax nor are we using include guards. // #define GTEST_VERSIONINFO_SHORT %s.%s diff --git a/test/gtest-1.8.0/xcode/gtest.xcodeproj/project.pbxproj b/test/gtest-1.8.0/xcode/gtest.xcodeproj/project.pbxproj index aefaa88b05..003bff8cb8 100644 --- a/test/gtest-1.8.0/xcode/gtest.xcodeproj/project.pbxproj +++ b/test/gtest-1.8.0/xcode/gtest.xcodeproj/project.pbxproj @@ -79,6 +79,13 @@ 4539C9390EC280E200A70F4C /* gtest-param-util-generated.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */; }; 4539C93A0EC280E200A70F4C /* gtest-param-util.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9370EC280E200A70F4C /* gtest-param-util.h */; }; 4567C8181264FF71007740BE /* gtest-printers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4567C8171264FF71007740BE /* gtest-printers.h */; settings = {ATTRIBUTES = (Public, ); }; }; + F67D4F3E1C7F5D8B0017C729 /* gtest-port-arch.h in Headers */ = {isa = PBXBuildFile; fileRef = F67D4F3D1C7F5D8B0017C729 /* gtest-port-arch.h */; }; + F67D4F3F1C7F5DA70017C729 /* gtest-port-arch.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = F67D4F3D1C7F5D8B0017C729 /* gtest-port-arch.h */; }; + F67D4F441C7F5DD00017C729 /* gtest-port.h in Headers */ = {isa = PBXBuildFile; fileRef = F67D4F411C7F5DD00017C729 /* gtest-port.h */; }; + F67D4F451C7F5DD00017C729 /* gtest-printers.h in Headers */ = {isa = PBXBuildFile; fileRef = F67D4F421C7F5DD00017C729 /* gtest-printers.h */; }; + F67D4F461C7F5DD00017C729 /* gtest.h in Headers */ = {isa = PBXBuildFile; fileRef = F67D4F431C7F5DD00017C729 /* gtest.h */; }; + F67D4F481C7F5E160017C729 /* gtest-port.h in Copy Headers Internal Custom */ = {isa = PBXBuildFile; fileRef = F67D4F411C7F5DD00017C729 /* gtest-port.h */; }; + F67D4F491C7F5E260017C729 /* gtest-printers.h in Copy Headers Internal Custom */ = {isa = PBXBuildFile; fileRef = F67D4F421C7F5DD00017C729 /* gtest-printers.h */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -182,6 +189,7 @@ dstPath = Headers/internal; dstSubfolderSpec = 6; files = ( + F67D4F3F1C7F5DA70017C729 /* gtest-port-arch.h in Copy Headers Internal */, 404884A00E2F7BE600CF7658 /* gtest-death-test-internal.h in Copy Headers Internal */, 404884A10E2F7BE600CF7658 /* gtest-filepath.h in Copy Headers Internal */, 404884A20E2F7BE600CF7658 /* gtest-internal.h in Copy Headers Internal */, @@ -196,6 +204,18 @@ name = "Copy Headers Internal"; runOnlyForDeploymentPostprocessing = 0; }; + F67D4F471C7F5DF60017C729 /* Copy Headers Internal Custom */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = Headers/internal/custom; + dstSubfolderSpec = 6; + files = ( + F67D4F491C7F5E260017C729 /* gtest-printers.h in Copy Headers Internal Custom */, + F67D4F481C7F5E160017C729 /* gtest-port.h in Copy Headers Internal Custom */, + ); + name = "Copy Headers Internal Custom"; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -244,6 +264,10 @@ 4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-util-generated.h"; sourceTree = ""; }; 4539C9370EC280E200A70F4C /* gtest-param-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-util.h"; sourceTree = ""; }; 4567C8171264FF71007740BE /* gtest-printers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-printers.h"; sourceTree = ""; }; + F67D4F3D1C7F5D8B0017C729 /* gtest-port-arch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-port-arch.h"; sourceTree = ""; }; + F67D4F411C7F5DD00017C729 /* gtest-port.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-port.h"; sourceTree = ""; }; + F67D4F421C7F5DD00017C729 /* gtest-printers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-printers.h"; sourceTree = ""; }; + F67D4F431C7F5DD00017C729 /* gtest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gtest.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -375,6 +399,7 @@ 404883E10E2F799B00CF7658 /* internal */ = { isa = PBXGroup; children = ( + F67D4F401C7F5DD00017C729 /* custom */, 404883E20E2F799B00CF7658 /* gtest-death-test-internal.h */, 404883E30E2F799B00CF7658 /* gtest-filepath.h */, 404883E40E2F799B00CF7658 /* gtest-internal.h */, @@ -382,6 +407,7 @@ 4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */, 4539C9370EC280E200A70F4C /* gtest-param-util.h */, 404883E50E2F799B00CF7658 /* gtest-port.h */, + F67D4F3D1C7F5D8B0017C729 /* gtest-port-arch.h */, 404883E60E2F799B00CF7658 /* gtest-string.h */, 40899F4D0FFA7271000B29AE /* gtest-tuple.h */, 3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */, @@ -430,6 +456,16 @@ path = Resources; sourceTree = ""; }; + F67D4F401C7F5DD00017C729 /* custom */ = { + isa = PBXGroup; + children = ( + F67D4F411C7F5DD00017C729 /* gtest-port.h */, + F67D4F421C7F5DD00017C729 /* gtest-printers.h */, + F67D4F431C7F5DD00017C729 /* gtest.h */, + ); + path = custom; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -437,10 +473,14 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + F67D4F451C7F5DD00017C729 /* gtest-printers.h in Headers */, 404884380E2F799B00CF7658 /* gtest-death-test.h in Headers */, 404884390E2F799B00CF7658 /* gtest-message.h in Headers */, 4539C9340EC280AE00A70F4C /* gtest-param-test.h in Headers */, + F67D4F461C7F5DD00017C729 /* gtest.h in Headers */, + F67D4F441C7F5DD00017C729 /* gtest-port.h in Headers */, 4567C8181264FF71007740BE /* gtest-printers.h in Headers */, + F67D4F3E1C7F5D8B0017C729 /* gtest-port-arch.h in Headers */, 3BF6F2A50E79B616000F2EEE /* gtest-typed-test.h in Headers */, 4048843A0E2F799B00CF7658 /* gtest-spi.h in Headers */, 4048843B0E2F799B00CF7658 /* gtest.h in Headers */, @@ -560,6 +600,7 @@ 8D07F2C10486CC7A007CD1D0 /* Sources */, 8D07F2BD0486CC7A007CD1D0 /* Headers */, 404884A50E2F7C0400CF7658 /* Copy Headers Internal */, + F67D4F471C7F5DF60017C729 /* Copy Headers Internal Custom */, 8D07F2BF0486CC7A007CD1D0 /* Resources */, ); buildRules = ( @@ -1026,6 +1067,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 40D4CDF10E30E07400294801 /* DebugProject.xcconfig */; buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + MACOSX_DEPLOYMENT_TARGET = 10.7; }; name = Debug; }; @@ -1033,6 +1077,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */; buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + MACOSX_DEPLOYMENT_TARGET = 10.7; }; name = Release; }; From 44c8e77ee6b0a448806854b0d513143496a233b3 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 25 May 2018 08:44:00 -0700 Subject: [PATCH 037/363] Update bootstrappers --- run.ps1 | 22 +++++++++++++++++----- run.sh | 16 +++++++++++++++- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/run.ps1 b/run.ps1 index b7de403018..412062239a 100644 --- a/run.ps1 +++ b/run.ps1 @@ -26,12 +26,18 @@ The base url where build tools can be downloaded. Overrides the value from the c .PARAMETER Update Updates KoreBuild to the latest version even if a lock file is present. +.PARAMETER Reinstall +Re-installs KoreBuild + .PARAMETER ConfigFile The path to the configuration file that stores values. Defaults to korebuild.json. .PARAMETER ToolsSourceSuffix The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores. +.PARAMETER CI +Sets up CI specific settings and variables. + .PARAMETER Arguments Arguments to be passed to the command @@ -65,8 +71,10 @@ param( [string]$ToolsSource, [Alias('u')] [switch]$Update, - [string]$ConfigFile, + [switch]$Reinstall, [string]$ToolsSourceSuffix, + [string]$ConfigFile = $null, + [switch]$CI, [Parameter(ValueFromRemainingArguments = $true)] [string[]]$Arguments ) @@ -93,6 +101,10 @@ function Get-KoreBuild { $version = $version.TrimStart('version:').Trim() $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version) + if ($Reinstall -and (Test-Path $korebuildPath)) { + Remove-Item -Force -Recurse $korebuildPath + } + if (!(Test-Path $korebuildPath)) { Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version" New-Item -ItemType Directory -Path $korebuildPath | Out-Null @@ -101,9 +113,9 @@ function Get-KoreBuild { try { $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip" Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix - if (Get-Command -Name 'Expand-Archive' -ErrorAction Ignore) { + if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) { # Use built-in commands where possible as they are cross-plat compatible - Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath + Microsoft.PowerShell.Archive\Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath } else { # Fallback to old approach for old installations of PowerShell @@ -188,9 +200,9 @@ $korebuildPath = Get-KoreBuild Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') try { - Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile + Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI Invoke-KoreBuildCommand $Command @Arguments } finally { Remove-Module 'KoreBuild' -ErrorAction Ignore -} \ No newline at end of file +} diff --git a/run.sh b/run.sh index 834961fc3a..27e7d7ac6f 100755 --- a/run.sh +++ b/run.sh @@ -14,10 +14,12 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" [ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" verbose=false update=false +reinstall=false repo_path="$DIR" channel='' tools_source='' tools_source_suffix='' +ci=false # # Functions @@ -38,6 +40,8 @@ __usage() { echo " -s|--tools-source|-ToolsSource The base url where build tools can be downloaded. Overrides the value from the config file." echo " --tools-source-suffix|-ToolsSourceSuffix The suffix to append to tools-source. Useful for query strings." echo " -u|--update Update to the latest KoreBuild even if the lock file is present." + echo " --reinstall Reinstall KoreBuild." + echo " --ci Apply CI specific settings and environment variables." echo "" echo "Description:" echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be." @@ -62,6 +66,10 @@ get_korebuild() { version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version" + if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then + rm -rf "$korebuild_path" + fi + { if [ ! -d "$korebuild_path" ]; then mkdir -p "$korebuild_path" @@ -175,6 +183,12 @@ while [[ $# -gt 0 ]]; do -u|--update|-Update) update=true ;; + --reinstall|-[Rr]einstall) + reinstall=true + ;; + --ci|-[Cc][Ii]) + ci=true + ;; --verbose|-Verbose) verbose=true ;; @@ -227,5 +241,5 @@ fi [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' get_korebuild -set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" +set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci" invoke_korebuild_command "$command" "$@" From d041f89c9d537291f17e350d33d08303ed60911c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 25 May 2018 09:30:06 -0700 Subject: [PATCH 038/363] Remove E_OUTOFMEMORY check for new. (#863) --- .../AspNetCore/Inc/applicationmanager.h | 5 ---- .../AspNetCore/src/applicationinfo.cpp | 5 ---- .../AspNetCore/src/applicationmanager.cxx | 11 -------- .../AspNetCore/src/aspnetcore_shim_config.cpp | 5 ---- .../AspNetCore/src/dllmain.cpp | 16 ------------ .../AspNetCore/src/proxymodule.cxx | 6 ----- .../CommonLib/environmentvariablehelpers.h | 23 +++-------------- .../CommonLib/hostfxr_utility.cpp | 15 +++++------ .../CommonLib/requesthandler_config.cpp | 19 +++----------- src/AspNetCoreModuleV2/CommonLib/utility.cxx | 5 ---- .../managedexports.cxx | 4 ++- .../outofprocess/forwardinghandler.cpp | 20 --------------- .../outofprocess/outprocessapplication.cpp | 5 ---- .../outofprocess/processmanager.cxx | 11 -------- .../outofprocess/serverprocess.cxx | 25 ------------------- 15 files changed, 15 insertions(+), 160 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h index 3e035e2133..7d2cb29e66 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h @@ -106,11 +106,6 @@ public: if(m_pApplicationInfoHash == NULL) { m_pApplicationInfoHash = new APPLICATION_INFO_HASH(); - if(m_pApplicationInfoHash == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } hr = m_pApplicationInfoHash->Initialize(DEFAULT_HASH_BUCKETS); if(FAILED(hr)) diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index c2671bcdda..34a061c0b4 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -66,11 +66,6 @@ APPLICATION_INFO::Initialize( if (m_pFileWatcherEntry == NULL) { m_pFileWatcherEntry = new FILE_WATCHER_ENTRY(pFileWatcher); - if (m_pFileWatcherEntry == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } } UpdateAppOfflineFileHandle(); diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx index c5e52862ad..b8ebc40471 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx @@ -76,11 +76,6 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( goto Finished; } pApplicationInfo = new APPLICATION_INFO(pServer); - if (pApplicationInfo == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } AcquireSRWLockExclusive(&m_srwLock); fExclusiveLock = TRUE; @@ -286,12 +281,6 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( // This will be used for finding differences in which applications are affected by a config change. table = new APPLICATION_INFO_HASH(); - if (table == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } - // few application expected, small bucket size for hash table if (FAILED(hr = table->Initialize(17 /*prime*/))) { diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp index d1cf69b705..ea6441abf9 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp @@ -61,11 +61,6 @@ ASPNETCORE_SHIM_CONFIG::GetConfig( } pAspNetCoreShimConfig = new ASPNETCORE_SHIM_CONFIG; - if (pAspNetCoreShimConfig == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } hr = pAspNetCoreShimConfig->Populate(pHttpServer, pHttpApplication); if (FAILED(hr)) diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp index 3e0cffc323..88cc19991b 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp @@ -182,12 +182,6 @@ HRESULT // pFactory = new ASPNET_CORE_PROXY_MODULE_FACTORY; - if (pFactory == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } - hr = pModuleInfo->SetRequestNotifications( pFactory, RQ_EXECUTE_REQUEST_HANDLER, @@ -199,11 +193,6 @@ HRESULT pFactory = NULL; pApplicationManager = APPLICATION_MANAGER::GetInstance(); - if(pApplicationManager == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } hr = pApplicationManager->Initialize(); if(FAILED(hr)) @@ -213,11 +202,6 @@ HRESULT pGlobalModule = NULL; pGlobalModule = new ASPNET_CORE_GLOBAL_MODULE(pApplicationManager); - if (pGlobalModule == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } hr = pModuleInfo->SetGlobalNotifications( pGlobalModule, diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index a7a708e8d3..4156865a41 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -16,7 +16,6 @@ ASPNET_CORE_PROXY_MODULE_FACTORY::GetHttpModule( { return E_OUTOFMEMORY; } - *ppModule = pModule; return S_OK; } @@ -97,11 +96,6 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( } pApplicationManager = APPLICATION_MANAGER::GetInstance(); - if (pApplicationManager == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } hr = pApplicationManager->GetOrCreateApplicationInfo( g_pHttpServer, diff --git a/src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h b/src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h index 9652272d84..35155faedf 100644 --- a/src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h +++ b/src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h @@ -206,11 +206,6 @@ public: ENVIRONMENT_VAR_HASH* pEnvironmentVarTable = NULL; pEnvironmentVarTable = new ENVIRONMENT_VAR_HASH(); - if (pEnvironmentVarTable == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } // // few environment variables expected, small bucket size for hash table @@ -258,11 +253,7 @@ public: } pIISAuthEntry = new ENVIRONMENT_VAR_ENTRY(); - if (pIISAuthEntry == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } + if (FAILED(hr = pIISAuthEntry->Initialize(ASPNETCORE_IIS_AUTH_ENV_STR, strIisAuthEnvValue.QueryStr())) || FAILED(hr = pEnvironmentVarTable->InsertRecord(pIISAuthEntry))) { @@ -329,11 +320,7 @@ public: // the environment variable was not defined, create it and add to hashtable pHostingEntry = new ENVIRONMENT_VAR_ENTRY(); - if (pHostingEntry == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } + if (FAILED(hr = pHostingEntry->Initialize(HOSTING_STARTUP_ASSEMBLIES_NAME, strStartupAssemblyEnv.QueryStr())) || FAILED(hr = pEnvironmentVarTable->InsertRecord(pHostingEntry))) { @@ -403,11 +390,7 @@ public: } pIISWebsocketEntry = new ENVIRONMENT_VAR_ENTRY(); - if (pIISWebsocketEntry == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } + if (FAILED(hr = pIISWebsocketEntry->Initialize(ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED_ENV_STR, strIISWebsocketEnvValue.QueryStr())) || FAILED(hr = pInEnvironmentVarTable->InsertRecord(pIISWebsocketEntry))) { diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index 68e6ea0584..6ea7c46eeb 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -226,7 +226,8 @@ HOSTFXR_UTILITY::GetHostFxrParameters( goto Finished; } - if (FAILED(hr = pStruExeAbsolutePath->Copy(struAbsolutePathToDotnet))) { + if (FAILED(hr = pStruExeAbsolutePath->Copy(struAbsolutePathToDotnet))) + { goto Finished; } } @@ -252,7 +253,8 @@ HOSTFXR_UTILITY::GetHostFxrParameters( goto Finished; } - if (FAILED(hr = pStruExeAbsolutePath->Copy(struAbsolutePathToDotnet))) { + if (FAILED(hr = pStruExeAbsolutePath->Copy(struAbsolutePathToDotnet))) + { goto Finished; } } @@ -299,6 +301,7 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( DBG_ASSERT(dwArgCount != NULL); DBG_ASSERT(pwzArgv != NULL); + DBG_ASSERT(pwzExePath != NULL); HRESULT hr = S_OK; INT argc = 0; @@ -324,24 +327,18 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( } argv = new BSTR[argc + 1]; - if (argv == NULL) - { - hr = E_OUTOFMEMORY; - goto Failure; - } argv[0] = SysAllocString(pwzExePath); - if (argv[0] == NULL) { hr = E_OUTOFMEMORY; goto Failure; } - // Try to convert the application dll from a relative to an absolute path // Don't record this failure as pwzArgs[0] may already be an absolute path to the dll. for (intArgsProcessed = 0; intArgsProcessed < argc; intArgsProcessed++) { + DBG_ASSERT(pwzArgs[intArgsProcessed] != NULL); struTempPath.Copy(pwzArgs[intArgsProcessed]); if (struTempPath.EndsWith(L".dll")) { diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp index 01ca92f1ce..a341445fc6 100644 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp @@ -42,11 +42,6 @@ REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig( *ppAspNetCoreConfig = NULL; pRequestHandlerConfig = new REQUESTHANDLER_CONFIG; - if (pRequestHandlerConfig == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } hr = pRequestHandlerConfig->Populate(pHttpServer, pHttpApplication); if (FAILED(hr)) @@ -110,11 +105,6 @@ REQUESTHANDLER_CONFIG::Populate( BSTR bstrAspNetCoreSection = NULL; m_pEnvironmentVariables = new ENVIRONMENT_VAR_HASH(); - if (m_pEnvironmentVariables == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } if (FAILED(hr = m_pEnvironmentVariables->Initialize(37 /*prime*/))) { delete m_pEnvironmentVariables; @@ -168,7 +158,6 @@ REQUESTHANDLER_CONFIG::Populate( hr = E_OUTOFMEMORY; goto Finished; } - hr = pAdminManager->GetAdminSection(bstrWindowAuthSection, m_struConfigPath.QueryStr(), &pWindowsAuthenticationElement); @@ -196,6 +185,7 @@ REQUESTHANDLER_CONFIG::Populate( hr = E_OUTOFMEMORY; goto Finished; } + hr = pAdminManager->GetAdminSection(bstrBasicAuthSection, m_struConfigPath.QueryStr(), &pBasicAuthenticationElement); @@ -213,12 +203,14 @@ REQUESTHANDLER_CONFIG::Populate( goto Finished; } } + bstrAnonymousAuthSection = SysAllocString(CS_ANONYMOUS_AUTHENTICATION_SECTION); if (bstrAnonymousAuthSection == NULL) { hr = E_OUTOFMEMORY; goto Finished; } + hr = pAdminManager->GetAdminSection(bstrAnonymousAuthSection, m_struConfigPath.QueryStr(), &pAnonymousAuthenticationElement); @@ -419,11 +411,6 @@ REQUESTHANDLER_CONFIG::Populate( } pEntry = new ENVIRONMENT_VAR_ENTRY(); - if (pEntry == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } if (FAILED(hr = pEntry->Initialize(strEnvName.QueryStr(), strExpandedEnvValue.QueryStr())) || FAILED(hr = m_pEnvironmentVariables->InsertRecord(pEntry))) diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.cxx b/src/AspNetCoreModuleV2/CommonLib/utility.cxx index ed31d17305..a7bb7b1d63 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.cxx +++ b/src/AspNetCoreModuleV2/CommonLib/utility.cxx @@ -409,11 +409,6 @@ UTILITY::ConvertPathToFullPath( } pszFullPath = new WCHAR[ strFileFullPath.QueryCCH() + 1]; - if ( pszFullPath == NULL ) - { - hr = E_OUTOFMEMORY; - goto Finished; - } if(_wfullpath( pszFullPath, strFileFullPath.QueryStr(), diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx index 1f4528c6b3..c548d6b85f 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx @@ -53,6 +53,9 @@ http_get_server_variable( { PCWSTR pszVariableValue; DWORD cbLength; + + DBG_ASSERT(pszVariableValue != NULL); + HRESULT hr = pInProcessHandler ->QueryHttpContext() ->GetServerVariable(pszVariableName, &pszVariableValue, &cbLength); @@ -69,7 +72,6 @@ http_get_server_variable( hr = E_OUTOFMEMORY; goto Finished; } - Finished: return hr; } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp index 149b06edef..1b3df88da0 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp @@ -208,11 +208,6 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() if (m_pDisconnect == NULL) { m_pDisconnect = new ASYNC_DISCONNECT_CONTEXT(); - if (m_pDisconnect == NULL) - { - hr = E_OUTOFMEMORY; - goto Failure; - } hr = pClientConnection->GetModuleContextContainer()-> SetConnectionModuleContext(m_pDisconnect, @@ -459,11 +454,6 @@ REQUEST_NOTIFICATION_STATUS // This should be the write completion of the 101 response. // m_pWebSocket = new WEBSOCKET_HANDLER(); - if (m_pWebSocket == NULL) - { - hr = E_OUTOFMEMORY; - goto Failure; - } hr = m_pWebSocket->ProcessRequest(this, m_pW3Context, m_hRequest, &fWebSocketUpgraded); if (fWebSocketUpgraded) @@ -718,11 +708,6 @@ HRESULT HRESULT hr = S_OK; sm_pAlloc = new ALLOC_CACHE_HANDLER; - if (sm_pAlloc == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } hr = sm_pAlloc->Initialize(sizeof(FORWARDING_HANDLER), 64); // nThreshold @@ -732,11 +717,6 @@ HRESULT } sm_pResponseHeaderHash = new RESPONSE_HEADER_HASH; - if (sm_pResponseHeaderHash == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } hr = sm_pResponseHeaderHash->Initialize(); if (FAILED(hr)) diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp index 356029efd3..3e6bb30299 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp @@ -34,11 +34,6 @@ OUT_OF_PROCESS_APPLICATION::Initialize( if (m_pProcessManager == NULL) { m_pProcessManager = new PROCESS_MANAGER; - if (m_pProcessManager == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } hr = m_pProcessManager->Initialize(); if (FAILED(hr)) diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx index 7c75d65a0d..7241362d31 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx @@ -123,11 +123,6 @@ PROCESS_MANAGER::GetProcess( { m_dwProcessesPerApplication = pConfig->QueryProcessesPerApplication(); m_ppServerProcessList = new SERVER_PROCESS*[m_dwProcessesPerApplication]; - if (m_ppServerProcessList == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } for (DWORD i = 0; i < m_dwProcessesPerApplication; ++i) { @@ -203,12 +198,6 @@ PROCESS_MANAGER::GetProcess( { pSelectedServerProcess = new SERVER_PROCESS(); - if (pSelectedServerProcess == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } - hr = pSelectedServerProcess->Initialize( this, //ProcessManager diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx index cedbd0ba12..4deea28d74 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx @@ -187,11 +187,6 @@ SERVER_PROCESS::SetupListenPort( } pEntry = new ENVIRONMENT_VAR_ENTRY(); - if (pEntry == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } if (FAILED(hr = pEntry->Initialize(ASPNETCORE_PORT_ENV_STR, buffer)) || FAILED(hr = pEnvironmentVarTable->InsertRecord(pEntry)) || @@ -242,11 +237,6 @@ SERVER_PROCESS::SetupAppPath( } pEntry = new ENVIRONMENT_VAR_ENTRY(); - if (pEntry == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } if (FAILED(hr = pEntry->Initialize(ASPNETCORE_APP_PATH_ENV_STR, m_struAppVirtualPath.QueryStr())) || FAILED(hr = pEnvironmentVarTable->InsertRecord(pEntry))) @@ -314,11 +304,6 @@ SERVER_PROCESS::SetupAppToken( } pEntry = new ENVIRONMENT_VAR_ENTRY(); - if (pEntry == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } if (FAILED(strAppToken.CopyA(m_straGuid.QueryStr())) || FAILED(hr = pEntry->Initialize(ASPNETCORE_APP_TOKEN_ENV_STR, strAppToken.QueryStr())) || @@ -458,11 +443,6 @@ SERVER_PROCESS::SetupCommandLine( dwBufferSize = strRelativePath.QueryCCH() + 1; pszFullPath = new WCHAR[dwBufferSize]; - if (pszFullPath == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } if (_wfullpath(pszFullPath, strRelativePath.QueryStr(), @@ -694,11 +674,6 @@ SERVER_PROCESS::PostStartCheck( if (m_pForwarderConnection == NULL) { m_pForwarderConnection = new FORWARDER_CONNECTION(); - if (m_pForwarderConnection == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } hr = m_pForwarderConnection->Initialize(m_dwPort); if (FAILED(hr)) From 1d4921e168c0b5bf836b9c020a5f6f369a545011 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 25 May 2018 12:07:42 -0700 Subject: [PATCH 039/363] Skip TestServerTest on win7 (#865) --- test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs b/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs index 5e78794eb1..b48611b2fa 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs @@ -21,6 +21,7 @@ namespace IISIntegration.FunctionalTests.Inprocess } [ConditionalFact] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] public async Task Test() { var helloWorld = "Hello World"; From a8122026a6bc874107d27e5b598370bee2b07e2c Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 25 May 2018 12:34:55 -0700 Subject: [PATCH 040/363] Remove gtest output folder from repo root (#869) --- test/gtest-1.8.0/msvc/2010/gtest.vcxproj | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/test/gtest-1.8.0/msvc/2010/gtest.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest.vcxproj index 060d178074..2c76683582 100644 --- a/test/gtest-1.8.0/msvc/2010/gtest.vcxproj +++ b/test/gtest-1.8.0/msvc/2010/gtest.vcxproj @@ -66,16 +66,6 @@ $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ $(OutDir)temp\$(ProjectName)\ - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - gtestd - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - gtest - gtestd From b7e05e453b6b3f106f88803113e4aa332d0b1f7f Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 25 May 2018 12:46:32 -0700 Subject: [PATCH 041/363] Try to fix Jenkins (#870) --- build/buildpipeline/windows.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy index f756534198..249f595d47 100644 --- a/build/buildpipeline/windows.groovy +++ b/build/buildpipeline/windows.groovy @@ -8,7 +8,7 @@ simpleNode('Windows.10.Enterprise.RS3.ASPNET') { } stage ('Build') { def logFolder = getLogFolder() - def environment = "set ASPNETCORE_TEST_LOG_DIR=${WORKSPACE}\\${logFolder}" - bat "${environment}&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}" + def environment = "\$env:ASPNETCORE_TEST_LOG_DIR=\"${WORKSPACE}\\${logFolder}\"" + batchFile ("powershell -Command \"&.\\tools\\update_schema.ps1;${environment};&.\\run.ps1 -CI default-build /p:Configuration=${params.Configuration}\"") } } From 1f34c631d6891c405e4d21887e47f39c84b75bc8 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 25 May 2018 14:06:52 -0700 Subject: [PATCH 042/363] Fix P2P build order dependencies (#871) --- IISIntegration.sln | 58 ++- .../CommonLib/CommonLib.vcxproj | 10 +- .../InProcessRequestHandler.vcxproj | 480 +++++++++--------- 3 files changed, 278 insertions(+), 270 deletions(-) diff --git a/IISIntegration.sln b/IISIntegration.sln index 4d00cd78dd..59050d5d89 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -27,9 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "samples\IISSam EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{8B3446E8-E6A8-4591-AA63-A95837C6E97C}" ProjectSection(ProjectDependencies) = postProject - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} - {D57EA297-6DC2-4BC0-8C91-334863327863} = {D57EA297-6DC2-4BC0-8C91-334863327863} - {439824F9-1455-4CC4-BD79-B44FA0A16552} = {439824F9-1455-4CC4-BD79-B44FA0A16552} + {46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473} EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "test\Microsoft.AspNetCore.Server.IISIntegration.Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{4106DB10-E09F-480E-9CE6-B39235512EE6}" @@ -47,36 +45,40 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISIntegration.FunctionalTests", "test\IISIntegration.FunctionalTests\IISIntegration.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}" + ProjectSection(ProjectDependencies) = postProject + {7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67} + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeIISSample", "samples\NativeIISSample\NativeIISSample.csproj", "{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}" - ProjectSection(ProjectDependencies) = postProject - {D57EA297-6DC2-4BC0-8C91-334863327863} = {D57EA297-6DC2-4BC0-8C91-334863327863} - {439824F9-1455-4CC4-BD79-B44FA0A16552} = {439824F9-1455-4CC4-BD79-B44FA0A16552} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "test\WebSites\InProcessWebSite\InProcessWebSite.csproj", "{679FA2A2-898B-4320-884E-C2D294A97CE1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj", "{46A8612B-418B-4D70-B3A7-A21DD0627473}" ProjectSection(ProjectDependencies) = postProject + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} + {55494E58-E061-4C4C-A0A8-837008E72F85} = {55494E58-E061-4C4C-A0A8-837008E72F85} + {7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67} {D57EA297-6DC2-4BC0-8C91-334863327863} = {D57EA297-6DC2-4BC0-8C91-334863327863} {439824F9-1455-4CC4-BD79-B44FA0A16552} = {439824F9-1455-4CC4-BD79-B44FA0A16552} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj", "{46A8612B-418B-4D70-B3A7-A21DD0627473}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StressTestWebSite", "test\WebSites\StressTestWebSite\StressTestWebSite.csproj", "{13FD8F12-FFBE-4D01-B4AC-444F2994B04F}" + ProjectSection(ProjectDependencies) = postProject + {46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473} + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "test\TestTasks\TestTasks.csproj", "{064D860B-4D7C-4B1D-918F-E020F1B99E2A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OverriddenServerWebSite", "test\WebSites\OverriddenServerWebSite\OverriddenServerWebSite.csproj", "{FC2A97F8-A749-4C04-97D1-97500066A820}" - ProjectSection(ProjectDependencies) = postProject - {D57EA297-6DC2-4BC0-8C91-334863327863} = {D57EA297-6DC2-4BC0-8C91-334863327863} - {439824F9-1455-4CC4-BD79-B44FA0A16552} = {439824F9-1455-4CC4-BD79-B44FA0A16552} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "test\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}" + ProjectSection(ProjectDependencies) = postProject + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest-1.8.0\msvc\2010\gtest.vcxproj", "{2AF210A9-5BDC-45E8-95DD-07B5A2616493}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest-1.8.0\msvc\2010\gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV1", "AspNetCoreModuleV1", "{16E521CE-77F1-4B1C-A183-520A41C4F372}" EndProject @@ -97,8 +99,14 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{622D35C9-627B-466E-8D15-752968CC79AF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Performance", "benchmarks\IIS.Performance\IIS.Performance.csproj", "{48F46909-E76A-4788-BCE1-E543C0E140FE}" + ProjectSection(ProjectDependencies) = postProject + {46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", "src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}" + ProjectSection(ProjectDependencies) = postProject + {09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {09D9D1D6-2951-4E14-BC35-76A23CF9391A} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}" EndProject @@ -236,16 +244,16 @@ Global {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.Build.0 = Release|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.ActiveCfg = Release|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.Build.0 = Release|Win32 - {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Debug|x64.ActiveCfg = Debug|x64 - {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Debug|x64.Build.0 = Debug|x64 - {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Debug|x86.ActiveCfg = Debug|Win32 - {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Debug|x86.Build.0 = Debug|Win32 - {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Release|Any CPU.ActiveCfg = Release|Win32 - {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Release|x64.ActiveCfg = Release|x64 - {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Release|x64.Build.0 = Release|x64 - {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Release|x86.ActiveCfg = Release|Win32 - {2AF210A9-5BDC-45E8-95DD-07B5A2616493}.Release|x86.Build.0 = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x86.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x86.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Any CPU.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x86.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x86.Build.0 = Release|Win32 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Any CPU.ActiveCfg = Debug|Win32 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.ActiveCfg = Debug|x64 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.Build.0 = Debug|x64 @@ -355,7 +363,7 @@ Global {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {FC2A97F8-A749-4C04-97D1-97500066A820} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {2AF210A9-5BDC-45E8-95DD-07B5A2616493} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {16E521CE-77F1-4B1C-A183-520A41C4F372} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {06CA2C2B-83B0-4D83-905A-E0C74790009E} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE} = {16E521CE-77F1-4B1C-A183-520A41C4F372} diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 3b33efff12..ba9bfb352a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -202,11 +202,6 @@ - - - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - - Document @@ -224,6 +219,11 @@ %(Filename).rc;%(Filename).h;MSG0409.bin + + + {09d9d1d6-2951-4e14-bc35-76a23cf9391a} + + diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 7cb549ffd1..f77b896393 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -1,241 +1,241 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {D57EA297-6DC2-4BC0-8C91-334863327863} - Win32Proj - InProcessRequestHandler - 10.0.15063.0 - InProcessRequestHandler - - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - - aspnetcorev2_inprocess - - - false - - - false - - - - NotUsing - Level4 - Disabled - WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx - $(IntDir)$(TargetName).pch - ProgramDatabase - MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) - Source.def - - - - - NotUsing - Level4 - Disabled - WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx - $(IntDir)$(TargetName).pch - ProgramDatabase - MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) - Source.def - - - - - Level4 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx - MultiThreaded - ..\IISLib;..\CommonLib;.\Inc - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - - - Windows - false - true - true - Source.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) - - - - - Level4 - NotUsing - MaxSpeed - true - true - NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx - MultiThreaded - ..\IISLib;..\CommonLib;.\Inc - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - - - Windows - false - true - true - Source.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - {55494e58-e061-4c4c-a0a8-837008e72f85} - - - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - - - - - - - - - - - - + + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {D57EA297-6DC2-4BC0-8C91-334863327863} + Win32Proj + InProcessRequestHandler + 10.0.15063.0 + InProcessRequestHandler + + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + aspnetcorev2_inprocess + + + false + + + false + + + + NotUsing + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + precomp.hxx + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + Source.def + + + + + NotUsing + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + precomp.hxx + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + Source.def + + + + + Level4 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) + precomp.hxx + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + false + true + true + Source.def + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) + + + + + Level4 + NotUsing + MaxSpeed + true + true + NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + precomp.hxx + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + false + true + true + Source.def + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {09d9d1d6-2951-4e14-bc35-76a23cf9391a} + + + + + + + + + + + + \ No newline at end of file From 2354dc072318dedd5b328aa4b9e3e40cbfa0e996 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 25 May 2018 16:08:16 -0700 Subject: [PATCH 043/363] Fix Jenkins even more (#872) --- build/buildpipeline/windows.groovy | 4 ++-- tools/update_schema.ps1 | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy index 249f595d47..a88d4c9cea 100644 --- a/build/buildpipeline/windows.groovy +++ b/build/buildpipeline/windows.groovy @@ -8,7 +8,7 @@ simpleNode('Windows.10.Enterprise.RS3.ASPNET') { } stage ('Build') { def logFolder = getLogFolder() - def environment = "\$env:ASPNETCORE_TEST_LOG_DIR=\"${WORKSPACE}\\${logFolder}\"" - batchFile ("powershell -Command \"&.\\tools\\update_schema.ps1;${environment};&.\\run.ps1 -CI default-build /p:Configuration=${params.Configuration}\"") + def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" + bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"&.\\tools\\update_schema.ps1;${environment};&.\\run.ps1 -CI default-build /p:Configuration=${params.Configuration}\"" } } diff --git a/tools/update_schema.ps1 b/tools/update_schema.ps1 index a887c69551..64f8248af4 100644 --- a/tools/update_schema.ps1 +++ b/tools/update_schema.ps1 @@ -49,12 +49,20 @@ for ($i=0; $i -lt $ancmSchemaFiles.Length; $i++) $schemaSource = $ancmSchemaFileLocations[$i] $destinations = @( - "${env:ProgramFiles(x86)}\IIS Express\config\schema\${schemaFile}", - "${env:ProgramFiles}\IIS Express\config\schema\${schemaFile}", - "${env:windir}\system32\inetsrv\config\schema\${schemaFile}" + "${env:ProgramFiles(x86)}\IIS Express\config\schema\", + "${env:ProgramFiles}\IIS Express\config\schema\", + "${env:windir}\system32\inetsrv\config\schema\" ) - foreach ($dest in $destinations) { + foreach ($destPath in $destinations) { + $dest = "$destPath\${schemaFile}"; + + if (!(Test-Path $destPath)) + { + Write-Host "$destPath doesn't exist" + continue; + } + if ($PSCmdlet.ShouldProcess($dest, "Replace file")) { Write-Host "Updated $dest" Move-Item $dest "${dest}.bak" -ErrorAction Ignore From a3cbf9cc55d7104b6fa39c039441e3fde0594ec7 Mon Sep 17 00:00:00 2001 From: "Nate McMaster (automated)" Date: Fri, 25 May 2018 16:14:38 -0700 Subject: [PATCH 044/363] Update bootstrapper scripts (automated commit) [ci skip] --- run.ps1 | 5 +++-- run.sh | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/run.ps1 b/run.ps1 index 412062239a..3b27382468 100644 --- a/run.ps1 +++ b/run.ps1 @@ -179,8 +179,9 @@ if (Test-Path $ConfigFile) { } } catch { - Write-Warning "$ConfigFile could not be read. Its settings will be ignored." - Write-Warning $Error[0] + Write-Host -ForegroundColor Red $Error[0] + Write-Error "$ConfigFile contains invalid JSON." + exit 1 } } diff --git a/run.sh b/run.sh index 27e7d7ac6f..02aac15874 100755 --- a/run.sh +++ b/run.sh @@ -220,17 +220,28 @@ if [ -f "$config_file" ]; then config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" else - __warn "$config_file is invalid JSON. Its settings will be ignored." + _error "$config_file contains invalid JSON." + exit 1 fi elif __machine_has python ; then if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" else - __warn "$config_file is invalid JSON. Its settings will be ignored." + _error "$config_file contains invalid JSON." + exit 1 + fi + elif __machine_has python3 ; then + if python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then + config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" + config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" + else + _error "$config_file contains invalid JSON." + exit 1 fi else - __warn 'Missing required command: jq or pyton. Could not parse the JSON file. Its settings will be ignored.' + _error 'Missing required command: jq or python. Could not parse the JSON file.' + exit 1 fi [ ! -z "${config_channel:-}" ] && channel="$config_channel" From 04656d97904b72ad34fc67999df930325d2edd9d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 27 May 2018 19:17:00 +0000 Subject: [PATCH 045/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 72 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index a179cb7665..f830eacdd0 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,48 +4,48 @@ 0.10.13 - 2.2.0-preview1-17060 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 0.6.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 + 2.2.0-preview1-17064 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 0.6.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 15.6.82 15.6.82 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 2.0.0 2.1.0-rc1 - 2.2.0-preview1-26509-06 - 2.2.0-preview1-34255 + 2.2.0-preview1-26526-03 + 2.2.0-preview1-34326 15.6.1 2.0.3 - 4.6.0-preview1-26508-04 - 4.6.0-preview1-26508-04 - 4.6.0-preview1-26508-04 - 4.6.0-preview1-26508-04 - 4.6.0-preview1-26508-04 - 4.6.0-preview1-26508-04 - 4.6.0-preview1-26508-04 + 4.6.0-preview1-26525-01 + 4.6.0-preview1-26525-01 + 4.6.0-preview1-26525-01 + 4.6.0-preview1-26525-01 + 4.6.0-preview1-26525-01 + 4.6.0-preview1-26525-01 + 4.6.0-preview1-26525-01 9.0.1 2.3.1 2.4.0-beta.1.build3945 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 06fc8a13e4..de5df64434 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17060 -commithash:25b4b134d6f8f7b461928f0d495cfc695ccabb5b +version:2.2.0-preview1-17064 +commithash:5380a2461b135b261646f31d1c919ab0a7b577a8 From 2a467bfd6d2c07054465ddf4ec43466b6a88920c Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 29 May 2018 09:06:21 -0700 Subject: [PATCH 046/363] Cleanup headers and enable MultiProcessorCompilation (#845) --- .../AspNetCore/AspNetCore.vcxproj | 18 +- .../AspNetCore/Inc/applicationinfo.h | 18 +- .../AspNetCore/Inc/applicationmanager.h | 10 +- .../AspNetCore/Inc/appoffline.h | 3 + .../AspNetCore/Inc/aspnetcore_shim_config.h | 3 + .../AspNetCore/Inc/filewatcher.h | 2 + .../AspNetCore/Inc/globalmodule.h | 4 + .../AspNetCore/Inc/precomp.hxx | 66 +++ .../AspNetCore/Inc/proxymodule.h | 7 +- .../AspNetCore/src/applicationinfo.cpp | 15 +- .../AspNetCore/src/applicationmanager.cxx | 24 +- .../AspNetCore/src/aspnetcore_shim_config.cpp | 6 +- .../AspNetCore/src/dllmain.cpp | 10 +- .../AspNetCore/src/filewatcher.cxx | 19 +- .../AspNetCore/src/globalmodule.cpp | 5 +- .../AspNetCore/src/precomp.hxx | 282 +++++----- .../AspNetCore/src/proxymodule.cxx | 19 +- .../CommonLib/CommonLib.vcxproj | 14 +- .../CommonLib/hostfxr_utility.h | 4 + .../CommonLib/hostfxroptions.h | 2 + src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj | 404 +++++++------- .../OutOfProcessRequestHandler.vcxproj | 510 +++++++++--------- 22 files changed, 802 insertions(+), 643 deletions(-) create mode 100644 src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index baa119b1e6..21d5ff2680 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -82,7 +82,7 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) precomp.hxx $(IntDir)$(TargetName).pch - ..\IISLib;inc;..\CommonLib + ..\IISLib;.\Inc;..\CommonLib ProgramDatabase MultiThreadedDebug true @@ -96,12 +96,14 @@ true CompileAsCpp true + true Windows true kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) Source.def + UseLinkTimeCodeGeneration ..\Commonlib @@ -115,7 +117,7 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) precomp.hxx $(IntDir)$(TargetName).pch - ..\IISLib;inc;..\CommonLib + ..\IISLib;.\Inc;..\CommonLib ProgramDatabase MultiThreadedDebug true @@ -128,6 +130,7 @@ false true CompileAsCpp + true true @@ -135,6 +138,7 @@ true kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) Source.def + UseLinkTimeCodeGeneration ..\Commonlib @@ -148,7 +152,7 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - ..\IISLib;inc;..\CommonLib + ..\IISLib;.\Inc;..\CommonLib precomp.hxx MultiThreaded true @@ -162,6 +166,7 @@ true CompileAsCpp true + true Windows @@ -170,6 +175,7 @@ true Source.def kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) + UseLinkTimeCodeGeneration ..\Commonlib @@ -184,7 +190,7 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) precomp.hxx - ..\IISLib;inc;..\CommonLib + ..\IISLib;.\Inc;..\CommonLib MultiThreaded true true @@ -197,6 +203,7 @@ true CompileAsCpp true + true Windows @@ -205,6 +212,7 @@ true Source.def kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + UseLinkTimeCodeGeneration ..\Commonlib @@ -218,7 +226,7 @@ - + diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h index 1743f6eb29..0648f3bf79 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h @@ -3,9 +3,17 @@ #pragma once -#define API_BUFFER_TOO_SMALL 0x80008098 +#include "precomp.hxx" -extern BOOL g_fRecycleProcessCalled; +#include "hostfxroptions.h" +#include "appoffline.h" +#include "filewatcher.h" +#include "hashtable.h" +#include "hashfn.h" +#include "aspnetcore_shim_config.h" +#include "iapplication.h" + +#define API_BUFFER_TOO_SMALL 0x80008098 typedef HRESULT @@ -16,6 +24,9 @@ HRESULT _Out_ IAPPLICATION **pApplication ); +extern BOOL g_fRecycleProcessCalled; +extern PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; + // // The key used for hash-table lookups, consists of the port on which the http process is created. // @@ -168,6 +179,9 @@ private: SRWLOCK m_srwLock; IHttpServer *m_pServer; PFN_ASPNETCORE_CREATE_APPLICATION m_pfnAspNetCoreCreateApplication; + + static const PCWSTR s_pwzAspnetcoreInProcessRequestHandlerName; + static const PCWSTR s_pwzAspnetcoreOutOfProcessRequestHandlerName; }; class APPLICATION_INFO_HASH : diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h index 7d2cb29e66..5577df2de2 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h @@ -3,6 +3,12 @@ #pragma once +#include "precomp.hxx" + +#include "applicationinfo.h" +#include "multisz.h" +#include "filewatcher.h" + #define DEFAULT_HASH_BUCKETS 17 // @@ -133,8 +139,8 @@ public: private: // // we currently limit the size of m_pstrErrorInfo to 5000, be careful if you want to change its payload - // - APPLICATION_MANAGER() : m_pApplicationInfoHash(NULL), + // + APPLICATION_MANAGER() : m_pApplicationInfoHash(NULL), m_pFileWatcher(NULL), m_hostingModel(HOSTING_UNKNOWN) { diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h index 85b6c13ea8..581292fdba 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h @@ -2,6 +2,9 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #pragma once + +#include "precomp.hxx" + class APP_OFFLINE_HTM { public: diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h index 8a114a69b4..2d1e8e7944 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h @@ -2,6 +2,9 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #pragma once + +#include "precomp.hxx" + #define CS_ASPNETCORE_SECTION L"system.webServer/aspNetCore" #define CS_ASPNETCORE_PROCESS_EXE_PATH L"processPath" #define CS_ASPNETCORE_PROCESS_ARGUMENTS L"arguments" diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h index d8bde448a7..8290b4b118 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h @@ -3,6 +3,8 @@ #pragma once +#include "precomp.hxx" + #define FILE_WATCHER_SHUTDOWN_KEY (ULONG_PTR)(-1) #define FILE_WATCHER_ENTRY_BUFFER_SIZE 4096 #ifndef CONTAINING_RECORD diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h index aca1857051..a21ea907d5 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h @@ -3,6 +3,10 @@ #pragma once +#include "precomp.hxx" + +#include "applicationmanager.h" + class ASPNET_CORE_GLOBAL_MODULE : public CGlobalModule { diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx b/src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx new file mode 100644 index 0000000000..6e6e2619e3 --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx @@ -0,0 +1,66 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +#pragma warning( disable : 4091) + +// +// System related headers +// +#define WIN32_LEAN_AND_MEAN + +#define NTDDI_VERSION 0x06010000 +#define WINVER 0x0601 +#define _WIN32_WINNT 0x0601 + +#include +#include +#include + +#include "stringu.h" +#include "stringa.h" + +#include "ntassert.h" +#include "dbgutil.h" + +#include "aspnetcore_msg.h" +#include "resources.h" + +#include + +FORCEINLINE +DWORD +WIN32_FROM_HRESULT( + HRESULT hr +) +{ + if ((FAILED(hr)) && + (HRESULT_FACILITY(hr) == FACILITY_WIN32)) + { + return HRESULT_CODE(hr); + } + return hr; +} + +FORCEINLINE +HRESULT +HRESULT_FROM_GETLASTERROR() +{ + return ( GetLastError() != NO_ERROR ) + ? HRESULT_FROM_WIN32( GetLastError() ) + : E_FAIL; +} + +extern PVOID g_pModuleId; +extern BOOL g_fAspnetcoreRHAssemblyLoaded; +extern BOOL g_fAspnetcoreRHLoadedError; +extern BOOL g_fInShutdown; +extern BOOL g_fEnableReferenceCountTracing; +extern DWORD g_dwActiveServerProcesses; +extern HINSTANCE g_hModule; +extern HMODULE g_hAspnetCoreRH; +extern SRWLOCK g_srwLock; +extern PCWSTR g_pwzAspnetcoreRequestHandlerName; +extern HANDLE g_hEventLog; + +#pragma warning( error : 4091) diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h index 982dd8c970..a5711f84c4 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h @@ -3,6 +3,11 @@ #pragma once +#include "precomp.hxx" + +#include "applicationinfo.h" +#include "irequesthandler.h" + extern HTTP_MODULE_ID g_pModuleId; extern IHttpServer *g_pHttpServer; extern HMODULE g_hAspnetCoreRH; @@ -61,4 +66,4 @@ class ASPNET_CORE_PROXY_MODULE_FACTORY : public IHttpModuleFactory VOID Terminate(); -}; \ No newline at end of file +}; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 34a061c0b4..3f18c63507 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -1,7 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "precomp.hxx" +#include "applicationinfo.h" + +#include "proxymodule.h" +#include "hostfxr_utility.h" +#include "utility.h" + +const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; +const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; APPLICATION_INFO::~APPLICATION_INFO() { @@ -258,11 +265,11 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) if (m_pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) { - pstrHandlerDllName = g_pwzAspnetcoreInProcessRequestHandlerName; + pstrHandlerDllName = s_pwzAspnetcoreInProcessRequestHandlerName; } else { - pstrHandlerDllName = g_pwzAspnetcoreOutOfProcessRequestHandlerName; + pstrHandlerDllName = s_pwzAspnetcoreOutOfProcessRequestHandlerName; } // Try to see if RH is already loaded @@ -272,7 +279,7 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) { if (m_pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) { - std:: unique_ptr options; + std::unique_ptr options; if (FAILED(hr = HOSTFXR_OPTIONS::Create( NULL, diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx index b8ebc40471..7d49d91ace 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx @@ -1,7 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "precomp.hxx" +#include "applicationmanager.h" + +#include "proxymodule.h" +#include "utility.h" +#include // The application manager is a singleton across ANCM. APPLICATION_MANAGER* APPLICATION_MANAGER::sm_pApplicationManager = NULL; @@ -32,9 +36,9 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( *ppApplicationInfo = NULL; - // The configuration path is unique for each application and is used for the + // The configuration path is unique for each application and is used for the // key in the applicationInfoHash. - pszApplicationId = pConfig->QueryConfigPath()->QueryStr(); + pszApplicationId = pConfig->QueryConfigPath()->QueryStr(); hr = key.Initialize(pszApplicationId); if (FAILED(hr)) { @@ -55,7 +59,7 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( if (*ppApplicationInfo == NULL) { - // Check which hosting model we want to support + // Check which hosting model we want to support switch (pConfig->QueryHostingModel()) { case HOSTING_IN_PROCESS: @@ -210,7 +214,7 @@ APPLICATION_MANAGER::FindConfigChangedApplication( DBG_ASSERT(pvContext); // Config Change context contains the original config path that changed - // and a multiStr containing + // and a multiStr containing CONFIG_CHANGE_CONTEXT* pContext = static_cast(pvContext); STRU* pstruConfigPath = pEntry->QueryConfig()->QueryConfigPath(); @@ -245,7 +249,7 @@ APPLICATION_MANAGER::FindConfigChangedApplication( // This will cause a shutdown event to occur through the global stop listening event. // OutOfProcess: Removes all applications in the application manager and calls Recycle, which will call Shutdown, // on each application. -// +// HRESULT APPLICATION_MANAGER::RecycleApplicationFromManager( _In_ LPCWSTR pszApplicationId @@ -296,7 +300,7 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( // Don't call application shutdown inside the lock m_pApplicationInfoHash->Apply(APPLICATION_INFO_HASH::ReferenceCopyToTable, static_cast(table)); DBG_ASSERT(dwPreviousCounter == table->Count()); - + // Removed the applications which are impacted by the configurtion change m_pApplicationInfoHash->DeleteIf(FindConfigChangedApplication, (PVOID)&context); @@ -358,7 +362,7 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( table->FindKey(&key, &pRecord); DBG_ASSERT(pRecord != NULL); - // RecycleApplication is called on a separate thread. + // RecycleApplication is called on a separate thread. pRecord->RecycleApplication(); pRecord->DereferenceApplicationInfo(); path = context.MultiSz.Next(path); @@ -399,7 +403,7 @@ Finished: // // Shutsdown all applications in the application hashtable // Only called by OnGlobalStopListening. -// +// VOID APPLICATION_MANAGER::ShutDown() { @@ -416,7 +420,7 @@ APPLICATION_MANAGER::ShutDown() } DBG_ASSERT(m_pApplicationInfoHash); - // During shutdown we lock until we delete the application + // During shutdown we lock until we delete the application AcquireSRWLockExclusive(&m_srwLock); // Call shutdown on each application in the application manager diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp index ea6441abf9..1a59586160 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp @@ -1,7 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "precomp.hxx" +#include "aspnetcore_shim_config.h" + +#include "hostfxr_utility.h" +#include "debugutil.h" +#include "ahutil.h" ASPNETCORE_SHIM_CONFIG::~ASPNETCORE_SHIM_CONFIG() { diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp index 88cc19991b..f7b9f8aa81 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp @@ -2,7 +2,13 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "precomp.hxx" -#include + +#include "applicationinfo.h" +#include "applicationmanager.h" +#include "proxymodule.h" +#include "globalmodule.h" +#include "acache.h" +#include "utility.h" HTTP_MODULE_ID g_pModuleId = NULL; IHttpServer * g_pHttpServer = NULL; @@ -19,8 +25,6 @@ DWORD g_dwActiveServerProcesses = 0; SRWLOCK g_srwLock; DWORD g_dwDebugFlags = 0; PCSTR g_szDebugLabel = "ASPNET_CORE_MODULE"; -PCWSTR g_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; -PCWSTR g_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; VOID diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx index 7fbc860c5e..4bb215b4ed 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx @@ -1,7 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "precomp.hxx" +#include "filewatcher.h" + +#include "ntassert.h" +#include "applicationinfo.h" FILE_WATCHER::FILE_WATCHER() : m_hCompletionPort(NULL), @@ -272,11 +275,11 @@ HRESULT goto Finished; } - // When directory handle is closed then HandleChangeCompletion - // happens with cbCompletion = 0 and dwCompletionStatus = 0 - // From documentation it is not clear if that combination - // of return values is specific to closing handles or whether - // it could also mean an error condition. Hence we will maintain + // When directory handle is closed then HandleChangeCompletion + // happens with cbCompletion = 0 and dwCompletionStatus = 0 + // From documentation it is not clear if that combination + // of return values is specific to closing handles or whether + // it could also mean an error condition. Hence we will maintain // explicit flag that will help us determine if entry // is being shutdown (StopMonitor() called) // @@ -287,8 +290,8 @@ HRESULT // // There could be a FCN overflow - // Let assume the file got changed instead of checking files - // Othersie we have to cache the file info + // Let assume the file got changed instead of checking files + // Othersie we have to cache the file info // if (cbCompletion == 0) { diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/globalmodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/globalmodule.cpp index f4c6257bb4..05dee36b15 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/globalmodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/globalmodule.cpp @@ -1,4 +1,7 @@ -#include "precomp.hxx" +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "globalmodule.h" ASPNET_CORE_GLOBAL_MODULE::ASPNET_CORE_GLOBAL_MODULE( APPLICATION_MANAGER* pApplicationManager) diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx index 6de0acdc12..64b579339f 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx @@ -1,160 +1,160 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. +// // Copyright (c) .NET Foundation. All rights reserved. +// // Licensed under the MIT License. See License.txt in the project root for license information. -#pragma once -#pragma warning( disable : 4091) +// #pragma once +// #pragma warning( disable : 4091) -// -// System related headers -// -#define _WINSOCKAPI_ +// // +// // System related headers +// // +// #define _WINSOCKAPI_ -#define NTDDI_VERSION 0x06010000 -#define WINVER 0x0601 -#define _WIN32_WINNT 0x0601 +// #define NTDDI_VERSION 0x06010000 +// #define WINVER 0x0601 +// #define _WIN32_WINNT 0x0601 -#include -#include -#include +// #include +// #include +// #include -//#include -#include -#include +// //#include +// #include +// #include -// This should remove our issue of compiling for win7 without header files. -// We force the Windows 8 version check logic in iiswebsocket.h to succeed even though we're compiling for Windows 7. -// Then, we set the version defines back to Windows 7 to for the remainder of the compilation. -#undef NTDDI_VERSION -#undef WINVER -#undef _WIN32_WINNT -#define NTDDI_VERSION 0x06020000 -#define WINVER 0x0602 -#define _WIN32_WINNT 0x0602 -#include -#undef NTDDI_VERSION -#undef WINVER -#undef _WIN32_WINNT +// // This should remove our issue of compiling for win7 without header files. +// // We force the Windows 8 version check logic in iiswebsocket.h to succeed even though we're compiling for Windows 7. +// // Then, we set the version defines back to Windows 7 to for the remainder of the compilation. +// #undef NTDDI_VERSION +// #undef WINVER +// #undef _WIN32_WINNT +// #define NTDDI_VERSION 0x06020000 +// #define WINVER 0x0602 +// #define _WIN32_WINNT 0x0602 +// #include +// #undef NTDDI_VERSION +// #undef WINVER +// #undef _WIN32_WINNT -#define NTDDI_VERSION 0x06010000 -#define WINVER 0x0601 -#define _WIN32_WINNT 0x0601 +// #define NTDDI_VERSION 0x06010000 +// #define WINVER 0x0601 +// #define _WIN32_WINNT 0x0601 -#include -#include +// #include +// #include -#include -#include -#include +// #include +// #include +// #include -// -// Option available starting Windows 8. -// 111 is the value in SDK on May 15, 2012. -// -#ifndef WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS -#define WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS 111 -#endif +// // +// // Option available starting Windows 8. +// // 111 is the value in SDK on May 15, 2012. +// // +// #ifndef WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS +// #define WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS 111 +// #endif -#ifdef max -#undef max -template inline T max(T a, T b) -{ - return a > b ? a : b; -} -#endif +// #ifdef max +// #undef max +// template inline T max(T a, T b) +// { +// return a > b ? a : b; +// } +// #endif -#ifdef min -#undef min -template inline T min(T a, T b) -{ - return a < b ? a : b; -} -#endif +// #ifdef min +// #undef min +// template inline T min(T a, T b) +// { +// return a < b ? a : b; +// } +// #endif -inline bool IsSpace(char ch) -{ - switch(ch) - { - case 32: // ' ' - case 9: // '\t' - case 10: // '\n' - case 13: // '\r' - case 11: // '\v' - case 12: // '\f' - return true; - default: - return false; - } -} +// inline bool IsSpace(char ch) +// { +// switch(ch) +// { +// case 32: // ' ' +// case 9: // '\t' +// case 10: // '\n' +// case 13: // '\r' +// case 11: // '\v' +// case 12: // '\f' +// return true; +// default: +// return false; +// } +// } -#include -#include -#include "stringa.h" -#include "stringu.h" -#include "dbgutil.h" -#include "ahutil.h" -#include "multisz.h" -#include "multisza.h" -#include "base64.h" -#include -#include -#include -#include -#include +// #include +// #include +// #include "stringa.h" +// #include "stringu.h" +// #include "dbgutil.h" +// #include "ahutil.h" +// #include "multisz.h" +// #include "multisza.h" +// #include "base64.h" +// #include +// #include +// #include +// #include +// #include -#include "environmentvariablehash.h" -#include "hostfxr_utility.h" -#include "utility.h" -#include "debugutil.h" -#include "requesthandler.h" -#include "resources.h" -#include "aspnetcore_msg.h" -//#include "aspnetcore_event.h" -#include "aspnetcore_shim_config.h" -#include "fx_ver.h" +// #include "environmentvariablehash.h" +// #include "hostfxr_utility.h" +// #include "utility.h" +// #include "debugutil.h" +// #include "requesthandler.h" +// #include "resources.h" +// #include "aspnetcore_msg.h" +// //#include "aspnetcore_event.h" +// #include "aspnetcore_shim_config.h" +// #include "fx_ver.h" -#include "appoffline.h" -#include "filewatcher.h" -#include "applicationinfo.h" -#include "applicationmanager.h" -#include "globalmodule.h" -#include "proxymodule.h" -#include "applicationinfo.h" -#include "hostfxroptions.h" +// #include "appoffline.h" +// #include "filewatcher.h" +// #include "applicationinfo.h" +// #include "applicationmanager.h" +// #include "globalmodule.h" +// #include "proxymodule.h" +// #include "applicationinfo.h" +// #include "hostfxroptions.h" -FORCEINLINE -DWORD -WIN32_FROM_HRESULT( - HRESULT hr -) -{ - if ((FAILED(hr)) && - (HRESULT_FACILITY(hr) == FACILITY_WIN32)) - { - return HRESULT_CODE(hr); - } - return hr; -} +// FORCEINLINE +// DWORD +// WIN32_FROM_HRESULT( +// HRESULT hr +// ) +// { +// if ((FAILED(hr)) && +// (HRESULT_FACILITY(hr) == FACILITY_WIN32)) +// { +// return HRESULT_CODE(hr); +// } +// return hr; +// } -FORCEINLINE -HRESULT -HRESULT_FROM_GETLASTERROR() -{ - return ( GetLastError() != NO_ERROR ) - ? HRESULT_FROM_WIN32( GetLastError() ) - : E_FAIL; -} +// FORCEINLINE +// HRESULT +// HRESULT_FROM_GETLASTERROR() +// { +// return ( GetLastError() != NO_ERROR ) +// ? HRESULT_FROM_WIN32( GetLastError() ) +// : E_FAIL; +// } -extern PVOID g_pModuleId; -extern BOOL g_fAspnetcoreRHAssemblyLoaded; -extern BOOL g_fAspnetcoreRHLoadedError; -extern BOOL g_fInShutdown; -extern BOOL g_fEnableReferenceCountTracing; -extern DWORD g_dwActiveServerProcesses; -extern HINSTANCE g_hModule; -extern HMODULE g_hAspnetCoreRH; -extern SRWLOCK g_srwLock; -extern HANDLE g_hEventLog; -extern PCWSTR g_pwzAspnetcoreInProcessRequestHandlerName; -extern PCWSTR g_pwzAspnetcoreOutOfProcessRequestHandlerName; -extern PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; -#pragma warning( error : 4091) +// extern PVOID g_pModuleId; +// extern BOOL g_fAspnetcoreRHAssemblyLoaded; +// extern BOOL g_fAspnetcoreRHLoadedError; +// extern BOOL g_fInShutdown; +// extern BOOL g_fEnableReferenceCountTracing; +// extern DWORD g_dwActiveServerProcesses; +// extern HINSTANCE g_hModule; +// extern HMODULE g_hAspnetCoreRH; +// extern SRWLOCK g_srwLock; +// extern HANDLE g_hEventLog; +// extern PCWSTR g_pwzAspnetcoreInProcessRequestHandlerName; +// extern PCWSTR g_pwzAspnetcoreOutOfProcessRequestHandlerName; +// extern PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; +// #pragma warning( error : 4091) diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index 4156865a41..69ad025692 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -1,9 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "precomp.hxx" +#include "proxymodule.h" + +#include "applicationmanager.h" +#include "applicationinfo.h" +#include "acache.h" #include "hostfxroptions.h" + __override HRESULT ASPNET_CORE_PROXY_MODULE_FACTORY::GetHttpModule( @@ -41,7 +46,7 @@ Return value: --*/ { - /* FORWARDING_HANDLER::StaticTerminate(); + /* FORWARDING_HANDLER::StaticTerminate(); WEBSOCKET_HANDLER::StaticTerminate();*/ @@ -81,7 +86,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( APPLICATION_MANAGER *pApplicationManager = NULL; REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; IAPPLICATION* pApplication = NULL; - STACK_STRU(struFileName, 256); + STRU struExeLocation; if (g_fInShutdown) { @@ -123,9 +128,9 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( // Set fTrySkipCustomErrors to true as we want client see the offline content pResponse->SetStatus(503, "Service Unavailable", 0, hr, NULL, TRUE); pResponse->SetHeader("Content-Type", - "text/html", - (USHORT)strlen("text/html"), - FALSE + "text/html", + (USHORT)strlen("text/html"), + FALSE ); DataChunk.DataChunkType = HttpDataChunkFromMemory; @@ -158,7 +163,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( // Create RequestHandler and process the request hr = pApplication->CreateHandler(pHttpContext, - &m_pHandler); + &m_pHandler); if (FAILED(hr)) { diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index ba9bfb352a..ceb029e00b 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -96,6 +96,7 @@ false ProgramDatabase ..\iislib; + true Windows @@ -116,6 +117,7 @@ MultiThreadedDebug false ..\iislib; + true Windows @@ -136,6 +138,7 @@ MultiThreaded false ..\iislib; + true Windows @@ -160,6 +163,7 @@ MultiThreaded false + true Windows @@ -202,6 +206,11 @@ + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + Document @@ -219,11 +228,6 @@ %(Filename).rc;%(Filename).h;MSG0409.bin - - - {09d9d1d6-2951-4e14-bc35-76a23cf9391a} - - diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index 381270a222..57f77260f4 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -3,6 +3,10 @@ #pragma once +#include "precomp.h" + +#include + typedef INT(*hostfxr_get_native_search_directories_fn) (CONST INT argc, CONST PCWSTR* argv, PWSTR buffer, DWORD buffer_size, DWORD* required_buffer_size); typedef INT(*hostfxr_main_fn) (CONST DWORD argc, CONST PCWSTR argv[]); diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h index 360b392760..391e01291d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h @@ -3,6 +3,8 @@ #pragma once +#include + class HOSTFXR_OPTIONS { public: diff --git a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index 7c0cca6626..a13fc774fd 100644 --- a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -1,201 +1,205 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {09D9D1D6-2951-4E14-BC35-76A23CF9391A} - Win32Proj - IISLib - IISLib - 10.0.15063.0 - - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - true - Unicode - - - StaticLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - MultiThreadedDebug - false - true - - - Windows - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - MultiThreadedDebug - false - true - - - Windows - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - - - Windows - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - - - Windows - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {09D9D1D6-2951-4E14-BC35-76A23CF9391A} + Win32Proj + IISLib + IISLib + 10.0.15063.0 + + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + ProgramDatabase + MultiThreadedDebug + false + true + true + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + ProgramDatabase + MultiThreadedDebug + false + true + true + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + + + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 33c8b4046a..d1aa2c87ea 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -1,254 +1,258 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {7F87406C-A3C8-4139-A68D-E4C344294A67} - Win32Proj - OutOfProcessRequestHandler - 10.0.15063.0 - OutOfProcessRequestHandler - - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - - aspnetcorev2_outofprocess - - - false - - - false - - - - NotUsing - Level4 - Disabled - WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx - $(IntDir)$(TargetName).pch - ProgramDatabase - MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) - Source.def - - - - - NotUsing - Level4 - Disabled - WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx - $(IntDir)$(TargetName).pch - ProgramDatabase - MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) - Source.def - - - - - Level4 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx - MultiThreaded - ..\IISLib;..\CommonLib;.\Inc - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - - - Windows - false - true - true - Source.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) - - - - - Level4 - NotUsing - MaxSpeed - true - true - NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx - MultiThreaded - ..\IISLib;..\CommonLib;.\Inc - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - - - Windows - false - true - true - Source.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {55494e58-e061-4c4c-a0a8-837008e72f85} - - - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - - - - - - - - - - - - + + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {7F87406C-A3C8-4139-A68D-E4C344294A67} + Win32Proj + OutOfProcessRequestHandler + 10.0.15063.0 + OutOfProcessRequestHandler + + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + aspnetcorev2_outofprocess + + + false + + + false + + + + NotUsing + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + precomp.hxx + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + Source.def + + + + + NotUsing + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + precomp.hxx + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + Source.def + + + + + Level4 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) + precomp.hxx + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + + + Windows + false + true + true + Source.def + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) + + + + + Level4 + NotUsing + MaxSpeed + true + true + NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + precomp.hxx + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + + + Windows + false + true + true + Source.def + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + + + + + + + + + + + \ No newline at end of file From a02892f13923df76569b2ceb2f0e12bff61201e1 Mon Sep 17 00:00:00 2001 From: "Chris Ross (ASP.NET)" Date: Wed, 30 May 2018 16:06:58 -0700 Subject: [PATCH 047/363] React to deployer changes --- IISIntegration.sln | 29 ++++++++++++++----- build/dependencies.props | 4 +-- .../AppHostConfig/Http.config | 3 ++ .../AppHostConfig/TestServer.config | 2 +- .../Inprocess/StartupTests.cs | 9 ++++-- .../UpgradeFeatureDetectionTests.cs | 14 +++++---- .../Utilities/IISFunctionalTestBase.cs | 13 --------- .../Utilities/IISTestSiteFixture.cs | 4 +-- test/WebSites/InProcessWebSite/Program.cs | 2 +- test/WebSites/OutOfProcessWebSite/Program.cs | 2 +- test/WebSites/OutOfProcessWebSite/web.config | 9 ------ .../OverriddenServerWebSite/web.config | 9 ------ 12 files changed, 44 insertions(+), 56 deletions(-) delete mode 100644 test/WebSites/OutOfProcessWebSite/web.config delete mode 100644 test/WebSites/OverriddenServerWebSite/web.config diff --git a/IISIntegration.sln b/IISIntegration.sln index 59050d5d89..96aa2b6a92 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -36,10 +36,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E ProjectSection(SolutionItems) = preProject build\applicationhost.config = build\applicationhost.config build\applicationhost.iis.config = build\applicationhost.iis.config + build\build.msbuild = build\build.msbuild + build\Build.Settings = build\Build.Settings + build\Config.Definitions.Props = build\Config.Definitions.Props build\dependencies.props = build\dependencies.props build\Key.snk = build\Key.snk + build\launchSettings.json = build\launchSettings.json build\native.targets = build\native.targets build\repo.props = build\repo.props + build\repo.targets = build\repo.targets build\sources.props = build\sources.props build\testsite.props = build\testsite.props EndProjectSection @@ -180,12 +185,14 @@ Global {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x64.Build.0 = Release|x64 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.ActiveCfg = Release|x86 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.Build.0 = Release|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.ActiveCfg = Debug|x86 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.ActiveCfg = Debug|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.Build.0 = Debug|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x64.ActiveCfg = Debug|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x64.Build.0 = Debug|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.ActiveCfg = Debug|x86 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.Build.0 = Debug|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.ActiveCfg = Release|x86 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.ActiveCfg = Release|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.Build.0 = Release|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.ActiveCfg = Release|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.Build.0 = Release|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x86.ActiveCfg = Release|x86 @@ -202,12 +209,14 @@ Global {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.Build.0 = Release|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.ActiveCfg = Release|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.Build.0 = Release|Any CPU - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.ActiveCfg = Debug|x86 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.ActiveCfg = Debug|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.Build.0 = Debug|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.ActiveCfg = Debug|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.Build.0 = Debug|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.ActiveCfg = Debug|x86 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.Build.0 = Debug|x86 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.ActiveCfg = Release|x86 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.ActiveCfg = Release|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.Build.0 = Release|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x64.ActiveCfg = Release|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x64.Build.0 = Release|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x86.ActiveCfg = Release|x86 @@ -224,12 +233,14 @@ Global {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x64.Build.0 = Release|Any CPU {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x86.ActiveCfg = Release|Any CPU {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x86.Build.0 = Release|Any CPU - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|Any CPU.ActiveCfg = Debug|x86 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|Any CPU.ActiveCfg = Debug|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|Any CPU.Build.0 = Debug|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x64.ActiveCfg = Debug|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x64.Build.0 = Debug|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x86.ActiveCfg = Debug|x86 {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x86.Build.0 = Debug|x86 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.ActiveCfg = Release|x86 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.ActiveCfg = Release|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.Build.0 = Release|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x64.ActiveCfg = Release|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x64.Build.0 = Release|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x86.ActiveCfg = Release|x86 @@ -304,12 +315,14 @@ Global {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.Build.0 = Release|x64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.ActiveCfg = Release|Win32 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.Build.0 = Release|Win32 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.ActiveCfg = Debug|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.ActiveCfg = Debug|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.Build.0 = Debug|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.ActiveCfg = Debug|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.Build.0 = Debug|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.ActiveCfg = Debug|x86 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.Build.0 = Debug|x86 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.ActiveCfg = Release|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.ActiveCfg = Release|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.Build.0 = Release|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.ActiveCfg = Release|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.Build.0 = Release|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.ActiveCfg = Release|x86 diff --git a/build/dependencies.props b/build/dependencies.props index f830eacdd0..bdb8feda3d 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) @@ -14,7 +14,7 @@ 2.2.0-preview1-34326 2.2.0-preview1-34326 2.2.0-preview1-34326 - 0.6.0-preview1-34326 + 0.6.0-a-preview1-tratcher-exp-17050 2.2.0-preview1-34326 2.2.0-preview1-34326 2.2.0-preview1-34326 diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config b/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config index 771c84bcdd..b0de53397c 100644 --- a/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config +++ b/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config @@ -177,6 +177,8 @@ + + @@ -935,6 +937,7 @@ + diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config b/test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config index a0fa1187f8..1543ebb97c 100644 --- a/test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config +++ b/test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config @@ -194,7 +194,7 @@ - + diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index 4d497612b7..f679afb235 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -74,6 +74,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentParameters = new DeploymentParameters(variant) { ApplicationPath = Helpers.GetInProcessTestSitesPath(), + PublishApplicationBeforeDeployment = true, }; var deploymentResult = await DeployAsync(deploymentParameters); @@ -93,13 +94,15 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Contains(TestSink.Writes, context => context.Message.Contains("Application is running inside IIS process but is not configured to use IIS server")); } - private DeploymentParameters GetBaseDeploymentParameters(string site = null) + private DeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite") { - return new DeploymentParameters(Helpers.GetTestWebSitePath(site ?? "InProcessWebSite"), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + return new DeploymentParameters(Helpers.GetTestWebSitePath(site), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, - AncmVersion = AncmVersion.AspNetCoreModuleV2 + AncmVersion = AncmVersion.AspNetCoreModuleV2, + HostingModel = HostingModel.InProcess, + PublishApplicationBeforeDeployment = site == "InProcessWebSite", }; } diff --git a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs index 3d0822af04..bc54543067 100644 --- a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs +++ b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs @@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return UpgradeFeatureDetectionDeployer( disableWebSocket: true, Helpers.GetInProcessTestSitesPath(), - "Disabled"); + "Disabled", HostingModel.InProcess); } [Fact] @@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return UpgradeFeatureDetectionDeployer( disableWebSocket: false, Helpers.GetInProcessTestSitesPath(), - _isWebsocketsSupported); + _isWebsocketsSupported, HostingModel.InProcess); } [Fact] @@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return UpgradeFeatureDetectionDeployer( disableWebSocket: true, Helpers.GetOutOfProcessTestSitesPath(), - "Disabled"); + "Disabled", HostingModel.OutOfProcess); } [Fact] @@ -53,16 +53,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return UpgradeFeatureDetectionDeployer( disableWebSocket: false, Helpers.GetOutOfProcessTestSitesPath(), - _isWebsocketsSupported); + _isWebsocketsSupported, HostingModel.OutOfProcess); } - private async Task UpgradeFeatureDetectionDeployer(bool disableWebSocket, string sitePath, string expected) + private async Task UpgradeFeatureDetectionDeployer(bool disableWebSocket, string sitePath, string expected, HostingModel hostingModel) { var deploymentParameters = new DeploymentParameters(sitePath, ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, - AncmVersion = AncmVersion.AspNetCoreModuleV2 + AncmVersion = AncmVersion.AspNetCoreModuleV2, + HostingModel = hostingModel, + PublishApplicationBeforeDeployment = hostingModel == HostingModel.InProcess, }; if (disableWebSocket) diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs b/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs index fb6cf40be8..9c6ba61513 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs @@ -16,19 +16,6 @@ namespace IISIntegration.FunctionalTests.Utilities { } - protected override Task DeployAsync(DeploymentParameters parameters) - { - if (parameters.SiteName == null) - { - parameters.SiteName = "HttpTestSite"; - } - if (parameters.ServerConfigTemplateContent == null) - { - parameters.ServerConfigTemplateContent = GetServerConfig(null); - } - return base.DeployAsync(parameters); - } - protected string GetServerConfig(Action transform) { var doc = XDocument.Load("AppHostConfig/Http.config"); diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs index 98cb337f4f..3cbaefa9e6 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -24,12 +24,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { - ServerConfigTemplateContent = File.ReadAllText("AppHostConfig/Http.config"), - SiteName = "HttpTestSite", TargetFramework = Tfm.NetCoreApp22, - ApplicationType = ApplicationType.Portable, AncmVersion = AncmVersion.AspNetCoreModuleV2, HostingModel = HostingModel.InProcess, + PublishApplicationBeforeDeployment = true, }; _deployer = ApplicationDeployerFactory.Create(deploymentParameters, logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture))); diff --git a/test/WebSites/InProcessWebSite/Program.cs b/test/WebSites/InProcessWebSite/Program.cs index e9db174529..2e5e8f5d6a 100644 --- a/test/WebSites/InProcessWebSite/Program.cs +++ b/test/WebSites/InProcessWebSite/Program.cs @@ -17,7 +17,7 @@ namespace IISTestSite factory.AddFilter("Console", level => level >= LogLevel.Information); }) .UseIIS() - .UseStartup(typeof(Program).Assembly.FullName) + .UseStartup() .Build(); host.Run(); diff --git a/test/WebSites/OutOfProcessWebSite/Program.cs b/test/WebSites/OutOfProcessWebSite/Program.cs index 18104fa30a..52be26b80c 100644 --- a/test/WebSites/OutOfProcessWebSite/Program.cs +++ b/test/WebSites/OutOfProcessWebSite/Program.cs @@ -17,7 +17,7 @@ namespace TestSites factory.AddFilter("Console", level => level >= LogLevel.Information); }) .UseIISIntegration() - .UseStartup(typeof(Program).Assembly.FullName) + .UseStartup() .UseKestrel() .Build(); diff --git a/test/WebSites/OutOfProcessWebSite/web.config b/test/WebSites/OutOfProcessWebSite/web.config deleted file mode 100644 index 8286b650fe..0000000000 --- a/test/WebSites/OutOfProcessWebSite/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/test/WebSites/OverriddenServerWebSite/web.config b/test/WebSites/OverriddenServerWebSite/web.config deleted file mode 100644 index ccfab87ca0..0000000000 --- a/test/WebSites/OverriddenServerWebSite/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - From f09edb3b5d7aadf49fc5627b24eac092723e3ba2 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 1 Jun 2018 09:11:18 -0700 Subject: [PATCH 048/363] Target c++17 (#881) --- src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj | 4 ++++ src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj | 4 ++++ .../InProcessRequestHandler/InProcessRequestHandler.vcxproj | 4 ++++ .../OutOfProcessRequestHandler.vcxproj | 4 ++++ test/CommonLibTests/CommonLibTests.vcxproj | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index 21d5ff2680..77e0442946 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -97,6 +97,7 @@ CompileAsCpp true true + stdcpp17 Windows @@ -132,6 +133,7 @@ CompileAsCpp true true + stdcpp17 Windows @@ -167,6 +169,7 @@ CompileAsCpp true true + stdcpp17 Windows @@ -204,6 +207,7 @@ CompileAsCpp true true + stdcpp17 Windows diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index ceb029e00b..32ec0aaedb 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -97,6 +97,7 @@ ProgramDatabase ..\iislib; true + stdcpp17 Windows @@ -118,6 +119,7 @@ false ..\iislib; true + stdcpp17 Windows @@ -139,6 +141,7 @@ false ..\iislib; true + stdcpp17 Windows @@ -164,6 +167,7 @@ MultiThreaded false true + stdcpp17 Windows diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index f77b896393..8de752cea8 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -103,6 +103,7 @@ true CompileAsCpp true + stdcpp17 Windows @@ -133,6 +134,7 @@ true CompileAsCpp true + stdcpp17 Windows @@ -163,6 +165,7 @@ true CompileAsCpp true + stdcpp17 Windows @@ -195,6 +198,7 @@ true CompileAsCpp true + stdcpp17 Windows diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index d1aa2c87ea..9881e6d4a8 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -104,6 +104,7 @@ CompileAsCpp true true + stdcpp17 Windows @@ -135,6 +136,7 @@ CompileAsCpp true true + stdcpp17 Windows @@ -166,6 +168,7 @@ CompileAsCpp true true + stdcpp17 Windows @@ -199,6 +202,7 @@ CompileAsCpp true true + stdcpp17 Windows diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 03e1fbd05b..184b27b4ae 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -74,6 +74,7 @@ Level3 $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" + stdcpp17 true @@ -96,6 +97,7 @@ Level3 $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" + stdcpp17 true @@ -116,6 +118,7 @@ ProgramDatabase $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" + stdcpp17 true @@ -138,6 +141,7 @@ ProgramDatabase $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" + stdcpp17 true From e1ae70166bf639f29ec8628eb6ff2558e76300ac Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 1 Jun 2018 16:42:58 -0700 Subject: [PATCH 049/363] Improve logging architecture; add tests for logging and startup exceptions (#858) --- .gitignore | 1 + IISIntegration.sln | 13 + .../CommonLib/CommonLib.vcxproj | 483 +++++++++--------- .../CommonLib/FileOutputManager.cpp | 184 +++++++ .../CommonLib/FileOutputManager.h | 31 ++ .../CommonLib/IOutputManager.h | 25 + .../CommonLib/LoggingHelpers.cpp | 35 ++ .../CommonLib/LoggingHelpers.h | 20 + .../CommonLib/NullOutputManager.h | 31 ++ .../CommonLib/PipeOutputManager.cpp | 196 +++++++ .../CommonLib/PipeOutputManager.h | 38 ++ .../CommonLib/SRWLockWrapper.cpp | 3 + .../CommonLib/SRWLockWrapper.h | 4 + src/AspNetCoreModuleV2/CommonLib/stdafx.h | 7 + .../InProcessRequestHandler.vcxproj | 1 - .../inprocess/inprocessapplication.cpp | 416 ++------------- .../inprocess/inprocessapplication.h | 52 +- .../OutOfProcessRequestHandler.vcxproj | 1 - test/CommonLibTests/CommonLibTests.vcxproj | 18 +- .../CommonLibTests/FileOutputManagerTests.cpp | 142 +++++ test/CommonLibTests/Helpers.cpp | 48 ++ test/CommonLibTests/Helpers.h | 25 + .../CommonLibTests/PipeOutputManagerTests.cpp | 39 ++ test/CommonLibTests/main.cpp | 1 + test/CommonLibTests/stdafx.h | 3 + .../Inprocess/LoggingTests.cs | 70 +++ .../Inprocess/StartupExceptionTests.cs | 52 ++ .../Inprocess/StartupTests.cs | 19 +- .../Utilities/Helpers.cs | 30 ++ test/WebSites/InProcessWebSite/Startup.cs | 23 +- test/WebSites/InProcessWebSite/web.config | 8 +- .../StartupExceptionWebSite/Program.cs | 46 ++ .../Properties/launchSettings.json | 37 ++ .../StartupExceptionWebSite.csproj | 17 + 34 files changed, 1448 insertions(+), 671 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/IOutputManager.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h create mode 100644 test/CommonLibTests/FileOutputManagerTests.cpp create mode 100644 test/CommonLibTests/Helpers.cpp create mode 100644 test/CommonLibTests/Helpers.h create mode 100644 test/CommonLibTests/PipeOutputManagerTests.cpp create mode 100644 test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs create mode 100644 test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs create mode 100644 test/WebSites/StartupExceptionWebSite/Program.cs create mode 100644 test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json create mode 100644 test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj diff --git a/.gitignore b/.gitignore index 74f65a6ecf..4e21547710 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ project.lock.json *.tlog *.CppClean.log *msbuild.log +gtest.log src/*/*/Debug/ src/*/*/x64/Debug/ diff --git a/IISIntegration.sln b/IISIntegration.sln index 96aa2b6a92..5246def8ed 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -115,6 +115,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartupExceptionWebSite", "test\WebSites\StartupExceptionWebSite\StartupExceptionWebSite.csproj", "{340C59FC-C682-4CBA-81F8-791821EC8EDE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -359,6 +361,16 @@ Global {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.Build.0 = Release|x64 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.ActiveCfg = Release|Win32 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.Build.0 = Release|Win32 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|Any CPU.ActiveCfg = Debug|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x64.ActiveCfg = Debug|x64 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x64.Build.0 = Debug|x64 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x86.ActiveCfg = Debug|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x86.Build.0 = Debug|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|Any CPU.ActiveCfg = Release|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x64.ActiveCfg = Release|x64 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x64.Build.0 = Release|x64 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x86.ActiveCfg = Release|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -388,6 +400,7 @@ Global {48F46909-E76A-4788-BCE1-E543C0E140FE} = {622D35C9-627B-466E-8D15-752968CC79AF} {D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} + {340C59FC-C682-4CBA-81F8-791821EC8EDE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 32ec0aaedb..42079abe33 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -1,238 +1,247 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {55494E58-E061-4C4C-A0A8-837008E72F85} - Win32Proj - NewCommon - 10.0.15063.0 - - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - true - Unicode - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - false - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - C:\AspNetCoreModule\src\IISLib;$(IncludePath) - - - - Use - Level4 - true - Disabled - false - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - false - ProgramDatabase - ..\iislib; - true - stdcpp17 - - - Windows - true - - - - - Use - Level4 - true - Disabled - false - _DEBUG;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - false - MultiThreadedDebug - false - ..\iislib; - true - stdcpp17 - - - Windows - true - - - - - Use - Level4 - true - MaxSpeed - true - true - false - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - false - ..\iislib; - true - stdcpp17 - - - Windows - true - true - true - - - - - Use - Level4 - true - MaxSpeed - true - true - false - NDEBUG;_LIB;%(PreprocessorDefinitions) - true - ..\iislib; - - - MultiThreaded - false - true - stdcpp17 - - - Windows - true - true - true - - - ..\iislib - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - - - - - Document - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {55494E58-E061-4C4C-A0A8-837008E72F85} + Win32Proj + NewCommon + 10.0.15063.0 + + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + false + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + C:\AspNetCoreModule\src\IISLib;$(IncludePath) + + + + Use + Level4 + true + Disabled + false + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + false + ProgramDatabase + ..\iislib; + true + stdcpp17 + + + Windows + true + + + + + Use + Level4 + true + Disabled + false + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + ProgramDatabase + false + MultiThreadedDebug + false + ..\iislib; + true + stdcpp17 + + + Windows + true + + + + + Use + Level4 + true + MaxSpeed + true + true + false + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + false + ..\iislib; + true + stdcpp17 + + + Windows + true + true + true + + + + + Use + Level4 + true + MaxSpeed + true + true + false + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + ..\iislib; + true + + + MultiThreaded + false + stdcpp17 + + + Windows + true + true + true + + + ..\iislib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + + + + Document + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp new file mode 100644 index 0000000000..9f9ec1e75c --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp @@ -0,0 +1,184 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "stdafx.h" + + +FileOutputManager::FileOutputManager() + : m_pStdOutFile(NULL) +{ +} + +FileOutputManager::~FileOutputManager() +{ + HANDLE handle = NULL; + WIN32_FIND_DATA fileData; + + if (m_pStdOutFile != NULL) + { + m_Timer.CancelTimer(); + _close(_fileno(m_pStdOutFile)); + m_pStdOutFile = NULL; + } + + // delete empty log file + handle = FindFirstFile(m_struLogFilePath.QueryStr(), &fileData); + if (handle != INVALID_HANDLE_VALUE && + fileData.nFileSizeHigh == 0 && + fileData.nFileSizeLow == 0) // skip check of nFileSizeHigh + { + FindClose(handle); + // no need to check whether the deletion succeeds + // as nothing can be done + DeleteFile(m_struLogFilePath.QueryStr()); + } + + _dup2(m_fdStdOut, _fileno(stdout)); + _dup2(m_fdStdErr, _fileno(stderr)); +} + +HRESULT +FileOutputManager::Initialize(PCWSTR pwzStdOutLogFileName, PCWSTR pwzApplicationPath) +{ + HRESULT hr = S_OK; + + if (SUCCEEDED(hr = m_wsApplicationPath.Copy(pwzApplicationPath))) + { + hr = m_wsStdOutLogFileName.Copy(pwzStdOutLogFileName); + } + + return hr; +} + +void FileOutputManager::NotifyStartupComplete() +{ +} + +bool FileOutputManager::GetStdOutContent(STRA* struStdOutput) +{ + // + // Ungraceful shutdown, try to log an error message. + // This will be a common place for errors as it means the hostfxr_main returned + // or there was an exception. + // + CHAR pzFileContents[4096] = { 0 }; + DWORD dwNumBytesRead; + LARGE_INTEGER li = { 0 }; + BOOL fLogged = FALSE; + DWORD dwFilePointer = 0; + + if (m_hLogFileHandle != INVALID_HANDLE_VALUE) + { + if (GetFileSizeEx(m_hLogFileHandle, &li) && li.LowPart > 0 && li.HighPart == 0) + { + if (li.LowPart > 4096) + { + dwFilePointer = SetFilePointer(m_hLogFileHandle, -4096, NULL, FILE_END); + } + else + { + dwFilePointer = SetFilePointer(m_hLogFileHandle, 0, NULL, FILE_BEGIN); + } + + if (dwFilePointer != INVALID_SET_FILE_POINTER) + { + // Read file fails. + if (ReadFile(m_hLogFileHandle, pzFileContents, 4096, &dwNumBytesRead, NULL)) + { + if (SUCCEEDED(struStdOutput->Copy(pzFileContents, dwNumBytesRead))) + { + fLogged = TRUE; + } + } + } + } + } + + return fLogged; +} + +HRESULT +FileOutputManager::Start() +{ + HRESULT hr; + SYSTEMTIME systemTime; + SECURITY_ATTRIBUTES saAttr = { 0 }; + STRU struPath; + + hr = UTILITY::ConvertPathToFullPath( + m_wsStdOutLogFileName.QueryStr(), + m_wsApplicationPath.QueryStr(), + &struPath); + + if (FAILED(hr)) + { + goto Finished; + } + + hr = UTILITY::EnsureDirectoryPathExist(struPath.QueryStr()); + if (FAILED(hr)) + { + goto Finished; + } + + m_fdStdOut = _dup(_fileno(stdout)); + if (m_fdStdOut == -1) + { + hr = E_HANDLE; + goto Finished; + } + + m_fdStdErr = _dup(_fileno(stderr)); + if (m_fdStdErr == -1) + { + hr = E_HANDLE; + goto Finished; + } + + GetSystemTime(&systemTime); + hr = m_struLogFilePath.SafeSnwprintf(L"%s_%d%02d%02d%02d%02d%02d_%d.log", + struPath.QueryStr(), + systemTime.wYear, + systemTime.wMonth, + systemTime.wDay, + systemTime.wHour, + systemTime.wMinute, + systemTime.wSecond, + GetCurrentProcessId()); + if (FAILED(hr)) + { + goto Finished; + } + saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); + saAttr.bInheritHandle = TRUE; + saAttr.lpSecurityDescriptor = NULL; + + if (_wfreopen_s(&m_pStdOutFile, m_struLogFilePath.QueryStr(), L"w+", stdout) == 0) + { + setvbuf(m_pStdOutFile, NULL, _IONBF, 0); + if (_dup2(_fileno(m_pStdOutFile), _fileno(stdout)) == -1) + { + hr = E_HANDLE; + goto Finished; + } + if (_dup2(_fileno(m_pStdOutFile), _fileno(stderr)) == -1) + { + hr = E_HANDLE; + goto Finished; + } + } + + m_hLogFileHandle = (HANDLE)_get_osfhandle(_fileno(m_pStdOutFile)); + if (m_hLogFileHandle == INVALID_HANDLE_VALUE) + { + hr = E_HANDLE; + goto Finished; + } + + // Periodically flush the log content to file + m_Timer.InitializeTimer(STTIMER::TimerCallback, &m_struLogFilePath, FILE_FLUSH_TIMEOUT, FILE_FLUSH_TIMEOUT); + +Finished: + + return hr; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h new file mode 100644 index 0000000000..c4f087161c --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h @@ -0,0 +1,31 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + + +class FileOutputManager : public IOutputManager +{ + #define FILE_FLUSH_TIMEOUT 3000 +public: + FileOutputManager(); + ~FileOutputManager(); + + HRESULT + Initialize(PCWSTR pwzStdOutLogFileName, PCWSTR pwzApplciationpath); + + virtual bool GetStdOutContent(STRA* struStdOutput) override; + virtual HRESULT Start() override; + virtual void NotifyStartupComplete() override; + +private: + HANDLE m_hLogFileHandle; + STTIMER m_Timer; + STRU m_wsStdOutLogFileName; + STRU m_wsApplicationPath; + STRU m_struLogFilePath; + int m_fdStdOut; + int m_fdStdErr; + FILE* m_pStdOutFile; +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h new file mode 100644 index 0000000000..386e6d1a4f --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h @@ -0,0 +1,25 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "stdafx.h" + +#pragma once +class IOutputManager +{ +public: + virtual + HRESULT + Start() = 0; + + virtual + ~IOutputManager() {}; + + virtual + void + NotifyStartupComplete() = 0; + + virtual + bool + GetStdOutContent(STRA* struStdOutput) = 0; +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp new file mode 100644 index 0000000000..dbb6f71474 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp @@ -0,0 +1,35 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "stdafx.h" + +HRESULT +LoggingHelpers::CreateLoggingProvider( + bool fIsLoggingEnabled, + bool fEnablePipe, + PCWSTR pwzStdOutFileName, + PCWSTR pwzApplicationPath, + _Out_ IOutputManager** outputManager +) +{ + HRESULT hr = S_OK; + + DBG_ASSERT(outputManager != NULL); + + if (fIsLoggingEnabled) + { + FileOutputManager* manager = new FileOutputManager; + hr = manager->Initialize(pwzStdOutFileName, pwzApplicationPath); + *outputManager = manager; + } + else if (fEnablePipe) + { + *outputManager = new PipeOutputManager; + } + else + { + *outputManager = new NullOutputManager; + } + + return hr; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h new file mode 100644 index 0000000000..fb3f55954f --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +class LoggingHelpers +{ +public: + + static + HRESULT + CreateLoggingProvider( + bool fLoggingEnabled, + bool fEnablePipe, + PCWSTR pwzStdOutFileName, + PCWSTR pwzApplicationPath, + _Out_ IOutputManager** outputManager + ); +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h new file mode 100644 index 0000000000..e2cec68179 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h @@ -0,0 +1,31 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include "stdafx.h" + +class NullOutputManager : public IOutputManager +{ +public: + + NullOutputManager() = default; + + ~NullOutputManager() = default; + + HRESULT Start() + { + // The process has console, e.g., IIS Express scenario + return S_OK; + } + + void NotifyStartupComplete() + { + } + + bool GetStdOutContent(STRA*) + { + return false; + } +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp new file mode 100644 index 0000000000..f5e6acc782 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp @@ -0,0 +1,196 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "stdafx.h" + +PipeOutputManager::PipeOutputManager() : + m_dwStdErrReadTotal(0), + m_hErrReadPipe(INVALID_HANDLE_VALUE), + m_hErrWritePipe(INVALID_HANDLE_VALUE), + m_hErrThread(INVALID_HANDLE_VALUE), + m_fDisposed(FALSE) +{ +} + +PipeOutputManager::~PipeOutputManager() +{ + StopOutputRedirection(); +} + +VOID +PipeOutputManager::StopOutputRedirection() +{ + DWORD dwThreadStatus = 0; + STRA straStdOutput; + + if (m_fDisposed) + { + return; + } + m_fDisposed = true; + + fflush(stdout); + fflush(stderr); + + if (m_hErrWritePipe != INVALID_HANDLE_VALUE) + { + CloseHandle(m_hErrWritePipe); + m_hErrWritePipe = INVALID_HANDLE_VALUE; + } + + if (m_hErrThread != NULL && + GetExitCodeThread(m_hErrThread, &dwThreadStatus) != 0 && + dwThreadStatus == STILL_ACTIVE) + { + // wait for gracefullshut down, i.e., the exit of the background thread or timeout + if (WaitForSingleObject(m_hErrThread, PIPE_OUTPUT_THREAD_TIMEOUT) != WAIT_OBJECT_0) + { + // if the thread is still running, we need kill it first before exit to avoid AV + if (GetExitCodeThread(m_hErrThread, &dwThreadStatus) != 0 && dwThreadStatus == STILL_ACTIVE) + { + TerminateThread(m_hErrThread, STATUS_CONTROL_C_EXIT); + } + } + } + + CloseHandle(m_hErrThread); + m_hErrThread = NULL; + + if (m_hErrReadPipe != INVALID_HANDLE_VALUE) + { + CloseHandle(m_hErrReadPipe); + m_hErrReadPipe = INVALID_HANDLE_VALUE; + } + + // Restore the original stdout and stderr handles of the process, + // as the application has either finished startup or has exited. + if (_dup2(m_fdStdOut, _fileno(stdout)) == -1) + { + return; + } + + if (_dup2(m_fdStdErr, _fileno(stderr)) == -1) + { + return; + } + + if (GetStdOutContent(&straStdOutput)) + { + printf(straStdOutput.QueryStr()); + // Need to flush contents. + _flushall(); + } +} + +HRESULT PipeOutputManager::Start() +{ + HRESULT hr = S_OK; + SECURITY_ATTRIBUTES saAttr = { 0 }; + HANDLE hStdErrReadPipe; + HANDLE hStdErrWritePipe; + + m_fdStdOut = _dup(_fileno(stdout)); + if (m_fdStdOut == -1) + { + hr = E_HANDLE; + goto Finished; + } + m_fdStdErr = _dup(_fileno(stderr)); + if (m_fdStdErr == -1) + { + hr = E_HANDLE; + goto Finished; + } + + if (!CreatePipe(&hStdErrReadPipe, &hStdErrWritePipe, &saAttr, 0 /*nSize*/)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto Finished; + } + + // TODO this still doesn't redirect calls in native, like wprintf + if (!SetStdHandle(STD_ERROR_HANDLE, hStdErrWritePipe)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto Finished; + } + + if (!SetStdHandle(STD_OUTPUT_HANDLE, hStdErrWritePipe)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto Finished; + } + + m_hErrReadPipe = hStdErrReadPipe; + m_hErrWritePipe = hStdErrWritePipe; + + // Read the stderr handle on a separate thread until we get 4096 bytes. + m_hErrThread = CreateThread( + NULL, // default security attributes + 0, // default stack size + (LPTHREAD_START_ROUTINE)ReadStdErrHandle, + this, // thread function arguments + 0, // default creation flags + NULL); // receive thread identifier + + if (m_hErrThread == NULL) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto Finished; + } + +Finished: + return hr; +} + +VOID +PipeOutputManager::ReadStdErrHandle( + LPVOID pContext +) +{ + PipeOutputManager *pLoggingProvider = (PipeOutputManager*)pContext; + DBG_ASSERT(pLoggingProvider != NULL); + pLoggingProvider->ReadStdErrHandleInternal(); +} + +bool PipeOutputManager::GetStdOutContent(STRA* struStdOutput) +{ + bool fLogged = false; + if (m_dwStdErrReadTotal > 0) + { + if (SUCCEEDED(struStdOutput->Copy(m_pzFileContents, m_dwStdErrReadTotal))) + { + fLogged = TRUE; + } + } + return fLogged; +} + +VOID +PipeOutputManager::ReadStdErrHandleInternal( + VOID +) +{ + DWORD dwNumBytesRead = 0; + while (true) + { + if (ReadFile(m_hErrReadPipe, &m_pzFileContents[m_dwStdErrReadTotal], MAX_PIPE_READ_SIZE - m_dwStdErrReadTotal, &dwNumBytesRead, NULL)) + { + m_dwStdErrReadTotal += dwNumBytesRead; + if (m_dwStdErrReadTotal >= MAX_PIPE_READ_SIZE) + { + break; + } + } + else if (GetLastError() == ERROR_BROKEN_PIPE) + { + break; + } + } +} + +VOID +PipeOutputManager::NotifyStartupComplete() +{ + StopOutputRedirection(); +} diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h new file mode 100644 index 0000000000..fb4e19a449 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h @@ -0,0 +1,38 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +class PipeOutputManager : public IOutputManager +{ + #define PIPE_OUTPUT_THREAD_TIMEOUT 2000 + #define MAX_PIPE_READ_SIZE 4096 +public: + PipeOutputManager(); + ~PipeOutputManager(); + + // Inherited via ILoggerProvider + virtual HRESULT Start() override; + virtual void NotifyStartupComplete() override; + + // Inherited via IOutputManager + virtual bool GetStdOutContent(STRA* struStdOutput) override; + + VOID ReadStdErrHandleInternal(VOID); + + static + VOID ReadStdErrHandle(LPVOID pContext); + + VOID StopOutputRedirection(); +private: + HANDLE m_hErrReadPipe; + HANDLE m_hErrWritePipe; + STRU m_struLogFilePath; + HANDLE m_hErrThread; + CHAR m_pzFileContents[MAX_PIPE_READ_SIZE] = { 0 }; + BOOL m_fDisposed; + DWORD m_dwStdErrReadTotal; + int m_fdStdOut; + int m_fdStdErr; +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.cpp b/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.cpp index 3fd0be51f4..52ecf57d07 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.cpp @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + #include "stdafx.h" #include "SRWLockWrapper.h" diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.h b/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.h index 2ae57cb2f8..e8c112a2d5 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.h +++ b/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.h @@ -1,4 +1,8 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + #pragma once + class SRWLockWrapper { public: diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index 3191f9376b..8e5563da25 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -15,6 +15,7 @@ #include #include #include "Shlwapi.h" +#include #include "hashtable.h" #include "stringu.h" #include "stringa.h" @@ -23,6 +24,7 @@ #include "ahutil.h" #include "hashfn.h" #include "irequesthandler.h" +#include "sttimer.h" #include "requesthandler.h" #include "iapplication.h" #include "application.h" @@ -34,3 +36,8 @@ #include "fx_ver.h" #include "hostfxr_utility.h" #include "hostfxroptions.h" +#include "IOutputManager.h" +#include "FileOutputManager.h" +#include "PipeOutputManager.h" +#include "NullOutputManager.h" +#include "LoggingHelpers.h" diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 8de752cea8..db22833452 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -214,7 +214,6 @@ - diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp index 4551c177b3..81ec85fab3 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp @@ -10,11 +10,6 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( PCWSTR pDotnetExeLocation) : m_pHttpServer(pHttpServer), m_ProcessExitCode(0), - m_hLogFileHandle(INVALID_HANDLE_VALUE), - m_hErrReadPipe(INVALID_HANDLE_VALUE), - m_hErrWritePipe(INVALID_HANDLE_VALUE), - m_dwStdErrReadTotal(0), - m_fDoneStdRedirect(FALSE), m_fBlockCallbacksIntoManaged(FALSE), m_fInitialized(FALSE), m_fShutdownCalledFromNative(FALSE), @@ -35,12 +30,6 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION() { - if (m_hLogFileHandle != INVALID_HANDLE_VALUE) - { - m_Timer.CancelTimer(); - CloseHandle(m_hLogFileHandle); - m_hLogFileHandle = INVALID_HANDLE_VALUE; - } if (m_pConfig != NULL) { @@ -106,6 +95,12 @@ IN_PROCESS_APPLICATION::ShutDown( } } + if (m_pLoggerProvider != NULL) + { + delete m_pLoggerProvider; + m_pLoggerProvider = NULL; + } + Finished: if (FAILED(hr)) @@ -131,8 +126,6 @@ IN_PROCESS_APPLICATION::ShutDownInternal() { DWORD dwThreadStatus = 0; DWORD dwTimeout = m_pConfig->QueryShutdownTimeLimitInMS(); - HANDLE handle = NULL; - WIN32_FIND_DATA fileData; if (IsDebuggerPresent()) { @@ -201,34 +194,6 @@ IN_PROCESS_APPLICATION::ShutDownInternal() CloseHandle(m_hThread); m_hThread = NULL; s_Application = NULL; - - CloseStdErrHandles(); - - if (m_pStdFile != NULL) - { - fflush(stdout); - fflush(stderr); - fclose(m_pStdFile); - } - - if (m_hLogFileHandle != INVALID_HANDLE_VALUE) - { - m_Timer.CancelTimer(); - CloseHandle(m_hLogFileHandle); - m_hLogFileHandle = INVALID_HANDLE_VALUE; - } - - // delete empty log file - handle = FindFirstFile(m_struLogFilePath.QueryStr(), &fileData); - if (handle != INVALID_HANDLE_VALUE && - fileData.nFileSizeHigh == 0 && - fileData.nFileSizeLow == 0) // skip check of nFileSizeHigh - { - FindClose(handle); - // no need to check whether the deletion succeeds - // as nothing can be done - DeleteFile(m_struLogFilePath.QueryStr()); - } } __override @@ -371,263 +336,13 @@ IN_PROCESS_APPLICATION::SetCallbackHandles( m_ShutdownHandlerContext = pvShutdownHandlerContext; m_AsyncCompletionHandler = async_completion_handler; - CloseStdErrHandles(); + m_pLoggerProvider->NotifyStartupComplete(); // Can't check the std err handle as it isn't a critical error - SetStdHandle(STD_ERROR_HANDLE, INVALID_HANDLE_VALUE); // Initialization complete SetEvent(m_pInitalizeEvent); m_fInitialized = TRUE; } -VOID -IN_PROCESS_APPLICATION::SetStdOut( - VOID -) -{ - HRESULT hr = S_OK; - STRU struPath; - SYSTEMTIME systemTime; - SECURITY_ATTRIBUTES saAttr = { 0 }; - HANDLE hStdErrReadPipe; - HANDLE hStdErrWritePipe; - - if (!m_fDoneStdRedirect) - { - // Have not set stdout yet, redirect stdout to log file - SRWLockWrapper lock(m_srwLock); - if (!m_fDoneStdRedirect) - { - saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); - saAttr.bInheritHandle = TRUE; - saAttr.lpSecurityDescriptor = NULL; - - // - // best effort - // no need to capture the error code as nothing we can do here - // in case mamanged layer exits abnormally, may not be able to capture the log content as it is buffered. - // - if (!GetConsoleWindow()) - { - // Full IIS scenario. - - // - // SetStdHandle works as w3wp does not have Console - // Current process does not have a console - // - if (m_pConfig->QueryStdoutLogEnabled()) - { - hr = UTILITY::ConvertPathToFullPath( - m_pConfig->QueryStdoutLogFile()->QueryStr(), - m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), - &struPath); - if (FAILED(hr)) - { - goto Finished; - } - - hr = UTILITY::EnsureDirectoryPathExist(struPath.QueryStr()); - if (FAILED(hr)) - { - goto Finished; - } - - GetSystemTime(&systemTime); - hr = m_struLogFilePath.SafeSnwprintf(L"%s_%d%02d%02d%02d%02d%02d_%d.log", - struPath.QueryStr(), - systemTime.wYear, - systemTime.wMonth, - systemTime.wDay, - systemTime.wHour, - systemTime.wMinute, - systemTime.wSecond, - GetCurrentProcessId()); - if (FAILED(hr)) - { - goto Finished; - } - - m_hLogFileHandle = CreateFileW(m_struLogFilePath.QueryStr(), - FILE_READ_DATA | FILE_WRITE_DATA, - FILE_SHARE_READ, - &saAttr, - CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, - NULL); - - if (m_hLogFileHandle == INVALID_HANDLE_VALUE) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - if (!SetStdHandle(STD_OUTPUT_HANDLE, m_hLogFileHandle)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - if (!SetStdHandle(STD_ERROR_HANDLE, m_hLogFileHandle)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - // not work - // AllocConsole() does not help - // *stdout = *m_pStdFile; - // *stderr = *m_pStdFile; - // _dup2(_fileno(m_pStdFile), _fileno(stdout)); - // _dup2(_fileno(m_pStdFile), _fileno(stderr)); - // this one cannot capture the process start failure - // _wfreopen_s(&m_pStdFile, struLogFileName.QueryStr(), L"w", stdout); - - // Periodically flush the log content to file - m_Timer.InitializeTimer(STTIMER::TimerCallback, &m_struLogFilePath, 3000, 3000); - } - else - { - // - // CreatePipe for outputting stderr to the windows event log. - // Ignore failures - // - if (!CreatePipe(&hStdErrReadPipe, &hStdErrWritePipe, &saAttr, 0 /*nSize*/)) - { - goto Finished; - } - - if (!SetStdHandle(STD_ERROR_HANDLE, hStdErrWritePipe)) - { - goto Finished; - } - - m_hErrReadPipe = hStdErrReadPipe; - m_hErrWritePipe = hStdErrWritePipe; - - // Read the stderr handle on a separate thread until we get 4096 bytes. - m_hErrThread = CreateThread( - NULL, // default security attributes - 0, // default stack size - (LPTHREAD_START_ROUTINE)ReadStdErrHandle, - this, // thread function arguments - 0, // default creation flags - NULL); // receive thread identifier - - if (m_hErrThread == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - } - } - else - { - // The process has console, e.g., IIS Express scenario - - if (_wfopen_s(&m_pStdFile, m_struLogFilePath.QueryStr(), L"w") == 0) - { - // known issue: error info may not be capture when process crashes during buffering - // even we disabled FILE buffering - setvbuf(m_pStdFile, NULL, _IONBF, 0); - _dup2(_fileno(m_pStdFile), _fileno(stdout)); - _dup2(_fileno(m_pStdFile), _fileno(stderr)); - } - // These don't work for console scenario - // close and AllocConsole does not help - //_wfreopen_s(&m_pStdFile, struLogFileName.QueryStr(), L"w", stdout); - // SetStdHandle(STD_ERROR_HANDLE, m_hLogFileHandle); - // SetStdHandle(STD_OUTPUT_HANDLE, m_hLogFileHandle); - //*stdout = *m_pStdFile; - //*stderr = *m_pStdFile; - } - } - } - -Finished: - m_fDoneStdRedirect = TRUE; - if (FAILED(hr) && m_pConfig->QueryStdoutLogEnabled()) - { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_WARNING_TYPE, - ASPNETCORE_EVENT_CONFIG_ERROR, - ASPNETCORE_EVENT_INVALID_STDOUT_LOG_FILE_MSG, - m_struLogFilePath.QueryStr(), - hr); - } -} - -VOID -IN_PROCESS_APPLICATION::ReadStdErrHandle( - LPVOID pContext -) -{ - IN_PROCESS_APPLICATION *pApplication = (IN_PROCESS_APPLICATION*)pContext; - DBG_ASSERT(pApplication != NULL); - pApplication->ReadStdErrHandleInternal(); -} - -VOID -IN_PROCESS_APPLICATION::ReadStdErrHandleInternal( - VOID -) -{ - DWORD dwNumBytesRead = 0; - while (true) - { - if (ReadFile(m_hErrReadPipe, &m_pzFileContents[m_dwStdErrReadTotal], 4096 - m_dwStdErrReadTotal, &dwNumBytesRead, NULL)) - { - m_dwStdErrReadTotal += dwNumBytesRead; - if (m_dwStdErrReadTotal >= 4096) - { - break; - } - } - else if (GetLastError() == ERROR_BROKEN_PIPE) - { - break; - } - } -} - -VOID -IN_PROCESS_APPLICATION::CloseStdErrHandles -( - VOID -) -{ - DWORD dwThreadStatus = 0; - DWORD dwTimeout = m_pConfig->QueryShutdownTimeLimitInMS(); - // Close Handles for stderr as we only care about capturing startup errors - if (m_hErrWritePipe != INVALID_HANDLE_VALUE) - { - CloseHandle(m_hErrWritePipe); - m_hErrWritePipe = INVALID_HANDLE_VALUE; - } - - if (m_hErrThread != NULL && - GetExitCodeThread(m_hErrThread, &dwThreadStatus) != 0 && - dwThreadStatus == STILL_ACTIVE) - { - // wait for gracefullshut down, i.e., the exit of the background thread or timeout - if (WaitForSingleObject(m_hErrThread, dwTimeout) != WAIT_OBJECT_0) - { - // if the thread is still running, we need kill it first before exit to avoid AV - if (GetExitCodeThread(m_hErrThread, &dwThreadStatus) != 0 && dwThreadStatus == STILL_ACTIVE) - { - TerminateThread(m_hErrThread, STATUS_CONTROL_C_EXIT); - } - } - } - - CloseHandle(m_hErrThread); - m_hErrThread = NULL; - - if (m_hErrReadPipe != INVALID_HANDLE_VALUE) - { - CloseHandle(m_hErrReadPipe); - m_hErrReadPipe = INVALID_HANDLE_VALUE; - } -} - // Will be called by the inprocesshandler HRESULT IN_PROCESS_APPLICATION::LoadManagedApplication @@ -657,11 +372,27 @@ IN_PROCESS_APPLICATION::LoadManagedApplication goto Finished; } - // Set up stdout redirect - SetStdOut(); - { + // Set up stdout redirect + SRWLockWrapper lock(m_srwLock); + + if (m_pLoggerProvider == NULL) + { + hr = LoggingHelpers::CreateLoggingProvider( + m_pConfig->QueryStdoutLogEnabled(), + !GetConsoleWindow(), + m_pConfig->QueryStdoutLogFile()->QueryStr(), + m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), + &m_pLoggerProvider); + if (FAILED(hr)) + { + goto Finished; + } + + m_pLoggerProvider->Start(); + } + if (m_status != APPLICATION_STATUS::STARTING) { if (m_status == APPLICATION_STATUS::FAIL) @@ -887,6 +618,8 @@ Finished: if (!m_fShutdownCalledFromNative) { + m_pLoggerProvider->NotifyStartupComplete(); + LogErrorsOnMainExit(hr); if (m_fInitialized) { @@ -910,72 +643,20 @@ IN_PROCESS_APPLICATION::LogErrorsOnMainExit( // This will be a common place for errors as it means the hostfxr_main returned // or there was an exception. // - CHAR pzFileContents[4096] = { 0 }; - DWORD dwNumBytesRead; - STRU struStdErrLog; - LARGE_INTEGER li = { 0 }; - BOOL fLogged = FALSE; - DWORD dwFilePointer = 0; - - if (m_pConfig->QueryStdoutLogEnabled()) + STRA struStdErrOutput; + if (m_pLoggerProvider->GetStdOutContent(&struStdErrOutput)) { - // Put stdout/stderr logs into - if (m_hLogFileHandle != INVALID_HANDLE_VALUE) - { - if (GetFileSizeEx(m_hLogFileHandle, &li) && li.LowPart > 0 && li.HighPart == 0) - { - if (li.LowPart > 4096) - { - dwFilePointer = SetFilePointer(m_hLogFileHandle, -4096, NULL, FILE_END); - } - else - { - dwFilePointer = SetFilePointer(m_hLogFileHandle, 0, NULL, FILE_BEGIN); - } - if (dwFilePointer != INVALID_SET_FILE_POINTER) - { - if (ReadFile(m_hLogFileHandle, pzFileContents, 4096, &dwNumBytesRead, NULL)) - { - if (SUCCEEDED(struStdErrLog.CopyA(m_pzFileContents, m_dwStdErrReadTotal))) - { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT, - ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG, - m_pConfig->QueryApplicationPath()->QueryStr(), - m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), - hr, - struStdErrLog.QueryStr()); - fLogged = TRUE; - - } - } - } - } - } + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_ERROR_TYPE, + ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT, + ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG, + m_pConfig->QueryApplicationPath()->QueryStr(), + m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), + hr, + struStdErrOutput.QueryStr()); } else { - if (m_dwStdErrReadTotal > 0) - { - if (SUCCEEDED(struStdErrLog.CopyA(m_pzFileContents, m_dwStdErrReadTotal))) - { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT, - ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDERR_MSG, - m_pConfig->QueryApplicationPath()->QueryStr(), - m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), - hr, - struStdErrLog.QueryStr()); - fLogged = TRUE; - } - } - } - - if (!fLogged) - { - // If we didn't log, log the generic message. UTILITY::LogEventF(g_hEventLog, EVENTLOG_ERROR_TYPE, ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT, @@ -983,41 +664,34 @@ IN_PROCESS_APPLICATION::LogErrorsOnMainExit( m_pConfig->QueryApplicationPath()->QueryStr(), m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), hr); - fLogged = TRUE; } } // // Calls hostfxr_main with the hostfxr and application as arguments. -// Method should be called with only -// Need to have __try / __except in methods that require unwinding. -// Note, this will not // HRESULT IN_PROCESS_APPLICATION::RunDotnetApplication(DWORD argc, CONST PCWSTR* argv, hostfxr_main_fn pProc) { HRESULT hr = S_OK; + __try { m_ProcessExitCode = pProc(argc, argv); + if (m_ProcessExitCode != 0) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + } } - __except (FilterException(GetExceptionCode(), GetExceptionInformation())) + __except(GetExceptionCode() != 0) { - // TODO Log error message here. - hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; + hr = HRESULT_FROM_WIN32(GetLastError()); } return hr; } // static -INT -IN_PROCESS_APPLICATION::FilterException(unsigned int, struct _EXCEPTION_POINTERS*) -{ - // We assume that any exception is a failure as the applicaiton didn't start or there was a startup error. - // TODO, log error based on exception code. - return EXCEPTION_EXECUTE_HANDLER; -} REQUESTHANDLER_CONFIG* IN_PROCESS_APPLICATION::QueryConfig() const diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h index e72d921e1d..c9d0285369 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h @@ -55,16 +55,6 @@ public: VOID ); - VOID - ReadStdErrHandleInternal( - VOID - ); - - VOID - CloseStdErrHandles( - VOID - ); - HRESULT LoadManagedApplication( VOID @@ -130,17 +120,6 @@ public: } private: - static - DWORD - DoShutDown( - LPVOID lpParam - ); - - VOID - ShutDownInternal( - VOID - ); - IHttpServer* const m_pHttpServer; // Thread executing the .NET Core process @@ -159,26 +138,18 @@ private: // The event that gets triggered when managed initialization is complete HANDLE m_pInitalizeEvent; - // The std log file handle - HANDLE m_hLogFileHandle; - HANDLE m_hErrReadPipe; - HANDLE m_hErrWritePipe; - STRU m_struLogFilePath; STRU m_struExeLocation; // The exit code of the .NET Core process INT m_ProcessExitCode; BOOL m_fIsWebSocketsConnection; - BOOL m_fDoneStdRedirect; volatile BOOL m_fBlockCallbacksIntoManaged; volatile BOOL m_fShutdownCalledFromNative; volatile BOOL m_fShutdownCalledFromManaged; BOOL m_fRecycleCalled; BOOL m_fInitialized; - FILE* m_pStdFile; - STTIMER m_Timer; SRWLOCK m_srwLock; // Thread for capturing startup stderr logs when logging is disabled @@ -188,6 +159,7 @@ private: PCWSTR m_pstrDotnetExeLocation; static IN_PROCESS_APPLICATION* s_Application; + IOutputManager* m_pLoggerProvider; REQUESTHANDLER_CONFIG* m_pConfig; // Allows to override call to hostfxr_main with custome callback @@ -205,26 +177,26 @@ private: _In_ LPVOID pContext ); - static - VOID - ReadStdErrHandle - ( - _In_ LPVOID pContext - ); - HRESULT SetEnvironementVariablesOnWorkerProcess( VOID ); - static - INT - FilterException(unsigned int code, struct _EXCEPTION_POINTERS *ep); - HRESULT RunDotnetApplication( DWORD argc, CONST PCWSTR* argv, hostfxr_main_fn pProc ); + + static + DWORD + DoShutDown( + LPVOID lpParam + ); + + VOID + ShutDownInternal( + VOID + ); }; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 9881e6d4a8..08cd979af8 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -217,7 +217,6 @@ - diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 184b27b4ae..ffa2e2314c 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -32,12 +32,28 @@ + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + + + Create Create @@ -141,7 +157,7 @@ ProgramDatabase $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - stdcpp17 + stdcpp14 true diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/test/CommonLibTests/FileOutputManagerTests.cpp new file mode 100644 index 0000000000..e3d261097a --- /dev/null +++ b/test/CommonLibTests/FileOutputManagerTests.cpp @@ -0,0 +1,142 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "gtest/internal/gtest-port.h" + +class FileManagerWrapper +{ +public: + FileOutputManager* manager; + FileManagerWrapper(FileOutputManager* m) + : manager(m) + { + manager->Start(); + } + + ~FileManagerWrapper() + { + delete manager; + } +}; + +namespace FileOutManagerStartupTests +{ + using ::testing::Test; + class FileOutputManagerTest : public Test + { + protected: + void + Test(std::wstring fileNamePrefix, FILE* out) + { + PCWSTR expected = L"test"; + + std::wstring tempDirectory = Helpers::CreateRandomTempDirectory(); + FileOutputManager* pManager = new FileOutputManager; + pManager->Initialize(fileNamePrefix.c_str(), tempDirectory.c_str()); + { + FileManagerWrapper wrapper(pManager); + + wprintf(expected, out); + } + + // std::filesystem is available on c++17, however gtest fails to build when using it + // c++14 has filesystem as experimental. + for (auto & p : std::experimental::filesystem::directory_iterator(tempDirectory)) + { + std::wstring filename(p.path().filename()); + ASSERT_EQ(filename.substr(0, fileNamePrefix.size()), fileNamePrefix); + + std::wstring content = Helpers::ReadFileContent(std::wstring(p.path())); + ASSERT_EQ(content.length(), DWORD(4)); + ASSERT_STREQ(content.c_str(), expected); + } + + Helpers::DeleteDirectory(tempDirectory); + } + }; + + TEST_F(FileOutputManagerTest, WriteToFileCheckContentsWritten) + { + Test(L"", stdout); + Test(L"log", stdout); + } + + TEST_F(FileOutputManagerTest, WriteToFileCheckContentsWrittenErr) + { + Test(L"", stderr); + Test(L"log", stderr); + } +} + +namespace FileOutManagerOutputTests +{ + + TEST(FileOutManagerOutputTest, StdErr) + { + PCSTR expected = "test"; + + std::wstring tempDirectory = Helpers::CreateRandomTempDirectory(); + + FileOutputManager* pManager = new FileOutputManager; + pManager->Initialize(L"", tempDirectory.c_str()); + { + FileManagerWrapper wrapper(pManager); + + printf(expected, stderr); + STRA straContent; + ASSERT_TRUE(pManager->GetStdOutContent(&straContent)); + + ASSERT_STREQ(straContent.QueryStr(), expected); + } + + Helpers::DeleteDirectory(tempDirectory); + } + + TEST(FileOutManagerOutputTest, CheckFileOutput) + { + PCSTR expected = "test"; + + std::wstring tempDirectory = Helpers::CreateRandomTempDirectory(); + + FileOutputManager* pManager = new FileOutputManager; + pManager->Initialize(L"", tempDirectory.c_str()); + { + FileManagerWrapper wrapper(pManager); + + printf(expected); + STRA straContent; + ASSERT_TRUE(pManager->GetStdOutContent(&straContent)); + + ASSERT_STREQ(straContent.QueryStr(), expected); + } + + Helpers::DeleteDirectory(tempDirectory); + } + + TEST(FileOutManagerOutputTest, CapAt4KB) + { + PCSTR expected = "test"; + + std::wstring tempDirectory = Helpers::CreateRandomTempDirectory(); + + FileOutputManager* pManager = new FileOutputManager; + pManager->Initialize(L"", tempDirectory.c_str()); + { + FileManagerWrapper wrapper(pManager); + + for (int i = 0; i < 1200; i++) + { + printf(expected); + } + + STRA straContent; + ASSERT_TRUE(pManager->GetStdOutContent(&straContent)); + + ASSERT_EQ(straContent.QueryCCH(), 4096); + } + + Helpers::DeleteDirectory(tempDirectory); + } +} + diff --git a/test/CommonLibTests/Helpers.cpp b/test/CommonLibTests/Helpers.cpp new file mode 100644 index 0000000000..9ad7560c94 --- /dev/null +++ b/test/CommonLibTests/Helpers.cpp @@ -0,0 +1,48 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "stdafx.h" + +std::wstring +Helpers::CreateRandomValue() +{ + int randomValue = rand(); + return std::to_wstring(randomValue); +} + +std::wstring +Helpers::CreateRandomTempDirectory() +{ + PWSTR tempPath = new WCHAR[256]; + GetTempPath(256, tempPath); + std::wstring wstringPath(tempPath); + + return wstringPath.append(Helpers::CreateRandomValue()).append(L"\\"); +} + +void +Helpers::DeleteDirectory(std::wstring directory) +{ + std::experimental::filesystem::remove_all(directory); +} + +std::wstring +Helpers::ReadFileContent(std::wstring file) +{ + std::wcout << file << std::endl; + + std::fstream t(file); + std::stringstream buffer; + buffer << t.rdbuf(); + + int nChars = MultiByteToWideChar(CP_ACP, 0, buffer.str().c_str(), -1, NULL, 0); + + LPWSTR pwzName = new WCHAR[nChars]; + MultiByteToWideChar(CP_UTF8, 0, buffer.str().c_str(), -1, pwzName, nChars); + + std::wstring retVal(pwzName); + + delete pwzName; + + return retVal; +} diff --git a/test/CommonLibTests/Helpers.h b/test/CommonLibTests/Helpers.h new file mode 100644 index 0000000000..f9e06bbca4 --- /dev/null +++ b/test/CommonLibTests/Helpers.h @@ -0,0 +1,25 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +class Helpers +{ +public: + + static + std::wstring + CreateRandomValue(); + + static + std::wstring + CreateRandomTempDirectory(); + + static + void + DeleteDirectory(std::wstring directory); + + static + std::wstring + ReadFileContent(std::wstring file); +}; + diff --git a/test/CommonLibTests/PipeOutputManagerTests.cpp b/test/CommonLibTests/PipeOutputManagerTests.cpp new file mode 100644 index 0000000000..1b16f470d1 --- /dev/null +++ b/test/CommonLibTests/PipeOutputManagerTests.cpp @@ -0,0 +1,39 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "gtest/internal/gtest-port.h" + +class FileManagerWrapper +{ +public: + PipeOutputManager * manager; + FileManagerWrapper(PipeOutputManager* m) + : manager(m) + { + manager->Start(); + } + + ~FileManagerWrapper() + { + delete manager; + } +}; + +namespace PipeOutputManagerTests +{ + TEST(PipeManagerOutputTest, NotifyStartupCompleteCallsDispose) + { + PCWSTR expected = L"test"; + + PipeOutputManager* pManager = new PipeOutputManager(); + ASSERT_EQ(S_OK, pManager->Start()); + + pManager->NotifyStartupComplete(); + + // Test will fail if we didn't redirect stdout back to a file descriptor. + // This is because gtest relies on console output to know if a test succeeded or failed. + // If the output still points to a file/pipe, the test (and all other tests after it) will fail. + } +} + diff --git a/test/CommonLibTests/main.cpp b/test/CommonLibTests/main.cpp index 49f150778f..47c991b3e9 100644 --- a/test/CommonLibTests/main.cpp +++ b/test/CommonLibTests/main.cpp @@ -9,6 +9,7 @@ int wmain(int argc, wchar_t* argv[]) int main(int argc, char* argv[]) #endif { + std::srand((unsigned int)std::time(0)); ::testing::InitGoogleTest(&argc, argv); RUN_ALL_TESTS(); return 0; diff --git a/test/CommonLibTests/stdafx.h b/test/CommonLibTests/stdafx.h index 3ada2d330d..e7c8024eda 100644 --- a/test/CommonLibTests/stdafx.h +++ b/test/CommonLibTests/stdafx.h @@ -17,6 +17,8 @@ #include #include #include +#include +#include #include #include @@ -48,6 +50,7 @@ #include "requesthandler.h" #include "resources.h" #include "aspnetcore_msg.h" +#include "Helpers.h" #undef assert // Macro redefinition in IISLib. #include "gtest\gtest.h" diff --git a/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs new file mode 100644 index 0000000000..e6215f34bc --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs @@ -0,0 +1,70 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.Extensions.Logging; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class LoggingTests : IISFunctionalTestBase + { + [Theory] + [InlineData("CheckErrLogFile")] + [InlineData("CheckLogFile")] + public async Task CheckStdoutLogging(string path) + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters(); + deploymentParameters.PublishApplicationBeforeDeployment = true; + deploymentParameters.PreservePublishedApplicationForDebugging = true; // workaround for keeping + + var deploymentResult = await DeployAsync(deploymentParameters); + + Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogEnabled", "true"); + Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogFile", @".\logs\stdout"); + + var response = await deploymentResult.RetryingHttpClient.GetAsync(path); + + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal("Hello World", responseText); + + Dispose(); + + var folderPath = Path.Combine(deploymentResult.DeploymentResult.ContentRoot, @"logs"); + + var fileInDirectory = Directory.GetFiles(folderPath).Single(); + Assert.NotNull(fileInDirectory); + + string contents = null; + for (var i = 0; i < 20; i++) + { + try + { + contents = await File.ReadAllTextAsync(fileInDirectory); + break; + } + catch (IOException) + { + // File in use by IISExpress, delay a bit before rereading. + } + await Task.Delay(20); + } + + Assert.NotNull(contents); + + // Open the log file and see if there are any contents. + Assert.Contains("TEST MESSAGE", contents); + + RetryHelper.RetryOperation( + () => Directory.Delete(deploymentParameters.PublishedApplicationRootPath, true), + e => Logger.LogWarning($"Failed to delete directory : {e.Message}"), + retryCount: 3, + retryDelayMilliseconds: 100); + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs new file mode 100644 index 0000000000..6ca6a200cc --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -0,0 +1,52 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Threading.Tasks; +using IISIntegration.FunctionalTests.Utilities; +using Xunit; +using System.Net; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class StartupExceptionTests : IISFunctionalTestBase + { + + [Theory] + [InlineData("CheckLogFile")] + [InlineData("CheckErrLogFile")] + public async Task CheckStdoutWithRandomNumber(string path) + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite"); + deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + var randomNumberString = new Random(Guid.NewGuid().GetHashCode()).Next(10000000).ToString(); + deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_RANDOM_VALUE"] = randomNumberString; + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.RetryingHttpClient.GetAsync(path); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + Assert.Contains(TestSink.Writes, context => context.Message.Contains($"Random number: {randomNumberString}")); + } + + [Theory] + [InlineData("CheckLargeStdErrWrites")] + [InlineData("CheckLargeStdOutWrites")] + [InlineData("CheckOversizedStdErrWrites")] + [InlineData("CheckOversizedStdOutWrites")] + public async Task CheckStdoutWithLargeWrites(string path) + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite"); + deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.RetryingHttpClient.GetAsync(path); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + Assert.Contains(TestSink.Writes, context => context.Message.Contains(new string('a', 4096))); + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index f679afb235..19c59a9161 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", "%DotnetPath%"); + Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", "%DotnetPath%"); var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); @@ -52,7 +52,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", "%DotnetPath%"); + Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", "%DotnetPath%"); // Request to base address and check if various parts of the body are rendered & measure the cold startup time. var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); @@ -60,7 +60,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); } - public static TestMatrix TestVariants => TestMatrix.ForServers(ServerType.IISExpress) .WithTfms(Tfm.NetCoreApp22) @@ -94,7 +93,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Contains(TestSink.Writes, context => context.Message.Contains("Application is running inside IIS process but is not configured to use IIS server")); } - private DeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite") + // Defaults to inprocess specific deployment parameters + public static DeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite") { return new DeploymentParameters(Helpers.GetTestWebSitePath(site), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { @@ -105,16 +105,5 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests PublishApplicationBeforeDeployment = site == "InProcessWebSite", }; } - - private static void ModifyAspNetCoreSectionInWebConfig(IISDeploymentResult deploymentResult, string key, string value) - { - // modify the web.config after publish - var root = deploymentResult.DeploymentResult.ContentRoot; - var webConfigFile = $"{root}/web.config"; - var config = XDocument.Load(webConfigFile); - var element = config.Descendants("aspNetCore").FirstOrDefault(); - element.SetAttributeValue(key, value); - config.Save(webConfigFile); - } } } diff --git a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs index 7690a49208..4d3e0e65dc 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs @@ -2,6 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; +using System.Linq; +using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests @@ -16,5 +19,32 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string GetInProcessTestSitesPath() => GetTestWebSitePath("InProcessWebSite"); public static string GetOutOfProcessTestSitesPath() => GetTestWebSitePath("OutOfProcessWebSite"); + + public static void ModifyAspNetCoreSectionInWebConfig(IISDeploymentResult deploymentResult, string key, string value) + => ModifySectionInWebConfig(deploymentResult, key, value, section: "aspNetCore", 0); + + public static void ModifySectionInWebConfig(IISDeploymentResult deploymentResult, string key, string value, string section, int index) + { + // modify the web.config after publish + var root = deploymentResult.DeploymentResult.ContentRoot; + var webConfigFile = $"{root}/web.config"; + var config = XDocument.Load(webConfigFile); + var element = config.Descendants(section).ToList()[index]; + element.SetAttributeValue(key, value); + config.Save(webConfigFile); + } + + // Defaults to inprocess specific deployment parameters + public static DeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite") + { + return new DeploymentParameters(Helpers.GetTestWebSitePath(site), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + { + TargetFramework = Tfm.NetCoreApp22, + ApplicationType = ApplicationType.Portable, + AncmVersion = AncmVersion.AspNetCoreModuleV2, + HostingModel = HostingModel.InProcess, + PublishApplicationBeforeDeployment = site == "InProcessWebSite", + }; + } } } diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index b6fd2ae9ca..8a190d47f0 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -657,7 +657,6 @@ namespace IISTestSite { app.Run(async context => { - if (context.Request.Path.StartsWithSegments("/NullBuffer")) { await context.Response.Body.WriteAsync(null, 0, 0); @@ -704,5 +703,27 @@ namespace IISTestSite { app.Run(async ctx => { await ctx.Response.WriteAsync(AppDomain.CurrentDomain.BaseDirectory); }); } + + private void CheckLogFile(IApplicationBuilder app) + { + app.Run(async ctx => + { + Console.WriteLine("TEST MESSAGE"); + + await ctx.Response.WriteAsync("Hello World"); + }); + } + + private void CheckErrLogFile(IApplicationBuilder app) + { + app.Run(async ctx => + { + Console.Error.WriteLine("TEST MESSAGE"); + Console.Error.Flush(); + + await ctx.Response.WriteAsync("Hello World"); + }); + } + } } diff --git a/test/WebSites/InProcessWebSite/web.config b/test/WebSites/InProcessWebSite/web.config index 532ccefdd9..3e1be0c169 100644 --- a/test/WebSites/InProcessWebSite/web.config +++ b/test/WebSites/InProcessWebSite/web.config @@ -1,16 +1,16 @@ - + - + - + - + \ No newline at end of file diff --git a/test/WebSites/StartupExceptionWebSite/Program.cs b/test/WebSites/StartupExceptionWebSite/Program.cs new file mode 100644 index 0000000000..283a0136ce --- /dev/null +++ b/test/WebSites/StartupExceptionWebSite/Program.cs @@ -0,0 +1,46 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; + +namespace IISTestSite +{ + public static class Program + { + public static void Main(string[] args) + { + var envVariable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_STARTUP_VALUE"); + var randomNumber = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_RANDOM_VALUE"); + + // Semicolons are appended to env variables; removing them. + if (envVariable == "CheckLargeStdOutWrites") + { + Console.WriteLine(new string('a', 4096)); + } + else if (envVariable == "CheckLargeStdErrWrites") + { + Console.Error.WriteLine(new string('a', 4096)); + Console.Error.Flush(); + } + else if (envVariable == "CheckLogFile") + { + Console.WriteLine($"Random number: {randomNumber}"); + } + else if (envVariable == "CheckErrLogFile") + { + Console.Error.WriteLine($"Random number: {randomNumber}"); + Console.Error.Flush(); + } + else if (envVariable == "CheckOversizedStdErrWrites") + { + Console.WriteLine(new string('a', 5000)); + + } + else if (envVariable == "CheckOversizedStdOutWrites") + { + Console.Error.WriteLine(new string('a', 4096)); + Console.Error.Flush(); + } + } + } +} diff --git a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json new file mode 100644 index 0000000000..aa0472a2dd --- /dev/null +++ b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json @@ -0,0 +1,37 @@ +{ + "iisSettings": { + "windowsAuthentication": true, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:5762/", + "sslPort": 0 + } + }, + "profiles": { + "ANCM IIS Express": { + "commandName": "Executable", + "executablePath": "$(IISExpressPath)", + "commandLineArgs": "$(IISExpressArguments)", + "nativeDebugging": true, + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)" + } + }, + "ANCM IIS": { + "commandName": "Executable", + "executablePath": "$(IISPath)", + "commandLineArgs": "$(IISArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)" + } + } + } +} diff --git a/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj b/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj new file mode 100644 index 0000000000..2b9db3ce4a --- /dev/null +++ b/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj @@ -0,0 +1,17 @@ + + + + + + netcoreapp2.2 + + + + + + + + + + + From e999010122ff61e970af78e9fe0b9c4d54d475d8 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 3 Jun 2018 19:16:49 +0000 Subject: [PATCH 050/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 76 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index bdb8feda3d..78c6b98d98 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,51 +1,51 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 0.10.13 - 2.2.0-preview1-17064 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 0.6.0-a-preview1-tratcher-exp-17050 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 + 2.2.0-preview1-17067 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 0.6.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 15.6.82 15.6.82 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 2.0.0 - 2.1.0-rc1 - 2.2.0-preview1-26526-03 - 2.2.0-preview1-34326 + 2.1.0 + 2.2.0-preview1-26531-03 + 2.2.0-preview1-34373 15.6.1 2.0.3 - 4.6.0-preview1-26525-01 - 4.6.0-preview1-26525-01 - 4.6.0-preview1-26525-01 - 4.6.0-preview1-26525-01 - 4.6.0-preview1-26525-01 - 4.6.0-preview1-26525-01 - 4.6.0-preview1-26525-01 + 4.6.0-preview1-26531-03 + 4.6.0-preview1-26531-03 + 4.6.0-preview1-26531-03 + 4.6.0-preview1-26531-03 + 4.6.0-preview1-26531-03 + 4.6.0-preview1-26531-03 + 4.6.0-preview1-26531-03 9.0.1 2.3.1 2.4.0-beta.1.build3945 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index de5df64434..34bf7eb808 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17064 -commithash:5380a2461b135b261646f31d1c919ab0a7b577a8 +version:2.2.0-preview1-17067 +commithash:2af0e2e3d02329b4f0290061ab9bd8c7ca1aa26f From ef071f605f9a73c95ad484e5bcf048b81e6315d4 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 4 Jun 2018 11:38:30 -0700 Subject: [PATCH 051/363] Make gtest a submodule (#885) --- .appveyor.yml | 1 + .gitignore | 2 - .gitmodules | 3 + IISIntegration.sln | 29 +- build/buildpipeline/windows.groovy | 5 +- test/CommonLibTests/CommonLibTests.vcxproj | 12 +- test/gtest-1.8.0/CHANGES | 157 - test/gtest-1.8.0/CMakeLists.txt | 312 - test/gtest-1.8.0/CONTRIBUTORS | 37 - test/gtest-1.8.0/LICENSE | 28 - test/gtest-1.8.0/Makefile.am | 339 - test/gtest-1.8.0/README.md | 360 - test/gtest-1.8.0/cmake/gtest.pc.in | 9 - test/gtest-1.8.0/cmake/gtest_main.pc.in | 10 - test/gtest-1.8.0/cmake/internal_utils.cmake | 280 - test/gtest-1.8.0/codegear/gtest.cbproj | 138 - test/gtest-1.8.0/codegear/gtest.groupproj | 54 - test/gtest-1.8.0/codegear/gtest_all.cc | 38 - test/gtest-1.8.0/codegear/gtest_link.cc | 40 - test/gtest-1.8.0/codegear/gtest_main.cbproj | 82 - .../codegear/gtest_unittest.cbproj | 88 - test/gtest-1.8.0/configure.ac | 68 - test/gtest-1.8.0/docs/AdvancedGuide.md | 2416 ----- test/gtest-1.8.0/docs/Documentation.md | 16 - test/gtest-1.8.0/docs/FAQ.md | 1092 --- test/gtest-1.8.0/docs/Pkgconfig.md | 146 - test/gtest-1.8.0/docs/Primer.md | 536 -- test/gtest-1.8.0/docs/PumpManual.md | 177 - test/gtest-1.8.0/docs/Samples.md | 14 - test/gtest-1.8.0/docs/XcodeGuide.md | 93 - .../include/gtest/gtest-death-test.h | 342 - .../gtest-1.8.0/include/gtest/gtest-message.h | 249 - .../include/gtest/gtest-param-test.h | 1438 --- .../include/gtest/gtest-param-test.h.pump | 501 -- .../include/gtest/gtest-printers.h | 1078 --- test/gtest-1.8.0/include/gtest/gtest-spi.h | 231 - .../include/gtest/gtest-test-part.h | 179 - .../include/gtest/gtest-typed-test.h | 264 - test/gtest-1.8.0/include/gtest/gtest.h | 2332 ----- .../include/gtest/gtest_pred_impl.h | 357 - test/gtest-1.8.0/include/gtest/gtest_prod.h | 61 - .../gtest/internal/custom/gtest-port.h | 75 - .../gtest/internal/custom/gtest-printers.h | 42 - .../include/gtest/internal/custom/gtest.h | 45 - .../internal/gtest-death-test-internal.h | 275 - .../include/gtest/internal/gtest-filepath.h | 205 - .../include/gtest/internal/gtest-internal.h | 1277 --- .../include/gtest/internal/gtest-linked_ptr.h | 243 - .../internal/gtest-param-util-generated.h | 5139 ----------- .../gtest-param-util-generated.h.pump | 279 - .../include/gtest/internal/gtest-param-util.h | 723 -- .../include/gtest/internal/gtest-port-arch.h | 100 - .../include/gtest/internal/gtest-port.h | 2687 ------ .../include/gtest/internal/gtest-string.h | 167 - .../include/gtest/internal/gtest-tuple.h | 1020 --- .../include/gtest/internal/gtest-tuple.h.pump | 347 - .../include/gtest/internal/gtest-type-util.h | 3347 ------- .../gtest/internal/gtest-type-util.h.pump | 313 - test/gtest-1.8.0/m4/acx_pthread.m4 | 363 - test/gtest-1.8.0/m4/gtest.m4 | 74 - test/gtest-1.8.0/make/Makefile | 82 - test/gtest-1.8.0/msvc/2010/gtest-md.sln | 55 - test/gtest-1.8.0/msvc/2010/gtest-md.vcxproj | 149 - test/gtest-1.8.0/msvc/2010/gtest.sln | 55 - test/gtest-1.8.0/msvc/2010/gtest.vcxproj | 139 - .../msvc/2010/gtest_main-md.vcxproj | 154 - test/gtest-1.8.0/msvc/2010/gtest_main.vcxproj | 162 - .../msvc/2010/gtest_prod_test-md.vcxproj | 199 - .../msvc/2010/gtest_prod_test.vcxproj | 191 - .../msvc/2010/gtest_unittest-md.vcxproj | 188 - .../msvc/2010/gtest_unittest.vcxproj | 180 - test/gtest-1.8.0/samples/prime_tables.h | 127 - test/gtest-1.8.0/samples/sample1.cc | 68 - test/gtest-1.8.0/samples/sample1.h | 43 - test/gtest-1.8.0/samples/sample10_unittest.cc | 140 - test/gtest-1.8.0/samples/sample1_unittest.cc | 154 - test/gtest-1.8.0/samples/sample2.cc | 56 - test/gtest-1.8.0/samples/sample2.h | 85 - test/gtest-1.8.0/samples/sample2_unittest.cc | 110 - test/gtest-1.8.0/samples/sample3-inl.h | 172 - test/gtest-1.8.0/samples/sample3_unittest.cc | 152 - test/gtest-1.8.0/samples/sample4.cc | 46 - test/gtest-1.8.0/samples/sample4.h | 53 - test/gtest-1.8.0/samples/sample4_unittest.cc | 49 - test/gtest-1.8.0/samples/sample5_unittest.cc | 199 - test/gtest-1.8.0/samples/sample6_unittest.cc | 225 - test/gtest-1.8.0/samples/sample7_unittest.cc | 118 - test/gtest-1.8.0/samples/sample8_unittest.cc | 174 - test/gtest-1.8.0/samples/sample9_unittest.cc | 157 - test/gtest-1.8.0/scripts/common.py | 83 - test/gtest-1.8.0/scripts/fuse_gtest_files.py | 253 - .../scripts/gen_gtest_pred_impl.py | 730 -- test/gtest-1.8.0/scripts/gtest-config.in | 274 - test/gtest-1.8.0/scripts/pump.py | 855 -- test/gtest-1.8.0/scripts/release_docs.py | 158 - test/gtest-1.8.0/scripts/test/Makefile | 59 - test/gtest-1.8.0/scripts/upload.py | 1387 --- test/gtest-1.8.0/scripts/upload_gtest.py | 78 - test/gtest-1.8.0/src/gtest-all.cc | 48 - test/gtest-1.8.0/src/gtest-death-test.cc | 1537 ---- test/gtest-1.8.0/src/gtest-filepath.cc | 385 - test/gtest-1.8.0/src/gtest-internal-inl.h | 1175 --- test/gtest-1.8.0/src/gtest-port.cc | 1277 --- test/gtest-1.8.0/src/gtest-printers.cc | 458 - test/gtest-1.8.0/src/gtest-test-part.cc | 102 - test/gtest-1.8.0/src/gtest-typed-test.cc | 119 - test/gtest-1.8.0/src/gtest.cc | 5845 ------------ test/gtest-1.8.0/src/gtest_main.cc | 38 - test/gtest-1.8.0/test/BUILD.bazel | 380 - .../test/gtest-death-test_ex_test.cc | 93 - .../gtest-1.8.0/test/gtest-death-test_test.cc | 1424 --- test/gtest-1.8.0/test/gtest-filepath_test.cc | 652 -- .../gtest-1.8.0/test/gtest-linked_ptr_test.cc | 154 - test/gtest-1.8.0/test/gtest-listener_test.cc | 311 - test/gtest-1.8.0/test/gtest-message_test.cc | 159 - test/gtest-1.8.0/test/gtest-options_test.cc | 213 - .../test/gtest-param-test2_test.cc | 61 - .../gtest-1.8.0/test/gtest-param-test_test.cc | 1110 --- test/gtest-1.8.0/test/gtest-param-test_test.h | 53 - test/gtest-1.8.0/test/gtest-port_test.cc | 1303 --- test/gtest-1.8.0/test/gtest-printers_test.cc | 1731 ---- test/gtest-1.8.0/test/gtest-test-part_test.cc | 208 - test/gtest-1.8.0/test/gtest-tuple_test.cc | 320 - .../test/gtest-typed-test2_test.cc | 45 - .../gtest-1.8.0/test/gtest-typed-test_test.cc | 380 - test/gtest-1.8.0/test/gtest-typed-test_test.h | 66 - .../test/gtest-unittest-api_test.cc | 341 - test/gtest-1.8.0/test/gtest_all_test.cc | 47 - .../test/gtest_assert_by_exception_test.cc | 119 - .../test/gtest_break_on_failure_unittest.py | 210 - .../test/gtest_break_on_failure_unittest_.cc | 87 - .../test/gtest_catch_exceptions_test.py | 235 - .../test/gtest_catch_exceptions_test_.cc | 311 - test/gtest-1.8.0/test/gtest_color_test.py | 129 - test/gtest-1.8.0/test/gtest_color_test_.cc | 63 - test/gtest-1.8.0/test/gtest_env_var_test.py | 119 - test/gtest-1.8.0/test/gtest_env_var_test_.cc | 124 - .../test/gtest_environment_test.cc | 189 - .../gtest-1.8.0/test/gtest_filter_unittest.py | 638 -- .../test/gtest_filter_unittest_.cc | 138 - test/gtest-1.8.0/test/gtest_help_test.py | 172 - test/gtest-1.8.0/test/gtest_help_test_.cc | 46 - .../test/gtest_json_outfiles_test.py | 162 - .../test/gtest_json_output_unittest.py | 611 -- .../gtest-1.8.0/test/gtest_json_test_utils.py | 60 - .../test/gtest_list_tests_unittest.py | 207 - .../test/gtest_list_tests_unittest_.cc | 157 - test/gtest-1.8.0/test/gtest_main_unittest.cc | 45 - .../test/gtest_no_test_unittest.cc | 56 - test/gtest-1.8.0/test/gtest_output_test.py | 344 - test/gtest-1.8.0/test/gtest_output_test_.cc | 1067 --- .../test/gtest_output_test_golden_lin.txt | 781 -- .../test/gtest_pred_impl_unittest.cc | 2427 ----- .../test/gtest_premature_exit_test.cc | 127 - test/gtest-1.8.0/test/gtest_prod_test.cc | 57 - test/gtest-1.8.0/test/gtest_repeat_test.cc | 236 - test/gtest-1.8.0/test/gtest_shuffle_test.py | 325 - test/gtest-1.8.0/test/gtest_shuffle_test_.cc | 103 - .../test/gtest_sole_header_test.cc | 57 - test/gtest-1.8.0/test/gtest_stress_test.cc | 250 - test/gtest-1.8.0/test/gtest_test_utils.py | 318 - .../test/gtest_throw_on_failure_ex_test.cc | 92 - .../test/gtest_throw_on_failure_test.py | 171 - .../test/gtest_throw_on_failure_test_.cc | 72 - .../test/gtest_uninitialized_test.py | 69 - .../test/gtest_uninitialized_test_.cc | 43 - test/gtest-1.8.0/test/gtest_unittest.cc | 7797 ----------------- .../test/gtest_xml_outfile1_test_.cc | 48 - .../test/gtest_xml_outfile2_test_.cc | 48 - .../test/gtest_xml_outfiles_test.py | 140 - .../test/gtest_xml_output_unittest.py | 378 - .../test/gtest_xml_output_unittest_.cc | 179 - test/gtest-1.8.0/test/gtest_xml_test_utils.py | 196 - test/gtest-1.8.0/test/production.cc | 36 - test/gtest-1.8.0/test/production.h | 55 - .../xcode/Config/DebugProject.xcconfig | 30 - .../xcode/Config/FrameworkTarget.xcconfig | 17 - .../gtest-1.8.0/xcode/Config/General.xcconfig | 41 - .../xcode/Config/ReleaseProject.xcconfig | 32 - .../xcode/Config/StaticLibraryTarget.xcconfig | 18 - .../xcode/Config/TestTarget.xcconfig | 8 - test/gtest-1.8.0/xcode/Resources/Info.plist | 30 - .../xcode/Samples/FrameworkSample/Info.plist | 28 - .../WidgetFramework.xcodeproj/project.pbxproj | 457 - .../xcode/Samples/FrameworkSample/runtests.sh | 62 - .../xcode/Samples/FrameworkSample/widget.cc | 63 - .../xcode/Samples/FrameworkSample/widget.h | 59 - .../Samples/FrameworkSample/widget_test.cc | 68 - test/gtest-1.8.0/xcode/Scripts/runtests.sh | 65 - .../xcode/Scripts/versiongenerate.py | 100 - .../xcode/gtest.xcodeproj/project.pbxproj | 1182 --- test/gtest/googletest | 1 + test/gtest/gtest.vcxproj | 175 + 193 files changed, 202 insertions(+), 79457 deletions(-) create mode 100644 .gitmodules delete mode 100644 test/gtest-1.8.0/CHANGES delete mode 100644 test/gtest-1.8.0/CMakeLists.txt delete mode 100644 test/gtest-1.8.0/CONTRIBUTORS delete mode 100644 test/gtest-1.8.0/LICENSE delete mode 100644 test/gtest-1.8.0/Makefile.am delete mode 100644 test/gtest-1.8.0/README.md delete mode 100644 test/gtest-1.8.0/cmake/gtest.pc.in delete mode 100644 test/gtest-1.8.0/cmake/gtest_main.pc.in delete mode 100644 test/gtest-1.8.0/cmake/internal_utils.cmake delete mode 100644 test/gtest-1.8.0/codegear/gtest.cbproj delete mode 100644 test/gtest-1.8.0/codegear/gtest.groupproj delete mode 100644 test/gtest-1.8.0/codegear/gtest_all.cc delete mode 100644 test/gtest-1.8.0/codegear/gtest_link.cc delete mode 100644 test/gtest-1.8.0/codegear/gtest_main.cbproj delete mode 100644 test/gtest-1.8.0/codegear/gtest_unittest.cbproj delete mode 100644 test/gtest-1.8.0/configure.ac delete mode 100644 test/gtest-1.8.0/docs/AdvancedGuide.md delete mode 100644 test/gtest-1.8.0/docs/Documentation.md delete mode 100644 test/gtest-1.8.0/docs/FAQ.md delete mode 100644 test/gtest-1.8.0/docs/Pkgconfig.md delete mode 100644 test/gtest-1.8.0/docs/Primer.md delete mode 100644 test/gtest-1.8.0/docs/PumpManual.md delete mode 100644 test/gtest-1.8.0/docs/Samples.md delete mode 100644 test/gtest-1.8.0/docs/XcodeGuide.md delete mode 100644 test/gtest-1.8.0/include/gtest/gtest-death-test.h delete mode 100644 test/gtest-1.8.0/include/gtest/gtest-message.h delete mode 100644 test/gtest-1.8.0/include/gtest/gtest-param-test.h delete mode 100644 test/gtest-1.8.0/include/gtest/gtest-param-test.h.pump delete mode 100644 test/gtest-1.8.0/include/gtest/gtest-printers.h delete mode 100644 test/gtest-1.8.0/include/gtest/gtest-spi.h delete mode 100644 test/gtest-1.8.0/include/gtest/gtest-test-part.h delete mode 100644 test/gtest-1.8.0/include/gtest/gtest-typed-test.h delete mode 100644 test/gtest-1.8.0/include/gtest/gtest.h delete mode 100644 test/gtest-1.8.0/include/gtest/gtest_pred_impl.h delete mode 100644 test/gtest-1.8.0/include/gtest/gtest_prod.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/custom/gtest-port.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/custom/gtest-printers.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/custom/gtest.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-death-test-internal.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-filepath.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-internal.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-linked_ptr.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h.pump delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-param-util.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-port-arch.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-port.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-string.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h.pump delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h delete mode 100644 test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h.pump delete mode 100644 test/gtest-1.8.0/m4/acx_pthread.m4 delete mode 100644 test/gtest-1.8.0/m4/gtest.m4 delete mode 100644 test/gtest-1.8.0/make/Makefile delete mode 100644 test/gtest-1.8.0/msvc/2010/gtest-md.sln delete mode 100644 test/gtest-1.8.0/msvc/2010/gtest-md.vcxproj delete mode 100644 test/gtest-1.8.0/msvc/2010/gtest.sln delete mode 100644 test/gtest-1.8.0/msvc/2010/gtest.vcxproj delete mode 100644 test/gtest-1.8.0/msvc/2010/gtest_main-md.vcxproj delete mode 100644 test/gtest-1.8.0/msvc/2010/gtest_main.vcxproj delete mode 100644 test/gtest-1.8.0/msvc/2010/gtest_prod_test-md.vcxproj delete mode 100644 test/gtest-1.8.0/msvc/2010/gtest_prod_test.vcxproj delete mode 100644 test/gtest-1.8.0/msvc/2010/gtest_unittest-md.vcxproj delete mode 100644 test/gtest-1.8.0/msvc/2010/gtest_unittest.vcxproj delete mode 100644 test/gtest-1.8.0/samples/prime_tables.h delete mode 100644 test/gtest-1.8.0/samples/sample1.cc delete mode 100644 test/gtest-1.8.0/samples/sample1.h delete mode 100644 test/gtest-1.8.0/samples/sample10_unittest.cc delete mode 100644 test/gtest-1.8.0/samples/sample1_unittest.cc delete mode 100644 test/gtest-1.8.0/samples/sample2.cc delete mode 100644 test/gtest-1.8.0/samples/sample2.h delete mode 100644 test/gtest-1.8.0/samples/sample2_unittest.cc delete mode 100644 test/gtest-1.8.0/samples/sample3-inl.h delete mode 100644 test/gtest-1.8.0/samples/sample3_unittest.cc delete mode 100644 test/gtest-1.8.0/samples/sample4.cc delete mode 100644 test/gtest-1.8.0/samples/sample4.h delete mode 100644 test/gtest-1.8.0/samples/sample4_unittest.cc delete mode 100644 test/gtest-1.8.0/samples/sample5_unittest.cc delete mode 100644 test/gtest-1.8.0/samples/sample6_unittest.cc delete mode 100644 test/gtest-1.8.0/samples/sample7_unittest.cc delete mode 100644 test/gtest-1.8.0/samples/sample8_unittest.cc delete mode 100644 test/gtest-1.8.0/samples/sample9_unittest.cc delete mode 100644 test/gtest-1.8.0/scripts/common.py delete mode 100644 test/gtest-1.8.0/scripts/fuse_gtest_files.py delete mode 100644 test/gtest-1.8.0/scripts/gen_gtest_pred_impl.py delete mode 100644 test/gtest-1.8.0/scripts/gtest-config.in delete mode 100644 test/gtest-1.8.0/scripts/pump.py delete mode 100644 test/gtest-1.8.0/scripts/release_docs.py delete mode 100644 test/gtest-1.8.0/scripts/test/Makefile delete mode 100644 test/gtest-1.8.0/scripts/upload.py delete mode 100644 test/gtest-1.8.0/scripts/upload_gtest.py delete mode 100644 test/gtest-1.8.0/src/gtest-all.cc delete mode 100644 test/gtest-1.8.0/src/gtest-death-test.cc delete mode 100644 test/gtest-1.8.0/src/gtest-filepath.cc delete mode 100644 test/gtest-1.8.0/src/gtest-internal-inl.h delete mode 100644 test/gtest-1.8.0/src/gtest-port.cc delete mode 100644 test/gtest-1.8.0/src/gtest-printers.cc delete mode 100644 test/gtest-1.8.0/src/gtest-test-part.cc delete mode 100644 test/gtest-1.8.0/src/gtest-typed-test.cc delete mode 100644 test/gtest-1.8.0/src/gtest.cc delete mode 100644 test/gtest-1.8.0/src/gtest_main.cc delete mode 100644 test/gtest-1.8.0/test/BUILD.bazel delete mode 100644 test/gtest-1.8.0/test/gtest-death-test_ex_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-death-test_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-filepath_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-linked_ptr_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-listener_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-message_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-options_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-param-test2_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-param-test_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-param-test_test.h delete mode 100644 test/gtest-1.8.0/test/gtest-port_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-printers_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-test-part_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-tuple_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-typed-test2_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-typed-test_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest-typed-test_test.h delete mode 100644 test/gtest-1.8.0/test/gtest-unittest-api_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest_all_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest_assert_by_exception_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest_break_on_failure_unittest.py delete mode 100644 test/gtest-1.8.0/test/gtest_break_on_failure_unittest_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_catch_exceptions_test.py delete mode 100644 test/gtest-1.8.0/test/gtest_catch_exceptions_test_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_color_test.py delete mode 100644 test/gtest-1.8.0/test/gtest_color_test_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_env_var_test.py delete mode 100644 test/gtest-1.8.0/test/gtest_env_var_test_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_environment_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest_filter_unittest.py delete mode 100644 test/gtest-1.8.0/test/gtest_filter_unittest_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_help_test.py delete mode 100644 test/gtest-1.8.0/test/gtest_help_test_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_json_outfiles_test.py delete mode 100644 test/gtest-1.8.0/test/gtest_json_output_unittest.py delete mode 100644 test/gtest-1.8.0/test/gtest_json_test_utils.py delete mode 100644 test/gtest-1.8.0/test/gtest_list_tests_unittest.py delete mode 100644 test/gtest-1.8.0/test/gtest_list_tests_unittest_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_main_unittest.cc delete mode 100644 test/gtest-1.8.0/test/gtest_no_test_unittest.cc delete mode 100644 test/gtest-1.8.0/test/gtest_output_test.py delete mode 100644 test/gtest-1.8.0/test/gtest_output_test_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_output_test_golden_lin.txt delete mode 100644 test/gtest-1.8.0/test/gtest_pred_impl_unittest.cc delete mode 100644 test/gtest-1.8.0/test/gtest_premature_exit_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest_prod_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest_repeat_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest_shuffle_test.py delete mode 100644 test/gtest-1.8.0/test/gtest_shuffle_test_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_sole_header_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest_stress_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest_test_utils.py delete mode 100644 test/gtest-1.8.0/test/gtest_throw_on_failure_ex_test.cc delete mode 100644 test/gtest-1.8.0/test/gtest_throw_on_failure_test.py delete mode 100644 test/gtest-1.8.0/test/gtest_throw_on_failure_test_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_uninitialized_test.py delete mode 100644 test/gtest-1.8.0/test/gtest_uninitialized_test_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_unittest.cc delete mode 100644 test/gtest-1.8.0/test/gtest_xml_outfile1_test_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_xml_outfile2_test_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_xml_outfiles_test.py delete mode 100644 test/gtest-1.8.0/test/gtest_xml_output_unittest.py delete mode 100644 test/gtest-1.8.0/test/gtest_xml_output_unittest_.cc delete mode 100644 test/gtest-1.8.0/test/gtest_xml_test_utils.py delete mode 100644 test/gtest-1.8.0/test/production.cc delete mode 100644 test/gtest-1.8.0/test/production.h delete mode 100644 test/gtest-1.8.0/xcode/Config/DebugProject.xcconfig delete mode 100644 test/gtest-1.8.0/xcode/Config/FrameworkTarget.xcconfig delete mode 100644 test/gtest-1.8.0/xcode/Config/General.xcconfig delete mode 100644 test/gtest-1.8.0/xcode/Config/ReleaseProject.xcconfig delete mode 100644 test/gtest-1.8.0/xcode/Config/StaticLibraryTarget.xcconfig delete mode 100644 test/gtest-1.8.0/xcode/Config/TestTarget.xcconfig delete mode 100644 test/gtest-1.8.0/xcode/Resources/Info.plist delete mode 100644 test/gtest-1.8.0/xcode/Samples/FrameworkSample/Info.plist delete mode 100644 test/gtest-1.8.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj delete mode 100644 test/gtest-1.8.0/xcode/Samples/FrameworkSample/runtests.sh delete mode 100644 test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.cc delete mode 100644 test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.h delete mode 100644 test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget_test.cc delete mode 100644 test/gtest-1.8.0/xcode/Scripts/runtests.sh delete mode 100644 test/gtest-1.8.0/xcode/Scripts/versiongenerate.py delete mode 100644 test/gtest-1.8.0/xcode/gtest.xcodeproj/project.pbxproj create mode 160000 test/gtest/googletest create mode 100644 test/gtest/gtest.vcxproj diff --git a/.appveyor.yml b/.appveyor.yml index 1a1d0264e7..8290b9bacd 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,6 +7,7 @@ branches: - /^(.*\/)?ci-.*$/ install: - ps: .\tools\update_schema.ps1 + - git submodule update --init --recursive build_script: - ps: .\run.ps1 default-build clone_depth: 1 diff --git a/.gitignore b/.gitignore index 4e21547710..c18e14397c 100644 --- a/.gitignore +++ b/.gitignore @@ -62,8 +62,6 @@ src/*/CommonLib/aspnetcore_msg.h src/*/CommonLib/aspnetcore_msg.rc test/*/Debug test/*/Release -test/gtest-1.8.0/msvc/Debug -test/gtest-1.8.0/msvc/Release .build *.VC.*db diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..42ecc5d6c7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "test/gtest/googletest"] + path = test/gtest/googletest + url = https://github.com/google/googletest diff --git a/IISIntegration.sln b/IISIntegration.sln index 5246def8ed..93242a80b1 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -79,11 +79,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OverriddenServerWebSite", "test\WebSites\OverriddenServerWebSite\OverriddenServerWebSite.csproj", "{FC2A97F8-A749-4C04-97D1-97500066A820}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "test\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}" - ProjectSection(ProjectDependencies) = postProject - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest-1.8.0\msvc\2010\gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV1", "AspNetCoreModuleV1", "{16E521CE-77F1-4B1C-A183-520A41C4F372}" EndProject @@ -117,6 +112,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartupExceptionWebSite", "test\WebSites\StartupExceptionWebSite\StartupExceptionWebSite.csproj", "{340C59FC-C682-4CBA-81F8-791821EC8EDE}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.vcxproj", "{CAC1267B-8778-4257-AAC6-CAF481723B01}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -257,16 +254,6 @@ Global {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.Build.0 = Release|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.ActiveCfg = Release|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.Build.0 = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x86.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x86.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Any CPU.ActiveCfg = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x86.ActiveCfg = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x86.Build.0 = Release|Win32 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|Any CPU.ActiveCfg = Debug|Win32 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.ActiveCfg = Debug|x64 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.Build.0 = Debug|x64 @@ -371,6 +358,16 @@ Global {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x64.Build.0 = Release|x64 {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x86.ActiveCfg = Release|x86 {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x86.Build.0 = Release|x86 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.ActiveCfg = Debug|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.Build.0 = Debug|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.ActiveCfg = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.Build.0 = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|Any CPU.ActiveCfg = Release|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.ActiveCfg = Release|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.Build.0 = Release|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.ActiveCfg = Release|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -388,7 +385,6 @@ Global {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {FC2A97F8-A749-4C04-97D1-97500066A820} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {16E521CE-77F1-4B1C-A183-520A41C4F372} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {06CA2C2B-83B0-4D83-905A-E0C74790009E} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE} = {16E521CE-77F1-4B1C-A183-520A41C4F372} @@ -401,6 +397,7 @@ Global {D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {340C59FC-C682-4CBA-81F8-791821EC8EDE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} + {CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy index a88d4c9cea..b0b729de77 100644 --- a/build/buildpipeline/windows.groovy +++ b/build/buildpipeline/windows.groovy @@ -2,13 +2,14 @@ // 'node' indicates to Jenkins that the enclosed block runs on a node that matches // the label 'windows-with-vs' -simpleNode('Windows.10.Enterprise.RS3.ASPNET') { +simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { stage ('Checking out source') { checkout scm + bat 'git submodule update --init --recursive' } stage ('Build') { def logFolder = getLogFolder() def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" - bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"&.\\tools\\update_schema.ps1;${environment};&.\\run.ps1 -CI default-build /p:Configuration=${params.Configuration}\"" + bat "${environment}&.\\run.cmd -CI default-build" } } diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index ffa2e2314c..5e30180286 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -72,8 +72,8 @@ {09d9d1d6-2951-4e14-bc35-76a23cf9391a} - - {2af210a9-5bdc-45e8-95dd-07b5a2616493} + + {cac1267b-8778-4257-aac6-caf481723b01} @@ -88,7 +88,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -111,7 +111,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -132,7 +132,7 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -155,7 +155,7 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest-1.8.0\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp14 diff --git a/test/gtest-1.8.0/CHANGES b/test/gtest-1.8.0/CHANGES deleted file mode 100644 index 0552132421..0000000000 --- a/test/gtest-1.8.0/CHANGES +++ /dev/null @@ -1,157 +0,0 @@ -Changes for 1.7.0: - -* New feature: death tests are supported on OpenBSD and in iOS - simulator now. -* New feature: Google Test now implements a protocol to allow - a test runner to detect that a test program has exited - prematurely and report it as a failure (before it would be - falsely reported as a success if the exit code is 0). -* New feature: Test::RecordProperty() can now be used outside of the - lifespan of a test method, in which case it will be attributed to - the current test case or the test program in the XML report. -* New feature (potentially breaking): --gtest_list_tests now prints - the type parameters and value parameters for each test. -* Improvement: char pointers and char arrays are now escaped properly - in failure messages. -* Improvement: failure summary in XML reports now includes file and - line information. -* Improvement: the XML element now has a timestamp attribute. -* Improvement: When --gtest_filter is specified, XML report now doesn't - contain information about tests that are filtered out. -* Fixed the bug where long --gtest_filter flag values are truncated in - death tests. -* Potentially breaking change: RUN_ALL_TESTS() is now implemented as a - function instead of a macro in order to work better with Clang. -* Compatibility fixes with C++ 11 and various platforms. -* Bug/warning fixes. - -Changes for 1.6.0: - -* New feature: ADD_FAILURE_AT() for reporting a test failure at the - given source location -- useful for writing testing utilities. -* New feature: the universal value printer is moved from Google Mock - to Google Test. -* New feature: type parameters and value parameters are reported in - the XML report now. -* A gtest_disable_pthreads CMake option. -* Colored output works in GNU Screen sessions now. -* Parameters of value-parameterized tests are now printed in the - textual output. -* Failures from ad hoc test assertions run before RUN_ALL_TESTS() are - now correctly reported. -* Arguments of ASSERT_XY and EXPECT_XY no longer need to support << to - ostream. -* More complete handling of exceptions. -* GTEST_ASSERT_XY can be used instead of ASSERT_XY in case the latter - name is already used by another library. -* --gtest_catch_exceptions is now true by default, allowing a test - program to continue after an exception is thrown. -* Value-parameterized test fixtures can now derive from Test and - WithParamInterface separately, easing conversion of legacy tests. -* Death test messages are clearly marked to make them more - distinguishable from other messages. -* Compatibility fixes for Android, Google Native Client, MinGW, HP UX, - PowerPC, Lucid autotools, libCStd, Sun C++, Borland C++ Builder (Code Gear), - IBM XL C++ (Visual Age C++), and C++0x. -* Bug fixes and implementation clean-ups. -* Potentially incompatible changes: disables the harmful 'make install' - command in autotools. - -Changes for 1.5.0: - - * New feature: assertions can be safely called in multiple threads - where the pthreads library is available. - * New feature: predicates used inside EXPECT_TRUE() and friends - can now generate custom failure messages. - * New feature: Google Test can now be compiled as a DLL. - * New feature: fused source files are included. - * New feature: prints help when encountering unrecognized Google Test flags. - * Experimental feature: CMake build script (requires CMake 2.6.4+). - * Experimental feature: the Pump script for meta programming. - * double values streamed to an assertion are printed with enough precision - to differentiate any two different values. - * Google Test now works on Solaris and AIX. - * Build and test script improvements. - * Bug fixes and implementation clean-ups. - - Potentially breaking changes: - - * Stopped supporting VC++ 7.1 with exceptions disabled. - * Dropped support for 'make install'. - -Changes for 1.4.0: - - * New feature: the event listener API - * New feature: test shuffling - * New feature: the XML report format is closer to junitreport and can - be parsed by Hudson now. - * New feature: when a test runs under Visual Studio, its failures are - integrated in the IDE. - * New feature: /MD(d) versions of VC++ projects. - * New feature: elapsed time for the tests is printed by default. - * New feature: comes with a TR1 tuple implementation such that Boost - is no longer needed for Combine(). - * New feature: EXPECT_DEATH_IF_SUPPORTED macro and friends. - * New feature: the Xcode project can now produce static gtest - libraries in addition to a framework. - * Compatibility fixes for Solaris, Cygwin, minGW, Windows Mobile, - Symbian, gcc, and C++Builder. - * Bug fixes and implementation clean-ups. - -Changes for 1.3.0: - - * New feature: death tests on Windows, Cygwin, and Mac. - * New feature: ability to use Google Test assertions in other testing - frameworks. - * New feature: ability to run disabled test via - --gtest_also_run_disabled_tests. - * New feature: the --help flag for printing the usage. - * New feature: access to Google Test flag values in user code. - * New feature: a script that packs Google Test into one .h and one - .cc file for easy deployment. - * New feature: support for distributing test functions to multiple - machines (requires support from the test runner). - * Bug fixes and implementation clean-ups. - -Changes for 1.2.1: - - * Compatibility fixes for Linux IA-64 and IBM z/OS. - * Added support for using Boost and other TR1 implementations. - * Changes to the build scripts to support upcoming release of Google C++ - Mocking Framework. - * Added Makefile to the distribution package. - * Improved build instructions in README. - -Changes for 1.2.0: - - * New feature: value-parameterized tests. - * New feature: the ASSERT/EXPECT_(NON)FATAL_FAILURE(_ON_ALL_THREADS) - macros. - * Changed the XML report format to match JUnit/Ant's. - * Added tests to the Xcode project. - * Added scons/SConscript for building with SCons. - * Added src/gtest-all.cc for building Google Test from a single file. - * Fixed compatibility with Solaris and z/OS. - * Enabled running Python tests on systems with python 2.3 installed, - e.g. Mac OS X 10.4. - * Bug fixes. - -Changes for 1.1.0: - - * New feature: type-parameterized tests. - * New feature: exception assertions. - * New feature: printing elapsed time of tests. - * Improved the robustness of death tests. - * Added an Xcode project and samples. - * Adjusted the output format on Windows to be understandable by Visual Studio. - * Minor bug fixes. - -Changes for 1.0.1: - - * Added project files for Visual Studio 7.1. - * Fixed issues with compiling on Mac OS X. - * Fixed issues with compiling on Cygwin. - -Changes for 1.0.0: - - * Initial Open Source release of Google Test diff --git a/test/gtest-1.8.0/CMakeLists.txt b/test/gtest-1.8.0/CMakeLists.txt deleted file mode 100644 index b09c46ed32..0000000000 --- a/test/gtest-1.8.0/CMakeLists.txt +++ /dev/null @@ -1,312 +0,0 @@ -######################################################################## -# CMake build script for Google Test. -# -# To run the tests for Google Test itself on Linux, use 'make test' or -# ctest. You can select which tests to run using 'ctest -R regex'. -# For more options, run 'ctest --help'. - -# BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to -# make it prominent in the GUI. -option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF) - -# When other libraries are using a shared version of runtime libraries, -# Google Test also has to use one. -option( - gtest_force_shared_crt - "Use shared (DLL) run-time lib even when Google Test is built as static lib." - OFF) - -option(gtest_build_tests "Build all of gtest's own tests." OFF) - -option(gtest_build_samples "Build gtest's sample programs." OFF) - -option(gtest_disable_pthreads "Disable uses of pthreads in gtest." OFF) - -option( - gtest_hide_internal_symbols - "Build gtest with internal symbols hidden in shared libraries." - OFF) - -# Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build(). -include(cmake/hermetic_build.cmake OPTIONAL) - -if (COMMAND pre_project_set_up_hermetic_build) - pre_project_set_up_hermetic_build() -endif() - -######################################################################## -# -# Project-wide settings - -# Name of the project. -# -# CMake files in this project can refer to the root source directory -# as ${gtest_SOURCE_DIR} and to the root binary directory as -# ${gtest_BINARY_DIR}. -# Language "C" is required for find_package(Threads). -if (CMAKE_VERSION VERSION_LESS 3.0) - project(gtest CXX C) -else() - cmake_policy(SET CMP0048 NEW) - project(gtest VERSION 1.9.0 LANGUAGES CXX C) -endif() -cmake_minimum_required(VERSION 2.6.4) - -if (POLICY CMP0063) # Visibility - cmake_policy(SET CMP0063 NEW) -endif (POLICY CMP0063) - -if (COMMAND set_up_hermetic_build) - set_up_hermetic_build() -endif() - -if (gtest_hide_internal_symbols) - set(CMAKE_CXX_VISIBILITY_PRESET hidden) - set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) -endif() - -# Define helper functions and macros used by Google Test. -include(cmake/internal_utils.cmake) - -config_compiler_and_linker() # Defined in internal_utils.cmake. - -# Where Google Test's .h files can be found. -include_directories( - "${gtest_SOURCE_DIR}/include" - "${gtest_SOURCE_DIR}") - -# Summary of tuple support for Microsoft Visual Studio: -# Compiler version(MS) version(cmake) Support -# ---------- ----------- -------------- ----------------------------- -# <= VS 2010 <= 10 <= 1600 Use Google Tests's own tuple. -# VS 2012 11 1700 std::tr1::tuple + _VARIADIC_MAX=10 -# VS 2013 12 1800 std::tr1::tuple -# VS 2015 14 1900 std::tuple -# VS 2017 15 >= 1910 std::tuple -if (MSVC AND MSVC_VERSION EQUAL 1700) - add_definitions(/D _VARIADIC_MAX=10) -endif() - -######################################################################## -# -# Defines the gtest & gtest_main libraries. User tests should link -# with one of them. - -# Google Test libraries. We build them using more strict warnings than what -# are used for other targets, to ensure that gtest can be compiled by a user -# aggressive about warnings. -cxx_library(gtest "${cxx_strict}" src/gtest-all.cc) -cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc) -target_link_libraries(gtest_main gtest) - -# If the CMake version supports it, attach header directory information -# to the targets for when we are part of a parent build (ie being pulled -# in via add_subdirectory() rather than being a standalone build). -if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - target_include_directories(gtest SYSTEM INTERFACE "${gtest_SOURCE_DIR}/include") - target_include_directories(gtest_main SYSTEM INTERFACE "${gtest_SOURCE_DIR}/include") -endif() - -######################################################################## -# -# Install rules -if(INSTALL_GTEST) - install(TARGETS gtest gtest_main - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") - install(DIRECTORY "${gtest_SOURCE_DIR}/include/gtest" - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - - # configure and install pkgconfig files - configure_file( - cmake/gtest.pc.in - "${CMAKE_BINARY_DIR}/gtest.pc" - @ONLY) - configure_file( - cmake/gtest_main.pc.in - "${CMAKE_BINARY_DIR}/gtest_main.pc" - @ONLY) - install(FILES "${CMAKE_BINARY_DIR}/gtest.pc" "${CMAKE_BINARY_DIR}/gtest_main.pc" - DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -endif() - -######################################################################## -# -# Samples on how to link user tests with gtest or gtest_main. -# -# They are not built by default. To build them, set the -# gtest_build_samples option to ON. You can do it by running ccmake -# or specifying the -Dgtest_build_samples=ON flag when running cmake. - -if (gtest_build_samples) - cxx_executable(sample1_unittest samples gtest_main samples/sample1.cc) - cxx_executable(sample2_unittest samples gtest_main samples/sample2.cc) - cxx_executable(sample3_unittest samples gtest_main) - cxx_executable(sample4_unittest samples gtest_main samples/sample4.cc) - cxx_executable(sample5_unittest samples gtest_main samples/sample1.cc) - cxx_executable(sample6_unittest samples gtest_main) - cxx_executable(sample7_unittest samples gtest_main) - cxx_executable(sample8_unittest samples gtest_main) - cxx_executable(sample9_unittest samples gtest) - cxx_executable(sample10_unittest samples gtest) -endif() - -######################################################################## -# -# Google Test's own tests. -# -# You can skip this section if you aren't interested in testing -# Google Test itself. -# -# The tests are not built by default. To build them, set the -# gtest_build_tests option to ON. You can do it by running ccmake -# or specifying the -Dgtest_build_tests=ON flag when running cmake. - -if (gtest_build_tests) - # This must be set in the root directory for the tests to be run by - # 'make test' or ctest. - enable_testing() - - ############################################################ - # C++ tests built with standard compiler flags. - - cxx_test(gtest-death-test_test gtest_main) - cxx_test(gtest_environment_test gtest) - cxx_test(gtest-filepath_test gtest_main) - cxx_test(gtest-linked_ptr_test gtest_main) - cxx_test(gtest-listener_test gtest_main) - cxx_test(gtest_main_unittest gtest_main) - cxx_test(gtest-message_test gtest_main) - cxx_test(gtest_no_test_unittest gtest) - cxx_test(gtest-options_test gtest_main) - cxx_test(gtest-param-test_test gtest - test/gtest-param-test2_test.cc) - cxx_test(gtest-port_test gtest_main) - cxx_test(gtest_pred_impl_unittest gtest_main) - cxx_test(gtest_premature_exit_test gtest - test/gtest_premature_exit_test.cc) - cxx_test(gtest-printers_test gtest_main) - cxx_test(gtest_prod_test gtest_main - test/production.cc) - cxx_test(gtest_repeat_test gtest) - cxx_test(gtest_sole_header_test gtest_main) - cxx_test(gtest_stress_test gtest) - cxx_test(gtest-test-part_test gtest_main) - cxx_test(gtest_throw_on_failure_ex_test gtest) - cxx_test(gtest-typed-test_test gtest_main - test/gtest-typed-test2_test.cc) - cxx_test(gtest_unittest gtest_main) - cxx_test(gtest-unittest-api_test gtest) - - ############################################################ - # C++ tests built with non-standard compiler flags. - - # MSVC 7.1 does not support STL with exceptions disabled. - if (NOT MSVC OR MSVC_VERSION GREATER 1310) - cxx_library(gtest_no_exception "${cxx_no_exception}" - src/gtest-all.cc) - cxx_library(gtest_main_no_exception "${cxx_no_exception}" - src/gtest-all.cc src/gtest_main.cc) - endif() - cxx_library(gtest_main_no_rtti "${cxx_no_rtti}" - src/gtest-all.cc src/gtest_main.cc) - - cxx_test_with_flags(gtest-death-test_ex_nocatch_test - "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0" - gtest test/gtest-death-test_ex_test.cc) - cxx_test_with_flags(gtest-death-test_ex_catch_test - "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1" - gtest test/gtest-death-test_ex_test.cc) - - cxx_test_with_flags(gtest_no_rtti_unittest "${cxx_no_rtti}" - gtest_main_no_rtti test/gtest_unittest.cc) - - cxx_shared_library(gtest_dll "${cxx_default}" - src/gtest-all.cc src/gtest_main.cc) - - cxx_executable_with_flags(gtest_dll_test_ "${cxx_default}" - gtest_dll test/gtest_all_test.cc) - set_target_properties(gtest_dll_test_ - PROPERTIES - COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1") - - if (NOT MSVC OR MSVC_VERSION LESS 1600) # 1600 is Visual Studio 2010. - # Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that - # conflict with our own definitions. Therefore using our own tuple does not - # work on those compilers. - cxx_library(gtest_main_use_own_tuple "${cxx_use_own_tuple}" - src/gtest-all.cc src/gtest_main.cc) - - cxx_test_with_flags(gtest-tuple_test "${cxx_use_own_tuple}" - gtest_main_use_own_tuple test/gtest-tuple_test.cc) - - cxx_test_with_flags(gtest_use_own_tuple_test "${cxx_use_own_tuple}" - gtest_main_use_own_tuple - test/gtest-param-test_test.cc test/gtest-param-test2_test.cc) - endif() - - ############################################################ - # Python tests. - - cxx_executable(gtest_break_on_failure_unittest_ test gtest) - py_test(gtest_break_on_failure_unittest) - - # Visual Studio .NET 2003 does not support STL with exceptions disabled. - if (NOT MSVC OR MSVC_VERSION GREATER 1310) # 1310 is Visual Studio .NET 2003 - cxx_executable_with_flags( - gtest_catch_exceptions_no_ex_test_ - "${cxx_no_exception}" - gtest_main_no_exception - test/gtest_catch_exceptions_test_.cc) - endif() - - cxx_executable_with_flags( - gtest_catch_exceptions_ex_test_ - "${cxx_exception}" - gtest_main - test/gtest_catch_exceptions_test_.cc) - py_test(gtest_catch_exceptions_test) - - cxx_executable(gtest_color_test_ test gtest) - py_test(gtest_color_test) - - cxx_executable(gtest_env_var_test_ test gtest) - py_test(gtest_env_var_test) - - cxx_executable(gtest_filter_unittest_ test gtest) - py_test(gtest_filter_unittest) - - cxx_executable(gtest_help_test_ test gtest_main) - py_test(gtest_help_test) - - cxx_executable(gtest_list_tests_unittest_ test gtest) - py_test(gtest_list_tests_unittest) - - cxx_executable(gtest_output_test_ test gtest) - py_test(gtest_output_test) - - cxx_executable(gtest_shuffle_test_ test gtest) - py_test(gtest_shuffle_test) - - # MSVC 7.1 does not support STL with exceptions disabled. - if (NOT MSVC OR MSVC_VERSION GREATER 1310) - cxx_executable(gtest_throw_on_failure_test_ test gtest_no_exception) - set_target_properties(gtest_throw_on_failure_test_ - PROPERTIES - COMPILE_FLAGS "${cxx_no_exception}") - py_test(gtest_throw_on_failure_test) - endif() - - cxx_executable(gtest_uninitialized_test_ test gtest) - py_test(gtest_uninitialized_test) - - cxx_executable(gtest_xml_outfile1_test_ test gtest_main) - cxx_executable(gtest_xml_outfile2_test_ test gtest_main) - py_test(gtest_xml_outfiles_test) - py_test(gtest_json_outfiles_test) - - cxx_executable(gtest_xml_output_unittest_ test gtest) - py_test(gtest_xml_output_unittest) - py_test(gtest_json_output_unittest) -endif() diff --git a/test/gtest-1.8.0/CONTRIBUTORS b/test/gtest-1.8.0/CONTRIBUTORS deleted file mode 100644 index feae2fc044..0000000000 --- a/test/gtest-1.8.0/CONTRIBUTORS +++ /dev/null @@ -1,37 +0,0 @@ -# This file contains a list of people who've made non-trivial -# contribution to the Google C++ Testing Framework project. People -# who commit code to the project are encouraged to add their names -# here. Please keep the list sorted by first names. - -Ajay Joshi -Balázs Dán -Bharat Mediratta -Chandler Carruth -Chris Prince -Chris Taylor -Dan Egnor -Eric Roman -Hady Zalek -Jeffrey Yasskin -Jói Sigurðsson -Keir Mierle -Keith Ray -Kenton Varda -Manuel Klimek -Markus Heule -Mika Raento -Miklós Fazekas -Pasi Valminen -Patrick Hanna -Patrick Riley -Peter Kaminski -Preston Jackson -Rainer Klaffenboeck -Russ Cox -Russ Rufer -Sean Mcafee -Sigurður Ásgeirsson -Tracy Bialik -Vadim Berman -Vlad Losev -Zhanyong Wan diff --git a/test/gtest-1.8.0/LICENSE b/test/gtest-1.8.0/LICENSE deleted file mode 100644 index 1941a11f8c..0000000000 --- a/test/gtest-1.8.0/LICENSE +++ /dev/null @@ -1,28 +0,0 @@ -Copyright 2008, Google Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/test/gtest-1.8.0/Makefile.am b/test/gtest-1.8.0/Makefile.am deleted file mode 100644 index b6c7232dd4..0000000000 --- a/test/gtest-1.8.0/Makefile.am +++ /dev/null @@ -1,339 +0,0 @@ -# Automake file - -ACLOCAL_AMFLAGS = -I m4 - -# Nonstandard package files for distribution -EXTRA_DIST = \ - CHANGES \ - CONTRIBUTORS \ - LICENSE \ - include/gtest/gtest-param-test.h.pump \ - include/gtest/internal/gtest-param-util-generated.h.pump \ - include/gtest/internal/gtest-tuple.h.pump \ - include/gtest/internal/gtest-type-util.h.pump \ - make/Makefile \ - scripts/fuse_gtest_files.py \ - scripts/gen_gtest_pred_impl.py \ - scripts/pump.py \ - scripts/test/Makefile - -# gtest source files that we don't compile directly. They are -# #included by gtest-all.cc. -GTEST_SRC = \ - src/gtest-death-test.cc \ - src/gtest-filepath.cc \ - src/gtest-internal-inl.h \ - src/gtest-port.cc \ - src/gtest-printers.cc \ - src/gtest-test-part.cc \ - src/gtest-typed-test.cc \ - src/gtest.cc - -EXTRA_DIST += $(GTEST_SRC) - -# Sample files that we don't compile. -EXTRA_DIST += \ - samples/prime_tables.h \ - samples/sample1_unittest.cc \ - samples/sample2_unittest.cc \ - samples/sample3_unittest.cc \ - samples/sample4_unittest.cc \ - samples/sample5_unittest.cc \ - samples/sample6_unittest.cc \ - samples/sample7_unittest.cc \ - samples/sample8_unittest.cc \ - samples/sample9_unittest.cc - -# C++ test files that we don't compile directly. -EXTRA_DIST += \ - test/gtest-death-test_ex_test.cc \ - test/gtest-death-test_test.cc \ - test/gtest-filepath_test.cc \ - test/gtest-linked_ptr_test.cc \ - test/gtest-listener_test.cc \ - test/gtest-message_test.cc \ - test/gtest-options_test.cc \ - test/gtest-param-test2_test.cc \ - test/gtest-param-test2_test.cc \ - test/gtest-param-test_test.cc \ - test/gtest-param-test_test.cc \ - test/gtest-param-test_test.h \ - test/gtest-port_test.cc \ - test/gtest_premature_exit_test.cc \ - test/gtest-printers_test.cc \ - test/gtest-test-part_test.cc \ - test/gtest-tuple_test.cc \ - test/gtest-typed-test2_test.cc \ - test/gtest-typed-test_test.cc \ - test/gtest-typed-test_test.h \ - test/gtest-unittest-api_test.cc \ - test/gtest_break_on_failure_unittest_.cc \ - test/gtest_catch_exceptions_test_.cc \ - test/gtest_color_test_.cc \ - test/gtest_env_var_test_.cc \ - test/gtest_environment_test.cc \ - test/gtest_filter_unittest_.cc \ - test/gtest_help_test_.cc \ - test/gtest_list_tests_unittest_.cc \ - test/gtest_main_unittest.cc \ - test/gtest_no_test_unittest.cc \ - test/gtest_output_test_.cc \ - test/gtest_pred_impl_unittest.cc \ - test/gtest_prod_test.cc \ - test/gtest_repeat_test.cc \ - test/gtest_shuffle_test_.cc \ - test/gtest_sole_header_test.cc \ - test/gtest_stress_test.cc \ - test/gtest_throw_on_failure_ex_test.cc \ - test/gtest_throw_on_failure_test_.cc \ - test/gtest_uninitialized_test_.cc \ - test/gtest_unittest.cc \ - test/gtest_unittest.cc \ - test/gtest_xml_outfile1_test_.cc \ - test/gtest_xml_outfile2_test_.cc \ - test/gtest_xml_output_unittest_.cc \ - test/production.cc \ - test/production.h - -# Python tests that we don't run. -EXTRA_DIST += \ - test/gtest_break_on_failure_unittest.py \ - test/gtest_catch_exceptions_test.py \ - test/gtest_color_test.py \ - test/gtest_env_var_test.py \ - test/gtest_filter_unittest.py \ - test/gtest_help_test.py \ - test/gtest_list_tests_unittest.py \ - test/gtest_output_test.py \ - test/gtest_output_test_golden_lin.txt \ - test/gtest_shuffle_test.py \ - test/gtest_test_utils.py \ - test/gtest_throw_on_failure_test.py \ - test/gtest_uninitialized_test.py \ - test/gtest_xml_outfiles_test.py \ - test/gtest_xml_output_unittest.py \ - test/gtest_xml_test_utils.py - -# CMake script -EXTRA_DIST += \ - CMakeLists.txt \ - cmake/internal_utils.cmake - -# MSVC project files -EXTRA_DIST += \ - msvc/2010/gtest-md.sln \ - msvc/2010/gtest-md.vcxproj \ - msvc/2010/gtest.sln \ - msvc/2010/gtest.vcxproj \ - msvc/2010/gtest_main-md.vcxproj \ - msvc/2010/gtest_main.vcxproj \ - msvc/2010/gtest_prod_test-md.vcxproj \ - msvc/2010/gtest_prod_test.vcxproj \ - msvc/2010/gtest_unittest-md.vcxproj \ - msvc/2010/gtest_unittest.vcxproj - -# xcode project files -EXTRA_DIST += \ - xcode/Config/DebugProject.xcconfig \ - xcode/Config/FrameworkTarget.xcconfig \ - xcode/Config/General.xcconfig \ - xcode/Config/ReleaseProject.xcconfig \ - xcode/Config/StaticLibraryTarget.xcconfig \ - xcode/Config/TestTarget.xcconfig \ - xcode/Resources/Info.plist \ - xcode/Scripts/runtests.sh \ - xcode/Scripts/versiongenerate.py \ - xcode/gtest.xcodeproj/project.pbxproj - -# xcode sample files -EXTRA_DIST += \ - xcode/Samples/FrameworkSample/Info.plist \ - xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj \ - xcode/Samples/FrameworkSample/runtests.sh \ - xcode/Samples/FrameworkSample/widget.cc \ - xcode/Samples/FrameworkSample/widget.h \ - xcode/Samples/FrameworkSample/widget_test.cc - -# C++Builder project files -EXTRA_DIST += \ - codegear/gtest.cbproj \ - codegear/gtest.groupproj \ - codegear/gtest_all.cc \ - codegear/gtest_link.cc \ - codegear/gtest_main.cbproj \ - codegear/gtest_unittest.cbproj - -# Distribute and install M4 macro -m4datadir = $(datadir)/aclocal -m4data_DATA = m4/gtest.m4 -EXTRA_DIST += $(m4data_DATA) - -# We define the global AM_CPPFLAGS as everything we compile includes from these -# directories. -AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include - -# Modifies compiler and linker flags for pthreads compatibility. -if HAVE_PTHREADS - AM_CXXFLAGS = @PTHREAD_CFLAGS@ -DGTEST_HAS_PTHREAD=1 - AM_LIBS = @PTHREAD_LIBS@ -else - AM_CXXFLAGS = -DGTEST_HAS_PTHREAD=0 -endif - -# Build rules for libraries. -lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la - -lib_libgtest_la_SOURCES = src/gtest-all.cc - -pkginclude_HEADERS = \ - include/gtest/gtest-death-test.h \ - include/gtest/gtest-message.h \ - include/gtest/gtest-param-test.h \ - include/gtest/gtest-printers.h \ - include/gtest/gtest-spi.h \ - include/gtest/gtest-test-part.h \ - include/gtest/gtest-typed-test.h \ - include/gtest/gtest.h \ - include/gtest/gtest_pred_impl.h \ - include/gtest/gtest_prod.h - -pkginclude_internaldir = $(pkgincludedir)/internal -pkginclude_internal_HEADERS = \ - include/gtest/internal/gtest-death-test-internal.h \ - include/gtest/internal/gtest-filepath.h \ - include/gtest/internal/gtest-internal.h \ - include/gtest/internal/gtest-linked_ptr.h \ - include/gtest/internal/gtest-param-util-generated.h \ - include/gtest/internal/gtest-param-util.h \ - include/gtest/internal/gtest-port.h \ - include/gtest/internal/gtest-port-arch.h \ - include/gtest/internal/gtest-string.h \ - include/gtest/internal/gtest-tuple.h \ - include/gtest/internal/gtest-type-util.h \ - include/gtest/internal/custom/gtest.h \ - include/gtest/internal/custom/gtest-port.h \ - include/gtest/internal/custom/gtest-printers.h - -lib_libgtest_main_la_SOURCES = src/gtest_main.cc -lib_libgtest_main_la_LIBADD = lib/libgtest.la - -# Build rules for samples and tests. Automake's naming for some of -# these variables isn't terribly obvious, so this is a brief -# reference: -# -# TESTS -- Programs run automatically by "make check" -# check_PROGRAMS -- Programs built by "make check" but not necessarily run - -TESTS= -TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \ - GTEST_BUILD_DIR="$(top_builddir)/test" -check_PROGRAMS= - -# A simple sample on using gtest. -TESTS += samples/sample1_unittest \ - samples/sample2_unittest \ - samples/sample3_unittest \ - samples/sample4_unittest \ - samples/sample5_unittest \ - samples/sample6_unittest \ - samples/sample7_unittest \ - samples/sample8_unittest \ - samples/sample9_unittest \ - samples/sample10_unittest -check_PROGRAMS += samples/sample1_unittest \ - samples/sample2_unittest \ - samples/sample3_unittest \ - samples/sample4_unittest \ - samples/sample5_unittest \ - samples/sample6_unittest \ - samples/sample7_unittest \ - samples/sample8_unittest \ - samples/sample9_unittest \ - samples/sample10_unittest - -samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc samples/sample1.cc -samples_sample1_unittest_LDADD = lib/libgtest_main.la \ - lib/libgtest.la -samples_sample2_unittest_SOURCES = samples/sample2_unittest.cc samples/sample2.cc -samples_sample2_unittest_LDADD = lib/libgtest_main.la \ - lib/libgtest.la -samples_sample3_unittest_SOURCES = samples/sample3_unittest.cc -samples_sample3_unittest_LDADD = lib/libgtest_main.la \ - lib/libgtest.la -samples_sample4_unittest_SOURCES = samples/sample4_unittest.cc samples/sample4.cc -samples_sample4_unittest_LDADD = lib/libgtest_main.la \ - lib/libgtest.la -samples_sample5_unittest_SOURCES = samples/sample5_unittest.cc samples/sample1.cc -samples_sample5_unittest_LDADD = lib/libgtest_main.la \ - lib/libgtest.la -samples_sample6_unittest_SOURCES = samples/sample6_unittest.cc -samples_sample6_unittest_LDADD = lib/libgtest_main.la \ - lib/libgtest.la -samples_sample7_unittest_SOURCES = samples/sample7_unittest.cc -samples_sample7_unittest_LDADD = lib/libgtest_main.la \ - lib/libgtest.la -samples_sample8_unittest_SOURCES = samples/sample8_unittest.cc -samples_sample8_unittest_LDADD = lib/libgtest_main.la \ - lib/libgtest.la - -# Also verify that libgtest works by itself. -samples_sample9_unittest_SOURCES = samples/sample9_unittest.cc -samples_sample9_unittest_LDADD = lib/libgtest.la -samples_sample10_unittest_SOURCES = samples/sample10_unittest.cc -samples_sample10_unittest_LDADD = lib/libgtest.la - -# This tests most constructs of gtest and verifies that libgtest_main -# and libgtest work. -TESTS += test/gtest_all_test -check_PROGRAMS += test/gtest_all_test -test_gtest_all_test_SOURCES = test/gtest_all_test.cc -test_gtest_all_test_LDADD = lib/libgtest_main.la \ - lib/libgtest.la - -# Tests that fused gtest files compile and work. -FUSED_GTEST_SRC = \ - fused-src/gtest/gtest-all.cc \ - fused-src/gtest/gtest.h \ - fused-src/gtest/gtest_main.cc - -if HAVE_PYTHON -TESTS += test/fused_gtest_test -check_PROGRAMS += test/fused_gtest_test -test_fused_gtest_test_SOURCES = $(FUSED_GTEST_SRC) \ - samples/sample1.cc samples/sample1_unittest.cc -test_fused_gtest_test_CPPFLAGS = -I"$(srcdir)/fused-src" - -# Build rules for putting fused Google Test files into the distribution -# package. The user can also create those files by manually running -# scripts/fuse_gtest_files.py. -$(test_fused_gtest_test_SOURCES): fused-gtest - -fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \ - $(GTEST_SRC) src/gtest-all.cc src/gtest_main.cc \ - scripts/fuse_gtest_files.py - mkdir -p "$(srcdir)/fused-src" - chmod -R u+w "$(srcdir)/fused-src" - rm -f "$(srcdir)/fused-src/gtest/gtest-all.cc" - rm -f "$(srcdir)/fused-src/gtest/gtest.h" - "$(srcdir)/scripts/fuse_gtest_files.py" "$(srcdir)/fused-src" - cp -f "$(srcdir)/src/gtest_main.cc" "$(srcdir)/fused-src/gtest/" - -maintainer-clean-local: - rm -rf "$(srcdir)/fused-src" -endif - -# Death tests may produce core dumps in the build directory. In case -# this happens, clean them to keep distcleancheck happy. -CLEANFILES = core - -# Disables 'make install' as installing a compiled version of Google -# Test can lead to undefined behavior due to violation of the -# One-Definition Rule. - -install-exec-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." - false - -install-data-local: - echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." - false diff --git a/test/gtest-1.8.0/README.md b/test/gtest-1.8.0/README.md deleted file mode 100644 index 225aba2439..0000000000 --- a/test/gtest-1.8.0/README.md +++ /dev/null @@ -1,360 +0,0 @@ - -### Generic Build Instructions ### - -#### Setup #### - -To build Google Test and your tests that use it, you need to tell your -build system where to find its headers and source files. The exact -way to do it depends on which build system you use, and is usually -straightforward. - -#### Build #### - -Suppose you put Google Test in directory `${GTEST_DIR}`. To build it, -create a library build target (or a project as called by Visual Studio -and Xcode) to compile - - ${GTEST_DIR}/src/gtest-all.cc - -with `${GTEST_DIR}/include` in the system header search path and `${GTEST_DIR}` -in the normal header search path. Assuming a Linux-like system and gcc, -something like the following will do: - - g++ -isystem ${GTEST_DIR}/include -I${GTEST_DIR} \ - -pthread -c ${GTEST_DIR}/src/gtest-all.cc - ar -rv libgtest.a gtest-all.o - -(We need `-pthread` as Google Test uses threads.) - -Next, you should compile your test source file with -`${GTEST_DIR}/include` in the system header search path, and link it -with gtest and any other necessary libraries: - - g++ -isystem ${GTEST_DIR}/include -pthread path/to/your_test.cc libgtest.a \ - -o your_test - -As an example, the make/ directory contains a Makefile that you can -use to build Google Test on systems where GNU make is available -(e.g. Linux, Mac OS X, and Cygwin). It doesn't try to build Google -Test's own tests. Instead, it just builds the Google Test library and -a sample test. You can use it as a starting point for your own build -script. - -If the default settings are correct for your environment, the -following commands should succeed: - - cd ${GTEST_DIR}/make - make - ./sample1_unittest - -If you see errors, try to tweak the contents of `make/Makefile` to make -them go away. There are instructions in `make/Makefile` on how to do -it. - -### Using CMake ### - -Google Test comes with a CMake build script ( -[CMakeLists.txt](CMakeLists.txt)) that can be used on a wide range of platforms ("C" stands for -cross-platform.). If you don't have CMake installed already, you can -download it for free from . - -CMake works by generating native makefiles or build projects that can -be used in the compiler environment of your choice. You can either -build Google Test as a standalone project or it can be incorporated -into an existing CMake build for another project. - -#### Standalone CMake Project #### - -When building Google Test as a standalone project, the typical -workflow starts with: - - mkdir mybuild # Create a directory to hold the build output. - cd mybuild - cmake ${GTEST_DIR} # Generate native build scripts. - -If you want to build Google Test's samples, you should replace the -last command with - - cmake -Dgtest_build_samples=ON ${GTEST_DIR} - -If you are on a \*nix system, you should now see a Makefile in the -current directory. Just type 'make' to build gtest. - -If you use Windows and have Visual Studio installed, a `gtest.sln` file -and several `.vcproj` files will be created. You can then build them -using Visual Studio. - -On Mac OS X with Xcode installed, a `.xcodeproj` file will be generated. - -#### Incorporating Into An Existing CMake Project #### - -If you want to use gtest in a project which already uses CMake, then a -more robust and flexible approach is to build gtest as part of that -project directly. This is done by making the GoogleTest source code -available to the main build and adding it using CMake's -`add_subdirectory()` command. This has the significant advantage that -the same compiler and linker settings are used between gtest and the -rest of your project, so issues associated with using incompatible -libraries (eg debug/release), etc. are avoided. This is particularly -useful on Windows. Making GoogleTest's source code available to the -main build can be done a few different ways: - -* Download the GoogleTest source code manually and place it at a - known location. This is the least flexible approach and can make - it more difficult to use with continuous integration systems, etc. -* Embed the GoogleTest source code as a direct copy in the main - project's source tree. This is often the simplest approach, but is - also the hardest to keep up to date. Some organizations may not - permit this method. -* Add GoogleTest as a git submodule or equivalent. This may not - always be possible or appropriate. Git submodules, for example, - have their own set of advantages and drawbacks. -* Use CMake to download GoogleTest as part of the build's configure - step. This is just a little more complex, but doesn't have the - limitations of the other methods. - -The last of the above methods is implemented with a small piece -of CMake code in a separate file (e.g. `CMakeLists.txt.in`) which -is copied to the build area and then invoked as a sub-build -_during the CMake stage_. That directory is then pulled into the -main build with `add_subdirectory()`. For example: - -New file `CMakeLists.txt.in`: - - cmake_minimum_required(VERSION 2.8.2) - - project(googletest-download NONE) - - include(ExternalProject) - ExternalProject_Add(googletest - GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG master - SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" - BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - TEST_COMMAND "" - ) - -Existing build's `CMakeLists.txt`: - - # Download and unpack googletest at configure time - configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt) - execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . - RESULT_VARIABLE result - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) - if(result) - message(FATAL_ERROR "CMake step for googletest failed: ${result}") - endif() - execute_process(COMMAND ${CMAKE_COMMAND} --build . - RESULT_VARIABLE result - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) - if(result) - message(FATAL_ERROR "Build step for googletest failed: ${result}") - endif() - - # Prevent overriding the parent project's compiler/linker - # settings on Windows - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - - # Add googletest directly to our build. This defines - # the gtest and gtest_main targets. - add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src - ${CMAKE_BINARY_DIR}/googletest-build - EXCLUDE_FROM_ALL) - - # The gtest/gtest_main targets carry header search path - # dependencies automatically when using CMake 2.8.11 or - # later. Otherwise we have to add them here ourselves. - if (CMAKE_VERSION VERSION_LESS 2.8.11) - include_directories("${gtest_SOURCE_DIR}/include") - endif() - - # Now simply link against gtest or gtest_main as needed. Eg - add_executable(example example.cpp) - target_link_libraries(example gtest_main) - add_test(NAME example_test COMMAND example) - -Note that this approach requires CMake 2.8.2 or later due to -its use of the `ExternalProject_Add()` command. The above -technique is discussed in more detail in -[this separate article](http://crascit.com/2015/07/25/cmake-gtest/) -which also contains a link to a fully generalized implementation -of the technique. - -##### Visual Studio Dynamic vs Static Runtimes ##### - -By default, new Visual Studio projects link the C runtimes dynamically -but Google Test links them statically. -This will generate an error that looks something like the following: - gtest.lib(gtest-all.obj) : error LNK2038: mismatch detected for 'RuntimeLibrary': value 'MTd_StaticDebug' doesn't match value 'MDd_DynamicDebug' in main.obj - -Google Test already has a CMake option for this: `gtest_force_shared_crt` - -Enabling this option will make gtest link the runtimes dynamically too, -and match the project in which it is included. - -### Legacy Build Scripts ### - -Before settling on CMake, we have been providing hand-maintained build -projects/scripts for Visual Studio, Xcode, and Autotools. While we -continue to provide them for convenience, they are not actively -maintained any more. We highly recommend that you follow the -instructions in the above sections to integrate Google Test -with your existing build system. - -If you still need to use the legacy build scripts, here's how: - -The msvc\ folder contains two solutions with Visual C++ projects. -Open the `gtest.sln` or `gtest-md.sln` file using Visual Studio, and you -are ready to build Google Test the same way you build any Visual -Studio project. Files that have names ending with -md use DLL -versions of Microsoft runtime libraries (the /MD or the /MDd compiler -option). Files without that suffix use static versions of the runtime -libraries (the /MT or the /MTd option). Please note that one must use -the same option to compile both gtest and the test code. If you use -Visual Studio 2005 or above, we recommend the -md version as /MD is -the default for new projects in these versions of Visual Studio. - -On Mac OS X, open the `gtest.xcodeproj` in the `xcode/` folder using -Xcode. Build the "gtest" target. The universal binary framework will -end up in your selected build directory (selected in the Xcode -"Preferences..." -> "Building" pane and defaults to xcode/build). -Alternatively, at the command line, enter: - - xcodebuild - -This will build the "Release" configuration of gtest.framework in your -default build location. See the "xcodebuild" man page for more -information about building different configurations and building in -different locations. - -If you wish to use the Google Test Xcode project with Xcode 4.x and -above, you need to either: - - * update the SDK configuration options in xcode/Config/General.xconfig. - Comment options `SDKROOT`, `MACOS_DEPLOYMENT_TARGET`, and `GCC_VERSION`. If - you choose this route you lose the ability to target earlier versions - of MacOS X. - * Install an SDK for an earlier version. This doesn't appear to be - supported by Apple, but has been reported to work - (http://stackoverflow.com/questions/5378518). - -### Tweaking Google Test ### - -Google Test can be used in diverse environments. The default -configuration may not work (or may not work well) out of the box in -some environments. However, you can easily tweak Google Test by -defining control macros on the compiler command line. Generally, -these macros are named like `GTEST_XYZ` and you define them to either 1 -or 0 to enable or disable a certain feature. - -We list the most frequently used macros below. For a complete list, -see file [include/gtest/internal/gtest-port.h](include/gtest/internal/gtest-port.h). - -### Choosing a TR1 Tuple Library ### - -Some Google Test features require the C++ Technical Report 1 (TR1) -tuple library, which is not yet available with all compilers. The -good news is that Google Test implements a subset of TR1 tuple that's -enough for its own need, and will automatically use this when the -compiler doesn't provide TR1 tuple. - -Usually you don't need to care about which tuple library Google Test -uses. However, if your project already uses TR1 tuple, you need to -tell Google Test to use the same TR1 tuple library the rest of your -project uses, or the two tuple implementations will clash. To do -that, add - - -DGTEST_USE_OWN_TR1_TUPLE=0 - -to the compiler flags while compiling Google Test and your tests. If -you want to force Google Test to use its own tuple library, just add - - -DGTEST_USE_OWN_TR1_TUPLE=1 - -to the compiler flags instead. - -If you don't want Google Test to use tuple at all, add - - -DGTEST_HAS_TR1_TUPLE=0 - -and all features using tuple will be disabled. - -### Multi-threaded Tests ### - -Google Test is thread-safe where the pthread library is available. -After `#include "gtest/gtest.h"`, you can check the `GTEST_IS_THREADSAFE` -macro to see whether this is the case (yes if the macro is `#defined` to -1, no if it's undefined.). - -If Google Test doesn't correctly detect whether pthread is available -in your environment, you can force it with - - -DGTEST_HAS_PTHREAD=1 - -or - - -DGTEST_HAS_PTHREAD=0 - -When Google Test uses pthread, you may need to add flags to your -compiler and/or linker to select the pthread library, or you'll get -link errors. If you use the CMake script or the deprecated Autotools -script, this is taken care of for you. If you use your own build -script, you'll need to read your compiler and linker's manual to -figure out what flags to add. - -### As a Shared Library (DLL) ### - -Google Test is compact, so most users can build and link it as a -static library for the simplicity. You can choose to use Google Test -as a shared library (known as a DLL on Windows) if you prefer. - -To compile *gtest* as a shared library, add - - -DGTEST_CREATE_SHARED_LIBRARY=1 - -to the compiler flags. You'll also need to tell the linker to produce -a shared library instead - consult your linker's manual for how to do -it. - -To compile your *tests* that use the gtest shared library, add - - -DGTEST_LINKED_AS_SHARED_LIBRARY=1 - -to the compiler flags. - -Note: while the above steps aren't technically necessary today when -using some compilers (e.g. GCC), they may become necessary in the -future, if we decide to improve the speed of loading the library (see - for details). Therefore you are -recommended to always add the above flags when using Google Test as a -shared library. Otherwise a future release of Google Test may break -your build script. - -### Avoiding Macro Name Clashes ### - -In C++, macros don't obey namespaces. Therefore two libraries that -both define a macro of the same name will clash if you `#include` both -definitions. In case a Google Test macro clashes with another -library, you can force Google Test to rename its macro to avoid the -conflict. - -Specifically, if both Google Test and some other code define macro -FOO, you can add - - -DGTEST_DONT_DEFINE_FOO=1 - -to the compiler flags to tell Google Test to change the macro's name -from `FOO` to `GTEST_FOO`. Currently `FOO` can be `FAIL`, `SUCCEED`, -or `TEST`. For example, with `-DGTEST_DONT_DEFINE_TEST=1`, you'll -need to write - - GTEST_TEST(SomeTest, DoesThis) { ... } - -instead of - - TEST(SomeTest, DoesThis) { ... } - -in order to define a test. diff --git a/test/gtest-1.8.0/cmake/gtest.pc.in b/test/gtest-1.8.0/cmake/gtest.pc.in deleted file mode 100644 index e7967ad56f..0000000000 --- a/test/gtest-1.8.0/cmake/gtest.pc.in +++ /dev/null @@ -1,9 +0,0 @@ -libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - -Name: gtest -Description: GoogleTest (without main() function) -Version: @PROJECT_VERSION@ -URL: https://github.com/google/googletest -Libs: -L${libdir} -lgtest @CMAKE_THREAD_LIBS_INIT@ -Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ diff --git a/test/gtest-1.8.0/cmake/gtest_main.pc.in b/test/gtest-1.8.0/cmake/gtest_main.pc.in deleted file mode 100644 index fe25d9c73c..0000000000 --- a/test/gtest-1.8.0/cmake/gtest_main.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - -Name: gtest_main -Description: GoogleTest (with main() function) -Version: @PROJECT_VERSION@ -URL: https://github.com/google/googletest -Requires: gtest -Libs: -L${libdir} -lgtest_main @CMAKE_THREAD_LIBS_INIT@ -Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ diff --git a/test/gtest-1.8.0/cmake/internal_utils.cmake b/test/gtest-1.8.0/cmake/internal_utils.cmake deleted file mode 100644 index 6448918f8e..0000000000 --- a/test/gtest-1.8.0/cmake/internal_utils.cmake +++ /dev/null @@ -1,280 +0,0 @@ -# Defines functions and macros useful for building Google Test and -# Google Mock. -# -# Note: -# -# - This file will be run twice when building Google Mock (once via -# Google Test's CMakeLists.txt, and once via Google Mock's). -# Therefore it shouldn't have any side effects other than defining -# the functions and macros. -# -# - The functions/macros defined in this file may depend on Google -# Test and Google Mock's option() definitions, and thus must be -# called *after* the options have been defined. - -# Tweaks CMake's default compiler/linker settings to suit Google Test's needs. -# -# This must be a macro(), as inside a function string() can only -# update variables in the function scope. -macro(fix_default_compiler_settings_) - if (MSVC) - # For MSVC, CMake sets certain flags to defaults we want to override. - # This replacement code is taken from sample in the CMake Wiki at - # http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace. - foreach (flag_var - CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE - CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) - if (NOT BUILD_SHARED_LIBS AND NOT gtest_force_shared_crt) - # When Google Test is built as a shared library, it should also use - # shared runtime libraries. Otherwise, it may end up with multiple - # copies of runtime library data in different modules, resulting in - # hard-to-find crashes. When it is built as a static library, it is - # preferable to use CRT as static libraries, as we don't have to rely - # on CRT DLLs being available. CMake always defaults to using shared - # CRT libraries, so we override that default here. - string(REPLACE "/MD" "-MT" ${flag_var} "${${flag_var}}") - endif() - - # We prefer more strict warning checking for building Google Test. - # Replaces /W3 with /W4 in defaults. - string(REPLACE "/W3" "/W4" ${flag_var} "${${flag_var}}") - endforeach() - endif() -endmacro() - -# Defines the compiler/linker flags used to build Google Test and -# Google Mock. You can tweak these definitions to suit your need. A -# variable's value is empty before it's explicitly assigned to. -macro(config_compiler_and_linker) - # Note: pthreads on MinGW is not supported, even if available - # instead, we use windows threading primitives - unset(GTEST_HAS_PTHREAD) - if (NOT gtest_disable_pthreads AND NOT MINGW) - # Defines CMAKE_USE_PTHREADS_INIT and CMAKE_THREAD_LIBS_INIT. - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads) - if (CMAKE_USE_PTHREADS_INIT) - set(GTEST_HAS_PTHREAD ON) - endif() - endif() - - fix_default_compiler_settings_() - if (MSVC) - # Newlines inside flags variables break CMake's NMake generator. - # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds. - set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J -Zi") - if (MSVC_VERSION LESS 1400) # 1400 is Visual Studio 2005 - # Suppress spurious warnings MSVC 7.1 sometimes issues. - # Forcing value to bool. - set(cxx_base_flags "${cxx_base_flags} -wd4800") - # Copy constructor and assignment operator could not be generated. - set(cxx_base_flags "${cxx_base_flags} -wd4511 -wd4512") - # Compatibility warnings not applicable to Google Test. - # Resolved overload was found by argument-dependent lookup. - set(cxx_base_flags "${cxx_base_flags} -wd4675") - endif() - if (MSVC_VERSION LESS 1500) # 1500 is Visual Studio 2008 - # Conditional expression is constant. - # When compiling with /W4, we get several instances of C4127 - # (Conditional expression is constant). In our code, we disable that - # warning on a case-by-case basis. However, on Visual Studio 2005, - # the warning fires on std::list. Therefore on that compiler and earlier, - # we disable the warning project-wide. - set(cxx_base_flags "${cxx_base_flags} -wd4127") - endif() - if (NOT (MSVC_VERSION LESS 1700)) # 1700 is Visual Studio 2012. - # Suppress "unreachable code" warning on VS 2012 and later. - # http://stackoverflow.com/questions/3232669 explains the issue. - set(cxx_base_flags "${cxx_base_flags} -wd4702") - endif() - - set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32") - set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN") - set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1") - set(cxx_no_exception_flags "-EHs-c- -D_HAS_EXCEPTIONS=0") - set(cxx_no_rtti_flags "-GR-") - elseif (CMAKE_COMPILER_IS_GNUCXX) - set(cxx_base_flags "-Wall -Wshadow -Werror") - if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0) - set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else") - endif() - set(cxx_exception_flags "-fexceptions") - set(cxx_no_exception_flags "-fno-exceptions") - # Until version 4.3.2, GCC doesn't define a macro to indicate - # whether RTTI is enabled. Therefore we define GTEST_HAS_RTTI - # explicitly. - set(cxx_no_rtti_flags "-fno-rtti -DGTEST_HAS_RTTI=0") - set(cxx_strict_flags - "-Wextra -Wno-unused-parameter -Wno-missing-field-initializers") - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro") - set(cxx_exception_flags "-features=except") - # Sun Pro doesn't provide macros to indicate whether exceptions and - # RTTI are enabled, so we define GTEST_HAS_* explicitly. - set(cxx_no_exception_flags "-features=no%except -DGTEST_HAS_EXCEPTIONS=0") - set(cxx_no_rtti_flags "-features=no%rtti -DGTEST_HAS_RTTI=0") - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "VisualAge" OR - CMAKE_CXX_COMPILER_ID STREQUAL "XL") - # CMake 2.8 changes Visual Age's compiler ID to "XL". - set(cxx_exception_flags "-qeh") - set(cxx_no_exception_flags "-qnoeh") - # Until version 9.0, Visual Age doesn't define a macro to indicate - # whether RTTI is enabled. Therefore we define GTEST_HAS_RTTI - # explicitly. - set(cxx_no_rtti_flags "-qnortti -DGTEST_HAS_RTTI=0") - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "HP") - set(cxx_base_flags "-AA -mt") - set(cxx_exception_flags "-DGTEST_HAS_EXCEPTIONS=1") - set(cxx_no_exception_flags "+noeh -DGTEST_HAS_EXCEPTIONS=0") - # RTTI can not be disabled in HP aCC compiler. - set(cxx_no_rtti_flags "") - endif() - - # The pthreads library is available and allowed? - if (DEFINED GTEST_HAS_PTHREAD) - set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=1") - else() - set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=0") - endif() - set(cxx_base_flags "${cxx_base_flags} ${GTEST_HAS_PTHREAD_MACRO}") - - # For building gtest's own tests and samples. - set(cxx_exception "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_exception_flags}") - set(cxx_no_exception - "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_no_exception_flags}") - set(cxx_default "${cxx_exception}") - set(cxx_no_rtti "${cxx_default} ${cxx_no_rtti_flags}") - set(cxx_use_own_tuple "${cxx_default} -DGTEST_USE_OWN_TR1_TUPLE=1") - - # For building the gtest libraries. - set(cxx_strict "${cxx_default} ${cxx_strict_flags}") -endmacro() - -# Defines the gtest & gtest_main libraries. User tests should link -# with one of them. -function(cxx_library_with_type name type cxx_flags) - # type can be either STATIC or SHARED to denote a static or shared library. - # ARGN refers to additional arguments after 'cxx_flags'. - add_library(${name} ${type} ${ARGN}) - set_target_properties(${name} - PROPERTIES - COMPILE_FLAGS "${cxx_flags}") - # Generate debug library name with a postfix. - set_target_properties(${name} - PROPERTIES - DEBUG_POSTFIX "d") - if (BUILD_SHARED_LIBS OR type STREQUAL "SHARED") - set_target_properties(${name} - PROPERTIES - COMPILE_DEFINITIONS "GTEST_CREATE_SHARED_LIBRARY=1") - endif() - if (DEFINED GTEST_HAS_PTHREAD) - target_link_libraries(${name} ${CMAKE_THREAD_LIBS_INIT}) - endif() -endfunction() - -######################################################################## -# -# Helper functions for creating build targets. - -function(cxx_shared_library name cxx_flags) - cxx_library_with_type(${name} SHARED "${cxx_flags}" ${ARGN}) -endfunction() - -function(cxx_library name cxx_flags) - cxx_library_with_type(${name} "" "${cxx_flags}" ${ARGN}) -endfunction() - -# cxx_executable_with_flags(name cxx_flags libs srcs...) -# -# creates a named C++ executable that depends on the given libraries and -# is built from the given source files with the given compiler flags. -function(cxx_executable_with_flags name cxx_flags libs) - add_executable(${name} ${ARGN}) - if (MSVC AND (NOT (MSVC_VERSION LESS 1700))) # 1700 is Visual Studio 2012. - # BigObj required for tests. - set(cxx_flags "${cxx_flags} -bigobj") - endif() - if (cxx_flags) - set_target_properties(${name} - PROPERTIES - COMPILE_FLAGS "${cxx_flags}") - endif() - if (BUILD_SHARED_LIBS) - set_target_properties(${name} - PROPERTIES - COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1") - endif() - # To support mixing linking in static and dynamic libraries, link each - # library in with an extra call to target_link_libraries. - foreach (lib "${libs}") - target_link_libraries(${name} ${lib}) - endforeach() -endfunction() - -# cxx_executable(name dir lib srcs...) -# -# creates a named target that depends on the given libs and is built -# from the given source files. dir/name.cc is implicitly included in -# the source file list. -function(cxx_executable name dir libs) - cxx_executable_with_flags( - ${name} "${cxx_default}" "${libs}" "${dir}/${name}.cc" ${ARGN}) -endfunction() - -# Sets PYTHONINTERP_FOUND and PYTHON_EXECUTABLE. -find_package(PythonInterp) - -# cxx_test_with_flags(name cxx_flags libs srcs...) -# -# creates a named C++ test that depends on the given libs and is built -# from the given source files with the given compiler flags. -function(cxx_test_with_flags name cxx_flags libs) - cxx_executable_with_flags(${name} "${cxx_flags}" "${libs}" ${ARGN}) - add_test(${name} ${name}) -endfunction() - -# cxx_test(name libs srcs...) -# -# creates a named test target that depends on the given libs and is -# built from the given source files. Unlike cxx_test_with_flags, -# test/name.cc is already implicitly included in the source file list. -function(cxx_test name libs) - cxx_test_with_flags("${name}" "${cxx_default}" "${libs}" - "test/${name}.cc" ${ARGN}) -endfunction() - -# py_test(name) -# -# creates a Python test with the given name whose main module is in -# test/name.py. It does nothing if Python is not installed. -function(py_test name) - if (PYTHONINTERP_FOUND) - if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) - if (CMAKE_CONFIGURATION_TYPES) - # Multi-configuration build generators as for Visual Studio save - # output in a subdirectory of CMAKE_CURRENT_BINARY_DIR (Debug, - # Release etc.), so we have to provide it here. - add_test( - NAME ${name} - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py - --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$) - else (CMAKE_CONFIGURATION_TYPES) - # Single-configuration build generators like Makefile generators - # don't have subdirs below CMAKE_CURRENT_BINARY_DIR. - add_test( - NAME ${name} - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py - --build_dir=${CMAKE_CURRENT_BINARY_DIR}) - endif (CMAKE_CONFIGURATION_TYPES) - else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) - # ${CMAKE_CURRENT_BINARY_DIR} is known at configuration time, so we can - # directly bind it from cmake. ${CTEST_CONFIGURATION_TYPE} is known - # only at ctest runtime (by calling ctest -c ), so - # we have to escape $ to delay variable substitution here. - add_test( - ${name} - ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py - --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE}) - endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) - endif(PYTHONINTERP_FOUND) -endfunction() diff --git a/test/gtest-1.8.0/codegear/gtest.cbproj b/test/gtest-1.8.0/codegear/gtest.cbproj deleted file mode 100644 index 95c3054b85..0000000000 --- a/test/gtest-1.8.0/codegear/gtest.cbproj +++ /dev/null @@ -1,138 +0,0 @@ - - - - {bca37a72-5b07-46cf-b44e-89f8e06451a2} - Release - - - true - - - true - true - Base - - - true - true - Base - - - true - lib - JPHNE - NO_STRICT - true - true - CppStaticLibrary - true - rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi - false - $(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;.. - rtl.lib;vcl.lib - 32 - $(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk - - - false - false - true - _DEBUG;$(Defines) - true - false - true - None - DEBUG - true - Debug - true - true - true - $(BDS)\lib\debug;$(ILINK_LibraryPath) - Full - true - - - NDEBUG;$(Defines) - Release - $(BDS)\lib\release;$(ILINK_LibraryPath) - None - - - CPlusPlusBuilder.Personality - CppStaticLibrary - -FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse - - - CodeGear C++Builder Office 2000 Servers Package - CodeGear C++Builder Office XP Servers Package - FalseTrueTrue3$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include1$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk1NO_STRICT13216 - - - - - 3 - - - 4 - - - 5 - - - 6 - - - 7 - - - 8 - - - 0 - - - 1 - - - 2 - - - 9 - - - 10 - - - 11 - - - 12 - - - 14 - - - 13 - - - 15 - - - 16 - - - 17 - - - 18 - - - Cfg_1 - - - Cfg_2 - - - \ No newline at end of file diff --git a/test/gtest-1.8.0/codegear/gtest.groupproj b/test/gtest-1.8.0/codegear/gtest.groupproj deleted file mode 100644 index faf31cab64..0000000000 --- a/test/gtest-1.8.0/codegear/gtest.groupproj +++ /dev/null @@ -1,54 +0,0 @@ - - - {c1d923e0-6cba-4332-9b6f-3420acbf5091} - - - - - - - - - Default.Personality - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/gtest-1.8.0/codegear/gtest_all.cc b/test/gtest-1.8.0/codegear/gtest_all.cc deleted file mode 100644 index 121b2d80e8..0000000000 --- a/test/gtest-1.8.0/codegear/gtest_all.cc +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2009, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: Josh Kelley (joshkel@gmail.com) -// -// Google C++ Testing Framework (Google Test) -// -// C++Builder's IDE cannot build a static library from files with hyphens -// in their name. See http://qc.codegear.com/wc/qcmain.aspx?d=70977 . -// This file serves as a workaround. - -#include "src/gtest-all.cc" diff --git a/test/gtest-1.8.0/codegear/gtest_link.cc b/test/gtest-1.8.0/codegear/gtest_link.cc deleted file mode 100644 index 918eccd19b..0000000000 --- a/test/gtest-1.8.0/codegear/gtest_link.cc +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2009, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: Josh Kelley (joshkel@gmail.com) -// -// Google C++ Testing Framework (Google Test) -// -// Links gtest.lib and gtest_main.lib into the current project in C++Builder. -// This means that these libraries can't be renamed, but it's the only way to -// ensure that Debug versus Release test builds are linked against the -// appropriate Debug or Release build of the libraries. - -#pragma link "gtest.lib" -#pragma link "gtest_main.lib" diff --git a/test/gtest-1.8.0/codegear/gtest_main.cbproj b/test/gtest-1.8.0/codegear/gtest_main.cbproj deleted file mode 100644 index d76ce1398f..0000000000 --- a/test/gtest-1.8.0/codegear/gtest_main.cbproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - {bca37a72-5b07-46cf-b44e-89f8e06451a2} - Release - - - true - - - true - true - Base - - - true - true - Base - - - true - lib - JPHNE - NO_STRICT - true - true - CppStaticLibrary - true - rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi - false - $(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;.. - rtl.lib;vcl.lib - 32 - $(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk - - - false - false - true - _DEBUG;$(Defines) - true - false - true - None - DEBUG - true - Debug - true - true - true - $(BDS)\lib\debug;$(ILINK_LibraryPath) - Full - true - - - NDEBUG;$(Defines) - Release - $(BDS)\lib\release;$(ILINK_LibraryPath) - None - - - CPlusPlusBuilder.Personality - CppStaticLibrary - -FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse - CodeGear C++Builder Office 2000 Servers Package - CodeGear C++Builder Office XP Servers Package - FalseTrueTrue3$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include1$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk1NO_STRICT13216 - - - - - 0 - - - Cfg_1 - - - Cfg_2 - - - diff --git a/test/gtest-1.8.0/codegear/gtest_unittest.cbproj b/test/gtest-1.8.0/codegear/gtest_unittest.cbproj deleted file mode 100644 index dc5db8e4da..0000000000 --- a/test/gtest-1.8.0/codegear/gtest_unittest.cbproj +++ /dev/null @@ -1,88 +0,0 @@ - - - - {eea63393-5ac5-4b9c-8909-d75fef2daa41} - Release - - - true - - - true - true - Base - - - true - true - Base - - - exe - true - NO_STRICT - JPHNE - true - ..\test - true - CppConsoleApplication - true - true - rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi - false - $(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;.. - $(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test - true - - - false - false - true - _DEBUG;$(Defines) - true - false - true - None - DEBUG - true - Debug - true - true - true - $(BDS)\lib\debug;$(ILINK_LibraryPath) - Full - true - - - NDEBUG;$(Defines) - Release - $(BDS)\lib\release;$(ILINK_LibraryPath) - None - - - CPlusPlusBuilder.Personality - CppConsoleApplication - -FalseFalse1000FalseFalseFalseFalseFalse103312521.0.0.01.0.0.0FalseFalseFalseTrueFalse - - - CodeGear C++Builder Office 2000 Servers Package - CodeGear C++Builder Office XP Servers Package - FalseTrueTrue3$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include1$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(OUTPUTDIR);..\test2NO_STRICTSTRICT - - - - - 0 - - - 1 - - - Cfg_1 - - - Cfg_2 - - - \ No newline at end of file diff --git a/test/gtest-1.8.0/configure.ac b/test/gtest-1.8.0/configure.ac deleted file mode 100644 index 254c8c4b31..0000000000 --- a/test/gtest-1.8.0/configure.ac +++ /dev/null @@ -1,68 +0,0 @@ -m4_include(m4/acx_pthread.m4) - -# At this point, the Xcode project assumes the version string will be three -# integers separated by periods and surrounded by square brackets (e.g. -# "[1.0.1]"). It also asumes that there won't be any closing parenthesis -# between "AC_INIT(" and the closing ")" including comments and strings. -AC_INIT([Google C++ Testing Framework], - [1.8.0], - [googletestframework@googlegroups.com], - [gtest]) - -# Provide various options to initialize the Autoconf and configure processes. -AC_PREREQ([2.59]) -AC_CONFIG_SRCDIR([./LICENSE]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_HEADERS([build-aux/config.h]) -AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([scripts/gtest-config], [chmod +x scripts/gtest-config]) - -# Initialize Automake with various options. We require at least v1.9, prevent -# pedantic complaints about package files, and enable various distribution -# targets. -AM_INIT_AUTOMAKE([1.9 dist-bzip2 dist-zip foreign subdir-objects]) - -# Check for programs used in building Google Test. -AC_PROG_CC -AC_PROG_CXX -AC_LANG([C++]) -AC_PROG_LIBTOOL - -# TODO(chandlerc@google.com): Currently we aren't running the Python tests -# against the interpreter detected by AM_PATH_PYTHON, and so we condition -# HAVE_PYTHON by requiring "python" to be in the PATH, and that interpreter's -# version to be >= 2.3. This will allow the scripts to use a "/usr/bin/env" -# hashbang. -PYTHON= # We *do not* allow the user to specify a python interpreter -AC_PATH_PROG([PYTHON],[python],[:]) -AS_IF([test "$PYTHON" != ":"], - [AM_PYTHON_CHECK_VERSION([$PYTHON],[2.3],[:],[PYTHON=":"])]) -AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != ":"]) - -# Configure pthreads. -AC_ARG_WITH([pthreads], - [AS_HELP_STRING([--with-pthreads], - [use pthreads (default is yes)])], - [with_pthreads=$withval], - [with_pthreads=check]) - -have_pthreads=no -AS_IF([test "x$with_pthreads" != "xno"], - [ACX_PTHREAD( - [], - [AS_IF([test "x$with_pthreads" != "xcheck"], - [AC_MSG_FAILURE( - [--with-pthreads was specified, but unable to be used])])]) - have_pthreads="$acx_pthread_ok"]) -AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" = "xyes"]) -AC_SUBST(PTHREAD_CFLAGS) -AC_SUBST(PTHREAD_LIBS) - -# TODO(chandlerc@google.com) Check for the necessary system headers. - -# TODO(chandlerc@google.com) Check the types, structures, and other compiler -# and architecture characteristics. - -# Output the generated files. No further autoconf macros may be used. -AC_OUTPUT diff --git a/test/gtest-1.8.0/docs/AdvancedGuide.md b/test/gtest-1.8.0/docs/AdvancedGuide.md deleted file mode 100644 index c1a1a4abba..0000000000 --- a/test/gtest-1.8.0/docs/AdvancedGuide.md +++ /dev/null @@ -1,2416 +0,0 @@ - - -Now that you have read [Primer](Primer.md) and learned how to write tests -using Google Test, it's time to learn some new tricks. This document -will show you more assertions as well as how to construct complex -failure messages, propagate fatal failures, reuse and speed up your -test fixtures, and use various flags with your tests. - -# More Assertions # - -This section covers some less frequently used, but still significant, -assertions. - -## Explicit Success and Failure ## - -These three assertions do not actually test a value or expression. Instead, -they generate a success or failure directly. Like the macros that actually -perform a test, you may stream a custom failure message into them. - -| `SUCCEED();` | -|:-------------| - -Generates a success. This does NOT make the overall test succeed. A test is -considered successful only if none of its assertions fail during its execution. - -Note: `SUCCEED()` is purely documentary and currently doesn't generate any -user-visible output. However, we may add `SUCCEED()` messages to Google Test's -output in the future. - -| `FAIL();` | `ADD_FAILURE();` | `ADD_FAILURE_AT("`_file\_path_`", `_line\_number_`);` | -|:-----------|:-----------------|:------------------------------------------------------| - -`FAIL()` generates a fatal failure, while `ADD_FAILURE()` and `ADD_FAILURE_AT()` generate a nonfatal -failure. These are useful when control flow, rather than a Boolean expression, -determines the test's success or failure. For example, you might want to write -something like: - -``` -switch(expression) { - case 1: ... some checks ... - case 2: ... some other checks - ... - default: FAIL() << "We shouldn't get here."; -} -``` - -Note: you can only use `FAIL()` in functions that return `void`. See the [Assertion Placement section](#assertion-placement) for more information. - -_Availability_: Linux, Windows, Mac. - -## Exception Assertions ## - -These are for verifying that a piece of code throws (or does not -throw) an exception of the given type: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_THROW(`_statement_, _exception\_type_`);` | `EXPECT_THROW(`_statement_, _exception\_type_`);` | _statement_ throws an exception of the given type | -| `ASSERT_ANY_THROW(`_statement_`);` | `EXPECT_ANY_THROW(`_statement_`);` | _statement_ throws an exception of any type | -| `ASSERT_NO_THROW(`_statement_`);` | `EXPECT_NO_THROW(`_statement_`);` | _statement_ doesn't throw any exception | - -Examples: - -``` -ASSERT_THROW(Foo(5), bar_exception); - -EXPECT_NO_THROW({ - int n = 5; - Bar(&n); -}); -``` - -_Availability_: Linux, Windows, Mac; since version 1.1.0. - -## Predicate Assertions for Better Error Messages ## - -Even though Google Test has a rich set of assertions, they can never be -complete, as it's impossible (nor a good idea) to anticipate all the scenarios -a user might run into. Therefore, sometimes a user has to use `EXPECT_TRUE()` -to check a complex expression, for lack of a better macro. This has the problem -of not showing you the values of the parts of the expression, making it hard to -understand what went wrong. As a workaround, some users choose to construct the -failure message by themselves, streaming it into `EXPECT_TRUE()`. However, this -is awkward especially when the expression has side-effects or is expensive to -evaluate. - -Google Test gives you three different options to solve this problem: - -### Using an Existing Boolean Function ### - -If you already have a function or a functor that returns `bool` (or a type -that can be implicitly converted to `bool`), you can use it in a _predicate -assertion_ to get the function arguments printed for free: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_PRED1(`_pred1, val1_`);` | `EXPECT_PRED1(`_pred1, val1_`);` | _pred1(val1)_ returns true | -| `ASSERT_PRED2(`_pred2, val1, val2_`);` | `EXPECT_PRED2(`_pred2, val1, val2_`);` | _pred2(val1, val2)_ returns true | -| ... | ... | ... | - -In the above, _predn_ is an _n_-ary predicate function or functor, where -_val1_, _val2_, ..., and _valn_ are its arguments. The assertion succeeds -if the predicate returns `true` when applied to the given arguments, and fails -otherwise. When the assertion fails, it prints the value of each argument. In -either case, the arguments are evaluated exactly once. - -Here's an example. Given - -``` -// Returns true iff m and n have no common divisors except 1. -bool MutuallyPrime(int m, int n) { ... } -const int a = 3; -const int b = 4; -const int c = 10; -``` - -the assertion `EXPECT_PRED2(MutuallyPrime, a, b);` will succeed, while the -assertion `EXPECT_PRED2(MutuallyPrime, b, c);` will fail with the message - -
-!MutuallyPrime(b, c) is false, where

-b is 4

-c is 10

-
- -**Notes:** - - 1. If you see a compiler error "no matching function to call" when using `ASSERT_PRED*` or `EXPECT_PRED*`, please see [this FAQ](FAQ.md#the-compiler-complains-no-matching-function-to-call-when-i-use-assert_predn-how-do-i-fix-it) for how to resolve it. - 1. Currently we only provide predicate assertions of arity <= 5. If you need a higher-arity assertion, let us know. - -_Availability_: Linux, Windows, Mac. - -### Using a Function That Returns an AssertionResult ### - -While `EXPECT_PRED*()` and friends are handy for a quick job, the -syntax is not satisfactory: you have to use different macros for -different arities, and it feels more like Lisp than C++. The -`::testing::AssertionResult` class solves this problem. - -An `AssertionResult` object represents the result of an assertion -(whether it's a success or a failure, and an associated message). You -can create an `AssertionResult` using one of these factory -functions: - -``` -namespace testing { - -// Returns an AssertionResult object to indicate that an assertion has -// succeeded. -AssertionResult AssertionSuccess(); - -// Returns an AssertionResult object to indicate that an assertion has -// failed. -AssertionResult AssertionFailure(); - -} -``` - -You can then use the `<<` operator to stream messages to the -`AssertionResult` object. - -To provide more readable messages in Boolean assertions -(e.g. `EXPECT_TRUE()`), write a predicate function that returns -`AssertionResult` instead of `bool`. For example, if you define -`IsEven()` as: - -``` -::testing::AssertionResult IsEven(int n) { - if ((n % 2) == 0) - return ::testing::AssertionSuccess(); - else - return ::testing::AssertionFailure() << n << " is odd"; -} -``` - -instead of: - -``` -bool IsEven(int n) { - return (n % 2) == 0; -} -``` - -the failed assertion `EXPECT_TRUE(IsEven(Fib(4)))` will print: - -
-Value of: IsEven(Fib(4))

-Actual: false (*3 is odd*)

-Expected: true

-
- -instead of a more opaque - -
-Value of: IsEven(Fib(4))

-Actual: false

-Expected: true

-
- -If you want informative messages in `EXPECT_FALSE` and `ASSERT_FALSE` -as well, and are fine with making the predicate slower in the success -case, you can supply a success message: - -``` -::testing::AssertionResult IsEven(int n) { - if ((n % 2) == 0) - return ::testing::AssertionSuccess() << n << " is even"; - else - return ::testing::AssertionFailure() << n << " is odd"; -} -``` - -Then the statement `EXPECT_FALSE(IsEven(Fib(6)))` will print - -
-Value of: IsEven(Fib(6))

-Actual: true (8 is even)

-Expected: false

-
- -_Availability_: Linux, Windows, Mac; since version 1.4.1. - -### Using a Predicate-Formatter ### - -If you find the default message generated by `(ASSERT|EXPECT)_PRED*` and -`(ASSERT|EXPECT)_(TRUE|FALSE)` unsatisfactory, or some arguments to your -predicate do not support streaming to `ostream`, you can instead use the -following _predicate-formatter assertions_ to _fully_ customize how the -message is formatted: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_PRED_FORMAT1(`_pred\_format1, val1_`);` | `EXPECT_PRED_FORMAT1(`_pred\_format1, val1_`);` | _pred\_format1(val1)_ is successful | -| `ASSERT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | `EXPECT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | _pred\_format2(val1, val2)_ is successful | -| `...` | `...` | `...` | - -The difference between this and the previous two groups of macros is that instead of -a predicate, `(ASSERT|EXPECT)_PRED_FORMAT*` take a _predicate-formatter_ -(_pred\_formatn_), which is a function or functor with the signature: - -`::testing::AssertionResult PredicateFormattern(const char* `_expr1_`, const char* `_expr2_`, ... const char* `_exprn_`, T1 `_val1_`, T2 `_val2_`, ... Tn `_valn_`);` - -where _val1_, _val2_, ..., and _valn_ are the values of the predicate -arguments, and _expr1_, _expr2_, ..., and _exprn_ are the corresponding -expressions as they appear in the source code. The types `T1`, `T2`, ..., and -`Tn` can be either value types or reference types. For example, if an -argument has type `Foo`, you can declare it as either `Foo` or `const Foo&`, -whichever is appropriate. - -A predicate-formatter returns a `::testing::AssertionResult` object to indicate -whether the assertion has succeeded or not. The only way to create such an -object is to call one of these factory functions: - -As an example, let's improve the failure message in the previous example, which uses `EXPECT_PRED2()`: - -``` -// Returns the smallest prime common divisor of m and n, -// or 1 when m and n are mutually prime. -int SmallestPrimeCommonDivisor(int m, int n) { ... } - -// A predicate-formatter for asserting that two integers are mutually prime. -::testing::AssertionResult AssertMutuallyPrime(const char* m_expr, - const char* n_expr, - int m, - int n) { - if (MutuallyPrime(m, n)) - return ::testing::AssertionSuccess(); - - return ::testing::AssertionFailure() - << m_expr << " and " << n_expr << " (" << m << " and " << n - << ") are not mutually prime, " << "as they have a common divisor " - << SmallestPrimeCommonDivisor(m, n); -} -``` - -With this predicate-formatter, we can use - -``` -EXPECT_PRED_FORMAT2(AssertMutuallyPrime, b, c); -``` - -to generate the message - -
-b and c (4 and 10) are not mutually prime, as they have a common divisor 2.

-
- -As you may have realized, many of the assertions we introduced earlier are -special cases of `(EXPECT|ASSERT)_PRED_FORMAT*`. In fact, most of them are -indeed defined using `(EXPECT|ASSERT)_PRED_FORMAT*`. - -_Availability_: Linux, Windows, Mac. - - -## Floating-Point Comparison ## - -Comparing floating-point numbers is tricky. Due to round-off errors, it is -very unlikely that two floating-points will match exactly. Therefore, -`ASSERT_EQ` 's naive comparison usually doesn't work. And since floating-points -can have a wide value range, no single fixed error bound works. It's better to -compare by a fixed relative error bound, except for values close to 0 due to -the loss of precision there. - -In general, for floating-point comparison to make sense, the user needs to -carefully choose the error bound. If they don't want or care to, comparing in -terms of Units in the Last Place (ULPs) is a good default, and Google Test -provides assertions to do this. Full details about ULPs are quite long; if you -want to learn more, see -[this article on float comparison](https://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/). - -### Floating-Point Macros ### - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_FLOAT_EQ(`_val1, val2_`);` | `EXPECT_FLOAT_EQ(`_val1, val2_`);` | the two `float` values are almost equal | -| `ASSERT_DOUBLE_EQ(`_val1, val2_`);` | `EXPECT_DOUBLE_EQ(`_val1, val2_`);` | the two `double` values are almost equal | - -By "almost equal", we mean the two values are within 4 ULP's from each -other. - -The following assertions allow you to choose the acceptable error bound: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_NEAR(`_val1, val2, abs\_error_`);` | `EXPECT_NEAR`_(val1, val2, abs\_error_`);` | the difference between _val1_ and _val2_ doesn't exceed the given absolute error | - -_Availability_: Linux, Windows, Mac. - -### Floating-Point Predicate-Format Functions ### - -Some floating-point operations are useful, but not that often used. In order -to avoid an explosion of new macros, we provide them as predicate-format -functions that can be used in predicate assertion macros (e.g. -`EXPECT_PRED_FORMAT2`, etc). - -``` -EXPECT_PRED_FORMAT2(::testing::FloatLE, val1, val2); -EXPECT_PRED_FORMAT2(::testing::DoubleLE, val1, val2); -``` - -Verifies that _val1_ is less than, or almost equal to, _val2_. You can -replace `EXPECT_PRED_FORMAT2` in the above table with `ASSERT_PRED_FORMAT2`. - -_Availability_: Linux, Windows, Mac. - -## Windows HRESULT assertions ## - -These assertions test for `HRESULT` success or failure. - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_HRESULT_SUCCEEDED(`_expression_`);` | `EXPECT_HRESULT_SUCCEEDED(`_expression_`);` | _expression_ is a success `HRESULT` | -| `ASSERT_HRESULT_FAILED(`_expression_`);` | `EXPECT_HRESULT_FAILED(`_expression_`);` | _expression_ is a failure `HRESULT` | - -The generated output contains the human-readable error message -associated with the `HRESULT` code returned by _expression_. - -You might use them like this: - -``` -CComPtr shell; -ASSERT_HRESULT_SUCCEEDED(shell.CoCreateInstance(L"Shell.Application")); -CComVariant empty; -ASSERT_HRESULT_SUCCEEDED(shell->ShellExecute(CComBSTR(url), empty, empty, empty, empty)); -``` - -_Availability_: Windows. - -## Type Assertions ## - -You can call the function -``` -::testing::StaticAssertTypeEq(); -``` -to assert that types `T1` and `T2` are the same. The function does -nothing if the assertion is satisfied. If the types are different, -the function call will fail to compile, and the compiler error message -will likely (depending on the compiler) show you the actual values of -`T1` and `T2`. This is mainly useful inside template code. - -_Caveat:_ When used inside a member function of a class template or a -function template, `StaticAssertTypeEq()` is effective _only if_ -the function is instantiated. For example, given: -``` -template class Foo { - public: - void Bar() { ::testing::StaticAssertTypeEq(); } -}; -``` -the code: -``` -void Test1() { Foo foo; } -``` -will _not_ generate a compiler error, as `Foo::Bar()` is never -actually instantiated. Instead, you need: -``` -void Test2() { Foo foo; foo.Bar(); } -``` -to cause a compiler error. - -_Availability:_ Linux, Windows, Mac; since version 1.3.0. - -## Assertion Placement ## - -You can use assertions in any C++ function. In particular, it doesn't -have to be a method of the test fixture class. The one constraint is -that assertions that generate a fatal failure (`FAIL*` and `ASSERT_*`) -can only be used in void-returning functions. This is a consequence of -Google Test not using exceptions. By placing it in a non-void function -you'll get a confusing compile error like -`"error: void value not ignored as it ought to be"`. - -If you need to use assertions in a function that returns non-void, one option -is to make the function return the value in an out parameter instead. For -example, you can rewrite `T2 Foo(T1 x)` to `void Foo(T1 x, T2* result)`. You -need to make sure that `*result` contains some sensible value even when the -function returns prematurely. As the function now returns `void`, you can use -any assertion inside of it. - -If changing the function's type is not an option, you should just use -assertions that generate non-fatal failures, such as `ADD_FAILURE*` and -`EXPECT_*`. - -_Note_: Constructors and destructors are not considered void-returning -functions, according to the C++ language specification, and so you may not use -fatal assertions in them. You'll get a compilation error if you try. A simple -workaround is to transfer the entire body of the constructor or destructor to a -private void-returning method. However, you should be aware that a fatal -assertion failure in a constructor does not terminate the current test, as your -intuition might suggest; it merely returns from the constructor early, possibly -leaving your object in a partially-constructed state. Likewise, a fatal -assertion failure in a destructor may leave your object in a -partially-destructed state. Use assertions carefully in these situations! - -# Teaching Google Test How to Print Your Values # - -When a test assertion such as `EXPECT_EQ` fails, Google Test prints the -argument values to help you debug. It does this using a -user-extensible value printer. - -This printer knows how to print built-in C++ types, native arrays, STL -containers, and any type that supports the `<<` operator. For other -types, it prints the raw bytes in the value and hopes that you the -user can figure it out. - -As mentioned earlier, the printer is _extensible_. That means -you can teach it to do a better job at printing your particular type -than to dump the bytes. To do that, define `<<` for your type: - -``` -#include - -namespace foo { - -class Bar { ... }; // We want Google Test to be able to print instances of this. - -// It's important that the << operator is defined in the SAME -// namespace that defines Bar. C++'s look-up rules rely on that. -::std::ostream& operator<<(::std::ostream& os, const Bar& bar) { - return os << bar.DebugString(); // whatever needed to print bar to os -} - -} // namespace foo -``` - -Sometimes, this might not be an option: your team may consider it bad -style to have a `<<` operator for `Bar`, or `Bar` may already have a -`<<` operator that doesn't do what you want (and you cannot change -it). If so, you can instead define a `PrintTo()` function like this: - -``` -#include - -namespace foo { - -class Bar { ... }; - -// It's important that PrintTo() is defined in the SAME -// namespace that defines Bar. C++'s look-up rules rely on that. -void PrintTo(const Bar& bar, ::std::ostream* os) { - *os << bar.DebugString(); // whatever needed to print bar to os -} - -} // namespace foo -``` - -If you have defined both `<<` and `PrintTo()`, the latter will be used -when Google Test is concerned. This allows you to customize how the value -appears in Google Test's output without affecting code that relies on the -behavior of its `<<` operator. - -If you want to print a value `x` using Google Test's value printer -yourself, just call `::testing::PrintToString(`_x_`)`, which -returns an `std::string`: - -``` -vector > bar_ints = GetBarIntVector(); - -EXPECT_TRUE(IsCorrectBarIntVector(bar_ints)) - << "bar_ints = " << ::testing::PrintToString(bar_ints); -``` - -# Death Tests # - -In many applications, there are assertions that can cause application failure -if a condition is not met. These sanity checks, which ensure that the program -is in a known good state, are there to fail at the earliest possible time after -some program state is corrupted. If the assertion checks the wrong condition, -then the program may proceed in an erroneous state, which could lead to memory -corruption, security holes, or worse. Hence it is vitally important to test -that such assertion statements work as expected. - -Since these precondition checks cause the processes to die, we call such tests -_death tests_. More generally, any test that checks that a program terminates -(except by throwing an exception) in an expected fashion is also a death test. - -Note that if a piece of code throws an exception, we don't consider it "death" -for the purpose of death tests, as the caller of the code could catch the exception -and avoid the crash. If you want to verify exceptions thrown by your code, -see [Exception Assertions](#exception-assertions). - -If you want to test `EXPECT_*()/ASSERT_*()` failures in your test code, see [Catching Failures](#catching-failures). - -## How to Write a Death Test ## - -Google Test has the following macros to support death tests: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_DEATH(`_statement, regex_`);` | `EXPECT_DEATH(`_statement, regex_`);` | _statement_ crashes with the given error | -| `ASSERT_DEATH_IF_SUPPORTED(`_statement, regex_`);` | `EXPECT_DEATH_IF_SUPPORTED(`_statement, regex_`);` | if death tests are supported, verifies that _statement_ crashes with the given error; otherwise verifies nothing | -| `ASSERT_EXIT(`_statement, predicate, regex_`);` | `EXPECT_EXIT(`_statement, predicate, regex_`);` |_statement_ exits with the given error and its exit code matches _predicate_ | - -where _statement_ is a statement that is expected to cause the process to -die, _predicate_ is a function or function object that evaluates an integer -exit status, and _regex_ is a regular expression that the stderr output of -_statement_ is expected to match. Note that _statement_ can be _any valid -statement_ (including _compound statement_) and doesn't have to be an -expression. - -As usual, the `ASSERT` variants abort the current test function, while the -`EXPECT` variants do not. - -**Note:** We use the word "crash" here to mean that the process -terminates with a _non-zero_ exit status code. There are two -possibilities: either the process has called `exit()` or `_exit()` -with a non-zero value, or it may be killed by a signal. - -This means that if _statement_ terminates the process with a 0 exit -code, it is _not_ considered a crash by `EXPECT_DEATH`. Use -`EXPECT_EXIT` instead if this is the case, or if you want to restrict -the exit code more precisely. - -A predicate here must accept an `int` and return a `bool`. The death test -succeeds only if the predicate returns `true`. Google Test defines a few -predicates that handle the most common cases: - -``` -::testing::ExitedWithCode(exit_code) -``` - -This expression is `true` if the program exited normally with the given exit -code. - -``` -::testing::KilledBySignal(signal_number) // Not available on Windows. -``` - -This expression is `true` if the program was killed by the given signal. - -The `*_DEATH` macros are convenient wrappers for `*_EXIT` that use a predicate -that verifies the process' exit code is non-zero. - -Note that a death test only cares about three things: - - 1. does _statement_ abort or exit the process? - 1. (in the case of `ASSERT_EXIT` and `EXPECT_EXIT`) does the exit status satisfy _predicate_? Or (in the case of `ASSERT_DEATH` and `EXPECT_DEATH`) is the exit status non-zero? And - 1. does the stderr output match _regex_? - -In particular, if _statement_ generates an `ASSERT_*` or `EXPECT_*` failure, it will **not** cause the death test to fail, as Google Test assertions don't abort the process. - -To write a death test, simply use one of the above macros inside your test -function. For example, - -``` -TEST(MyDeathTest, Foo) { - // This death test uses a compound statement. - ASSERT_DEATH({ int n = 5; Foo(&n); }, "Error on line .* of Foo()"); -} -TEST(MyDeathTest, NormalExit) { - EXPECT_EXIT(NormalExit(), ::testing::ExitedWithCode(0), "Success"); -} -TEST(MyDeathTest, KillMyself) { - EXPECT_EXIT(KillMyself(), ::testing::KilledBySignal(SIGKILL), "Sending myself unblockable signal"); -} -``` - -verifies that: - - * calling `Foo(5)` causes the process to die with the given error message, - * calling `NormalExit()` causes the process to print `"Success"` to stderr and exit with exit code 0, and - * calling `KillMyself()` kills the process with signal `SIGKILL`. - -The test function body may contain other assertions and statements as well, if -necessary. - -_Important:_ We strongly recommend you to follow the convention of naming your -test case (not test) `*DeathTest` when it contains a death test, as -demonstrated in the above example. The `Death Tests And Threads` section below -explains why. - -If a test fixture class is shared by normal tests and death tests, you -can use typedef to introduce an alias for the fixture class and avoid -duplicating its code: -``` -class FooTest : public ::testing::Test { ... }; - -typedef FooTest FooDeathTest; - -TEST_F(FooTest, DoesThis) { - // normal test -} - -TEST_F(FooDeathTest, DoesThat) { - // death test -} -``` - -_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Cygwin, and Mac (the latter three are supported since v1.3.0). `(ASSERT|EXPECT)_DEATH_IF_SUPPORTED` are new in v1.4.0. - -## Regular Expression Syntax ## - -On POSIX systems (e.g. Linux, Cygwin, and Mac), Google Test uses the -[POSIX extended regular expression](http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04) -syntax in death tests. To learn about this syntax, you may want to read this [Wikipedia entry](http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions). - -On Windows, Google Test uses its own simple regular expression -implementation. It lacks many features you can find in POSIX extended -regular expressions. For example, we don't support union (`"x|y"`), -grouping (`"(xy)"`), brackets (`"[xy]"`), and repetition count -(`"x{5,7}"`), among others. Below is what we do support (Letter `A` denotes a -literal character, period (`.`), or a single `\\` escape sequence; `x` -and `y` denote regular expressions.): - -| `c` | matches any literal character `c` | -|:----|:----------------------------------| -| `\\d` | matches any decimal digit | -| `\\D` | matches any character that's not a decimal digit | -| `\\f` | matches `\f` | -| `\\n` | matches `\n` | -| `\\r` | matches `\r` | -| `\\s` | matches any ASCII whitespace, including `\n` | -| `\\S` | matches any character that's not a whitespace | -| `\\t` | matches `\t` | -| `\\v` | matches `\v` | -| `\\w` | matches any letter, `_`, or decimal digit | -| `\\W` | matches any character that `\\w` doesn't match | -| `\\c` | matches any literal character `c`, which must be a punctuation | -| `\\.` | matches the `.` character | -| `.` | matches any single character except `\n` | -| `A?` | matches 0 or 1 occurrences of `A` | -| `A*` | matches 0 or many occurrences of `A` | -| `A+` | matches 1 or many occurrences of `A` | -| `^` | matches the beginning of a string (not that of each line) | -| `$` | matches the end of a string (not that of each line) | -| `xy` | matches `x` followed by `y` | - -To help you determine which capability is available on your system, -Google Test defines macro `GTEST_USES_POSIX_RE=1` when it uses POSIX -extended regular expressions, or `GTEST_USES_SIMPLE_RE=1` when it uses -the simple version. If you want your death tests to work in both -cases, you can either `#if` on these macros or use the more limited -syntax only. - -## How It Works ## - -Under the hood, `ASSERT_EXIT()` spawns a new process and executes the -death test statement in that process. The details of how precisely -that happens depend on the platform and the variable -`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the -command-line flag `--gtest_death_test_style`). - - * On POSIX systems, `fork()` (or `clone()` on Linux) is used to spawn the child, after which: - * If the variable's value is `"fast"`, the death test statement is immediately executed. - * If the variable's value is `"threadsafe"`, the child process re-executes the unit test binary just as it was originally invoked, but with some extra flags to cause just the single death test under consideration to be run. - * On Windows, the child is spawned using the `CreateProcess()` API, and re-executes the binary to cause just the single death test under consideration to be run - much like the `threadsafe` mode on POSIX. - -Other values for the variable are illegal and will cause the death test to -fail. Currently, the flag's default value is `"fast"`. However, we reserve the -right to change it in the future. Therefore, your tests should not depend on -this. - -In either case, the parent process waits for the child process to complete, and checks that - - 1. the child's exit status satisfies the predicate, and - 1. the child's stderr matches the regular expression. - -If the death test statement runs to completion without dying, the child -process will nonetheless terminate, and the assertion fails. - -## Death Tests And Threads ## - -The reason for the two death test styles has to do with thread safety. Due to -well-known problems with forking in the presence of threads, death tests should -be run in a single-threaded context. Sometimes, however, it isn't feasible to -arrange that kind of environment. For example, statically-initialized modules -may start threads before main is ever reached. Once threads have been created, -it may be difficult or impossible to clean them up. - -Google Test has three features intended to raise awareness of threading issues. - - 1. A warning is emitted if multiple threads are running when a death test is encountered. - 1. Test cases with a name ending in "DeathTest" are run before all other tests. - 1. It uses `clone()` instead of `fork()` to spawn the child process on Linux (`clone()` is not available on Cygwin and Mac), as `fork()` is more likely to cause the child to hang when the parent process has multiple threads. - -It's perfectly fine to create threads inside a death test statement; they are -executed in a separate process and cannot affect the parent. - -## Death Test Styles ## - -The "threadsafe" death test style was introduced in order to help mitigate the -risks of testing in a possibly multithreaded environment. It trades increased -test execution time (potentially dramatically so) for improved thread safety. -We suggest using the faster, default "fast" style unless your test has specific -problems with it. - -You can choose a particular style of death tests by setting the flag -programmatically: - -``` -::testing::FLAGS_gtest_death_test_style = "threadsafe"; -``` - -You can do this in `main()` to set the style for all death tests in the -binary, or in individual tests. Recall that flags are saved before running each -test and restored afterwards, so you need not do that yourself. For example: - -``` -TEST(MyDeathTest, TestOne) { - ::testing::FLAGS_gtest_death_test_style = "threadsafe"; - // This test is run in the "threadsafe" style: - ASSERT_DEATH(ThisShouldDie(), ""); -} - -TEST(MyDeathTest, TestTwo) { - // This test is run in the "fast" style: - ASSERT_DEATH(ThisShouldDie(), ""); -} - -int main(int argc, char** argv) { - ::testing::InitGoogleTest(&argc, argv); - ::testing::FLAGS_gtest_death_test_style = "fast"; - return RUN_ALL_TESTS(); -} -``` - -## Caveats ## - -The _statement_ argument of `ASSERT_EXIT()` can be any valid C++ statement. -If it leaves the current function via a `return` statement or by throwing an exception, -the death test is considered to have failed. Some Google Test macros may return -from the current function (e.g. `ASSERT_TRUE()`), so be sure to avoid them in _statement_. - -Since _statement_ runs in the child process, any in-memory side effect (e.g. -modifying a variable, releasing memory, etc) it causes will _not_ be observable -in the parent process. In particular, if you release memory in a death test, -your program will fail the heap check as the parent process will never see the -memory reclaimed. To solve this problem, you can - - 1. try not to free memory in a death test; - 1. free the memory again in the parent process; or - 1. do not use the heap checker in your program. - -Due to an implementation detail, you cannot place multiple death test -assertions on the same line; otherwise, compilation will fail with an unobvious -error message. - -Despite the improved thread safety afforded by the "threadsafe" style of death -test, thread problems such as deadlock are still possible in the presence of -handlers registered with `pthread_atfork(3)`. - -# Using Assertions in Sub-routines # - -## Adding Traces to Assertions ## - -If a test sub-routine is called from several places, when an assertion -inside it fails, it can be hard to tell which invocation of the -sub-routine the failure is from. You can alleviate this problem using -extra logging or custom failure messages, but that usually clutters up -your tests. A better solution is to use the `SCOPED_TRACE` macro or -the `ScopedTrace` utility: - -| `SCOPED_TRACE(`_message_`);` | `::testing::ScopedTrace trace(`_"file\_path"_`, `_line\_number_`, `_message_`);` | -|:-----------------------------|:---------------------------------------------------------------------------------| - -where `message` can be anything streamable to `std::ostream`. `SCOPED_TRACE` -macro will cause the current file name, line number, and the given message to be -added in every failure message. `ScopedTrace` accepts explicit file name and -line number in arguments, which is useful for writing test helpers. The effect -will be undone when the control leaves the current lexical scope. - -For example, - -``` -10: void Sub1(int n) { -11: EXPECT_EQ(1, Bar(n)); -12: EXPECT_EQ(2, Bar(n + 1)); -13: } -14: -15: TEST(FooTest, Bar) { -16: { -17: SCOPED_TRACE("A"); // This trace point will be included in -18: // every failure in this scope. -19: Sub1(1); -20: } -21: // Now it won't. -22: Sub1(9); -23: } -``` - -could result in messages like these: - -``` -path/to/foo_test.cc:11: Failure -Value of: Bar(n) -Expected: 1 - Actual: 2 - Trace: -path/to/foo_test.cc:17: A - -path/to/foo_test.cc:12: Failure -Value of: Bar(n + 1) -Expected: 2 - Actual: 3 -``` - -Without the trace, it would've been difficult to know which invocation -of `Sub1()` the two failures come from respectively. (You could add an -extra message to each assertion in `Sub1()` to indicate the value of -`n`, but that's tedious.) - -Some tips on using `SCOPED_TRACE`: - - 1. With a suitable message, it's often enough to use `SCOPED_TRACE` at the beginning of a sub-routine, instead of at each call site. - 1. When calling sub-routines inside a loop, make the loop iterator part of the message in `SCOPED_TRACE` such that you can know which iteration the failure is from. - 1. Sometimes the line number of the trace point is enough for identifying the particular invocation of a sub-routine. In this case, you don't have to choose a unique message for `SCOPED_TRACE`. You can simply use `""`. - 1. You can use `SCOPED_TRACE` in an inner scope when there is one in the outer scope. In this case, all active trace points will be included in the failure messages, in reverse order they are encountered. - 1. The trace dump is clickable in Emacs' compilation buffer - hit return on a line number and you'll be taken to that line in the source file! - -_Availability:_ Linux, Windows, Mac. - -## Propagating Fatal Failures ## - -A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that -when they fail they only abort the _current function_, not the entire test. For -example, the following test will segfault: -``` -void Subroutine() { - // Generates a fatal failure and aborts the current function. - ASSERT_EQ(1, 2); - // The following won't be executed. - ... -} - -TEST(FooTest, Bar) { - Subroutine(); - // The intended behavior is for the fatal failure - // in Subroutine() to abort the entire test. - // The actual behavior: the function goes on after Subroutine() returns. - int* p = NULL; - *p = 3; // Segfault! -} -``` - -To alleviate this, gUnit provides three different solutions. You could use -either exceptions, the `(ASSERT|EXPECT)_NO_FATAL_FAILURE` assertions or the -`HasFatalFailure()` function. They are described in the following two -subsections. - -#### Asserting on Subroutines with an exception - -The following code can turn ASSERT-failure into an exception: - -```c++ -class ThrowListener : public testing::EmptyTestEventListener { - void OnTestPartResult(const testing::TestPartResult& result) override { - if (result.type() == testing::TestPartResult::kFatalFailure) { - throw testing::AssertionException(result); - } - } -}; -int main(int argc, char** argv) { - ... - testing::UnitTest::GetInstance()->listeners().Append(new ThrowListener); - return RUN_ALL_TESTS(); -} -``` - -This listener should be added after other listeners if you have any, otherwise -they won't see failed `OnTestPartResult`. - -### Asserting on Subroutines ### - -As shown above, if your test calls a subroutine that has an `ASSERT_*` -failure in it, the test will continue after the subroutine -returns. This may not be what you want. - -Often people want fatal failures to propagate like exceptions. For -that Google Test offers the following macros: - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_NO_FATAL_FAILURE(`_statement_`);` | `EXPECT_NO_FATAL_FAILURE(`_statement_`);` | _statement_ doesn't generate any new fatal failures in the current thread. | - -Only failures in the thread that executes the assertion are checked to -determine the result of this type of assertions. If _statement_ -creates new threads, failures in these threads are ignored. - -Examples: - -``` -ASSERT_NO_FATAL_FAILURE(Foo()); - -int i; -EXPECT_NO_FATAL_FAILURE({ - i = Bar(); -}); -``` - -_Availability:_ Linux, Windows, Mac. Assertions from multiple threads -are currently not supported. - -### Checking for Failures in the Current Test ### - -`HasFatalFailure()` in the `::testing::Test` class returns `true` if an -assertion in the current test has suffered a fatal failure. This -allows functions to catch fatal failures in a sub-routine and return -early. - -``` -class Test { - public: - ... - static bool HasFatalFailure(); -}; -``` - -The typical usage, which basically simulates the behavior of a thrown -exception, is: - -``` -TEST(FooTest, Bar) { - Subroutine(); - // Aborts if Subroutine() had a fatal failure. - if (HasFatalFailure()) - return; - // The following won't be executed. - ... -} -``` - -If `HasFatalFailure()` is used outside of `TEST()` , `TEST_F()` , or a test -fixture, you must add the `::testing::Test::` prefix, as in: - -``` -if (::testing::Test::HasFatalFailure()) - return; -``` - -Similarly, `HasNonfatalFailure()` returns `true` if the current test -has at least one non-fatal failure, and `HasFailure()` returns `true` -if the current test has at least one failure of either kind. - -_Availability:_ Linux, Windows, Mac. `HasNonfatalFailure()` and -`HasFailure()` are available since version 1.4.0. - -# Logging Additional Information # - -In your test code, you can call `RecordProperty("key", value)` to log -additional information, where `value` can be either a string or an `int`. The _last_ value recorded for a key will be emitted to the XML output -if you specify one. For example, the test - -``` -TEST_F(WidgetUsageTest, MinAndMaxWidgets) { - RecordProperty("MaximumWidgets", ComputeMaxUsage()); - RecordProperty("MinimumWidgets", ComputeMinUsage()); -} -``` - -will output XML like this: - -``` -... - -... -``` - -_Note_: - * `RecordProperty()` is a static member of the `Test` class. Therefore it needs to be prefixed with `::testing::Test::` if used outside of the `TEST` body and the test fixture class. - * `key` must be a valid XML attribute name, and cannot conflict with the ones already used by Google Test (`name`, `status`, `time`, `classname`, `type_param`, and `value_param`). - * Calling `RecordProperty()` outside of the lifespan of a test is allowed. If it's called outside of a test but between a test case's `SetUpTestCase()` and `TearDownTestCase()` methods, it will be attributed to the XML element for the test case. If it's called outside of all test cases (e.g. in a test environment), it will be attributed to the top-level XML element. - -_Availability_: Linux, Windows, Mac. - -# Sharing Resources Between Tests in the Same Test Case # - - - -Google Test creates a new test fixture object for each test in order to make -tests independent and easier to debug. However, sometimes tests use resources -that are expensive to set up, making the one-copy-per-test model prohibitively -expensive. - -If the tests don't change the resource, there's no harm in them sharing a -single resource copy. So, in addition to per-test set-up/tear-down, Google Test -also supports per-test-case set-up/tear-down. To use it: - - 1. In your test fixture class (say `FooTest` ), define as `static` some member variables to hold the shared resources. - 1. In the same test fixture class, define a `static void SetUpTestCase()` function (remember not to spell it as **`SetupTestCase`** with a small `u`!) to set up the shared resources and a `static void TearDownTestCase()` function to tear them down. - -That's it! Google Test automatically calls `SetUpTestCase()` before running the -_first test_ in the `FooTest` test case (i.e. before creating the first -`FooTest` object), and calls `TearDownTestCase()` after running the _last test_ -in it (i.e. after deleting the last `FooTest` object). In between, the tests -can use the shared resources. - -Remember that the test order is undefined, so your code can't depend on a test -preceding or following another. Also, the tests must either not modify the -state of any shared resource, or, if they do modify the state, they must -restore the state to its original value before passing control to the next -test. - -Here's an example of per-test-case set-up and tear-down: -``` -class FooTest : public ::testing::Test { - protected: - // Per-test-case set-up. - // Called before the first test in this test case. - // Can be omitted if not needed. - static void SetUpTestCase() { - shared_resource_ = new ...; - } - - // Per-test-case tear-down. - // Called after the last test in this test case. - // Can be omitted if not needed. - static void TearDownTestCase() { - delete shared_resource_; - shared_resource_ = NULL; - } - - // You can define per-test set-up and tear-down logic as usual. - virtual void SetUp() { ... } - virtual void TearDown() { ... } - - // Some expensive resource shared by all tests. - static T* shared_resource_; -}; - -T* FooTest::shared_resource_ = NULL; - -TEST_F(FooTest, Test1) { - ... you can refer to shared_resource here ... -} -TEST_F(FooTest, Test2) { - ... you can refer to shared_resource here ... -} -``` - -_Availability:_ Linux, Windows, Mac. - -# Global Set-Up and Tear-Down # - -Just as you can do set-up and tear-down at the test level and the test case -level, you can also do it at the test program level. Here's how. - -First, you subclass the `::testing::Environment` class to define a test -environment, which knows how to set-up and tear-down: - -``` -class Environment { - public: - virtual ~Environment() {} - // Override this to define how to set up the environment. - virtual void SetUp() {} - // Override this to define how to tear down the environment. - virtual void TearDown() {} -}; -``` - -Then, you register an instance of your environment class with Google Test by -calling the `::testing::AddGlobalTestEnvironment()` function: - -``` -Environment* AddGlobalTestEnvironment(Environment* env); -``` - -Now, when `RUN_ALL_TESTS()` is called, it first calls the `SetUp()` method of -the environment object, then runs the tests if there was no fatal failures, and -finally calls `TearDown()` of the environment object. - -It's OK to register multiple environment objects. In this case, their `SetUp()` -will be called in the order they are registered, and their `TearDown()` will be -called in the reverse order. - -Note that Google Test takes ownership of the registered environment objects. -Therefore **do not delete them** by yourself. - -You should call `AddGlobalTestEnvironment()` before `RUN_ALL_TESTS()` is -called, probably in `main()`. If you use `gtest_main`, you need to call -this before `main()` starts for it to take effect. One way to do this is to -define a global variable like this: - -``` -::testing::Environment* const foo_env = ::testing::AddGlobalTestEnvironment(new FooEnvironment); -``` - -However, we strongly recommend you to write your own `main()` and call -`AddGlobalTestEnvironment()` there, as relying on initialization of global -variables makes the code harder to read and may cause problems when you -register multiple environments from different translation units and the -environments have dependencies among them (remember that the compiler doesn't -guarantee the order in which global variables from different translation units -are initialized). - -_Availability:_ Linux, Windows, Mac. - - -# Value Parameterized Tests # - -_Value-parameterized tests_ allow you to test your code with different -parameters without writing multiple copies of the same test. - -Suppose you write a test for your code and then realize that your code is affected by a presence of a Boolean command line flag. - -``` -TEST(MyCodeTest, TestFoo) { - // A code to test foo(). -} -``` - -Usually people factor their test code into a function with a Boolean parameter in such situations. The function sets the flag, then executes the testing code. - -``` -void TestFooHelper(bool flag_value) { - flag = flag_value; - // A code to test foo(). -} - -TEST(MyCodeTest, TestFoo) { - TestFooHelper(false); - TestFooHelper(true); -} -``` - -But this setup has serious drawbacks. First, when a test assertion fails in your tests, it becomes unclear what value of the parameter caused it to fail. You can stream a clarifying message into your `EXPECT`/`ASSERT` statements, but it you'll have to do it with all of them. Second, you have to add one such helper function per test. What if you have ten tests? Twenty? A hundred? - -Value-parameterized tests will let you write your test only once and then easily instantiate and run it with an arbitrary number of parameter values. - -Here are some other situations when value-parameterized tests come handy: - - * You want to test different implementations of an OO interface. - * You want to test your code over various inputs (a.k.a. data-driven testing). This feature is easy to abuse, so please exercise your good sense when doing it! - -## How to Write Value-Parameterized Tests ## - -To write value-parameterized tests, first you should define a fixture -class. It must be derived from both `::testing::Test` and -`::testing::WithParamInterface` (the latter is a pure interface), -where `T` is the type of your parameter values. For convenience, you -can just derive the fixture class from `::testing::TestWithParam`, -which itself is derived from both `::testing::Test` and -`::testing::WithParamInterface`. `T` can be any copyable type. If -it's a raw pointer, you are responsible for managing the lifespan of -the pointed values. - -``` -class FooTest : public ::testing::TestWithParam { - // You can implement all the usual fixture class members here. - // To access the test parameter, call GetParam() from class - // TestWithParam. -}; - -// Or, when you want to add parameters to a pre-existing fixture class: -class BaseTest : public ::testing::Test { - ... -}; -class BarTest : public BaseTest, - public ::testing::WithParamInterface { - ... -}; -``` - -Then, use the `TEST_P` macro to define as many test patterns using -this fixture as you want. The `_P` suffix is for "parameterized" or -"pattern", whichever you prefer to think. - -``` -TEST_P(FooTest, DoesBlah) { - // Inside a test, access the test parameter with the GetParam() method - // of the TestWithParam class: - EXPECT_TRUE(foo.Blah(GetParam())); - ... -} - -TEST_P(FooTest, HasBlahBlah) { - ... -} -``` - -Finally, you can use `INSTANTIATE_TEST_CASE_P` to instantiate the test -case with any set of parameters you want. Google Test defines a number of -functions for generating test parameters. They return what we call -(surprise!) _parameter generators_. Here is a summary of them, -which are all in the `testing` namespace: - -| `Range(begin, end[, step])` | Yields values `{begin, begin+step, begin+step+step, ...}`. The values do not include `end`. `step` defaults to 1. | -|:----------------------------|:------------------------------------------------------------------------------------------------------------------| -| `Values(v1, v2, ..., vN)` | Yields values `{v1, v2, ..., vN}`. | -| `ValuesIn(container)` and `ValuesIn(begin, end)` | Yields values from a C-style array, an STL-style container, or an iterator range `[begin, end)`. `container`, `begin`, and `end` can be expressions whose values are determined at run time. | -| `Bool()` | Yields sequence `{false, true}`. | -| `Combine(g1, g2, ..., gN)` | Yields all combinations (the Cartesian product for the math savvy) of the values generated by the `N` generators. This is only available if your system provides the `` header. If you are sure your system does, and Google Test disagrees, you can override it by defining `GTEST_HAS_TR1_TUPLE=1`. See comments in [include/gtest/internal/gtest-port.h](../include/gtest/internal/gtest-port.h) for more information. | - -For more details, see the comments at the definitions of these functions in the [source code](../include/gtest/gtest-param-test.h). - -The following statement will instantiate tests from the `FooTest` test case -each with parameter values `"meeny"`, `"miny"`, and `"moe"`. - -``` -INSTANTIATE_TEST_CASE_P(InstantiationName, - FooTest, - ::testing::Values("meeny", "miny", "moe")); -``` - -To distinguish different instances of the pattern (yes, you can -instantiate it more than once), the first argument to -`INSTANTIATE_TEST_CASE_P` is a prefix that will be added to the actual -test case name. Remember to pick unique prefixes for different -instantiations. The tests from the instantiation above will have these -names: - - * `InstantiationName/FooTest.DoesBlah/0` for `"meeny"` - * `InstantiationName/FooTest.DoesBlah/1` for `"miny"` - * `InstantiationName/FooTest.DoesBlah/2` for `"moe"` - * `InstantiationName/FooTest.HasBlahBlah/0` for `"meeny"` - * `InstantiationName/FooTest.HasBlahBlah/1` for `"miny"` - * `InstantiationName/FooTest.HasBlahBlah/2` for `"moe"` - -You can use these names in [--gtest\_filter](#running-a-subset-of-the-tests). - -This statement will instantiate all tests from `FooTest` again, each -with parameter values `"cat"` and `"dog"`: - -``` -const char* pets[] = {"cat", "dog"}; -INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, - ::testing::ValuesIn(pets)); -``` - -The tests from the instantiation above will have these names: - - * `AnotherInstantiationName/FooTest.DoesBlah/0` for `"cat"` - * `AnotherInstantiationName/FooTest.DoesBlah/1` for `"dog"` - * `AnotherInstantiationName/FooTest.HasBlahBlah/0` for `"cat"` - * `AnotherInstantiationName/FooTest.HasBlahBlah/1` for `"dog"` - -Please note that `INSTANTIATE_TEST_CASE_P` will instantiate _all_ -tests in the given test case, whether their definitions come before or -_after_ the `INSTANTIATE_TEST_CASE_P` statement. - -You can see -[these](../samples/sample7_unittest.cc) -[files](../samples/sample8_unittest.cc) for more examples. - -_Availability_: Linux, Windows (requires MSVC 8.0 or above), Mac; since version 1.2.0. - -## Creating Value-Parameterized Abstract Tests ## - -In the above, we define and instantiate `FooTest` in the same source -file. Sometimes you may want to define value-parameterized tests in a -library and let other people instantiate them later. This pattern is -known as abstract tests. As an example of its application, when you -are designing an interface you can write a standard suite of abstract -tests (perhaps using a factory function as the test parameter) that -all implementations of the interface are expected to pass. When -someone implements the interface, they can instantiate your suite to get -all the interface-conformance tests for free. - -To define abstract tests, you should organize your code like this: - - 1. Put the definition of the parameterized test fixture class (e.g. `FooTest`) in a header file, say `foo_param_test.h`. Think of this as _declaring_ your abstract tests. - 1. Put the `TEST_P` definitions in `foo_param_test.cc`, which includes `foo_param_test.h`. Think of this as _implementing_ your abstract tests. - -Once they are defined, you can instantiate them by including -`foo_param_test.h`, invoking `INSTANTIATE_TEST_CASE_P()`, and linking -with `foo_param_test.cc`. You can instantiate the same abstract test -case multiple times, possibly in different source files. - -# Typed Tests # - -Suppose you have multiple implementations of the same interface and -want to make sure that all of them satisfy some common requirements. -Or, you may have defined several types that are supposed to conform to -the same "concept" and you want to verify it. In both cases, you want -the same test logic repeated for different types. - -While you can write one `TEST` or `TEST_F` for each type you want to -test (and you may even factor the test logic into a function template -that you invoke from the `TEST`), it's tedious and doesn't scale: -if you want _m_ tests over _n_ types, you'll end up writing _m\*n_ -`TEST`s. - -_Typed tests_ allow you to repeat the same test logic over a list of -types. You only need to write the test logic once, although you must -know the type list when writing typed tests. Here's how you do it: - -First, define a fixture class template. It should be parameterized -by a type. Remember to derive it from `::testing::Test`: - -``` -template -class FooTest : public ::testing::Test { - public: - ... - typedef std::list List; - static T shared_; - T value_; -}; -``` - -Next, associate a list of types with the test case, which will be -repeated for each type in the list: - -``` -typedef ::testing::Types MyTypes; -TYPED_TEST_CASE(FooTest, MyTypes); -``` - -The `typedef` is necessary for the `TYPED_TEST_CASE` macro to parse -correctly. Otherwise the compiler will think that each comma in the -type list introduces a new macro argument. - -Then, use `TYPED_TEST()` instead of `TEST_F()` to define a typed test -for this test case. You can repeat this as many times as you want: - -``` -TYPED_TEST(FooTest, DoesBlah) { - // Inside a test, refer to the special name TypeParam to get the type - // parameter. Since we are inside a derived class template, C++ requires - // us to visit the members of FooTest via 'this'. - TypeParam n = this->value_; - - // To visit static members of the fixture, add the 'TestFixture::' - // prefix. - n += TestFixture::shared_; - - // To refer to typedefs in the fixture, add the 'typename TestFixture::' - // prefix. The 'typename' is required to satisfy the compiler. - typename TestFixture::List values; - values.push_back(n); - ... -} - -TYPED_TEST(FooTest, HasPropertyA) { ... } -``` - -You can see [`samples/sample6_unittest.cc`](../samples/sample6_unittest.cc) for a complete example. - -_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac; -since version 1.1.0. - -# Type-Parameterized Tests # - -_Type-parameterized tests_ are like typed tests, except that they -don't require you to know the list of types ahead of time. Instead, -you can define the test logic first and instantiate it with different -type lists later. You can even instantiate it more than once in the -same program. - -If you are designing an interface or concept, you can define a suite -of type-parameterized tests to verify properties that any valid -implementation of the interface/concept should have. Then, the author -of each implementation can just instantiate the test suite with his -type to verify that it conforms to the requirements, without having to -write similar tests repeatedly. Here's an example: - -First, define a fixture class template, as we did with typed tests: - -``` -template -class FooTest : public ::testing::Test { - ... -}; -``` - -Next, declare that you will define a type-parameterized test case: - -``` -TYPED_TEST_CASE_P(FooTest); -``` - -The `_P` suffix is for "parameterized" or "pattern", whichever you -prefer to think. - -Then, use `TYPED_TEST_P()` to define a type-parameterized test. You -can repeat this as many times as you want: - -``` -TYPED_TEST_P(FooTest, DoesBlah) { - // Inside a test, refer to TypeParam to get the type parameter. - TypeParam n = 0; - ... -} - -TYPED_TEST_P(FooTest, HasPropertyA) { ... } -``` - -Now the tricky part: you need to register all test patterns using the -`REGISTER_TYPED_TEST_CASE_P` macro before you can instantiate them. -The first argument of the macro is the test case name; the rest are -the names of the tests in this test case: - -``` -REGISTER_TYPED_TEST_CASE_P(FooTest, - DoesBlah, HasPropertyA); -``` - -Finally, you are free to instantiate the pattern with the types you -want. If you put the above code in a header file, you can `#include` -it in multiple C++ source files and instantiate it multiple times. - -``` -typedef ::testing::Types MyTypes; -INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes); -``` - -To distinguish different instances of the pattern, the first argument -to the `INSTANTIATE_TYPED_TEST_CASE_P` macro is a prefix that will be -added to the actual test case name. Remember to pick unique prefixes -for different instances. - -In the special case where the type list contains only one type, you -can write that type directly without `::testing::Types<...>`, like this: - -``` -INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int); -``` - -You can see `samples/sample6_unittest.cc` for a complete example. - -_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac; -since version 1.1.0. - -# Testing Private Code # - -If you change your software's internal implementation, your tests should not -break as long as the change is not observable by users. Therefore, per the -_black-box testing principle_, most of the time you should test your code -through its public interfaces. - -If you still find yourself needing to test internal implementation code, -consider if there's a better design that wouldn't require you to do so. If you -absolutely have to test non-public interface code though, you can. There are -two cases to consider: - - * Static functions (_not_ the same as static member functions!) or unnamed namespaces, and - * Private or protected class members. - -## Static Functions ## - -Both static functions and definitions/declarations in an unnamed namespace are -only visible within the same translation unit. To test them, you can `#include` -the entire `.cc` file being tested in your `*_test.cc` file. (`#include`ing `.cc` -files is not a good way to reuse code - you should not do this in production -code!) - -However, a better approach is to move the private code into the -`foo::internal` namespace, where `foo` is the namespace your project normally -uses, and put the private declarations in a `*-internal.h` file. Your -production `.cc` files and your tests are allowed to include this internal -header, but your clients are not. This way, you can fully test your internal -implementation without leaking it to your clients. - -## Private Class Members ## - -Private class members are only accessible from within the class or by friends. -To access a class' private members, you can declare your test fixture as a -friend to the class and define accessors in your fixture. Tests using the -fixture can then access the private members of your production class via the -accessors in the fixture. Note that even though your fixture is a friend to -your production class, your tests are not automatically friends to it, as they -are technically defined in sub-classes of the fixture. - -Another way to test private members is to refactor them into an implementation -class, which is then declared in a `*-internal.h` file. Your clients aren't -allowed to include this header but your tests can. Such is called the Pimpl -(Private Implementation) idiom. - -Or, you can declare an individual test as a friend of your class by adding this -line in the class body: - -``` -FRIEND_TEST(TestCaseName, TestName); -``` - -For example, -``` -// foo.h -#include "gtest/gtest_prod.h" - -// Defines FRIEND_TEST. -class Foo { - ... - private: - FRIEND_TEST(FooTest, BarReturnsZeroOnNull); - int Bar(void* x); -}; - -// foo_test.cc -... -TEST(FooTest, BarReturnsZeroOnNull) { - Foo foo; - EXPECT_EQ(0, foo.Bar(NULL)); - // Uses Foo's private member Bar(). -} -``` - -Pay special attention when your class is defined in a namespace, as you should -define your test fixtures and tests in the same namespace if you want them to -be friends of your class. For example, if the code to be tested looks like: - -``` -namespace my_namespace { - -class Foo { - friend class FooTest; - FRIEND_TEST(FooTest, Bar); - FRIEND_TEST(FooTest, Baz); - ... - definition of the class Foo - ... -}; - -} // namespace my_namespace -``` - -Your test code should be something like: - -``` -namespace my_namespace { -class FooTest : public ::testing::Test { - protected: - ... -}; - -TEST_F(FooTest, Bar) { ... } -TEST_F(FooTest, Baz) { ... } - -} // namespace my_namespace -``` - -# Catching Failures # - -If you are building a testing utility on top of Google Test, you'll -want to test your utility. What framework would you use to test it? -Google Test, of course. - -The challenge is to verify that your testing utility reports failures -correctly. In frameworks that report a failure by throwing an -exception, you could catch the exception and assert on it. But Google -Test doesn't use exceptions, so how do we test that a piece of code -generates an expected failure? - -`"gtest/gtest-spi.h"` contains some constructs to do this. After -`#include`ing this header, you can use - -| `EXPECT_FATAL_FAILURE(`_statement, substring_`);` | -|:--------------------------------------------------| - -to assert that _statement_ generates a fatal (e.g. `ASSERT_*`) failure -whose message contains the given _substring_, or use - -| `EXPECT_NONFATAL_FAILURE(`_statement, substring_`);` | -|:-----------------------------------------------------| - -if you are expecting a non-fatal (e.g. `EXPECT_*`) failure. - -For technical reasons, there are some caveats: - - 1. You cannot stream a failure message to either macro. - 1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot reference local non-static variables or non-static members of `this` object. - 1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot return a value. - -_Note:_ Google Test is designed with threads in mind. Once the -synchronization primitives in `"gtest/internal/gtest-port.h"` have -been implemented, Google Test will become thread-safe, meaning that -you can then use assertions in multiple threads concurrently. Before -that, however, Google Test only supports single-threaded usage. Once -thread-safe, `EXPECT_FATAL_FAILURE()` and `EXPECT_NONFATAL_FAILURE()` -will capture failures in the current thread only. If _statement_ -creates new threads, failures in these threads will be ignored. If -you want to capture failures from all threads instead, you should use -the following macros: - -| `EXPECT_FATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` | -|:-----------------------------------------------------------------| -| `EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` | - -# Getting the Current Test's Name # - -Sometimes a function may need to know the name of the currently running test. -For example, you may be using the `SetUp()` method of your test fixture to set -the golden file name based on which test is running. The `::testing::TestInfo` -class has this information: - -``` -namespace testing { - -class TestInfo { - public: - // Returns the test case name and the test name, respectively. - // - // Do NOT delete or free the return value - it's managed by the - // TestInfo class. - const char* test_case_name() const; - const char* name() const; -}; - -} // namespace testing -``` - - -> To obtain a `TestInfo` object for the currently running test, call -`current_test_info()` on the `UnitTest` singleton object: - -``` -// Gets information about the currently running test. -// Do NOT delete the returned object - it's managed by the UnitTest class. -const ::testing::TestInfo* const test_info = - ::testing::UnitTest::GetInstance()->current_test_info(); -printf("We are in test %s of test case %s.\n", - test_info->name(), test_info->test_case_name()); -``` - -`current_test_info()` returns a null pointer if no test is running. In -particular, you cannot find the test case name in `SetUpTestCase()`, -`TearDownTestCase()` (where you know the test case name implicitly), or -functions called from them. - -_Availability:_ Linux, Windows, Mac. - -# Extending Google Test by Handling Test Events # - -Google Test provides an event listener API to let you receive -notifications about the progress of a test program and test -failures. The events you can listen to include the start and end of -the test program, a test case, or a test method, among others. You may -use this API to augment or replace the standard console output, -replace the XML output, or provide a completely different form of -output, such as a GUI or a database. You can also use test events as -checkpoints to implement a resource leak checker, for example. - -_Availability:_ Linux, Windows, Mac; since v1.4.0. - -## Defining Event Listeners ## - -To define a event listener, you subclass either -[testing::TestEventListener](../include/gtest/gtest.h#L991) -or [testing::EmptyTestEventListener](../include/gtest/gtest.h#L1044). -The former is an (abstract) interface, where each pure virtual method
-can be overridden to handle a test event (For example, when a test -starts, the `OnTestStart()` method will be called.). The latter provides -an empty implementation of all methods in the interface, such that a -subclass only needs to override the methods it cares about. - -When an event is fired, its context is passed to the handler function -as an argument. The following argument types are used: - * [UnitTest](../include/gtest/gtest.h#L1151) reflects the state of the entire test program, - * [TestCase](../include/gtest/gtest.h#L778) has information about a test case, which can contain one or more tests, - * [TestInfo](../include/gtest/gtest.h#L644) contains the state of a test, and - * [TestPartResult](../include/gtest/gtest-test-part.h#L47) represents the result of a test assertion. - -An event handler function can examine the argument it receives to find -out interesting information about the event and the test program's -state. Here's an example: - -``` - class MinimalistPrinter : public ::testing::EmptyTestEventListener { - // Called before a test starts. - virtual void OnTestStart(const ::testing::TestInfo& test_info) { - printf("*** Test %s.%s starting.\n", - test_info.test_case_name(), test_info.name()); - } - - // Called after a failed assertion or a SUCCEED() invocation. - virtual void OnTestPartResult( - const ::testing::TestPartResult& test_part_result) { - printf("%s in %s:%d\n%s\n", - test_part_result.failed() ? "*** Failure" : "Success", - test_part_result.file_name(), - test_part_result.line_number(), - test_part_result.summary()); - } - - // Called after a test ends. - virtual void OnTestEnd(const ::testing::TestInfo& test_info) { - printf("*** Test %s.%s ending.\n", - test_info.test_case_name(), test_info.name()); - } - }; -``` - -## Using Event Listeners ## - -To use the event listener you have defined, add an instance of it to -the Google Test event listener list (represented by class -[TestEventListeners](../include/gtest/gtest.h#L1064) -- note the "s" at the end of the name) in your -`main()` function, before calling `RUN_ALL_TESTS()`: -``` -int main(int argc, char** argv) { - ::testing::InitGoogleTest(&argc, argv); - // Gets hold of the event listener list. - ::testing::TestEventListeners& listeners = - ::testing::UnitTest::GetInstance()->listeners(); - // Adds a listener to the end. Google Test takes the ownership. - listeners.Append(new MinimalistPrinter); - return RUN_ALL_TESTS(); -} -``` - -There's only one problem: the default test result printer is still in -effect, so its output will mingle with the output from your minimalist -printer. To suppress the default printer, just release it from the -event listener list and delete it. You can do so by adding one line: -``` - ... - delete listeners.Release(listeners.default_result_printer()); - listeners.Append(new MinimalistPrinter); - return RUN_ALL_TESTS(); -``` - -Now, sit back and enjoy a completely different output from your -tests. For more details, you can read this -[sample](../samples/sample9_unittest.cc). - -You may append more than one listener to the list. When an `On*Start()` -or `OnTestPartResult()` event is fired, the listeners will receive it in -the order they appear in the list (since new listeners are added to -the end of the list, the default text printer and the default XML -generator will receive the event first). An `On*End()` event will be -received by the listeners in the _reverse_ order. This allows output by -listeners added later to be framed by output from listeners added -earlier. - -## Generating Failures in Listeners ## - -You may use failure-raising macros (`EXPECT_*()`, `ASSERT_*()`, -`FAIL()`, etc) when processing an event. There are some restrictions: - - 1. You cannot generate any failure in `OnTestPartResult()` (otherwise it will cause `OnTestPartResult()` to be called recursively). - 1. A listener that handles `OnTestPartResult()` is not allowed to generate any failure. - -When you add listeners to the listener list, you should put listeners -that handle `OnTestPartResult()` _before_ listeners that can generate -failures. This ensures that failures generated by the latter are -attributed to the right test by the former. - -We have a sample of failure-raising listener -[here](../samples/sample10_unittest.cc). - -# Running Test Programs: Advanced Options # - -Google Test test programs are ordinary executables. Once built, you can run -them directly and affect their behavior via the following environment variables -and/or command line flags. For the flags to work, your programs must call -`::testing::InitGoogleTest()` before calling `RUN_ALL_TESTS()`. - -To see a list of supported flags and their usage, please run your test -program with the `--help` flag. You can also use `-h`, `-?`, or `/?` -for short. This feature is added in version 1.3.0. - -If an option is specified both by an environment variable and by a -flag, the latter takes precedence. Most of the options can also be -set/read in code: to access the value of command line flag -`--gtest_foo`, write `::testing::GTEST_FLAG(foo)`. A common pattern is -to set the value of a flag before calling `::testing::InitGoogleTest()` -to change the default value of the flag: -``` -int main(int argc, char** argv) { - // Disables elapsed time by default. - ::testing::GTEST_FLAG(print_time) = false; - - // This allows the user to override the flag on the command line. - ::testing::InitGoogleTest(&argc, argv); - - return RUN_ALL_TESTS(); -} -``` - -## Selecting Tests ## - -This section shows various options for choosing which tests to run. - -### Listing Test Names ### - -Sometimes it is necessary to list the available tests in a program before -running them so that a filter may be applied if needed. Including the flag -`--gtest_list_tests` overrides all other flags and lists tests in the following -format: -``` -TestCase1. - TestName1 - TestName2 -TestCase2. - TestName -``` - -None of the tests listed are actually run if the flag is provided. There is no -corresponding environment variable for this flag. - -_Availability:_ Linux, Windows, Mac. - -### Running a Subset of the Tests ### - -By default, a Google Test program runs all tests the user has defined. -Sometimes, you want to run only a subset of the tests (e.g. for debugging or -quickly verifying a change). If you set the `GTEST_FILTER` environment variable -or the `--gtest_filter` flag to a filter string, Google Test will only run the -tests whose full names (in the form of `TestCaseName.TestName`) match the -filter. - -The format of a filter is a '`:`'-separated list of wildcard patterns (called -the positive patterns) optionally followed by a '`-`' and another -'`:`'-separated pattern list (called the negative patterns). A test matches the -filter if and only if it matches any of the positive patterns but does not -match any of the negative patterns. - -A pattern may contain `'*'` (matches any string) or `'?'` (matches any single -character). For convenience, the filter `'*-NegativePatterns'` can be also -written as `'-NegativePatterns'`. - -For example: - - * `./foo_test` Has no flag, and thus runs all its tests. - * `./foo_test --gtest_filter=*` Also runs everything, due to the single match-everything `*` value. - * `./foo_test --gtest_filter=FooTest.*` Runs everything in test case `FooTest`. - * `./foo_test --gtest_filter=*Null*:*Constructor*` Runs any test whose full name contains either `"Null"` or `"Constructor"`. - * `./foo_test --gtest_filter=-*DeathTest.*` Runs all non-death tests. - * `./foo_test --gtest_filter=FooTest.*-FooTest.Bar` Runs everything in test case `FooTest` except `FooTest.Bar`. - -_Availability:_ Linux, Windows, Mac. - -### Temporarily Disabling Tests ### - -If you have a broken test that you cannot fix right away, you can add the -`DISABLED_` prefix to its name. This will exclude it from execution. This is -better than commenting out the code or using `#if 0`, as disabled tests are -still compiled (and thus won't rot). - -If you need to disable all tests in a test case, you can either add `DISABLED_` -to the front of the name of each test, or alternatively add it to the front of -the test case name. - -For example, the following tests won't be run by Google Test, even though they -will still be compiled: - -``` -// Tests that Foo does Abc. -TEST(FooTest, DISABLED_DoesAbc) { ... } - -class DISABLED_BarTest : public ::testing::Test { ... }; - -// Tests that Bar does Xyz. -TEST_F(DISABLED_BarTest, DoesXyz) { ... } -``` - -_Note:_ This feature should only be used for temporary pain-relief. You still -have to fix the disabled tests at a later date. As a reminder, Google Test will -print a banner warning you if a test program contains any disabled tests. - -_Tip:_ You can easily count the number of disabled tests you have -using `grep`. This number can be used as a metric for improving your -test quality. - -_Availability:_ Linux, Windows, Mac. - -### Temporarily Enabling Disabled Tests ### - -To include [disabled tests](#temporarily-disabling-tests) in test -execution, just invoke the test program with the -`--gtest_also_run_disabled_tests` flag or set the -`GTEST_ALSO_RUN_DISABLED_TESTS` environment variable to a value other -than `0`. You can combine this with the -[--gtest\_filter](#running-a-subset-of-the-tests) flag to further select -which disabled tests to run. - -_Availability:_ Linux, Windows, Mac; since version 1.3.0. - -## Repeating the Tests ## - -Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it -will fail only 1% of the time, making it rather hard to reproduce the bug under -a debugger. This can be a major source of frustration. - -The `--gtest_repeat` flag allows you to repeat all (or selected) test methods -in a program many times. Hopefully, a flaky test will eventually fail and give -you a chance to debug. Here's how to use it: - -| `$ foo_test --gtest_repeat=1000` | Repeat foo\_test 1000 times and don't stop at failures. | -|:---------------------------------|:--------------------------------------------------------| -| `$ foo_test --gtest_repeat=-1` | A negative count means repeating forever. | -| `$ foo_test --gtest_repeat=1000 --gtest_break_on_failure` | Repeat foo\_test 1000 times, stopping at the first failure. This is especially useful when running under a debugger: when the testfails, it will drop into the debugger and you can then inspect variables and stacks. | -| `$ foo_test --gtest_repeat=1000 --gtest_filter=FooBar` | Repeat the tests whose name matches the filter 1000 times. | - -If your test program contains global set-up/tear-down code registered -using `AddGlobalTestEnvironment()`, it will be repeated in each -iteration as well, as the flakiness may be in it. You can also specify -the repeat count by setting the `GTEST_REPEAT` environment variable. - -_Availability:_ Linux, Windows, Mac. - -## Shuffling the Tests ## - -You can specify the `--gtest_shuffle` flag (or set the `GTEST_SHUFFLE` -environment variable to `1`) to run the tests in a program in a random -order. This helps to reveal bad dependencies between tests. - -By default, Google Test uses a random seed calculated from the current -time. Therefore you'll get a different order every time. The console -output includes the random seed value, such that you can reproduce an -order-related test failure later. To specify the random seed -explicitly, use the `--gtest_random_seed=SEED` flag (or set the -`GTEST_RANDOM_SEED` environment variable), where `SEED` is an integer -between 0 and 99999. The seed value 0 is special: it tells Google Test -to do the default behavior of calculating the seed from the current -time. - -If you combine this with `--gtest_repeat=N`, Google Test will pick a -different random seed and re-shuffle the tests in each iteration. - -_Availability:_ Linux, Windows, Mac; since v1.4.0. - -## Controlling Test Output ## - -This section teaches how to tweak the way test results are reported. - -### Colored Terminal Output ### - -Google Test can use colors in its terminal output to make it easier to spot -the separation between tests, and whether tests passed. - -You can set the GTEST\_COLOR environment variable or set the `--gtest_color` -command line flag to `yes`, `no`, or `auto` (the default) to enable colors, -disable colors, or let Google Test decide. When the value is `auto`, Google -Test will use colors if and only if the output goes to a terminal and (on -non-Windows platforms) the `TERM` environment variable is set to `xterm` or -`xterm-color`. - -_Availability:_ Linux, Windows, Mac. - -### Suppressing the Elapsed Time ### - -By default, Google Test prints the time it takes to run each test. To -suppress that, run the test program with the `--gtest_print_time=0` -command line flag. Setting the `GTEST_PRINT_TIME` environment -variable to `0` has the same effect. - -_Availability:_ Linux, Windows, Mac. (In Google Test 1.3.0 and lower, -the default behavior is that the elapsed time is **not** printed.) - -**Availability**: Linux, Windows, Mac. - -#### Suppressing UTF-8 Text Output - -In case of assertion failures, gUnit prints expected and actual values of type -`string` both as hex-encoded strings as well as in readable UTF-8 text if they -contain valid non-ASCII UTF-8 characters. If you want to suppress the UTF-8 text -because, for example, you don't have an UTF-8 compatible output medium, run the -test program with `--gunit_print_utf8=0` or set the `GUNIT_PRINT_UTF8` -environment variable to `0`. - -### Generating an XML Report ### - -Google Test can emit a detailed XML report to a file in addition to its normal -textual output. The report contains the duration of each test, and thus can -help you identify slow tests. - -To generate the XML report, set the `GTEST_OUTPUT` environment variable or the -`--gtest_output` flag to the string `"xml:_path_to_output_file_"`, which will -create the file at the given location. You can also just use the string -`"xml"`, in which case the output can be found in the `test_detail.xml` file in -the current directory. - -If you specify a directory (for example, `"xml:output/directory/"` on Linux or -`"xml:output\directory\"` on Windows), Google Test will create the XML file in -that directory, named after the test executable (e.g. `foo_test.xml` for test -program `foo_test` or `foo_test.exe`). If the file already exists (perhaps left -over from a previous run), Google Test will pick a different name (e.g. -`foo_test_1.xml`) to avoid overwriting it. - -The report uses the format described here. It is based on the -`junitreport` Ant task and can be parsed by popular continuous build -systems like [Hudson](https://hudson.dev.java.net/). Since that format -was originally intended for Java, a little interpretation is required -to make it apply to Google Test tests, as shown here: - -``` - - - - - - - - - -``` - - * The root `` element corresponds to the entire test program. - * `` elements correspond to Google Test test cases. - * `` elements correspond to Google Test test functions. - -For instance, the following program - -``` -TEST(MathTest, Addition) { ... } -TEST(MathTest, Subtraction) { ... } -TEST(LogicTest, NonContradiction) { ... } -``` - -could generate this report: - -``` - - - - - - - - - - - - - - - -``` - -Things to note: - - * The `tests` attribute of a `` or `` element tells how many test functions the Google Test program or test case contains, while the `failures` attribute tells how many of them failed. - * The `time` attribute expresses the duration of the test, test case, or entire test program in milliseconds. - * Each `` element corresponds to a single failed Google Test assertion. - * Some JUnit concepts don't apply to Google Test, yet we have to conform to the DTD. Therefore you'll see some dummy elements and attributes in the report. You can safely ignore these parts. - -_Availability:_ Linux, Windows, Mac. - -#### Generating an JSON Report {#JsonReport} - -gUnit can also emit a JSON report as an alternative format to XML. To generate -the JSON report, set the `GUNIT_OUTPUT` environment variable or the -`--gunit_output` flag to the string `"json:path_to_output_file"`, which will -create the file at the given location. You can also just use the string -`"json"`, in which case the output can be found in the `test_detail.json` file -in the current directory. - -The report format conforms to the following JSON Schema: - -```json -{ - "$schema": "http://json-schema.org/schema#", - "type": "object", - "definitions": { - "TestCase": { - "type": "object", - "properties": { - "name": { "type": "string" }, - "tests": { "type": "integer" }, - "failures": { "type": "integer" }, - "disabled": { "type": "integer" }, - "time": { "type": "string" }, - "testsuite": { - "type": "array", - "items": { - "$ref": "#/definitions/TestInfo" - } - } - } - }, - "TestInfo": { - "type": "object", - "properties": { - "name": { "type": "string" }, - "status": { - "type": "string", - "enum": ["RUN", "NOTRUN"] - }, - "time": { "type": "string" }, - "classname": { "type": "string" }, - "failures": { - "type": "array", - "items": { - "$ref": "#/definitions/Failure" - } - } - } - }, - "Failure": { - "type": "object", - "properties": { - "failures": { "type": "string" }, - "type": { "type": "string" } - } - } - }, - "properties": { - "tests": { "type": "integer" }, - "failures": { "type": "integer" }, - "disabled": { "type": "integer" }, - "errors": { "type": "integer" }, - "timestamp": { - "type": "string", - "format": "date-time" - }, - "time": { "type": "string" }, - "name": { "type": "string" }, - "testsuites": { - "type": "array", - "items": { - "$ref": "#/definitions/TestCase" - } - } - } -} -``` - -The report uses the format that conforms to the following Proto3 using the -[JSON encoding](https://developers.google.com/protocol-buffers/docs/proto3#json): - -```proto -syntax = "proto3"; - -package googletest; - -import "google/protobuf/timestamp.proto"; -import "google/protobuf/duration.proto"; - -message UnitTest { - int32 tests = 1; - int32 failures = 2; - int32 disabled = 3; - int32 errors = 4; - google.protobuf.Timestamp timestamp = 5; - google.protobuf.Duration time = 6; - string name = 7; - repeated TestCase testsuites = 8; -} - -message TestCase { - string name = 1; - int32 tests = 2; - int32 failures = 3; - int32 disabled = 4; - int32 errors = 5; - google.protobuf.Duration time = 6; - repeated TestInfo testsuite = 7; -} - -message TestInfo { - string name = 1; - enum Status { - RUN = 0; - NOTRUN = 1; - } - Status status = 2; - google.protobuf.Duration time = 3; - string classname = 4; - message Failure { - string failures = 1; - string type = 2; - } - repeated Failure failures = 5; -} -``` - -For instance, the following program - -```c++ -TEST(MathTest, Addition) { ... } -TEST(MathTest, Subtraction) { ... } -TEST(LogicTest, NonContradiction) { ... } -``` - -could generate this report: - -```json -{ - "tests": 3, - "failures": 1, - "errors": 0, - "time": "0.035s", - "timestamp": "2011-10-31T18:52:42Z" - "name": "AllTests", - "testsuites": [ - { - "name": "MathTest", - "tests": 2, - "failures": 1, - "errors": 0, - "time": "0.015s", - "testsuite": [ - { - "name": "Addition", - "status": "RUN", - "time": "0.007s", - "classname": "", - "failures": [ - { - "message": "Value of: add(1, 1)\x0A Actual: 3\x0AExpected: 2", - "type": "" - }, - { - "message": "Value of: add(1, -1)\x0A Actual: 1\x0AExpected: 0", - "type": "" - } - ] - }, - { - "name": "Subtraction", - "status": "RUN", - "time": "0.005s", - "classname": "" - } - ] - } - { - "name": "LogicTest", - "tests": 1, - "failures": 0, - "errors": 0, - "time": "0.005s", - "testsuite": [ - { - "name": "NonContradiction", - "status": "RUN", - "time": "0.005s", - "classname": "" - } - ] - } - ] -} -``` - -IMPORTANT: The exact format of the JSON document is subject to change. - -**Availability**: Linux, Windows, Mac. - -## Controlling How Failures Are Reported ## - -### Turning Assertion Failures into Break-Points ### - -When running test programs under a debugger, it's very convenient if the -debugger can catch an assertion failure and automatically drop into interactive -mode. Google Test's _break-on-failure_ mode supports this behavior. - -To enable it, set the `GTEST_BREAK_ON_FAILURE` environment variable to a value -other than `0` . Alternatively, you can use the `--gtest_break_on_failure` -command line flag. - -_Availability:_ Linux, Windows, Mac. - -### Disabling Catching Test-Thrown Exceptions ### - -Google Test can be used either with or without exceptions enabled. If -a test throws a C++ exception or (on Windows) a structured exception -(SEH), by default Google Test catches it, reports it as a test -failure, and continues with the next test method. This maximizes the -coverage of a test run. Also, on Windows an uncaught exception will -cause a pop-up window, so catching the exceptions allows you to run -the tests automatically. - -When debugging the test failures, however, you may instead want the -exceptions to be handled by the debugger, such that you can examine -the call stack when an exception is thrown. To achieve that, set the -`GTEST_CATCH_EXCEPTIONS` environment variable to `0`, or use the -`--gtest_catch_exceptions=0` flag when running the tests. - -**Availability**: Linux, Windows, Mac. - -### Letting Another Testing Framework Drive ### - -If you work on a project that has already been using another testing -framework and is not ready to completely switch to Google Test yet, -you can get much of Google Test's benefit by using its assertions in -your existing tests. Just change your `main()` function to look -like: - -``` -#include "gtest/gtest.h" - -int main(int argc, char** argv) { - ::testing::GTEST_FLAG(throw_on_failure) = true; - // Important: Google Test must be initialized. - ::testing::InitGoogleTest(&argc, argv); - - ... whatever your existing testing framework requires ... -} -``` - -With that, you can use Google Test assertions in addition to the -native assertions your testing framework provides, for example: - -``` -void TestFooDoesBar() { - Foo foo; - EXPECT_LE(foo.Bar(1), 100); // A Google Test assertion. - CPPUNIT_ASSERT(foo.IsEmpty()); // A native assertion. -} -``` - -If a Google Test assertion fails, it will print an error message and -throw an exception, which will be treated as a failure by your host -testing framework. If you compile your code with exceptions disabled, -a failed Google Test assertion will instead exit your program with a -non-zero code, which will also signal a test failure to your test -runner. - -If you don't write `::testing::GTEST_FLAG(throw_on_failure) = true;` in -your `main()`, you can alternatively enable this feature by specifying -the `--gtest_throw_on_failure` flag on the command-line or setting the -`GTEST_THROW_ON_FAILURE` environment variable to a non-zero value. - -Death tests are _not_ supported when other test framework is used to organize tests. - -_Availability:_ Linux, Windows, Mac; since v1.3.0. - -## Distributing Test Functions to Multiple Machines ## - -If you have more than one machine you can use to run a test program, -you might want to run the test functions in parallel and get the -result faster. We call this technique _sharding_, where each machine -is called a _shard_. - -Google Test is compatible with test sharding. To take advantage of -this feature, your test runner (not part of Google Test) needs to do -the following: - - 1. Allocate a number of machines (shards) to run the tests. - 1. On each shard, set the `GTEST_TOTAL_SHARDS` environment variable to the total number of shards. It must be the same for all shards. - 1. On each shard, set the `GTEST_SHARD_INDEX` environment variable to the index of the shard. Different shards must be assigned different indices, which must be in the range `[0, GTEST_TOTAL_SHARDS - 1]`. - 1. Run the same test program on all shards. When Google Test sees the above two environment variables, it will select a subset of the test functions to run. Across all shards, each test function in the program will be run exactly once. - 1. Wait for all shards to finish, then collect and report the results. - -Your project may have tests that were written without Google Test and -thus don't understand this protocol. In order for your test runner to -figure out which test supports sharding, it can set the environment -variable `GTEST_SHARD_STATUS_FILE` to a non-existent file path. If a -test program supports sharding, it will create this file to -acknowledge the fact (the actual contents of the file are not -important at this time; although we may stick some useful information -in it in the future.); otherwise it will not create it. - -Here's an example to make it clear. Suppose you have a test program -`foo_test` that contains the following 5 test functions: -``` -TEST(A, V) -TEST(A, W) -TEST(B, X) -TEST(B, Y) -TEST(B, Z) -``` -and you have 3 machines at your disposal. To run the test functions in -parallel, you would set `GTEST_TOTAL_SHARDS` to 3 on all machines, and -set `GTEST_SHARD_INDEX` to 0, 1, and 2 on the machines respectively. -Then you would run the same `foo_test` on each machine. - -Google Test reserves the right to change how the work is distributed -across the shards, but here's one possible scenario: - - * Machine #0 runs `A.V` and `B.X`. - * Machine #1 runs `A.W` and `B.Y`. - * Machine #2 runs `B.Z`. - -_Availability:_ Linux, Windows, Mac; since version 1.3.0. - -# Fusing Google Test Source Files # - -Google Test's implementation consists of ~30 files (excluding its own -tests). Sometimes you may want them to be packaged up in two files (a -`.h` and a `.cc`) instead, such that you can easily copy them to a new -machine and start hacking there. For this we provide an experimental -Python script `fuse_gtest_files.py` in the `scripts/` directory (since release 1.3.0). -Assuming you have Python 2.4 or above installed on your machine, just -go to that directory and run -``` -python fuse_gtest_files.py OUTPUT_DIR -``` - -and you should see an `OUTPUT_DIR` directory being created with files -`gtest/gtest.h` and `gtest/gtest-all.cc` in it. These files contain -everything you need to use Google Test. Just copy them to anywhere -you want and you are ready to write tests. You can use the -[scripts/test/Makefile](../scripts/test/Makefile) -file as an example on how to compile your tests against them. - -# Where to Go from Here # - -Congratulations! You've now learned more advanced Google Test tools and are -ready to tackle more complex testing tasks. If you want to dive even deeper, you -can read the [Frequently-Asked Questions](FAQ.md). diff --git a/test/gtest-1.8.0/docs/Documentation.md b/test/gtest-1.8.0/docs/Documentation.md deleted file mode 100644 index 20f250399e..0000000000 --- a/test/gtest-1.8.0/docs/Documentation.md +++ /dev/null @@ -1,16 +0,0 @@ -This page lists all documentation markdown files for Google Test **(the -current git version)** --- **if you use a former version of Google Test, please read the -documentation for that specific version instead (e.g. by checking out -the respective git branch/tag).** - - * [Primer](Primer.md) -- start here if you are new to Google Test. - * [Samples](Samples.md) -- learn from examples. - * [AdvancedGuide](AdvancedGuide.md) -- learn more about Google Test. - * [XcodeGuide](XcodeGuide.md) -- how to use Google Test in Xcode on Mac. - * [Frequently-Asked Questions](FAQ.md) -- check here before asking a question on the mailing list. - -To contribute code to Google Test, read: - - * [CONTRIBUTING](../../CONTRIBUTING.md) -- read this _before_ writing your first patch. - * [PumpManual](PumpManual.md) -- how we generate some of Google Test's source files. diff --git a/test/gtest-1.8.0/docs/FAQ.md b/test/gtest-1.8.0/docs/FAQ.md deleted file mode 100644 index bd9526de21..0000000000 --- a/test/gtest-1.8.0/docs/FAQ.md +++ /dev/null @@ -1,1092 +0,0 @@ - - -If you cannot find the answer to your question here, and you have read -[Primer](Primer.md) and [AdvancedGuide](AdvancedGuide.md), send it to -googletestframework@googlegroups.com. - -## Why should I use Google Test instead of my favorite C++ testing framework? ## - -First, let us say clearly that we don't want to get into the debate of -which C++ testing framework is **the best**. There exist many fine -frameworks for writing C++ tests, and we have tremendous respect for -the developers and users of them. We don't think there is (or will -be) a single best framework - you have to pick the right tool for the -particular task you are tackling. - -We created Google Test because we couldn't find the right combination -of features and conveniences in an existing framework to satisfy _our_ -needs. The following is a list of things that _we_ like about Google -Test. We don't claim them to be unique to Google Test - rather, the -combination of them makes Google Test the choice for us. We hope this -list can help you decide whether it is for you too. - - * Google Test is designed to be portable: it doesn't require exceptions or RTTI; it works around various bugs in various compilers and environments; etc. As a result, it works on Linux, Mac OS X, Windows and several embedded operating systems. - * Nonfatal assertions (`EXPECT_*`) have proven to be great time savers, as they allow a test to report multiple failures in a single edit-compile-test cycle. - * It's easy to write assertions that generate informative messages: you just use the stream syntax to append any additional information, e.g. `ASSERT_EQ(5, Foo(i)) << " where i = " << i;`. It doesn't require a new set of macros or special functions. - * Google Test automatically detects your tests and doesn't require you to enumerate them in order to run them. - * Death tests are pretty handy for ensuring that your asserts in production code are triggered by the right conditions. - * `SCOPED_TRACE` helps you understand the context of an assertion failure when it comes from inside a sub-routine or loop. - * You can decide which tests to run using name patterns. This saves time when you want to quickly reproduce a test failure. - * Google Test can generate XML test result reports that can be parsed by popular continuous build system like Hudson. - * Simple things are easy in Google Test, while hard things are possible: in addition to advanced features like [global test environments](AdvancedGuide.md#global-set-up-and-tear-down) and tests parameterized by [values](AdvancedGuide.md#value-parameterized-tests) or [types](docs/AdvancedGuide.md#typed-tests), Google Test supports various ways for the user to extend the framework -- if Google Test doesn't do something out of the box, chances are that a user can implement the feature using Google Test's public API, without changing Google Test itself. In particular, you can: - * expand your testing vocabulary by defining [custom predicates](AdvancedGuide.md#predicate-assertions-for-better-error-messages), - * teach Google Test how to [print your types](AdvancedGuide.md#teaching-google-test-how-to-print-your-values), - * define your own testing macros or utilities and verify them using Google Test's [Service Provider Interface](AdvancedGuide.md#catching-failures), and - * reflect on the test cases or change the test output format by intercepting the [test events](AdvancedGuide.md#extending-google-test-by-handling-test-events). - -## I'm getting warnings when compiling Google Test. Would you fix them? ## - -We strive to minimize compiler warnings Google Test generates. Before releasing a new version, we test to make sure that it doesn't generate warnings when compiled using its CMake script on Windows, Linux, and Mac OS. - -Unfortunately, this doesn't mean you are guaranteed to see no warnings when compiling Google Test in your environment: - - * You may be using a different compiler as we use, or a different version of the same compiler. We cannot possibly test for all compilers. - * You may be compiling on a different platform as we do. - * Your project may be using different compiler flags as we do. - -It is not always possible to make Google Test warning-free for everyone. Or, it may not be desirable if the warning is rarely enabled and fixing the violations makes the code more complex. - -If you see warnings when compiling Google Test, we suggest that you use the `-isystem` flag (assuming your are using GCC) to mark Google Test headers as system headers. That'll suppress warnings from Google Test headers. - -## Why should not test case names and test names contain underscore? ## - -Underscore (`_`) is special, as C++ reserves the following to be used by -the compiler and the standard library: - - 1. any identifier that starts with an `_` followed by an upper-case letter, and - 1. any identifier that contains two consecutive underscores (i.e. `__`) _anywhere_ in its name. - -User code is _prohibited_ from using such identifiers. - -Now let's look at what this means for `TEST` and `TEST_F`. - -Currently `TEST(TestCaseName, TestName)` generates a class named -`TestCaseName_TestName_Test`. What happens if `TestCaseName` or `TestName` -contains `_`? - - 1. If `TestCaseName` starts with an `_` followed by an upper-case letter (say, `_Foo`), we end up with `_Foo_TestName_Test`, which is reserved and thus invalid. - 1. If `TestCaseName` ends with an `_` (say, `Foo_`), we get `Foo__TestName_Test`, which is invalid. - 1. If `TestName` starts with an `_` (say, `_Bar`), we get `TestCaseName__Bar_Test`, which is invalid. - 1. If `TestName` ends with an `_` (say, `Bar_`), we get `TestCaseName_Bar__Test`, which is invalid. - -So clearly `TestCaseName` and `TestName` cannot start or end with `_` -(Actually, `TestCaseName` can start with `_` -- as long as the `_` isn't -followed by an upper-case letter. But that's getting complicated. So -for simplicity we just say that it cannot start with `_`.). - -It may seem fine for `TestCaseName` and `TestName` to contain `_` in the -middle. However, consider this: -``` cpp -TEST(Time, Flies_Like_An_Arrow) { ... } -TEST(Time_Flies, Like_An_Arrow) { ... } -``` - -Now, the two `TEST`s will both generate the same class -(`Time_Files_Like_An_Arrow_Test`). That's not good. - -So for simplicity, we just ask the users to avoid `_` in `TestCaseName` -and `TestName`. The rule is more constraining than necessary, but it's -simple and easy to remember. It also gives Google Test some wiggle -room in case its implementation needs to change in the future. - -If you violate the rule, there may not be immediately consequences, -but your test may (just may) break with a new compiler (or a new -version of the compiler you are using) or with a new version of Google -Test. Therefore it's best to follow the rule. - -## Why is it not recommended to install a pre-compiled copy of Google Test (for example, into /usr/local)? ## - -In the early days, we said that you could install -compiled Google Test libraries on `*`nix systems using `make install`. -Then every user of your machine can write tests without -recompiling Google Test. - -This seemed like a good idea, but it has a -got-cha: every user needs to compile their tests using the _same_ compiler -flags used to compile the installed Google Test libraries; otherwise -they may run into undefined behaviors (i.e. the tests can behave -strangely and may even crash for no obvious reasons). - -Why? Because C++ has this thing called the One-Definition Rule: if -two C++ source files contain different definitions of the same -class/function/variable, and you link them together, you violate the -rule. The linker may or may not catch the error (in many cases it's -not required by the C++ standard to catch the violation). If it -doesn't, you get strange run-time behaviors that are unexpected and -hard to debug. - -If you compile Google Test and your test code using different compiler -flags, they may see different definitions of the same -class/function/variable (e.g. due to the use of `#if` in Google Test). -Therefore, for your sanity, we recommend to avoid installing pre-compiled -Google Test libraries. Instead, each project should compile -Google Test itself such that it can be sure that the same flags are -used for both Google Test and the tests. - -## How do I generate 64-bit binaries on Windows (using Visual Studio 2008)? ## - -(Answered by Trevor Robinson) - -Load the supplied Visual Studio solution file, either `msvc\gtest-md.sln` or -`msvc\gtest.sln`. Go through the migration wizard to migrate the -solution and project files to Visual Studio 2008. Select -`Configuration Manager...` from the `Build` menu. Select `` from -the `Active solution platform` dropdown. Select `x64` from the new -platform dropdown, leave `Copy settings from` set to `Win32` and -`Create new project platforms` checked, then click `OK`. You now have -`Win32` and `x64` platform configurations, selectable from the -`Standard` toolbar, which allow you to toggle between building 32-bit or -64-bit binaries (or both at once using Batch Build). - -In order to prevent build output files from overwriting one another, -you'll need to change the `Intermediate Directory` settings for the -newly created platform configuration across all the projects. To do -this, multi-select (e.g. using shift-click) all projects (but not the -solution) in the `Solution Explorer`. Right-click one of them and -select `Properties`. In the left pane, select `Configuration Properties`, -and from the `Configuration` dropdown, select `All Configurations`. -Make sure the selected platform is `x64`. For the -`Intermediate Directory` setting, change the value from -`$(PlatformName)\$(ConfigurationName)` to -`$(OutDir)\$(ProjectName)`. Click `OK` and then build the -solution. When the build is complete, the 64-bit binaries will be in -the `msvc\x64\Debug` directory. - -## Can I use Google Test on MinGW? ## - -We haven't tested this ourselves, but Per Abrahamsen reported that he -was able to compile and install Google Test successfully when using -MinGW from Cygwin. You'll need to configure it with: - -`PATH/TO/configure CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin"` - -You should be able to replace the `-mno-cygwin` option with direct links -to the real MinGW binaries, but we haven't tried that. - -Caveats: - - * There are many warnings when compiling. - * `make check` will produce some errors as not all tests for Google Test itself are compatible with MinGW. - -We also have reports on successful cross compilation of Google Test -MinGW binaries on Linux using -[these instructions](http://wiki.wxwidgets.org/Cross-Compiling_Under_Linux#Cross-compiling_under_Linux_for_MS_Windows) -on the WxWidgets site. - -Please contact `googletestframework@googlegroups.com` if you are -interested in improving the support for MinGW. - -## Why does Google Test support EXPECT\_EQ(NULL, ptr) and ASSERT\_EQ(NULL, ptr) but not EXPECT\_NE(NULL, ptr) and ASSERT\_NE(NULL, ptr)? ## - -Due to some peculiarity of C++, it requires some non-trivial template -meta programming tricks to support using `NULL` as an argument of the -`EXPECT_XX()` and `ASSERT_XX()` macros. Therefore we only do it where -it's most needed (otherwise we make the implementation of Google Test -harder to maintain and more error-prone than necessary). - -The `EXPECT_EQ()` macro takes the _expected_ value as its first -argument and the _actual_ value as the second. It's reasonable that -someone wants to write `EXPECT_EQ(NULL, some_expression)`, and this -indeed was requested several times. Therefore we implemented it. - -The need for `EXPECT_NE(NULL, ptr)` isn't nearly as strong. When the -assertion fails, you already know that `ptr` must be `NULL`, so it -doesn't add any information to print ptr in this case. That means -`EXPECT_TRUE(ptr != NULL)` works just as well. - -If we were to support `EXPECT_NE(NULL, ptr)`, for consistency we'll -have to support `EXPECT_NE(ptr, NULL)` as well, as unlike `EXPECT_EQ`, -we don't have a convention on the order of the two arguments for -`EXPECT_NE`. This means using the template meta programming tricks -twice in the implementation, making it even harder to understand and -maintain. We believe the benefit doesn't justify the cost. - -Finally, with the growth of Google Mock's [matcher](../../googlemock/docs/CookBook.md#using-matchers-in-google-test-assertions) library, we are -encouraging people to use the unified `EXPECT_THAT(value, matcher)` -syntax more often in tests. One significant advantage of the matcher -approach is that matchers can be easily combined to form new matchers, -while the `EXPECT_NE`, etc, macros cannot be easily -combined. Therefore we want to invest more in the matchers than in the -`EXPECT_XX()` macros. - -## Does Google Test support running tests in parallel? ## - -Test runners tend to be tightly coupled with the build/test -environment, and Google Test doesn't try to solve the problem of -running tests in parallel. Instead, we tried to make Google Test work -nicely with test runners. For example, Google Test's XML report -contains the time spent on each test, and its `gtest_list_tests` and -`gtest_filter` flags can be used for splitting the execution of test -methods into multiple processes. These functionalities can help the -test runner run the tests in parallel. - -## Why don't Google Test run the tests in different threads to speed things up? ## - -It's difficult to write thread-safe code. Most tests are not written -with thread-safety in mind, and thus may not work correctly in a -multi-threaded setting. - -If you think about it, it's already hard to make your code work when -you know what other threads are doing. It's much harder, and -sometimes even impossible, to make your code work when you don't know -what other threads are doing (remember that test methods can be added, -deleted, or modified after your test was written). If you want to run -the tests in parallel, you'd better run them in different processes. - -## Why aren't Google Test assertions implemented using exceptions? ## - -Our original motivation was to be able to use Google Test in projects -that disable exceptions. Later we realized some additional benefits -of this approach: - - 1. Throwing in a destructor is undefined behavior in C++. Not using exceptions means Google Test's assertions are safe to use in destructors. - 1. The `EXPECT_*` family of macros will continue even after a failure, allowing multiple failures in a `TEST` to be reported in a single run. This is a popular feature, as in C++ the edit-compile-test cycle is usually quite long and being able to fixing more than one thing at a time is a blessing. - 1. If assertions are implemented using exceptions, a test may falsely ignore a failure if it's caught by user code: -``` cpp -try { ... ASSERT_TRUE(...) ... } -catch (...) { ... } -``` -The above code will pass even if the `ASSERT_TRUE` throws. While it's unlikely for someone to write this in a test, it's possible to run into this pattern when you write assertions in callbacks that are called by the code under test. - -The downside of not using exceptions is that `ASSERT_*` (implemented -using `return`) will only abort the current function, not the current -`TEST`. - -## Why do we use two different macros for tests with and without fixtures? ## - -Unfortunately, C++'s macro system doesn't allow us to use the same -macro for both cases. One possibility is to provide only one macro -for tests with fixtures, and require the user to define an empty -fixture sometimes: - -``` cpp -class FooTest : public ::testing::Test {}; - -TEST_F(FooTest, DoesThis) { ... } -``` -or -``` cpp -typedef ::testing::Test FooTest; - -TEST_F(FooTest, DoesThat) { ... } -``` - -Yet, many people think this is one line too many. :-) Our goal was to -make it really easy to write tests, so we tried to make simple tests -trivial to create. That means using a separate macro for such tests. - -We think neither approach is ideal, yet either of them is reasonable. -In the end, it probably doesn't matter much either way. - -## Why don't we use structs as test fixtures? ## - -We like to use structs only when representing passive data. This -distinction between structs and classes is good for documenting the -intent of the code's author. Since test fixtures have logic like -`SetUp()` and `TearDown()`, they are better defined as classes. - -## Why are death tests implemented as assertions instead of using a test runner? ## - -Our goal was to make death tests as convenient for a user as C++ -possibly allows. In particular: - - * The runner-style requires to split the information into two pieces: the definition of the death test itself, and the specification for the runner on how to run the death test and what to expect. The death test would be written in C++, while the runner spec may or may not be. A user needs to carefully keep the two in sync. `ASSERT_DEATH(statement, expected_message)` specifies all necessary information in one place, in one language, without boilerplate code. It is very declarative. - * `ASSERT_DEATH` has a similar syntax and error-reporting semantics as other Google Test assertions, and thus is easy to learn. - * `ASSERT_DEATH` can be mixed with other assertions and other logic at your will. You are not limited to one death test per test method. For example, you can write something like: -``` cpp - if (FooCondition()) { - ASSERT_DEATH(Bar(), "blah"); - } else { - ASSERT_EQ(5, Bar()); - } -``` -If you prefer one death test per test method, you can write your tests in that style too, but we don't want to impose that on the users. The fewer artificial limitations the better. - * `ASSERT_DEATH` can reference local variables in the current function, and you can decide how many death tests you want based on run-time information. For example, -``` cpp - const int count = GetCount(); // Only known at run time. - for (int i = 1; i <= count; i++) { - ASSERT_DEATH({ - double* buffer = new double[i]; - ... initializes buffer ... - Foo(buffer, i) - }, "blah blah"); - } -``` -The runner-based approach tends to be more static and less flexible, or requires more user effort to get this kind of flexibility. - -Another interesting thing about `ASSERT_DEATH` is that it calls `fork()` -to create a child process to run the death test. This is lightening -fast, as `fork()` uses copy-on-write pages and incurs almost zero -overhead, and the child process starts from the user-supplied -statement directly, skipping all global and local initialization and -any code leading to the given statement. If you launch the child -process from scratch, it can take seconds just to load everything and -start running if the test links to many libraries dynamically. - -## My death test modifies some state, but the change seems lost after the death test finishes. Why? ## - -Death tests (`EXPECT_DEATH`, etc) are executed in a sub-process s.t. the -expected crash won't kill the test program (i.e. the parent process). As a -result, any in-memory side effects they incur are observable in their -respective sub-processes, but not in the parent process. You can think of them -as running in a parallel universe, more or less. - -## The compiler complains about "undefined references" to some static const member variables, but I did define them in the class body. What's wrong? ## - -If your class has a static data member: - -``` cpp -// foo.h -class Foo { - ... - static const int kBar = 100; -}; -``` - -You also need to define it _outside_ of the class body in `foo.cc`: - -``` cpp -const int Foo::kBar; // No initializer here. -``` - -Otherwise your code is **invalid C++**, and may break in unexpected ways. In -particular, using it in Google Test comparison assertions (`EXPECT_EQ`, etc) -will generate an "undefined reference" linker error. - -## I have an interface that has several implementations. Can I write a set of tests once and repeat them over all the implementations? ## - -Google Test doesn't yet have good support for this kind of tests, or -data-driven tests in general. We hope to be able to make improvements in this -area soon. - -## Can I derive a test fixture from another? ## - -Yes. - -Each test fixture has a corresponding and same named test case. This means only -one test case can use a particular fixture. Sometimes, however, multiple test -cases may want to use the same or slightly different fixtures. For example, you -may want to make sure that all of a GUI library's test cases don't leak -important system resources like fonts and brushes. - -In Google Test, you share a fixture among test cases by putting the shared -logic in a base test fixture, then deriving from that base a separate fixture -for each test case that wants to use this common logic. You then use `TEST_F()` -to write tests using each derived fixture. - -Typically, your code looks like this: - -``` cpp -// Defines a base test fixture. -class BaseTest : public ::testing::Test { - protected: - ... -}; - -// Derives a fixture FooTest from BaseTest. -class FooTest : public BaseTest { - protected: - virtual void SetUp() { - BaseTest::SetUp(); // Sets up the base fixture first. - ... additional set-up work ... - } - virtual void TearDown() { - ... clean-up work for FooTest ... - BaseTest::TearDown(); // Remember to tear down the base fixture - // after cleaning up FooTest! - } - ... functions and variables for FooTest ... -}; - -// Tests that use the fixture FooTest. -TEST_F(FooTest, Bar) { ... } -TEST_F(FooTest, Baz) { ... } - -... additional fixtures derived from BaseTest ... -``` - -If necessary, you can continue to derive test fixtures from a derived fixture. -Google Test has no limit on how deep the hierarchy can be. - -For a complete example using derived test fixtures, see -[sample5](../samples/sample5_unittest.cc). - -## My compiler complains "void value not ignored as it ought to be." What does this mean? ## - -You're probably using an `ASSERT_*()` in a function that doesn't return `void`. -`ASSERT_*()` can only be used in `void` functions. - -## My death test hangs (or seg-faults). How do I fix it? ## - -In Google Test, death tests are run in a child process and the way they work is -delicate. To write death tests you really need to understand how they work. -Please make sure you have read this. - -In particular, death tests don't like having multiple threads in the parent -process. So the first thing you can try is to eliminate creating threads -outside of `EXPECT_DEATH()`. - -Sometimes this is impossible as some library you must use may be creating -threads before `main()` is even reached. In this case, you can try to minimize -the chance of conflicts by either moving as many activities as possible inside -`EXPECT_DEATH()` (in the extreme case, you want to move everything inside), or -leaving as few things as possible in it. Also, you can try to set the death -test style to `"threadsafe"`, which is safer but slower, and see if it helps. - -If you go with thread-safe death tests, remember that they rerun the test -program from the beginning in the child process. Therefore make sure your -program can run side-by-side with itself and is deterministic. - -In the end, this boils down to good concurrent programming. You have to make -sure that there is no race conditions or dead locks in your program. No silver -bullet - sorry! - -## Should I use the constructor/destructor of the test fixture or the set-up/tear-down function? ## - -The first thing to remember is that Google Test does not reuse the -same test fixture object across multiple tests. For each `TEST_F`, -Google Test will create a fresh test fixture object, _immediately_ -call `SetUp()`, run the test body, call `TearDown()`, and then -_immediately_ delete the test fixture object. - -When you need to write per-test set-up and tear-down logic, you have -the choice between using the test fixture constructor/destructor or -`SetUp()/TearDown()`. The former is usually preferred, as it has the -following benefits: - - * By initializing a member variable in the constructor, we have the option to make it `const`, which helps prevent accidental changes to its value and makes the tests more obviously correct. - * In case we need to subclass the test fixture class, the subclass' constructor is guaranteed to call the base class' constructor first, and the subclass' destructor is guaranteed to call the base class' destructor afterward. With `SetUp()/TearDown()`, a subclass may make the mistake of forgetting to call the base class' `SetUp()/TearDown()` or call them at the wrong moment. - -You may still want to use `SetUp()/TearDown()` in the following rare cases: - * If the tear-down operation could throw an exception, you must use `TearDown()` as opposed to the destructor, as throwing in a destructor leads to undefined behavior and usually will kill your program right away. Note that many standard libraries (like STL) may throw when exceptions are enabled in the compiler. Therefore you should prefer `TearDown()` if you want to write portable tests that work with or without exceptions. - * The assertion macros throw an exception when flag `--gtest_throw_on_failure` is specified. Therefore, you shouldn't use Google Test assertions in a destructor if you plan to run your tests with this flag. - * In a constructor or destructor, you cannot make a virtual function call on this object. (You can call a method declared as virtual, but it will be statically bound.) Therefore, if you need to call a method that will be overridden in a derived class, you have to use `SetUp()/TearDown()`. - -## The compiler complains "no matching function to call" when I use ASSERT\_PREDn. How do I fix it? ## - -If the predicate function you use in `ASSERT_PRED*` or `EXPECT_PRED*` is -overloaded or a template, the compiler will have trouble figuring out which -overloaded version it should use. `ASSERT_PRED_FORMAT*` and -`EXPECT_PRED_FORMAT*` don't have this problem. - -If you see this error, you might want to switch to -`(ASSERT|EXPECT)_PRED_FORMAT*`, which will also give you a better failure -message. If, however, that is not an option, you can resolve the problem by -explicitly telling the compiler which version to pick. - -For example, suppose you have - -``` cpp -bool IsPositive(int n) { - return n > 0; -} -bool IsPositive(double x) { - return x > 0; -} -``` - -you will get a compiler error if you write - -``` cpp -EXPECT_PRED1(IsPositive, 5); -``` - -However, this will work: - -``` cpp -EXPECT_PRED1(static_cast(IsPositive), 5); -``` - -(The stuff inside the angled brackets for the `static_cast` operator is the -type of the function pointer for the `int`-version of `IsPositive()`.) - -As another example, when you have a template function - -``` cpp -template -bool IsNegative(T x) { - return x < 0; -} -``` - -you can use it in a predicate assertion like this: - -``` cpp -ASSERT_PRED1(IsNegative, -5); -``` - -Things are more interesting if your template has more than one parameters. The -following won't compile: - -``` cpp -ASSERT_PRED2(GreaterThan, 5, 0); -``` - - -as the C++ pre-processor thinks you are giving `ASSERT_PRED2` 4 arguments, -which is one more than expected. The workaround is to wrap the predicate -function in parentheses: - -``` cpp -ASSERT_PRED2((GreaterThan), 5, 0); -``` - - -## My compiler complains about "ignoring return value" when I call RUN\_ALL\_TESTS(). Why? ## - -Some people had been ignoring the return value of `RUN_ALL_TESTS()`. That is, -instead of - -``` cpp -return RUN_ALL_TESTS(); -``` - -they write - -``` cpp -RUN_ALL_TESTS(); -``` - -This is wrong and dangerous. A test runner needs to see the return value of -`RUN_ALL_TESTS()` in order to determine if a test has passed. If your `main()` -function ignores it, your test will be considered successful even if it has a -Google Test assertion failure. Very bad. - -To help the users avoid this dangerous bug, the implementation of -`RUN_ALL_TESTS()` causes gcc to raise this warning, when the return value is -ignored. If you see this warning, the fix is simple: just make sure its value -is used as the return value of `main()`. - -## My compiler complains that a constructor (or destructor) cannot return a value. What's going on? ## - -Due to a peculiarity of C++, in order to support the syntax for streaming -messages to an `ASSERT_*`, e.g. - -``` cpp -ASSERT_EQ(1, Foo()) << "blah blah" << foo; -``` - -we had to give up using `ASSERT*` and `FAIL*` (but not `EXPECT*` and -`ADD_FAILURE*`) in constructors and destructors. The workaround is to move the -content of your constructor/destructor to a private void member function, or -switch to `EXPECT_*()` if that works. This section in the user's guide explains -it. - -## My set-up function is not called. Why? ## - -C++ is case-sensitive. It should be spelled as `SetUp()`. Did you -spell it as `Setup()`? - -Similarly, sometimes people spell `SetUpTestCase()` as `SetupTestCase()` and -wonder why it's never called. - -## How do I jump to the line of a failure in Emacs directly? ## - -Google Test's failure message format is understood by Emacs and many other -IDEs, like acme and XCode. If a Google Test message is in a compilation buffer -in Emacs, then it's clickable. You can now hit `enter` on a message to jump to -the corresponding source code, or use `C-x `` to jump to the next failure. - -## I have several test cases which share the same test fixture logic, do I have to define a new test fixture class for each of them? This seems pretty tedious. ## - -You don't have to. Instead of - -``` cpp -class FooTest : public BaseTest {}; - -TEST_F(FooTest, Abc) { ... } -TEST_F(FooTest, Def) { ... } - -class BarTest : public BaseTest {}; - -TEST_F(BarTest, Abc) { ... } -TEST_F(BarTest, Def) { ... } -``` - -you can simply `typedef` the test fixtures: -``` cpp -typedef BaseTest FooTest; - -TEST_F(FooTest, Abc) { ... } -TEST_F(FooTest, Def) { ... } - -typedef BaseTest BarTest; - -TEST_F(BarTest, Abc) { ... } -TEST_F(BarTest, Def) { ... } -``` - -## The Google Test output is buried in a whole bunch of log messages. What do I do? ## - -The Google Test output is meant to be a concise and human-friendly report. If -your test generates textual output itself, it will mix with the Google Test -output, making it hard to read. However, there is an easy solution to this -problem. - -Since most log messages go to stderr, we decided to let Google Test output go -to stdout. This way, you can easily separate the two using redirection. For -example: -``` -./my_test > googletest_output.txt -``` - -## Why should I prefer test fixtures over global variables? ## - -There are several good reasons: - 1. It's likely your test needs to change the states of its global variables. This makes it difficult to keep side effects from escaping one test and contaminating others, making debugging difficult. By using fixtures, each test has a fresh set of variables that's different (but with the same names). Thus, tests are kept independent of each other. - 1. Global variables pollute the global namespace. - 1. Test fixtures can be reused via subclassing, which cannot be done easily with global variables. This is useful if many test cases have something in common. - -## How do I test private class members without writing FRIEND\_TEST()s? ## - -You should try to write testable code, which means classes should be easily -tested from their public interface. One way to achieve this is the Pimpl idiom: -you move all private members of a class into a helper class, and make all -members of the helper class public. - -You have several other options that don't require using `FRIEND_TEST`: - * Write the tests as members of the fixture class: -``` cpp -class Foo { - friend class FooTest; - ... -}; - -class FooTest : public ::testing::Test { - protected: - ... - void Test1() {...} // This accesses private members of class Foo. - void Test2() {...} // So does this one. -}; - -TEST_F(FooTest, Test1) { - Test1(); -} - -TEST_F(FooTest, Test2) { - Test2(); -} -``` - * In the fixture class, write accessors for the tested class' private members, then use the accessors in your tests: -``` cpp -class Foo { - friend class FooTest; - ... -}; - -class FooTest : public ::testing::Test { - protected: - ... - T1 get_private_member1(Foo* obj) { - return obj->private_member1_; - } -}; - -TEST_F(FooTest, Test1) { - ... - get_private_member1(x) - ... -} -``` - * If the methods are declared **protected**, you can change their access level in a test-only subclass: -``` cpp -class YourClass { - ... - protected: // protected access for testability. - int DoSomethingReturningInt(); - ... -}; - -// in the your_class_test.cc file: -class TestableYourClass : public YourClass { - ... - public: using YourClass::DoSomethingReturningInt; // changes access rights - ... -}; - -TEST_F(YourClassTest, DoSomethingTest) { - TestableYourClass obj; - assertEquals(expected_value, obj.DoSomethingReturningInt()); -} -``` - -## How do I test private class static members without writing FRIEND\_TEST()s? ## - -We find private static methods clutter the header file. They are -implementation details and ideally should be kept out of a .h. So often I make -them free functions instead. - -Instead of: -``` cpp -// foo.h -class Foo { - ... - private: - static bool Func(int n); -}; - -// foo.cc -bool Foo::Func(int n) { ... } - -// foo_test.cc -EXPECT_TRUE(Foo::Func(12345)); -``` - -You probably should better write: -``` cpp -// foo.h -class Foo { - ... -}; - -// foo.cc -namespace internal { - bool Func(int n) { ... } -} - -// foo_test.cc -namespace internal { - bool Func(int n); -} - -EXPECT_TRUE(internal::Func(12345)); -``` - -## I would like to run a test several times with different parameters. Do I need to write several similar copies of it? ## - -No. You can use a feature called [value-parameterized tests](AdvancedGuide.md#Value_Parameterized_Tests) which -lets you repeat your tests with different parameters, without defining it more than once. - -## How do I test a file that defines main()? ## - -To test a `foo.cc` file, you need to compile and link it into your unit test -program. However, when the file contains a definition for the `main()` -function, it will clash with the `main()` of your unit test, and will result in -a build error. - -The right solution is to split it into three files: - 1. `foo.h` which contains the declarations, - 1. `foo.cc` which contains the definitions except `main()`, and - 1. `foo_main.cc` which contains nothing but the definition of `main()`. - -Then `foo.cc` can be easily tested. - -If you are adding tests to an existing file and don't want an intrusive change -like this, there is a hack: just include the entire `foo.cc` file in your unit -test. For example: -``` cpp -// File foo_unittest.cc - -// The headers section -... - -// Renames main() in foo.cc to make room for the unit test main() -#define main FooMain - -#include "a/b/foo.cc" - -// The tests start here. -... -``` - - -However, please remember this is a hack and should only be used as the last -resort. - -## What can the statement argument in ASSERT\_DEATH() be? ## - -`ASSERT_DEATH(_statement_, _regex_)` (or any death assertion macro) can be used -wherever `_statement_` is valid. So basically `_statement_` can be any C++ -statement that makes sense in the current context. In particular, it can -reference global and/or local variables, and can be: - * a simple function call (often the case), - * a complex expression, or - * a compound statement. - -Some examples are shown here: - -``` cpp -// A death test can be a simple function call. -TEST(MyDeathTest, FunctionCall) { - ASSERT_DEATH(Xyz(5), "Xyz failed"); -} - -// Or a complex expression that references variables and functions. -TEST(MyDeathTest, ComplexExpression) { - const bool c = Condition(); - ASSERT_DEATH((c ? Func1(0) : object2.Method("test")), - "(Func1|Method) failed"); -} - -// Death assertions can be used any where in a function. In -// particular, they can be inside a loop. -TEST(MyDeathTest, InsideLoop) { - // Verifies that Foo(0), Foo(1), ..., and Foo(4) all die. - for (int i = 0; i < 5; i++) { - EXPECT_DEATH_M(Foo(i), "Foo has \\d+ errors", - ::testing::Message() << "where i is " << i); - } -} - -// A death assertion can contain a compound statement. -TEST(MyDeathTest, CompoundStatement) { - // Verifies that at lease one of Bar(0), Bar(1), ..., and - // Bar(4) dies. - ASSERT_DEATH({ - for (int i = 0; i < 5; i++) { - Bar(i); - } - }, - "Bar has \\d+ errors");} -``` - -`googletest_unittest.cc` contains more examples if you are interested. - -## What syntax does the regular expression in ASSERT\_DEATH use? ## - -On POSIX systems, Google Test uses the POSIX Extended regular -expression syntax -(http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions). -On Windows, it uses a limited variant of regular expression -syntax. For more details, see the -[regular expression syntax](AdvancedGuide.md#Regular_Expression_Syntax). - -## I have a fixture class Foo, but TEST\_F(Foo, Bar) gives me error "no matching function for call to Foo::Foo()". Why? ## - -Google Test needs to be able to create objects of your test fixture class, so -it must have a default constructor. Normally the compiler will define one for -you. However, there are cases where you have to define your own: - * If you explicitly declare a non-default constructor for class `Foo`, then you need to define a default constructor, even if it would be empty. - * If `Foo` has a const non-static data member, then you have to define the default constructor _and_ initialize the const member in the initializer list of the constructor. (Early versions of `gcc` doesn't force you to initialize the const member. It's a bug that has been fixed in `gcc 4`.) - -## Why does ASSERT\_DEATH complain about previous threads that were already joined? ## - -With the Linux pthread library, there is no turning back once you cross the -line from single thread to multiple threads. The first time you create a -thread, a manager thread is created in addition, so you get 3, not 2, threads. -Later when the thread you create joins the main thread, the thread count -decrements by 1, but the manager thread will never be killed, so you still have -2 threads, which means you cannot safely run a death test. - -The new NPTL thread library doesn't suffer from this problem, as it doesn't -create a manager thread. However, if you don't control which machine your test -runs on, you shouldn't depend on this. - -## Why does Google Test require the entire test case, instead of individual tests, to be named FOODeathTest when it uses ASSERT\_DEATH? ## - -Google Test does not interleave tests from different test cases. That is, it -runs all tests in one test case first, and then runs all tests in the next test -case, and so on. Google Test does this because it needs to set up a test case -before the first test in it is run, and tear it down afterwords. Splitting up -the test case would require multiple set-up and tear-down processes, which is -inefficient and makes the semantics unclean. - -If we were to determine the order of tests based on test name instead of test -case name, then we would have a problem with the following situation: - -``` cpp -TEST_F(FooTest, AbcDeathTest) { ... } -TEST_F(FooTest, Uvw) { ... } - -TEST_F(BarTest, DefDeathTest) { ... } -TEST_F(BarTest, Xyz) { ... } -``` - -Since `FooTest.AbcDeathTest` needs to run before `BarTest.Xyz`, and we don't -interleave tests from different test cases, we need to run all tests in the -`FooTest` case before running any test in the `BarTest` case. This contradicts -with the requirement to run `BarTest.DefDeathTest` before `FooTest.Uvw`. - -## But I don't like calling my entire test case FOODeathTest when it contains both death tests and non-death tests. What do I do? ## - -You don't have to, but if you like, you may split up the test case into -`FooTest` and `FooDeathTest`, where the names make it clear that they are -related: - -``` cpp -class FooTest : public ::testing::Test { ... }; - -TEST_F(FooTest, Abc) { ... } -TEST_F(FooTest, Def) { ... } - -typedef FooTest FooDeathTest; - -TEST_F(FooDeathTest, Uvw) { ... EXPECT_DEATH(...) ... } -TEST_F(FooDeathTest, Xyz) { ... ASSERT_DEATH(...) ... } -``` - -## The compiler complains about "no match for 'operator<<'" when I use an assertion. What gives? ## - -If you use a user-defined type `FooType` in an assertion, you must make sure -there is an `std::ostream& operator<<(std::ostream&, const FooType&)` function -defined such that we can print a value of `FooType`. - -In addition, if `FooType` is declared in a name space, the `<<` operator also -needs to be defined in the _same_ name space. - -## How do I suppress the memory leak messages on Windows? ## - -Since the statically initialized Google Test singleton requires allocations on -the heap, the Visual C++ memory leak detector will report memory leaks at the -end of the program run. The easiest way to avoid this is to use the -`_CrtMemCheckpoint` and `_CrtMemDumpAllObjectsSince` calls to not report any -statically initialized heap objects. See MSDN for more details and additional -heap check/debug routines. - -## I am building my project with Google Test in Visual Studio and all I'm getting is a bunch of linker errors (or warnings). Help! ## - -You may get a number of the following linker error or warnings if you -attempt to link your test project with the Google Test library when -your project and the are not built using the same compiler settings. - - * LNK2005: symbol already defined in object - * LNK4217: locally defined symbol 'symbol' imported in function 'function' - * LNK4049: locally defined symbol 'symbol' imported - -The Google Test project (gtest.vcproj) has the Runtime Library option -set to /MT (use multi-threaded static libraries, /MTd for debug). If -your project uses something else, for example /MD (use multi-threaded -DLLs, /MDd for debug), you need to change the setting in the Google -Test project to match your project's. - -To update this setting open the project properties in the Visual -Studio IDE then select the branch Configuration Properties | C/C++ | -Code Generation and change the option "Runtime Library". You may also try -using gtest-md.vcproj instead of gtest.vcproj. - -## I put my tests in a library and Google Test doesn't run them. What's happening? ## -Have you read a -[warning](Primer.md#important-note-for-visual-c-users) on -the Google Test Primer page? - -## I want to use Google Test with Visual Studio but don't know where to start. ## -Many people are in your position and one of them posted his solution to our mailing list. - -## I am seeing compile errors mentioning std::type\_traits when I try to use Google Test on Solaris. ## -Google Test uses parts of the standard C++ library that SunStudio does not support. -Our users reported success using alternative implementations. Try running the build after running this command: - -`export CC=cc CXX=CC CXXFLAGS='-library=stlport4'` - -## How can my code detect if it is running in a test? ## - -If you write code that sniffs whether it's running in a test and does -different things accordingly, you are leaking test-only logic into -production code and there is no easy way to ensure that the test-only -code paths aren't run by mistake in production. Such cleverness also -leads to -[Heisenbugs](http://en.wikipedia.org/wiki/Unusual_software_bug#Heisenbug). -Therefore we strongly advise against the practice, and Google Test doesn't -provide a way to do it. - -In general, the recommended way to cause the code to behave -differently under test is [dependency injection](http://jamesshore.com/Blog/Dependency-Injection-Demystified.html). -You can inject different functionality from the test and from the -production code. Since your production code doesn't link in the -for-test logic at all, there is no danger in accidentally running it. - -However, if you _really_, _really_, _really_ have no choice, and if -you follow the rule of ending your test program names with `_test`, -you can use the _horrible_ hack of sniffing your executable name -(`argv[0]` in `main()`) to know whether the code is under test. - -## Google Test defines a macro that clashes with one defined by another library. How do I deal with that? ## - -In C++, macros don't obey namespaces. Therefore two libraries that -both define a macro of the same name will clash if you `#include` both -definitions. In case a Google Test macro clashes with another -library, you can force Google Test to rename its macro to avoid the -conflict. - -Specifically, if both Google Test and some other code define macro -`FOO`, you can add -``` - -DGTEST_DONT_DEFINE_FOO=1 -``` -to the compiler flags to tell Google Test to change the macro's name -from `FOO` to `GTEST_FOO`. For example, with `-DGTEST_DONT_DEFINE_TEST=1`, you'll need to write -``` cpp - GTEST_TEST(SomeTest, DoesThis) { ... } -``` -instead of -``` cpp - TEST(SomeTest, DoesThis) { ... } -``` -in order to define a test. - -Currently, the following `TEST`, `FAIL`, `SUCCEED`, and the basic comparison assertion macros can have . You can see the full list of covered macros [here](../include/gtest/gtest.h). More information can be found in the "Avoiding Macro Name Clashes" section of the README file. - - -## Is it OK if I have two separate `TEST(Foo, Bar)` test methods defined in different namespaces? ## - -Yes. - -The rule is **all test methods in the same test case must use the same fixture class**. This means that the following is **allowed** because both tests use the same fixture class (`::testing::Test`). - -``` cpp -namespace foo { -TEST(CoolTest, DoSomething) { - SUCCEED(); -} -} // namespace foo - -namespace bar { -TEST(CoolTest, DoSomething) { - SUCCEED(); -} -} // namespace bar -``` - -However, the following code is **not allowed** and will produce a runtime error from Google Test because the test methods are using different test fixture classes with the same test case name. - -``` cpp -namespace foo { -class CoolTest : public ::testing::Test {}; // Fixture foo::CoolTest -TEST_F(CoolTest, DoSomething) { - SUCCEED(); -} -} // namespace foo - -namespace bar { -class CoolTest : public ::testing::Test {}; // Fixture: bar::CoolTest -TEST_F(CoolTest, DoSomething) { - SUCCEED(); -} -} // namespace bar -``` - -## How do I build Google Testing Framework with Xcode 4? ## - -If you try to build Google Test's Xcode project with Xcode 4.0 or later, you may encounter an error message that looks like -"Missing SDK in target gtest\_framework: /Developer/SDKs/MacOSX10.4u.sdk". That means that Xcode does not support the SDK the project is targeting. See the Xcode section in the [README](../README.md) file on how to resolve this. - -## How do I easily discover the flags needed for GoogleTest? ## - -GoogleTest (and GoogleMock) now support discovering all necessary flags using pkg-config. -See the [pkg-config guide](Pkgconfig.md) on how you can easily discover all compiler and -linker flags using pkg-config. - -## My question is not covered in your FAQ! ## - -If you cannot find the answer to your question in this FAQ, there are -some other resources you can use: - - 1. read other [wiki pages](../docs), - 1. search the mailing list [archive](https://groups.google.com/forum/#!forum/googletestframework), - 1. ask it on [googletestframework@googlegroups.com](mailto:googletestframework@googlegroups.com) and someone will answer it (to prevent spam, we require you to join the [discussion group](http://groups.google.com/group/googletestframework) before you can post.). - -Please note that creating an issue in the -[issue tracker](https://github.com/google/googletest/issues) is _not_ -a good way to get your answer, as it is monitored infrequently by a -very small number of people. - -When asking a question, it's helpful to provide as much of the -following information as possible (people cannot help you if there's -not enough information in your question): - - * the version (or the commit hash if you check out from Git directly) of Google Test you use (Google Test is under active development, so it's possible that your problem has been solved in a later version), - * your operating system, - * the name and version of your compiler, - * the complete command line flags you give to your compiler, - * the complete compiler error messages (if the question is about compilation), - * the _actual_ code (ideally, a minimal but complete program) that has the problem you encounter. diff --git a/test/gtest-1.8.0/docs/Pkgconfig.md b/test/gtest-1.8.0/docs/Pkgconfig.md deleted file mode 100644 index 97612894d2..0000000000 --- a/test/gtest-1.8.0/docs/Pkgconfig.md +++ /dev/null @@ -1,146 +0,0 @@ -## Using GoogleTest from various build systems ## - -GoogleTest comes with pkg-config files that can be used to determine all -necessary flags for compiling and linking to GoogleTest (and GoogleMock). -Pkg-config is a standardised plain-text format containing - - * the includedir (-I) path - * necessary macro (-D) definitions - * further required flags (-pthread) - * the library (-L) path - * the library (-l) to link to - -All current build systems support pkg-config in one way or another. For -all examples here we assume you want to compile the sample -`samples/sample3_unittest.cc`. - - -### CMake ### - -Using `pkg-config` in CMake is fairly easy: - -``` -cmake_minimum_required(VERSION 3.0) - -cmake_policy(SET CMP0048 NEW) -project(my_gtest_pkgconfig VERSION 0.0.1 LANGUAGES CXX) - -find_package(PkgConfig) -pkg_search_module(GTEST REQUIRED gtest_main) - -add_executable(testapp samples/sample3_unittest.cc) -target_link_libraries(testapp ${GTEST_LDFLAGS}) -target_compile_options(testapp PUBLIC ${GTEST_CFLAGS}) - -include(CTest) -add_test(first_and_only_test testapp) -``` - -It is generally recommended that you use `target_compile_options` + `_CFLAGS` -over `target_include_directories` + `_INCLUDE_DIRS` as the former includes not -just -I flags (GoogleTest might require a macro indicating to internal headers -that all libraries have been compiled with threading enabled. In addition, -GoogleTest might also require `-pthread` in the compiling step, and as such -splitting the pkg-config `Cflags` variable into include dirs and macros for -`target_compile_definitions()` might still miss this). The same recommendation -goes for using `_LDFLAGS` over the more commonplace `_LIBRARIES`, which -happens to discard `-L` flags and `-pthread`. - - -### Autotools ### - -Finding GoogleTest in Autoconf and using it from Automake is also fairly easy: - -In your `configure.ac`: - -``` -AC_PREREQ([2.69]) -AC_INIT([my_gtest_pkgconfig], [0.0.1]) -AC_CONFIG_SRCDIR([samples/sample3_unittest.cc]) -AC_PROG_CXX - -PKG_CHECK_MODULES([GTEST], [gtest_main]) - -AM_INIT_AUTOMAKE([foreign subdir-objects]) -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT -``` - -and in your `Makefile.am`: - -``` -check_PROGRAMS = testapp -TESTS = $(check_PROGRAMS) - -testapp_SOURCES = samples/sample3_unittest.cc -testapp_CXXFLAGS = $(GTEST_CFLAGS) -testapp_LDADD = $(GTEST_LIBS) -``` - - -### Meson ### - -Meson natively uses pkgconfig to query dependencies: - -``` -project('my_gtest_pkgconfig', 'cpp', version : '0.0.1') - -gtest_dep = dependency('gtest_main') - -testapp = executable( - 'testapp', - files(['samples/sample3_unittest.cc']), - dependencies : gtest_dep, - install : false) - -test('first_and_only_test', testapp) -``` - - -### Plain Makefiles ### - -Since `pkg-config` is a small Unix command-line utility, it can be used -in handwritten `Makefile`s too: - -``` -GTEST_CFLAGS = `pkg-config --cflags gtest_main` -GTEST_LIBS = `pkg-config --libs gtest_main` - -.PHONY: tests all - -tests: all - ./testapp - -all: testapp - -testapp: testapp.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) $< -o $@ $(GTEST_LIBS) - -testapp.o: samples/sample3_unittest.cc - $(CXX) $(CPPFLAGS) $(CXXFLAGS) $< -c -o $@ $(GTEST_CFLAGS) -``` - - -### Help! pkg-config can't find GoogleTest! ### - -Let's say you have a `CMakeLists.txt` along the lines of the one in this -tutorial and you try to run `cmake`. It is very possible that you get a -failure along the lines of: - -``` --- Checking for one of the modules 'gtest_main' -CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:640 (message): - None of the required 'gtest_main' found -``` - -These failures are common if you installed GoogleTest yourself and have not -sourced it from a distro or other package manager. If so, you need to tell -pkg-config where it can find the `.pc` files containing the information. -Say you installed GoogleTest to `/usr/local`, then it might be that the -`.pc` files are installed under `/usr/local/lib64/pkgconfig`. If you set - -``` -export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig -``` - -pkg-config will also try to look in `PKG_CONFIG_PATH` to find `gtest_main.pc`. diff --git a/test/gtest-1.8.0/docs/Primer.md b/test/gtest-1.8.0/docs/Primer.md deleted file mode 100644 index 5e8ee0c697..0000000000 --- a/test/gtest-1.8.0/docs/Primer.md +++ /dev/null @@ -1,536 +0,0 @@ - - -# Introduction: Why Google C++ Testing Framework? # - -_Google C++ Testing Framework_ helps you write better C++ tests. - -No matter whether you work on Linux, Windows, or a Mac, if you write C++ code, -Google Test can help you. - -So what makes a good test, and how does Google C++ Testing Framework fit in? We believe: - 1. Tests should be _independent_ and _repeatable_. It's a pain to debug a test that succeeds or fails as a result of other tests. Google C++ Testing Framework isolates the tests by running each of them on a different object. When a test fails, Google C++ Testing Framework allows you to run it in isolation for quick debugging. - 1. Tests should be well _organized_ and reflect the structure of the tested code. Google C++ Testing Framework groups related tests into test cases that can share data and subroutines. This common pattern is easy to recognize and makes tests easy to maintain. Such consistency is especially helpful when people switch projects and start to work on a new code base. - 1. Tests should be _portable_ and _reusable_. The open-source community has a lot of code that is platform-neutral, its tests should also be platform-neutral. Google C++ Testing Framework works on different OSes, with different compilers (gcc, MSVC, and others), with or without exceptions, so Google C++ Testing Framework tests can easily work with a variety of configurations. (Note that the current release only contains build scripts for Linux - we are actively working on scripts for other platforms.) - 1. When tests fail, they should provide as much _information_ about the problem as possible. Google C++ Testing Framework doesn't stop at the first test failure. Instead, it only stops the current test and continues with the next. You can also set up tests that report non-fatal failures after which the current test continues. Thus, you can detect and fix multiple bugs in a single run-edit-compile cycle. - 1. The testing framework should liberate test writers from housekeeping chores and let them focus on the test _content_. Google C++ Testing Framework automatically keeps track of all tests defined, and doesn't require the user to enumerate them in order to run them. - 1. Tests should be _fast_. With Google C++ Testing Framework, you can reuse shared resources across tests and pay for the set-up/tear-down only once, without making tests depend on each other. - -Since Google C++ Testing Framework is based on the popular xUnit -architecture, you'll feel right at home if you've used JUnit or PyUnit before. -If not, it will take you about 10 minutes to learn the basics and get started. -So let's go! - -_Note:_ We sometimes refer to Google C++ Testing Framework informally -as _Google Test_. - -# Beware of the nomenclature # - -_Note:_ There might be some confusion of idea due to different -definitions of the terms _Test_, _Test Case_ and _Test Suite_, so beware -of misunderstanding these. - -Historically, the Google C++ Testing Framework started to use the term -_Test Case_ for grouping related tests, whereas current publications -including the International Software Testing Qualifications Board -([ISTQB](http://www.istqb.org/)) and various textbooks on Software -Quality use the term _[Test -Suite](http://glossary.istqb.org/search/test%20suite)_ for this. - -The related term _Test_, as it is used in the Google C++ Testing -Framework, is corresponding to the term _[Test -Case](http://glossary.istqb.org/search/test%20case)_ of ISTQB and -others. - -The term _Test_ is commonly of broad enough sense, including ISTQB's -definition of _Test Case_, so it's not much of a problem here. But the -term _Test Case_ as used in Google Test is of contradictory sense and thus confusing. - -Unfortunately replacing the term _Test Case_ by _Test Suite_ throughout -the Google C++ Testing Framework is not easy without breaking dependent -projects, as `TestCase` is part of the public API at various places. - -So for the time being, please be aware of the different definitions of -the terms: - -Meaning | Google Test Term | [ISTQB](http://www.istqb.org/) Term -------- | ---------------- | ----------------------------------- -Exercise a particular program path with specific input values and verify the results | [TEST()](#simple-tests) | [Test Case](http://glossary.istqb.org/search/test%20case) -A set of several tests related to one component | [Test Case](#basic-concepts) | [Test Suite](http://glossary.istqb.org/search/test%20suite) - -# Setting up a New Test Project # - -To write a test program using Google Test, you need to compile Google -Test into a library and link your test with it. We provide build -files for some popular build systems: `msvc/` for Visual Studio, -`xcode/` for Mac Xcode, `make/` for GNU make, `codegear/` for Borland -C++ Builder, and the autotools script (deprecated) and -`CMakeLists.txt` for CMake (recommended) in the Google Test root -directory. If your build system is not on this list, you can take a -look at `make/Makefile` to learn how Google Test should be compiled -(basically you want to compile `src/gtest-all.cc` with `GTEST_ROOT` -and `GTEST_ROOT/include` in the header search path, where `GTEST_ROOT` -is the Google Test root directory). - -Once you are able to compile the Google Test library, you should -create a project or build target for your test program. Make sure you -have `GTEST_ROOT/include` in the header search path so that the -compiler can find `"gtest/gtest.h"` when compiling your test. Set up -your test project to link with the Google Test library (for example, -in Visual Studio, this is done by adding a dependency on -`gtest.vcproj`). - -If you still have questions, take a look at how Google Test's own -tests are built and use them as examples. - -# Basic Concepts # - -When using Google Test, you start by writing _assertions_, which are statements -that check whether a condition is true. An assertion's result can be _success_, -_nonfatal failure_, or _fatal failure_. If a fatal failure occurs, it aborts -the current function; otherwise the program continues normally. - -_Tests_ use assertions to verify the tested code's behavior. If a test crashes -or has a failed assertion, then it _fails_; otherwise it _succeeds_. - -A _test case_ contains one or many tests. You should group your tests into test -cases that reflect the structure of the tested code. When multiple tests in a -test case need to share common objects and subroutines, you can put them into a -_test fixture_ class. - -A _test program_ can contain multiple test cases. - -We'll now explain how to write a test program, starting at the individual -assertion level and building up to tests and test cases. - -# Assertions # - -Google Test assertions are macros that resemble function calls. You test a -class or function by making assertions about its behavior. When an assertion -fails, Google Test prints the assertion's source file and line number location, -along with a failure message. You may also supply a custom failure message -which will be appended to Google Test's message. - -The assertions come in pairs that test the same thing but have different -effects on the current function. `ASSERT_*` versions generate fatal failures -when they fail, and **abort the current function**. `EXPECT_*` versions generate -nonfatal failures, which don't abort the current function. Usually `EXPECT_*` -are preferred, as they allow more than one failures to be reported in a test. -However, you should use `ASSERT_*` if it doesn't make sense to continue when -the assertion in question fails. - -Since a failed `ASSERT_*` returns from the current function immediately, -possibly skipping clean-up code that comes after it, it may cause a space leak. -Depending on the nature of the leak, it may or may not be worth fixing - so -keep this in mind if you get a heap checker error in addition to assertion -errors. - -To provide a custom failure message, simply stream it into the macro using the -`<<` operator, or a sequence of such operators. An example: -``` -ASSERT_EQ(x.size(), y.size()) << "Vectors x and y are of unequal length"; - -for (int i = 0; i < x.size(); ++i) { - EXPECT_EQ(x[i], y[i]) << "Vectors x and y differ at index " << i; -} -``` - -Anything that can be streamed to an `ostream` can be streamed to an assertion -macro--in particular, C strings and `string` objects. If a wide string -(`wchar_t*`, `TCHAR*` in `UNICODE` mode on Windows, or `std::wstring`) is -streamed to an assertion, it will be translated to UTF-8 when printed. - -## Basic Assertions ## - -These assertions do basic true/false condition testing. - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_TRUE(`_condition_`)`; | `EXPECT_TRUE(`_condition_`)`; | _condition_ is true | -| `ASSERT_FALSE(`_condition_`)`; | `EXPECT_FALSE(`_condition_`)`; | _condition_ is false | - -Remember, when they fail, `ASSERT_*` yields a fatal failure and -returns from the current function, while `EXPECT_*` yields a nonfatal -failure, allowing the function to continue running. In either case, an -assertion failure means its containing test fails. - -_Availability_: Linux, Windows, Mac. - -## Binary Comparison ## - -This section describes assertions that compare two values. - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -|`ASSERT_EQ(`_val1_`, `_val2_`);`|`EXPECT_EQ(`_val1_`, `_val2_`);`| _val1_ `==` _val2_ | -|`ASSERT_NE(`_val1_`, `_val2_`);`|`EXPECT_NE(`_val1_`, `_val2_`);`| _val1_ `!=` _val2_ | -|`ASSERT_LT(`_val1_`, `_val2_`);`|`EXPECT_LT(`_val1_`, `_val2_`);`| _val1_ `<` _val2_ | -|`ASSERT_LE(`_val1_`, `_val2_`);`|`EXPECT_LE(`_val1_`, `_val2_`);`| _val1_ `<=` _val2_ | -|`ASSERT_GT(`_val1_`, `_val2_`);`|`EXPECT_GT(`_val1_`, `_val2_`);`| _val1_ `>` _val2_ | -|`ASSERT_GE(`_val1_`, `_val2_`);`|`EXPECT_GE(`_val1_`, `_val2_`);`| _val1_ `>=` _val2_ | - -In the event of a failure, Google Test prints both _val1_ and _val2_. - -Value arguments must be comparable by the assertion's comparison -operator or you'll get a compiler error. We used to require the -arguments to support the `<<` operator for streaming to an `ostream`, -but it's no longer necessary since v1.6.0 (if `<<` is supported, it -will be called to print the arguments when the assertion fails; -otherwise Google Test will attempt to print them in the best way it -can. For more details and how to customize the printing of the -arguments, see this Google Mock [recipe](../../googlemock/docs/CookBook.md#teaching-google-mock-how-to-print-your-values).). - -These assertions can work with a user-defined type, but only if you define the -corresponding comparison operator (e.g. `==`, `<`, etc). If the corresponding -operator is defined, prefer using the `ASSERT_*()` macros because they will -print out not only the result of the comparison, but the two operands as well. - -Arguments are always evaluated exactly once. Therefore, it's OK for the -arguments to have side effects. However, as with any ordinary C/C++ function, -the arguments' evaluation order is undefined (i.e. the compiler is free to -choose any order) and your code should not depend on any particular argument -evaluation order. - -`ASSERT_EQ()` does pointer equality on pointers. If used on two C strings, it -tests if they are in the same memory location, not if they have the same value. -Therefore, if you want to compare C strings (e.g. `const char*`) by value, use -`ASSERT_STREQ()` , which will be described later on. In particular, to assert -that a C string is `NULL`, use `ASSERT_STREQ(NULL, c_string)` . However, to -compare two `string` objects, you should use `ASSERT_EQ`. - -Macros in this section work with both narrow and wide string objects (`string` -and `wstring`). - -_Availability_: Linux, Windows, Mac. - -_Historical note_: Before February 2016 `*_EQ` had a convention of calling it as -`ASSERT_EQ(expected, actual)`, so lots of existing code uses this order. -Now `*_EQ` treats both parameters in the same way. - -## String Comparison ## - -The assertions in this group compare two **C strings**. If you want to compare -two `string` objects, use `EXPECT_EQ`, `EXPECT_NE`, and etc instead. - -| **Fatal assertion** | **Nonfatal assertion** | **Verifies** | -|:--------------------|:-----------------------|:-------------| -| `ASSERT_STREQ(`_str1_`, `_str2_`);` | `EXPECT_STREQ(`_str1_`, `_str2_`);` | the two C strings have the same content | -| `ASSERT_STRNE(`_str1_`, `_str2_`);` | `EXPECT_STRNE(`_str1_`, `_str2_`);` | the two C strings have different content | -| `ASSERT_STRCASEEQ(`_str1_`, `_str2_`);`| `EXPECT_STRCASEEQ(`_str1_`, `_str2_`);` | the two C strings have the same content, ignoring case | -| `ASSERT_STRCASENE(`_str1_`, `_str2_`);`| `EXPECT_STRCASENE(`_str1_`, `_str2_`);` | the two C strings have different content, ignoring case | - -Note that "CASE" in an assertion name means that case is ignored. - -`*STREQ*` and `*STRNE*` also accept wide C strings (`wchar_t*`). If a -comparison of two wide strings fails, their values will be printed as UTF-8 -narrow strings. - -A `NULL` pointer and an empty string are considered _different_. - -_Availability_: Linux, Windows, Mac. - -See also: For more string comparison tricks (substring, prefix, suffix, and -regular expression matching, for example), see the [Advanced Google Test Guide](AdvancedGuide.md). - -# Simple Tests # - -To create a test: - 1. Use the `TEST()` macro to define and name a test function, These are ordinary C++ functions that don't return a value. - 1. In this function, along with any valid C++ statements you want to include, use the various Google Test assertions to check values. - 1. The test's result is determined by the assertions; if any assertion in the test fails (either fatally or non-fatally), or if the test crashes, the entire test fails. Otherwise, it succeeds. - -``` -TEST(testCaseName, testName) { - ... test body ... -} -``` - - -`TEST()` arguments go from general to specific. The _first_ argument is the -name of the test case, and the _second_ argument is the test's name within the -test case. Both names must be valid C++ identifiers, and they should not contain underscore (`_`). A test's _full name_ consists of its containing test case and its -individual name. Tests from different test cases can have the same individual -name. - -For example, let's take a simple integer function: -``` -int Factorial(int n); // Returns the factorial of n -``` - -A test case for this function might look like: -``` -// Tests factorial of 0. -TEST(FactorialTest, HandlesZeroInput) { - EXPECT_EQ(1, Factorial(0)); -} - -// Tests factorial of positive numbers. -TEST(FactorialTest, HandlesPositiveInput) { - EXPECT_EQ(1, Factorial(1)); - EXPECT_EQ(2, Factorial(2)); - EXPECT_EQ(6, Factorial(3)); - EXPECT_EQ(40320, Factorial(8)); -} -``` - -Google Test groups the test results by test cases, so logically-related tests -should be in the same test case; in other words, the first argument to their -`TEST()` should be the same. In the above example, we have two tests, -`HandlesZeroInput` and `HandlesPositiveInput`, that belong to the same test -case `FactorialTest`. - -_Availability_: Linux, Windows, Mac. - -# Test Fixtures: Using the Same Data Configuration for Multiple Tests # - -If you find yourself writing two or more tests that operate on similar data, -you can use a _test fixture_. It allows you to reuse the same configuration of -objects for several different tests. - -To create a fixture, just: - 1. Derive a class from `::testing::Test` . Start its body with `protected:` or `public:` as we'll want to access fixture members from sub-classes. - 1. Inside the class, declare any objects you plan to use. - 1. If necessary, write a default constructor or `SetUp()` function to prepare the objects for each test. A common mistake is to spell `SetUp()` as `Setup()` with a small `u` - don't let that happen to you. - 1. If necessary, write a destructor or `TearDown()` function to release any resources you allocated in `SetUp()` . To learn when you should use the constructor/destructor and when you should use `SetUp()/TearDown()`, read this [FAQ entry](FAQ.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-the-set-uptear-down-function). - 1. If needed, define subroutines for your tests to share. - -When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to -access objects and subroutines in the test fixture: -``` -TEST_F(test_case_name, test_name) { - ... test body ... -} -``` - -Like `TEST()`, the first argument is the test case name, but for `TEST_F()` -this must be the name of the test fixture class. You've probably guessed: `_F` -is for fixture. - -Unfortunately, the C++ macro system does not allow us to create a single macro -that can handle both types of tests. Using the wrong macro causes a compiler -error. - -Also, you must first define a test fixture class before using it in a -`TEST_F()`, or you'll get the compiler error "`virtual outside class -declaration`". - -For each test defined with `TEST_F()`, Google Test will: - 1. Create a _fresh_ test fixture at runtime - 1. Immediately initialize it via `SetUp()` - 1. Run the test - 1. Clean up by calling `TearDown()` - 1. Delete the test fixture. Note that different tests in the same test case have different test fixture objects, and Google Test always deletes a test fixture before it creates the next one. Google Test does not reuse the same test fixture for multiple tests. Any changes one test makes to the fixture do not affect other tests. - -As an example, let's write tests for a FIFO queue class named `Queue`, which -has the following interface: -``` -template // E is the element type. -class Queue { - public: - Queue(); - void Enqueue(const E& element); - E* Dequeue(); // Returns NULL if the queue is empty. - size_t size() const; - ... -}; -``` - -First, define a fixture class. By convention, you should give it the name -`FooTest` where `Foo` is the class being tested. -``` -class QueueTest : public ::testing::Test { - protected: - virtual void SetUp() { - q1_.Enqueue(1); - q2_.Enqueue(2); - q2_.Enqueue(3); - } - - // virtual void TearDown() {} - - Queue q0_; - Queue q1_; - Queue q2_; -}; -``` - -In this case, `TearDown()` is not needed since we don't have to clean up after -each test, other than what's already done by the destructor. - -Now we'll write tests using `TEST_F()` and this fixture. -``` -TEST_F(QueueTest, IsEmptyInitially) { - EXPECT_EQ(0, q0_.size()); -} - -TEST_F(QueueTest, DequeueWorks) { - int* n = q0_.Dequeue(); - EXPECT_EQ(NULL, n); - - n = q1_.Dequeue(); - ASSERT_TRUE(n != NULL); - EXPECT_EQ(1, *n); - EXPECT_EQ(0, q1_.size()); - delete n; - - n = q2_.Dequeue(); - ASSERT_TRUE(n != NULL); - EXPECT_EQ(2, *n); - EXPECT_EQ(1, q2_.size()); - delete n; -} -``` - -The above uses both `ASSERT_*` and `EXPECT_*` assertions. The rule of thumb is -to use `EXPECT_*` when you want the test to continue to reveal more errors -after the assertion failure, and use `ASSERT_*` when continuing after failure -doesn't make sense. For example, the second assertion in the `Dequeue` test is -`ASSERT_TRUE(n != NULL)`, as we need to dereference the pointer `n` later, -which would lead to a segfault when `n` is `NULL`. - -When these tests run, the following happens: - 1. Google Test constructs a `QueueTest` object (let's call it `t1` ). - 1. `t1.SetUp()` initializes `t1` . - 1. The first test ( `IsEmptyInitially` ) runs on `t1` . - 1. `t1.TearDown()` cleans up after the test finishes. - 1. `t1` is destructed. - 1. The above steps are repeated on another `QueueTest` object, this time running the `DequeueWorks` test. - -_Availability_: Linux, Windows, Mac. - -_Note_: Google Test automatically saves all _Google Test_ flags when a test -object is constructed, and restores them when it is destructed. - -# Invoking the Tests # - -`TEST()` and `TEST_F()` implicitly register their tests with Google Test. So, unlike with many other C++ testing frameworks, you don't have to re-list all your defined tests in order to run them. - -After defining your tests, you can run them with `RUN_ALL_TESTS()` , which returns `0` if all the tests are successful, or `1` otherwise. Note that `RUN_ALL_TESTS()` runs _all tests_ in your link unit -- they can be from different test cases, or even different source files. - -When invoked, the `RUN_ALL_TESTS()` macro: - 1. Saves the state of all Google Test flags. - 1. Creates a test fixture object for the first test. - 1. Initializes it via `SetUp()`. - 1. Runs the test on the fixture object. - 1. Cleans up the fixture via `TearDown()`. - 1. Deletes the fixture. - 1. Restores the state of all Google Test flags. - 1. Repeats the above steps for the next test, until all tests have run. - -In addition, if the test fixture's constructor generates a fatal failure in -step 2, there is no point for step 3 - 5 and they are thus skipped. Similarly, -if step 3 generates a fatal failure, step 4 will be skipped. - -_Important_: You must not ignore the return value of `RUN_ALL_TESTS()`, or `gcc` -will give you a compiler error. The rationale for this design is that the -automated testing service determines whether a test has passed based on its -exit code, not on its stdout/stderr output; thus your `main()` function must -return the value of `RUN_ALL_TESTS()`. - -Also, you should call `RUN_ALL_TESTS()` only **once**. Calling it more than once -conflicts with some advanced Google Test features (e.g. thread-safe death -tests) and thus is not supported. - -_Availability_: Linux, Windows, Mac. - -# Writing the main() Function # - -You can start from this boilerplate: -``` -#include "this/package/foo.h" -#include "gtest/gtest.h" - -namespace { - -// The fixture for testing class Foo. -class FooTest : public ::testing::Test { - protected: - // You can remove any or all of the following functions if its body - // is empty. - - FooTest() { - // You can do set-up work for each test here. - } - - virtual ~FooTest() { - // You can do clean-up work that doesn't throw exceptions here. - } - - // If the constructor and destructor are not enough for setting up - // and cleaning up each test, you can define the following methods: - - virtual void SetUp() { - // Code here will be called immediately after the constructor (right - // before each test). - } - - virtual void TearDown() { - // Code here will be called immediately after each test (right - // before the destructor). - } - - // Objects declared here can be used by all tests in the test case for Foo. -}; - -// Tests that the Foo::Bar() method does Abc. -TEST_F(FooTest, MethodBarDoesAbc) { - const string input_filepath = "this/package/testdata/myinputfile.dat"; - const string output_filepath = "this/package/testdata/myoutputfile.dat"; - Foo f; - EXPECT_EQ(0, f.Bar(input_filepath, output_filepath)); -} - -// Tests that Foo does Xyz. -TEST_F(FooTest, DoesXyz) { - // Exercises the Xyz feature of Foo. -} - -} // namespace - -int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} -``` - -The `::testing::InitGoogleTest()` function parses the command line for Google -Test flags, and removes all recognized flags. This allows the user to control a -test program's behavior via various flags, which we'll cover in [AdvancedGuide](AdvancedGuide.md). -You must call this function before calling `RUN_ALL_TESTS()`, or the flags -won't be properly initialized. - -On Windows, `InitGoogleTest()` also works with wide strings, so it can be used -in programs compiled in `UNICODE` mode as well. - -But maybe you think that writing all those main() functions is too much work? We agree with you completely and that's why Google Test provides a basic implementation of main(). If it fits your needs, then just link your test with gtest\_main library and you are good to go. - -## Important note for Visual C++ users ## -If you put your tests into a library and your `main()` function is in a different library or in your .exe file, those tests will not run. The reason is a [bug](https://connect.microsoft.com/feedback/viewfeedback.aspx?FeedbackID=244410&siteid=210) in Visual C++. When you define your tests, Google Test creates certain static objects to register them. These objects are not referenced from elsewhere but their constructors are still supposed to run. When Visual C++ linker sees that nothing in the library is referenced from other places it throws the library out. You have to reference your library with tests from your main program to keep the linker from discarding it. Here is how to do it. Somewhere in your library code declare a function: -``` -__declspec(dllexport) int PullInMyLibrary() { return 0; } -``` -If you put your tests in a static library (not DLL) then `__declspec(dllexport)` is not required. Now, in your main program, write a code that invokes that function: -``` -int PullInMyLibrary(); -static int dummy = PullInMyLibrary(); -``` -This will keep your tests referenced and will make them register themselves at startup. - -In addition, if you define your tests in a static library, add `/OPT:NOREF` to your main program linker options. If you use MSVC++ IDE, go to your .exe project properties/Configuration Properties/Linker/Optimization and set References setting to `Keep Unreferenced Data (/OPT:NOREF)`. This will keep Visual C++ linker from discarding individual symbols generated by your tests from the final executable. - -There is one more pitfall, though. If you use Google Test as a static library (that's how it is defined in gtest.vcproj) your tests must also reside in a static library. If you have to have them in a DLL, you _must_ change Google Test to build into a DLL as well. Otherwise your tests will not run correctly or will not run at all. The general conclusion here is: make your life easier - do not write your tests in libraries! - -# Where to Go from Here # - -Congratulations! You've learned the Google Test basics. You can start writing -and running Google Test tests, read some [samples](Samples.md), or continue with -[AdvancedGuide](AdvancedGuide.md), which describes many more useful Google Test features. - -# Known Limitations # - -Google Test is designed to be thread-safe. The implementation is -thread-safe on systems where the `pthreads` library is available. It -is currently _unsafe_ to use Google Test assertions from two threads -concurrently on other systems (e.g. Windows). In most tests this is -not an issue as usually the assertions are done in the main thread. If -you want to help, you can volunteer to implement the necessary -synchronization primitives in `gtest-port.h` for your platform. diff --git a/test/gtest-1.8.0/docs/PumpManual.md b/test/gtest-1.8.0/docs/PumpManual.md deleted file mode 100644 index 827bb24b04..0000000000 --- a/test/gtest-1.8.0/docs/PumpManual.md +++ /dev/null @@ -1,177 +0,0 @@ - - -Pump is Useful for Meta Programming. - -# The Problem # - -Template and macro libraries often need to define many classes, -functions, or macros that vary only (or almost only) in the number of -arguments they take. It's a lot of repetitive, mechanical, and -error-prone work. - -Variadic templates and variadic macros can alleviate the problem. -However, while both are being considered by the C++ committee, neither -is in the standard yet or widely supported by compilers. Thus they -are often not a good choice, especially when your code needs to be -portable. And their capabilities are still limited. - -As a result, authors of such libraries often have to write scripts to -generate their implementation. However, our experience is that it's -tedious to write such scripts, which tend to reflect the structure of -the generated code poorly and are often hard to read and edit. For -example, a small change needed in the generated code may require some -non-intuitive, non-trivial changes in the script. This is especially -painful when experimenting with the code. - -# Our Solution # - -Pump (for Pump is Useful for Meta Programming, Pretty Useful for Meta -Programming, or Practical Utility for Meta Programming, whichever you -prefer) is a simple meta-programming tool for C++. The idea is that a -programmer writes a `foo.pump` file which contains C++ code plus meta -code that manipulates the C++ code. The meta code can handle -iterations over a range, nested iterations, local meta variable -definitions, simple arithmetic, and conditional expressions. You can -view it as a small Domain-Specific Language. The meta language is -designed to be non-intrusive (s.t. it won't confuse Emacs' C++ mode, -for example) and concise, making Pump code intuitive and easy to -maintain. - -## Highlights ## - - * The implementation is in a single Python script and thus ultra portable: no build or installation is needed and it works cross platforms. - * Pump tries to be smart with respect to [Google's style guide](https://github.com/google/styleguide): it breaks long lines (easy to have when they are generated) at acceptable places to fit within 80 columns and indent the continuation lines correctly. - * The format is human-readable and more concise than XML. - * The format works relatively well with Emacs' C++ mode. - -## Examples ## - -The following Pump code (where meta keywords start with `$`, `[[` and `]]` are meta brackets, and `$$` starts a meta comment that ends with the line): - -``` -$var n = 3 $$ Defines a meta variable n. -$range i 0..n $$ Declares the range of meta iterator i (inclusive). -$for i [[ - $$ Meta loop. -// Foo$i does blah for $i-ary predicates. -$range j 1..i -template -class Foo$i { -$if i == 0 [[ - blah a; -]] $elif i <= 2 [[ - blah b; -]] $else [[ - blah c; -]] -}; - -]] -``` - -will be translated by the Pump compiler to: - -``` -// Foo0 does blah for 0-ary predicates. -template -class Foo0 { - blah a; -}; - -// Foo1 does blah for 1-ary predicates. -template -class Foo1 { - blah b; -}; - -// Foo2 does blah for 2-ary predicates. -template -class Foo2 { - blah b; -}; - -// Foo3 does blah for 3-ary predicates. -template -class Foo3 { - blah c; -}; -``` - -In another example, - -``` -$range i 1..n -Func($for i + [[a$i]]); -$$ The text between i and [[ is the separator between iterations. -``` - -will generate one of the following lines (without the comments), depending on the value of `n`: - -``` -Func(); // If n is 0. -Func(a1); // If n is 1. -Func(a1 + a2); // If n is 2. -Func(a1 + a2 + a3); // If n is 3. -// And so on... -``` - -## Constructs ## - -We support the following meta programming constructs: - -| `$var id = exp` | Defines a named constant value. `$id` is valid util the end of the current meta lexical block. | -|:----------------|:-----------------------------------------------------------------------------------------------| -| `$range id exp..exp` | Sets the range of an iteration variable, which can be reused in multiple loops later. | -| `$for id sep [[ code ]]` | Iteration. The range of `id` must have been defined earlier. `$id` is valid in `code`. | -| `$($)` | Generates a single `$` character. | -| `$id` | Value of the named constant or iteration variable. | -| `$(exp)` | Value of the expression. | -| `$if exp [[ code ]] else_branch` | Conditional. | -| `[[ code ]]` | Meta lexical block. | -| `cpp_code` | Raw C++ code. | -| `$$ comment` | Meta comment. | - -**Note:** To give the user some freedom in formatting the Pump source -code, Pump ignores a new-line character if it's right after `$for foo` -or next to `[[` or `]]`. Without this rule you'll often be forced to write -very long lines to get the desired output. Therefore sometimes you may -need to insert an extra new-line in such places for a new-line to show -up in your output. - -## Grammar ## - -``` -code ::= atomic_code* -atomic_code ::= $var id = exp - | $var id = [[ code ]] - | $range id exp..exp - | $for id sep [[ code ]] - | $($) - | $id - | $(exp) - | $if exp [[ code ]] else_branch - | [[ code ]] - | cpp_code -sep ::= cpp_code | empty_string -else_branch ::= $else [[ code ]] - | $elif exp [[ code ]] else_branch - | empty_string -exp ::= simple_expression_in_Python_syntax -``` - -## Code ## - -You can find the source code of Pump in [scripts/pump.py](../scripts/pump.py). It is still -very unpolished and lacks automated tests, although it has been -successfully used many times. If you find a chance to use it in your -project, please let us know what you think! We also welcome help on -improving Pump. - -## Real Examples ## - -You can find real-world applications of Pump in [Google Test](https://github.com/google/googletest/tree/master/googletest) and [Google Mock](https://github.com/google/googletest/tree/master/googlemock). The source file `foo.h.pump` generates `foo.h`. - -## Tips ## - - * If a meta variable is followed by a letter or digit, you can separate them using `[[]]`, which inserts an empty string. For example `Foo$j[[]]Helper` generate `Foo1Helper` when `j` is 1. - * To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line. diff --git a/test/gtest-1.8.0/docs/Samples.md b/test/gtest-1.8.0/docs/Samples.md deleted file mode 100644 index f21d200567..0000000000 --- a/test/gtest-1.8.0/docs/Samples.md +++ /dev/null @@ -1,14 +0,0 @@ -If you're like us, you'd like to look at some Google Test sample code. The -[samples folder](../samples) has a number of well-commented samples showing how to use a -variety of Google Test features. - - * [Sample #1](../samples/sample1_unittest.cc) shows the basic steps of using Google Test to test C++ functions. - * [Sample #2](../samples/sample2_unittest.cc) shows a more complex unit test for a class with multiple member functions. - * [Sample #3](../samples/sample3_unittest.cc) uses a test fixture. - * [Sample #4](../samples/sample4_unittest.cc) is another basic example of using Google Test. - * [Sample #5](../samples/sample5_unittest.cc) teaches how to reuse a test fixture in multiple test cases by deriving sub-fixtures from it. - * [Sample #6](../samples/sample6_unittest.cc) demonstrates type-parameterized tests. - * [Sample #7](../samples/sample7_unittest.cc) teaches the basics of value-parameterized tests. - * [Sample #8](../samples/sample8_unittest.cc) shows using `Combine()` in value-parameterized tests. - * [Sample #9](../samples/sample9_unittest.cc) shows use of the listener API to modify Google Test's console output and the use of its reflection API to inspect test results. - * [Sample #10](../samples/sample10_unittest.cc) shows use of the listener API to implement a primitive memory leak checker. diff --git a/test/gtest-1.8.0/docs/XcodeGuide.md b/test/gtest-1.8.0/docs/XcodeGuide.md deleted file mode 100644 index 117265c590..0000000000 --- a/test/gtest-1.8.0/docs/XcodeGuide.md +++ /dev/null @@ -1,93 +0,0 @@ - - -This guide will explain how to use the Google Testing Framework in your Xcode projects on Mac OS X. This tutorial begins by quickly explaining what to do for experienced users. After the quick start, the guide goes provides additional explanation about each step. - -# Quick Start # - -Here is the quick guide for using Google Test in your Xcode project. - - 1. Download the source from the [website](http://code.google.com/p/googletest) using this command: `svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only`. - 1. Open up the `gtest.xcodeproj` in the `googletest-read-only/xcode/` directory and build the gtest.framework. - 1. Create a new "Shell Tool" target in your Xcode project called something like "UnitTests". - 1. Add the gtest.framework to your project and add it to the "Link Binary with Libraries" build phase of "UnitTests". - 1. Add your unit test source code to the "Compile Sources" build phase of "UnitTests". - 1. Edit the "UnitTests" executable and add an environment variable named "DYLD\_FRAMEWORK\_PATH" with a value equal to the path to the framework containing the gtest.framework relative to the compiled executable. - 1. Build and Go. - -The following sections further explain each of the steps listed above in depth, describing in more detail how to complete it including some variations. - -# Get the Source # - -Currently, the gtest.framework discussed here isn't available in a tagged release of Google Test, it is only available in the trunk. As explained at the Google Test [site](http://code.google.com/p/googletest/source/checkout">svn), you can get the code from anonymous SVN with this command: - -``` -svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only -``` - -Alternatively, if you are working with Subversion in your own code base, you can add Google Test as an external dependency to your own Subversion repository. By following this approach, everyone that checks out your svn repository will also receive a copy of Google Test (a specific version, if you wish) without having to check it out explicitly. This makes the set up of your project simpler and reduces the copied code in the repository. - -To use `svn:externals`, decide where you would like to have the external source reside. You might choose to put the external source inside the trunk, because you want it to be part of the branch when you make a release. However, keeping it outside the trunk in a version-tagged directory called something like `third-party/googletest/1.0.1`, is another option. Once the location is established, use `svn propedit svn:externals _directory_` to set the svn:externals property on a directory in your repository. This directory won't contain the code, but be its versioned parent directory. - -The command `svn propedit` will bring up your Subversion editor, making editing the long, (potentially multi-line) property simpler. This same method can be used to check out a tagged branch, by using the appropriate URL (e.g. `http://googletest.googlecode.com/svn/tags/release-1.0.1`). Additionally, the svn:externals property allows the specification of a particular revision of the trunk with the `-r_##_` option (e.g. `externals/src/googletest -r60 http://googletest.googlecode.com/svn/trunk`). - -Here is an example of using the svn:externals properties on a trunk (read via `svn propget`) of a project. This value checks out a copy of Google Test into the `trunk/externals/src/googletest/` directory. - -``` -[Computer:svn] user$ svn propget svn:externals trunk -externals/src/googletest http://googletest.googlecode.com/svn/trunk -``` - -# Add the Framework to Your Project # - -The next step is to build and add the gtest.framework to your own project. This guide describes two common ways below. - - * **Option 1** --- The simplest way to add Google Test to your own project, is to open gtest.xcodeproj (found in the xcode/ directory of the Google Test trunk) and build the framework manually. Then, add the built framework into your project using the "Add->Existing Framework..." from the context menu or "Project->Add..." from the main menu. The gtest.framework is relocatable and contains the headers and object code that you'll need to make tests. This method requires rebuilding every time you upgrade Google Test in your project. - * **Option 2** --- If you are going to be living off the trunk of Google Test, incorporating its latest features into your unit tests (or are a Google Test developer yourself). You'll want to rebuild the framework every time the source updates. to do this, you'll need to add the gtest.xcodeproj file, not the framework itself, to your own Xcode project. Then, from the build products that are revealed by the project's disclosure triangle, you can find the gtest.framework, which can be added to your targets (discussed below). - -# Make a Test Target # - -To start writing tests, make a new "Shell Tool" target. This target template is available under BSD, Cocoa, or Carbon. Add your unit test source code to the "Compile Sources" build phase of the target. - -Next, you'll want to add gtest.framework in two different ways, depending upon which option you chose above. - - * **Option 1** --- During compilation, Xcode will need to know that you are linking against the gtest.framework. Add the gtest.framework to the "Link Binary with Libraries" build phase of your test target. This will include the Google Test headers in your header search path, and will tell the linker where to find the library. - * **Option 2** --- If your working out of the trunk, you'll also want to add gtest.framework to your "Link Binary with Libraries" build phase of your test target. In addition, you'll want to add the gtest.framework as a dependency to your unit test target. This way, Xcode will make sure that gtest.framework is up to date, every time your build your target. Finally, if you don't share build directories with Google Test, you'll have to copy the gtest.framework into your own build products directory using a "Run Script" build phase. - -# Set Up the Executable Run Environment # - -Since the unit test executable is a shell tool, it doesn't have a bundle with a `Contents/Frameworks` directory, in which to place gtest.framework. Instead, the dynamic linker must be told at runtime to search for the framework in another location. This can be accomplished by setting the "DYLD\_FRAMEWORK\_PATH" environment variable in the "Edit Active Executable ..." Arguments tab, under "Variables to be set in the environment:". The path for this value is the path (relative or absolute) of the directory containing the gtest.framework. - -If you haven't set up the DYLD\_FRAMEWORK\_PATH, correctly, you might get a message like this: - -``` -[Session started at 2008-08-15 06:23:57 -0600.] - dyld: Library not loaded: @loader_path/../Frameworks/gtest.framework/Versions/A/gtest - Referenced from: /Users/username/Documents/Sandbox/gtestSample/build/Debug/WidgetFrameworkTest - Reason: image not found -``` - -To correct this problem, go to to the directory containing the executable named in "Referenced from:" value in the error message above. Then, with the terminal in this location, find the relative path to the directory containing the gtest.framework. That is the value you'll need to set as the DYLD\_FRAMEWORK\_PATH. - -# Build and Go # - -Now, when you click "Build and Go", the test will be executed. Dumping out something like this: - -``` -[Session started at 2008-08-06 06:36:13 -0600.] -[==========] Running 2 tests from 1 test case. -[----------] Global test environment set-up. -[----------] 2 tests from WidgetInitializerTest -[ RUN ] WidgetInitializerTest.TestConstructor -[ OK ] WidgetInitializerTest.TestConstructor -[ RUN ] WidgetInitializerTest.TestConversion -[ OK ] WidgetInitializerTest.TestConversion -[----------] Global test environment tear-down -[==========] 2 tests from 1 test case ran. -[ PASSED ] 2 tests. - -The Debugger has exited with status 0. -``` - -# Summary # - -Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment. \ No newline at end of file diff --git a/test/gtest-1.8.0/include/gtest/gtest-death-test.h b/test/gtest-1.8.0/include/gtest/gtest-death-test.h deleted file mode 100644 index 53f11d4c56..0000000000 --- a/test/gtest-1.8.0/include/gtest/gtest-death-test.h +++ /dev/null @@ -1,342 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// The Google C++ Testing and Mocking Framework (Google Test) -// -// This header file defines the public API for death tests. It is -// #included by gtest.h so a user doesn't need to include this -// directly. - -#ifndef GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_ -#define GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_ - -#include "gtest/internal/gtest-death-test-internal.h" - -namespace testing { - -// This flag controls the style of death tests. Valid values are "threadsafe", -// meaning that the death test child process will re-execute the test binary -// from the start, running only a single death test, or "fast", -// meaning that the child process will execute the test logic immediately -// after forking. -GTEST_DECLARE_string_(death_test_style); - -#if GTEST_HAS_DEATH_TEST - -namespace internal { - -// Returns a Boolean value indicating whether the caller is currently -// executing in the context of the death test child process. Tools such as -// Valgrind heap checkers may need this to modify their behavior in death -// tests. IMPORTANT: This is an internal utility. Using it may break the -// implementation of death tests. User code MUST NOT use it. -GTEST_API_ bool InDeathTestChild(); - -} // namespace internal - -// The following macros are useful for writing death tests. - -// Here's what happens when an ASSERT_DEATH* or EXPECT_DEATH* is -// executed: -// -// 1. It generates a warning if there is more than one active -// thread. This is because it's safe to fork() or clone() only -// when there is a single thread. -// -// 2. The parent process clone()s a sub-process and runs the death -// test in it; the sub-process exits with code 0 at the end of the -// death test, if it hasn't exited already. -// -// 3. The parent process waits for the sub-process to terminate. -// -// 4. The parent process checks the exit code and error message of -// the sub-process. -// -// Examples: -// -// ASSERT_DEATH(server.SendMessage(56, "Hello"), "Invalid port number"); -// for (int i = 0; i < 5; i++) { -// EXPECT_DEATH(server.ProcessRequest(i), -// "Invalid request .* in ProcessRequest()") -// << "Failed to die on request " << i; -// } -// -// ASSERT_EXIT(server.ExitNow(), ::testing::ExitedWithCode(0), "Exiting"); -// -// bool KilledBySIGHUP(int exit_code) { -// return WIFSIGNALED(exit_code) && WTERMSIG(exit_code) == SIGHUP; -// } -// -// ASSERT_EXIT(client.HangUpServer(), KilledBySIGHUP, "Hanging up!"); -// -// On the regular expressions used in death tests: -// -// On POSIX-compliant systems (*nix), we use the library, -// which uses the POSIX extended regex syntax. -// -// On other platforms (e.g. Windows or Mac), we only support a simple regex -// syntax implemented as part of Google Test. This limited -// implementation should be enough most of the time when writing -// death tests; though it lacks many features you can find in PCRE -// or POSIX extended regex syntax. For example, we don't support -// union ("x|y"), grouping ("(xy)"), brackets ("[xy]"), and -// repetition count ("x{5,7}"), among others. -// -// Below is the syntax that we do support. We chose it to be a -// subset of both PCRE and POSIX extended regex, so it's easy to -// learn wherever you come from. In the following: 'A' denotes a -// literal character, period (.), or a single \\ escape sequence; -// 'x' and 'y' denote regular expressions; 'm' and 'n' are for -// natural numbers. -// -// c matches any literal character c -// \\d matches any decimal digit -// \\D matches any character that's not a decimal digit -// \\f matches \f -// \\n matches \n -// \\r matches \r -// \\s matches any ASCII whitespace, including \n -// \\S matches any character that's not a whitespace -// \\t matches \t -// \\v matches \v -// \\w matches any letter, _, or decimal digit -// \\W matches any character that \\w doesn't match -// \\c matches any literal character c, which must be a punctuation -// . matches any single character except \n -// A? matches 0 or 1 occurrences of A -// A* matches 0 or many occurrences of A -// A+ matches 1 or many occurrences of A -// ^ matches the beginning of a string (not that of each line) -// $ matches the end of a string (not that of each line) -// xy matches x followed by y -// -// If you accidentally use PCRE or POSIX extended regex features -// not implemented by us, you will get a run-time failure. In that -// case, please try to rewrite your regular expression within the -// above syntax. -// -// This implementation is *not* meant to be as highly tuned or robust -// as a compiled regex library, but should perform well enough for a -// death test, which already incurs significant overhead by launching -// a child process. -// -// Known caveats: -// -// A "threadsafe" style death test obtains the path to the test -// program from argv[0] and re-executes it in the sub-process. For -// simplicity, the current implementation doesn't search the PATH -// when launching the sub-process. This means that the user must -// invoke the test program via a path that contains at least one -// path separator (e.g. path/to/foo_test and -// /absolute/path/to/bar_test are fine, but foo_test is not). This -// is rarely a problem as people usually don't put the test binary -// directory in PATH. -// -// TODO(wan@google.com): make thread-safe death tests search the PATH. - -// Asserts that a given statement causes the program to exit, with an -// integer exit status that satisfies predicate, and emitting error output -// that matches regex. -# define ASSERT_EXIT(statement, predicate, regex) \ - GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_FATAL_FAILURE_) - -// Like ASSERT_EXIT, but continues on to successive tests in the -// test case, if any: -# define EXPECT_EXIT(statement, predicate, regex) \ - GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_NONFATAL_FAILURE_) - -// Asserts that a given statement causes the program to exit, either by -// explicitly exiting with a nonzero exit code or being killed by a -// signal, and emitting error output that matches regex. -# define ASSERT_DEATH(statement, regex) \ - ASSERT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex) - -// Like ASSERT_DEATH, but continues on to successive tests in the -// test case, if any: -# define EXPECT_DEATH(statement, regex) \ - EXPECT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex) - -// Two predicate classes that can be used in {ASSERT,EXPECT}_EXIT*: - -// Tests that an exit code describes a normal exit with a given exit code. -class GTEST_API_ ExitedWithCode { - public: - explicit ExitedWithCode(int exit_code); - bool operator()(int exit_status) const; - private: - // No implementation - assignment is unsupported. - void operator=(const ExitedWithCode& other); - - const int exit_code_; -}; - -# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA -// Tests that an exit code describes an exit due to termination by a -// given signal. -class GTEST_API_ KilledBySignal { - public: - explicit KilledBySignal(int signum); - bool operator()(int exit_status) const; - private: - const int signum_; -}; -# endif // !GTEST_OS_WINDOWS - -// EXPECT_DEBUG_DEATH asserts that the given statements die in debug mode. -// The death testing framework causes this to have interesting semantics, -// since the sideeffects of the call are only visible in opt mode, and not -// in debug mode. -// -// In practice, this can be used to test functions that utilize the -// LOG(DFATAL) macro using the following style: -// -// int DieInDebugOr12(int* sideeffect) { -// if (sideeffect) { -// *sideeffect = 12; -// } -// LOG(DFATAL) << "death"; -// return 12; -// } -// -// TEST(TestCase, TestDieOr12WorksInDgbAndOpt) { -// int sideeffect = 0; -// // Only asserts in dbg. -// EXPECT_DEBUG_DEATH(DieInDebugOr12(&sideeffect), "death"); -// -// #ifdef NDEBUG -// // opt-mode has sideeffect visible. -// EXPECT_EQ(12, sideeffect); -// #else -// // dbg-mode no visible sideeffect. -// EXPECT_EQ(0, sideeffect); -// #endif -// } -// -// This will assert that DieInDebugReturn12InOpt() crashes in debug -// mode, usually due to a DCHECK or LOG(DFATAL), but returns the -// appropriate fallback value (12 in this case) in opt mode. If you -// need to test that a function has appropriate side-effects in opt -// mode, include assertions against the side-effects. A general -// pattern for this is: -// -// EXPECT_DEBUG_DEATH({ -// // Side-effects here will have an effect after this statement in -// // opt mode, but none in debug mode. -// EXPECT_EQ(12, DieInDebugOr12(&sideeffect)); -// }, "death"); -// -# ifdef NDEBUG - -# define EXPECT_DEBUG_DEATH(statement, regex) \ - GTEST_EXECUTE_STATEMENT_(statement, regex) - -# define ASSERT_DEBUG_DEATH(statement, regex) \ - GTEST_EXECUTE_STATEMENT_(statement, regex) - -# else - -# define EXPECT_DEBUG_DEATH(statement, regex) \ - EXPECT_DEATH(statement, regex) - -# define ASSERT_DEBUG_DEATH(statement, regex) \ - ASSERT_DEATH(statement, regex) - -# endif // NDEBUG for EXPECT_DEBUG_DEATH -#endif // GTEST_HAS_DEATH_TEST - -// This macro is used for implementing macros such as -// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED on systems where -// death tests are not supported. Those macros must compile on such systems -// iff EXPECT_DEATH and ASSERT_DEATH compile with the same parameters on -// systems that support death tests. This allows one to write such a macro -// on a system that does not support death tests and be sure that it will -// compile on a death-test supporting system. It is exposed publicly so that -// systems that have death-tests with stricter requirements than -// GTEST_HAS_DEATH_TEST can write their own equivalent of -// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED. -// -// Parameters: -// statement - A statement that a macro such as EXPECT_DEATH would test -// for program termination. This macro has to make sure this -// statement is compiled but not executed, to ensure that -// EXPECT_DEATH_IF_SUPPORTED compiles with a certain -// parameter iff EXPECT_DEATH compiles with it. -// regex - A regex that a macro such as EXPECT_DEATH would use to test -// the output of statement. This parameter has to be -// compiled but not evaluated by this macro, to ensure that -// this macro only accepts expressions that a macro such as -// EXPECT_DEATH would accept. -// terminator - Must be an empty statement for EXPECT_DEATH_IF_SUPPORTED -// and a return statement for ASSERT_DEATH_IF_SUPPORTED. -// This ensures that ASSERT_DEATH_IF_SUPPORTED will not -// compile inside functions where ASSERT_DEATH doesn't -// compile. -// -// The branch that has an always false condition is used to ensure that -// statement and regex are compiled (and thus syntactically correct) but -// never executed. The unreachable code macro protects the terminator -// statement from generating an 'unreachable code' warning in case -// statement unconditionally returns or throws. The Message constructor at -// the end allows the syntax of streaming additional messages into the -// macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH. -# define GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, terminator) \ - GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ - if (::testing::internal::AlwaysTrue()) { \ - GTEST_LOG_(WARNING) \ - << "Death tests are not supported on this platform.\n" \ - << "Statement '" #statement "' cannot be verified."; \ - } else if (::testing::internal::AlwaysFalse()) { \ - ::testing::internal::RE::PartialMatch(".*", (regex)); \ - GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ - terminator; \ - } else \ - ::testing::Message() - -// EXPECT_DEATH_IF_SUPPORTED(statement, regex) and -// ASSERT_DEATH_IF_SUPPORTED(statement, regex) expand to real death tests if -// death tests are supported; otherwise they just issue a warning. This is -// useful when you are combining death test assertions with normal test -// assertions in one test. -#if GTEST_HAS_DEATH_TEST -# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \ - EXPECT_DEATH(statement, regex) -# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \ - ASSERT_DEATH(statement, regex) -#else -# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \ - GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, ) -# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \ - GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, return) -#endif - -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_ diff --git a/test/gtest-1.8.0/include/gtest/gtest-message.h b/test/gtest-1.8.0/include/gtest/gtest-message.h deleted file mode 100644 index d7266baab0..0000000000 --- a/test/gtest-1.8.0/include/gtest/gtest-message.h +++ /dev/null @@ -1,249 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// The Google C++ Testing and Mocking Framework (Google Test) -// -// This header file defines the Message class. -// -// IMPORTANT NOTE: Due to limitation of the C++ language, we have to -// leave some internal implementation details in this header file. -// They are clearly marked by comments like this: -// -// // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. -// -// Such code is NOT meant to be used by a user directly, and is subject -// to CHANGE WITHOUT NOTICE. Therefore DO NOT DEPEND ON IT in a user -// program! - -#ifndef GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ -#define GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ - -#include - -#include "gtest/internal/gtest-port.h" - -// Ensures that there is at least one operator<< in the global namespace. -// See Message& operator<<(...) below for why. -void operator<<(const testing::internal::Secret&, int); - -namespace testing { - -// The Message class works like an ostream repeater. -// -// Typical usage: -// -// 1. You stream a bunch of values to a Message object. -// It will remember the text in a stringstream. -// 2. Then you stream the Message object to an ostream. -// This causes the text in the Message to be streamed -// to the ostream. -// -// For example; -// -// testing::Message foo; -// foo << 1 << " != " << 2; -// std::cout << foo; -// -// will print "1 != 2". -// -// Message is not intended to be inherited from. In particular, its -// destructor is not virtual. -// -// Note that stringstream behaves differently in gcc and in MSVC. You -// can stream a NULL char pointer to it in the former, but not in the -// latter (it causes an access violation if you do). The Message -// class hides this difference by treating a NULL char pointer as -// "(null)". -class GTEST_API_ Message { - private: - // The type of basic IO manipulators (endl, ends, and flush) for - // narrow streams. - typedef std::ostream& (*BasicNarrowIoManip)(std::ostream&); - - public: - // Constructs an empty Message. - Message(); - - // Copy constructor. - Message(const Message& msg) : ss_(new ::std::stringstream) { // NOLINT - *ss_ << msg.GetString(); - } - - // Constructs a Message from a C-string. - explicit Message(const char* str) : ss_(new ::std::stringstream) { - *ss_ << str; - } - -#if GTEST_OS_SYMBIAN - // Streams a value (either a pointer or not) to this object. - template - inline Message& operator <<(const T& value) { - StreamHelper(typename internal::is_pointer::type(), value); - return *this; - } -#else - // Streams a non-pointer value to this object. - template - inline Message& operator <<(const T& val) { - // Some libraries overload << for STL containers. These - // overloads are defined in the global namespace instead of ::std. - // - // C++'s symbol lookup rule (i.e. Koenig lookup) says that these - // overloads are visible in either the std namespace or the global - // namespace, but not other namespaces, including the testing - // namespace which Google Test's Message class is in. - // - // To allow STL containers (and other types that has a << operator - // defined in the global namespace) to be used in Google Test - // assertions, testing::Message must access the custom << operator - // from the global namespace. With this using declaration, - // overloads of << defined in the global namespace and those - // visible via Koenig lookup are both exposed in this function. - using ::operator <<; - *ss_ << val; - return *this; - } - - // Streams a pointer value to this object. - // - // This function is an overload of the previous one. When you - // stream a pointer to a Message, this definition will be used as it - // is more specialized. (The C++ Standard, section - // [temp.func.order].) If you stream a non-pointer, then the - // previous definition will be used. - // - // The reason for this overload is that streaming a NULL pointer to - // ostream is undefined behavior. Depending on the compiler, you - // may get "0", "(nil)", "(null)", or an access violation. To - // ensure consistent result across compilers, we always treat NULL - // as "(null)". - template - inline Message& operator <<(T* const& pointer) { // NOLINT - if (pointer == NULL) { - *ss_ << "(null)"; - } else { - *ss_ << pointer; - } - return *this; - } -#endif // GTEST_OS_SYMBIAN - - // Since the basic IO manipulators are overloaded for both narrow - // and wide streams, we have to provide this specialized definition - // of operator <<, even though its body is the same as the - // templatized version above. Without this definition, streaming - // endl or other basic IO manipulators to Message will confuse the - // compiler. - Message& operator <<(BasicNarrowIoManip val) { - *ss_ << val; - return *this; - } - - // Instead of 1/0, we want to see true/false for bool values. - Message& operator <<(bool b) { - return *this << (b ? "true" : "false"); - } - - // These two overloads allow streaming a wide C string to a Message - // using the UTF-8 encoding. - Message& operator <<(const wchar_t* wide_c_str); - Message& operator <<(wchar_t* wide_c_str); - -#if GTEST_HAS_STD_WSTRING - // Converts the given wide string to a narrow string using the UTF-8 - // encoding, and streams the result to this Message object. - Message& operator <<(const ::std::wstring& wstr); -#endif // GTEST_HAS_STD_WSTRING - -#if GTEST_HAS_GLOBAL_WSTRING - // Converts the given wide string to a narrow string using the UTF-8 - // encoding, and streams the result to this Message object. - Message& operator <<(const ::wstring& wstr); -#endif // GTEST_HAS_GLOBAL_WSTRING - - // Gets the text streamed to this object so far as an std::string. - // Each '\0' character in the buffer is replaced with "\\0". - // - // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. - std::string GetString() const; - - private: -#if GTEST_OS_SYMBIAN - // These are needed as the Nokia Symbian Compiler cannot decide between - // const T& and const T* in a function template. The Nokia compiler _can_ - // decide between class template specializations for T and T*, so a - // tr1::type_traits-like is_pointer works, and we can overload on that. - template - inline void StreamHelper(internal::true_type /*is_pointer*/, T* pointer) { - if (pointer == NULL) { - *ss_ << "(null)"; - } else { - *ss_ << pointer; - } - } - template - inline void StreamHelper(internal::false_type /*is_pointer*/, - const T& value) { - // See the comments in Message& operator <<(const T&) above for why - // we need this using statement. - using ::operator <<; - *ss_ << value; - } -#endif // GTEST_OS_SYMBIAN - - // We'll hold the text streamed to this object here. - const internal::scoped_ptr< ::std::stringstream> ss_; - - // We declare (but don't implement) this to prevent the compiler - // from implementing the assignment operator. - void operator=(const Message&); -}; - -// Streams a Message to an ostream. -inline std::ostream& operator <<(std::ostream& os, const Message& sb) { - return os << sb.GetString(); -} - -namespace internal { - -// Converts a streamable value to an std::string. A NULL pointer is -// converted to "(null)". When the input value is a ::string, -// ::std::string, ::wstring, or ::std::wstring object, each NUL -// character in it is replaced with "\\0". -template -std::string StreamableToString(const T& streamable) { - return (Message() << streamable).GetString(); -} - -} // namespace internal -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ diff --git a/test/gtest-1.8.0/include/gtest/gtest-param-test.h b/test/gtest-1.8.0/include/gtest/gtest-param-test.h deleted file mode 100644 index 8993c1ce17..0000000000 --- a/test/gtest-1.8.0/include/gtest/gtest-param-test.h +++ /dev/null @@ -1,1438 +0,0 @@ -// This file was GENERATED by command: -// pump.py gtest-param-test.h.pump -// DO NOT EDIT BY HAND!!! - -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: vladl@google.com (Vlad Losev) -// -// Macros and functions for implementing parameterized tests -// in Google C++ Testing and Mocking Framework (Google Test) -// -// This file is generated by a SCRIPT. DO NOT EDIT BY HAND! -// - -#ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ -#define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ - - -// Value-parameterized tests allow you to test your code with different -// parameters without writing multiple copies of the same test. -// -// Here is how you use value-parameterized tests: - -#if 0 - -// To write value-parameterized tests, first you should define a fixture -// class. It is usually derived from testing::TestWithParam (see below for -// another inheritance scheme that's sometimes useful in more complicated -// class hierarchies), where the type of your parameter values. -// TestWithParam is itself derived from testing::Test. T can be any -// copyable type. If it's a raw pointer, you are responsible for managing the -// lifespan of the pointed values. - -class FooTest : public ::testing::TestWithParam { - // You can implement all the usual class fixture members here. -}; - -// Then, use the TEST_P macro to define as many parameterized tests -// for this fixture as you want. The _P suffix is for "parameterized" -// or "pattern", whichever you prefer to think. - -TEST_P(FooTest, DoesBlah) { - // Inside a test, access the test parameter with the GetParam() method - // of the TestWithParam class: - EXPECT_TRUE(foo.Blah(GetParam())); - ... -} - -TEST_P(FooTest, HasBlahBlah) { - ... -} - -// Finally, you can use INSTANTIATE_TEST_CASE_P to instantiate the test -// case with any set of parameters you want. Google Test defines a number -// of functions for generating test parameters. They return what we call -// (surprise!) parameter generators. Here is a summary of them, which -// are all in the testing namespace: -// -// -// Range(begin, end [, step]) - Yields values {begin, begin+step, -// begin+step+step, ...}. The values do not -// include end. step defaults to 1. -// Values(v1, v2, ..., vN) - Yields values {v1, v2, ..., vN}. -// ValuesIn(container) - Yields values from a C-style array, an STL -// ValuesIn(begin,end) container, or an iterator range [begin, end). -// Bool() - Yields sequence {false, true}. -// Combine(g1, g2, ..., gN) - Yields all combinations (the Cartesian product -// for the math savvy) of the values generated -// by the N generators. -// -// For more details, see comments at the definitions of these functions below -// in this file. -// -// The following statement will instantiate tests from the FooTest test case -// each with parameter values "meeny", "miny", and "moe". - -INSTANTIATE_TEST_CASE_P(InstantiationName, - FooTest, - Values("meeny", "miny", "moe")); - -// To distinguish different instances of the pattern, (yes, you -// can instantiate it more then once) the first argument to the -// INSTANTIATE_TEST_CASE_P macro is a prefix that will be added to the -// actual test case name. Remember to pick unique prefixes for different -// instantiations. The tests from the instantiation above will have -// these names: -// -// * InstantiationName/FooTest.DoesBlah/0 for "meeny" -// * InstantiationName/FooTest.DoesBlah/1 for "miny" -// * InstantiationName/FooTest.DoesBlah/2 for "moe" -// * InstantiationName/FooTest.HasBlahBlah/0 for "meeny" -// * InstantiationName/FooTest.HasBlahBlah/1 for "miny" -// * InstantiationName/FooTest.HasBlahBlah/2 for "moe" -// -// You can use these names in --gtest_filter. -// -// This statement will instantiate all tests from FooTest again, each -// with parameter values "cat" and "dog": - -const char* pets[] = {"cat", "dog"}; -INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets)); - -// The tests from the instantiation above will have these names: -// -// * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat" -// * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog" -// * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat" -// * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog" -// -// Please note that INSTANTIATE_TEST_CASE_P will instantiate all tests -// in the given test case, whether their definitions come before or -// AFTER the INSTANTIATE_TEST_CASE_P statement. -// -// Please also note that generator expressions (including parameters to the -// generators) are evaluated in InitGoogleTest(), after main() has started. -// This allows the user on one hand, to adjust generator parameters in order -// to dynamically determine a set of tests to run and on the other hand, -// give the user a chance to inspect the generated tests with Google Test -// reflection API before RUN_ALL_TESTS() is executed. -// -// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc -// for more examples. -// -// In the future, we plan to publish the API for defining new parameter -// generators. But for now this interface remains part of the internal -// implementation and is subject to change. -// -// -// A parameterized test fixture must be derived from testing::Test and from -// testing::WithParamInterface, where T is the type of the parameter -// values. Inheriting from TestWithParam satisfies that requirement because -// TestWithParam inherits from both Test and WithParamInterface. In more -// complicated hierarchies, however, it is occasionally useful to inherit -// separately from Test and WithParamInterface. For example: - -class BaseTest : public ::testing::Test { - // You can inherit all the usual members for a non-parameterized test - // fixture here. -}; - -class DerivedTest : public BaseTest, public ::testing::WithParamInterface { - // The usual test fixture members go here too. -}; - -TEST_F(BaseTest, HasFoo) { - // This is an ordinary non-parameterized test. -} - -TEST_P(DerivedTest, DoesBlah) { - // GetParam works just the same here as if you inherit from TestWithParam. - EXPECT_TRUE(foo.Blah(GetParam())); -} - -#endif // 0 - -#include "gtest/internal/gtest-port.h" - -#if !GTEST_OS_SYMBIAN -# include -#endif - -#include "gtest/internal/gtest-internal.h" -#include "gtest/internal/gtest-param-util.h" -#include "gtest/internal/gtest-param-util-generated.h" - -namespace testing { - -// Functions producing parameter generators. -// -// Google Test uses these generators to produce parameters for value- -// parameterized tests. When a parameterized test case is instantiated -// with a particular generator, Google Test creates and runs tests -// for each element in the sequence produced by the generator. -// -// In the following sample, tests from test case FooTest are instantiated -// each three times with parameter values 3, 5, and 8: -// -// class FooTest : public TestWithParam { ... }; -// -// TEST_P(FooTest, TestThis) { -// } -// TEST_P(FooTest, TestThat) { -// } -// INSTANTIATE_TEST_CASE_P(TestSequence, FooTest, Values(3, 5, 8)); -// - -// Range() returns generators providing sequences of values in a range. -// -// Synopsis: -// Range(start, end) -// - returns a generator producing a sequence of values {start, start+1, -// start+2, ..., }. -// Range(start, end, step) -// - returns a generator producing a sequence of values {start, start+step, -// start+step+step, ..., }. -// Notes: -// * The generated sequences never include end. For example, Range(1, 5) -// returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2) -// returns a generator producing {1, 3, 5, 7}. -// * start and end must have the same type. That type may be any integral or -// floating-point type or a user defined type satisfying these conditions: -// * It must be assignable (have operator=() defined). -// * It must have operator+() (operator+(int-compatible type) for -// two-operand version). -// * It must have operator<() defined. -// Elements in the resulting sequences will also have that type. -// * Condition start < end must be satisfied in order for resulting sequences -// to contain any elements. -// -template -internal::ParamGenerator Range(T start, T end, IncrementT step) { - return internal::ParamGenerator( - new internal::RangeGenerator(start, end, step)); -} - -template -internal::ParamGenerator Range(T start, T end) { - return Range(start, end, 1); -} - -// ValuesIn() function allows generation of tests with parameters coming from -// a container. -// -// Synopsis: -// ValuesIn(const T (&array)[N]) -// - returns a generator producing sequences with elements from -// a C-style array. -// ValuesIn(const Container& container) -// - returns a generator producing sequences with elements from -// an STL-style container. -// ValuesIn(Iterator begin, Iterator end) -// - returns a generator producing sequences with elements from -// a range [begin, end) defined by a pair of STL-style iterators. These -// iterators can also be plain C pointers. -// -// Please note that ValuesIn copies the values from the containers -// passed in and keeps them to generate tests in RUN_ALL_TESTS(). -// -// Examples: -// -// This instantiates tests from test case StringTest -// each with C-string values of "foo", "bar", and "baz": -// -// const char* strings[] = {"foo", "bar", "baz"}; -// INSTANTIATE_TEST_CASE_P(StringSequence, StringTest, ValuesIn(strings)); -// -// This instantiates tests from test case StlStringTest -// each with STL strings with values "a" and "b": -// -// ::std::vector< ::std::string> GetParameterStrings() { -// ::std::vector< ::std::string> v; -// v.push_back("a"); -// v.push_back("b"); -// return v; -// } -// -// INSTANTIATE_TEST_CASE_P(CharSequence, -// StlStringTest, -// ValuesIn(GetParameterStrings())); -// -// -// This will also instantiate tests from CharTest -// each with parameter values 'a' and 'b': -// -// ::std::list GetParameterChars() { -// ::std::list list; -// list.push_back('a'); -// list.push_back('b'); -// return list; -// } -// ::std::list l = GetParameterChars(); -// INSTANTIATE_TEST_CASE_P(CharSequence2, -// CharTest, -// ValuesIn(l.begin(), l.end())); -// -template -internal::ParamGenerator< - typename ::testing::internal::IteratorTraits::value_type> -ValuesIn(ForwardIterator begin, ForwardIterator end) { - typedef typename ::testing::internal::IteratorTraits - ::value_type ParamType; - return internal::ParamGenerator( - new internal::ValuesInIteratorRangeGenerator(begin, end)); -} - -template -internal::ParamGenerator ValuesIn(const T (&array)[N]) { - return ValuesIn(array, array + N); -} - -template -internal::ParamGenerator ValuesIn( - const Container& container) { - return ValuesIn(container.begin(), container.end()); -} - -// Values() allows generating tests from explicitly specified list of -// parameters. -// -// Synopsis: -// Values(T v1, T v2, ..., T vN) -// - returns a generator producing sequences with elements v1, v2, ..., vN. -// -// For example, this instantiates tests from test case BarTest each -// with values "one", "two", and "three": -// -// INSTANTIATE_TEST_CASE_P(NumSequence, BarTest, Values("one", "two", "three")); -// -// This instantiates tests from test case BazTest each with values 1, 2, 3.5. -// The exact type of values will depend on the type of parameter in BazTest. -// -// INSTANTIATE_TEST_CASE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5)); -// -// Currently, Values() supports from 1 to 50 parameters. -// -template -internal::ValueArray1 Values(T1 v1) { - return internal::ValueArray1(v1); -} - -template -internal::ValueArray2 Values(T1 v1, T2 v2) { - return internal::ValueArray2(v1, v2); -} - -template -internal::ValueArray3 Values(T1 v1, T2 v2, T3 v3) { - return internal::ValueArray3(v1, v2, v3); -} - -template -internal::ValueArray4 Values(T1 v1, T2 v2, T3 v3, T4 v4) { - return internal::ValueArray4(v1, v2, v3, v4); -} - -template -internal::ValueArray5 Values(T1 v1, T2 v2, T3 v3, T4 v4, - T5 v5) { - return internal::ValueArray5(v1, v2, v3, v4, v5); -} - -template -internal::ValueArray6 Values(T1 v1, T2 v2, T3 v3, - T4 v4, T5 v5, T6 v6) { - return internal::ValueArray6(v1, v2, v3, v4, v5, v6); -} - -template -internal::ValueArray7 Values(T1 v1, T2 v2, T3 v3, - T4 v4, T5 v5, T6 v6, T7 v7) { - return internal::ValueArray7(v1, v2, v3, v4, v5, - v6, v7); -} - -template -internal::ValueArray8 Values(T1 v1, T2 v2, - T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8) { - return internal::ValueArray8(v1, v2, v3, v4, - v5, v6, v7, v8); -} - -template -internal::ValueArray9 Values(T1 v1, T2 v2, - T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9) { - return internal::ValueArray9(v1, v2, v3, - v4, v5, v6, v7, v8, v9); -} - -template -internal::ValueArray10 Values(T1 v1, - T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10) { - return internal::ValueArray10(v1, - v2, v3, v4, v5, v6, v7, v8, v9, v10); -} - -template -internal::ValueArray11 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11) { - return internal::ValueArray11(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11); -} - -template -internal::ValueArray12 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12) { - return internal::ValueArray12(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12); -} - -template -internal::ValueArray13 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13) { - return internal::ValueArray13(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13); -} - -template -internal::ValueArray14 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14) { - return internal::ValueArray14(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, - v14); -} - -template -internal::ValueArray15 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, - T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15) { - return internal::ValueArray15(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, - v13, v14, v15); -} - -template -internal::ValueArray16 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, - T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, - T16 v16) { - return internal::ValueArray16(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, - v12, v13, v14, v15, v16); -} - -template -internal::ValueArray17 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, - T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, - T16 v16, T17 v17) { - return internal::ValueArray17(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, - v11, v12, v13, v14, v15, v16, v17); -} - -template -internal::ValueArray18 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, - T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, - T16 v16, T17 v17, T18 v18) { - return internal::ValueArray18(v1, v2, v3, v4, v5, v6, v7, v8, v9, - v10, v11, v12, v13, v14, v15, v16, v17, v18); -} - -template -internal::ValueArray19 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, - T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, - T15 v15, T16 v16, T17 v17, T18 v18, T19 v19) { - return internal::ValueArray19(v1, v2, v3, v4, v5, v6, v7, v8, - v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19); -} - -template -internal::ValueArray20 Values(T1 v1, T2 v2, T3 v3, T4 v4, - T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, - T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20) { - return internal::ValueArray20(v1, v2, v3, v4, v5, v6, v7, - v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20); -} - -template -internal::ValueArray21 Values(T1 v1, T2 v2, T3 v3, T4 v4, - T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, - T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21) { - return internal::ValueArray21(v1, v2, v3, v4, v5, v6, - v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21); -} - -template -internal::ValueArray22 Values(T1 v1, T2 v2, T3 v3, - T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, - T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, - T21 v21, T22 v22) { - return internal::ValueArray22(v1, v2, v3, v4, - v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, - v20, v21, v22); -} - -template -internal::ValueArray23 Values(T1 v1, T2 v2, - T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, - T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, - T21 v21, T22 v22, T23 v23) { - return internal::ValueArray23(v1, v2, v3, - v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, - v20, v21, v22, v23); -} - -template -internal::ValueArray24 Values(T1 v1, T2 v2, - T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, - T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, - T21 v21, T22 v22, T23 v23, T24 v24) { - return internal::ValueArray24(v1, v2, - v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, - v19, v20, v21, v22, v23, v24); -} - -template -internal::ValueArray25 Values(T1 v1, - T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, - T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, - T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25) { - return internal::ValueArray25(v1, - v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, - v18, v19, v20, v21, v22, v23, v24, v25); -} - -template -internal::ValueArray26 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26) { - return internal::ValueArray26(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, - v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26); -} - -template -internal::ValueArray27 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27) { - return internal::ValueArray27(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, - v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27); -} - -template -internal::ValueArray28 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28) { - return internal::ValueArray28(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, - v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, - v28); -} - -template -internal::ValueArray29 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29) { - return internal::ValueArray29(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, - v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, - v27, v28, v29); -} - -template -internal::ValueArray30 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, - T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, - T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, - T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30) { - return internal::ValueArray30(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, - v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, - v26, v27, v28, v29, v30); -} - -template -internal::ValueArray31 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, - T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, - T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, - T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31) { - return internal::ValueArray31(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, - v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, - v25, v26, v27, v28, v29, v30, v31); -} - -template -internal::ValueArray32 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, - T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, - T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, - T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, - T32 v32) { - return internal::ValueArray32(v1, v2, v3, v4, v5, v6, v7, v8, v9, - v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, - v24, v25, v26, v27, v28, v29, v30, v31, v32); -} - -template -internal::ValueArray33 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, - T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, - T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, - T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, - T32 v32, T33 v33) { - return internal::ValueArray33(v1, v2, v3, v4, v5, v6, v7, v8, - v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, - v24, v25, v26, v27, v28, v29, v30, v31, v32, v33); -} - -template -internal::ValueArray34 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, - T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, - T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, - T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, - T31 v31, T32 v32, T33 v33, T34 v34) { - return internal::ValueArray34(v1, v2, v3, v4, v5, v6, v7, - v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, - v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34); -} - -template -internal::ValueArray35 Values(T1 v1, T2 v2, T3 v3, T4 v4, - T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, - T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, - T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, - T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35) { - return internal::ValueArray35(v1, v2, v3, v4, v5, v6, - v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, - v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35); -} - -template -internal::ValueArray36 Values(T1 v1, T2 v2, T3 v3, T4 v4, - T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, - T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, - T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, - T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36) { - return internal::ValueArray36(v1, v2, v3, v4, - v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, - v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, - v34, v35, v36); -} - -template -internal::ValueArray37 Values(T1 v1, T2 v2, T3 v3, - T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, - T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, - T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, - T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, - T37 v37) { - return internal::ValueArray37(v1, v2, v3, - v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, - v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, - v34, v35, v36, v37); -} - -template -internal::ValueArray38 Values(T1 v1, T2 v2, - T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, - T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, - T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, - T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, - T37 v37, T38 v38) { - return internal::ValueArray38(v1, v2, - v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, - v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, - v33, v34, v35, v36, v37, v38); -} - -template -internal::ValueArray39 Values(T1 v1, T2 v2, - T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, - T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, - T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, - T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, - T37 v37, T38 v38, T39 v39) { - return internal::ValueArray39(v1, - v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, - v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, - v32, v33, v34, v35, v36, v37, v38, v39); -} - -template -internal::ValueArray40 Values(T1 v1, - T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, - T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, - T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, - T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, - T36 v36, T37 v37, T38 v38, T39 v39, T40 v40) { - return internal::ValueArray40(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, - v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, - v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40); -} - -template -internal::ValueArray41 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41) { - return internal::ValueArray41(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, - v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, - v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41); -} - -template -internal::ValueArray42 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, - T42 v42) { - return internal::ValueArray42(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, - v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, - v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, - v42); -} - -template -internal::ValueArray43 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, - T42 v42, T43 v43) { - return internal::ValueArray43(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, - v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, - v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, - v41, v42, v43); -} - -template -internal::ValueArray44 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, - T42 v42, T43 v43, T44 v44) { - return internal::ValueArray44(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, - v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, - v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, - v40, v41, v42, v43, v44); -} - -template -internal::ValueArray45 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, - T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, - T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, - T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, - T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, - T41 v41, T42 v42, T43 v43, T44 v44, T45 v45) { - return internal::ValueArray45(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, - v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, - v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, - v39, v40, v41, v42, v43, v44, v45); -} - -template -internal::ValueArray46 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, - T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, - T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, - T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, - T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, - T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46) { - return internal::ValueArray46(v1, v2, v3, v4, v5, v6, v7, v8, v9, - v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, - v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, - v38, v39, v40, v41, v42, v43, v44, v45, v46); -} - -template -internal::ValueArray47 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, - T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, - T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, - T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, - T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, - T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47) { - return internal::ValueArray47(v1, v2, v3, v4, v5, v6, v7, v8, - v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, - v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, - v38, v39, v40, v41, v42, v43, v44, v45, v46, v47); -} - -template -internal::ValueArray48 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, - T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, - T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, - T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, - T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, - T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, - T48 v48) { - return internal::ValueArray48(v1, v2, v3, v4, v5, v6, v7, - v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, - v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, - v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48); -} - -template -internal::ValueArray49 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, - T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, - T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, - T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, - T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, - T39 v39, T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, - T47 v47, T48 v48, T49 v49) { - return internal::ValueArray49(v1, v2, v3, v4, v5, v6, - v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, - v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, - v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49); -} - -template -internal::ValueArray50 Values(T1 v1, T2 v2, T3 v3, T4 v4, - T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, - T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, - T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, - T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, - T38 v38, T39 v39, T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, - T46 v46, T47 v47, T48 v48, T49 v49, T50 v50) { - return internal::ValueArray50(v1, v2, v3, v4, - v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, - v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, - v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, - v48, v49, v50); -} - -// Bool() allows generating tests with parameters in a set of (false, true). -// -// Synopsis: -// Bool() -// - returns a generator producing sequences with elements {false, true}. -// -// It is useful when testing code that depends on Boolean flags. Combinations -// of multiple flags can be tested when several Bool()'s are combined using -// Combine() function. -// -// In the following example all tests in the test case FlagDependentTest -// will be instantiated twice with parameters false and true. -// -// class FlagDependentTest : public testing::TestWithParam { -// virtual void SetUp() { -// external_flag = GetParam(); -// } -// } -// INSTANTIATE_TEST_CASE_P(BoolSequence, FlagDependentTest, Bool()); -// -inline internal::ParamGenerator Bool() { - return Values(false, true); -} - -# if GTEST_HAS_COMBINE -// Combine() allows the user to combine two or more sequences to produce -// values of a Cartesian product of those sequences' elements. -// -// Synopsis: -// Combine(gen1, gen2, ..., genN) -// - returns a generator producing sequences with elements coming from -// the Cartesian product of elements from the sequences generated by -// gen1, gen2, ..., genN. The sequence elements will have a type of -// tuple where T1, T2, ..., TN are the types -// of elements from sequences produces by gen1, gen2, ..., genN. -// -// Combine can have up to 10 arguments. This number is currently limited -// by the maximum number of elements in the tuple implementation used by Google -// Test. -// -// Example: -// -// This will instantiate tests in test case AnimalTest each one with -// the parameter values tuple("cat", BLACK), tuple("cat", WHITE), -// tuple("dog", BLACK), and tuple("dog", WHITE): -// -// enum Color { BLACK, GRAY, WHITE }; -// class AnimalTest -// : public testing::TestWithParam > {...}; -// -// TEST_P(AnimalTest, AnimalLooksNice) {...} -// -// INSTANTIATE_TEST_CASE_P(AnimalVariations, AnimalTest, -// Combine(Values("cat", "dog"), -// Values(BLACK, WHITE))); -// -// This will instantiate tests in FlagDependentTest with all variations of two -// Boolean flags: -// -// class FlagDependentTest -// : public testing::TestWithParam > { -// virtual void SetUp() { -// // Assigns external_flag_1 and external_flag_2 values from the tuple. -// tie(external_flag_1, external_flag_2) = GetParam(); -// } -// }; -// -// TEST_P(FlagDependentTest, TestFeature1) { -// // Test your code using external_flag_1 and external_flag_2 here. -// } -// INSTANTIATE_TEST_CASE_P(TwoBoolSequence, FlagDependentTest, -// Combine(Bool(), Bool())); -// -template -internal::CartesianProductHolder2 Combine( - const Generator1& g1, const Generator2& g2) { - return internal::CartesianProductHolder2( - g1, g2); -} - -template -internal::CartesianProductHolder3 Combine( - const Generator1& g1, const Generator2& g2, const Generator3& g3) { - return internal::CartesianProductHolder3( - g1, g2, g3); -} - -template -internal::CartesianProductHolder4 Combine( - const Generator1& g1, const Generator2& g2, const Generator3& g3, - const Generator4& g4) { - return internal::CartesianProductHolder4( - g1, g2, g3, g4); -} - -template -internal::CartesianProductHolder5 Combine( - const Generator1& g1, const Generator2& g2, const Generator3& g3, - const Generator4& g4, const Generator5& g5) { - return internal::CartesianProductHolder5( - g1, g2, g3, g4, g5); -} - -template -internal::CartesianProductHolder6 Combine( - const Generator1& g1, const Generator2& g2, const Generator3& g3, - const Generator4& g4, const Generator5& g5, const Generator6& g6) { - return internal::CartesianProductHolder6( - g1, g2, g3, g4, g5, g6); -} - -template -internal::CartesianProductHolder7 Combine( - const Generator1& g1, const Generator2& g2, const Generator3& g3, - const Generator4& g4, const Generator5& g5, const Generator6& g6, - const Generator7& g7) { - return internal::CartesianProductHolder7( - g1, g2, g3, g4, g5, g6, g7); -} - -template -internal::CartesianProductHolder8 Combine( - const Generator1& g1, const Generator2& g2, const Generator3& g3, - const Generator4& g4, const Generator5& g5, const Generator6& g6, - const Generator7& g7, const Generator8& g8) { - return internal::CartesianProductHolder8( - g1, g2, g3, g4, g5, g6, g7, g8); -} - -template -internal::CartesianProductHolder9 Combine( - const Generator1& g1, const Generator2& g2, const Generator3& g3, - const Generator4& g4, const Generator5& g5, const Generator6& g6, - const Generator7& g7, const Generator8& g8, const Generator9& g9) { - return internal::CartesianProductHolder9( - g1, g2, g3, g4, g5, g6, g7, g8, g9); -} - -template -internal::CartesianProductHolder10 Combine( - const Generator1& g1, const Generator2& g2, const Generator3& g3, - const Generator4& g4, const Generator5& g5, const Generator6& g6, - const Generator7& g7, const Generator8& g8, const Generator9& g9, - const Generator10& g10) { - return internal::CartesianProductHolder10( - g1, g2, g3, g4, g5, g6, g7, g8, g9, g10); -} -# endif // GTEST_HAS_COMBINE - -# define TEST_P(test_case_name, test_name) \ - class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \ - : public test_case_name { \ - public: \ - GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \ - virtual void TestBody(); \ - private: \ - static int AddToRegistry() { \ - ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ - GetTestCasePatternHolder(\ - #test_case_name, \ - ::testing::internal::CodeLocation(\ - __FILE__, __LINE__))->AddTestPattern(\ - GTEST_STRINGIFY_(test_case_name), \ - GTEST_STRINGIFY_(test_name), \ - new ::testing::internal::TestMetaFactory< \ - GTEST_TEST_CLASS_NAME_(\ - test_case_name, test_name)>()); \ - return 0; \ - } \ - static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_; \ - GTEST_DISALLOW_COPY_AND_ASSIGN_(\ - GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \ - }; \ - int GTEST_TEST_CLASS_NAME_(test_case_name, \ - test_name)::gtest_registering_dummy_ = \ - GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \ - void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody() - -// The optional last argument to INSTANTIATE_TEST_CASE_P allows the user -// to specify a function or functor that generates custom test name suffixes -// based on the test parameters. The function should accept one argument of -// type testing::TestParamInfo, and return std::string. -// -// testing::PrintToStringParamName is a builtin test suffix generator that -// returns the value of testing::PrintToString(GetParam()). -// -// Note: test names must be non-empty, unique, and may only contain ASCII -// alphanumeric characters or underscore. Because PrintToString adds quotes -// to std::string and C strings, it won't work for these types. - -#define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \ - static ::testing::internal::ParamGenerator \ - gtest_##prefix##test_case_name##_EvalGenerator_() { \ - return generator; \ - } \ - static ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \ - const ::testing::TestParamInfo& info) { \ - return ::testing::internal::GetParamNameGen( \ - __VA_ARGS__)(info); \ - } \ - static int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \ - ::testing::UnitTest::GetInstance() \ - ->parameterized_test_registry() \ - .GetTestCasePatternHolder( \ - #test_case_name, \ - ::testing::internal::CodeLocation(__FILE__, __LINE__)) \ - ->AddTestCaseInstantiation( \ - #prefix, >est_##prefix##test_case_name##_EvalGenerator_, \ - >est_##prefix##test_case_name##_EvalGenerateName_, __FILE__, \ - __LINE__) - -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ diff --git a/test/gtest-1.8.0/include/gtest/gtest-param-test.h.pump b/test/gtest-1.8.0/include/gtest/gtest-param-test.h.pump deleted file mode 100644 index 7b7243f348..0000000000 --- a/test/gtest-1.8.0/include/gtest/gtest-param-test.h.pump +++ /dev/null @@ -1,501 +0,0 @@ -$$ -*- mode: c++; -*- -$var n = 50 $$ Maximum length of Values arguments we want to support. -$var maxtuple = 10 $$ Maximum number of Combine arguments we want to support. -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: vladl@google.com (Vlad Losev) -// -// Macros and functions for implementing parameterized tests -// in Google C++ Testing and Mocking Framework (Google Test) -// -// This file is generated by a SCRIPT. DO NOT EDIT BY HAND! -// -#ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ -#define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ - - -// Value-parameterized tests allow you to test your code with different -// parameters without writing multiple copies of the same test. -// -// Here is how you use value-parameterized tests: - -#if 0 - -// To write value-parameterized tests, first you should define a fixture -// class. It is usually derived from testing::TestWithParam (see below for -// another inheritance scheme that's sometimes useful in more complicated -// class hierarchies), where the type of your parameter values. -// TestWithParam is itself derived from testing::Test. T can be any -// copyable type. If it's a raw pointer, you are responsible for managing the -// lifespan of the pointed values. - -class FooTest : public ::testing::TestWithParam { - // You can implement all the usual class fixture members here. -}; - -// Then, use the TEST_P macro to define as many parameterized tests -// for this fixture as you want. The _P suffix is for "parameterized" -// or "pattern", whichever you prefer to think. - -TEST_P(FooTest, DoesBlah) { - // Inside a test, access the test parameter with the GetParam() method - // of the TestWithParam class: - EXPECT_TRUE(foo.Blah(GetParam())); - ... -} - -TEST_P(FooTest, HasBlahBlah) { - ... -} - -// Finally, you can use INSTANTIATE_TEST_CASE_P to instantiate the test -// case with any set of parameters you want. Google Test defines a number -// of functions for generating test parameters. They return what we call -// (surprise!) parameter generators. Here is a summary of them, which -// are all in the testing namespace: -// -// -// Range(begin, end [, step]) - Yields values {begin, begin+step, -// begin+step+step, ...}. The values do not -// include end. step defaults to 1. -// Values(v1, v2, ..., vN) - Yields values {v1, v2, ..., vN}. -// ValuesIn(container) - Yields values from a C-style array, an STL -// ValuesIn(begin,end) container, or an iterator range [begin, end). -// Bool() - Yields sequence {false, true}. -// Combine(g1, g2, ..., gN) - Yields all combinations (the Cartesian product -// for the math savvy) of the values generated -// by the N generators. -// -// For more details, see comments at the definitions of these functions below -// in this file. -// -// The following statement will instantiate tests from the FooTest test case -// each with parameter values "meeny", "miny", and "moe". - -INSTANTIATE_TEST_CASE_P(InstantiationName, - FooTest, - Values("meeny", "miny", "moe")); - -// To distinguish different instances of the pattern, (yes, you -// can instantiate it more then once) the first argument to the -// INSTANTIATE_TEST_CASE_P macro is a prefix that will be added to the -// actual test case name. Remember to pick unique prefixes for different -// instantiations. The tests from the instantiation above will have -// these names: -// -// * InstantiationName/FooTest.DoesBlah/0 for "meeny" -// * InstantiationName/FooTest.DoesBlah/1 for "miny" -// * InstantiationName/FooTest.DoesBlah/2 for "moe" -// * InstantiationName/FooTest.HasBlahBlah/0 for "meeny" -// * InstantiationName/FooTest.HasBlahBlah/1 for "miny" -// * InstantiationName/FooTest.HasBlahBlah/2 for "moe" -// -// You can use these names in --gtest_filter. -// -// This statement will instantiate all tests from FooTest again, each -// with parameter values "cat" and "dog": - -const char* pets[] = {"cat", "dog"}; -INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets)); - -// The tests from the instantiation above will have these names: -// -// * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat" -// * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog" -// * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat" -// * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog" -// -// Please note that INSTANTIATE_TEST_CASE_P will instantiate all tests -// in the given test case, whether their definitions come before or -// AFTER the INSTANTIATE_TEST_CASE_P statement. -// -// Please also note that generator expressions (including parameters to the -// generators) are evaluated in InitGoogleTest(), after main() has started. -// This allows the user on one hand, to adjust generator parameters in order -// to dynamically determine a set of tests to run and on the other hand, -// give the user a chance to inspect the generated tests with Google Test -// reflection API before RUN_ALL_TESTS() is executed. -// -// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc -// for more examples. -// -// In the future, we plan to publish the API for defining new parameter -// generators. But for now this interface remains part of the internal -// implementation and is subject to change. -// -// -// A parameterized test fixture must be derived from testing::Test and from -// testing::WithParamInterface, where T is the type of the parameter -// values. Inheriting from TestWithParam satisfies that requirement because -// TestWithParam inherits from both Test and WithParamInterface. In more -// complicated hierarchies, however, it is occasionally useful to inherit -// separately from Test and WithParamInterface. For example: - -class BaseTest : public ::testing::Test { - // You can inherit all the usual members for a non-parameterized test - // fixture here. -}; - -class DerivedTest : public BaseTest, public ::testing::WithParamInterface { - // The usual test fixture members go here too. -}; - -TEST_F(BaseTest, HasFoo) { - // This is an ordinary non-parameterized test. -} - -TEST_P(DerivedTest, DoesBlah) { - // GetParam works just the same here as if you inherit from TestWithParam. - EXPECT_TRUE(foo.Blah(GetParam())); -} - -#endif // 0 - -#include "gtest/internal/gtest-port.h" - -#if !GTEST_OS_SYMBIAN -# include -#endif - -#include "gtest/internal/gtest-internal.h" -#include "gtest/internal/gtest-param-util.h" -#include "gtest/internal/gtest-param-util-generated.h" - -namespace testing { - -// Functions producing parameter generators. -// -// Google Test uses these generators to produce parameters for value- -// parameterized tests. When a parameterized test case is instantiated -// with a particular generator, Google Test creates and runs tests -// for each element in the sequence produced by the generator. -// -// In the following sample, tests from test case FooTest are instantiated -// each three times with parameter values 3, 5, and 8: -// -// class FooTest : public TestWithParam { ... }; -// -// TEST_P(FooTest, TestThis) { -// } -// TEST_P(FooTest, TestThat) { -// } -// INSTANTIATE_TEST_CASE_P(TestSequence, FooTest, Values(3, 5, 8)); -// - -// Range() returns generators providing sequences of values in a range. -// -// Synopsis: -// Range(start, end) -// - returns a generator producing a sequence of values {start, start+1, -// start+2, ..., }. -// Range(start, end, step) -// - returns a generator producing a sequence of values {start, start+step, -// start+step+step, ..., }. -// Notes: -// * The generated sequences never include end. For example, Range(1, 5) -// returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2) -// returns a generator producing {1, 3, 5, 7}. -// * start and end must have the same type. That type may be any integral or -// floating-point type or a user defined type satisfying these conditions: -// * It must be assignable (have operator=() defined). -// * It must have operator+() (operator+(int-compatible type) for -// two-operand version). -// * It must have operator<() defined. -// Elements in the resulting sequences will also have that type. -// * Condition start < end must be satisfied in order for resulting sequences -// to contain any elements. -// -template -internal::ParamGenerator Range(T start, T end, IncrementT step) { - return internal::ParamGenerator( - new internal::RangeGenerator(start, end, step)); -} - -template -internal::ParamGenerator Range(T start, T end) { - return Range(start, end, 1); -} - -// ValuesIn() function allows generation of tests with parameters coming from -// a container. -// -// Synopsis: -// ValuesIn(const T (&array)[N]) -// - returns a generator producing sequences with elements from -// a C-style array. -// ValuesIn(const Container& container) -// - returns a generator producing sequences with elements from -// an STL-style container. -// ValuesIn(Iterator begin, Iterator end) -// - returns a generator producing sequences with elements from -// a range [begin, end) defined by a pair of STL-style iterators. These -// iterators can also be plain C pointers. -// -// Please note that ValuesIn copies the values from the containers -// passed in and keeps them to generate tests in RUN_ALL_TESTS(). -// -// Examples: -// -// This instantiates tests from test case StringTest -// each with C-string values of "foo", "bar", and "baz": -// -// const char* strings[] = {"foo", "bar", "baz"}; -// INSTANTIATE_TEST_CASE_P(StringSequence, StringTest, ValuesIn(strings)); -// -// This instantiates tests from test case StlStringTest -// each with STL strings with values "a" and "b": -// -// ::std::vector< ::std::string> GetParameterStrings() { -// ::std::vector< ::std::string> v; -// v.push_back("a"); -// v.push_back("b"); -// return v; -// } -// -// INSTANTIATE_TEST_CASE_P(CharSequence, -// StlStringTest, -// ValuesIn(GetParameterStrings())); -// -// -// This will also instantiate tests from CharTest -// each with parameter values 'a' and 'b': -// -// ::std::list GetParameterChars() { -// ::std::list list; -// list.push_back('a'); -// list.push_back('b'); -// return list; -// } -// ::std::list l = GetParameterChars(); -// INSTANTIATE_TEST_CASE_P(CharSequence2, -// CharTest, -// ValuesIn(l.begin(), l.end())); -// -template -internal::ParamGenerator< - typename ::testing::internal::IteratorTraits::value_type> -ValuesIn(ForwardIterator begin, ForwardIterator end) { - typedef typename ::testing::internal::IteratorTraits - ::value_type ParamType; - return internal::ParamGenerator( - new internal::ValuesInIteratorRangeGenerator(begin, end)); -} - -template -internal::ParamGenerator ValuesIn(const T (&array)[N]) { - return ValuesIn(array, array + N); -} - -template -internal::ParamGenerator ValuesIn( - const Container& container) { - return ValuesIn(container.begin(), container.end()); -} - -// Values() allows generating tests from explicitly specified list of -// parameters. -// -// Synopsis: -// Values(T v1, T v2, ..., T vN) -// - returns a generator producing sequences with elements v1, v2, ..., vN. -// -// For example, this instantiates tests from test case BarTest each -// with values "one", "two", and "three": -// -// INSTANTIATE_TEST_CASE_P(NumSequence, BarTest, Values("one", "two", "three")); -// -// This instantiates tests from test case BazTest each with values 1, 2, 3.5. -// The exact type of values will depend on the type of parameter in BazTest. -// -// INSTANTIATE_TEST_CASE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5)); -// -// Currently, Values() supports from 1 to $n parameters. -// -$range i 1..n -$for i [[ -$range j 1..i - -template <$for j, [[typename T$j]]> -internal::ValueArray$i<$for j, [[T$j]]> Values($for j, [[T$j v$j]]) { - return internal::ValueArray$i<$for j, [[T$j]]>($for j, [[v$j]]); -} - -]] - -// Bool() allows generating tests with parameters in a set of (false, true). -// -// Synopsis: -// Bool() -// - returns a generator producing sequences with elements {false, true}. -// -// It is useful when testing code that depends on Boolean flags. Combinations -// of multiple flags can be tested when several Bool()'s are combined using -// Combine() function. -// -// In the following example all tests in the test case FlagDependentTest -// will be instantiated twice with parameters false and true. -// -// class FlagDependentTest : public testing::TestWithParam { -// virtual void SetUp() { -// external_flag = GetParam(); -// } -// } -// INSTANTIATE_TEST_CASE_P(BoolSequence, FlagDependentTest, Bool()); -// -inline internal::ParamGenerator Bool() { - return Values(false, true); -} - -# if GTEST_HAS_COMBINE -// Combine() allows the user to combine two or more sequences to produce -// values of a Cartesian product of those sequences' elements. -// -// Synopsis: -// Combine(gen1, gen2, ..., genN) -// - returns a generator producing sequences with elements coming from -// the Cartesian product of elements from the sequences generated by -// gen1, gen2, ..., genN. The sequence elements will have a type of -// tuple where T1, T2, ..., TN are the types -// of elements from sequences produces by gen1, gen2, ..., genN. -// -// Combine can have up to $maxtuple arguments. This number is currently limited -// by the maximum number of elements in the tuple implementation used by Google -// Test. -// -// Example: -// -// This will instantiate tests in test case AnimalTest each one with -// the parameter values tuple("cat", BLACK), tuple("cat", WHITE), -// tuple("dog", BLACK), and tuple("dog", WHITE): -// -// enum Color { BLACK, GRAY, WHITE }; -// class AnimalTest -// : public testing::TestWithParam > {...}; -// -// TEST_P(AnimalTest, AnimalLooksNice) {...} -// -// INSTANTIATE_TEST_CASE_P(AnimalVariations, AnimalTest, -// Combine(Values("cat", "dog"), -// Values(BLACK, WHITE))); -// -// This will instantiate tests in FlagDependentTest with all variations of two -// Boolean flags: -// -// class FlagDependentTest -// : public testing::TestWithParam > { -// virtual void SetUp() { -// // Assigns external_flag_1 and external_flag_2 values from the tuple. -// tie(external_flag_1, external_flag_2) = GetParam(); -// } -// }; -// -// TEST_P(FlagDependentTest, TestFeature1) { -// // Test your code using external_flag_1 and external_flag_2 here. -// } -// INSTANTIATE_TEST_CASE_P(TwoBoolSequence, FlagDependentTest, -// Combine(Bool(), Bool())); -// -$range i 2..maxtuple -$for i [[ -$range j 1..i - -template <$for j, [[typename Generator$j]]> -internal::CartesianProductHolder$i<$for j, [[Generator$j]]> Combine( - $for j, [[const Generator$j& g$j]]) { - return internal::CartesianProductHolder$i<$for j, [[Generator$j]]>( - $for j, [[g$j]]); -} - -]] -# endif // GTEST_HAS_COMBINE - -# define TEST_P(test_case_name, test_name) \ - class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \ - : public test_case_name { \ - public: \ - GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \ - virtual void TestBody(); \ - private: \ - static int AddToRegistry() { \ - ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ - GetTestCasePatternHolder(\ - #test_case_name, \ - ::testing::internal::CodeLocation(\ - __FILE__, __LINE__))->AddTestPattern(\ - GTEST_STRINGIFY_(test_case_name), \ - GTEST_STRINGIFY_(test_name), \ - new ::testing::internal::TestMetaFactory< \ - GTEST_TEST_CLASS_NAME_(\ - test_case_name, test_name)>()); \ - return 0; \ - } \ - static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_; \ - GTEST_DISALLOW_COPY_AND_ASSIGN_(\ - GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \ - }; \ - int GTEST_TEST_CLASS_NAME_(test_case_name, \ - test_name)::gtest_registering_dummy_ = \ - GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \ - void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody() - -// The optional last argument to INSTANTIATE_TEST_CASE_P allows the user -// to specify a function or functor that generates custom test name suffixes -// based on the test parameters. The function should accept one argument of -// type testing::TestParamInfo, and return std::string. -// -// testing::PrintToStringParamName is a builtin test suffix generator that -// returns the value of testing::PrintToString(GetParam()). -// -// Note: test names must be non-empty, unique, and may only contain ASCII -// alphanumeric characters or underscore. Because PrintToString adds quotes -// to std::string and C strings, it won't work for these types. - -# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \ - static ::testing::internal::ParamGenerator \ - gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \ - static ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \ - const ::testing::TestParamInfo& info) { \ - return ::testing::internal::GetParamNameGen \ - (__VA_ARGS__)(info); \ - } \ - static int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \ - ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ - GetTestCasePatternHolder(\ - #test_case_name, \ - ::testing::internal::CodeLocation(\ - __FILE__, __LINE__))->AddTestCaseInstantiation(\ - #prefix, \ - >est_##prefix##test_case_name##_EvalGenerator_, \ - >est_##prefix##test_case_name##_EvalGenerateName_, \ - __FILE__, __LINE__) - -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ diff --git a/test/gtest-1.8.0/include/gtest/gtest-printers.h b/test/gtest-1.8.0/include/gtest/gtest-printers.h deleted file mode 100644 index e53963b42c..0000000000 --- a/test/gtest-1.8.0/include/gtest/gtest-printers.h +++ /dev/null @@ -1,1078 +0,0 @@ -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Test - The Google C++ Testing and Mocking Framework -// -// This file implements a universal value printer that can print a -// value of any type T: -// -// void ::testing::internal::UniversalPrinter::Print(value, ostream_ptr); -// -// A user can teach this function how to print a class type T by -// defining either operator<<() or PrintTo() in the namespace that -// defines T. More specifically, the FIRST defined function in the -// following list will be used (assuming T is defined in namespace -// foo): -// -// 1. foo::PrintTo(const T&, ostream*) -// 2. operator<<(ostream&, const T&) defined in either foo or the -// global namespace. -// -// However if T is an STL-style container then it is printed element-wise -// unless foo::PrintTo(const T&, ostream*) is defined. Note that -// operator<<() is ignored for container types. -// -// If none of the above is defined, it will print the debug string of -// the value if it is a protocol buffer, or print the raw bytes in the -// value otherwise. -// -// To aid debugging: when T is a reference type, the address of the -// value is also printed; when T is a (const) char pointer, both the -// pointer value and the NUL-terminated string it points to are -// printed. -// -// We also provide some convenient wrappers: -// -// // Prints a value to a string. For a (const or not) char -// // pointer, the NUL-terminated string (but not the pointer) is -// // printed. -// std::string ::testing::PrintToString(const T& value); -// -// // Prints a value tersely: for a reference type, the referenced -// // value (but not the address) is printed; for a (const or not) char -// // pointer, the NUL-terminated string (but not the pointer) is -// // printed. -// void ::testing::internal::UniversalTersePrint(const T& value, ostream*); -// -// // Prints value using the type inferred by the compiler. The difference -// // from UniversalTersePrint() is that this function prints both the -// // pointer and the NUL-terminated string for a (const or not) char pointer. -// void ::testing::internal::UniversalPrint(const T& value, ostream*); -// -// // Prints the fields of a tuple tersely to a string vector, one -// // element for each field. Tuple support must be enabled in -// // gtest-port.h. -// std::vector UniversalTersePrintTupleFieldsToStrings( -// const Tuple& value); -// -// Known limitation: -// -// The print primitives print the elements of an STL-style container -// using the compiler-inferred type of *iter where iter is a -// const_iterator of the container. When const_iterator is an input -// iterator but not a forward iterator, this inferred type may not -// match value_type, and the print output may be incorrect. In -// practice, this is rarely a problem as for most containers -// const_iterator is a forward iterator. We'll fix this if there's an -// actual need for it. Note that this fix cannot rely on value_type -// being defined as many user-defined container types don't have -// value_type. - -#ifndef GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_ -#define GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_ - -#include // NOLINT -#include -#include -#include -#include -#include "gtest/internal/gtest-port.h" -#include "gtest/internal/gtest-internal.h" - -#if GTEST_HAS_STD_TUPLE_ -# include -#endif - -#if GTEST_HAS_ABSL -#include "absl/strings/string_view.h" -#include "absl/types/optional.h" -#endif // GTEST_HAS_ABSL - -namespace testing { - -// Definitions in the 'internal' and 'internal2' name spaces are -// subject to change without notice. DO NOT USE THEM IN USER CODE! -namespace internal2 { - -// Prints the given number of bytes in the given object to the given -// ostream. -GTEST_API_ void PrintBytesInObjectTo(const unsigned char* obj_bytes, - size_t count, - ::std::ostream* os); - -// For selecting which printer to use when a given type has neither << -// nor PrintTo(). -enum TypeKind { - kProtobuf, // a protobuf type - kConvertibleToInteger, // a type implicitly convertible to BiggestInt - // (e.g. a named or unnamed enum type) -#if GTEST_HAS_ABSL - kConvertibleToStringView, // a type implicitly convertible to - // absl::string_view -#endif - kOtherType // anything else -}; - -// TypeWithoutFormatter::PrintValue(value, os) is called -// by the universal printer to print a value of type T when neither -// operator<< nor PrintTo() is defined for T, where kTypeKind is the -// "kind" of T as defined by enum TypeKind. -template -class TypeWithoutFormatter { - public: - // This default version is called when kTypeKind is kOtherType. - static void PrintValue(const T& value, ::std::ostream* os) { - PrintBytesInObjectTo(static_cast( - reinterpret_cast(&value)), - sizeof(value), os); - } -}; - -// We print a protobuf using its ShortDebugString() when the string -// doesn't exceed this many characters; otherwise we print it using -// DebugString() for better readability. -const size_t kProtobufOneLinerMaxLength = 50; - -template -class TypeWithoutFormatter { - public: - static void PrintValue(const T& value, ::std::ostream* os) { - std::string pretty_str = value.ShortDebugString(); - if (pretty_str.length() > kProtobufOneLinerMaxLength) { - pretty_str = "\n" + value.DebugString(); - } - *os << ("<" + pretty_str + ">"); - } -}; - -template -class TypeWithoutFormatter { - public: - // Since T has no << operator or PrintTo() but can be implicitly - // converted to BiggestInt, we print it as a BiggestInt. - // - // Most likely T is an enum type (either named or unnamed), in which - // case printing it as an integer is the desired behavior. In case - // T is not an enum, printing it as an integer is the best we can do - // given that it has no user-defined printer. - static void PrintValue(const T& value, ::std::ostream* os) { - const internal::BiggestInt kBigInt = value; - *os << kBigInt; - } -}; - -#if GTEST_HAS_ABSL -template -class TypeWithoutFormatter { - public: - // Since T has neither operator<< nor PrintTo() but can be implicitly - // converted to absl::string_view, we print it as a absl::string_view. - // - // Note: the implementation is further below, as it depends on - // internal::PrintTo symbol which is defined later in the file. - static void PrintValue(const T& value, ::std::ostream* os); -}; -#endif - -// Prints the given value to the given ostream. If the value is a -// protocol message, its debug string is printed; if it's an enum or -// of a type implicitly convertible to BiggestInt, it's printed as an -// integer; otherwise the bytes in the value are printed. This is -// what UniversalPrinter::Print() does when it knows nothing about -// type T and T has neither << operator nor PrintTo(). -// -// A user can override this behavior for a class type Foo by defining -// a << operator in the namespace where Foo is defined. -// -// We put this operator in namespace 'internal2' instead of 'internal' -// to simplify the implementation, as much code in 'internal' needs to -// use << in STL, which would conflict with our own << were it defined -// in 'internal'. -// -// Note that this operator<< takes a generic std::basic_ostream type instead of the more restricted std::ostream. If -// we define it to take an std::ostream instead, we'll get an -// "ambiguous overloads" compiler error when trying to print a type -// Foo that supports streaming to std::basic_ostream, as the compiler cannot tell whether -// operator<<(std::ostream&, const T&) or -// operator<<(std::basic_stream, const Foo&) is more -// specific. -template -::std::basic_ostream& operator<<( - ::std::basic_ostream& os, const T& x) { - TypeWithoutFormatter::value - ? kProtobuf - : internal::ImplicitlyConvertible< - const T&, internal::BiggestInt>::value - ? kConvertibleToInteger - : -#if GTEST_HAS_ABSL - internal::ImplicitlyConvertible< - const T&, absl::string_view>::value - ? kConvertibleToStringView - : -#endif - kOtherType)>::PrintValue(x, &os); - return os; -} - -} // namespace internal2 -} // namespace testing - -// This namespace MUST NOT BE NESTED IN ::testing, or the name look-up -// magic needed for implementing UniversalPrinter won't work. -namespace testing_internal { - -// Used to print a value that is not an STL-style container when the -// user doesn't define PrintTo() for it. -template -void DefaultPrintNonContainerTo(const T& value, ::std::ostream* os) { - // With the following statement, during unqualified name lookup, - // testing::internal2::operator<< appears as if it was declared in - // the nearest enclosing namespace that contains both - // ::testing_internal and ::testing::internal2, i.e. the global - // namespace. For more details, refer to the C++ Standard section - // 7.3.4-1 [namespace.udir]. This allows us to fall back onto - // testing::internal2::operator<< in case T doesn't come with a << - // operator. - // - // We cannot write 'using ::testing::internal2::operator<<;', which - // gcc 3.3 fails to compile due to a compiler bug. - using namespace ::testing::internal2; // NOLINT - - // Assuming T is defined in namespace foo, in the next statement, - // the compiler will consider all of: - // - // 1. foo::operator<< (thanks to Koenig look-up), - // 2. ::operator<< (as the current namespace is enclosed in ::), - // 3. testing::internal2::operator<< (thanks to the using statement above). - // - // The operator<< whose type matches T best will be picked. - // - // We deliberately allow #2 to be a candidate, as sometimes it's - // impossible to define #1 (e.g. when foo is ::std, defining - // anything in it is undefined behavior unless you are a compiler - // vendor.). - *os << value; -} - -} // namespace testing_internal - -namespace testing { -namespace internal { - -// FormatForComparison::Format(value) formats a -// value of type ToPrint that is an operand of a comparison assertion -// (e.g. ASSERT_EQ). OtherOperand is the type of the other operand in -// the comparison, and is used to help determine the best way to -// format the value. In particular, when the value is a C string -// (char pointer) and the other operand is an STL string object, we -// want to format the C string as a string, since we know it is -// compared by value with the string object. If the value is a char -// pointer but the other operand is not an STL string object, we don't -// know whether the pointer is supposed to point to a NUL-terminated -// string, and thus want to print it as a pointer to be safe. -// -// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. - -// The default case. -template -class FormatForComparison { - public: - static ::std::string Format(const ToPrint& value) { - return ::testing::PrintToString(value); - } -}; - -// Array. -template -class FormatForComparison { - public: - static ::std::string Format(const ToPrint* value) { - return FormatForComparison::Format(value); - } -}; - -// By default, print C string as pointers to be safe, as we don't know -// whether they actually point to a NUL-terminated string. - -#define GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(CharType) \ - template \ - class FormatForComparison { \ - public: \ - static ::std::string Format(CharType* value) { \ - return ::testing::PrintToString(static_cast(value)); \ - } \ - } - -GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char); -GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char); -GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t); -GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t); - -#undef GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_ - -// If a C string is compared with an STL string object, we know it's meant -// to point to a NUL-terminated string, and thus can print it as a string. - -#define GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(CharType, OtherStringType) \ - template <> \ - class FormatForComparison { \ - public: \ - static ::std::string Format(CharType* value) { \ - return ::testing::PrintToString(value); \ - } \ - } - -GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string); -GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string); - -#if GTEST_HAS_GLOBAL_STRING -GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::string); -GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::string); -#endif - -#if GTEST_HAS_GLOBAL_WSTRING -GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::wstring); -GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::wstring); -#endif - -#if GTEST_HAS_STD_WSTRING -GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::std::wstring); -GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::std::wstring); -#endif - -#undef GTEST_IMPL_FORMAT_C_STRING_AS_STRING_ - -// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc) -// operand to be used in a failure message. The type (but not value) -// of the other operand may affect the format. This allows us to -// print a char* as a raw pointer when it is compared against another -// char* or void*, and print it as a C string when it is compared -// against an std::string object, for example. -// -// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. -template -std::string FormatForComparisonFailureMessage( - const T1& value, const T2& /* other_operand */) { - return FormatForComparison::Format(value); -} - -// UniversalPrinter::Print(value, ostream_ptr) prints the given -// value to the given ostream. The caller must ensure that -// 'ostream_ptr' is not NULL, or the behavior is undefined. -// -// We define UniversalPrinter as a class template (as opposed to a -// function template), as we need to partially specialize it for -// reference types, which cannot be done with function templates. -template -class UniversalPrinter; - -template -void UniversalPrint(const T& value, ::std::ostream* os); - -enum DefaultPrinterType { - kPrintContainer, - kPrintPointer, - kPrintFunctionPointer, - kPrintOther, -}; -template struct WrapPrinterType {}; - -// Used to print an STL-style container when the user doesn't define -// a PrintTo() for it. -template -void DefaultPrintTo(WrapPrinterType /* dummy */, - const C& container, ::std::ostream* os) { - const size_t kMaxCount = 32; // The maximum number of elements to print. - *os << '{'; - size_t count = 0; - for (typename C::const_iterator it = container.begin(); - it != container.end(); ++it, ++count) { - if (count > 0) { - *os << ','; - if (count == kMaxCount) { // Enough has been printed. - *os << " ..."; - break; - } - } - *os << ' '; - // We cannot call PrintTo(*it, os) here as PrintTo() doesn't - // handle *it being a native array. - internal::UniversalPrint(*it, os); - } - - if (count > 0) { - *os << ' '; - } - *os << '}'; -} - -// Used to print a pointer that is neither a char pointer nor a member -// pointer, when the user doesn't define PrintTo() for it. (A member -// variable pointer or member function pointer doesn't really point to -// a location in the address space. Their representation is -// implementation-defined. Therefore they will be printed as raw -// bytes.) -template -void DefaultPrintTo(WrapPrinterType /* dummy */, - T* p, ::std::ostream* os) { - if (p == NULL) { - *os << "NULL"; - } else { - // T is not a function type. We just call << to print p, - // relying on ADL to pick up user-defined << for their pointer - // types, if any. - *os << p; - } -} -template -void DefaultPrintTo(WrapPrinterType /* dummy */, - T* p, ::std::ostream* os) { - if (p == NULL) { - *os << "NULL"; - } else { - // T is a function type, so '*os << p' doesn't do what we want - // (it just prints p as bool). We want to print p as a const - // void*. - *os << reinterpret_cast(p); - } -} - -// Used to print a non-container, non-pointer value when the user -// doesn't define PrintTo() for it. -template -void DefaultPrintTo(WrapPrinterType /* dummy */, - const T& value, ::std::ostream* os) { - ::testing_internal::DefaultPrintNonContainerTo(value, os); -} - -// Prints the given value using the << operator if it has one; -// otherwise prints the bytes in it. This is what -// UniversalPrinter::Print() does when PrintTo() is not specialized -// or overloaded for type T. -// -// A user can override this behavior for a class type Foo by defining -// an overload of PrintTo() in the namespace where Foo is defined. We -// give the user this option as sometimes defining a << operator for -// Foo is not desirable (e.g. the coding style may prevent doing it, -// or there is already a << operator but it doesn't do what the user -// wants). -template -void PrintTo(const T& value, ::std::ostream* os) { - // DefaultPrintTo() is overloaded. The type of its first argument - // determines which version will be picked. - // - // Note that we check for container types here, prior to we check - // for protocol message types in our operator<<. The rationale is: - // - // For protocol messages, we want to give people a chance to - // override Google Mock's format by defining a PrintTo() or - // operator<<. For STL containers, other formats can be - // incompatible with Google Mock's format for the container - // elements; therefore we check for container types here to ensure - // that our format is used. - // - // Note that MSVC and clang-cl do allow an implicit conversion from - // pointer-to-function to pointer-to-object, but clang-cl warns on it. - // So don't use ImplicitlyConvertible if it can be helped since it will - // cause this warning, and use a separate overload of DefaultPrintTo for - // function pointers so that the `*os << p` in the object pointer overload - // doesn't cause that warning either. - DefaultPrintTo( - WrapPrinterType < - (sizeof(IsContainerTest(0)) == sizeof(IsContainer)) && - !IsRecursiveContainer::value - ? kPrintContainer - : !is_pointer::value - ? kPrintOther -#if GTEST_LANG_CXX11 - : std::is_function::type>::value -#else - : !internal::ImplicitlyConvertible::value -#endif - ? kPrintFunctionPointer - : kPrintPointer > (), - value, os); -} - -// The following list of PrintTo() overloads tells -// UniversalPrinter::Print() how to print standard types (built-in -// types, strings, plain arrays, and pointers). - -// Overloads for various char types. -GTEST_API_ void PrintTo(unsigned char c, ::std::ostream* os); -GTEST_API_ void PrintTo(signed char c, ::std::ostream* os); -inline void PrintTo(char c, ::std::ostream* os) { - // When printing a plain char, we always treat it as unsigned. This - // way, the output won't be affected by whether the compiler thinks - // char is signed or not. - PrintTo(static_cast(c), os); -} - -// Overloads for other simple built-in types. -inline void PrintTo(bool x, ::std::ostream* os) { - *os << (x ? "true" : "false"); -} - -// Overload for wchar_t type. -// Prints a wchar_t as a symbol if it is printable or as its internal -// code otherwise and also as its decimal code (except for L'\0'). -// The L'\0' char is printed as "L'\\0'". The decimal code is printed -// as signed integer when wchar_t is implemented by the compiler -// as a signed type and is printed as an unsigned integer when wchar_t -// is implemented as an unsigned type. -GTEST_API_ void PrintTo(wchar_t wc, ::std::ostream* os); - -// Overloads for C strings. -GTEST_API_ void PrintTo(const char* s, ::std::ostream* os); -inline void PrintTo(char* s, ::std::ostream* os) { - PrintTo(ImplicitCast_(s), os); -} - -// signed/unsigned char is often used for representing binary data, so -// we print pointers to it as void* to be safe. -inline void PrintTo(const signed char* s, ::std::ostream* os) { - PrintTo(ImplicitCast_(s), os); -} -inline void PrintTo(signed char* s, ::std::ostream* os) { - PrintTo(ImplicitCast_(s), os); -} -inline void PrintTo(const unsigned char* s, ::std::ostream* os) { - PrintTo(ImplicitCast_(s), os); -} -inline void PrintTo(unsigned char* s, ::std::ostream* os) { - PrintTo(ImplicitCast_(s), os); -} - -// MSVC can be configured to define wchar_t as a typedef of unsigned -// short. It defines _NATIVE_WCHAR_T_DEFINED when wchar_t is a native -// type. When wchar_t is a typedef, defining an overload for const -// wchar_t* would cause unsigned short* be printed as a wide string, -// possibly causing invalid memory accesses. -#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED) -// Overloads for wide C strings -GTEST_API_ void PrintTo(const wchar_t* s, ::std::ostream* os); -inline void PrintTo(wchar_t* s, ::std::ostream* os) { - PrintTo(ImplicitCast_(s), os); -} -#endif - -// Overload for C arrays. Multi-dimensional arrays are printed -// properly. - -// Prints the given number of elements in an array, without printing -// the curly braces. -template -void PrintRawArrayTo(const T a[], size_t count, ::std::ostream* os) { - UniversalPrint(a[0], os); - for (size_t i = 1; i != count; i++) { - *os << ", "; - UniversalPrint(a[i], os); - } -} - -// Overloads for ::string and ::std::string. -#if GTEST_HAS_GLOBAL_STRING -GTEST_API_ void PrintStringTo(const ::string&s, ::std::ostream* os); -inline void PrintTo(const ::string& s, ::std::ostream* os) { - PrintStringTo(s, os); -} -#endif // GTEST_HAS_GLOBAL_STRING - -GTEST_API_ void PrintStringTo(const ::std::string&s, ::std::ostream* os); -inline void PrintTo(const ::std::string& s, ::std::ostream* os) { - PrintStringTo(s, os); -} - -// Overloads for ::wstring and ::std::wstring. -#if GTEST_HAS_GLOBAL_WSTRING -GTEST_API_ void PrintWideStringTo(const ::wstring&s, ::std::ostream* os); -inline void PrintTo(const ::wstring& s, ::std::ostream* os) { - PrintWideStringTo(s, os); -} -#endif // GTEST_HAS_GLOBAL_WSTRING - -#if GTEST_HAS_STD_WSTRING -GTEST_API_ void PrintWideStringTo(const ::std::wstring&s, ::std::ostream* os); -inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) { - PrintWideStringTo(s, os); -} -#endif // GTEST_HAS_STD_WSTRING - -#if GTEST_HAS_ABSL -// Overload for absl::string_view. -inline void PrintTo(absl::string_view sp, ::std::ostream* os) { - PrintTo(::std::string(sp), os); -} -#endif // GTEST_HAS_ABSL - -#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_ -// Helper function for printing a tuple. T must be instantiated with -// a tuple type. -template -void PrintTupleTo(const T& t, ::std::ostream* os); -#endif // GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_ - -#if GTEST_HAS_TR1_TUPLE -// Overload for ::std::tr1::tuple. Needed for printing function arguments, -// which are packed as tuples. - -// Overloaded PrintTo() for tuples of various arities. We support -// tuples of up-to 10 fields. The following implementation works -// regardless of whether tr1::tuple is implemented using the -// non-standard variadic template feature or not. - -inline void PrintTo(const ::std::tr1::tuple<>& t, ::std::ostream* os) { - PrintTupleTo(t, os); -} - -template -void PrintTo(const ::std::tr1::tuple& t, ::std::ostream* os) { - PrintTupleTo(t, os); -} - -template -void PrintTo(const ::std::tr1::tuple& t, ::std::ostream* os) { - PrintTupleTo(t, os); -} - -template -void PrintTo(const ::std::tr1::tuple& t, ::std::ostream* os) { - PrintTupleTo(t, os); -} - -template -void PrintTo(const ::std::tr1::tuple& t, ::std::ostream* os) { - PrintTupleTo(t, os); -} - -template -void PrintTo(const ::std::tr1::tuple& t, - ::std::ostream* os) { - PrintTupleTo(t, os); -} - -template -void PrintTo(const ::std::tr1::tuple& t, - ::std::ostream* os) { - PrintTupleTo(t, os); -} - -template -void PrintTo(const ::std::tr1::tuple& t, - ::std::ostream* os) { - PrintTupleTo(t, os); -} - -template -void PrintTo(const ::std::tr1::tuple& t, - ::std::ostream* os) { - PrintTupleTo(t, os); -} - -template -void PrintTo(const ::std::tr1::tuple& t, - ::std::ostream* os) { - PrintTupleTo(t, os); -} - -template -void PrintTo( - const ::std::tr1::tuple& t, - ::std::ostream* os) { - PrintTupleTo(t, os); -} -#endif // GTEST_HAS_TR1_TUPLE - -#if GTEST_HAS_STD_TUPLE_ -template -void PrintTo(const ::std::tuple& t, ::std::ostream* os) { - PrintTupleTo(t, os); -} -#endif // GTEST_HAS_STD_TUPLE_ - -// Overload for std::pair. -template -void PrintTo(const ::std::pair& value, ::std::ostream* os) { - *os << '('; - // We cannot use UniversalPrint(value.first, os) here, as T1 may be - // a reference type. The same for printing value.second. - UniversalPrinter::Print(value.first, os); - *os << ", "; - UniversalPrinter::Print(value.second, os); - *os << ')'; -} - -// Implements printing a non-reference type T by letting the compiler -// pick the right overload of PrintTo() for T. -template -class UniversalPrinter { - public: - // MSVC warns about adding const to a function type, so we want to - // disable the warning. - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180) - - // Note: we deliberately don't call this PrintTo(), as that name - // conflicts with ::testing::internal::PrintTo in the body of the - // function. - static void Print(const T& value, ::std::ostream* os) { - // By default, ::testing::internal::PrintTo() is used for printing - // the value. - // - // Thanks to Koenig look-up, if T is a class and has its own - // PrintTo() function defined in its namespace, that function will - // be visible here. Since it is more specific than the generic ones - // in ::testing::internal, it will be picked by the compiler in the - // following statement - exactly what we want. - PrintTo(value, os); - } - - GTEST_DISABLE_MSC_WARNINGS_POP_() -}; - -#if GTEST_HAS_ABSL - -// Printer for absl::optional - -template -class UniversalPrinter<::absl::optional> { - public: - static void Print(const ::absl::optional& value, ::std::ostream* os) { - *os << '('; - if (!value) { - *os << "nullopt"; - } else { - UniversalPrint(*value, os); - } - *os << ')'; - } -}; - -#endif // GTEST_HAS_ABSL - -// UniversalPrintArray(begin, len, os) prints an array of 'len' -// elements, starting at address 'begin'. -template -void UniversalPrintArray(const T* begin, size_t len, ::std::ostream* os) { - if (len == 0) { - *os << "{}"; - } else { - *os << "{ "; - const size_t kThreshold = 18; - const size_t kChunkSize = 8; - // If the array has more than kThreshold elements, we'll have to - // omit some details by printing only the first and the last - // kChunkSize elements. - // TODO(wan@google.com): let the user control the threshold using a flag. - if (len <= kThreshold) { - PrintRawArrayTo(begin, len, os); - } else { - PrintRawArrayTo(begin, kChunkSize, os); - *os << ", ..., "; - PrintRawArrayTo(begin + len - kChunkSize, kChunkSize, os); - } - *os << " }"; - } -} -// This overload prints a (const) char array compactly. -GTEST_API_ void UniversalPrintArray( - const char* begin, size_t len, ::std::ostream* os); - -// This overload prints a (const) wchar_t array compactly. -GTEST_API_ void UniversalPrintArray( - const wchar_t* begin, size_t len, ::std::ostream* os); - -// Implements printing an array type T[N]. -template -class UniversalPrinter { - public: - // Prints the given array, omitting some elements when there are too - // many. - static void Print(const T (&a)[N], ::std::ostream* os) { - UniversalPrintArray(a, N, os); - } -}; - -// Implements printing a reference type T&. -template -class UniversalPrinter { - public: - // MSVC warns about adding const to a function type, so we want to - // disable the warning. - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180) - - static void Print(const T& value, ::std::ostream* os) { - // Prints the address of the value. We use reinterpret_cast here - // as static_cast doesn't compile when T is a function type. - *os << "@" << reinterpret_cast(&value) << " "; - - // Then prints the value itself. - UniversalPrint(value, os); - } - - GTEST_DISABLE_MSC_WARNINGS_POP_() -}; - -// Prints a value tersely: for a reference type, the referenced value -// (but not the address) is printed; for a (const) char pointer, the -// NUL-terminated string (but not the pointer) is printed. - -template -class UniversalTersePrinter { - public: - static void Print(const T& value, ::std::ostream* os) { - UniversalPrint(value, os); - } -}; -template -class UniversalTersePrinter { - public: - static void Print(const T& value, ::std::ostream* os) { - UniversalPrint(value, os); - } -}; -template -class UniversalTersePrinter { - public: - static void Print(const T (&value)[N], ::std::ostream* os) { - UniversalPrinter::Print(value, os); - } -}; -template <> -class UniversalTersePrinter { - public: - static void Print(const char* str, ::std::ostream* os) { - if (str == NULL) { - *os << "NULL"; - } else { - UniversalPrint(std::string(str), os); - } - } -}; -template <> -class UniversalTersePrinter { - public: - static void Print(char* str, ::std::ostream* os) { - UniversalTersePrinter::Print(str, os); - } -}; - -#if GTEST_HAS_STD_WSTRING -template <> -class UniversalTersePrinter { - public: - static void Print(const wchar_t* str, ::std::ostream* os) { - if (str == NULL) { - *os << "NULL"; - } else { - UniversalPrint(::std::wstring(str), os); - } - } -}; -#endif - -template <> -class UniversalTersePrinter { - public: - static void Print(wchar_t* str, ::std::ostream* os) { - UniversalTersePrinter::Print(str, os); - } -}; - -template -void UniversalTersePrint(const T& value, ::std::ostream* os) { - UniversalTersePrinter::Print(value, os); -} - -// Prints a value using the type inferred by the compiler. The -// difference between this and UniversalTersePrint() is that for a -// (const) char pointer, this prints both the pointer and the -// NUL-terminated string. -template -void UniversalPrint(const T& value, ::std::ostream* os) { - // A workarond for the bug in VC++ 7.1 that prevents us from instantiating - // UniversalPrinter with T directly. - typedef T T1; - UniversalPrinter::Print(value, os); -} - -typedef ::std::vector< ::std::string> Strings; - -// TuplePolicy must provide: -// - tuple_size -// size of tuple TupleT. -// - get(const TupleT& t) -// static function extracting element I of tuple TupleT. -// - tuple_element::type -// type of element I of tuple TupleT. -template -struct TuplePolicy; - -#if GTEST_HAS_TR1_TUPLE -template -struct TuplePolicy { - typedef TupleT Tuple; - static const size_t tuple_size = ::std::tr1::tuple_size::value; - - template - struct tuple_element : ::std::tr1::tuple_element {}; - - template - static typename AddReference< - const typename ::std::tr1::tuple_element::type>::type get( - const Tuple& tuple) { - return ::std::tr1::get(tuple); - } -}; -template -const size_t TuplePolicy::tuple_size; -#endif // GTEST_HAS_TR1_TUPLE - -#if GTEST_HAS_STD_TUPLE_ -template -struct TuplePolicy< ::std::tuple > { - typedef ::std::tuple Tuple; - static const size_t tuple_size = ::std::tuple_size::value; - - template - struct tuple_element : ::std::tuple_element {}; - - template - static const typename ::std::tuple_element::type& get( - const Tuple& tuple) { - return ::std::get(tuple); - } -}; -template -const size_t TuplePolicy< ::std::tuple >::tuple_size; -#endif // GTEST_HAS_STD_TUPLE_ - -#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_ -// This helper template allows PrintTo() for tuples and -// UniversalTersePrintTupleFieldsToStrings() to be defined by -// induction on the number of tuple fields. The idea is that -// TuplePrefixPrinter::PrintPrefixTo(t, os) prints the first N -// fields in tuple t, and can be defined in terms of -// TuplePrefixPrinter. -// -// The inductive case. -template -struct TuplePrefixPrinter { - // Prints the first N fields of a tuple. - template - static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) { - TuplePrefixPrinter::PrintPrefixTo(t, os); - GTEST_INTENTIONAL_CONST_COND_PUSH_() - if (N > 1) { - GTEST_INTENTIONAL_CONST_COND_POP_() - *os << ", "; - } - UniversalPrinter< - typename TuplePolicy::template tuple_element::type> - ::Print(TuplePolicy::template get(t), os); - } - - // Tersely prints the first N fields of a tuple to a string vector, - // one element for each field. - template - static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) { - TuplePrefixPrinter::TersePrintPrefixToStrings(t, strings); - ::std::stringstream ss; - UniversalTersePrint(TuplePolicy::template get(t), &ss); - strings->push_back(ss.str()); - } -}; - -// Base case. -template <> -struct TuplePrefixPrinter<0> { - template - static void PrintPrefixTo(const Tuple&, ::std::ostream*) {} - - template - static void TersePrintPrefixToStrings(const Tuple&, Strings*) {} -}; - -// Helper function for printing a tuple. -// Tuple must be either std::tr1::tuple or std::tuple type. -template -void PrintTupleTo(const Tuple& t, ::std::ostream* os) { - *os << "("; - TuplePrefixPrinter::tuple_size>::PrintPrefixTo(t, os); - *os << ")"; -} - -// Prints the fields of a tuple tersely to a string vector, one -// element for each field. See the comment before -// UniversalTersePrint() for how we define "tersely". -template -Strings UniversalTersePrintTupleFieldsToStrings(const Tuple& value) { - Strings result; - TuplePrefixPrinter::tuple_size>:: - TersePrintPrefixToStrings(value, &result); - return result; -} -#endif // GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_ - -} // namespace internal - -#if GTEST_HAS_ABSL -namespace internal2 { -template -void TypeWithoutFormatter::PrintValue( - const T& value, ::std::ostream* os) { - internal::PrintTo(absl::string_view(value), os); -} -} // namespace internal2 -#endif - -template -::std::string PrintToString(const T& value) { - ::std::stringstream ss; - internal::UniversalTersePrinter::Print(value, &ss); - return ss.str(); -} - -} // namespace testing - -// Include any custom printer added by the local installation. -// We must include this header at the end to make sure it can use the -// declarations from this file. -#include "gtest/internal/custom/gtest-printers.h" - -#endif // GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_ diff --git a/test/gtest-1.8.0/include/gtest/gtest-spi.h b/test/gtest-1.8.0/include/gtest/gtest-spi.h deleted file mode 100644 index 0e5c10cf7c..0000000000 --- a/test/gtest-1.8.0/include/gtest/gtest-spi.h +++ /dev/null @@ -1,231 +0,0 @@ -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// Utilities for testing Google Test itself and code that uses Google Test -// (e.g. frameworks built on top of Google Test). - -#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_ -#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_ - -#include "gtest/gtest.h" - -namespace testing { - -// This helper class can be used to mock out Google Test failure reporting -// so that we can test Google Test or code that builds on Google Test. -// -// An object of this class appends a TestPartResult object to the -// TestPartResultArray object given in the constructor whenever a Google Test -// failure is reported. It can either intercept only failures that are -// generated in the same thread that created this object or it can intercept -// all generated failures. The scope of this mock object can be controlled with -// the second argument to the two arguments constructor. -class GTEST_API_ ScopedFakeTestPartResultReporter - : public TestPartResultReporterInterface { - public: - // The two possible mocking modes of this object. - enum InterceptMode { - INTERCEPT_ONLY_CURRENT_THREAD, // Intercepts only thread local failures. - INTERCEPT_ALL_THREADS // Intercepts all failures. - }; - - // The c'tor sets this object as the test part result reporter used - // by Google Test. The 'result' parameter specifies where to report the - // results. This reporter will only catch failures generated in the current - // thread. DEPRECATED - explicit ScopedFakeTestPartResultReporter(TestPartResultArray* result); - - // Same as above, but you can choose the interception scope of this object. - ScopedFakeTestPartResultReporter(InterceptMode intercept_mode, - TestPartResultArray* result); - - // The d'tor restores the previous test part result reporter. - virtual ~ScopedFakeTestPartResultReporter(); - - // Appends the TestPartResult object to the TestPartResultArray - // received in the constructor. - // - // This method is from the TestPartResultReporterInterface - // interface. - virtual void ReportTestPartResult(const TestPartResult& result); - private: - void Init(); - - const InterceptMode intercept_mode_; - TestPartResultReporterInterface* old_reporter_; - TestPartResultArray* const result_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedFakeTestPartResultReporter); -}; - -namespace internal { - -// A helper class for implementing EXPECT_FATAL_FAILURE() and -// EXPECT_NONFATAL_FAILURE(). Its destructor verifies that the given -// TestPartResultArray contains exactly one failure that has the given -// type and contains the given substring. If that's not the case, a -// non-fatal failure will be generated. -class GTEST_API_ SingleFailureChecker { - public: - // The constructor remembers the arguments. - SingleFailureChecker(const TestPartResultArray* results, - TestPartResult::Type type, const std::string& substr); - ~SingleFailureChecker(); - private: - const TestPartResultArray* const results_; - const TestPartResult::Type type_; - const std::string substr_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker); -}; - -} // namespace internal - -} // namespace testing - -// A set of macros for testing Google Test assertions or code that's expected -// to generate Google Test fatal failures. It verifies that the given -// statement will cause exactly one fatal Google Test failure with 'substr' -// being part of the failure message. -// -// There are two different versions of this macro. EXPECT_FATAL_FAILURE only -// affects and considers failures generated in the current thread and -// EXPECT_FATAL_FAILURE_ON_ALL_THREADS does the same but for all threads. -// -// The verification of the assertion is done correctly even when the statement -// throws an exception or aborts the current function. -// -// Known restrictions: -// - 'statement' cannot reference local non-static variables or -// non-static members of the current object. -// - 'statement' cannot return a value. -// - You cannot stream a failure message to this macro. -// -// Note that even though the implementations of the following two -// macros are much alike, we cannot refactor them to use a common -// helper macro, due to some peculiarity in how the preprocessor -// works. The AcceptsMacroThatExpandsToUnprotectedComma test in -// gtest_unittest.cc will fail to compile if we do that. -#define EXPECT_FATAL_FAILURE(statement, substr) \ - do { \ - class GTestExpectFatalFailureHelper {\ - public:\ - static void Execute() { statement; }\ - };\ - ::testing::TestPartResultArray gtest_failures;\ - ::testing::internal::SingleFailureChecker gtest_checker(\ - >est_failures, ::testing::TestPartResult::kFatalFailure, (substr));\ - {\ - ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ - ::testing::ScopedFakeTestPartResultReporter:: \ - INTERCEPT_ONLY_CURRENT_THREAD, >est_failures);\ - GTestExpectFatalFailureHelper::Execute();\ - }\ - } while (::testing::internal::AlwaysFalse()) - -#define EXPECT_FATAL_FAILURE_ON_ALL_THREADS(statement, substr) \ - do { \ - class GTestExpectFatalFailureHelper {\ - public:\ - static void Execute() { statement; }\ - };\ - ::testing::TestPartResultArray gtest_failures;\ - ::testing::internal::SingleFailureChecker gtest_checker(\ - >est_failures, ::testing::TestPartResult::kFatalFailure, (substr));\ - {\ - ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ - ::testing::ScopedFakeTestPartResultReporter:: \ - INTERCEPT_ALL_THREADS, >est_failures);\ - GTestExpectFatalFailureHelper::Execute();\ - }\ - } while (::testing::internal::AlwaysFalse()) - -// A macro for testing Google Test assertions or code that's expected to -// generate Google Test non-fatal failures. It asserts that the given -// statement will cause exactly one non-fatal Google Test failure with 'substr' -// being part of the failure message. -// -// There are two different versions of this macro. EXPECT_NONFATAL_FAILURE only -// affects and considers failures generated in the current thread and -// EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS does the same but for all threads. -// -// 'statement' is allowed to reference local variables and members of -// the current object. -// -// The verification of the assertion is done correctly even when the statement -// throws an exception or aborts the current function. -// -// Known restrictions: -// - You cannot stream a failure message to this macro. -// -// Note that even though the implementations of the following two -// macros are much alike, we cannot refactor them to use a common -// helper macro, due to some peculiarity in how the preprocessor -// works. If we do that, the code won't compile when the user gives -// EXPECT_NONFATAL_FAILURE() a statement that contains a macro that -// expands to code containing an unprotected comma. The -// AcceptsMacroThatExpandsToUnprotectedComma test in gtest_unittest.cc -// catches that. -// -// For the same reason, we have to write -// if (::testing::internal::AlwaysTrue()) { statement; } -// instead of -// GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) -// to avoid an MSVC warning on unreachable code. -#define EXPECT_NONFATAL_FAILURE(statement, substr) \ - do {\ - ::testing::TestPartResultArray gtest_failures;\ - ::testing::internal::SingleFailureChecker gtest_checker(\ - >est_failures, ::testing::TestPartResult::kNonFatalFailure, \ - (substr));\ - {\ - ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ - ::testing::ScopedFakeTestPartResultReporter:: \ - INTERCEPT_ONLY_CURRENT_THREAD, >est_failures);\ - if (::testing::internal::AlwaysTrue()) { statement; }\ - }\ - } while (::testing::internal::AlwaysFalse()) - -#define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr) \ - do {\ - ::testing::TestPartResultArray gtest_failures;\ - ::testing::internal::SingleFailureChecker gtest_checker(\ - >est_failures, ::testing::TestPartResult::kNonFatalFailure, \ - (substr));\ - {\ - ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ - ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \ - >est_failures);\ - if (::testing::internal::AlwaysTrue()) { statement; }\ - }\ - } while (::testing::internal::AlwaysFalse()) - -#endif // GTEST_INCLUDE_GTEST_GTEST_SPI_H_ diff --git a/test/gtest-1.8.0/include/gtest/gtest-test-part.h b/test/gtest-1.8.0/include/gtest/gtest-test-part.h deleted file mode 100644 index 77eb844839..0000000000 --- a/test/gtest-1.8.0/include/gtest/gtest-test-part.h +++ /dev/null @@ -1,179 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: mheule@google.com (Markus Heule) -// - -#ifndef GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_ -#define GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_ - -#include -#include -#include "gtest/internal/gtest-internal.h" -#include "gtest/internal/gtest-string.h" - -namespace testing { - -// A copyable object representing the result of a test part (i.e. an -// assertion or an explicit FAIL(), ADD_FAILURE(), or SUCCESS()). -// -// Don't inherit from TestPartResult as its destructor is not virtual. -class GTEST_API_ TestPartResult { - public: - // The possible outcomes of a test part (i.e. an assertion or an - // explicit SUCCEED(), FAIL(), or ADD_FAILURE()). - enum Type { - kSuccess, // Succeeded. - kNonFatalFailure, // Failed but the test can continue. - kFatalFailure // Failed and the test should be terminated. - }; - - // C'tor. TestPartResult does NOT have a default constructor. - // Always use this constructor (with parameters) to create a - // TestPartResult object. - TestPartResult(Type a_type, - const char* a_file_name, - int a_line_number, - const char* a_message) - : type_(a_type), - file_name_(a_file_name == NULL ? "" : a_file_name), - line_number_(a_line_number), - summary_(ExtractSummary(a_message)), - message_(a_message) { - } - - // Gets the outcome of the test part. - Type type() const { return type_; } - - // Gets the name of the source file where the test part took place, or - // NULL if it's unknown. - const char* file_name() const { - return file_name_.empty() ? NULL : file_name_.c_str(); - } - - // Gets the line in the source file where the test part took place, - // or -1 if it's unknown. - int line_number() const { return line_number_; } - - // Gets the summary of the failure message. - const char* summary() const { return summary_.c_str(); } - - // Gets the message associated with the test part. - const char* message() const { return message_.c_str(); } - - // Returns true iff the test part passed. - bool passed() const { return type_ == kSuccess; } - - // Returns true iff the test part failed. - bool failed() const { return type_ != kSuccess; } - - // Returns true iff the test part non-fatally failed. - bool nonfatally_failed() const { return type_ == kNonFatalFailure; } - - // Returns true iff the test part fatally failed. - bool fatally_failed() const { return type_ == kFatalFailure; } - - private: - Type type_; - - // Gets the summary of the failure message by omitting the stack - // trace in it. - static std::string ExtractSummary(const char* message); - - // The name of the source file where the test part took place, or - // "" if the source file is unknown. - std::string file_name_; - // The line in the source file where the test part took place, or -1 - // if the line number is unknown. - int line_number_; - std::string summary_; // The test failure summary. - std::string message_; // The test failure message. -}; - -// Prints a TestPartResult object. -std::ostream& operator<<(std::ostream& os, const TestPartResult& result); - -// An array of TestPartResult objects. -// -// Don't inherit from TestPartResultArray as its destructor is not -// virtual. -class GTEST_API_ TestPartResultArray { - public: - TestPartResultArray() {} - - // Appends the given TestPartResult to the array. - void Append(const TestPartResult& result); - - // Returns the TestPartResult at the given index (0-based). - const TestPartResult& GetTestPartResult(int index) const; - - // Returns the number of TestPartResult objects in the array. - int size() const; - - private: - std::vector array_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(TestPartResultArray); -}; - -// This interface knows how to report a test part result. -class TestPartResultReporterInterface { - public: - virtual ~TestPartResultReporterInterface() {} - - virtual void ReportTestPartResult(const TestPartResult& result) = 0; -}; - -namespace internal { - -// This helper class is used by {ASSERT|EXPECT}_NO_FATAL_FAILURE to check if a -// statement generates new fatal failures. To do so it registers itself as the -// current test part result reporter. Besides checking if fatal failures were -// reported, it only delegates the reporting to the former result reporter. -// The original result reporter is restored in the destructor. -// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. -class GTEST_API_ HasNewFatalFailureHelper - : public TestPartResultReporterInterface { - public: - HasNewFatalFailureHelper(); - virtual ~HasNewFatalFailureHelper(); - virtual void ReportTestPartResult(const TestPartResult& result); - bool has_new_fatal_failure() const { return has_new_fatal_failure_; } - private: - bool has_new_fatal_failure_; - TestPartResultReporterInterface* original_reporter_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(HasNewFatalFailureHelper); -}; - -} // namespace internal - -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_ diff --git a/test/gtest-1.8.0/include/gtest/gtest-typed-test.h b/test/gtest-1.8.0/include/gtest/gtest-typed-test.h deleted file mode 100644 index 759d1dbdf2..0000000000 --- a/test/gtest-1.8.0/include/gtest/gtest-typed-test.h +++ /dev/null @@ -1,264 +0,0 @@ -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -#ifndef GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_ -#define GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_ - -// This header implements typed tests and type-parameterized tests. - -// Typed (aka type-driven) tests repeat the same test for types in a -// list. You must know which types you want to test with when writing -// typed tests. Here's how you do it: - -#if 0 - -// First, define a fixture class template. It should be parameterized -// by a type. Remember to derive it from testing::Test. -template -class FooTest : public testing::Test { - public: - ... - typedef std::list List; - static T shared_; - T value_; -}; - -// Next, associate a list of types with the test case, which will be -// repeated for each type in the list. The typedef is necessary for -// the macro to parse correctly. -typedef testing::Types MyTypes; -TYPED_TEST_CASE(FooTest, MyTypes); - -// If the type list contains only one type, you can write that type -// directly without Types<...>: -// TYPED_TEST_CASE(FooTest, int); - -// Then, use TYPED_TEST() instead of TEST_F() to define as many typed -// tests for this test case as you want. -TYPED_TEST(FooTest, DoesBlah) { - // Inside a test, refer to TypeParam to get the type parameter. - // Since we are inside a derived class template, C++ requires use to - // visit the members of FooTest via 'this'. - TypeParam n = this->value_; - - // To visit static members of the fixture, add the TestFixture:: - // prefix. - n += TestFixture::shared_; - - // To refer to typedefs in the fixture, add the "typename - // TestFixture::" prefix. - typename TestFixture::List values; - values.push_back(n); - ... -} - -TYPED_TEST(FooTest, HasPropertyA) { ... } - -#endif // 0 - -// Type-parameterized tests are abstract test patterns parameterized -// by a type. Compared with typed tests, type-parameterized tests -// allow you to define the test pattern without knowing what the type -// parameters are. The defined pattern can be instantiated with -// different types any number of times, in any number of translation -// units. -// -// If you are designing an interface or concept, you can define a -// suite of type-parameterized tests to verify properties that any -// valid implementation of the interface/concept should have. Then, -// each implementation can easily instantiate the test suite to verify -// that it conforms to the requirements, without having to write -// similar tests repeatedly. Here's an example: - -#if 0 - -// First, define a fixture class template. It should be parameterized -// by a type. Remember to derive it from testing::Test. -template -class FooTest : public testing::Test { - ... -}; - -// Next, declare that you will define a type-parameterized test case -// (the _P suffix is for "parameterized" or "pattern", whichever you -// prefer): -TYPED_TEST_CASE_P(FooTest); - -// Then, use TYPED_TEST_P() to define as many type-parameterized tests -// for this type-parameterized test case as you want. -TYPED_TEST_P(FooTest, DoesBlah) { - // Inside a test, refer to TypeParam to get the type parameter. - TypeParam n = 0; - ... -} - -TYPED_TEST_P(FooTest, HasPropertyA) { ... } - -// Now the tricky part: you need to register all test patterns before -// you can instantiate them. The first argument of the macro is the -// test case name; the rest are the names of the tests in this test -// case. -REGISTER_TYPED_TEST_CASE_P(FooTest, - DoesBlah, HasPropertyA); - -// Finally, you are free to instantiate the pattern with the types you -// want. If you put the above code in a header file, you can #include -// it in multiple C++ source files and instantiate it multiple times. -// -// To distinguish different instances of the pattern, the first -// argument to the INSTANTIATE_* macro is a prefix that will be added -// to the actual test case name. Remember to pick unique prefixes for -// different instances. -typedef testing::Types MyTypes; -INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes); - -// If the type list contains only one type, you can write that type -// directly without Types<...>: -// INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int); - -#endif // 0 - -#include "gtest/internal/gtest-port.h" -#include "gtest/internal/gtest-type-util.h" - -// Implements typed tests. - -#if GTEST_HAS_TYPED_TEST - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// Expands to the name of the typedef for the type parameters of the -// given test case. -# define GTEST_TYPE_PARAMS_(TestCaseName) gtest_type_params_##TestCaseName##_ - -// The 'Types' template argument below must have spaces around it -// since some compilers may choke on '>>' when passing a template -// instance (e.g. Types) -# define TYPED_TEST_CASE(CaseName, Types) \ - typedef ::testing::internal::TypeList< Types >::type \ - GTEST_TYPE_PARAMS_(CaseName) - -# define TYPED_TEST(CaseName, TestName) \ - template \ - class GTEST_TEST_CLASS_NAME_(CaseName, TestName) \ - : public CaseName { \ - private: \ - typedef CaseName TestFixture; \ - typedef gtest_TypeParam_ TypeParam; \ - virtual void TestBody(); \ - }; \ - bool gtest_##CaseName##_##TestName##_registered_ GTEST_ATTRIBUTE_UNUSED_ = \ - ::testing::internal::TypeParameterizedTest< \ - CaseName, \ - ::testing::internal::TemplateSel< \ - GTEST_TEST_CLASS_NAME_(CaseName, TestName)>, \ - GTEST_TYPE_PARAMS_(CaseName)>::Register(\ - "", ::testing::internal::CodeLocation(__FILE__, __LINE__), \ - #CaseName, #TestName, 0); \ - template \ - void GTEST_TEST_CLASS_NAME_(CaseName, TestName)::TestBody() - -#endif // GTEST_HAS_TYPED_TEST - -// Implements type-parameterized tests. - -#if GTEST_HAS_TYPED_TEST_P - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// Expands to the namespace name that the type-parameterized tests for -// the given type-parameterized test case are defined in. The exact -// name of the namespace is subject to change without notice. -# define GTEST_CASE_NAMESPACE_(TestCaseName) \ - gtest_case_##TestCaseName##_ - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// Expands to the name of the variable used to remember the names of -// the defined tests in the given test case. -# define GTEST_TYPED_TEST_CASE_P_STATE_(TestCaseName) \ - gtest_typed_test_case_p_state_##TestCaseName##_ - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE DIRECTLY. -// -// Expands to the name of the variable used to remember the names of -// the registered tests in the given test case. -# define GTEST_REGISTERED_TEST_NAMES_(TestCaseName) \ - gtest_registered_test_names_##TestCaseName##_ - -// The variables defined in the type-parameterized test macros are -// static as typically these macros are used in a .h file that can be -// #included in multiple translation units linked together. -# define TYPED_TEST_CASE_P(CaseName) \ - static ::testing::internal::TypedTestCasePState \ - GTEST_TYPED_TEST_CASE_P_STATE_(CaseName) - -# define TYPED_TEST_P(CaseName, TestName) \ - namespace GTEST_CASE_NAMESPACE_(CaseName) { \ - template \ - class TestName : public CaseName { \ - private: \ - typedef CaseName TestFixture; \ - typedef gtest_TypeParam_ TypeParam; \ - virtual void TestBody(); \ - }; \ - static bool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \ - GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).AddTestName(\ - __FILE__, __LINE__, #CaseName, #TestName); \ - } \ - template \ - void GTEST_CASE_NAMESPACE_(CaseName)::TestName::TestBody() - -# define REGISTER_TYPED_TEST_CASE_P(CaseName, ...) \ - namespace GTEST_CASE_NAMESPACE_(CaseName) { \ - typedef ::testing::internal::Templates<__VA_ARGS__>::type gtest_AllTests_; \ - } \ - static const char* const GTEST_REGISTERED_TEST_NAMES_(CaseName) \ - GTEST_ATTRIBUTE_UNUSED_ = \ - GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).VerifyRegisteredTestNames( \ - __FILE__, __LINE__, #__VA_ARGS__) - -// The 'Types' template argument below must have spaces around it -// since some compilers may choke on '>>' when passing a template -// instance (e.g. Types) -# define INSTANTIATE_TYPED_TEST_CASE_P(Prefix, CaseName, Types) \ - bool gtest_##Prefix##_##CaseName GTEST_ATTRIBUTE_UNUSED_ = \ - ::testing::internal::TypeParameterizedTestCase::type>::Register(\ - #Prefix, \ - ::testing::internal::CodeLocation(__FILE__, __LINE__), \ - >EST_TYPED_TEST_CASE_P_STATE_(CaseName), \ - #CaseName, GTEST_REGISTERED_TEST_NAMES_(CaseName)) - -#endif // GTEST_HAS_TYPED_TEST_P - -#endif // GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_ diff --git a/test/gtest-1.8.0/include/gtest/gtest.h b/test/gtest-1.8.0/include/gtest/gtest.h deleted file mode 100644 index 686750e020..0000000000 --- a/test/gtest-1.8.0/include/gtest/gtest.h +++ /dev/null @@ -1,2332 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// The Google C++ Testing and Mocking Framework (Google Test) -// -// This header file defines the public API for Google Test. It should be -// included by any test program that uses Google Test. -// -// IMPORTANT NOTE: Due to limitation of the C++ language, we have to -// leave some internal implementation details in this header file. -// They are clearly marked by comments like this: -// -// // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. -// -// Such code is NOT meant to be used by a user directly, and is subject -// to CHANGE WITHOUT NOTICE. Therefore DO NOT DEPEND ON IT in a user -// program! -// -// Acknowledgment: Google Test borrowed the idea of automatic test -// registration from Barthelemy Dagenais' (barthelemy@prologique.com) -// easyUnit framework. - -#ifndef GTEST_INCLUDE_GTEST_GTEST_H_ -#define GTEST_INCLUDE_GTEST_GTEST_H_ - -#include -#include -#include - -#include "gtest/internal/gtest-internal.h" -#include "gtest/internal/gtest-string.h" -#include "gtest/gtest-death-test.h" -#include "gtest/gtest-message.h" -#include "gtest/gtest-param-test.h" -#include "gtest/gtest-printers.h" -#include "gtest/gtest_prod.h" -#include "gtest/gtest-test-part.h" -#include "gtest/gtest-typed-test.h" - -// Depending on the platform, different string classes are available. -// On Linux, in addition to ::std::string, Google also makes use of -// class ::string, which has the same interface as ::std::string, but -// has a different implementation. -// -// You can define GTEST_HAS_GLOBAL_STRING to 1 to indicate that -// ::string is available AND is a distinct type to ::std::string, or -// define it to 0 to indicate otherwise. -// -// If ::std::string and ::string are the same class on your platform -// due to aliasing, you should define GTEST_HAS_GLOBAL_STRING to 0. -// -// If you do not define GTEST_HAS_GLOBAL_STRING, it is defined -// heuristically. - -namespace testing { - -// Silence C4100 (unreferenced formal parameter) and 4805 -// unsafe mix of type 'const int' and type 'const bool' -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable:4805) -# pragma warning(disable:4100) -#endif - - -// Declares the flags. - -// This flag temporary enables the disabled tests. -GTEST_DECLARE_bool_(also_run_disabled_tests); - -// This flag brings the debugger on an assertion failure. -GTEST_DECLARE_bool_(break_on_failure); - -// This flag controls whether Google Test catches all test-thrown exceptions -// and logs them as failures. -GTEST_DECLARE_bool_(catch_exceptions); - -// This flag enables using colors in terminal output. Available values are -// "yes" to enable colors, "no" (disable colors), or "auto" (the default) -// to let Google Test decide. -GTEST_DECLARE_string_(color); - -// This flag sets up the filter to select by name using a glob pattern -// the tests to run. If the filter is not given all tests are executed. -GTEST_DECLARE_string_(filter); - -// This flag causes the Google Test to list tests. None of the tests listed -// are actually run if the flag is provided. -GTEST_DECLARE_bool_(list_tests); - -// This flag controls whether Google Test emits a detailed XML report to a file -// in addition to its normal textual output. -GTEST_DECLARE_string_(output); - -// This flags control whether Google Test prints the elapsed time for each -// test. -GTEST_DECLARE_bool_(print_time); - -// This flags control whether Google Test prints UTF8 characters as text. -GTEST_DECLARE_bool_(print_utf8); - -// This flag specifies the random number seed. -GTEST_DECLARE_int32_(random_seed); - -// This flag sets how many times the tests are repeated. The default value -// is 1. If the value is -1 the tests are repeating forever. -GTEST_DECLARE_int32_(repeat); - -// This flag controls whether Google Test includes Google Test internal -// stack frames in failure stack traces. -GTEST_DECLARE_bool_(show_internal_stack_frames); - -// When this flag is specified, tests' order is randomized on every iteration. -GTEST_DECLARE_bool_(shuffle); - -// This flag specifies the maximum number of stack frames to be -// printed in a failure message. -GTEST_DECLARE_int32_(stack_trace_depth); - -// When this flag is specified, a failed assertion will throw an -// exception if exceptions are enabled, or exit the program with a -// non-zero code otherwise. For use with an external test framework. -GTEST_DECLARE_bool_(throw_on_failure); - -// When this flag is set with a "host:port" string, on supported -// platforms test results are streamed to the specified port on -// the specified host machine. -GTEST_DECLARE_string_(stream_result_to); - -// The upper limit for valid stack trace depths. -const int kMaxStackTraceDepth = 100; - -namespace internal { - -class AssertHelper; -class DefaultGlobalTestPartResultReporter; -class ExecDeathTest; -class NoExecDeathTest; -class FinalSuccessChecker; -class GTestFlagSaver; -class StreamingListenerTest; -class TestResultAccessor; -class TestEventListenersAccessor; -class TestEventRepeater; -class UnitTestRecordPropertyTestHelper; -class WindowsDeathTest; -class FuchsiaDeathTest; -class UnitTestImpl* GetUnitTestImpl(); -void ReportFailureInUnknownLocation(TestPartResult::Type result_type, - const std::string& message); - -} // namespace internal - -// The friend relationship of some of these classes is cyclic. -// If we don't forward declare them the compiler might confuse the classes -// in friendship clauses with same named classes on the scope. -class Test; -class TestCase; -class TestInfo; -class UnitTest; - -// A class for indicating whether an assertion was successful. When -// the assertion wasn't successful, the AssertionResult object -// remembers a non-empty message that describes how it failed. -// -// To create an instance of this class, use one of the factory functions -// (AssertionSuccess() and AssertionFailure()). -// -// This class is useful for two purposes: -// 1. Defining predicate functions to be used with Boolean test assertions -// EXPECT_TRUE/EXPECT_FALSE and their ASSERT_ counterparts -// 2. Defining predicate-format functions to be -// used with predicate assertions (ASSERT_PRED_FORMAT*, etc). -// -// For example, if you define IsEven predicate: -// -// testing::AssertionResult IsEven(int n) { -// if ((n % 2) == 0) -// return testing::AssertionSuccess(); -// else -// return testing::AssertionFailure() << n << " is odd"; -// } -// -// Then the failed expectation EXPECT_TRUE(IsEven(Fib(5))) -// will print the message -// -// Value of: IsEven(Fib(5)) -// Actual: false (5 is odd) -// Expected: true -// -// instead of a more opaque -// -// Value of: IsEven(Fib(5)) -// Actual: false -// Expected: true -// -// in case IsEven is a simple Boolean predicate. -// -// If you expect your predicate to be reused and want to support informative -// messages in EXPECT_FALSE and ASSERT_FALSE (negative assertions show up -// about half as often as positive ones in our tests), supply messages for -// both success and failure cases: -// -// testing::AssertionResult IsEven(int n) { -// if ((n % 2) == 0) -// return testing::AssertionSuccess() << n << " is even"; -// else -// return testing::AssertionFailure() << n << " is odd"; -// } -// -// Then a statement EXPECT_FALSE(IsEven(Fib(6))) will print -// -// Value of: IsEven(Fib(6)) -// Actual: true (8 is even) -// Expected: false -// -// NB: Predicates that support negative Boolean assertions have reduced -// performance in positive ones so be careful not to use them in tests -// that have lots (tens of thousands) of positive Boolean assertions. -// -// To use this class with EXPECT_PRED_FORMAT assertions such as: -// -// // Verifies that Foo() returns an even number. -// EXPECT_PRED_FORMAT1(IsEven, Foo()); -// -// you need to define: -// -// testing::AssertionResult IsEven(const char* expr, int n) { -// if ((n % 2) == 0) -// return testing::AssertionSuccess(); -// else -// return testing::AssertionFailure() -// << "Expected: " << expr << " is even\n Actual: it's " << n; -// } -// -// If Foo() returns 5, you will see the following message: -// -// Expected: Foo() is even -// Actual: it's 5 -// -class GTEST_API_ AssertionResult { - public: - // Copy constructor. - // Used in EXPECT_TRUE/FALSE(assertion_result). - AssertionResult(const AssertionResult& other); - -#if defined(_MSC_VER) && _MSC_VER < 1910 - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */) -#endif - - // Used in the EXPECT_TRUE/FALSE(bool_expression). - // - // T must be contextually convertible to bool. - // - // The second parameter prevents this overload from being considered if - // the argument is implicitly convertible to AssertionResult. In that case - // we want AssertionResult's copy constructor to be used. - template - explicit AssertionResult( - const T& success, - typename internal::EnableIf< - !internal::ImplicitlyConvertible::value>::type* - /*enabler*/ = NULL) - : success_(success) {} - -#if defined(_MSC_VER) && _MSC_VER < 1910 - GTEST_DISABLE_MSC_WARNINGS_POP_() -#endif - - // Assignment operator. - AssertionResult& operator=(AssertionResult other) { - swap(other); - return *this; - } - - // Returns true iff the assertion succeeded. - operator bool() const { return success_; } // NOLINT - - // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE. - AssertionResult operator!() const; - - // Returns the text streamed into this AssertionResult. Test assertions - // use it when they fail (i.e., the predicate's outcome doesn't match the - // assertion's expectation). When nothing has been streamed into the - // object, returns an empty string. - const char* message() const { - return message_.get() != NULL ? message_->c_str() : ""; - } - // TODO(vladl@google.com): Remove this after making sure no clients use it. - // Deprecated; please use message() instead. - const char* failure_message() const { return message(); } - - // Streams a custom failure message into this object. - template AssertionResult& operator<<(const T& value) { - AppendMessage(Message() << value); - return *this; - } - - // Allows streaming basic output manipulators such as endl or flush into - // this object. - AssertionResult& operator<<( - ::std::ostream& (*basic_manipulator)(::std::ostream& stream)) { - AppendMessage(Message() << basic_manipulator); - return *this; - } - - private: - // Appends the contents of message to message_. - void AppendMessage(const Message& a_message) { - if (message_.get() == NULL) - message_.reset(new ::std::string); - message_->append(a_message.GetString().c_str()); - } - - // Swap the contents of this AssertionResult with other. - void swap(AssertionResult& other); - - // Stores result of the assertion predicate. - bool success_; - // Stores the message describing the condition in case the expectation - // construct is not satisfied with the predicate's outcome. - // Referenced via a pointer to avoid taking too much stack frame space - // with test assertions. - internal::scoped_ptr< ::std::string> message_; -}; - -// Makes a successful assertion result. -GTEST_API_ AssertionResult AssertionSuccess(); - -// Makes a failed assertion result. -GTEST_API_ AssertionResult AssertionFailure(); - -// Makes a failed assertion result with the given failure message. -// Deprecated; use AssertionFailure() << msg. -GTEST_API_ AssertionResult AssertionFailure(const Message& msg); - -} // namespace testing - -// Includes the auto-generated header that implements a family of generic -// predicate assertion macros. This include comes late because it relies on -// APIs declared above. -#include "gtest/gtest_pred_impl.h" - -namespace testing { - -// The abstract class that all tests inherit from. -// -// In Google Test, a unit test program contains one or many TestCases, and -// each TestCase contains one or many Tests. -// -// When you define a test using the TEST macro, you don't need to -// explicitly derive from Test - the TEST macro automatically does -// this for you. -// -// The only time you derive from Test is when defining a test fixture -// to be used in a TEST_F. For example: -// -// class FooTest : public testing::Test { -// protected: -// void SetUp() override { ... } -// void TearDown() override { ... } -// ... -// }; -// -// TEST_F(FooTest, Bar) { ... } -// TEST_F(FooTest, Baz) { ... } -// -// Test is not copyable. -class GTEST_API_ Test { - public: - friend class TestInfo; - - // Defines types for pointers to functions that set up and tear down - // a test case. - typedef internal::SetUpTestCaseFunc SetUpTestCaseFunc; - typedef internal::TearDownTestCaseFunc TearDownTestCaseFunc; - - // The d'tor is virtual as we intend to inherit from Test. - virtual ~Test(); - - // Sets up the stuff shared by all tests in this test case. - // - // Google Test will call Foo::SetUpTestCase() before running the first - // test in test case Foo. Hence a sub-class can define its own - // SetUpTestCase() method to shadow the one defined in the super - // class. - static void SetUpTestCase() {} - - // Tears down the stuff shared by all tests in this test case. - // - // Google Test will call Foo::TearDownTestCase() after running the last - // test in test case Foo. Hence a sub-class can define its own - // TearDownTestCase() method to shadow the one defined in the super - // class. - static void TearDownTestCase() {} - - // Returns true iff the current test has a fatal failure. - static bool HasFatalFailure(); - - // Returns true iff the current test has a non-fatal failure. - static bool HasNonfatalFailure(); - - // Returns true iff the current test has a (either fatal or - // non-fatal) failure. - static bool HasFailure() { return HasFatalFailure() || HasNonfatalFailure(); } - - // Logs a property for the current test, test case, or for the entire - // invocation of the test program when used outside of the context of a - // test case. Only the last value for a given key is remembered. These - // are public static so they can be called from utility functions that are - // not members of the test fixture. Calls to RecordProperty made during - // lifespan of the test (from the moment its constructor starts to the - // moment its destructor finishes) will be output in XML as attributes of - // the element. Properties recorded from fixture's - // SetUpTestCase or TearDownTestCase are logged as attributes of the - // corresponding element. Calls to RecordProperty made in the - // global context (before or after invocation of RUN_ALL_TESTS and from - // SetUp/TearDown method of Environment objects registered with Google - // Test) will be output as attributes of the element. - static void RecordProperty(const std::string& key, const std::string& value); - static void RecordProperty(const std::string& key, int value); - - protected: - // Creates a Test object. - Test(); - - // Sets up the test fixture. - virtual void SetUp(); - - // Tears down the test fixture. - virtual void TearDown(); - - private: - // Returns true iff the current test has the same fixture class as - // the first test in the current test case. - static bool HasSameFixtureClass(); - - // Runs the test after the test fixture has been set up. - // - // A sub-class must implement this to define the test logic. - // - // DO NOT OVERRIDE THIS FUNCTION DIRECTLY IN A USER PROGRAM. - // Instead, use the TEST or TEST_F macro. - virtual void TestBody() = 0; - - // Sets up, executes, and tears down the test. - void Run(); - - // Deletes self. We deliberately pick an unusual name for this - // internal method to avoid clashing with names used in user TESTs. - void DeleteSelf_() { delete this; } - - const internal::scoped_ptr< GTEST_FLAG_SAVER_ > gtest_flag_saver_; - - // Often a user misspells SetUp() as Setup() and spends a long time - // wondering why it is never called by Google Test. The declaration of - // the following method is solely for catching such an error at - // compile time: - // - // - The return type is deliberately chosen to be not void, so it - // will be a conflict if void Setup() is declared in the user's - // test fixture. - // - // - This method is private, so it will be another compiler error - // if the method is called from the user's test fixture. - // - // DO NOT OVERRIDE THIS FUNCTION. - // - // If you see an error about overriding the following function or - // about it being private, you have mis-spelled SetUp() as Setup(). - struct Setup_should_be_spelled_SetUp {}; - virtual Setup_should_be_spelled_SetUp* Setup() { return NULL; } - - // We disallow copying Tests. - GTEST_DISALLOW_COPY_AND_ASSIGN_(Test); -}; - -typedef internal::TimeInMillis TimeInMillis; - -// A copyable object representing a user specified test property which can be -// output as a key/value string pair. -// -// Don't inherit from TestProperty as its destructor is not virtual. -class TestProperty { - public: - // C'tor. TestProperty does NOT have a default constructor. - // Always use this constructor (with parameters) to create a - // TestProperty object. - TestProperty(const std::string& a_key, const std::string& a_value) : - key_(a_key), value_(a_value) { - } - - // Gets the user supplied key. - const char* key() const { - return key_.c_str(); - } - - // Gets the user supplied value. - const char* value() const { - return value_.c_str(); - } - - // Sets a new value, overriding the one supplied in the constructor. - void SetValue(const std::string& new_value) { - value_ = new_value; - } - - private: - // The key supplied by the user. - std::string key_; - // The value supplied by the user. - std::string value_; -}; - -// The result of a single Test. This includes a list of -// TestPartResults, a list of TestProperties, a count of how many -// death tests there are in the Test, and how much time it took to run -// the Test. -// -// TestResult is not copyable. -class GTEST_API_ TestResult { - public: - // Creates an empty TestResult. - TestResult(); - - // D'tor. Do not inherit from TestResult. - ~TestResult(); - - // Gets the number of all test parts. This is the sum of the number - // of successful test parts and the number of failed test parts. - int total_part_count() const; - - // Returns the number of the test properties. - int test_property_count() const; - - // Returns true iff the test passed (i.e. no test part failed). - bool Passed() const { return !Failed(); } - - // Returns true iff the test failed. - bool Failed() const; - - // Returns true iff the test fatally failed. - bool HasFatalFailure() const; - - // Returns true iff the test has a non-fatal failure. - bool HasNonfatalFailure() const; - - // Returns the elapsed time, in milliseconds. - TimeInMillis elapsed_time() const { return elapsed_time_; } - - // Returns the i-th test part result among all the results. i can range from 0 - // to total_part_count() - 1. If i is not in that range, aborts the program. - const TestPartResult& GetTestPartResult(int i) const; - - // Returns the i-th test property. i can range from 0 to - // test_property_count() - 1. If i is not in that range, aborts the - // program. - const TestProperty& GetTestProperty(int i) const; - - private: - friend class TestInfo; - friend class TestCase; - friend class UnitTest; - friend class internal::DefaultGlobalTestPartResultReporter; - friend class internal::ExecDeathTest; - friend class internal::TestResultAccessor; - friend class internal::UnitTestImpl; - friend class internal::WindowsDeathTest; - friend class internal::FuchsiaDeathTest; - - // Gets the vector of TestPartResults. - const std::vector& test_part_results() const { - return test_part_results_; - } - - // Gets the vector of TestProperties. - const std::vector& test_properties() const { - return test_properties_; - } - - // Sets the elapsed time. - void set_elapsed_time(TimeInMillis elapsed) { elapsed_time_ = elapsed; } - - // Adds a test property to the list. The property is validated and may add - // a non-fatal failure if invalid (e.g., if it conflicts with reserved - // key names). If a property is already recorded for the same key, the - // value will be updated, rather than storing multiple values for the same - // key. xml_element specifies the element for which the property is being - // recorded and is used for validation. - void RecordProperty(const std::string& xml_element, - const TestProperty& test_property); - - // Adds a failure if the key is a reserved attribute of Google Test - // testcase tags. Returns true if the property is valid. - // TODO(russr): Validate attribute names are legal and human readable. - static bool ValidateTestProperty(const std::string& xml_element, - const TestProperty& test_property); - - // Adds a test part result to the list. - void AddTestPartResult(const TestPartResult& test_part_result); - - // Returns the death test count. - int death_test_count() const { return death_test_count_; } - - // Increments the death test count, returning the new count. - int increment_death_test_count() { return ++death_test_count_; } - - // Clears the test part results. - void ClearTestPartResults(); - - // Clears the object. - void Clear(); - - // Protects mutable state of the property vector and of owned - // properties, whose values may be updated. - internal::Mutex test_properites_mutex_; - - // The vector of TestPartResults - std::vector test_part_results_; - // The vector of TestProperties - std::vector test_properties_; - // Running count of death tests. - int death_test_count_; - // The elapsed time, in milliseconds. - TimeInMillis elapsed_time_; - - // We disallow copying TestResult. - GTEST_DISALLOW_COPY_AND_ASSIGN_(TestResult); -}; // class TestResult - -// A TestInfo object stores the following information about a test: -// -// Test case name -// Test name -// Whether the test should be run -// A function pointer that creates the test object when invoked -// Test result -// -// The constructor of TestInfo registers itself with the UnitTest -// singleton such that the RUN_ALL_TESTS() macro knows which tests to -// run. -class GTEST_API_ TestInfo { - public: - // Destructs a TestInfo object. This function is not virtual, so - // don't inherit from TestInfo. - ~TestInfo(); - - // Returns the test case name. - const char* test_case_name() const { return test_case_name_.c_str(); } - - // Returns the test name. - const char* name() const { return name_.c_str(); } - - // Returns the name of the parameter type, or NULL if this is not a typed - // or a type-parameterized test. - const char* type_param() const { - if (type_param_.get() != NULL) - return type_param_->c_str(); - return NULL; - } - - // Returns the text representation of the value parameter, or NULL if this - // is not a value-parameterized test. - const char* value_param() const { - if (value_param_.get() != NULL) - return value_param_->c_str(); - return NULL; - } - - // Returns the file name where this test is defined. - const char* file() const { return location_.file.c_str(); } - - // Returns the line where this test is defined. - int line() const { return location_.line; } - - // Return true if this test should not be run because it's in another shard. - bool is_in_another_shard() const { return is_in_another_shard_; } - - // Returns true if this test should run, that is if the test is not - // disabled (or it is disabled but the also_run_disabled_tests flag has - // been specified) and its full name matches the user-specified filter. - // - // Google Test allows the user to filter the tests by their full names. - // The full name of a test Bar in test case Foo is defined as - // "Foo.Bar". Only the tests that match the filter will run. - // - // A filter is a colon-separated list of glob (not regex) patterns, - // optionally followed by a '-' and a colon-separated list of - // negative patterns (tests to exclude). A test is run if it - // matches one of the positive patterns and does not match any of - // the negative patterns. - // - // For example, *A*:Foo.* is a filter that matches any string that - // contains the character 'A' or starts with "Foo.". - bool should_run() const { return should_run_; } - - // Returns true iff this test will appear in the XML report. - bool is_reportable() const { - // The XML report includes tests matching the filter, excluding those - // run in other shards. - return matches_filter_ && !is_in_another_shard_; - } - - // Returns the result of the test. - const TestResult* result() const { return &result_; } - - private: -#if GTEST_HAS_DEATH_TEST - friend class internal::DefaultDeathTestFactory; -#endif // GTEST_HAS_DEATH_TEST - friend class Test; - friend class TestCase; - friend class internal::UnitTestImpl; - friend class internal::StreamingListenerTest; - friend TestInfo* internal::MakeAndRegisterTestInfo( - const char* test_case_name, - const char* name, - const char* type_param, - const char* value_param, - internal::CodeLocation code_location, - internal::TypeId fixture_class_id, - Test::SetUpTestCaseFunc set_up_tc, - Test::TearDownTestCaseFunc tear_down_tc, - internal::TestFactoryBase* factory); - - // Constructs a TestInfo object. The newly constructed instance assumes - // ownership of the factory object. - TestInfo(const std::string& test_case_name, - const std::string& name, - const char* a_type_param, // NULL if not a type-parameterized test - const char* a_value_param, // NULL if not a value-parameterized test - internal::CodeLocation a_code_location, - internal::TypeId fixture_class_id, - internal::TestFactoryBase* factory); - - // Increments the number of death tests encountered in this test so - // far. - int increment_death_test_count() { - return result_.increment_death_test_count(); - } - - // Creates the test object, runs it, records its result, and then - // deletes it. - void Run(); - - static void ClearTestResult(TestInfo* test_info) { - test_info->result_.Clear(); - } - - // These fields are immutable properties of the test. - const std::string test_case_name_; // Test case name - const std::string name_; // Test name - // Name of the parameter type, or NULL if this is not a typed or a - // type-parameterized test. - const internal::scoped_ptr type_param_; - // Text representation of the value parameter, or NULL if this is not a - // value-parameterized test. - const internal::scoped_ptr value_param_; - internal::CodeLocation location_; - const internal::TypeId fixture_class_id_; // ID of the test fixture class - bool should_run_; // True iff this test should run - bool is_disabled_; // True iff this test is disabled - bool matches_filter_; // True if this test matches the - // user-specified filter. - bool is_in_another_shard_; // Will be run in another shard. - internal::TestFactoryBase* const factory_; // The factory that creates - // the test object - - // This field is mutable and needs to be reset before running the - // test for the second time. - TestResult result_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(TestInfo); -}; - -// A test case, which consists of a vector of TestInfos. -// -// TestCase is not copyable. -class GTEST_API_ TestCase { - public: - // Creates a TestCase with the given name. - // - // TestCase does NOT have a default constructor. Always use this - // constructor to create a TestCase object. - // - // Arguments: - // - // name: name of the test case - // a_type_param: the name of the test's type parameter, or NULL if - // this is not a type-parameterized test. - // set_up_tc: pointer to the function that sets up the test case - // tear_down_tc: pointer to the function that tears down the test case - TestCase(const char* name, const char* a_type_param, - Test::SetUpTestCaseFunc set_up_tc, - Test::TearDownTestCaseFunc tear_down_tc); - - // Destructor of TestCase. - virtual ~TestCase(); - - // Gets the name of the TestCase. - const char* name() const { return name_.c_str(); } - - // Returns the name of the parameter type, or NULL if this is not a - // type-parameterized test case. - const char* type_param() const { - if (type_param_.get() != NULL) - return type_param_->c_str(); - return NULL; - } - - // Returns true if any test in this test case should run. - bool should_run() const { return should_run_; } - - // Gets the number of successful tests in this test case. - int successful_test_count() const; - - // Gets the number of failed tests in this test case. - int failed_test_count() const; - - // Gets the number of disabled tests that will be reported in the XML report. - int reportable_disabled_test_count() const; - - // Gets the number of disabled tests in this test case. - int disabled_test_count() const; - - // Gets the number of tests to be printed in the XML report. - int reportable_test_count() const; - - // Get the number of tests in this test case that should run. - int test_to_run_count() const; - - // Gets the number of all tests in this test case. - int total_test_count() const; - - // Returns true iff the test case passed. - bool Passed() const { return !Failed(); } - - // Returns true iff the test case failed. - bool Failed() const { return failed_test_count() > 0; } - - // Returns the elapsed time, in milliseconds. - TimeInMillis elapsed_time() const { return elapsed_time_; } - - // Returns the i-th test among all the tests. i can range from 0 to - // total_test_count() - 1. If i is not in that range, returns NULL. - const TestInfo* GetTestInfo(int i) const; - - // Returns the TestResult that holds test properties recorded during - // execution of SetUpTestCase and TearDownTestCase. - const TestResult& ad_hoc_test_result() const { return ad_hoc_test_result_; } - - private: - friend class Test; - friend class internal::UnitTestImpl; - - // Gets the (mutable) vector of TestInfos in this TestCase. - std::vector& test_info_list() { return test_info_list_; } - - // Gets the (immutable) vector of TestInfos in this TestCase. - const std::vector& test_info_list() const { - return test_info_list_; - } - - // Returns the i-th test among all the tests. i can range from 0 to - // total_test_count() - 1. If i is not in that range, returns NULL. - TestInfo* GetMutableTestInfo(int i); - - // Sets the should_run member. - void set_should_run(bool should) { should_run_ = should; } - - // Adds a TestInfo to this test case. Will delete the TestInfo upon - // destruction of the TestCase object. - void AddTestInfo(TestInfo * test_info); - - // Clears the results of all tests in this test case. - void ClearResult(); - - // Clears the results of all tests in the given test case. - static void ClearTestCaseResult(TestCase* test_case) { - test_case->ClearResult(); - } - - // Runs every test in this TestCase. - void Run(); - - // Runs SetUpTestCase() for this TestCase. This wrapper is needed - // for catching exceptions thrown from SetUpTestCase(). - void RunSetUpTestCase() { (*set_up_tc_)(); } - - // Runs TearDownTestCase() for this TestCase. This wrapper is - // needed for catching exceptions thrown from TearDownTestCase(). - void RunTearDownTestCase() { (*tear_down_tc_)(); } - - // Returns true iff test passed. - static bool TestPassed(const TestInfo* test_info) { - return test_info->should_run() && test_info->result()->Passed(); - } - - // Returns true iff test failed. - static bool TestFailed(const TestInfo* test_info) { - return test_info->should_run() && test_info->result()->Failed(); - } - - // Returns true iff the test is disabled and will be reported in the XML - // report. - static bool TestReportableDisabled(const TestInfo* test_info) { - return test_info->is_reportable() && test_info->is_disabled_; - } - - // Returns true iff test is disabled. - static bool TestDisabled(const TestInfo* test_info) { - return test_info->is_disabled_; - } - - // Returns true iff this test will appear in the XML report. - static bool TestReportable(const TestInfo* test_info) { - return test_info->is_reportable(); - } - - // Returns true if the given test should run. - static bool ShouldRunTest(const TestInfo* test_info) { - return test_info->should_run(); - } - - // Shuffles the tests in this test case. - void ShuffleTests(internal::Random* random); - - // Restores the test order to before the first shuffle. - void UnshuffleTests(); - - // Name of the test case. - std::string name_; - // Name of the parameter type, or NULL if this is not a typed or a - // type-parameterized test. - const internal::scoped_ptr type_param_; - // The vector of TestInfos in their original order. It owns the - // elements in the vector. - std::vector test_info_list_; - // Provides a level of indirection for the test list to allow easy - // shuffling and restoring the test order. The i-th element in this - // vector is the index of the i-th test in the shuffled test list. - std::vector test_indices_; - // Pointer to the function that sets up the test case. - Test::SetUpTestCaseFunc set_up_tc_; - // Pointer to the function that tears down the test case. - Test::TearDownTestCaseFunc tear_down_tc_; - // True iff any test in this test case should run. - bool should_run_; - // Elapsed time, in milliseconds. - TimeInMillis elapsed_time_; - // Holds test properties recorded during execution of SetUpTestCase and - // TearDownTestCase. - TestResult ad_hoc_test_result_; - - // We disallow copying TestCases. - GTEST_DISALLOW_COPY_AND_ASSIGN_(TestCase); -}; - -// An Environment object is capable of setting up and tearing down an -// environment. You should subclass this to define your own -// environment(s). -// -// An Environment object does the set-up and tear-down in virtual -// methods SetUp() and TearDown() instead of the constructor and the -// destructor, as: -// -// 1. You cannot safely throw from a destructor. This is a problem -// as in some cases Google Test is used where exceptions are enabled, and -// we may want to implement ASSERT_* using exceptions where they are -// available. -// 2. You cannot use ASSERT_* directly in a constructor or -// destructor. -class Environment { - public: - // The d'tor is virtual as we need to subclass Environment. - virtual ~Environment() {} - - // Override this to define how to set up the environment. - virtual void SetUp() {} - - // Override this to define how to tear down the environment. - virtual void TearDown() {} - private: - // If you see an error about overriding the following function or - // about it being private, you have mis-spelled SetUp() as Setup(). - struct Setup_should_be_spelled_SetUp {}; - virtual Setup_should_be_spelled_SetUp* Setup() { return NULL; } -}; - -#if GTEST_HAS_EXCEPTIONS - -// Exception which can be thrown from TestEventListener::OnTestPartResult. -class GTEST_API_ AssertionException - : public internal::GoogleTestFailureException { - public: - explicit AssertionException(const TestPartResult& result) - : GoogleTestFailureException(result) {} -}; - -#endif // GTEST_HAS_EXCEPTIONS - -// The interface for tracing execution of tests. The methods are organized in -// the order the corresponding events are fired. -class TestEventListener { - public: - virtual ~TestEventListener() {} - - // Fired before any test activity starts. - virtual void OnTestProgramStart(const UnitTest& unit_test) = 0; - - // Fired before each iteration of tests starts. There may be more than - // one iteration if GTEST_FLAG(repeat) is set. iteration is the iteration - // index, starting from 0. - virtual void OnTestIterationStart(const UnitTest& unit_test, - int iteration) = 0; - - // Fired before environment set-up for each iteration of tests starts. - virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test) = 0; - - // Fired after environment set-up for each iteration of tests ends. - virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) = 0; - - // Fired before the test case starts. - virtual void OnTestCaseStart(const TestCase& test_case) = 0; - - // Fired before the test starts. - virtual void OnTestStart(const TestInfo& test_info) = 0; - - // Fired after a failed assertion or a SUCCEED() invocation. - // If you want to throw an exception from this function to skip to the next - // TEST, it must be AssertionException defined above, or inherited from it. - virtual void OnTestPartResult(const TestPartResult& test_part_result) = 0; - - // Fired after the test ends. - virtual void OnTestEnd(const TestInfo& test_info) = 0; - - // Fired after the test case ends. - virtual void OnTestCaseEnd(const TestCase& test_case) = 0; - - // Fired before environment tear-down for each iteration of tests starts. - virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test) = 0; - - // Fired after environment tear-down for each iteration of tests ends. - virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) = 0; - - // Fired after each iteration of tests finishes. - virtual void OnTestIterationEnd(const UnitTest& unit_test, - int iteration) = 0; - - // Fired after all test activities have ended. - virtual void OnTestProgramEnd(const UnitTest& unit_test) = 0; -}; - -// The convenience class for users who need to override just one or two -// methods and are not concerned that a possible change to a signature of -// the methods they override will not be caught during the build. For -// comments about each method please see the definition of TestEventListener -// above. -class EmptyTestEventListener : public TestEventListener { - public: - virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {} - virtual void OnTestIterationStart(const UnitTest& /*unit_test*/, - int /*iteration*/) {} - virtual void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) {} - virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {} - virtual void OnTestCaseStart(const TestCase& /*test_case*/) {} - virtual void OnTestStart(const TestInfo& /*test_info*/) {} - virtual void OnTestPartResult(const TestPartResult& /*test_part_result*/) {} - virtual void OnTestEnd(const TestInfo& /*test_info*/) {} - virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {} - virtual void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) {} - virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {} - virtual void OnTestIterationEnd(const UnitTest& /*unit_test*/, - int /*iteration*/) {} - virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {} -}; - -// TestEventListeners lets users add listeners to track events in Google Test. -class GTEST_API_ TestEventListeners { - public: - TestEventListeners(); - ~TestEventListeners(); - - // Appends an event listener to the end of the list. Google Test assumes - // the ownership of the listener (i.e. it will delete the listener when - // the test program finishes). - void Append(TestEventListener* listener); - - // Removes the given event listener from the list and returns it. It then - // becomes the caller's responsibility to delete the listener. Returns - // NULL if the listener is not found in the list. - TestEventListener* Release(TestEventListener* listener); - - // Returns the standard listener responsible for the default console - // output. Can be removed from the listeners list to shut down default - // console output. Note that removing this object from the listener list - // with Release transfers its ownership to the caller and makes this - // function return NULL the next time. - TestEventListener* default_result_printer() const { - return default_result_printer_; - } - - // Returns the standard listener responsible for the default XML output - // controlled by the --gtest_output=xml flag. Can be removed from the - // listeners list by users who want to shut down the default XML output - // controlled by this flag and substitute it with custom one. Note that - // removing this object from the listener list with Release transfers its - // ownership to the caller and makes this function return NULL the next - // time. - TestEventListener* default_xml_generator() const { - return default_xml_generator_; - } - - private: - friend class TestCase; - friend class TestInfo; - friend class internal::DefaultGlobalTestPartResultReporter; - friend class internal::NoExecDeathTest; - friend class internal::TestEventListenersAccessor; - friend class internal::UnitTestImpl; - - // Returns repeater that broadcasts the TestEventListener events to all - // subscribers. - TestEventListener* repeater(); - - // Sets the default_result_printer attribute to the provided listener. - // The listener is also added to the listener list and previous - // default_result_printer is removed from it and deleted. The listener can - // also be NULL in which case it will not be added to the list. Does - // nothing if the previous and the current listener objects are the same. - void SetDefaultResultPrinter(TestEventListener* listener); - - // Sets the default_xml_generator attribute to the provided listener. The - // listener is also added to the listener list and previous - // default_xml_generator is removed from it and deleted. The listener can - // also be NULL in which case it will not be added to the list. Does - // nothing if the previous and the current listener objects are the same. - void SetDefaultXmlGenerator(TestEventListener* listener); - - // Controls whether events will be forwarded by the repeater to the - // listeners in the list. - bool EventForwardingEnabled() const; - void SuppressEventForwarding(); - - // The actual list of listeners. - internal::TestEventRepeater* repeater_; - // Listener responsible for the standard result output. - TestEventListener* default_result_printer_; - // Listener responsible for the creation of the XML output file. - TestEventListener* default_xml_generator_; - - // We disallow copying TestEventListeners. - GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventListeners); -}; - -// A UnitTest consists of a vector of TestCases. -// -// This is a singleton class. The only instance of UnitTest is -// created when UnitTest::GetInstance() is first called. This -// instance is never deleted. -// -// UnitTest is not copyable. -// -// This class is thread-safe as long as the methods are called -// according to their specification. -class GTEST_API_ UnitTest { - public: - // Gets the singleton UnitTest object. The first time this method - // is called, a UnitTest object is constructed and returned. - // Consecutive calls will return the same object. - static UnitTest* GetInstance(); - - // Runs all tests in this UnitTest object and prints the result. - // Returns 0 if successful, or 1 otherwise. - // - // This method can only be called from the main thread. - // - // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. - int Run() GTEST_MUST_USE_RESULT_; - - // Returns the working directory when the first TEST() or TEST_F() - // was executed. The UnitTest object owns the string. - const char* original_working_dir() const; - - // Returns the TestCase object for the test that's currently running, - // or NULL if no test is running. - const TestCase* current_test_case() const - GTEST_LOCK_EXCLUDED_(mutex_); - - // Returns the TestInfo object for the test that's currently running, - // or NULL if no test is running. - const TestInfo* current_test_info() const - GTEST_LOCK_EXCLUDED_(mutex_); - - // Returns the random seed used at the start of the current test run. - int random_seed() const; - - // Returns the ParameterizedTestCaseRegistry object used to keep track of - // value-parameterized tests and instantiate and register them. - // - // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. - internal::ParameterizedTestCaseRegistry& parameterized_test_registry() - GTEST_LOCK_EXCLUDED_(mutex_); - - // Gets the number of successful test cases. - int successful_test_case_count() const; - - // Gets the number of failed test cases. - int failed_test_case_count() const; - - // Gets the number of all test cases. - int total_test_case_count() const; - - // Gets the number of all test cases that contain at least one test - // that should run. - int test_case_to_run_count() const; - - // Gets the number of successful tests. - int successful_test_count() const; - - // Gets the number of failed tests. - int failed_test_count() const; - - // Gets the number of disabled tests that will be reported in the XML report. - int reportable_disabled_test_count() const; - - // Gets the number of disabled tests. - int disabled_test_count() const; - - // Gets the number of tests to be printed in the XML report. - int reportable_test_count() const; - - // Gets the number of all tests. - int total_test_count() const; - - // Gets the number of tests that should run. - int test_to_run_count() const; - - // Gets the time of the test program start, in ms from the start of the - // UNIX epoch. - TimeInMillis start_timestamp() const; - - // Gets the elapsed time, in milliseconds. - TimeInMillis elapsed_time() const; - - // Returns true iff the unit test passed (i.e. all test cases passed). - bool Passed() const; - - // Returns true iff the unit test failed (i.e. some test case failed - // or something outside of all tests failed). - bool Failed() const; - - // Gets the i-th test case among all the test cases. i can range from 0 to - // total_test_case_count() - 1. If i is not in that range, returns NULL. - const TestCase* GetTestCase(int i) const; - - // Returns the TestResult containing information on test failures and - // properties logged outside of individual test cases. - const TestResult& ad_hoc_test_result() const; - - // Returns the list of event listeners that can be used to track events - // inside Google Test. - TestEventListeners& listeners(); - - private: - // Registers and returns a global test environment. When a test - // program is run, all global test environments will be set-up in - // the order they were registered. After all tests in the program - // have finished, all global test environments will be torn-down in - // the *reverse* order they were registered. - // - // The UnitTest object takes ownership of the given environment. - // - // This method can only be called from the main thread. - Environment* AddEnvironment(Environment* env); - - // Adds a TestPartResult to the current TestResult object. All - // Google Test assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) - // eventually call this to report their results. The user code - // should use the assertion macros instead of calling this directly. - void AddTestPartResult(TestPartResult::Type result_type, - const char* file_name, - int line_number, - const std::string& message, - const std::string& os_stack_trace) - GTEST_LOCK_EXCLUDED_(mutex_); - - // Adds a TestProperty to the current TestResult object when invoked from - // inside a test, to current TestCase's ad_hoc_test_result_ when invoked - // from SetUpTestCase or TearDownTestCase, or to the global property set - // when invoked elsewhere. If the result already contains a property with - // the same key, the value will be updated. - void RecordProperty(const std::string& key, const std::string& value); - - // Gets the i-th test case among all the test cases. i can range from 0 to - // total_test_case_count() - 1. If i is not in that range, returns NULL. - TestCase* GetMutableTestCase(int i); - - // Accessors for the implementation object. - internal::UnitTestImpl* impl() { return impl_; } - const internal::UnitTestImpl* impl() const { return impl_; } - - // These classes and functions are friends as they need to access private - // members of UnitTest. - friend class ScopedTrace; - friend class Test; - friend class internal::AssertHelper; - friend class internal::StreamingListenerTest; - friend class internal::UnitTestRecordPropertyTestHelper; - friend Environment* AddGlobalTestEnvironment(Environment* env); - friend internal::UnitTestImpl* internal::GetUnitTestImpl(); - friend void internal::ReportFailureInUnknownLocation( - TestPartResult::Type result_type, - const std::string& message); - - // Creates an empty UnitTest. - UnitTest(); - - // D'tor - virtual ~UnitTest(); - - // Pushes a trace defined by SCOPED_TRACE() on to the per-thread - // Google Test trace stack. - void PushGTestTrace(const internal::TraceInfo& trace) - GTEST_LOCK_EXCLUDED_(mutex_); - - // Pops a trace from the per-thread Google Test trace stack. - void PopGTestTrace() - GTEST_LOCK_EXCLUDED_(mutex_); - - // Protects mutable state in *impl_. This is mutable as some const - // methods need to lock it too. - mutable internal::Mutex mutex_; - - // Opaque implementation object. This field is never changed once - // the object is constructed. We don't mark it as const here, as - // doing so will cause a warning in the constructor of UnitTest. - // Mutable state in *impl_ is protected by mutex_. - internal::UnitTestImpl* impl_; - - // We disallow copying UnitTest. - GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTest); -}; - -// A convenient wrapper for adding an environment for the test -// program. -// -// You should call this before RUN_ALL_TESTS() is called, probably in -// main(). If you use gtest_main, you need to call this before main() -// starts for it to take effect. For example, you can define a global -// variable like this: -// -// testing::Environment* const foo_env = -// testing::AddGlobalTestEnvironment(new FooEnvironment); -// -// However, we strongly recommend you to write your own main() and -// call AddGlobalTestEnvironment() there, as relying on initialization -// of global variables makes the code harder to read and may cause -// problems when you register multiple environments from different -// translation units and the environments have dependencies among them -// (remember that the compiler doesn't guarantee the order in which -// global variables from different translation units are initialized). -inline Environment* AddGlobalTestEnvironment(Environment* env) { - return UnitTest::GetInstance()->AddEnvironment(env); -} - -// Initializes Google Test. This must be called before calling -// RUN_ALL_TESTS(). In particular, it parses a command line for the -// flags that Google Test recognizes. Whenever a Google Test flag is -// seen, it is removed from argv, and *argc is decremented. -// -// No value is returned. Instead, the Google Test flag variables are -// updated. -// -// Calling the function for the second time has no user-visible effect. -GTEST_API_ void InitGoogleTest(int* argc, char** argv); - -// This overloaded version can be used in Windows programs compiled in -// UNICODE mode. -GTEST_API_ void InitGoogleTest(int* argc, wchar_t** argv); - -namespace internal { - -// Separate the error generating code from the code path to reduce the stack -// frame size of CmpHelperEQ. This helps reduce the overhead of some sanitizers -// when calling EXPECT_* in a tight loop. -template -AssertionResult CmpHelperEQFailure(const char* lhs_expression, - const char* rhs_expression, - const T1& lhs, const T2& rhs) { - return EqFailure(lhs_expression, - rhs_expression, - FormatForComparisonFailureMessage(lhs, rhs), - FormatForComparisonFailureMessage(rhs, lhs), - false); -} - -// The helper function for {ASSERT|EXPECT}_EQ. -template -AssertionResult CmpHelperEQ(const char* lhs_expression, - const char* rhs_expression, - const T1& lhs, - const T2& rhs) { - if (lhs == rhs) { - return AssertionSuccess(); - } - - return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs); -} - -// With this overloaded version, we allow anonymous enums to be used -// in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous enums -// can be implicitly cast to BiggestInt. -GTEST_API_ AssertionResult CmpHelperEQ(const char* lhs_expression, - const char* rhs_expression, - BiggestInt lhs, - BiggestInt rhs); - -// The helper class for {ASSERT|EXPECT}_EQ. The template argument -// lhs_is_null_literal is true iff the first argument to ASSERT_EQ() -// is a null pointer literal. The following default implementation is -// for lhs_is_null_literal being false. -template -class EqHelper { - public: - // This templatized version is for the general case. - template - static AssertionResult Compare(const char* lhs_expression, - const char* rhs_expression, - const T1& lhs, - const T2& rhs) { - return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs); - } - - // With this overloaded version, we allow anonymous enums to be used - // in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous - // enums can be implicitly cast to BiggestInt. - // - // Even though its body looks the same as the above version, we - // cannot merge the two, as it will make anonymous enums unhappy. - static AssertionResult Compare(const char* lhs_expression, - const char* rhs_expression, - BiggestInt lhs, - BiggestInt rhs) { - return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs); - } -}; - -// This specialization is used when the first argument to ASSERT_EQ() -// is a null pointer literal, like NULL, false, or 0. -template <> -class EqHelper { - public: - // We define two overloaded versions of Compare(). The first - // version will be picked when the second argument to ASSERT_EQ() is - // NOT a pointer, e.g. ASSERT_EQ(0, AnIntFunction()) or - // EXPECT_EQ(false, a_bool). - template - static AssertionResult Compare( - const char* lhs_expression, - const char* rhs_expression, - const T1& lhs, - const T2& rhs, - // The following line prevents this overload from being considered if T2 - // is not a pointer type. We need this because ASSERT_EQ(NULL, my_ptr) - // expands to Compare("", "", NULL, my_ptr), which requires a conversion - // to match the Secret* in the other overload, which would otherwise make - // this template match better. - typename EnableIf::value>::type* = 0) { - return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs); - } - - // This version will be picked when the second argument to ASSERT_EQ() is a - // pointer, e.g. ASSERT_EQ(NULL, a_pointer). - template - static AssertionResult Compare( - const char* lhs_expression, - const char* rhs_expression, - // We used to have a second template parameter instead of Secret*. That - // template parameter would deduce to 'long', making this a better match - // than the first overload even without the first overload's EnableIf. - // Unfortunately, gcc with -Wconversion-null warns when "passing NULL to - // non-pointer argument" (even a deduced integral argument), so the old - // implementation caused warnings in user code. - Secret* /* lhs (NULL) */, - T* rhs) { - // We already know that 'lhs' is a null pointer. - return CmpHelperEQ(lhs_expression, rhs_expression, - static_cast(NULL), rhs); - } -}; - -// Separate the error generating code from the code path to reduce the stack -// frame size of CmpHelperOP. This helps reduce the overhead of some sanitizers -// when calling EXPECT_OP in a tight loop. -template -AssertionResult CmpHelperOpFailure(const char* expr1, const char* expr2, - const T1& val1, const T2& val2, - const char* op) { - return AssertionFailure() - << "Expected: (" << expr1 << ") " << op << " (" << expr2 - << "), actual: " << FormatForComparisonFailureMessage(val1, val2) - << " vs " << FormatForComparisonFailureMessage(val2, val1); -} - -// A macro for implementing the helper functions needed to implement -// ASSERT_?? and EXPECT_??. It is here just to avoid copy-and-paste -// of similar code. -// -// For each templatized helper function, we also define an overloaded -// version for BiggestInt in order to reduce code bloat and allow -// anonymous enums to be used with {ASSERT|EXPECT}_?? when compiled -// with gcc 4. -// -// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. - -#define GTEST_IMPL_CMP_HELPER_(op_name, op)\ -template \ -AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \ - const T1& val1, const T2& val2) {\ - if (val1 op val2) {\ - return AssertionSuccess();\ - } else {\ - return CmpHelperOpFailure(expr1, expr2, val1, val2, #op);\ - }\ -}\ -GTEST_API_ AssertionResult CmpHelper##op_name(\ - const char* expr1, const char* expr2, BiggestInt val1, BiggestInt val2) - -// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. - -// Implements the helper function for {ASSERT|EXPECT}_NE -GTEST_IMPL_CMP_HELPER_(NE, !=); -// Implements the helper function for {ASSERT|EXPECT}_LE -GTEST_IMPL_CMP_HELPER_(LE, <=); -// Implements the helper function for {ASSERT|EXPECT}_LT -GTEST_IMPL_CMP_HELPER_(LT, <); -// Implements the helper function for {ASSERT|EXPECT}_GE -GTEST_IMPL_CMP_HELPER_(GE, >=); -// Implements the helper function for {ASSERT|EXPECT}_GT -GTEST_IMPL_CMP_HELPER_(GT, >); - -#undef GTEST_IMPL_CMP_HELPER_ - -// The helper function for {ASSERT|EXPECT}_STREQ. -// -// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. -GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression, - const char* s2_expression, - const char* s1, - const char* s2); - -// The helper function for {ASSERT|EXPECT}_STRCASEEQ. -// -// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. -GTEST_API_ AssertionResult CmpHelperSTRCASEEQ(const char* s1_expression, - const char* s2_expression, - const char* s1, - const char* s2); - -// The helper function for {ASSERT|EXPECT}_STRNE. -// -// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. -GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression, - const char* s2_expression, - const char* s1, - const char* s2); - -// The helper function for {ASSERT|EXPECT}_STRCASENE. -// -// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. -GTEST_API_ AssertionResult CmpHelperSTRCASENE(const char* s1_expression, - const char* s2_expression, - const char* s1, - const char* s2); - - -// Helper function for *_STREQ on wide strings. -// -// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. -GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression, - const char* s2_expression, - const wchar_t* s1, - const wchar_t* s2); - -// Helper function for *_STRNE on wide strings. -// -// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. -GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression, - const char* s2_expression, - const wchar_t* s1, - const wchar_t* s2); - -} // namespace internal - -// IsSubstring() and IsNotSubstring() are intended to be used as the -// first argument to {EXPECT,ASSERT}_PRED_FORMAT2(), not by -// themselves. They check whether needle is a substring of haystack -// (NULL is considered a substring of itself only), and return an -// appropriate error message when they fail. -// -// The {needle,haystack}_expr arguments are the stringified -// expressions that generated the two real arguments. -GTEST_API_ AssertionResult IsSubstring( - const char* needle_expr, const char* haystack_expr, - const char* needle, const char* haystack); -GTEST_API_ AssertionResult IsSubstring( - const char* needle_expr, const char* haystack_expr, - const wchar_t* needle, const wchar_t* haystack); -GTEST_API_ AssertionResult IsNotSubstring( - const char* needle_expr, const char* haystack_expr, - const char* needle, const char* haystack); -GTEST_API_ AssertionResult IsNotSubstring( - const char* needle_expr, const char* haystack_expr, - const wchar_t* needle, const wchar_t* haystack); -GTEST_API_ AssertionResult IsSubstring( - const char* needle_expr, const char* haystack_expr, - const ::std::string& needle, const ::std::string& haystack); -GTEST_API_ AssertionResult IsNotSubstring( - const char* needle_expr, const char* haystack_expr, - const ::std::string& needle, const ::std::string& haystack); - -#if GTEST_HAS_STD_WSTRING -GTEST_API_ AssertionResult IsSubstring( - const char* needle_expr, const char* haystack_expr, - const ::std::wstring& needle, const ::std::wstring& haystack); -GTEST_API_ AssertionResult IsNotSubstring( - const char* needle_expr, const char* haystack_expr, - const ::std::wstring& needle, const ::std::wstring& haystack); -#endif // GTEST_HAS_STD_WSTRING - -namespace internal { - -// Helper template function for comparing floating-points. -// -// Template parameter: -// -// RawType: the raw floating-point type (either float or double) -// -// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. -template -AssertionResult CmpHelperFloatingPointEQ(const char* lhs_expression, - const char* rhs_expression, - RawType lhs_value, - RawType rhs_value) { - const FloatingPoint lhs(lhs_value), rhs(rhs_value); - - if (lhs.AlmostEquals(rhs)) { - return AssertionSuccess(); - } - - ::std::stringstream lhs_ss; - lhs_ss << std::setprecision(std::numeric_limits::digits10 + 2) - << lhs_value; - - ::std::stringstream rhs_ss; - rhs_ss << std::setprecision(std::numeric_limits::digits10 + 2) - << rhs_value; - - return EqFailure(lhs_expression, - rhs_expression, - StringStreamToString(&lhs_ss), - StringStreamToString(&rhs_ss), - false); -} - -// Helper function for implementing ASSERT_NEAR. -// -// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. -GTEST_API_ AssertionResult DoubleNearPredFormat(const char* expr1, - const char* expr2, - const char* abs_error_expr, - double val1, - double val2, - double abs_error); - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// A class that enables one to stream messages to assertion macros -class GTEST_API_ AssertHelper { - public: - // Constructor. - AssertHelper(TestPartResult::Type type, - const char* file, - int line, - const char* message); - ~AssertHelper(); - - // Message assignment is a semantic trick to enable assertion - // streaming; see the GTEST_MESSAGE_ macro below. - void operator=(const Message& message) const; - - private: - // We put our data in a struct so that the size of the AssertHelper class can - // be as small as possible. This is important because gcc is incapable of - // re-using stack space even for temporary variables, so every EXPECT_EQ - // reserves stack space for another AssertHelper. - struct AssertHelperData { - AssertHelperData(TestPartResult::Type t, - const char* srcfile, - int line_num, - const char* msg) - : type(t), file(srcfile), line(line_num), message(msg) { } - - TestPartResult::Type const type; - const char* const file; - int const line; - std::string const message; - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelperData); - }; - - AssertHelperData* const data_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelper); -}; - -} // namespace internal - -// The pure interface class that all value-parameterized tests inherit from. -// A value-parameterized class must inherit from both ::testing::Test and -// ::testing::WithParamInterface. In most cases that just means inheriting -// from ::testing::TestWithParam, but more complicated test hierarchies -// may need to inherit from Test and WithParamInterface at different levels. -// -// This interface has support for accessing the test parameter value via -// the GetParam() method. -// -// Use it with one of the parameter generator defining functions, like Range(), -// Values(), ValuesIn(), Bool(), and Combine(). -// -// class FooTest : public ::testing::TestWithParam { -// protected: -// FooTest() { -// // Can use GetParam() here. -// } -// virtual ~FooTest() { -// // Can use GetParam() here. -// } -// virtual void SetUp() { -// // Can use GetParam() here. -// } -// virtual void TearDown { -// // Can use GetParam() here. -// } -// }; -// TEST_P(FooTest, DoesBar) { -// // Can use GetParam() method here. -// Foo foo; -// ASSERT_TRUE(foo.DoesBar(GetParam())); -// } -// INSTANTIATE_TEST_CASE_P(OneToTenRange, FooTest, ::testing::Range(1, 10)); - -template -class WithParamInterface { - public: - typedef T ParamType; - virtual ~WithParamInterface() {} - - // The current parameter value. Is also available in the test fixture's - // constructor. This member function is non-static, even though it only - // references static data, to reduce the opportunity for incorrect uses - // like writing 'WithParamInterface::GetParam()' for a test that - // uses a fixture whose parameter type is int. - const ParamType& GetParam() const { - GTEST_CHECK_(parameter_ != NULL) - << "GetParam() can only be called inside a value-parameterized test " - << "-- did you intend to write TEST_P instead of TEST_F?"; - return *parameter_; - } - - private: - // Sets parameter value. The caller is responsible for making sure the value - // remains alive and unchanged throughout the current test. - static void SetParam(const ParamType* parameter) { - parameter_ = parameter; - } - - // Static value used for accessing parameter during a test lifetime. - static const ParamType* parameter_; - - // TestClass must be a subclass of WithParamInterface and Test. - template friend class internal::ParameterizedTestFactory; -}; - -template -const T* WithParamInterface::parameter_ = NULL; - -// Most value-parameterized classes can ignore the existence of -// WithParamInterface, and can just inherit from ::testing::TestWithParam. - -template -class TestWithParam : public Test, public WithParamInterface { -}; - -// Macros for indicating success/failure in test code. - -// ADD_FAILURE unconditionally adds a failure to the current test. -// SUCCEED generates a success - it doesn't automatically make the -// current test successful, as a test is only successful when it has -// no failure. -// -// EXPECT_* verifies that a certain condition is satisfied. If not, -// it behaves like ADD_FAILURE. In particular: -// -// EXPECT_TRUE verifies that a Boolean condition is true. -// EXPECT_FALSE verifies that a Boolean condition is false. -// -// FAIL and ASSERT_* are similar to ADD_FAILURE and EXPECT_*, except -// that they will also abort the current function on failure. People -// usually want the fail-fast behavior of FAIL and ASSERT_*, but those -// writing data-driven tests often find themselves using ADD_FAILURE -// and EXPECT_* more. - -// Generates a nonfatal failure with a generic message. -#define ADD_FAILURE() GTEST_NONFATAL_FAILURE_("Failed") - -// Generates a nonfatal failure at the given source file location with -// a generic message. -#define ADD_FAILURE_AT(file, line) \ - GTEST_MESSAGE_AT_(file, line, "Failed", \ - ::testing::TestPartResult::kNonFatalFailure) - -// Generates a fatal failure with a generic message. -#define GTEST_FAIL() GTEST_FATAL_FAILURE_("Failed") - -// Define this macro to 1 to omit the definition of FAIL(), which is a -// generic name and clashes with some other libraries. -#if !GTEST_DONT_DEFINE_FAIL -# define FAIL() GTEST_FAIL() -#endif - -// Generates a success with a generic message. -#define GTEST_SUCCEED() GTEST_SUCCESS_("Succeeded") - -// Define this macro to 1 to omit the definition of SUCCEED(), which -// is a generic name and clashes with some other libraries. -#if !GTEST_DONT_DEFINE_SUCCEED -# define SUCCEED() GTEST_SUCCEED() -#endif - -// Macros for testing exceptions. -// -// * {ASSERT|EXPECT}_THROW(statement, expected_exception): -// Tests that the statement throws the expected exception. -// * {ASSERT|EXPECT}_NO_THROW(statement): -// Tests that the statement doesn't throw any exception. -// * {ASSERT|EXPECT}_ANY_THROW(statement): -// Tests that the statement throws an exception. - -#define EXPECT_THROW(statement, expected_exception) \ - GTEST_TEST_THROW_(statement, expected_exception, GTEST_NONFATAL_FAILURE_) -#define EXPECT_NO_THROW(statement) \ - GTEST_TEST_NO_THROW_(statement, GTEST_NONFATAL_FAILURE_) -#define EXPECT_ANY_THROW(statement) \ - GTEST_TEST_ANY_THROW_(statement, GTEST_NONFATAL_FAILURE_) -#define ASSERT_THROW(statement, expected_exception) \ - GTEST_TEST_THROW_(statement, expected_exception, GTEST_FATAL_FAILURE_) -#define ASSERT_NO_THROW(statement) \ - GTEST_TEST_NO_THROW_(statement, GTEST_FATAL_FAILURE_) -#define ASSERT_ANY_THROW(statement) \ - GTEST_TEST_ANY_THROW_(statement, GTEST_FATAL_FAILURE_) - -// Boolean assertions. Condition can be either a Boolean expression or an -// AssertionResult. For more information on how to use AssertionResult with -// these macros see comments on that class. -#define EXPECT_TRUE(condition) \ - GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \ - GTEST_NONFATAL_FAILURE_) -#define EXPECT_FALSE(condition) \ - GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \ - GTEST_NONFATAL_FAILURE_) -#define ASSERT_TRUE(condition) \ - GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \ - GTEST_FATAL_FAILURE_) -#define ASSERT_FALSE(condition) \ - GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \ - GTEST_FATAL_FAILURE_) - -// Macros for testing equalities and inequalities. -// -// * {ASSERT|EXPECT}_EQ(v1, v2): Tests that v1 == v2 -// * {ASSERT|EXPECT}_NE(v1, v2): Tests that v1 != v2 -// * {ASSERT|EXPECT}_LT(v1, v2): Tests that v1 < v2 -// * {ASSERT|EXPECT}_LE(v1, v2): Tests that v1 <= v2 -// * {ASSERT|EXPECT}_GT(v1, v2): Tests that v1 > v2 -// * {ASSERT|EXPECT}_GE(v1, v2): Tests that v1 >= v2 -// -// When they are not, Google Test prints both the tested expressions and -// their actual values. The values must be compatible built-in types, -// or you will get a compiler error. By "compatible" we mean that the -// values can be compared by the respective operator. -// -// Note: -// -// 1. It is possible to make a user-defined type work with -// {ASSERT|EXPECT}_??(), but that requires overloading the -// comparison operators and is thus discouraged by the Google C++ -// Usage Guide. Therefore, you are advised to use the -// {ASSERT|EXPECT}_TRUE() macro to assert that two objects are -// equal. -// -// 2. The {ASSERT|EXPECT}_??() macros do pointer comparisons on -// pointers (in particular, C strings). Therefore, if you use it -// with two C strings, you are testing how their locations in memory -// are related, not how their content is related. To compare two C -// strings by content, use {ASSERT|EXPECT}_STR*(). -// -// 3. {ASSERT|EXPECT}_EQ(v1, v2) is preferred to -// {ASSERT|EXPECT}_TRUE(v1 == v2), as the former tells you -// what the actual value is when it fails, and similarly for the -// other comparisons. -// -// 4. Do not depend on the order in which {ASSERT|EXPECT}_??() -// evaluate their arguments, which is undefined. -// -// 5. These macros evaluate their arguments exactly once. -// -// Examples: -// -// EXPECT_NE(Foo(), 5); -// EXPECT_EQ(a_pointer, NULL); -// ASSERT_LT(i, array_size); -// ASSERT_GT(records.size(), 0) << "There is no record left."; - -#define EXPECT_EQ(val1, val2) \ - EXPECT_PRED_FORMAT2(::testing::internal:: \ - EqHelper::Compare, \ - val1, val2) -#define EXPECT_NE(val1, val2) \ - EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2) -#define EXPECT_LE(val1, val2) \ - EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2) -#define EXPECT_LT(val1, val2) \ - EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2) -#define EXPECT_GE(val1, val2) \ - EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2) -#define EXPECT_GT(val1, val2) \ - EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2) - -#define GTEST_ASSERT_EQ(val1, val2) \ - ASSERT_PRED_FORMAT2(::testing::internal:: \ - EqHelper::Compare, \ - val1, val2) -#define GTEST_ASSERT_NE(val1, val2) \ - ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2) -#define GTEST_ASSERT_LE(val1, val2) \ - ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2) -#define GTEST_ASSERT_LT(val1, val2) \ - ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2) -#define GTEST_ASSERT_GE(val1, val2) \ - ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2) -#define GTEST_ASSERT_GT(val1, val2) \ - ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2) - -// Define macro GTEST_DONT_DEFINE_ASSERT_XY to 1 to omit the definition of -// ASSERT_XY(), which clashes with some users' own code. - -#if !GTEST_DONT_DEFINE_ASSERT_EQ -# define ASSERT_EQ(val1, val2) GTEST_ASSERT_EQ(val1, val2) -#endif - -#if !GTEST_DONT_DEFINE_ASSERT_NE -# define ASSERT_NE(val1, val2) GTEST_ASSERT_NE(val1, val2) -#endif - -#if !GTEST_DONT_DEFINE_ASSERT_LE -# define ASSERT_LE(val1, val2) GTEST_ASSERT_LE(val1, val2) -#endif - -#if !GTEST_DONT_DEFINE_ASSERT_LT -# define ASSERT_LT(val1, val2) GTEST_ASSERT_LT(val1, val2) -#endif - -#if !GTEST_DONT_DEFINE_ASSERT_GE -# define ASSERT_GE(val1, val2) GTEST_ASSERT_GE(val1, val2) -#endif - -#if !GTEST_DONT_DEFINE_ASSERT_GT -# define ASSERT_GT(val1, val2) GTEST_ASSERT_GT(val1, val2) -#endif - -// C-string Comparisons. All tests treat NULL and any non-NULL string -// as different. Two NULLs are equal. -// -// * {ASSERT|EXPECT}_STREQ(s1, s2): Tests that s1 == s2 -// * {ASSERT|EXPECT}_STRNE(s1, s2): Tests that s1 != s2 -// * {ASSERT|EXPECT}_STRCASEEQ(s1, s2): Tests that s1 == s2, ignoring case -// * {ASSERT|EXPECT}_STRCASENE(s1, s2): Tests that s1 != s2, ignoring case -// -// For wide or narrow string objects, you can use the -// {ASSERT|EXPECT}_??() macros. -// -// Don't depend on the order in which the arguments are evaluated, -// which is undefined. -// -// These macros evaluate their arguments exactly once. - -#define EXPECT_STREQ(s1, s2) \ - EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2) -#define EXPECT_STRNE(s1, s2) \ - EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2) -#define EXPECT_STRCASEEQ(s1, s2) \ - EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2) -#define EXPECT_STRCASENE(s1, s2)\ - EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2) - -#define ASSERT_STREQ(s1, s2) \ - ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2) -#define ASSERT_STRNE(s1, s2) \ - ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2) -#define ASSERT_STRCASEEQ(s1, s2) \ - ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2) -#define ASSERT_STRCASENE(s1, s2)\ - ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2) - -// Macros for comparing floating-point numbers. -// -// * {ASSERT|EXPECT}_FLOAT_EQ(val1, val2): -// Tests that two float values are almost equal. -// * {ASSERT|EXPECT}_DOUBLE_EQ(val1, val2): -// Tests that two double values are almost equal. -// * {ASSERT|EXPECT}_NEAR(v1, v2, abs_error): -// Tests that v1 and v2 are within the given distance to each other. -// -// Google Test uses ULP-based comparison to automatically pick a default -// error bound that is appropriate for the operands. See the -// FloatingPoint template class in gtest-internal.h if you are -// interested in the implementation details. - -#define EXPECT_FLOAT_EQ(val1, val2)\ - EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ, \ - val1, val2) - -#define EXPECT_DOUBLE_EQ(val1, val2)\ - EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ, \ - val1, val2) - -#define ASSERT_FLOAT_EQ(val1, val2)\ - ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ, \ - val1, val2) - -#define ASSERT_DOUBLE_EQ(val1, val2)\ - ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ, \ - val1, val2) - -#define EXPECT_NEAR(val1, val2, abs_error)\ - EXPECT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \ - val1, val2, abs_error) - -#define ASSERT_NEAR(val1, val2, abs_error)\ - ASSERT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \ - val1, val2, abs_error) - -// These predicate format functions work on floating-point values, and -// can be used in {ASSERT|EXPECT}_PRED_FORMAT2*(), e.g. -// -// EXPECT_PRED_FORMAT2(testing::DoubleLE, Foo(), 5.0); - -// Asserts that val1 is less than, or almost equal to, val2. Fails -// otherwise. In particular, it fails if either val1 or val2 is NaN. -GTEST_API_ AssertionResult FloatLE(const char* expr1, const char* expr2, - float val1, float val2); -GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2, - double val1, double val2); - - -#if GTEST_OS_WINDOWS - -// Macros that test for HRESULT failure and success, these are only useful -// on Windows, and rely on Windows SDK macros and APIs to compile. -// -// * {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}(expr) -// -// When expr unexpectedly fails or succeeds, Google Test prints the -// expected result and the actual result with both a human-readable -// string representation of the error, if available, as well as the -// hex result code. -# define EXPECT_HRESULT_SUCCEEDED(expr) \ - EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr)) - -# define ASSERT_HRESULT_SUCCEEDED(expr) \ - ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr)) - -# define EXPECT_HRESULT_FAILED(expr) \ - EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr)) - -# define ASSERT_HRESULT_FAILED(expr) \ - ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr)) - -#endif // GTEST_OS_WINDOWS - -// Macros that execute statement and check that it doesn't generate new fatal -// failures in the current thread. -// -// * {ASSERT|EXPECT}_NO_FATAL_FAILURE(statement); -// -// Examples: -// -// EXPECT_NO_FATAL_FAILURE(Process()); -// ASSERT_NO_FATAL_FAILURE(Process()) << "Process() failed"; -// -#define ASSERT_NO_FATAL_FAILURE(statement) \ - GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_FATAL_FAILURE_) -#define EXPECT_NO_FATAL_FAILURE(statement) \ - GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_NONFATAL_FAILURE_) - -// Causes a trace (including the given source file path and line number, -// and the given message) to be included in every test failure message generated -// by code in the scope of the lifetime of an instance of this class. The effect -// is undone with the destruction of the instance. -// -// The message argument can be anything streamable to std::ostream. -// -// Example: -// testing::ScopedTrace trace("file.cc", 123, "message"); -// -class GTEST_API_ ScopedTrace { - public: - // The c'tor pushes the given source file location and message onto - // a trace stack maintained by Google Test. - - // Template version. Uses Message() to convert the values into strings. - // Slow, but flexible. - template - ScopedTrace(const char* file, int line, const T& message) { - PushTrace(file, line, (Message() << message).GetString()); - } - - // Optimize for some known types. - ScopedTrace(const char* file, int line, const char* message) { - PushTrace(file, line, message ? message : "(null)"); - } - -#if GTEST_HAS_GLOBAL_STRING - ScopedTrace(const char* file, int line, const ::string& message) { - PushTrace(file, line, message); - } -#endif - - ScopedTrace(const char* file, int line, const std::string& message) { - PushTrace(file, line, message); - } - - // The d'tor pops the info pushed by the c'tor. - // - // Note that the d'tor is not virtual in order to be efficient. - // Don't inherit from ScopedTrace! - ~ScopedTrace(); - - private: - void PushTrace(const char* file, int line, std::string message); - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace); -} GTEST_ATTRIBUTE_UNUSED_; // A ScopedTrace object does its job in its - // c'tor and d'tor. Therefore it doesn't - // need to be used otherwise. - -// Causes a trace (including the source file path, the current line -// number, and the given message) to be included in every test failure -// message generated by code in the current scope. The effect is -// undone when the control leaves the current scope. -// -// The message argument can be anything streamable to std::ostream. -// -// In the implementation, we include the current line number as part -// of the dummy variable name, thus allowing multiple SCOPED_TRACE()s -// to appear in the same block - as long as they are on different -// lines. -// -// Assuming that each thread maintains its own stack of traces. -// Therefore, a SCOPED_TRACE() would (correctly) only affect the -// assertions in its own thread. -#define SCOPED_TRACE(message) \ - ::testing::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\ - __FILE__, __LINE__, (message)) - - -// Compile-time assertion for type equality. -// StaticAssertTypeEq() compiles iff type1 and type2 are -// the same type. The value it returns is not interesting. -// -// Instead of making StaticAssertTypeEq a class template, we make it a -// function template that invokes a helper class template. This -// prevents a user from misusing StaticAssertTypeEq by -// defining objects of that type. -// -// CAVEAT: -// -// When used inside a method of a class template, -// StaticAssertTypeEq() is effective ONLY IF the method is -// instantiated. For example, given: -// -// template class Foo { -// public: -// void Bar() { testing::StaticAssertTypeEq(); } -// }; -// -// the code: -// -// void Test1() { Foo foo; } -// -// will NOT generate a compiler error, as Foo::Bar() is never -// actually instantiated. Instead, you need: -// -// void Test2() { Foo foo; foo.Bar(); } -// -// to cause a compiler error. -template -bool StaticAssertTypeEq() { - (void)internal::StaticAssertTypeEqHelper(); - return true; -} - -// Defines a test. -// -// The first parameter is the name of the test case, and the second -// parameter is the name of the test within the test case. -// -// The convention is to end the test case name with "Test". For -// example, a test case for the Foo class can be named FooTest. -// -// Test code should appear between braces after an invocation of -// this macro. Example: -// -// TEST(FooTest, InitializesCorrectly) { -// Foo foo; -// EXPECT_TRUE(foo.StatusIsOK()); -// } - -// Note that we call GetTestTypeId() instead of GetTypeId< -// ::testing::Test>() here to get the type ID of testing::Test. This -// is to work around a suspected linker bug when using Google Test as -// a framework on Mac OS X. The bug causes GetTypeId< -// ::testing::Test>() to return different values depending on whether -// the call is from the Google Test framework itself or from user test -// code. GetTestTypeId() is guaranteed to always return the same -// value, as it always calls GetTypeId<>() from the Google Test -// framework. -#define GTEST_TEST(test_case_name, test_name)\ - GTEST_TEST_(test_case_name, test_name, \ - ::testing::Test, ::testing::internal::GetTestTypeId()) - -// Define this macro to 1 to omit the definition of TEST(), which -// is a generic name and clashes with some other libraries. -#if !GTEST_DONT_DEFINE_TEST -# define TEST(test_case_name, test_name) GTEST_TEST(test_case_name, test_name) -#endif - -// Defines a test that uses a test fixture. -// -// The first parameter is the name of the test fixture class, which -// also doubles as the test case name. The second parameter is the -// name of the test within the test case. -// -// A test fixture class must be declared earlier. The user should put -// the test code between braces after using this macro. Example: -// -// class FooTest : public testing::Test { -// protected: -// virtual void SetUp() { b_.AddElement(3); } -// -// Foo a_; -// Foo b_; -// }; -// -// TEST_F(FooTest, InitializesCorrectly) { -// EXPECT_TRUE(a_.StatusIsOK()); -// } -// -// TEST_F(FooTest, ReturnsElementCountCorrectly) { -// EXPECT_EQ(a_.size(), 0); -// EXPECT_EQ(b_.size(), 1); -// } - -#define TEST_F(test_fixture, test_name)\ - GTEST_TEST_(test_fixture, test_name, test_fixture, \ - ::testing::internal::GetTypeId()) - -// Returns a path to temporary directory. -// Tries to determine an appropriate directory for the platform. -GTEST_API_ std::string TempDir(); - -#ifdef _MSC_VER -# pragma warning(pop) -#endif - -} // namespace testing - -// Use this function in main() to run all tests. It returns 0 if all -// tests are successful, or 1 otherwise. -// -// RUN_ALL_TESTS() should be invoked after the command line has been -// parsed by InitGoogleTest(). -// -// This function was formerly a macro; thus, it is in the global -// namespace and has an all-caps name. -int RUN_ALL_TESTS() GTEST_MUST_USE_RESULT_; - -inline int RUN_ALL_TESTS() { - return ::testing::UnitTest::GetInstance()->Run(); -} - -#endif // GTEST_INCLUDE_GTEST_GTEST_H_ diff --git a/test/gtest-1.8.0/include/gtest/gtest_pred_impl.h b/test/gtest-1.8.0/include/gtest/gtest_pred_impl.h deleted file mode 100644 index c8be230ed6..0000000000 --- a/test/gtest-1.8.0/include/gtest/gtest_pred_impl.h +++ /dev/null @@ -1,357 +0,0 @@ -// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// This file is AUTOMATICALLY GENERATED on 01/02/2018 by command -// 'gen_gtest_pred_impl.py 5'. DO NOT EDIT BY HAND! -// -// Implements a family of generic predicate assertion macros. - -#ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ -#define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ - -#include "gtest/gtest.h" - -namespace testing { - -// This header implements a family of generic predicate assertion -// macros: -// -// ASSERT_PRED_FORMAT1(pred_format, v1) -// ASSERT_PRED_FORMAT2(pred_format, v1, v2) -// ... -// -// where pred_format is a function or functor that takes n (in the -// case of ASSERT_PRED_FORMATn) values and their source expression -// text, and returns a testing::AssertionResult. See the definition -// of ASSERT_EQ in gtest.h for an example. -// -// If you don't care about formatting, you can use the more -// restrictive version: -// -// ASSERT_PRED1(pred, v1) -// ASSERT_PRED2(pred, v1, v2) -// ... -// -// where pred is an n-ary function or functor that returns bool, -// and the values v1, v2, ..., must support the << operator for -// streaming to std::ostream. -// -// We also define the EXPECT_* variations. -// -// For now we only support predicates whose arity is at most 5. - -// GTEST_ASSERT_ is the basic statement to which all of the assertions -// in this file reduce. Don't use this in your code. - -#define GTEST_ASSERT_(expression, on_failure) \ - GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ - if (const ::testing::AssertionResult gtest_ar = (expression)) \ - ; \ - else \ - on_failure(gtest_ar.failure_message()) - - -// Helper function for implementing {EXPECT|ASSERT}_PRED1. Don't use -// this in your code. -template -AssertionResult AssertPred1Helper(const char* pred_text, - const char* e1, - Pred pred, - const T1& v1) { - if (pred(v1)) return AssertionSuccess(); - - return AssertionFailure() << pred_text << "(" - << e1 << ") evaluates to false, where" - << "\n" << e1 << " evaluates to " << v1; -} - -// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT1. -// Don't use this in your code. -#define GTEST_PRED_FORMAT1_(pred_format, v1, on_failure)\ - GTEST_ASSERT_(pred_format(#v1, v1), \ - on_failure) - -// Internal macro for implementing {EXPECT|ASSERT}_PRED1. Don't use -// this in your code. -#define GTEST_PRED1_(pred, v1, on_failure)\ - GTEST_ASSERT_(::testing::AssertPred1Helper(#pred, \ - #v1, \ - pred, \ - v1), on_failure) - -// Unary predicate assertion macros. -#define EXPECT_PRED_FORMAT1(pred_format, v1) \ - GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_NONFATAL_FAILURE_) -#define EXPECT_PRED1(pred, v1) \ - GTEST_PRED1_(pred, v1, GTEST_NONFATAL_FAILURE_) -#define ASSERT_PRED_FORMAT1(pred_format, v1) \ - GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_FATAL_FAILURE_) -#define ASSERT_PRED1(pred, v1) \ - GTEST_PRED1_(pred, v1, GTEST_FATAL_FAILURE_) - - - -// Helper function for implementing {EXPECT|ASSERT}_PRED2. Don't use -// this in your code. -template -AssertionResult AssertPred2Helper(const char* pred_text, - const char* e1, - const char* e2, - Pred pred, - const T1& v1, - const T2& v2) { - if (pred(v1, v2)) return AssertionSuccess(); - - return AssertionFailure() << pred_text << "(" - << e1 << ", " - << e2 << ") evaluates to false, where" - << "\n" << e1 << " evaluates to " << v1 - << "\n" << e2 << " evaluates to " << v2; -} - -// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT2. -// Don't use this in your code. -#define GTEST_PRED_FORMAT2_(pred_format, v1, v2, on_failure)\ - GTEST_ASSERT_(pred_format(#v1, #v2, v1, v2), \ - on_failure) - -// Internal macro for implementing {EXPECT|ASSERT}_PRED2. Don't use -// this in your code. -#define GTEST_PRED2_(pred, v1, v2, on_failure)\ - GTEST_ASSERT_(::testing::AssertPred2Helper(#pred, \ - #v1, \ - #v2, \ - pred, \ - v1, \ - v2), on_failure) - -// Binary predicate assertion macros. -#define EXPECT_PRED_FORMAT2(pred_format, v1, v2) \ - GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_NONFATAL_FAILURE_) -#define EXPECT_PRED2(pred, v1, v2) \ - GTEST_PRED2_(pred, v1, v2, GTEST_NONFATAL_FAILURE_) -#define ASSERT_PRED_FORMAT2(pred_format, v1, v2) \ - GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_FATAL_FAILURE_) -#define ASSERT_PRED2(pred, v1, v2) \ - GTEST_PRED2_(pred, v1, v2, GTEST_FATAL_FAILURE_) - - - -// Helper function for implementing {EXPECT|ASSERT}_PRED3. Don't use -// this in your code. -template -AssertionResult AssertPred3Helper(const char* pred_text, - const char* e1, - const char* e2, - const char* e3, - Pred pred, - const T1& v1, - const T2& v2, - const T3& v3) { - if (pred(v1, v2, v3)) return AssertionSuccess(); - - return AssertionFailure() << pred_text << "(" - << e1 << ", " - << e2 << ", " - << e3 << ") evaluates to false, where" - << "\n" << e1 << " evaluates to " << v1 - << "\n" << e2 << " evaluates to " << v2 - << "\n" << e3 << " evaluates to " << v3; -} - -// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT3. -// Don't use this in your code. -#define GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, on_failure)\ - GTEST_ASSERT_(pred_format(#v1, #v2, #v3, v1, v2, v3), \ - on_failure) - -// Internal macro for implementing {EXPECT|ASSERT}_PRED3. Don't use -// this in your code. -#define GTEST_PRED3_(pred, v1, v2, v3, on_failure)\ - GTEST_ASSERT_(::testing::AssertPred3Helper(#pred, \ - #v1, \ - #v2, \ - #v3, \ - pred, \ - v1, \ - v2, \ - v3), on_failure) - -// Ternary predicate assertion macros. -#define EXPECT_PRED_FORMAT3(pred_format, v1, v2, v3) \ - GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_NONFATAL_FAILURE_) -#define EXPECT_PRED3(pred, v1, v2, v3) \ - GTEST_PRED3_(pred, v1, v2, v3, GTEST_NONFATAL_FAILURE_) -#define ASSERT_PRED_FORMAT3(pred_format, v1, v2, v3) \ - GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_FATAL_FAILURE_) -#define ASSERT_PRED3(pred, v1, v2, v3) \ - GTEST_PRED3_(pred, v1, v2, v3, GTEST_FATAL_FAILURE_) - - - -// Helper function for implementing {EXPECT|ASSERT}_PRED4. Don't use -// this in your code. -template -AssertionResult AssertPred4Helper(const char* pred_text, - const char* e1, - const char* e2, - const char* e3, - const char* e4, - Pred pred, - const T1& v1, - const T2& v2, - const T3& v3, - const T4& v4) { - if (pred(v1, v2, v3, v4)) return AssertionSuccess(); - - return AssertionFailure() << pred_text << "(" - << e1 << ", " - << e2 << ", " - << e3 << ", " - << e4 << ") evaluates to false, where" - << "\n" << e1 << " evaluates to " << v1 - << "\n" << e2 << " evaluates to " << v2 - << "\n" << e3 << " evaluates to " << v3 - << "\n" << e4 << " evaluates to " << v4; -} - -// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT4. -// Don't use this in your code. -#define GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, on_failure)\ - GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, v1, v2, v3, v4), \ - on_failure) - -// Internal macro for implementing {EXPECT|ASSERT}_PRED4. Don't use -// this in your code. -#define GTEST_PRED4_(pred, v1, v2, v3, v4, on_failure)\ - GTEST_ASSERT_(::testing::AssertPred4Helper(#pred, \ - #v1, \ - #v2, \ - #v3, \ - #v4, \ - pred, \ - v1, \ - v2, \ - v3, \ - v4), on_failure) - -// 4-ary predicate assertion macros. -#define EXPECT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \ - GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_) -#define EXPECT_PRED4(pred, v1, v2, v3, v4) \ - GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_) -#define ASSERT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \ - GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_FATAL_FAILURE_) -#define ASSERT_PRED4(pred, v1, v2, v3, v4) \ - GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_FATAL_FAILURE_) - - - -// Helper function for implementing {EXPECT|ASSERT}_PRED5. Don't use -// this in your code. -template -AssertionResult AssertPred5Helper(const char* pred_text, - const char* e1, - const char* e2, - const char* e3, - const char* e4, - const char* e5, - Pred pred, - const T1& v1, - const T2& v2, - const T3& v3, - const T4& v4, - const T5& v5) { - if (pred(v1, v2, v3, v4, v5)) return AssertionSuccess(); - - return AssertionFailure() << pred_text << "(" - << e1 << ", " - << e2 << ", " - << e3 << ", " - << e4 << ", " - << e5 << ") evaluates to false, where" - << "\n" << e1 << " evaluates to " << v1 - << "\n" << e2 << " evaluates to " << v2 - << "\n" << e3 << " evaluates to " << v3 - << "\n" << e4 << " evaluates to " << v4 - << "\n" << e5 << " evaluates to " << v5; -} - -// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT5. -// Don't use this in your code. -#define GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, on_failure)\ - GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, #v5, v1, v2, v3, v4, v5), \ - on_failure) - -// Internal macro for implementing {EXPECT|ASSERT}_PRED5. Don't use -// this in your code. -#define GTEST_PRED5_(pred, v1, v2, v3, v4, v5, on_failure)\ - GTEST_ASSERT_(::testing::AssertPred5Helper(#pred, \ - #v1, \ - #v2, \ - #v3, \ - #v4, \ - #v5, \ - pred, \ - v1, \ - v2, \ - v3, \ - v4, \ - v5), on_failure) - -// 5-ary predicate assertion macros. -#define EXPECT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \ - GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_) -#define EXPECT_PRED5(pred, v1, v2, v3, v4, v5) \ - GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_) -#define ASSERT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \ - GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_) -#define ASSERT_PRED5(pred, v1, v2, v3, v4, v5) \ - GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_) - - - -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ diff --git a/test/gtest-1.8.0/include/gtest/gtest_prod.h b/test/gtest-1.8.0/include/gtest/gtest_prod.h deleted file mode 100644 index 89314f4058..0000000000 --- a/test/gtest-1.8.0/include/gtest/gtest_prod.h +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// Google C++ Testing and Mocking Framework definitions useful in production code. - -#ifndef GTEST_INCLUDE_GTEST_GTEST_PROD_H_ -#define GTEST_INCLUDE_GTEST_GTEST_PROD_H_ - -// When you need to test the private or protected members of a class, -// use the FRIEND_TEST macro to declare your tests as friends of the -// class. For example: -// -// class MyClass { -// private: -// void PrivateMethod(); -// FRIEND_TEST(MyClassTest, PrivateMethodWorks); -// }; -// -// class MyClassTest : public testing::Test { -// // ... -// }; -// -// TEST_F(MyClassTest, PrivateMethodWorks) { -// // Can call MyClass::PrivateMethod() here. -// } -// -// Note: The test class must be in the same namespace as the class being tested. -// For example, putting MyClassTest in an anonymous namespace will not work. - -#define FRIEND_TEST(test_case_name, test_name)\ -friend class test_case_name##_##test_name##_Test - -#endif // GTEST_INCLUDE_GTEST_GTEST_PROD_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/custom/gtest-port.h b/test/gtest-1.8.0/include/gtest/internal/custom/gtest-port.h deleted file mode 100644 index 94884c15bc..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/custom/gtest-port.h +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright 2015, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Injection point for custom user configurations. -// The following macros can be defined: -// -// Flag related macros: -// GTEST_FLAG(flag_name) -// GTEST_USE_OWN_FLAGFILE_FLAG_ - Define to 0 when the system provides its -// own flagfile flag parsing. -// GTEST_DECLARE_bool_(name) -// GTEST_DECLARE_int32_(name) -// GTEST_DECLARE_string_(name) -// GTEST_DEFINE_bool_(name, default_val, doc) -// GTEST_DEFINE_int32_(name, default_val, doc) -// GTEST_DEFINE_string_(name, default_val, doc) -// -// Test filtering: -// GTEST_TEST_FILTER_ENV_VAR_ - The name of an environment variable that -// will be used if --GTEST_FLAG(test_filter) -// is not provided. -// -// Logging: -// GTEST_LOG_(severity) -// GTEST_CHECK_(condition) -// Functions LogToStderr() and FlushInfoLog() have to be provided too. -// -// Threading: -// GTEST_HAS_NOTIFICATION_ - Enabled if Notification is already provided. -// GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ - Enabled if Mutex and ThreadLocal are -// already provided. -// Must also provide GTEST_DECLARE_STATIC_MUTEX_(mutex) and -// GTEST_DEFINE_STATIC_MUTEX_(mutex) -// -// GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks) -// GTEST_LOCK_EXCLUDED_(locks) -// -// Underlying library support features: -// GTEST_HAS_CXXABI_H_ -// -// Exporting API symbols: -// GTEST_API_ - Specifier for exported symbols. -// -// ** Custom implementation starts here ** - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_ - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/custom/gtest-printers.h b/test/gtest-1.8.0/include/gtest/internal/custom/gtest-printers.h deleted file mode 100644 index 60c1ea050b..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/custom/gtest-printers.h +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2015, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// This file provides an injection point for custom printers in a local -// installation of gTest. -// It will be included from gtest-printers.h and the overrides in this file -// will be visible to everyone. -// See documentation at gtest/gtest-printers.h for details on how to define a -// custom printer. -// -// ** Custom implementation starts here ** - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_ - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/custom/gtest.h b/test/gtest-1.8.0/include/gtest/internal/custom/gtest.h deleted file mode 100644 index 6f7c5e40ad..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/custom/gtest.h +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2015, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Injection point for custom user configurations. -// The following macros can be defined: -// -// GTEST_OS_STACK_TRACE_GETTER_ - The name of an implementation of -// OsStackTraceGetterInterface. -// -// GTEST_CUSTOM_TEMPDIR_FUNCTION_ - An override for testing::TempDir(). -// See testing::TempDir for semantics and -// signature. -// -// ** Custom implementation starts here ** - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_ - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-death-test-internal.h b/test/gtest-1.8.0/include/gtest/internal/gtest-death-test-internal.h deleted file mode 100644 index 949c429840..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-death-test-internal.h +++ /dev/null @@ -1,275 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// -// The Google C++ Testing and Mocking Framework (Google Test) -// -// This header file defines internal utilities needed for implementing -// death tests. They are subject to change without notice. - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_ - -#include "gtest/internal/gtest-internal.h" - -#include - -namespace testing { -namespace internal { - -GTEST_DECLARE_string_(internal_run_death_test); - -// Names of the flags (needed for parsing Google Test flags). -const char kDeathTestStyleFlag[] = "death_test_style"; -const char kDeathTestUseFork[] = "death_test_use_fork"; -const char kInternalRunDeathTestFlag[] = "internal_run_death_test"; - -#if GTEST_HAS_DEATH_TEST - -// DeathTest is a class that hides much of the complexity of the -// GTEST_DEATH_TEST_ macro. It is abstract; its static Create method -// returns a concrete class that depends on the prevailing death test -// style, as defined by the --gtest_death_test_style and/or -// --gtest_internal_run_death_test flags. - -// In describing the results of death tests, these terms are used with -// the corresponding definitions: -// -// exit status: The integer exit information in the format specified -// by wait(2) -// exit code: The integer code passed to exit(3), _exit(2), or -// returned from main() -class GTEST_API_ DeathTest { - public: - // Create returns false if there was an error determining the - // appropriate action to take for the current death test; for example, - // if the gtest_death_test_style flag is set to an invalid value. - // The LastMessage method will return a more detailed message in that - // case. Otherwise, the DeathTest pointer pointed to by the "test" - // argument is set. If the death test should be skipped, the pointer - // is set to NULL; otherwise, it is set to the address of a new concrete - // DeathTest object that controls the execution of the current test. - static bool Create(const char* statement, const RE* regex, - const char* file, int line, DeathTest** test); - DeathTest(); - virtual ~DeathTest() { } - - // A helper class that aborts a death test when it's deleted. - class ReturnSentinel { - public: - explicit ReturnSentinel(DeathTest* test) : test_(test) { } - ~ReturnSentinel() { test_->Abort(TEST_ENCOUNTERED_RETURN_STATEMENT); } - private: - DeathTest* const test_; - GTEST_DISALLOW_COPY_AND_ASSIGN_(ReturnSentinel); - } GTEST_ATTRIBUTE_UNUSED_; - - // An enumeration of possible roles that may be taken when a death - // test is encountered. EXECUTE means that the death test logic should - // be executed immediately. OVERSEE means that the program should prepare - // the appropriate environment for a child process to execute the death - // test, then wait for it to complete. - enum TestRole { OVERSEE_TEST, EXECUTE_TEST }; - - // An enumeration of the three reasons that a test might be aborted. - enum AbortReason { - TEST_ENCOUNTERED_RETURN_STATEMENT, - TEST_THREW_EXCEPTION, - TEST_DID_NOT_DIE - }; - - // Assumes one of the above roles. - virtual TestRole AssumeRole() = 0; - - // Waits for the death test to finish and returns its status. - virtual int Wait() = 0; - - // Returns true if the death test passed; that is, the test process - // exited during the test, its exit status matches a user-supplied - // predicate, and its stderr output matches a user-supplied regular - // expression. - // The user-supplied predicate may be a macro expression rather - // than a function pointer or functor, or else Wait and Passed could - // be combined. - virtual bool Passed(bool exit_status_ok) = 0; - - // Signals that the death test did not die as expected. - virtual void Abort(AbortReason reason) = 0; - - // Returns a human-readable outcome message regarding the outcome of - // the last death test. - static const char* LastMessage(); - - static void set_last_death_test_message(const std::string& message); - - private: - // A string containing a description of the outcome of the last death test. - static std::string last_death_test_message_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(DeathTest); -}; - -// Factory interface for death tests. May be mocked out for testing. -class DeathTestFactory { - public: - virtual ~DeathTestFactory() { } - virtual bool Create(const char* statement, const RE* regex, - const char* file, int line, DeathTest** test) = 0; -}; - -// A concrete DeathTestFactory implementation for normal use. -class DefaultDeathTestFactory : public DeathTestFactory { - public: - virtual bool Create(const char* statement, const RE* regex, - const char* file, int line, DeathTest** test); -}; - -// Returns true if exit_status describes a process that was terminated -// by a signal, or exited normally with a nonzero exit code. -GTEST_API_ bool ExitedUnsuccessfully(int exit_status); - -// Traps C++ exceptions escaping statement and reports them as test -// failures. Note that trapping SEH exceptions is not implemented here. -# if GTEST_HAS_EXCEPTIONS -# define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \ - try { \ - GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ - } catch (const ::std::exception& gtest_exception) { \ - fprintf(\ - stderr, \ - "\n%s: Caught std::exception-derived exception escaping the " \ - "death test statement. Exception message: %s\n", \ - ::testing::internal::FormatFileLocation(__FILE__, __LINE__).c_str(), \ - gtest_exception.what()); \ - fflush(stderr); \ - death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \ - } catch (...) { \ - death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \ - } - -# else -# define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \ - GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) - -# endif - -// This macro is for implementing ASSERT_DEATH*, EXPECT_DEATH*, -// ASSERT_EXIT*, and EXPECT_EXIT*. -# define GTEST_DEATH_TEST_(statement, predicate, regex, fail) \ - GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ - if (::testing::internal::AlwaysTrue()) { \ - const ::testing::internal::RE& gtest_regex = (regex); \ - ::testing::internal::DeathTest* gtest_dt; \ - if (!::testing::internal::DeathTest::Create(#statement, >est_regex, \ - __FILE__, __LINE__, >est_dt)) { \ - goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__); \ - } \ - if (gtest_dt != NULL) { \ - ::testing::internal::scoped_ptr< ::testing::internal::DeathTest> \ - gtest_dt_ptr(gtest_dt); \ - switch (gtest_dt->AssumeRole()) { \ - case ::testing::internal::DeathTest::OVERSEE_TEST: \ - if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) { \ - goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__); \ - } \ - break; \ - case ::testing::internal::DeathTest::EXECUTE_TEST: { \ - ::testing::internal::DeathTest::ReturnSentinel \ - gtest_sentinel(gtest_dt); \ - GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, gtest_dt); \ - gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE); \ - break; \ - } \ - default: \ - break; \ - } \ - } \ - } else \ - GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__): \ - fail(::testing::internal::DeathTest::LastMessage()) -// The symbol "fail" here expands to something into which a message -// can be streamed. - -// This macro is for implementing ASSERT/EXPECT_DEBUG_DEATH when compiled in -// NDEBUG mode. In this case we need the statements to be executed and the macro -// must accept a streamed message even though the message is never printed. -// The regex object is not evaluated, but it is used to prevent "unused" -// warnings and to avoid an expression that doesn't compile in debug mode. -#define GTEST_EXECUTE_STATEMENT_(statement, regex) \ - GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ - if (::testing::internal::AlwaysTrue()) { \ - GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ - } else if (!::testing::internal::AlwaysTrue()) { \ - const ::testing::internal::RE& gtest_regex = (regex); \ - static_cast(gtest_regex); \ - } else \ - ::testing::Message() - -// A class representing the parsed contents of the -// --gtest_internal_run_death_test flag, as it existed when -// RUN_ALL_TESTS was called. -class InternalRunDeathTestFlag { - public: - InternalRunDeathTestFlag(const std::string& a_file, - int a_line, - int an_index, - int a_write_fd) - : file_(a_file), line_(a_line), index_(an_index), - write_fd_(a_write_fd) {} - - ~InternalRunDeathTestFlag() { - if (write_fd_ >= 0) - posix::Close(write_fd_); - } - - const std::string& file() const { return file_; } - int line() const { return line_; } - int index() const { return index_; } - int write_fd() const { return write_fd_; } - - private: - std::string file_; - int line_; - int index_; - int write_fd_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(InternalRunDeathTestFlag); -}; - -// Returns a newly created InternalRunDeathTestFlag object with fields -// initialized from the GTEST_FLAG(internal_run_death_test) flag if -// the flag is specified; otherwise returns NULL. -InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag(); - -#endif // GTEST_HAS_DEATH_TEST - -} // namespace internal -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-filepath.h b/test/gtest-1.8.0/include/gtest/internal/gtest-filepath.h deleted file mode 100644 index 406597a44f..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-filepath.h +++ /dev/null @@ -1,205 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// -// Google Test filepath utilities -// -// This header file declares classes and functions used internally by -// Google Test. They are subject to change without notice. -// -// This file is #included in gtest/internal/gtest-internal.h. -// Do not include this header file separately! - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_ - -#include "gtest/internal/gtest-string.h" - -namespace testing { -namespace internal { - -// FilePath - a class for file and directory pathname manipulation which -// handles platform-specific conventions (like the pathname separator). -// Used for helper functions for naming files in a directory for xml output. -// Except for Set methods, all methods are const or static, which provides an -// "immutable value object" -- useful for peace of mind. -// A FilePath with a value ending in a path separator ("like/this/") represents -// a directory, otherwise it is assumed to represent a file. In either case, -// it may or may not represent an actual file or directory in the file system. -// Names are NOT checked for syntax correctness -- no checking for illegal -// characters, malformed paths, etc. - -class GTEST_API_ FilePath { - public: - FilePath() : pathname_("") { } - FilePath(const FilePath& rhs) : pathname_(rhs.pathname_) { } - - explicit FilePath(const std::string& pathname) : pathname_(pathname) { - Normalize(); - } - - FilePath& operator=(const FilePath& rhs) { - Set(rhs); - return *this; - } - - void Set(const FilePath& rhs) { - pathname_ = rhs.pathname_; - } - - const std::string& string() const { return pathname_; } - const char* c_str() const { return pathname_.c_str(); } - - // Returns the current working directory, or "" if unsuccessful. - static FilePath GetCurrentDir(); - - // Given directory = "dir", base_name = "test", number = 0, - // extension = "xml", returns "dir/test.xml". If number is greater - // than zero (e.g., 12), returns "dir/test_12.xml". - // On Windows platform, uses \ as the separator rather than /. - static FilePath MakeFileName(const FilePath& directory, - const FilePath& base_name, - int number, - const char* extension); - - // Given directory = "dir", relative_path = "test.xml", - // returns "dir/test.xml". - // On Windows, uses \ as the separator rather than /. - static FilePath ConcatPaths(const FilePath& directory, - const FilePath& relative_path); - - // Returns a pathname for a file that does not currently exist. The pathname - // will be directory/base_name.extension or - // directory/base_name_.extension if directory/base_name.extension - // already exists. The number will be incremented until a pathname is found - // that does not already exist. - // Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'. - // There could be a race condition if two or more processes are calling this - // function at the same time -- they could both pick the same filename. - static FilePath GenerateUniqueFileName(const FilePath& directory, - const FilePath& base_name, - const char* extension); - - // Returns true iff the path is "". - bool IsEmpty() const { return pathname_.empty(); } - - // If input name has a trailing separator character, removes it and returns - // the name, otherwise return the name string unmodified. - // On Windows platform, uses \ as the separator, other platforms use /. - FilePath RemoveTrailingPathSeparator() const; - - // Returns a copy of the FilePath with the directory part removed. - // Example: FilePath("path/to/file").RemoveDirectoryName() returns - // FilePath("file"). If there is no directory part ("just_a_file"), it returns - // the FilePath unmodified. If there is no file part ("just_a_dir/") it - // returns an empty FilePath (""). - // On Windows platform, '\' is the path separator, otherwise it is '/'. - FilePath RemoveDirectoryName() const; - - // RemoveFileName returns the directory path with the filename removed. - // Example: FilePath("path/to/file").RemoveFileName() returns "path/to/". - // If the FilePath is "a_file" or "/a_file", RemoveFileName returns - // FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does - // not have a file, like "just/a/dir/", it returns the FilePath unmodified. - // On Windows platform, '\' is the path separator, otherwise it is '/'. - FilePath RemoveFileName() const; - - // Returns a copy of the FilePath with the case-insensitive extension removed. - // Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns - // FilePath("dir/file"). If a case-insensitive extension is not - // found, returns a copy of the original FilePath. - FilePath RemoveExtension(const char* extension) const; - - // Creates directories so that path exists. Returns true if successful or if - // the directories already exist; returns false if unable to create - // directories for any reason. Will also return false if the FilePath does - // not represent a directory (that is, it doesn't end with a path separator). - bool CreateDirectoriesRecursively() const; - - // Create the directory so that path exists. Returns true if successful or - // if the directory already exists; returns false if unable to create the - // directory for any reason, including if the parent directory does not - // exist. Not named "CreateDirectory" because that's a macro on Windows. - bool CreateFolder() const; - - // Returns true if FilePath describes something in the file-system, - // either a file, directory, or whatever, and that something exists. - bool FileOrDirectoryExists() const; - - // Returns true if pathname describes a directory in the file-system - // that exists. - bool DirectoryExists() const; - - // Returns true if FilePath ends with a path separator, which indicates that - // it is intended to represent a directory. Returns false otherwise. - // This does NOT check that a directory (or file) actually exists. - bool IsDirectory() const; - - // Returns true if pathname describes a root directory. (Windows has one - // root directory per disk drive.) - bool IsRootDirectory() const; - - // Returns true if pathname describes an absolute path. - bool IsAbsolutePath() const; - - private: - // Replaces multiple consecutive separators with a single separator. - // For example, "bar///foo" becomes "bar/foo". Does not eliminate other - // redundancies that might be in a pathname involving "." or "..". - // - // A pathname with multiple consecutive separators may occur either through - // user error or as a result of some scripts or APIs that generate a pathname - // with a trailing separator. On other platforms the same API or script - // may NOT generate a pathname with a trailing "/". Then elsewhere that - // pathname may have another "/" and pathname components added to it, - // without checking for the separator already being there. - // The script language and operating system may allow paths like "foo//bar" - // but some of the functions in FilePath will not handle that correctly. In - // particular, RemoveTrailingPathSeparator() only removes one separator, and - // it is called in CreateDirectoriesRecursively() assuming that it will change - // a pathname from directory syntax (trailing separator) to filename syntax. - // - // On Windows this method also replaces the alternate path separator '/' with - // the primary path separator '\\', so that for example "bar\\/\\foo" becomes - // "bar\\foo". - - void Normalize(); - - // Returns a pointer to the last occurence of a valid path separator in - // the FilePath. On Windows, for example, both '/' and '\' are valid path - // separators. Returns NULL if no path separator was found. - const char* FindLastPathSeparator() const; - - std::string pathname_; -}; // class FilePath - -} // namespace internal -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-internal.h b/test/gtest-1.8.0/include/gtest/internal/gtest-internal.h deleted file mode 100644 index fc65b1f2bd..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-internal.h +++ /dev/null @@ -1,1277 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// -// The Google C++ Testing and Mocking Framework (Google Test) -// -// This header file declares functions and macros used internally by -// Google Test. They are subject to change without notice. - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_ - -#include "gtest/internal/gtest-port.h" - -#if GTEST_OS_LINUX -# include -# include -# include -# include -#endif // GTEST_OS_LINUX - -#if GTEST_HAS_EXCEPTIONS -# include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "gtest/gtest-message.h" -#include "gtest/internal/gtest-filepath.h" -#include "gtest/internal/gtest-string.h" -#include "gtest/internal/gtest-type-util.h" - -// Due to C++ preprocessor weirdness, we need double indirection to -// concatenate two tokens when one of them is __LINE__. Writing -// -// foo ## __LINE__ -// -// will result in the token foo__LINE__, instead of foo followed by -// the current line number. For more details, see -// http://www.parashift.com/c++-faq-lite/misc-technical-issues.html#faq-39.6 -#define GTEST_CONCAT_TOKEN_(foo, bar) GTEST_CONCAT_TOKEN_IMPL_(foo, bar) -#define GTEST_CONCAT_TOKEN_IMPL_(foo, bar) foo ## bar - -// Stringifies its argument. -#define GTEST_STRINGIFY_(name) #name - -class ProtocolMessage; -namespace proto2 { class Message; } - -namespace testing { - -// Forward declarations. - -class AssertionResult; // Result of an assertion. -class Message; // Represents a failure message. -class Test; // Represents a test. -class TestInfo; // Information about a test. -class TestPartResult; // Result of a test part. -class UnitTest; // A collection of test cases. - -template -::std::string PrintToString(const T& value); - -namespace internal { - -struct TraceInfo; // Information about a trace point. -class TestInfoImpl; // Opaque implementation of TestInfo -class UnitTestImpl; // Opaque implementation of UnitTest - -// The text used in failure messages to indicate the start of the -// stack trace. -GTEST_API_ extern const char kStackTraceMarker[]; - -// Two overloaded helpers for checking at compile time whether an -// expression is a null pointer literal (i.e. NULL or any 0-valued -// compile-time integral constant). Their return values have -// different sizes, so we can use sizeof() to test which version is -// picked by the compiler. These helpers have no implementations, as -// we only need their signatures. -// -// Given IsNullLiteralHelper(x), the compiler will pick the first -// version if x can be implicitly converted to Secret*, and pick the -// second version otherwise. Since Secret is a secret and incomplete -// type, the only expression a user can write that has type Secret* is -// a null pointer literal. Therefore, we know that x is a null -// pointer literal if and only if the first version is picked by the -// compiler. -char IsNullLiteralHelper(Secret* p); -char (&IsNullLiteralHelper(...))[2]; // NOLINT - -// A compile-time bool constant that is true if and only if x is a -// null pointer literal (i.e. NULL or any 0-valued compile-time -// integral constant). -#ifdef GTEST_ELLIPSIS_NEEDS_POD_ -// We lose support for NULL detection where the compiler doesn't like -// passing non-POD classes through ellipsis (...). -# define GTEST_IS_NULL_LITERAL_(x) false -#else -# define GTEST_IS_NULL_LITERAL_(x) \ - (sizeof(::testing::internal::IsNullLiteralHelper(x)) == 1) -#endif // GTEST_ELLIPSIS_NEEDS_POD_ - -// Appends the user-supplied message to the Google-Test-generated message. -GTEST_API_ std::string AppendUserMessage( - const std::string& gtest_msg, const Message& user_msg); - -#if GTEST_HAS_EXCEPTIONS - -// This exception is thrown by (and only by) a failed Google Test -// assertion when GTEST_FLAG(throw_on_failure) is true (if exceptions -// are enabled). We derive it from std::runtime_error, which is for -// errors presumably detectable only at run time. Since -// std::runtime_error inherits from std::exception, many testing -// frameworks know how to extract and print the message inside it. -class GTEST_API_ GoogleTestFailureException : public ::std::runtime_error { - public: - explicit GoogleTestFailureException(const TestPartResult& failure); -}; - -#endif // GTEST_HAS_EXCEPTIONS - -namespace edit_distance { -// Returns the optimal edits to go from 'left' to 'right'. -// All edits cost the same, with replace having lower priority than -// add/remove. -// Simple implementation of the Wagner-Fischer algorithm. -// See http://en.wikipedia.org/wiki/Wagner-Fischer_algorithm -enum EditType { kMatch, kAdd, kRemove, kReplace }; -GTEST_API_ std::vector CalculateOptimalEdits( - const std::vector& left, const std::vector& right); - -// Same as above, but the input is represented as strings. -GTEST_API_ std::vector CalculateOptimalEdits( - const std::vector& left, - const std::vector& right); - -// Create a diff of the input strings in Unified diff format. -GTEST_API_ std::string CreateUnifiedDiff(const std::vector& left, - const std::vector& right, - size_t context = 2); - -} // namespace edit_distance - -// Calculate the diff between 'left' and 'right' and return it in unified diff -// format. -// If not null, stores in 'total_line_count' the total number of lines found -// in left + right. -GTEST_API_ std::string DiffStrings(const std::string& left, - const std::string& right, - size_t* total_line_count); - -// Constructs and returns the message for an equality assertion -// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure. -// -// The first four parameters are the expressions used in the assertion -// and their values, as strings. For example, for ASSERT_EQ(foo, bar) -// where foo is 5 and bar is 6, we have: -// -// expected_expression: "foo" -// actual_expression: "bar" -// expected_value: "5" -// actual_value: "6" -// -// The ignoring_case parameter is true iff the assertion is a -// *_STRCASEEQ*. When it's true, the string " (ignoring case)" will -// be inserted into the message. -GTEST_API_ AssertionResult EqFailure(const char* expected_expression, - const char* actual_expression, - const std::string& expected_value, - const std::string& actual_value, - bool ignoring_case); - -// Constructs a failure message for Boolean assertions such as EXPECT_TRUE. -GTEST_API_ std::string GetBoolAssertionFailureMessage( - const AssertionResult& assertion_result, - const char* expression_text, - const char* actual_predicate_value, - const char* expected_predicate_value); - -// This template class represents an IEEE floating-point number -// (either single-precision or double-precision, depending on the -// template parameters). -// -// The purpose of this class is to do more sophisticated number -// comparison. (Due to round-off error, etc, it's very unlikely that -// two floating-points will be equal exactly. Hence a naive -// comparison by the == operation often doesn't work.) -// -// Format of IEEE floating-point: -// -// The most-significant bit being the leftmost, an IEEE -// floating-point looks like -// -// sign_bit exponent_bits fraction_bits -// -// Here, sign_bit is a single bit that designates the sign of the -// number. -// -// For float, there are 8 exponent bits and 23 fraction bits. -// -// For double, there are 11 exponent bits and 52 fraction bits. -// -// More details can be found at -// http://en.wikipedia.org/wiki/IEEE_floating-point_standard. -// -// Template parameter: -// -// RawType: the raw floating-point type (either float or double) -template -class FloatingPoint { - public: - // Defines the unsigned integer type that has the same size as the - // floating point number. - typedef typename TypeWithSize::UInt Bits; - - // Constants. - - // # of bits in a number. - static const size_t kBitCount = 8*sizeof(RawType); - - // # of fraction bits in a number. - static const size_t kFractionBitCount = - std::numeric_limits::digits - 1; - - // # of exponent bits in a number. - static const size_t kExponentBitCount = kBitCount - 1 - kFractionBitCount; - - // The mask for the sign bit. - static const Bits kSignBitMask = static_cast(1) << (kBitCount - 1); - - // The mask for the fraction bits. - static const Bits kFractionBitMask = - ~static_cast(0) >> (kExponentBitCount + 1); - - // The mask for the exponent bits. - static const Bits kExponentBitMask = ~(kSignBitMask | kFractionBitMask); - - // How many ULP's (Units in the Last Place) we want to tolerate when - // comparing two numbers. The larger the value, the more error we - // allow. A 0 value means that two numbers must be exactly the same - // to be considered equal. - // - // The maximum error of a single floating-point operation is 0.5 - // units in the last place. On Intel CPU's, all floating-point - // calculations are done with 80-bit precision, while double has 64 - // bits. Therefore, 4 should be enough for ordinary use. - // - // See the following article for more details on ULP: - // http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/ - static const size_t kMaxUlps = 4; - - // Constructs a FloatingPoint from a raw floating-point number. - // - // On an Intel CPU, passing a non-normalized NAN (Not a Number) - // around may change its bits, although the new value is guaranteed - // to be also a NAN. Therefore, don't expect this constructor to - // preserve the bits in x when x is a NAN. - explicit FloatingPoint(const RawType& x) { u_.value_ = x; } - - // Static methods - - // Reinterprets a bit pattern as a floating-point number. - // - // This function is needed to test the AlmostEquals() method. - static RawType ReinterpretBits(const Bits bits) { - FloatingPoint fp(0); - fp.u_.bits_ = bits; - return fp.u_.value_; - } - - // Returns the floating-point number that represent positive infinity. - static RawType Infinity() { - return ReinterpretBits(kExponentBitMask); - } - - // Returns the maximum representable finite floating-point number. - static RawType Max(); - - // Non-static methods - - // Returns the bits that represents this number. - const Bits &bits() const { return u_.bits_; } - - // Returns the exponent bits of this number. - Bits exponent_bits() const { return kExponentBitMask & u_.bits_; } - - // Returns the fraction bits of this number. - Bits fraction_bits() const { return kFractionBitMask & u_.bits_; } - - // Returns the sign bit of this number. - Bits sign_bit() const { return kSignBitMask & u_.bits_; } - - // Returns true iff this is NAN (not a number). - bool is_nan() const { - // It's a NAN if the exponent bits are all ones and the fraction - // bits are not entirely zeros. - return (exponent_bits() == kExponentBitMask) && (fraction_bits() != 0); - } - - // Returns true iff this number is at most kMaxUlps ULP's away from - // rhs. In particular, this function: - // - // - returns false if either number is (or both are) NAN. - // - treats really large numbers as almost equal to infinity. - // - thinks +0.0 and -0.0 are 0 DLP's apart. - bool AlmostEquals(const FloatingPoint& rhs) const { - // The IEEE standard says that any comparison operation involving - // a NAN must return false. - if (is_nan() || rhs.is_nan()) return false; - - return DistanceBetweenSignAndMagnitudeNumbers(u_.bits_, rhs.u_.bits_) - <= kMaxUlps; - } - - private: - // The data type used to store the actual floating-point number. - union FloatingPointUnion { - RawType value_; // The raw floating-point number. - Bits bits_; // The bits that represent the number. - }; - - // Converts an integer from the sign-and-magnitude representation to - // the biased representation. More precisely, let N be 2 to the - // power of (kBitCount - 1), an integer x is represented by the - // unsigned number x + N. - // - // For instance, - // - // -N + 1 (the most negative number representable using - // sign-and-magnitude) is represented by 1; - // 0 is represented by N; and - // N - 1 (the biggest number representable using - // sign-and-magnitude) is represented by 2N - 1. - // - // Read http://en.wikipedia.org/wiki/Signed_number_representations - // for more details on signed number representations. - static Bits SignAndMagnitudeToBiased(const Bits &sam) { - if (kSignBitMask & sam) { - // sam represents a negative number. - return ~sam + 1; - } else { - // sam represents a positive number. - return kSignBitMask | sam; - } - } - - // Given two numbers in the sign-and-magnitude representation, - // returns the distance between them as an unsigned number. - static Bits DistanceBetweenSignAndMagnitudeNumbers(const Bits &sam1, - const Bits &sam2) { - const Bits biased1 = SignAndMagnitudeToBiased(sam1); - const Bits biased2 = SignAndMagnitudeToBiased(sam2); - return (biased1 >= biased2) ? (biased1 - biased2) : (biased2 - biased1); - } - - FloatingPointUnion u_; -}; - -// We cannot use std::numeric_limits::max() as it clashes with the max() -// macro defined by . -template <> -inline float FloatingPoint::Max() { return FLT_MAX; } -template <> -inline double FloatingPoint::Max() { return DBL_MAX; } - -// Typedefs the instances of the FloatingPoint template class that we -// care to use. -typedef FloatingPoint Float; -typedef FloatingPoint Double; - -// In order to catch the mistake of putting tests that use different -// test fixture classes in the same test case, we need to assign -// unique IDs to fixture classes and compare them. The TypeId type is -// used to hold such IDs. The user should treat TypeId as an opaque -// type: the only operation allowed on TypeId values is to compare -// them for equality using the == operator. -typedef const void* TypeId; - -template -class TypeIdHelper { - public: - // dummy_ must not have a const type. Otherwise an overly eager - // compiler (e.g. MSVC 7.1 & 8.0) may try to merge - // TypeIdHelper::dummy_ for different Ts as an "optimization". - static bool dummy_; -}; - -template -bool TypeIdHelper::dummy_ = false; - -// GetTypeId() returns the ID of type T. Different values will be -// returned for different types. Calling the function twice with the -// same type argument is guaranteed to return the same ID. -template -TypeId GetTypeId() { - // The compiler is required to allocate a different - // TypeIdHelper::dummy_ variable for each T used to instantiate - // the template. Therefore, the address of dummy_ is guaranteed to - // be unique. - return &(TypeIdHelper::dummy_); -} - -// Returns the type ID of ::testing::Test. Always call this instead -// of GetTypeId< ::testing::Test>() to get the type ID of -// ::testing::Test, as the latter may give the wrong result due to a -// suspected linker bug when compiling Google Test as a Mac OS X -// framework. -GTEST_API_ TypeId GetTestTypeId(); - -// Defines the abstract factory interface that creates instances -// of a Test object. -class TestFactoryBase { - public: - virtual ~TestFactoryBase() {} - - // Creates a test instance to run. The instance is both created and destroyed - // within TestInfoImpl::Run() - virtual Test* CreateTest() = 0; - - protected: - TestFactoryBase() {} - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(TestFactoryBase); -}; - -// This class provides implementation of TeastFactoryBase interface. -// It is used in TEST and TEST_F macros. -template -class TestFactoryImpl : public TestFactoryBase { - public: - virtual Test* CreateTest() { return new TestClass; } -}; - -#if GTEST_OS_WINDOWS - -// Predicate-formatters for implementing the HRESULT checking macros -// {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED} -// We pass a long instead of HRESULT to avoid causing an -// include dependency for the HRESULT type. -GTEST_API_ AssertionResult IsHRESULTSuccess(const char* expr, - long hr); // NOLINT -GTEST_API_ AssertionResult IsHRESULTFailure(const char* expr, - long hr); // NOLINT - -#endif // GTEST_OS_WINDOWS - -// Types of SetUpTestCase() and TearDownTestCase() functions. -typedef void (*SetUpTestCaseFunc)(); -typedef void (*TearDownTestCaseFunc)(); - -struct CodeLocation { - CodeLocation(const std::string& a_file, int a_line) - : file(a_file), line(a_line) {} - - std::string file; - int line; -}; - -// Creates a new TestInfo object and registers it with Google Test; -// returns the created object. -// -// Arguments: -// -// test_case_name: name of the test case -// name: name of the test -// type_param the name of the test's type parameter, or NULL if -// this is not a typed or a type-parameterized test. -// value_param text representation of the test's value parameter, -// or NULL if this is not a type-parameterized test. -// code_location: code location where the test is defined -// fixture_class_id: ID of the test fixture class -// set_up_tc: pointer to the function that sets up the test case -// tear_down_tc: pointer to the function that tears down the test case -// factory: pointer to the factory that creates a test object. -// The newly created TestInfo instance will assume -// ownership of the factory object. -GTEST_API_ TestInfo* MakeAndRegisterTestInfo( - const char* test_case_name, - const char* name, - const char* type_param, - const char* value_param, - CodeLocation code_location, - TypeId fixture_class_id, - SetUpTestCaseFunc set_up_tc, - TearDownTestCaseFunc tear_down_tc, - TestFactoryBase* factory); - -// If *pstr starts with the given prefix, modifies *pstr to be right -// past the prefix and returns true; otherwise leaves *pstr unchanged -// and returns false. None of pstr, *pstr, and prefix can be NULL. -GTEST_API_ bool SkipPrefix(const char* prefix, const char** pstr); - -#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P - -// State of the definition of a type-parameterized test case. -class GTEST_API_ TypedTestCasePState { - public: - TypedTestCasePState() : registered_(false) {} - - // Adds the given test name to defined_test_names_ and return true - // if the test case hasn't been registered; otherwise aborts the - // program. - bool AddTestName(const char* file, int line, const char* case_name, - const char* test_name) { - if (registered_) { - fprintf(stderr, "%s Test %s must be defined before " - "REGISTER_TYPED_TEST_CASE_P(%s, ...).\n", - FormatFileLocation(file, line).c_str(), test_name, case_name); - fflush(stderr); - posix::Abort(); - } - registered_tests_.insert( - ::std::make_pair(test_name, CodeLocation(file, line))); - return true; - } - - bool TestExists(const std::string& test_name) const { - return registered_tests_.count(test_name) > 0; - } - - const CodeLocation& GetCodeLocation(const std::string& test_name) const { - RegisteredTestsMap::const_iterator it = registered_tests_.find(test_name); - GTEST_CHECK_(it != registered_tests_.end()); - return it->second; - } - - // Verifies that registered_tests match the test names in - // defined_test_names_; returns registered_tests if successful, or - // aborts the program otherwise. - const char* VerifyRegisteredTestNames( - const char* file, int line, const char* registered_tests); - - private: - typedef ::std::map RegisteredTestsMap; - - bool registered_; - RegisteredTestsMap registered_tests_; -}; - -// Skips to the first non-space char after the first comma in 'str'; -// returns NULL if no comma is found in 'str'. -inline const char* SkipComma(const char* str) { - const char* comma = strchr(str, ','); - if (comma == NULL) { - return NULL; - } - while (IsSpace(*(++comma))) {} - return comma; -} - -// Returns the prefix of 'str' before the first comma in it; returns -// the entire string if it contains no comma. -inline std::string GetPrefixUntilComma(const char* str) { - const char* comma = strchr(str, ','); - return comma == NULL ? str : std::string(str, comma); -} - -// Splits a given string on a given delimiter, populating a given -// vector with the fields. -void SplitString(const ::std::string& str, char delimiter, - ::std::vector< ::std::string>* dest); - -// TypeParameterizedTest::Register() -// registers a list of type-parameterized tests with Google Test. The -// return value is insignificant - we just need to return something -// such that we can call this function in a namespace scope. -// -// Implementation note: The GTEST_TEMPLATE_ macro declares a template -// template parameter. It's defined in gtest-type-util.h. -template -class TypeParameterizedTest { - public: - // 'index' is the index of the test in the type list 'Types' - // specified in INSTANTIATE_TYPED_TEST_CASE_P(Prefix, TestCase, - // Types). Valid values for 'index' are [0, N - 1] where N is the - // length of Types. - static bool Register(const char* prefix, - const CodeLocation& code_location, - const char* case_name, const char* test_names, - int index) { - typedef typename Types::Head Type; - typedef Fixture FixtureClass; - typedef typename GTEST_BIND_(TestSel, Type) TestClass; - - // First, registers the first type-parameterized test in the type - // list. - MakeAndRegisterTestInfo( - (std::string(prefix) + (prefix[0] == '\0' ? "" : "/") + case_name + "/" - + StreamableToString(index)).c_str(), - StripTrailingSpaces(GetPrefixUntilComma(test_names)).c_str(), - GetTypeName().c_str(), - NULL, // No value parameter. - code_location, - GetTypeId(), - TestClass::SetUpTestCase, - TestClass::TearDownTestCase, - new TestFactoryImpl); - - // Next, recurses (at compile time) with the tail of the type list. - return TypeParameterizedTest - ::Register(prefix, code_location, case_name, test_names, index + 1); - } -}; - -// The base case for the compile time recursion. -template -class TypeParameterizedTest { - public: - static bool Register(const char* /*prefix*/, const CodeLocation&, - const char* /*case_name*/, const char* /*test_names*/, - int /*index*/) { - return true; - } -}; - -// TypeParameterizedTestCase::Register() -// registers *all combinations* of 'Tests' and 'Types' with Google -// Test. The return value is insignificant - we just need to return -// something such that we can call this function in a namespace scope. -template -class TypeParameterizedTestCase { - public: - static bool Register(const char* prefix, CodeLocation code_location, - const TypedTestCasePState* state, - const char* case_name, const char* test_names) { - std::string test_name = StripTrailingSpaces( - GetPrefixUntilComma(test_names)); - if (!state->TestExists(test_name)) { - fprintf(stderr, "Failed to get code location for test %s.%s at %s.", - case_name, test_name.c_str(), - FormatFileLocation(code_location.file.c_str(), - code_location.line).c_str()); - fflush(stderr); - posix::Abort(); - } - const CodeLocation& test_location = state->GetCodeLocation(test_name); - - typedef typename Tests::Head Head; - - // First, register the first test in 'Test' for each type in 'Types'. - TypeParameterizedTest::Register( - prefix, test_location, case_name, test_names, 0); - - // Next, recurses (at compile time) with the tail of the test list. - return TypeParameterizedTestCase - ::Register(prefix, code_location, state, - case_name, SkipComma(test_names)); - } -}; - -// The base case for the compile time recursion. -template -class TypeParameterizedTestCase { - public: - static bool Register(const char* /*prefix*/, const CodeLocation&, - const TypedTestCasePState* /*state*/, - const char* /*case_name*/, const char* /*test_names*/) { - return true; - } -}; - -#endif // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P - -// Returns the current OS stack trace as an std::string. -// -// The maximum number of stack frames to be included is specified by -// the gtest_stack_trace_depth flag. The skip_count parameter -// specifies the number of top frames to be skipped, which doesn't -// count against the number of frames to be included. -// -// For example, if Foo() calls Bar(), which in turn calls -// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in -// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't. -GTEST_API_ std::string GetCurrentOsStackTraceExceptTop( - UnitTest* unit_test, int skip_count); - -// Helpers for suppressing warnings on unreachable code or constant -// condition. - -// Always returns true. -GTEST_API_ bool AlwaysTrue(); - -// Always returns false. -inline bool AlwaysFalse() { return !AlwaysTrue(); } - -// Helper for suppressing false warning from Clang on a const char* -// variable declared in a conditional expression always being NULL in -// the else branch. -struct GTEST_API_ ConstCharPtr { - ConstCharPtr(const char* str) : value(str) {} - operator bool() const { return true; } - const char* value; -}; - -// A simple Linear Congruential Generator for generating random -// numbers with a uniform distribution. Unlike rand() and srand(), it -// doesn't use global state (and therefore can't interfere with user -// code). Unlike rand_r(), it's portable. An LCG isn't very random, -// but it's good enough for our purposes. -class GTEST_API_ Random { - public: - static const UInt32 kMaxRange = 1u << 31; - - explicit Random(UInt32 seed) : state_(seed) {} - - void Reseed(UInt32 seed) { state_ = seed; } - - // Generates a random number from [0, range). Crashes if 'range' is - // 0 or greater than kMaxRange. - UInt32 Generate(UInt32 range); - - private: - UInt32 state_; - GTEST_DISALLOW_COPY_AND_ASSIGN_(Random); -}; - -// Defining a variable of type CompileAssertTypesEqual will cause a -// compiler error iff T1 and T2 are different types. -template -struct CompileAssertTypesEqual; - -template -struct CompileAssertTypesEqual { -}; - -// Removes the reference from a type if it is a reference type, -// otherwise leaves it unchanged. This is the same as -// tr1::remove_reference, which is not widely available yet. -template -struct RemoveReference { typedef T type; }; // NOLINT -template -struct RemoveReference { typedef T type; }; // NOLINT - -// A handy wrapper around RemoveReference that works when the argument -// T depends on template parameters. -#define GTEST_REMOVE_REFERENCE_(T) \ - typename ::testing::internal::RemoveReference::type - -// Removes const from a type if it is a const type, otherwise leaves -// it unchanged. This is the same as tr1::remove_const, which is not -// widely available yet. -template -struct RemoveConst { typedef T type; }; // NOLINT -template -struct RemoveConst { typedef T type; }; // NOLINT - -// MSVC 8.0, Sun C++, and IBM XL C++ have a bug which causes the above -// definition to fail to remove the const in 'const int[3]' and 'const -// char[3][4]'. The following specialization works around the bug. -template -struct RemoveConst { - typedef typename RemoveConst::type type[N]; -}; - -#if defined(_MSC_VER) && _MSC_VER < 1400 -// This is the only specialization that allows VC++ 7.1 to remove const in -// 'const int[3] and 'const int[3][4]'. However, it causes trouble with GCC -// and thus needs to be conditionally compiled. -template -struct RemoveConst { - typedef typename RemoveConst::type type[N]; -}; -#endif - -// A handy wrapper around RemoveConst that works when the argument -// T depends on template parameters. -#define GTEST_REMOVE_CONST_(T) \ - typename ::testing::internal::RemoveConst::type - -// Turns const U&, U&, const U, and U all into U. -#define GTEST_REMOVE_REFERENCE_AND_CONST_(T) \ - GTEST_REMOVE_CONST_(GTEST_REMOVE_REFERENCE_(T)) - -// ImplicitlyConvertible::value is a compile-time bool -// constant that's true iff type From can be implicitly converted to -// type To. -template -class ImplicitlyConvertible { - private: - // We need the following helper functions only for their types. - // They have no implementations. - - // MakeFrom() is an expression whose type is From. We cannot simply - // use From(), as the type From may not have a public default - // constructor. - static typename AddReference::type MakeFrom(); - - // These two functions are overloaded. Given an expression - // Helper(x), the compiler will pick the first version if x can be - // implicitly converted to type To; otherwise it will pick the - // second version. - // - // The first version returns a value of size 1, and the second - // version returns a value of size 2. Therefore, by checking the - // size of Helper(x), which can be done at compile time, we can tell - // which version of Helper() is used, and hence whether x can be - // implicitly converted to type To. - static char Helper(To); - static char (&Helper(...))[2]; // NOLINT - - // We have to put the 'public' section after the 'private' section, - // or MSVC refuses to compile the code. - public: -#if defined(__BORLANDC__) - // C++Builder cannot use member overload resolution during template - // instantiation. The simplest workaround is to use its C++0x type traits - // functions (C++Builder 2009 and above only). - static const bool value = __is_convertible(From, To); -#else - // MSVC warns about implicitly converting from double to int for - // possible loss of data, so we need to temporarily disable the - // warning. - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4244) - static const bool value = - sizeof(Helper(ImplicitlyConvertible::MakeFrom())) == 1; - GTEST_DISABLE_MSC_WARNINGS_POP_() -#endif // __BORLANDC__ -}; -template -const bool ImplicitlyConvertible::value; - -// IsAProtocolMessage::value is a compile-time bool constant that's -// true iff T is type ProtocolMessage, proto2::Message, or a subclass -// of those. -template -struct IsAProtocolMessage - : public bool_constant< - ImplicitlyConvertible::value || - ImplicitlyConvertible::value> { -}; - -// When the compiler sees expression IsContainerTest(0), if C is an -// STL-style container class, the first overload of IsContainerTest -// will be viable (since both C::iterator* and C::const_iterator* are -// valid types and NULL can be implicitly converted to them). It will -// be picked over the second overload as 'int' is a perfect match for -// the type of argument 0. If C::iterator or C::const_iterator is not -// a valid type, the first overload is not viable, and the second -// overload will be picked. Therefore, we can determine whether C is -// a container class by checking the type of IsContainerTest(0). -// The value of the expression is insignificant. -// -// In C++11 mode we check the existence of a const_iterator and that an -// iterator is properly implemented for the container. -// -// For pre-C++11 that we look for both C::iterator and C::const_iterator. -// The reason is that C++ injects the name of a class as a member of the -// class itself (e.g. you can refer to class iterator as either -// 'iterator' or 'iterator::iterator'). If we look for C::iterator -// only, for example, we would mistakenly think that a class named -// iterator is an STL container. -// -// Also note that the simpler approach of overloading -// IsContainerTest(typename C::const_iterator*) and -// IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++. -typedef int IsContainer; -#if GTEST_LANG_CXX11 -template ().begin()), - class = decltype(::std::declval().end()), - class = decltype(++::std::declval()), - class = decltype(*::std::declval()), - class = typename C::const_iterator> -IsContainer IsContainerTest(int /* dummy */) { - return 0; -} -#else -template -IsContainer IsContainerTest(int /* dummy */, - typename C::iterator* /* it */ = NULL, - typename C::const_iterator* /* const_it */ = NULL) { - return 0; -} -#endif // GTEST_LANG_CXX11 - -typedef char IsNotContainer; -template -IsNotContainer IsContainerTest(long /* dummy */) { return '\0'; } - -// Trait to detect whether a type T is a hash table. -// The heuristic used is that the type contains an inner type `hasher` and does -// not contain an inner type `reverse_iterator`. -// If the container is iterable in reverse, then order might actually matter. -template -struct IsHashTable { - private: - template - static char test(typename U::hasher*, typename U::reverse_iterator*); - template - static int test(typename U::hasher*, ...); - template - static char test(...); - - public: - static const bool value = sizeof(test(0, 0)) == sizeof(int); -}; - -template -const bool IsHashTable::value; - -template -struct VoidT { - typedef void value_type; -}; - -template -struct HasValueType : false_type {}; -template -struct HasValueType > : true_type { -}; - -template (0)) == sizeof(IsContainer), - bool = HasValueType::value> -struct IsRecursiveContainerImpl; - -template -struct IsRecursiveContainerImpl : public false_type {}; - -// Since the IsRecursiveContainerImpl depends on the IsContainerTest we need to -// obey the same inconsistencies as the IsContainerTest, namely check if -// something is a container is relying on only const_iterator in C++11 and -// is relying on both const_iterator and iterator otherwise -template -struct IsRecursiveContainerImpl : public false_type {}; - -template -struct IsRecursiveContainerImpl { - #if GTEST_LANG_CXX11 - typedef typename IteratorTraits::value_type - value_type; -#else - typedef typename IteratorTraits::value_type value_type; -#endif - typedef is_same type; -}; - -// IsRecursiveContainer is a unary compile-time predicate that -// evaluates whether C is a recursive container type. A recursive container -// type is a container type whose value_type is equal to the container type -// itself. An example for a recursive container type is -// boost::filesystem::path, whose iterator has a value_type that is equal to -// boost::filesystem::path. -template -struct IsRecursiveContainer : public IsRecursiveContainerImpl::type {}; - -// EnableIf::type is void when 'Cond' is true, and -// undefined when 'Cond' is false. To use SFINAE to make a function -// overload only apply when a particular expression is true, add -// "typename EnableIf::type* = 0" as the last parameter. -template struct EnableIf; -template<> struct EnableIf { typedef void type; }; // NOLINT - -// Utilities for native arrays. - -// ArrayEq() compares two k-dimensional native arrays using the -// elements' operator==, where k can be any integer >= 0. When k is -// 0, ArrayEq() degenerates into comparing a single pair of values. - -template -bool ArrayEq(const T* lhs, size_t size, const U* rhs); - -// This generic version is used when k is 0. -template -inline bool ArrayEq(const T& lhs, const U& rhs) { return lhs == rhs; } - -// This overload is used when k >= 1. -template -inline bool ArrayEq(const T(&lhs)[N], const U(&rhs)[N]) { - return internal::ArrayEq(lhs, N, rhs); -} - -// This helper reduces code bloat. If we instead put its logic inside -// the previous ArrayEq() function, arrays with different sizes would -// lead to different copies of the template code. -template -bool ArrayEq(const T* lhs, size_t size, const U* rhs) { - for (size_t i = 0; i != size; i++) { - if (!internal::ArrayEq(lhs[i], rhs[i])) - return false; - } - return true; -} - -// Finds the first element in the iterator range [begin, end) that -// equals elem. Element may be a native array type itself. -template -Iter ArrayAwareFind(Iter begin, Iter end, const Element& elem) { - for (Iter it = begin; it != end; ++it) { - if (internal::ArrayEq(*it, elem)) - return it; - } - return end; -} - -// CopyArray() copies a k-dimensional native array using the elements' -// operator=, where k can be any integer >= 0. When k is 0, -// CopyArray() degenerates into copying a single value. - -template -void CopyArray(const T* from, size_t size, U* to); - -// This generic version is used when k is 0. -template -inline void CopyArray(const T& from, U* to) { *to = from; } - -// This overload is used when k >= 1. -template -inline void CopyArray(const T(&from)[N], U(*to)[N]) { - internal::CopyArray(from, N, *to); -} - -// This helper reduces code bloat. If we instead put its logic inside -// the previous CopyArray() function, arrays with different sizes -// would lead to different copies of the template code. -template -void CopyArray(const T* from, size_t size, U* to) { - for (size_t i = 0; i != size; i++) { - internal::CopyArray(from[i], to + i); - } -} - -// The relation between an NativeArray object (see below) and the -// native array it represents. -// We use 2 different structs to allow non-copyable types to be used, as long -// as RelationToSourceReference() is passed. -struct RelationToSourceReference {}; -struct RelationToSourceCopy {}; - -// Adapts a native array to a read-only STL-style container. Instead -// of the complete STL container concept, this adaptor only implements -// members useful for Google Mock's container matchers. New members -// should be added as needed. To simplify the implementation, we only -// support Element being a raw type (i.e. having no top-level const or -// reference modifier). It's the client's responsibility to satisfy -// this requirement. Element can be an array type itself (hence -// multi-dimensional arrays are supported). -template -class NativeArray { - public: - // STL-style container typedefs. - typedef Element value_type; - typedef Element* iterator; - typedef const Element* const_iterator; - - // Constructs from a native array. References the source. - NativeArray(const Element* array, size_t count, RelationToSourceReference) { - InitRef(array, count); - } - - // Constructs from a native array. Copies the source. - NativeArray(const Element* array, size_t count, RelationToSourceCopy) { - InitCopy(array, count); - } - - // Copy constructor. - NativeArray(const NativeArray& rhs) { - (this->*rhs.clone_)(rhs.array_, rhs.size_); - } - - ~NativeArray() { - if (clone_ != &NativeArray::InitRef) - delete[] array_; - } - - // STL-style container methods. - size_t size() const { return size_; } - const_iterator begin() const { return array_; } - const_iterator end() const { return array_ + size_; } - bool operator==(const NativeArray& rhs) const { - return size() == rhs.size() && - ArrayEq(begin(), size(), rhs.begin()); - } - - private: - enum { - kCheckTypeIsNotConstOrAReference = StaticAssertTypeEqHelper< - Element, GTEST_REMOVE_REFERENCE_AND_CONST_(Element)>::value - }; - - // Initializes this object with a copy of the input. - void InitCopy(const Element* array, size_t a_size) { - Element* const copy = new Element[a_size]; - CopyArray(array, a_size, copy); - array_ = copy; - size_ = a_size; - clone_ = &NativeArray::InitCopy; - } - - // Initializes this object with a reference of the input. - void InitRef(const Element* array, size_t a_size) { - array_ = array; - size_ = a_size; - clone_ = &NativeArray::InitRef; - } - - const Element* array_; - size_t size_; - void (NativeArray::*clone_)(const Element*, size_t); - - GTEST_DISALLOW_ASSIGN_(NativeArray); -}; - -} // namespace internal -} // namespace testing - -#define GTEST_MESSAGE_AT_(file, line, message, result_type) \ - ::testing::internal::AssertHelper(result_type, file, line, message) \ - = ::testing::Message() - -#define GTEST_MESSAGE_(message, result_type) \ - GTEST_MESSAGE_AT_(__FILE__, __LINE__, message, result_type) - -#define GTEST_FATAL_FAILURE_(message) \ - return GTEST_MESSAGE_(message, ::testing::TestPartResult::kFatalFailure) - -#define GTEST_NONFATAL_FAILURE_(message) \ - GTEST_MESSAGE_(message, ::testing::TestPartResult::kNonFatalFailure) - -#define GTEST_SUCCESS_(message) \ - GTEST_MESSAGE_(message, ::testing::TestPartResult::kSuccess) - -// Suppress MSVC warning 4702 (unreachable code) for the code following -// statement if it returns or throws (or doesn't return or throw in some -// situations). -#define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \ - if (::testing::internal::AlwaysTrue()) { statement; } - -#define GTEST_TEST_THROW_(statement, expected_exception, fail) \ - GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ - if (::testing::internal::ConstCharPtr gtest_msg = "") { \ - bool gtest_caught_expected = false; \ - try { \ - GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ - } \ - catch (expected_exception const&) { \ - gtest_caught_expected = true; \ - } \ - catch (...) { \ - gtest_msg.value = \ - "Expected: " #statement " throws an exception of type " \ - #expected_exception ".\n Actual: it throws a different type."; \ - goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ - } \ - if (!gtest_caught_expected) { \ - gtest_msg.value = \ - "Expected: " #statement " throws an exception of type " \ - #expected_exception ".\n Actual: it throws nothing."; \ - goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ - } \ - } else \ - GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__): \ - fail(gtest_msg.value) - -#define GTEST_TEST_NO_THROW_(statement, fail) \ - GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ - if (::testing::internal::AlwaysTrue()) { \ - try { \ - GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ - } \ - catch (...) { \ - goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \ - } \ - } else \ - GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__): \ - fail("Expected: " #statement " doesn't throw an exception.\n" \ - " Actual: it throws.") - -#define GTEST_TEST_ANY_THROW_(statement, fail) \ - GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ - if (::testing::internal::AlwaysTrue()) { \ - bool gtest_caught_any = false; \ - try { \ - GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ - } \ - catch (...) { \ - gtest_caught_any = true; \ - } \ - if (!gtest_caught_any) { \ - goto GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__); \ - } \ - } else \ - GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__): \ - fail("Expected: " #statement " throws an exception.\n" \ - " Actual: it doesn't.") - - -// Implements Boolean test assertions such as EXPECT_TRUE. expression can be -// either a boolean expression or an AssertionResult. text is a textual -// represenation of expression as it was passed into the EXPECT_TRUE. -#define GTEST_TEST_BOOLEAN_(expression, text, actual, expected, fail) \ - GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ - if (const ::testing::AssertionResult gtest_ar_ = \ - ::testing::AssertionResult(expression)) \ - ; \ - else \ - fail(::testing::internal::GetBoolAssertionFailureMessage(\ - gtest_ar_, text, #actual, #expected).c_str()) - -#define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail) \ - GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ - if (::testing::internal::AlwaysTrue()) { \ - ::testing::internal::HasNewFatalFailureHelper gtest_fatal_failure_checker; \ - GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ - if (gtest_fatal_failure_checker.has_new_fatal_failure()) { \ - goto GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__); \ - } \ - } else \ - GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__): \ - fail("Expected: " #statement " doesn't generate new fatal " \ - "failures in the current thread.\n" \ - " Actual: it does.") - -// Expands to the name of the class that implements the given test. -#define GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \ - test_case_name##_##test_name##_Test - -// Helper macro for defining tests. -#define GTEST_TEST_(test_case_name, test_name, parent_class, parent_id)\ -class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) : public parent_class {\ - public:\ - GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\ - private:\ - virtual void TestBody();\ - static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;\ - GTEST_DISALLOW_COPY_AND_ASSIGN_(\ - GTEST_TEST_CLASS_NAME_(test_case_name, test_name));\ -};\ -\ -::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_case_name, test_name)\ - ::test_info_ =\ - ::testing::internal::MakeAndRegisterTestInfo(\ - #test_case_name, #test_name, NULL, NULL, \ - ::testing::internal::CodeLocation(__FILE__, __LINE__), \ - (parent_id), \ - parent_class::SetUpTestCase, \ - parent_class::TearDownTestCase, \ - new ::testing::internal::TestFactoryImpl<\ - GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\ -void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody() - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-linked_ptr.h b/test/gtest-1.8.0/include/gtest/internal/gtest-linked_ptr.h deleted file mode 100644 index 3602942217..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-linked_ptr.h +++ /dev/null @@ -1,243 +0,0 @@ -// Copyright 2003 Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: Dan Egnor (egnor@google.com) -// -// A "smart" pointer type with reference tracking. Every pointer to a -// particular object is kept on a circular linked list. When the last pointer -// to an object is destroyed or reassigned, the object is deleted. -// -// Used properly, this deletes the object when the last reference goes away. -// There are several caveats: -// - Like all reference counting schemes, cycles lead to leaks. -// - Each smart pointer is actually two pointers (8 bytes instead of 4). -// - Every time a pointer is assigned, the entire list of pointers to that -// object is traversed. This class is therefore NOT SUITABLE when there -// will often be more than two or three pointers to a particular object. -// - References are only tracked as long as linked_ptr<> objects are copied. -// If a linked_ptr<> is converted to a raw pointer and back, BAD THINGS -// will happen (double deletion). -// -// A good use of this class is storing object references in STL containers. -// You can safely put linked_ptr<> in a vector<>. -// Other uses may not be as good. -// -// Note: If you use an incomplete type with linked_ptr<>, the class -// *containing* linked_ptr<> must have a constructor and destructor (even -// if they do nothing!). -// -// Bill Gibbons suggested we use something like this. -// -// Thread Safety: -// Unlike other linked_ptr implementations, in this implementation -// a linked_ptr object is thread-safe in the sense that: -// - it's safe to copy linked_ptr objects concurrently, -// - it's safe to copy *from* a linked_ptr and read its underlying -// raw pointer (e.g. via get()) concurrently, and -// - it's safe to write to two linked_ptrs that point to the same -// shared object concurrently. -// TODO(wan@google.com): rename this to safe_linked_ptr to avoid -// confusion with normal linked_ptr. - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_ - -#include -#include - -#include "gtest/internal/gtest-port.h" - -namespace testing { -namespace internal { - -// Protects copying of all linked_ptr objects. -GTEST_API_ GTEST_DECLARE_STATIC_MUTEX_(g_linked_ptr_mutex); - -// This is used internally by all instances of linked_ptr<>. It needs to be -// a non-template class because different types of linked_ptr<> can refer to -// the same object (linked_ptr(obj) vs linked_ptr(obj)). -// So, it needs to be possible for different types of linked_ptr to participate -// in the same circular linked list, so we need a single class type here. -// -// DO NOT USE THIS CLASS DIRECTLY YOURSELF. Use linked_ptr. -class linked_ptr_internal { - public: - // Create a new circle that includes only this instance. - void join_new() { - next_ = this; - } - - // Many linked_ptr operations may change p.link_ for some linked_ptr - // variable p in the same circle as this object. Therefore we need - // to prevent two such operations from occurring concurrently. - // - // Note that different types of linked_ptr objects can coexist in a - // circle (e.g. linked_ptr, linked_ptr, and - // linked_ptr). Therefore we must use a single mutex to - // protect all linked_ptr objects. This can create serious - // contention in production code, but is acceptable in a testing - // framework. - - // Join an existing circle. - void join(linked_ptr_internal const* ptr) - GTEST_LOCK_EXCLUDED_(g_linked_ptr_mutex) { - MutexLock lock(&g_linked_ptr_mutex); - - linked_ptr_internal const* p = ptr; - while (p->next_ != ptr) { - assert(p->next_ != this && - "Trying to join() a linked ring we are already in. " - "Is GMock thread safety enabled?"); - p = p->next_; - } - p->next_ = this; - next_ = ptr; - } - - // Leave whatever circle we're part of. Returns true if we were the - // last member of the circle. Once this is done, you can join() another. - bool depart() - GTEST_LOCK_EXCLUDED_(g_linked_ptr_mutex) { - MutexLock lock(&g_linked_ptr_mutex); - - if (next_ == this) return true; - linked_ptr_internal const* p = next_; - while (p->next_ != this) { - assert(p->next_ != next_ && - "Trying to depart() a linked ring we are not in. " - "Is GMock thread safety enabled?"); - p = p->next_; - } - p->next_ = next_; - return false; - } - - private: - mutable linked_ptr_internal const* next_; -}; - -template -class linked_ptr { - public: - typedef T element_type; - - // Take over ownership of a raw pointer. This should happen as soon as - // possible after the object is created. - explicit linked_ptr(T* ptr = NULL) { capture(ptr); } - ~linked_ptr() { depart(); } - - // Copy an existing linked_ptr<>, adding ourselves to the list of references. - template linked_ptr(linked_ptr const& ptr) { copy(&ptr); } - linked_ptr(linked_ptr const& ptr) { // NOLINT - assert(&ptr != this); - copy(&ptr); - } - - // Assignment releases the old value and acquires the new. - template linked_ptr& operator=(linked_ptr const& ptr) { - depart(); - copy(&ptr); - return *this; - } - - linked_ptr& operator=(linked_ptr const& ptr) { - if (&ptr != this) { - depart(); - copy(&ptr); - } - return *this; - } - - // Smart pointer members. - void reset(T* ptr = NULL) { - depart(); - capture(ptr); - } - T* get() const { return value_; } - T* operator->() const { return value_; } - T& operator*() const { return *value_; } - - bool operator==(T* p) const { return value_ == p; } - bool operator!=(T* p) const { return value_ != p; } - template - bool operator==(linked_ptr const& ptr) const { - return value_ == ptr.get(); - } - template - bool operator!=(linked_ptr const& ptr) const { - return value_ != ptr.get(); - } - - private: - template - friend class linked_ptr; - - T* value_; - linked_ptr_internal link_; - - void depart() { - if (link_.depart()) delete value_; - } - - void capture(T* ptr) { - value_ = ptr; - link_.join_new(); - } - - template void copy(linked_ptr const* ptr) { - value_ = ptr->get(); - if (value_) - link_.join(&ptr->link_); - else - link_.join_new(); - } -}; - -template inline -bool operator==(T* ptr, const linked_ptr& x) { - return ptr == x.get(); -} - -template inline -bool operator!=(T* ptr, const linked_ptr& x) { - return ptr != x.get(); -} - -// A function to convert T* into linked_ptr -// Doing e.g. make_linked_ptr(new FooBarBaz(arg)) is a shorter notation -// for linked_ptr >(new FooBarBaz(arg)) -template -linked_ptr make_linked_ptr(T* ptr) { - return linked_ptr(ptr); -} - -} // namespace internal -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h b/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h deleted file mode 100644 index dcf90c279a..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h +++ /dev/null @@ -1,5139 +0,0 @@ -// This file was GENERATED by command: -// pump.py gtest-param-util-generated.h.pump -// DO NOT EDIT BY HAND!!! - -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vladl@google.com (Vlad Losev) - -// Type and function utilities for implementing parameterized tests. -// This file is generated by a SCRIPT. DO NOT EDIT BY HAND! -// -// Currently Google Test supports at most 50 arguments in Values, -// and at most 10 arguments in Combine. Please contact -// googletestframework@googlegroups.com if you need more. -// Please note that the number of arguments to Combine is limited -// by the maximum arity of the implementation of tuple which is -// currently set at 10. - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ - -#include "gtest/internal/gtest-param-util.h" -#include "gtest/internal/gtest-port.h" - -namespace testing { - -// Forward declarations of ValuesIn(), which is implemented in -// include/gtest/gtest-param-test.h. -template -internal::ParamGenerator< - typename ::testing::internal::IteratorTraits::value_type> -ValuesIn(ForwardIterator begin, ForwardIterator end); - -template -internal::ParamGenerator ValuesIn(const T (&array)[N]); - -template -internal::ParamGenerator ValuesIn( - const Container& container); - -namespace internal { - -// Used in the Values() function to provide polymorphic capabilities. -template -class ValueArray1 { - public: - explicit ValueArray1(T1 v1) : v1_(v1) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray1& other); - - const T1 v1_; -}; - -template -class ValueArray2 { - public: - ValueArray2(T1 v1, T2 v2) : v1_(v1), v2_(v2) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray2& other); - - const T1 v1_; - const T2 v2_; -}; - -template -class ValueArray3 { - public: - ValueArray3(T1 v1, T2 v2, T3 v3) : v1_(v1), v2_(v2), v3_(v3) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray3& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; -}; - -template -class ValueArray4 { - public: - ValueArray4(T1 v1, T2 v2, T3 v3, T4 v4) : v1_(v1), v2_(v2), v3_(v3), - v4_(v4) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray4& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; -}; - -template -class ValueArray5 { - public: - ValueArray5(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5) : v1_(v1), v2_(v2), v3_(v3), - v4_(v4), v5_(v5) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray5& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; -}; - -template -class ValueArray6 { - public: - ValueArray6(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6) : v1_(v1), v2_(v2), - v3_(v3), v4_(v4), v5_(v5), v6_(v6) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray6& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; -}; - -template -class ValueArray7 { - public: - ValueArray7(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7) : v1_(v1), - v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray7& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; -}; - -template -class ValueArray8 { - public: - ValueArray8(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, - T8 v8) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), - v8_(v8) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray8& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; -}; - -template -class ValueArray9 { - public: - ValueArray9(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, - T9 v9) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), - v8_(v8), v9_(v9) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray9& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; -}; - -template -class ValueArray10 { - public: - ValueArray10(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), - v8_(v8), v9_(v9), v10_(v10) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray10& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; -}; - -template -class ValueArray11 { - public: - ValueArray11(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), - v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray11& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; -}; - -template -class ValueArray12 { - public: - ValueArray12(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), - v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray12& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; -}; - -template -class ValueArray13 { - public: - ValueArray13(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), - v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), - v12_(v12), v13_(v13) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray13& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; -}; - -template -class ValueArray14 { - public: - ValueArray14(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14) : v1_(v1), v2_(v2), v3_(v3), - v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), - v11_(v11), v12_(v12), v13_(v13), v14_(v14) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray14& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; -}; - -template -class ValueArray15 { - public: - ValueArray15(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15) : v1_(v1), v2_(v2), - v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), - v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray15& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; -}; - -template -class ValueArray16 { - public: - ValueArray16(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16) : v1_(v1), - v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), - v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), - v16_(v16) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray16& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; -}; - -template -class ValueArray17 { - public: - ValueArray17(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, - T17 v17) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), - v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), - v15_(v15), v16_(v16), v17_(v17) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray17& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; -}; - -template -class ValueArray18 { - public: - ValueArray18(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), - v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), - v15_(v15), v16_(v16), v17_(v17), v18_(v18) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray18& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; -}; - -template -class ValueArray19 { - public: - ValueArray19(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), - v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), - v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray19& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; -}; - -template -class ValueArray20 { - public: - ValueArray20(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), - v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), - v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), - v19_(v19), v20_(v20) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray20& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; -}; - -template -class ValueArray21 { - public: - ValueArray21(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), - v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), - v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), - v18_(v18), v19_(v19), v20_(v20), v21_(v21) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray21& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; -}; - -template -class ValueArray22 { - public: - ValueArray22(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22) : v1_(v1), v2_(v2), v3_(v3), - v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), - v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), - v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray22& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; -}; - -template -class ValueArray23 { - public: - ValueArray23(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23) : v1_(v1), v2_(v2), - v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), - v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), - v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), - v23_(v23) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray23& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; -}; - -template -class ValueArray24 { - public: - ValueArray24(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24) : v1_(v1), - v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), - v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), - v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), - v22_(v22), v23_(v23), v24_(v24) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray24& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; -}; - -template -class ValueArray25 { - public: - ValueArray25(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, - T25 v25) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), - v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), - v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), - v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray25& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; -}; - -template -class ValueArray26 { - public: - ValueArray26(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), - v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), - v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), - v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray26& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; -}; - -template -class ValueArray27 { - public: - ValueArray27(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), - v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), - v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), - v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), - v26_(v26), v27_(v27) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray27& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; -}; - -template -class ValueArray28 { - public: - ValueArray28(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), - v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), - v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), - v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), - v25_(v25), v26_(v26), v27_(v27), v28_(v28) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray28& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; -}; - -template -class ValueArray29 { - public: - ValueArray29(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), - v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), - v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), - v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), - v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray29& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; -}; - -template -class ValueArray30 { - public: - ValueArray30(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30) : v1_(v1), v2_(v2), v3_(v3), - v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), - v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), - v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), - v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), - v29_(v29), v30_(v30) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray30& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; -}; - -template -class ValueArray31 { - public: - ValueArray31(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31) : v1_(v1), v2_(v2), - v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), - v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), - v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), - v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), - v29_(v29), v30_(v30), v31_(v31) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray31& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; -}; - -template -class ValueArray32 { - public: - ValueArray32(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32) : v1_(v1), - v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), - v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), - v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), - v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), - v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray32& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; -}; - -template -class ValueArray33 { - public: - ValueArray33(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, - T33 v33) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), - v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), - v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), - v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), - v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), - v33_(v33) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray33& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; -}; - -template -class ValueArray34 { - public: - ValueArray34(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), - v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), - v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), - v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), - v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), - v33_(v33), v34_(v34) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray34& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; -}; - -template -class ValueArray35 { - public: - ValueArray35(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), - v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), - v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), - v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), - v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), - v32_(v32), v33_(v33), v34_(v34), v35_(v35) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray35& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; -}; - -template -class ValueArray36 { - public: - ValueArray36(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), - v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), - v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), - v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), - v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30), - v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35), v36_(v36) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray36& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; -}; - -template -class ValueArray37 { - public: - ValueArray37(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), - v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), - v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), - v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), - v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29), - v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35), - v36_(v36), v37_(v37) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray37& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; -}; - -template -class ValueArray38 { - public: - ValueArray38(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38) : v1_(v1), v2_(v2), v3_(v3), - v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), - v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), - v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), - v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), - v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), - v35_(v35), v36_(v36), v37_(v37), v38_(v38) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_), static_cast(v38_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray38& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; - const T38 v38_; -}; - -template -class ValueArray39 { - public: - ValueArray39(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39) : v1_(v1), v2_(v2), - v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), - v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), - v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), - v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), - v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), - v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_), static_cast(v38_), - static_cast(v39_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray39& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; - const T38 v38_; - const T39 v39_; -}; - -template -class ValueArray40 { - public: - ValueArray40(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40) : v1_(v1), - v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), - v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), - v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), - v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), - v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), - v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39), - v40_(v40) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_), static_cast(v38_), - static_cast(v39_), static_cast(v40_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray40& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; - const T38 v38_; - const T39 v39_; - const T40 v40_; -}; - -template -class ValueArray41 { - public: - ValueArray41(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, - T41 v41) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), - v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), - v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), - v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), - v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), - v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), - v39_(v39), v40_(v40), v41_(v41) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_), static_cast(v38_), - static_cast(v39_), static_cast(v40_), static_cast(v41_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray41& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; - const T38 v38_; - const T39 v39_; - const T40 v40_; - const T41 v41_; -}; - -template -class ValueArray42 { - public: - ValueArray42(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, - T42 v42) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), - v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), - v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), - v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), - v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), - v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), - v39_(v39), v40_(v40), v41_(v41), v42_(v42) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_), static_cast(v38_), - static_cast(v39_), static_cast(v40_), static_cast(v41_), - static_cast(v42_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray42& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; - const T38 v38_; - const T39 v39_; - const T40 v40_; - const T41 v41_; - const T42 v42_; -}; - -template -class ValueArray43 { - public: - ValueArray43(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, - T42 v42, T43 v43) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), - v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), - v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), - v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), - v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), - v32_(v32), v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), - v38_(v38), v39_(v39), v40_(v40), v41_(v41), v42_(v42), v43_(v43) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_), static_cast(v38_), - static_cast(v39_), static_cast(v40_), static_cast(v41_), - static_cast(v42_), static_cast(v43_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray43& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; - const T38 v38_; - const T39 v39_; - const T40 v40_; - const T41 v41_; - const T42 v42_; - const T43 v43_; -}; - -template -class ValueArray44 { - public: - ValueArray44(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, - T42 v42, T43 v43, T44 v44) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), - v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), - v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), - v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), - v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30), - v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35), v36_(v36), - v37_(v37), v38_(v38), v39_(v39), v40_(v40), v41_(v41), v42_(v42), - v43_(v43), v44_(v44) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_), static_cast(v38_), - static_cast(v39_), static_cast(v40_), static_cast(v41_), - static_cast(v42_), static_cast(v43_), static_cast(v44_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray44& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; - const T38 v38_; - const T39 v39_; - const T40 v40_; - const T41 v41_; - const T42 v42_; - const T43 v43_; - const T44 v44_; -}; - -template -class ValueArray45 { - public: - ValueArray45(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, - T42 v42, T43 v43, T44 v44, T45 v45) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), - v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), - v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), - v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), - v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29), - v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35), - v36_(v36), v37_(v37), v38_(v38), v39_(v39), v40_(v40), v41_(v41), - v42_(v42), v43_(v43), v44_(v44), v45_(v45) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_), static_cast(v38_), - static_cast(v39_), static_cast(v40_), static_cast(v41_), - static_cast(v42_), static_cast(v43_), static_cast(v44_), - static_cast(v45_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray45& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; - const T38 v38_; - const T39 v39_; - const T40 v40_; - const T41 v41_; - const T42 v42_; - const T43 v43_; - const T44 v44_; - const T45 v45_; -}; - -template -class ValueArray46 { - public: - ValueArray46(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, - T42 v42, T43 v43, T44 v44, T45 v45, T46 v46) : v1_(v1), v2_(v2), v3_(v3), - v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), - v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), - v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), - v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), - v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), - v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39), v40_(v40), - v41_(v41), v42_(v42), v43_(v43), v44_(v44), v45_(v45), v46_(v46) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_), static_cast(v38_), - static_cast(v39_), static_cast(v40_), static_cast(v41_), - static_cast(v42_), static_cast(v43_), static_cast(v44_), - static_cast(v45_), static_cast(v46_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray46& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; - const T38 v38_; - const T39 v39_; - const T40 v40_; - const T41 v41_; - const T42 v42_; - const T43 v43_; - const T44 v44_; - const T45 v45_; - const T46 v46_; -}; - -template -class ValueArray47 { - public: - ValueArray47(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, - T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47) : v1_(v1), v2_(v2), - v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), - v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), - v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), - v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), - v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), - v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39), v40_(v40), - v41_(v41), v42_(v42), v43_(v43), v44_(v44), v45_(v45), v46_(v46), - v47_(v47) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_), static_cast(v38_), - static_cast(v39_), static_cast(v40_), static_cast(v41_), - static_cast(v42_), static_cast(v43_), static_cast(v44_), - static_cast(v45_), static_cast(v46_), static_cast(v47_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray47& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; - const T38 v38_; - const T39 v39_; - const T40 v40_; - const T41 v41_; - const T42 v42_; - const T43 v43_; - const T44 v44_; - const T45 v45_; - const T46 v46_; - const T47 v47_; -}; - -template -class ValueArray48 { - public: - ValueArray48(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, - T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, T48 v48) : v1_(v1), - v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), - v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), - v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), - v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), - v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), - v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39), - v40_(v40), v41_(v41), v42_(v42), v43_(v43), v44_(v44), v45_(v45), - v46_(v46), v47_(v47), v48_(v48) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_), static_cast(v38_), - static_cast(v39_), static_cast(v40_), static_cast(v41_), - static_cast(v42_), static_cast(v43_), static_cast(v44_), - static_cast(v45_), static_cast(v46_), static_cast(v47_), - static_cast(v48_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray48& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; - const T38 v38_; - const T39 v39_; - const T40 v40_; - const T41 v41_; - const T42 v42_; - const T43 v43_; - const T44 v44_; - const T45 v45_; - const T46 v46_; - const T47 v47_; - const T48 v48_; -}; - -template -class ValueArray49 { - public: - ValueArray49(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, - T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, T48 v48, - T49 v49) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), - v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), - v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), - v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), - v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), - v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), - v39_(v39), v40_(v40), v41_(v41), v42_(v42), v43_(v43), v44_(v44), - v45_(v45), v46_(v46), v47_(v47), v48_(v48), v49_(v49) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_), static_cast(v38_), - static_cast(v39_), static_cast(v40_), static_cast(v41_), - static_cast(v42_), static_cast(v43_), static_cast(v44_), - static_cast(v45_), static_cast(v46_), static_cast(v47_), - static_cast(v48_), static_cast(v49_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray49& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; - const T38 v38_; - const T39 v39_; - const T40 v40_; - const T41 v41_; - const T42 v42_; - const T43 v43_; - const T44 v44_; - const T45 v45_; - const T46 v46_; - const T47 v47_; - const T48 v48_; - const T49 v49_; -}; - -template -class ValueArray50 { - public: - ValueArray50(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, - T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, - T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, - T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, - T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, - T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, T48 v48, T49 v49, - T50 v50) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), - v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), - v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), - v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), - v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), - v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), - v39_(v39), v40_(v40), v41_(v41), v42_(v42), v43_(v43), v44_(v44), - v45_(v45), v46_(v46), v47_(v47), v48_(v48), v49_(v49), v50_(v50) {} - - template - operator ParamGenerator() const { - const T array[] = {static_cast(v1_), static_cast(v2_), - static_cast(v3_), static_cast(v4_), static_cast(v5_), - static_cast(v6_), static_cast(v7_), static_cast(v8_), - static_cast(v9_), static_cast(v10_), static_cast(v11_), - static_cast(v12_), static_cast(v13_), static_cast(v14_), - static_cast(v15_), static_cast(v16_), static_cast(v17_), - static_cast(v18_), static_cast(v19_), static_cast(v20_), - static_cast(v21_), static_cast(v22_), static_cast(v23_), - static_cast(v24_), static_cast(v25_), static_cast(v26_), - static_cast(v27_), static_cast(v28_), static_cast(v29_), - static_cast(v30_), static_cast(v31_), static_cast(v32_), - static_cast(v33_), static_cast(v34_), static_cast(v35_), - static_cast(v36_), static_cast(v37_), static_cast(v38_), - static_cast(v39_), static_cast(v40_), static_cast(v41_), - static_cast(v42_), static_cast(v43_), static_cast(v44_), - static_cast(v45_), static_cast(v46_), static_cast(v47_), - static_cast(v48_), static_cast(v49_), static_cast(v50_)}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray50& other); - - const T1 v1_; - const T2 v2_; - const T3 v3_; - const T4 v4_; - const T5 v5_; - const T6 v6_; - const T7 v7_; - const T8 v8_; - const T9 v9_; - const T10 v10_; - const T11 v11_; - const T12 v12_; - const T13 v13_; - const T14 v14_; - const T15 v15_; - const T16 v16_; - const T17 v17_; - const T18 v18_; - const T19 v19_; - const T20 v20_; - const T21 v21_; - const T22 v22_; - const T23 v23_; - const T24 v24_; - const T25 v25_; - const T26 v26_; - const T27 v27_; - const T28 v28_; - const T29 v29_; - const T30 v30_; - const T31 v31_; - const T32 v32_; - const T33 v33_; - const T34 v34_; - const T35 v35_; - const T36 v36_; - const T37 v37_; - const T38 v38_; - const T39 v39_; - const T40 v40_; - const T41 v41_; - const T42 v42_; - const T43 v43_; - const T44 v44_; - const T45 v45_; - const T46 v46_; - const T47 v47_; - const T48 v48_; - const T49 v49_; - const T50 v50_; -}; - -# if GTEST_HAS_COMBINE -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// Generates values from the Cartesian product of values produced -// by the argument generators. -// -template -class CartesianProductGenerator2 - : public ParamGeneratorInterface< ::testing::tuple > { - public: - typedef ::testing::tuple ParamType; - - CartesianProductGenerator2(const ParamGenerator& g1, - const ParamGenerator& g2) - : g1_(g1), g2_(g2) {} - virtual ~CartesianProductGenerator2() {} - - virtual ParamIteratorInterface* Begin() const { - return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin()); - } - virtual ParamIteratorInterface* End() const { - return new Iterator(this, g1_, g1_.end(), g2_, g2_.end()); - } - - private: - class Iterator : public ParamIteratorInterface { - public: - Iterator(const ParamGeneratorInterface* base, - const ParamGenerator& g1, - const typename ParamGenerator::iterator& current1, - const ParamGenerator& g2, - const typename ParamGenerator::iterator& current2) - : base_(base), - begin1_(g1.begin()), end1_(g1.end()), current1_(current1), - begin2_(g2.begin()), end2_(g2.end()), current2_(current2) { - ComputeCurrentValue(); - } - virtual ~Iterator() {} - - virtual const ParamGeneratorInterface* BaseGenerator() const { - return base_; - } - // Advance should not be called on beyond-of-range iterators - // so no component iterators must be beyond end of range, either. - virtual void Advance() { - assert(!AtEnd()); - ++current2_; - if (current2_ == end2_) { - current2_ = begin2_; - ++current1_; - } - ComputeCurrentValue(); - } - virtual ParamIteratorInterface* Clone() const { - return new Iterator(*this); - } - virtual const ParamType* Current() const { return current_value_.get(); } - virtual bool Equals(const ParamIteratorInterface& other) const { - // Having the same base generator guarantees that the other - // iterator is of the same type and we can downcast. - GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) - << "The program attempted to compare iterators " - << "from different generators." << std::endl; - const Iterator* typed_other = - CheckedDowncastToActualType(&other); - // We must report iterators equal if they both point beyond their - // respective ranges. That can happen in a variety of fashions, - // so we have to consult AtEnd(). - return (AtEnd() && typed_other->AtEnd()) || - ( - current1_ == typed_other->current1_ && - current2_ == typed_other->current2_); - } - - private: - Iterator(const Iterator& other) - : base_(other.base_), - begin1_(other.begin1_), - end1_(other.end1_), - current1_(other.current1_), - begin2_(other.begin2_), - end2_(other.end2_), - current2_(other.current2_) { - ComputeCurrentValue(); - } - - void ComputeCurrentValue() { - if (!AtEnd()) - current_value_.reset(new ParamType(*current1_, *current2_)); - } - bool AtEnd() const { - // We must report iterator past the end of the range when either of the - // component iterators has reached the end of its range. - return - current1_ == end1_ || - current2_ == end2_; - } - - // No implementation - assignment is unsupported. - void operator=(const Iterator& other); - - const ParamGeneratorInterface* const base_; - // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. - // current[i]_ is the actual traversing iterator. - const typename ParamGenerator::iterator begin1_; - const typename ParamGenerator::iterator end1_; - typename ParamGenerator::iterator current1_; - const typename ParamGenerator::iterator begin2_; - const typename ParamGenerator::iterator end2_; - typename ParamGenerator::iterator current2_; - linked_ptr current_value_; - }; // class CartesianProductGenerator2::Iterator - - // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator2& other); - - const ParamGenerator g1_; - const ParamGenerator g2_; -}; // class CartesianProductGenerator2 - - -template -class CartesianProductGenerator3 - : public ParamGeneratorInterface< ::testing::tuple > { - public: - typedef ::testing::tuple ParamType; - - CartesianProductGenerator3(const ParamGenerator& g1, - const ParamGenerator& g2, const ParamGenerator& g3) - : g1_(g1), g2_(g2), g3_(g3) {} - virtual ~CartesianProductGenerator3() {} - - virtual ParamIteratorInterface* Begin() const { - return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, - g3_.begin()); - } - virtual ParamIteratorInterface* End() const { - return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end()); - } - - private: - class Iterator : public ParamIteratorInterface { - public: - Iterator(const ParamGeneratorInterface* base, - const ParamGenerator& g1, - const typename ParamGenerator::iterator& current1, - const ParamGenerator& g2, - const typename ParamGenerator::iterator& current2, - const ParamGenerator& g3, - const typename ParamGenerator::iterator& current3) - : base_(base), - begin1_(g1.begin()), end1_(g1.end()), current1_(current1), - begin2_(g2.begin()), end2_(g2.end()), current2_(current2), - begin3_(g3.begin()), end3_(g3.end()), current3_(current3) { - ComputeCurrentValue(); - } - virtual ~Iterator() {} - - virtual const ParamGeneratorInterface* BaseGenerator() const { - return base_; - } - // Advance should not be called on beyond-of-range iterators - // so no component iterators must be beyond end of range, either. - virtual void Advance() { - assert(!AtEnd()); - ++current3_; - if (current3_ == end3_) { - current3_ = begin3_; - ++current2_; - } - if (current2_ == end2_) { - current2_ = begin2_; - ++current1_; - } - ComputeCurrentValue(); - } - virtual ParamIteratorInterface* Clone() const { - return new Iterator(*this); - } - virtual const ParamType* Current() const { return current_value_.get(); } - virtual bool Equals(const ParamIteratorInterface& other) const { - // Having the same base generator guarantees that the other - // iterator is of the same type and we can downcast. - GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) - << "The program attempted to compare iterators " - << "from different generators." << std::endl; - const Iterator* typed_other = - CheckedDowncastToActualType(&other); - // We must report iterators equal if they both point beyond their - // respective ranges. That can happen in a variety of fashions, - // so we have to consult AtEnd(). - return (AtEnd() && typed_other->AtEnd()) || - ( - current1_ == typed_other->current1_ && - current2_ == typed_other->current2_ && - current3_ == typed_other->current3_); - } - - private: - Iterator(const Iterator& other) - : base_(other.base_), - begin1_(other.begin1_), - end1_(other.end1_), - current1_(other.current1_), - begin2_(other.begin2_), - end2_(other.end2_), - current2_(other.current2_), - begin3_(other.begin3_), - end3_(other.end3_), - current3_(other.current3_) { - ComputeCurrentValue(); - } - - void ComputeCurrentValue() { - if (!AtEnd()) - current_value_.reset(new ParamType(*current1_, *current2_, *current3_)); - } - bool AtEnd() const { - // We must report iterator past the end of the range when either of the - // component iterators has reached the end of its range. - return - current1_ == end1_ || - current2_ == end2_ || - current3_ == end3_; - } - - // No implementation - assignment is unsupported. - void operator=(const Iterator& other); - - const ParamGeneratorInterface* const base_; - // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. - // current[i]_ is the actual traversing iterator. - const typename ParamGenerator::iterator begin1_; - const typename ParamGenerator::iterator end1_; - typename ParamGenerator::iterator current1_; - const typename ParamGenerator::iterator begin2_; - const typename ParamGenerator::iterator end2_; - typename ParamGenerator::iterator current2_; - const typename ParamGenerator::iterator begin3_; - const typename ParamGenerator::iterator end3_; - typename ParamGenerator::iterator current3_; - linked_ptr current_value_; - }; // class CartesianProductGenerator3::Iterator - - // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator3& other); - - const ParamGenerator g1_; - const ParamGenerator g2_; - const ParamGenerator g3_; -}; // class CartesianProductGenerator3 - - -template -class CartesianProductGenerator4 - : public ParamGeneratorInterface< ::testing::tuple > { - public: - typedef ::testing::tuple ParamType; - - CartesianProductGenerator4(const ParamGenerator& g1, - const ParamGenerator& g2, const ParamGenerator& g3, - const ParamGenerator& g4) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4) {} - virtual ~CartesianProductGenerator4() {} - - virtual ParamIteratorInterface* Begin() const { - return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, - g3_.begin(), g4_, g4_.begin()); - } - virtual ParamIteratorInterface* End() const { - return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), - g4_, g4_.end()); - } - - private: - class Iterator : public ParamIteratorInterface { - public: - Iterator(const ParamGeneratorInterface* base, - const ParamGenerator& g1, - const typename ParamGenerator::iterator& current1, - const ParamGenerator& g2, - const typename ParamGenerator::iterator& current2, - const ParamGenerator& g3, - const typename ParamGenerator::iterator& current3, - const ParamGenerator& g4, - const typename ParamGenerator::iterator& current4) - : base_(base), - begin1_(g1.begin()), end1_(g1.end()), current1_(current1), - begin2_(g2.begin()), end2_(g2.end()), current2_(current2), - begin3_(g3.begin()), end3_(g3.end()), current3_(current3), - begin4_(g4.begin()), end4_(g4.end()), current4_(current4) { - ComputeCurrentValue(); - } - virtual ~Iterator() {} - - virtual const ParamGeneratorInterface* BaseGenerator() const { - return base_; - } - // Advance should not be called on beyond-of-range iterators - // so no component iterators must be beyond end of range, either. - virtual void Advance() { - assert(!AtEnd()); - ++current4_; - if (current4_ == end4_) { - current4_ = begin4_; - ++current3_; - } - if (current3_ == end3_) { - current3_ = begin3_; - ++current2_; - } - if (current2_ == end2_) { - current2_ = begin2_; - ++current1_; - } - ComputeCurrentValue(); - } - virtual ParamIteratorInterface* Clone() const { - return new Iterator(*this); - } - virtual const ParamType* Current() const { return current_value_.get(); } - virtual bool Equals(const ParamIteratorInterface& other) const { - // Having the same base generator guarantees that the other - // iterator is of the same type and we can downcast. - GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) - << "The program attempted to compare iterators " - << "from different generators." << std::endl; - const Iterator* typed_other = - CheckedDowncastToActualType(&other); - // We must report iterators equal if they both point beyond their - // respective ranges. That can happen in a variety of fashions, - // so we have to consult AtEnd(). - return (AtEnd() && typed_other->AtEnd()) || - ( - current1_ == typed_other->current1_ && - current2_ == typed_other->current2_ && - current3_ == typed_other->current3_ && - current4_ == typed_other->current4_); - } - - private: - Iterator(const Iterator& other) - : base_(other.base_), - begin1_(other.begin1_), - end1_(other.end1_), - current1_(other.current1_), - begin2_(other.begin2_), - end2_(other.end2_), - current2_(other.current2_), - begin3_(other.begin3_), - end3_(other.end3_), - current3_(other.current3_), - begin4_(other.begin4_), - end4_(other.end4_), - current4_(other.current4_) { - ComputeCurrentValue(); - } - - void ComputeCurrentValue() { - if (!AtEnd()) - current_value_.reset(new ParamType(*current1_, *current2_, *current3_, - *current4_)); - } - bool AtEnd() const { - // We must report iterator past the end of the range when either of the - // component iterators has reached the end of its range. - return - current1_ == end1_ || - current2_ == end2_ || - current3_ == end3_ || - current4_ == end4_; - } - - // No implementation - assignment is unsupported. - void operator=(const Iterator& other); - - const ParamGeneratorInterface* const base_; - // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. - // current[i]_ is the actual traversing iterator. - const typename ParamGenerator::iterator begin1_; - const typename ParamGenerator::iterator end1_; - typename ParamGenerator::iterator current1_; - const typename ParamGenerator::iterator begin2_; - const typename ParamGenerator::iterator end2_; - typename ParamGenerator::iterator current2_; - const typename ParamGenerator::iterator begin3_; - const typename ParamGenerator::iterator end3_; - typename ParamGenerator::iterator current3_; - const typename ParamGenerator::iterator begin4_; - const typename ParamGenerator::iterator end4_; - typename ParamGenerator::iterator current4_; - linked_ptr current_value_; - }; // class CartesianProductGenerator4::Iterator - - // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator4& other); - - const ParamGenerator g1_; - const ParamGenerator g2_; - const ParamGenerator g3_; - const ParamGenerator g4_; -}; // class CartesianProductGenerator4 - - -template -class CartesianProductGenerator5 - : public ParamGeneratorInterface< ::testing::tuple > { - public: - typedef ::testing::tuple ParamType; - - CartesianProductGenerator5(const ParamGenerator& g1, - const ParamGenerator& g2, const ParamGenerator& g3, - const ParamGenerator& g4, const ParamGenerator& g5) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5) {} - virtual ~CartesianProductGenerator5() {} - - virtual ParamIteratorInterface* Begin() const { - return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, - g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin()); - } - virtual ParamIteratorInterface* End() const { - return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), - g4_, g4_.end(), g5_, g5_.end()); - } - - private: - class Iterator : public ParamIteratorInterface { - public: - Iterator(const ParamGeneratorInterface* base, - const ParamGenerator& g1, - const typename ParamGenerator::iterator& current1, - const ParamGenerator& g2, - const typename ParamGenerator::iterator& current2, - const ParamGenerator& g3, - const typename ParamGenerator::iterator& current3, - const ParamGenerator& g4, - const typename ParamGenerator::iterator& current4, - const ParamGenerator& g5, - const typename ParamGenerator::iterator& current5) - : base_(base), - begin1_(g1.begin()), end1_(g1.end()), current1_(current1), - begin2_(g2.begin()), end2_(g2.end()), current2_(current2), - begin3_(g3.begin()), end3_(g3.end()), current3_(current3), - begin4_(g4.begin()), end4_(g4.end()), current4_(current4), - begin5_(g5.begin()), end5_(g5.end()), current5_(current5) { - ComputeCurrentValue(); - } - virtual ~Iterator() {} - - virtual const ParamGeneratorInterface* BaseGenerator() const { - return base_; - } - // Advance should not be called on beyond-of-range iterators - // so no component iterators must be beyond end of range, either. - virtual void Advance() { - assert(!AtEnd()); - ++current5_; - if (current5_ == end5_) { - current5_ = begin5_; - ++current4_; - } - if (current4_ == end4_) { - current4_ = begin4_; - ++current3_; - } - if (current3_ == end3_) { - current3_ = begin3_; - ++current2_; - } - if (current2_ == end2_) { - current2_ = begin2_; - ++current1_; - } - ComputeCurrentValue(); - } - virtual ParamIteratorInterface* Clone() const { - return new Iterator(*this); - } - virtual const ParamType* Current() const { return current_value_.get(); } - virtual bool Equals(const ParamIteratorInterface& other) const { - // Having the same base generator guarantees that the other - // iterator is of the same type and we can downcast. - GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) - << "The program attempted to compare iterators " - << "from different generators." << std::endl; - const Iterator* typed_other = - CheckedDowncastToActualType(&other); - // We must report iterators equal if they both point beyond their - // respective ranges. That can happen in a variety of fashions, - // so we have to consult AtEnd(). - return (AtEnd() && typed_other->AtEnd()) || - ( - current1_ == typed_other->current1_ && - current2_ == typed_other->current2_ && - current3_ == typed_other->current3_ && - current4_ == typed_other->current4_ && - current5_ == typed_other->current5_); - } - - private: - Iterator(const Iterator& other) - : base_(other.base_), - begin1_(other.begin1_), - end1_(other.end1_), - current1_(other.current1_), - begin2_(other.begin2_), - end2_(other.end2_), - current2_(other.current2_), - begin3_(other.begin3_), - end3_(other.end3_), - current3_(other.current3_), - begin4_(other.begin4_), - end4_(other.end4_), - current4_(other.current4_), - begin5_(other.begin5_), - end5_(other.end5_), - current5_(other.current5_) { - ComputeCurrentValue(); - } - - void ComputeCurrentValue() { - if (!AtEnd()) - current_value_.reset(new ParamType(*current1_, *current2_, *current3_, - *current4_, *current5_)); - } - bool AtEnd() const { - // We must report iterator past the end of the range when either of the - // component iterators has reached the end of its range. - return - current1_ == end1_ || - current2_ == end2_ || - current3_ == end3_ || - current4_ == end4_ || - current5_ == end5_; - } - - // No implementation - assignment is unsupported. - void operator=(const Iterator& other); - - const ParamGeneratorInterface* const base_; - // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. - // current[i]_ is the actual traversing iterator. - const typename ParamGenerator::iterator begin1_; - const typename ParamGenerator::iterator end1_; - typename ParamGenerator::iterator current1_; - const typename ParamGenerator::iterator begin2_; - const typename ParamGenerator::iterator end2_; - typename ParamGenerator::iterator current2_; - const typename ParamGenerator::iterator begin3_; - const typename ParamGenerator::iterator end3_; - typename ParamGenerator::iterator current3_; - const typename ParamGenerator::iterator begin4_; - const typename ParamGenerator::iterator end4_; - typename ParamGenerator::iterator current4_; - const typename ParamGenerator::iterator begin5_; - const typename ParamGenerator::iterator end5_; - typename ParamGenerator::iterator current5_; - linked_ptr current_value_; - }; // class CartesianProductGenerator5::Iterator - - // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator5& other); - - const ParamGenerator g1_; - const ParamGenerator g2_; - const ParamGenerator g3_; - const ParamGenerator g4_; - const ParamGenerator g5_; -}; // class CartesianProductGenerator5 - - -template -class CartesianProductGenerator6 - : public ParamGeneratorInterface< ::testing::tuple > { - public: - typedef ::testing::tuple ParamType; - - CartesianProductGenerator6(const ParamGenerator& g1, - const ParamGenerator& g2, const ParamGenerator& g3, - const ParamGenerator& g4, const ParamGenerator& g5, - const ParamGenerator& g6) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6) {} - virtual ~CartesianProductGenerator6() {} - - virtual ParamIteratorInterface* Begin() const { - return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, - g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin()); - } - virtual ParamIteratorInterface* End() const { - return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), - g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end()); - } - - private: - class Iterator : public ParamIteratorInterface { - public: - Iterator(const ParamGeneratorInterface* base, - const ParamGenerator& g1, - const typename ParamGenerator::iterator& current1, - const ParamGenerator& g2, - const typename ParamGenerator::iterator& current2, - const ParamGenerator& g3, - const typename ParamGenerator::iterator& current3, - const ParamGenerator& g4, - const typename ParamGenerator::iterator& current4, - const ParamGenerator& g5, - const typename ParamGenerator::iterator& current5, - const ParamGenerator& g6, - const typename ParamGenerator::iterator& current6) - : base_(base), - begin1_(g1.begin()), end1_(g1.end()), current1_(current1), - begin2_(g2.begin()), end2_(g2.end()), current2_(current2), - begin3_(g3.begin()), end3_(g3.end()), current3_(current3), - begin4_(g4.begin()), end4_(g4.end()), current4_(current4), - begin5_(g5.begin()), end5_(g5.end()), current5_(current5), - begin6_(g6.begin()), end6_(g6.end()), current6_(current6) { - ComputeCurrentValue(); - } - virtual ~Iterator() {} - - virtual const ParamGeneratorInterface* BaseGenerator() const { - return base_; - } - // Advance should not be called on beyond-of-range iterators - // so no component iterators must be beyond end of range, either. - virtual void Advance() { - assert(!AtEnd()); - ++current6_; - if (current6_ == end6_) { - current6_ = begin6_; - ++current5_; - } - if (current5_ == end5_) { - current5_ = begin5_; - ++current4_; - } - if (current4_ == end4_) { - current4_ = begin4_; - ++current3_; - } - if (current3_ == end3_) { - current3_ = begin3_; - ++current2_; - } - if (current2_ == end2_) { - current2_ = begin2_; - ++current1_; - } - ComputeCurrentValue(); - } - virtual ParamIteratorInterface* Clone() const { - return new Iterator(*this); - } - virtual const ParamType* Current() const { return current_value_.get(); } - virtual bool Equals(const ParamIteratorInterface& other) const { - // Having the same base generator guarantees that the other - // iterator is of the same type and we can downcast. - GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) - << "The program attempted to compare iterators " - << "from different generators." << std::endl; - const Iterator* typed_other = - CheckedDowncastToActualType(&other); - // We must report iterators equal if they both point beyond their - // respective ranges. That can happen in a variety of fashions, - // so we have to consult AtEnd(). - return (AtEnd() && typed_other->AtEnd()) || - ( - current1_ == typed_other->current1_ && - current2_ == typed_other->current2_ && - current3_ == typed_other->current3_ && - current4_ == typed_other->current4_ && - current5_ == typed_other->current5_ && - current6_ == typed_other->current6_); - } - - private: - Iterator(const Iterator& other) - : base_(other.base_), - begin1_(other.begin1_), - end1_(other.end1_), - current1_(other.current1_), - begin2_(other.begin2_), - end2_(other.end2_), - current2_(other.current2_), - begin3_(other.begin3_), - end3_(other.end3_), - current3_(other.current3_), - begin4_(other.begin4_), - end4_(other.end4_), - current4_(other.current4_), - begin5_(other.begin5_), - end5_(other.end5_), - current5_(other.current5_), - begin6_(other.begin6_), - end6_(other.end6_), - current6_(other.current6_) { - ComputeCurrentValue(); - } - - void ComputeCurrentValue() { - if (!AtEnd()) - current_value_.reset(new ParamType(*current1_, *current2_, *current3_, - *current4_, *current5_, *current6_)); - } - bool AtEnd() const { - // We must report iterator past the end of the range when either of the - // component iterators has reached the end of its range. - return - current1_ == end1_ || - current2_ == end2_ || - current3_ == end3_ || - current4_ == end4_ || - current5_ == end5_ || - current6_ == end6_; - } - - // No implementation - assignment is unsupported. - void operator=(const Iterator& other); - - const ParamGeneratorInterface* const base_; - // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. - // current[i]_ is the actual traversing iterator. - const typename ParamGenerator::iterator begin1_; - const typename ParamGenerator::iterator end1_; - typename ParamGenerator::iterator current1_; - const typename ParamGenerator::iterator begin2_; - const typename ParamGenerator::iterator end2_; - typename ParamGenerator::iterator current2_; - const typename ParamGenerator::iterator begin3_; - const typename ParamGenerator::iterator end3_; - typename ParamGenerator::iterator current3_; - const typename ParamGenerator::iterator begin4_; - const typename ParamGenerator::iterator end4_; - typename ParamGenerator::iterator current4_; - const typename ParamGenerator::iterator begin5_; - const typename ParamGenerator::iterator end5_; - typename ParamGenerator::iterator current5_; - const typename ParamGenerator::iterator begin6_; - const typename ParamGenerator::iterator end6_; - typename ParamGenerator::iterator current6_; - linked_ptr current_value_; - }; // class CartesianProductGenerator6::Iterator - - // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator6& other); - - const ParamGenerator g1_; - const ParamGenerator g2_; - const ParamGenerator g3_; - const ParamGenerator g4_; - const ParamGenerator g5_; - const ParamGenerator g6_; -}; // class CartesianProductGenerator6 - - -template -class CartesianProductGenerator7 - : public ParamGeneratorInterface< ::testing::tuple > { - public: - typedef ::testing::tuple ParamType; - - CartesianProductGenerator7(const ParamGenerator& g1, - const ParamGenerator& g2, const ParamGenerator& g3, - const ParamGenerator& g4, const ParamGenerator& g5, - const ParamGenerator& g6, const ParamGenerator& g7) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7) {} - virtual ~CartesianProductGenerator7() {} - - virtual ParamIteratorInterface* Begin() const { - return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, - g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_, - g7_.begin()); - } - virtual ParamIteratorInterface* End() const { - return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), - g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end()); - } - - private: - class Iterator : public ParamIteratorInterface { - public: - Iterator(const ParamGeneratorInterface* base, - const ParamGenerator& g1, - const typename ParamGenerator::iterator& current1, - const ParamGenerator& g2, - const typename ParamGenerator::iterator& current2, - const ParamGenerator& g3, - const typename ParamGenerator::iterator& current3, - const ParamGenerator& g4, - const typename ParamGenerator::iterator& current4, - const ParamGenerator& g5, - const typename ParamGenerator::iterator& current5, - const ParamGenerator& g6, - const typename ParamGenerator::iterator& current6, - const ParamGenerator& g7, - const typename ParamGenerator::iterator& current7) - : base_(base), - begin1_(g1.begin()), end1_(g1.end()), current1_(current1), - begin2_(g2.begin()), end2_(g2.end()), current2_(current2), - begin3_(g3.begin()), end3_(g3.end()), current3_(current3), - begin4_(g4.begin()), end4_(g4.end()), current4_(current4), - begin5_(g5.begin()), end5_(g5.end()), current5_(current5), - begin6_(g6.begin()), end6_(g6.end()), current6_(current6), - begin7_(g7.begin()), end7_(g7.end()), current7_(current7) { - ComputeCurrentValue(); - } - virtual ~Iterator() {} - - virtual const ParamGeneratorInterface* BaseGenerator() const { - return base_; - } - // Advance should not be called on beyond-of-range iterators - // so no component iterators must be beyond end of range, either. - virtual void Advance() { - assert(!AtEnd()); - ++current7_; - if (current7_ == end7_) { - current7_ = begin7_; - ++current6_; - } - if (current6_ == end6_) { - current6_ = begin6_; - ++current5_; - } - if (current5_ == end5_) { - current5_ = begin5_; - ++current4_; - } - if (current4_ == end4_) { - current4_ = begin4_; - ++current3_; - } - if (current3_ == end3_) { - current3_ = begin3_; - ++current2_; - } - if (current2_ == end2_) { - current2_ = begin2_; - ++current1_; - } - ComputeCurrentValue(); - } - virtual ParamIteratorInterface* Clone() const { - return new Iterator(*this); - } - virtual const ParamType* Current() const { return current_value_.get(); } - virtual bool Equals(const ParamIteratorInterface& other) const { - // Having the same base generator guarantees that the other - // iterator is of the same type and we can downcast. - GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) - << "The program attempted to compare iterators " - << "from different generators." << std::endl; - const Iterator* typed_other = - CheckedDowncastToActualType(&other); - // We must report iterators equal if they both point beyond their - // respective ranges. That can happen in a variety of fashions, - // so we have to consult AtEnd(). - return (AtEnd() && typed_other->AtEnd()) || - ( - current1_ == typed_other->current1_ && - current2_ == typed_other->current2_ && - current3_ == typed_other->current3_ && - current4_ == typed_other->current4_ && - current5_ == typed_other->current5_ && - current6_ == typed_other->current6_ && - current7_ == typed_other->current7_); - } - - private: - Iterator(const Iterator& other) - : base_(other.base_), - begin1_(other.begin1_), - end1_(other.end1_), - current1_(other.current1_), - begin2_(other.begin2_), - end2_(other.end2_), - current2_(other.current2_), - begin3_(other.begin3_), - end3_(other.end3_), - current3_(other.current3_), - begin4_(other.begin4_), - end4_(other.end4_), - current4_(other.current4_), - begin5_(other.begin5_), - end5_(other.end5_), - current5_(other.current5_), - begin6_(other.begin6_), - end6_(other.end6_), - current6_(other.current6_), - begin7_(other.begin7_), - end7_(other.end7_), - current7_(other.current7_) { - ComputeCurrentValue(); - } - - void ComputeCurrentValue() { - if (!AtEnd()) - current_value_.reset(new ParamType(*current1_, *current2_, *current3_, - *current4_, *current5_, *current6_, *current7_)); - } - bool AtEnd() const { - // We must report iterator past the end of the range when either of the - // component iterators has reached the end of its range. - return - current1_ == end1_ || - current2_ == end2_ || - current3_ == end3_ || - current4_ == end4_ || - current5_ == end5_ || - current6_ == end6_ || - current7_ == end7_; - } - - // No implementation - assignment is unsupported. - void operator=(const Iterator& other); - - const ParamGeneratorInterface* const base_; - // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. - // current[i]_ is the actual traversing iterator. - const typename ParamGenerator::iterator begin1_; - const typename ParamGenerator::iterator end1_; - typename ParamGenerator::iterator current1_; - const typename ParamGenerator::iterator begin2_; - const typename ParamGenerator::iterator end2_; - typename ParamGenerator::iterator current2_; - const typename ParamGenerator::iterator begin3_; - const typename ParamGenerator::iterator end3_; - typename ParamGenerator::iterator current3_; - const typename ParamGenerator::iterator begin4_; - const typename ParamGenerator::iterator end4_; - typename ParamGenerator::iterator current4_; - const typename ParamGenerator::iterator begin5_; - const typename ParamGenerator::iterator end5_; - typename ParamGenerator::iterator current5_; - const typename ParamGenerator::iterator begin6_; - const typename ParamGenerator::iterator end6_; - typename ParamGenerator::iterator current6_; - const typename ParamGenerator::iterator begin7_; - const typename ParamGenerator::iterator end7_; - typename ParamGenerator::iterator current7_; - linked_ptr current_value_; - }; // class CartesianProductGenerator7::Iterator - - // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator7& other); - - const ParamGenerator g1_; - const ParamGenerator g2_; - const ParamGenerator g3_; - const ParamGenerator g4_; - const ParamGenerator g5_; - const ParamGenerator g6_; - const ParamGenerator g7_; -}; // class CartesianProductGenerator7 - - -template -class CartesianProductGenerator8 - : public ParamGeneratorInterface< ::testing::tuple > { - public: - typedef ::testing::tuple ParamType; - - CartesianProductGenerator8(const ParamGenerator& g1, - const ParamGenerator& g2, const ParamGenerator& g3, - const ParamGenerator& g4, const ParamGenerator& g5, - const ParamGenerator& g6, const ParamGenerator& g7, - const ParamGenerator& g8) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), - g8_(g8) {} - virtual ~CartesianProductGenerator8() {} - - virtual ParamIteratorInterface* Begin() const { - return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, - g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_, - g7_.begin(), g8_, g8_.begin()); - } - virtual ParamIteratorInterface* End() const { - return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), - g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end(), g8_, - g8_.end()); - } - - private: - class Iterator : public ParamIteratorInterface { - public: - Iterator(const ParamGeneratorInterface* base, - const ParamGenerator& g1, - const typename ParamGenerator::iterator& current1, - const ParamGenerator& g2, - const typename ParamGenerator::iterator& current2, - const ParamGenerator& g3, - const typename ParamGenerator::iterator& current3, - const ParamGenerator& g4, - const typename ParamGenerator::iterator& current4, - const ParamGenerator& g5, - const typename ParamGenerator::iterator& current5, - const ParamGenerator& g6, - const typename ParamGenerator::iterator& current6, - const ParamGenerator& g7, - const typename ParamGenerator::iterator& current7, - const ParamGenerator& g8, - const typename ParamGenerator::iterator& current8) - : base_(base), - begin1_(g1.begin()), end1_(g1.end()), current1_(current1), - begin2_(g2.begin()), end2_(g2.end()), current2_(current2), - begin3_(g3.begin()), end3_(g3.end()), current3_(current3), - begin4_(g4.begin()), end4_(g4.end()), current4_(current4), - begin5_(g5.begin()), end5_(g5.end()), current5_(current5), - begin6_(g6.begin()), end6_(g6.end()), current6_(current6), - begin7_(g7.begin()), end7_(g7.end()), current7_(current7), - begin8_(g8.begin()), end8_(g8.end()), current8_(current8) { - ComputeCurrentValue(); - } - virtual ~Iterator() {} - - virtual const ParamGeneratorInterface* BaseGenerator() const { - return base_; - } - // Advance should not be called on beyond-of-range iterators - // so no component iterators must be beyond end of range, either. - virtual void Advance() { - assert(!AtEnd()); - ++current8_; - if (current8_ == end8_) { - current8_ = begin8_; - ++current7_; - } - if (current7_ == end7_) { - current7_ = begin7_; - ++current6_; - } - if (current6_ == end6_) { - current6_ = begin6_; - ++current5_; - } - if (current5_ == end5_) { - current5_ = begin5_; - ++current4_; - } - if (current4_ == end4_) { - current4_ = begin4_; - ++current3_; - } - if (current3_ == end3_) { - current3_ = begin3_; - ++current2_; - } - if (current2_ == end2_) { - current2_ = begin2_; - ++current1_; - } - ComputeCurrentValue(); - } - virtual ParamIteratorInterface* Clone() const { - return new Iterator(*this); - } - virtual const ParamType* Current() const { return current_value_.get(); } - virtual bool Equals(const ParamIteratorInterface& other) const { - // Having the same base generator guarantees that the other - // iterator is of the same type and we can downcast. - GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) - << "The program attempted to compare iterators " - << "from different generators." << std::endl; - const Iterator* typed_other = - CheckedDowncastToActualType(&other); - // We must report iterators equal if they both point beyond their - // respective ranges. That can happen in a variety of fashions, - // so we have to consult AtEnd(). - return (AtEnd() && typed_other->AtEnd()) || - ( - current1_ == typed_other->current1_ && - current2_ == typed_other->current2_ && - current3_ == typed_other->current3_ && - current4_ == typed_other->current4_ && - current5_ == typed_other->current5_ && - current6_ == typed_other->current6_ && - current7_ == typed_other->current7_ && - current8_ == typed_other->current8_); - } - - private: - Iterator(const Iterator& other) - : base_(other.base_), - begin1_(other.begin1_), - end1_(other.end1_), - current1_(other.current1_), - begin2_(other.begin2_), - end2_(other.end2_), - current2_(other.current2_), - begin3_(other.begin3_), - end3_(other.end3_), - current3_(other.current3_), - begin4_(other.begin4_), - end4_(other.end4_), - current4_(other.current4_), - begin5_(other.begin5_), - end5_(other.end5_), - current5_(other.current5_), - begin6_(other.begin6_), - end6_(other.end6_), - current6_(other.current6_), - begin7_(other.begin7_), - end7_(other.end7_), - current7_(other.current7_), - begin8_(other.begin8_), - end8_(other.end8_), - current8_(other.current8_) { - ComputeCurrentValue(); - } - - void ComputeCurrentValue() { - if (!AtEnd()) - current_value_.reset(new ParamType(*current1_, *current2_, *current3_, - *current4_, *current5_, *current6_, *current7_, *current8_)); - } - bool AtEnd() const { - // We must report iterator past the end of the range when either of the - // component iterators has reached the end of its range. - return - current1_ == end1_ || - current2_ == end2_ || - current3_ == end3_ || - current4_ == end4_ || - current5_ == end5_ || - current6_ == end6_ || - current7_ == end7_ || - current8_ == end8_; - } - - // No implementation - assignment is unsupported. - void operator=(const Iterator& other); - - const ParamGeneratorInterface* const base_; - // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. - // current[i]_ is the actual traversing iterator. - const typename ParamGenerator::iterator begin1_; - const typename ParamGenerator::iterator end1_; - typename ParamGenerator::iterator current1_; - const typename ParamGenerator::iterator begin2_; - const typename ParamGenerator::iterator end2_; - typename ParamGenerator::iterator current2_; - const typename ParamGenerator::iterator begin3_; - const typename ParamGenerator::iterator end3_; - typename ParamGenerator::iterator current3_; - const typename ParamGenerator::iterator begin4_; - const typename ParamGenerator::iterator end4_; - typename ParamGenerator::iterator current4_; - const typename ParamGenerator::iterator begin5_; - const typename ParamGenerator::iterator end5_; - typename ParamGenerator::iterator current5_; - const typename ParamGenerator::iterator begin6_; - const typename ParamGenerator::iterator end6_; - typename ParamGenerator::iterator current6_; - const typename ParamGenerator::iterator begin7_; - const typename ParamGenerator::iterator end7_; - typename ParamGenerator::iterator current7_; - const typename ParamGenerator::iterator begin8_; - const typename ParamGenerator::iterator end8_; - typename ParamGenerator::iterator current8_; - linked_ptr current_value_; - }; // class CartesianProductGenerator8::Iterator - - // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator8& other); - - const ParamGenerator g1_; - const ParamGenerator g2_; - const ParamGenerator g3_; - const ParamGenerator g4_; - const ParamGenerator g5_; - const ParamGenerator g6_; - const ParamGenerator g7_; - const ParamGenerator g8_; -}; // class CartesianProductGenerator8 - - -template -class CartesianProductGenerator9 - : public ParamGeneratorInterface< ::testing::tuple > { - public: - typedef ::testing::tuple ParamType; - - CartesianProductGenerator9(const ParamGenerator& g1, - const ParamGenerator& g2, const ParamGenerator& g3, - const ParamGenerator& g4, const ParamGenerator& g5, - const ParamGenerator& g6, const ParamGenerator& g7, - const ParamGenerator& g8, const ParamGenerator& g9) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8), - g9_(g9) {} - virtual ~CartesianProductGenerator9() {} - - virtual ParamIteratorInterface* Begin() const { - return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, - g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_, - g7_.begin(), g8_, g8_.begin(), g9_, g9_.begin()); - } - virtual ParamIteratorInterface* End() const { - return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), - g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end(), g8_, - g8_.end(), g9_, g9_.end()); - } - - private: - class Iterator : public ParamIteratorInterface { - public: - Iterator(const ParamGeneratorInterface* base, - const ParamGenerator& g1, - const typename ParamGenerator::iterator& current1, - const ParamGenerator& g2, - const typename ParamGenerator::iterator& current2, - const ParamGenerator& g3, - const typename ParamGenerator::iterator& current3, - const ParamGenerator& g4, - const typename ParamGenerator::iterator& current4, - const ParamGenerator& g5, - const typename ParamGenerator::iterator& current5, - const ParamGenerator& g6, - const typename ParamGenerator::iterator& current6, - const ParamGenerator& g7, - const typename ParamGenerator::iterator& current7, - const ParamGenerator& g8, - const typename ParamGenerator::iterator& current8, - const ParamGenerator& g9, - const typename ParamGenerator::iterator& current9) - : base_(base), - begin1_(g1.begin()), end1_(g1.end()), current1_(current1), - begin2_(g2.begin()), end2_(g2.end()), current2_(current2), - begin3_(g3.begin()), end3_(g3.end()), current3_(current3), - begin4_(g4.begin()), end4_(g4.end()), current4_(current4), - begin5_(g5.begin()), end5_(g5.end()), current5_(current5), - begin6_(g6.begin()), end6_(g6.end()), current6_(current6), - begin7_(g7.begin()), end7_(g7.end()), current7_(current7), - begin8_(g8.begin()), end8_(g8.end()), current8_(current8), - begin9_(g9.begin()), end9_(g9.end()), current9_(current9) { - ComputeCurrentValue(); - } - virtual ~Iterator() {} - - virtual const ParamGeneratorInterface* BaseGenerator() const { - return base_; - } - // Advance should not be called on beyond-of-range iterators - // so no component iterators must be beyond end of range, either. - virtual void Advance() { - assert(!AtEnd()); - ++current9_; - if (current9_ == end9_) { - current9_ = begin9_; - ++current8_; - } - if (current8_ == end8_) { - current8_ = begin8_; - ++current7_; - } - if (current7_ == end7_) { - current7_ = begin7_; - ++current6_; - } - if (current6_ == end6_) { - current6_ = begin6_; - ++current5_; - } - if (current5_ == end5_) { - current5_ = begin5_; - ++current4_; - } - if (current4_ == end4_) { - current4_ = begin4_; - ++current3_; - } - if (current3_ == end3_) { - current3_ = begin3_; - ++current2_; - } - if (current2_ == end2_) { - current2_ = begin2_; - ++current1_; - } - ComputeCurrentValue(); - } - virtual ParamIteratorInterface* Clone() const { - return new Iterator(*this); - } - virtual const ParamType* Current() const { return current_value_.get(); } - virtual bool Equals(const ParamIteratorInterface& other) const { - // Having the same base generator guarantees that the other - // iterator is of the same type and we can downcast. - GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) - << "The program attempted to compare iterators " - << "from different generators." << std::endl; - const Iterator* typed_other = - CheckedDowncastToActualType(&other); - // We must report iterators equal if they both point beyond their - // respective ranges. That can happen in a variety of fashions, - // so we have to consult AtEnd(). - return (AtEnd() && typed_other->AtEnd()) || - ( - current1_ == typed_other->current1_ && - current2_ == typed_other->current2_ && - current3_ == typed_other->current3_ && - current4_ == typed_other->current4_ && - current5_ == typed_other->current5_ && - current6_ == typed_other->current6_ && - current7_ == typed_other->current7_ && - current8_ == typed_other->current8_ && - current9_ == typed_other->current9_); - } - - private: - Iterator(const Iterator& other) - : base_(other.base_), - begin1_(other.begin1_), - end1_(other.end1_), - current1_(other.current1_), - begin2_(other.begin2_), - end2_(other.end2_), - current2_(other.current2_), - begin3_(other.begin3_), - end3_(other.end3_), - current3_(other.current3_), - begin4_(other.begin4_), - end4_(other.end4_), - current4_(other.current4_), - begin5_(other.begin5_), - end5_(other.end5_), - current5_(other.current5_), - begin6_(other.begin6_), - end6_(other.end6_), - current6_(other.current6_), - begin7_(other.begin7_), - end7_(other.end7_), - current7_(other.current7_), - begin8_(other.begin8_), - end8_(other.end8_), - current8_(other.current8_), - begin9_(other.begin9_), - end9_(other.end9_), - current9_(other.current9_) { - ComputeCurrentValue(); - } - - void ComputeCurrentValue() { - if (!AtEnd()) - current_value_.reset(new ParamType(*current1_, *current2_, *current3_, - *current4_, *current5_, *current6_, *current7_, *current8_, - *current9_)); - } - bool AtEnd() const { - // We must report iterator past the end of the range when either of the - // component iterators has reached the end of its range. - return - current1_ == end1_ || - current2_ == end2_ || - current3_ == end3_ || - current4_ == end4_ || - current5_ == end5_ || - current6_ == end6_ || - current7_ == end7_ || - current8_ == end8_ || - current9_ == end9_; - } - - // No implementation - assignment is unsupported. - void operator=(const Iterator& other); - - const ParamGeneratorInterface* const base_; - // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. - // current[i]_ is the actual traversing iterator. - const typename ParamGenerator::iterator begin1_; - const typename ParamGenerator::iterator end1_; - typename ParamGenerator::iterator current1_; - const typename ParamGenerator::iterator begin2_; - const typename ParamGenerator::iterator end2_; - typename ParamGenerator::iterator current2_; - const typename ParamGenerator::iterator begin3_; - const typename ParamGenerator::iterator end3_; - typename ParamGenerator::iterator current3_; - const typename ParamGenerator::iterator begin4_; - const typename ParamGenerator::iterator end4_; - typename ParamGenerator::iterator current4_; - const typename ParamGenerator::iterator begin5_; - const typename ParamGenerator::iterator end5_; - typename ParamGenerator::iterator current5_; - const typename ParamGenerator::iterator begin6_; - const typename ParamGenerator::iterator end6_; - typename ParamGenerator::iterator current6_; - const typename ParamGenerator::iterator begin7_; - const typename ParamGenerator::iterator end7_; - typename ParamGenerator::iterator current7_; - const typename ParamGenerator::iterator begin8_; - const typename ParamGenerator::iterator end8_; - typename ParamGenerator::iterator current8_; - const typename ParamGenerator::iterator begin9_; - const typename ParamGenerator::iterator end9_; - typename ParamGenerator::iterator current9_; - linked_ptr current_value_; - }; // class CartesianProductGenerator9::Iterator - - // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator9& other); - - const ParamGenerator g1_; - const ParamGenerator g2_; - const ParamGenerator g3_; - const ParamGenerator g4_; - const ParamGenerator g5_; - const ParamGenerator g6_; - const ParamGenerator g7_; - const ParamGenerator g8_; - const ParamGenerator g9_; -}; // class CartesianProductGenerator9 - - -template -class CartesianProductGenerator10 - : public ParamGeneratorInterface< ::testing::tuple > { - public: - typedef ::testing::tuple ParamType; - - CartesianProductGenerator10(const ParamGenerator& g1, - const ParamGenerator& g2, const ParamGenerator& g3, - const ParamGenerator& g4, const ParamGenerator& g5, - const ParamGenerator& g6, const ParamGenerator& g7, - const ParamGenerator& g8, const ParamGenerator& g9, - const ParamGenerator& g10) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8), - g9_(g9), g10_(g10) {} - virtual ~CartesianProductGenerator10() {} - - virtual ParamIteratorInterface* Begin() const { - return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, - g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_, - g7_.begin(), g8_, g8_.begin(), g9_, g9_.begin(), g10_, g10_.begin()); - } - virtual ParamIteratorInterface* End() const { - return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), - g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end(), g8_, - g8_.end(), g9_, g9_.end(), g10_, g10_.end()); - } - - private: - class Iterator : public ParamIteratorInterface { - public: - Iterator(const ParamGeneratorInterface* base, - const ParamGenerator& g1, - const typename ParamGenerator::iterator& current1, - const ParamGenerator& g2, - const typename ParamGenerator::iterator& current2, - const ParamGenerator& g3, - const typename ParamGenerator::iterator& current3, - const ParamGenerator& g4, - const typename ParamGenerator::iterator& current4, - const ParamGenerator& g5, - const typename ParamGenerator::iterator& current5, - const ParamGenerator& g6, - const typename ParamGenerator::iterator& current6, - const ParamGenerator& g7, - const typename ParamGenerator::iterator& current7, - const ParamGenerator& g8, - const typename ParamGenerator::iterator& current8, - const ParamGenerator& g9, - const typename ParamGenerator::iterator& current9, - const ParamGenerator& g10, - const typename ParamGenerator::iterator& current10) - : base_(base), - begin1_(g1.begin()), end1_(g1.end()), current1_(current1), - begin2_(g2.begin()), end2_(g2.end()), current2_(current2), - begin3_(g3.begin()), end3_(g3.end()), current3_(current3), - begin4_(g4.begin()), end4_(g4.end()), current4_(current4), - begin5_(g5.begin()), end5_(g5.end()), current5_(current5), - begin6_(g6.begin()), end6_(g6.end()), current6_(current6), - begin7_(g7.begin()), end7_(g7.end()), current7_(current7), - begin8_(g8.begin()), end8_(g8.end()), current8_(current8), - begin9_(g9.begin()), end9_(g9.end()), current9_(current9), - begin10_(g10.begin()), end10_(g10.end()), current10_(current10) { - ComputeCurrentValue(); - } - virtual ~Iterator() {} - - virtual const ParamGeneratorInterface* BaseGenerator() const { - return base_; - } - // Advance should not be called on beyond-of-range iterators - // so no component iterators must be beyond end of range, either. - virtual void Advance() { - assert(!AtEnd()); - ++current10_; - if (current10_ == end10_) { - current10_ = begin10_; - ++current9_; - } - if (current9_ == end9_) { - current9_ = begin9_; - ++current8_; - } - if (current8_ == end8_) { - current8_ = begin8_; - ++current7_; - } - if (current7_ == end7_) { - current7_ = begin7_; - ++current6_; - } - if (current6_ == end6_) { - current6_ = begin6_; - ++current5_; - } - if (current5_ == end5_) { - current5_ = begin5_; - ++current4_; - } - if (current4_ == end4_) { - current4_ = begin4_; - ++current3_; - } - if (current3_ == end3_) { - current3_ = begin3_; - ++current2_; - } - if (current2_ == end2_) { - current2_ = begin2_; - ++current1_; - } - ComputeCurrentValue(); - } - virtual ParamIteratorInterface* Clone() const { - return new Iterator(*this); - } - virtual const ParamType* Current() const { return current_value_.get(); } - virtual bool Equals(const ParamIteratorInterface& other) const { - // Having the same base generator guarantees that the other - // iterator is of the same type and we can downcast. - GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) - << "The program attempted to compare iterators " - << "from different generators." << std::endl; - const Iterator* typed_other = - CheckedDowncastToActualType(&other); - // We must report iterators equal if they both point beyond their - // respective ranges. That can happen in a variety of fashions, - // so we have to consult AtEnd(). - return (AtEnd() && typed_other->AtEnd()) || - ( - current1_ == typed_other->current1_ && - current2_ == typed_other->current2_ && - current3_ == typed_other->current3_ && - current4_ == typed_other->current4_ && - current5_ == typed_other->current5_ && - current6_ == typed_other->current6_ && - current7_ == typed_other->current7_ && - current8_ == typed_other->current8_ && - current9_ == typed_other->current9_ && - current10_ == typed_other->current10_); - } - - private: - Iterator(const Iterator& other) - : base_(other.base_), - begin1_(other.begin1_), - end1_(other.end1_), - current1_(other.current1_), - begin2_(other.begin2_), - end2_(other.end2_), - current2_(other.current2_), - begin3_(other.begin3_), - end3_(other.end3_), - current3_(other.current3_), - begin4_(other.begin4_), - end4_(other.end4_), - current4_(other.current4_), - begin5_(other.begin5_), - end5_(other.end5_), - current5_(other.current5_), - begin6_(other.begin6_), - end6_(other.end6_), - current6_(other.current6_), - begin7_(other.begin7_), - end7_(other.end7_), - current7_(other.current7_), - begin8_(other.begin8_), - end8_(other.end8_), - current8_(other.current8_), - begin9_(other.begin9_), - end9_(other.end9_), - current9_(other.current9_), - begin10_(other.begin10_), - end10_(other.end10_), - current10_(other.current10_) { - ComputeCurrentValue(); - } - - void ComputeCurrentValue() { - if (!AtEnd()) - current_value_.reset(new ParamType(*current1_, *current2_, *current3_, - *current4_, *current5_, *current6_, *current7_, *current8_, - *current9_, *current10_)); - } - bool AtEnd() const { - // We must report iterator past the end of the range when either of the - // component iterators has reached the end of its range. - return - current1_ == end1_ || - current2_ == end2_ || - current3_ == end3_ || - current4_ == end4_ || - current5_ == end5_ || - current6_ == end6_ || - current7_ == end7_ || - current8_ == end8_ || - current9_ == end9_ || - current10_ == end10_; - } - - // No implementation - assignment is unsupported. - void operator=(const Iterator& other); - - const ParamGeneratorInterface* const base_; - // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. - // current[i]_ is the actual traversing iterator. - const typename ParamGenerator::iterator begin1_; - const typename ParamGenerator::iterator end1_; - typename ParamGenerator::iterator current1_; - const typename ParamGenerator::iterator begin2_; - const typename ParamGenerator::iterator end2_; - typename ParamGenerator::iterator current2_; - const typename ParamGenerator::iterator begin3_; - const typename ParamGenerator::iterator end3_; - typename ParamGenerator::iterator current3_; - const typename ParamGenerator::iterator begin4_; - const typename ParamGenerator::iterator end4_; - typename ParamGenerator::iterator current4_; - const typename ParamGenerator::iterator begin5_; - const typename ParamGenerator::iterator end5_; - typename ParamGenerator::iterator current5_; - const typename ParamGenerator::iterator begin6_; - const typename ParamGenerator::iterator end6_; - typename ParamGenerator::iterator current6_; - const typename ParamGenerator::iterator begin7_; - const typename ParamGenerator::iterator end7_; - typename ParamGenerator::iterator current7_; - const typename ParamGenerator::iterator begin8_; - const typename ParamGenerator::iterator end8_; - typename ParamGenerator::iterator current8_; - const typename ParamGenerator::iterator begin9_; - const typename ParamGenerator::iterator end9_; - typename ParamGenerator::iterator current9_; - const typename ParamGenerator::iterator begin10_; - const typename ParamGenerator::iterator end10_; - typename ParamGenerator::iterator current10_; - linked_ptr current_value_; - }; // class CartesianProductGenerator10::Iterator - - // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator10& other); - - const ParamGenerator g1_; - const ParamGenerator g2_; - const ParamGenerator g3_; - const ParamGenerator g4_; - const ParamGenerator g5_; - const ParamGenerator g6_; - const ParamGenerator g7_; - const ParamGenerator g8_; - const ParamGenerator g9_; - const ParamGenerator g10_; -}; // class CartesianProductGenerator10 - - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// Helper classes providing Combine() with polymorphic features. They allow -// casting CartesianProductGeneratorN to ParamGenerator if T is -// convertible to U. -// -template -class CartesianProductHolder2 { - public: -CartesianProductHolder2(const Generator1& g1, const Generator2& g2) - : g1_(g1), g2_(g2) {} - template - operator ParamGenerator< ::testing::tuple >() const { - return ParamGenerator< ::testing::tuple >( - new CartesianProductGenerator2( - static_cast >(g1_), - static_cast >(g2_))); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder2& other); - - const Generator1 g1_; - const Generator2 g2_; -}; // class CartesianProductHolder2 - -template -class CartesianProductHolder3 { - public: -CartesianProductHolder3(const Generator1& g1, const Generator2& g2, - const Generator3& g3) - : g1_(g1), g2_(g2), g3_(g3) {} - template - operator ParamGenerator< ::testing::tuple >() const { - return ParamGenerator< ::testing::tuple >( - new CartesianProductGenerator3( - static_cast >(g1_), - static_cast >(g2_), - static_cast >(g3_))); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder3& other); - - const Generator1 g1_; - const Generator2 g2_; - const Generator3 g3_; -}; // class CartesianProductHolder3 - -template -class CartesianProductHolder4 { - public: -CartesianProductHolder4(const Generator1& g1, const Generator2& g2, - const Generator3& g3, const Generator4& g4) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4) {} - template - operator ParamGenerator< ::testing::tuple >() const { - return ParamGenerator< ::testing::tuple >( - new CartesianProductGenerator4( - static_cast >(g1_), - static_cast >(g2_), - static_cast >(g3_), - static_cast >(g4_))); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder4& other); - - const Generator1 g1_; - const Generator2 g2_; - const Generator3 g3_; - const Generator4 g4_; -}; // class CartesianProductHolder4 - -template -class CartesianProductHolder5 { - public: -CartesianProductHolder5(const Generator1& g1, const Generator2& g2, - const Generator3& g3, const Generator4& g4, const Generator5& g5) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5) {} - template - operator ParamGenerator< ::testing::tuple >() const { - return ParamGenerator< ::testing::tuple >( - new CartesianProductGenerator5( - static_cast >(g1_), - static_cast >(g2_), - static_cast >(g3_), - static_cast >(g4_), - static_cast >(g5_))); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder5& other); - - const Generator1 g1_; - const Generator2 g2_; - const Generator3 g3_; - const Generator4 g4_; - const Generator5 g5_; -}; // class CartesianProductHolder5 - -template -class CartesianProductHolder6 { - public: -CartesianProductHolder6(const Generator1& g1, const Generator2& g2, - const Generator3& g3, const Generator4& g4, const Generator5& g5, - const Generator6& g6) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6) {} - template - operator ParamGenerator< ::testing::tuple >() const { - return ParamGenerator< ::testing::tuple >( - new CartesianProductGenerator6( - static_cast >(g1_), - static_cast >(g2_), - static_cast >(g3_), - static_cast >(g4_), - static_cast >(g5_), - static_cast >(g6_))); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder6& other); - - const Generator1 g1_; - const Generator2 g2_; - const Generator3 g3_; - const Generator4 g4_; - const Generator5 g5_; - const Generator6 g6_; -}; // class CartesianProductHolder6 - -template -class CartesianProductHolder7 { - public: -CartesianProductHolder7(const Generator1& g1, const Generator2& g2, - const Generator3& g3, const Generator4& g4, const Generator5& g5, - const Generator6& g6, const Generator7& g7) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7) {} - template - operator ParamGenerator< ::testing::tuple >() const { - return ParamGenerator< ::testing::tuple >( - new CartesianProductGenerator7( - static_cast >(g1_), - static_cast >(g2_), - static_cast >(g3_), - static_cast >(g4_), - static_cast >(g5_), - static_cast >(g6_), - static_cast >(g7_))); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder7& other); - - const Generator1 g1_; - const Generator2 g2_; - const Generator3 g3_; - const Generator4 g4_; - const Generator5 g5_; - const Generator6 g6_; - const Generator7 g7_; -}; // class CartesianProductHolder7 - -template -class CartesianProductHolder8 { - public: -CartesianProductHolder8(const Generator1& g1, const Generator2& g2, - const Generator3& g3, const Generator4& g4, const Generator5& g5, - const Generator6& g6, const Generator7& g7, const Generator8& g8) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), - g8_(g8) {} - template - operator ParamGenerator< ::testing::tuple >() const { - return ParamGenerator< ::testing::tuple >( - new CartesianProductGenerator8( - static_cast >(g1_), - static_cast >(g2_), - static_cast >(g3_), - static_cast >(g4_), - static_cast >(g5_), - static_cast >(g6_), - static_cast >(g7_), - static_cast >(g8_))); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder8& other); - - const Generator1 g1_; - const Generator2 g2_; - const Generator3 g3_; - const Generator4 g4_; - const Generator5 g5_; - const Generator6 g6_; - const Generator7 g7_; - const Generator8 g8_; -}; // class CartesianProductHolder8 - -template -class CartesianProductHolder9 { - public: -CartesianProductHolder9(const Generator1& g1, const Generator2& g2, - const Generator3& g3, const Generator4& g4, const Generator5& g5, - const Generator6& g6, const Generator7& g7, const Generator8& g8, - const Generator9& g9) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8), - g9_(g9) {} - template - operator ParamGenerator< ::testing::tuple >() const { - return ParamGenerator< ::testing::tuple >( - new CartesianProductGenerator9( - static_cast >(g1_), - static_cast >(g2_), - static_cast >(g3_), - static_cast >(g4_), - static_cast >(g5_), - static_cast >(g6_), - static_cast >(g7_), - static_cast >(g8_), - static_cast >(g9_))); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder9& other); - - const Generator1 g1_; - const Generator2 g2_; - const Generator3 g3_; - const Generator4 g4_; - const Generator5 g5_; - const Generator6 g6_; - const Generator7 g7_; - const Generator8 g8_; - const Generator9 g9_; -}; // class CartesianProductHolder9 - -template -class CartesianProductHolder10 { - public: -CartesianProductHolder10(const Generator1& g1, const Generator2& g2, - const Generator3& g3, const Generator4& g4, const Generator5& g5, - const Generator6& g6, const Generator7& g7, const Generator8& g8, - const Generator9& g9, const Generator10& g10) - : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8), - g9_(g9), g10_(g10) {} - template - operator ParamGenerator< ::testing::tuple >() const { - return ParamGenerator< ::testing::tuple >( - new CartesianProductGenerator10( - static_cast >(g1_), - static_cast >(g2_), - static_cast >(g3_), - static_cast >(g4_), - static_cast >(g5_), - static_cast >(g6_), - static_cast >(g7_), - static_cast >(g8_), - static_cast >(g9_), - static_cast >(g10_))); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder10& other); - - const Generator1 g1_; - const Generator2 g2_; - const Generator3 g3_; - const Generator4 g4_; - const Generator5 g5_; - const Generator6 g6_; - const Generator7 g7_; - const Generator8 g8_; - const Generator9 g9_; - const Generator10 g10_; -}; // class CartesianProductHolder10 - -# endif // GTEST_HAS_COMBINE - -} // namespace internal -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h.pump b/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h.pump deleted file mode 100644 index d65086a01e..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h.pump +++ /dev/null @@ -1,279 +0,0 @@ -$$ -*- mode: c++; -*- -$var n = 50 $$ Maximum length of Values arguments we want to support. -$var maxtuple = 10 $$ Maximum number of Combine arguments we want to support. -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vladl@google.com (Vlad Losev) - -// Type and function utilities for implementing parameterized tests. -// This file is generated by a SCRIPT. DO NOT EDIT BY HAND! -// -// Currently Google Test supports at most $n arguments in Values, -// and at most $maxtuple arguments in Combine. Please contact -// googletestframework@googlegroups.com if you need more. -// Please note that the number of arguments to Combine is limited -// by the maximum arity of the implementation of tuple which is -// currently set at $maxtuple. - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ - -#include "gtest/internal/gtest-param-util.h" -#include "gtest/internal/gtest-port.h" - -namespace testing { - -// Forward declarations of ValuesIn(), which is implemented in -// include/gtest/gtest-param-test.h. -template -internal::ParamGenerator< - typename ::testing::internal::IteratorTraits::value_type> -ValuesIn(ForwardIterator begin, ForwardIterator end); - -template -internal::ParamGenerator ValuesIn(const T (&array)[N]); - -template -internal::ParamGenerator ValuesIn( - const Container& container); - -namespace internal { - -// Used in the Values() function to provide polymorphic capabilities. -$range i 1..n -$for i [[ -$range j 1..i - -template <$for j, [[typename T$j]]> -class ValueArray$i { - public: - $if i==1 [[explicit ]]ValueArray$i($for j, [[T$j v$j]]) : $for j, [[v$(j)_(v$j)]] {} - - template - operator ParamGenerator() const { - const T array[] = {$for j, [[static_cast(v$(j)_)]]}; - return ValuesIn(array); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const ValueArray$i& other); - -$for j [[ - - const T$j v$(j)_; -]] - -}; - -]] - -# if GTEST_HAS_COMBINE -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// Generates values from the Cartesian product of values produced -// by the argument generators. -// -$range i 2..maxtuple -$for i [[ -$range j 1..i -$range k 2..i - -template <$for j, [[typename T$j]]> -class CartesianProductGenerator$i - : public ParamGeneratorInterface< ::testing::tuple<$for j, [[T$j]]> > { - public: - typedef ::testing::tuple<$for j, [[T$j]]> ParamType; - - CartesianProductGenerator$i($for j, [[const ParamGenerator& g$j]]) - : $for j, [[g$(j)_(g$j)]] {} - virtual ~CartesianProductGenerator$i() {} - - virtual ParamIteratorInterface* Begin() const { - return new Iterator(this, $for j, [[g$(j)_, g$(j)_.begin()]]); - } - virtual ParamIteratorInterface* End() const { - return new Iterator(this, $for j, [[g$(j)_, g$(j)_.end()]]); - } - - private: - class Iterator : public ParamIteratorInterface { - public: - Iterator(const ParamGeneratorInterface* base, $for j, [[ - - const ParamGenerator& g$j, - const typename ParamGenerator::iterator& current$(j)]]) - : base_(base), -$for j, [[ - - begin$(j)_(g$j.begin()), end$(j)_(g$j.end()), current$(j)_(current$j) -]] { - ComputeCurrentValue(); - } - virtual ~Iterator() {} - - virtual const ParamGeneratorInterface* BaseGenerator() const { - return base_; - } - // Advance should not be called on beyond-of-range iterators - // so no component iterators must be beyond end of range, either. - virtual void Advance() { - assert(!AtEnd()); - ++current$(i)_; - -$for k [[ - if (current$(i+2-k)_ == end$(i+2-k)_) { - current$(i+2-k)_ = begin$(i+2-k)_; - ++current$(i+2-k-1)_; - } - -]] - ComputeCurrentValue(); - } - virtual ParamIteratorInterface* Clone() const { - return new Iterator(*this); - } - virtual const ParamType* Current() const { return current_value_.get(); } - virtual bool Equals(const ParamIteratorInterface& other) const { - // Having the same base generator guarantees that the other - // iterator is of the same type and we can downcast. - GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) - << "The program attempted to compare iterators " - << "from different generators." << std::endl; - const Iterator* typed_other = - CheckedDowncastToActualType(&other); - // We must report iterators equal if they both point beyond their - // respective ranges. That can happen in a variety of fashions, - // so we have to consult AtEnd(). - return (AtEnd() && typed_other->AtEnd()) || - ($for j && [[ - - current$(j)_ == typed_other->current$(j)_ -]]); - } - - private: - Iterator(const Iterator& other) - : base_(other.base_), $for j, [[ - - begin$(j)_(other.begin$(j)_), - end$(j)_(other.end$(j)_), - current$(j)_(other.current$(j)_) -]] { - ComputeCurrentValue(); - } - - void ComputeCurrentValue() { - if (!AtEnd()) - current_value_.reset(new ParamType($for j, [[*current$(j)_]])); - } - bool AtEnd() const { - // We must report iterator past the end of the range when either of the - // component iterators has reached the end of its range. - return -$for j || [[ - - current$(j)_ == end$(j)_ -]]; - } - - // No implementation - assignment is unsupported. - void operator=(const Iterator& other); - - const ParamGeneratorInterface* const base_; - // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. - // current[i]_ is the actual traversing iterator. -$for j [[ - - const typename ParamGenerator::iterator begin$(j)_; - const typename ParamGenerator::iterator end$(j)_; - typename ParamGenerator::iterator current$(j)_; -]] - - linked_ptr current_value_; - }; // class CartesianProductGenerator$i::Iterator - - // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator$i& other); - - -$for j [[ - const ParamGenerator g$(j)_; - -]] -}; // class CartesianProductGenerator$i - - -]] - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// Helper classes providing Combine() with polymorphic features. They allow -// casting CartesianProductGeneratorN to ParamGenerator if T is -// convertible to U. -// -$range i 2..maxtuple -$for i [[ -$range j 1..i - -template <$for j, [[class Generator$j]]> -class CartesianProductHolder$i { - public: -CartesianProductHolder$i($for j, [[const Generator$j& g$j]]) - : $for j, [[g$(j)_(g$j)]] {} - template <$for j, [[typename T$j]]> - operator ParamGenerator< ::testing::tuple<$for j, [[T$j]]> >() const { - return ParamGenerator< ::testing::tuple<$for j, [[T$j]]> >( - new CartesianProductGenerator$i<$for j, [[T$j]]>( -$for j,[[ - - static_cast >(g$(j)_) -]])); - } - - private: - // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder$i& other); - - -$for j [[ - const Generator$j g$(j)_; - -]] -}; // class CartesianProductHolder$i - -]] - -# endif // GTEST_HAS_COMBINE - -} // namespace internal -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util.h b/test/gtest-1.8.0/include/gtest/internal/gtest-param-util.h deleted file mode 100644 index 3c80863cde..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util.h +++ /dev/null @@ -1,723 +0,0 @@ -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vladl@google.com (Vlad Losev) - -// Type and function utilities for implementing parameterized tests. - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_ - -#include - -#include -#include -#include -#include - -#include "gtest/internal/gtest-internal.h" -#include "gtest/internal/gtest-linked_ptr.h" -#include "gtest/internal/gtest-port.h" -#include "gtest/gtest-printers.h" - -namespace testing { - -// Input to a parameterized test name generator, describing a test parameter. -// Consists of the parameter value and the integer parameter index. -template -struct TestParamInfo { - TestParamInfo(const ParamType& a_param, size_t an_index) : - param(a_param), - index(an_index) {} - ParamType param; - size_t index; -}; - -// A builtin parameterized test name generator which returns the result of -// testing::PrintToString. -struct PrintToStringParamName { - template - std::string operator()(const TestParamInfo& info) const { - return PrintToString(info.param); - } -}; - -namespace internal { - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// Outputs a message explaining invalid registration of different -// fixture class for the same test case. This may happen when -// TEST_P macro is used to define two tests with the same name -// but in different namespaces. -GTEST_API_ void ReportInvalidTestCaseType(const char* test_case_name, - CodeLocation code_location); - -template class ParamGeneratorInterface; -template class ParamGenerator; - -// Interface for iterating over elements provided by an implementation -// of ParamGeneratorInterface. -template -class ParamIteratorInterface { - public: - virtual ~ParamIteratorInterface() {} - // A pointer to the base generator instance. - // Used only for the purposes of iterator comparison - // to make sure that two iterators belong to the same generator. - virtual const ParamGeneratorInterface* BaseGenerator() const = 0; - // Advances iterator to point to the next element - // provided by the generator. The caller is responsible - // for not calling Advance() on an iterator equal to - // BaseGenerator()->End(). - virtual void Advance() = 0; - // Clones the iterator object. Used for implementing copy semantics - // of ParamIterator. - virtual ParamIteratorInterface* Clone() const = 0; - // Dereferences the current iterator and provides (read-only) access - // to the pointed value. It is the caller's responsibility not to call - // Current() on an iterator equal to BaseGenerator()->End(). - // Used for implementing ParamGenerator::operator*(). - virtual const T* Current() const = 0; - // Determines whether the given iterator and other point to the same - // element in the sequence generated by the generator. - // Used for implementing ParamGenerator::operator==(). - virtual bool Equals(const ParamIteratorInterface& other) const = 0; -}; - -// Class iterating over elements provided by an implementation of -// ParamGeneratorInterface. It wraps ParamIteratorInterface -// and implements the const forward iterator concept. -template -class ParamIterator { - public: - typedef T value_type; - typedef const T& reference; - typedef ptrdiff_t difference_type; - - // ParamIterator assumes ownership of the impl_ pointer. - ParamIterator(const ParamIterator& other) : impl_(other.impl_->Clone()) {} - ParamIterator& operator=(const ParamIterator& other) { - if (this != &other) - impl_.reset(other.impl_->Clone()); - return *this; - } - - const T& operator*() const { return *impl_->Current(); } - const T* operator->() const { return impl_->Current(); } - // Prefix version of operator++. - ParamIterator& operator++() { - impl_->Advance(); - return *this; - } - // Postfix version of operator++. - ParamIterator operator++(int /*unused*/) { - ParamIteratorInterface* clone = impl_->Clone(); - impl_->Advance(); - return ParamIterator(clone); - } - bool operator==(const ParamIterator& other) const { - return impl_.get() == other.impl_.get() || impl_->Equals(*other.impl_); - } - bool operator!=(const ParamIterator& other) const { - return !(*this == other); - } - - private: - friend class ParamGenerator; - explicit ParamIterator(ParamIteratorInterface* impl) : impl_(impl) {} - scoped_ptr > impl_; -}; - -// ParamGeneratorInterface is the binary interface to access generators -// defined in other translation units. -template -class ParamGeneratorInterface { - public: - typedef T ParamType; - - virtual ~ParamGeneratorInterface() {} - - // Generator interface definition - virtual ParamIteratorInterface* Begin() const = 0; - virtual ParamIteratorInterface* End() const = 0; -}; - -// Wraps ParamGeneratorInterface and provides general generator syntax -// compatible with the STL Container concept. -// This class implements copy initialization semantics and the contained -// ParamGeneratorInterface instance is shared among all copies -// of the original object. This is possible because that instance is immutable. -template -class ParamGenerator { - public: - typedef ParamIterator iterator; - - explicit ParamGenerator(ParamGeneratorInterface* impl) : impl_(impl) {} - ParamGenerator(const ParamGenerator& other) : impl_(other.impl_) {} - - ParamGenerator& operator=(const ParamGenerator& other) { - impl_ = other.impl_; - return *this; - } - - iterator begin() const { return iterator(impl_->Begin()); } - iterator end() const { return iterator(impl_->End()); } - - private: - linked_ptr > impl_; -}; - -// Generates values from a range of two comparable values. Can be used to -// generate sequences of user-defined types that implement operator+() and -// operator<(). -// This class is used in the Range() function. -template -class RangeGenerator : public ParamGeneratorInterface { - public: - RangeGenerator(T begin, T end, IncrementT step) - : begin_(begin), end_(end), - step_(step), end_index_(CalculateEndIndex(begin, end, step)) {} - virtual ~RangeGenerator() {} - - virtual ParamIteratorInterface* Begin() const { - return new Iterator(this, begin_, 0, step_); - } - virtual ParamIteratorInterface* End() const { - return new Iterator(this, end_, end_index_, step_); - } - - private: - class Iterator : public ParamIteratorInterface { - public: - Iterator(const ParamGeneratorInterface* base, T value, int index, - IncrementT step) - : base_(base), value_(value), index_(index), step_(step) {} - virtual ~Iterator() {} - - virtual const ParamGeneratorInterface* BaseGenerator() const { - return base_; - } - virtual void Advance() { - value_ = static_cast(value_ + step_); - index_++; - } - virtual ParamIteratorInterface* Clone() const { - return new Iterator(*this); - } - virtual const T* Current() const { return &value_; } - virtual bool Equals(const ParamIteratorInterface& other) const { - // Having the same base generator guarantees that the other - // iterator is of the same type and we can downcast. - GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) - << "The program attempted to compare iterators " - << "from different generators." << std::endl; - const int other_index = - CheckedDowncastToActualType(&other)->index_; - return index_ == other_index; - } - - private: - Iterator(const Iterator& other) - : ParamIteratorInterface(), - base_(other.base_), value_(other.value_), index_(other.index_), - step_(other.step_) {} - - // No implementation - assignment is unsupported. - void operator=(const Iterator& other); - - const ParamGeneratorInterface* const base_; - T value_; - int index_; - const IncrementT step_; - }; // class RangeGenerator::Iterator - - static int CalculateEndIndex(const T& begin, - const T& end, - const IncrementT& step) { - int end_index = 0; - for (T i = begin; i < end; i = static_cast(i + step)) - end_index++; - return end_index; - } - - // No implementation - assignment is unsupported. - void operator=(const RangeGenerator& other); - - const T begin_; - const T end_; - const IncrementT step_; - // The index for the end() iterator. All the elements in the generated - // sequence are indexed (0-based) to aid iterator comparison. - const int end_index_; -}; // class RangeGenerator - - -// Generates values from a pair of STL-style iterators. Used in the -// ValuesIn() function. The elements are copied from the source range -// since the source can be located on the stack, and the generator -// is likely to persist beyond that stack frame. -template -class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface { - public: - template - ValuesInIteratorRangeGenerator(ForwardIterator begin, ForwardIterator end) - : container_(begin, end) {} - virtual ~ValuesInIteratorRangeGenerator() {} - - virtual ParamIteratorInterface* Begin() const { - return new Iterator(this, container_.begin()); - } - virtual ParamIteratorInterface* End() const { - return new Iterator(this, container_.end()); - } - - private: - typedef typename ::std::vector ContainerType; - - class Iterator : public ParamIteratorInterface { - public: - Iterator(const ParamGeneratorInterface* base, - typename ContainerType::const_iterator iterator) - : base_(base), iterator_(iterator) {} - virtual ~Iterator() {} - - virtual const ParamGeneratorInterface* BaseGenerator() const { - return base_; - } - virtual void Advance() { - ++iterator_; - value_.reset(); - } - virtual ParamIteratorInterface* Clone() const { - return new Iterator(*this); - } - // We need to use cached value referenced by iterator_ because *iterator_ - // can return a temporary object (and of type other then T), so just - // having "return &*iterator_;" doesn't work. - // value_ is updated here and not in Advance() because Advance() - // can advance iterator_ beyond the end of the range, and we cannot - // detect that fact. The client code, on the other hand, is - // responsible for not calling Current() on an out-of-range iterator. - virtual const T* Current() const { - if (value_.get() == NULL) - value_.reset(new T(*iterator_)); - return value_.get(); - } - virtual bool Equals(const ParamIteratorInterface& other) const { - // Having the same base generator guarantees that the other - // iterator is of the same type and we can downcast. - GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) - << "The program attempted to compare iterators " - << "from different generators." << std::endl; - return iterator_ == - CheckedDowncastToActualType(&other)->iterator_; - } - - private: - Iterator(const Iterator& other) - // The explicit constructor call suppresses a false warning - // emitted by gcc when supplied with the -Wextra option. - : ParamIteratorInterface(), - base_(other.base_), - iterator_(other.iterator_) {} - - const ParamGeneratorInterface* const base_; - typename ContainerType::const_iterator iterator_; - // A cached value of *iterator_. We keep it here to allow access by - // pointer in the wrapping iterator's operator->(). - // value_ needs to be mutable to be accessed in Current(). - // Use of scoped_ptr helps manage cached value's lifetime, - // which is bound by the lifespan of the iterator itself. - mutable scoped_ptr value_; - }; // class ValuesInIteratorRangeGenerator::Iterator - - // No implementation - assignment is unsupported. - void operator=(const ValuesInIteratorRangeGenerator& other); - - const ContainerType container_; -}; // class ValuesInIteratorRangeGenerator - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// Default parameterized test name generator, returns a string containing the -// integer test parameter index. -template -std::string DefaultParamName(const TestParamInfo& info) { - Message name_stream; - name_stream << info.index; - return name_stream.GetString(); -} - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// Parameterized test name overload helpers, which help the -// INSTANTIATE_TEST_CASE_P macro choose between the default parameterized -// test name generator and user param name generator. -template -ParamNameGenFunctor GetParamNameGen(ParamNameGenFunctor func) { - return func; -} - -template -struct ParamNameGenFunc { - typedef std::string Type(const TestParamInfo&); -}; - -template -typename ParamNameGenFunc::Type *GetParamNameGen() { - return DefaultParamName; -} - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// Stores a parameter value and later creates tests parameterized with that -// value. -template -class ParameterizedTestFactory : public TestFactoryBase { - public: - typedef typename TestClass::ParamType ParamType; - explicit ParameterizedTestFactory(ParamType parameter) : - parameter_(parameter) {} - virtual Test* CreateTest() { - TestClass::SetParam(¶meter_); - return new TestClass(); - } - - private: - const ParamType parameter_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestFactory); -}; - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// TestMetaFactoryBase is a base class for meta-factories that create -// test factories for passing into MakeAndRegisterTestInfo function. -template -class TestMetaFactoryBase { - public: - virtual ~TestMetaFactoryBase() {} - - virtual TestFactoryBase* CreateTestFactory(ParamType parameter) = 0; -}; - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// TestMetaFactory creates test factories for passing into -// MakeAndRegisterTestInfo function. Since MakeAndRegisterTestInfo receives -// ownership of test factory pointer, same factory object cannot be passed -// into that method twice. But ParameterizedTestCaseInfo is going to call -// it for each Test/Parameter value combination. Thus it needs meta factory -// creator class. -template -class TestMetaFactory - : public TestMetaFactoryBase { - public: - typedef typename TestCase::ParamType ParamType; - - TestMetaFactory() {} - - virtual TestFactoryBase* CreateTestFactory(ParamType parameter) { - return new ParameterizedTestFactory(parameter); - } - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(TestMetaFactory); -}; - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// ParameterizedTestCaseInfoBase is a generic interface -// to ParameterizedTestCaseInfo classes. ParameterizedTestCaseInfoBase -// accumulates test information provided by TEST_P macro invocations -// and generators provided by INSTANTIATE_TEST_CASE_P macro invocations -// and uses that information to register all resulting test instances -// in RegisterTests method. The ParameterizeTestCaseRegistry class holds -// a collection of pointers to the ParameterizedTestCaseInfo objects -// and calls RegisterTests() on each of them when asked. -class ParameterizedTestCaseInfoBase { - public: - virtual ~ParameterizedTestCaseInfoBase() {} - - // Base part of test case name for display purposes. - virtual const std::string& GetTestCaseName() const = 0; - // Test case id to verify identity. - virtual TypeId GetTestCaseTypeId() const = 0; - // UnitTest class invokes this method to register tests in this - // test case right before running them in RUN_ALL_TESTS macro. - // This method should not be called more then once on any single - // instance of a ParameterizedTestCaseInfoBase derived class. - virtual void RegisterTests() = 0; - - protected: - ParameterizedTestCaseInfoBase() {} - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestCaseInfoBase); -}; - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// ParameterizedTestCaseInfo accumulates tests obtained from TEST_P -// macro invocations for a particular test case and generators -// obtained from INSTANTIATE_TEST_CASE_P macro invocations for that -// test case. It registers tests with all values generated by all -// generators when asked. -template -class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase { - public: - // ParamType and GeneratorCreationFunc are private types but are required - // for declarations of public methods AddTestPattern() and - // AddTestCaseInstantiation(). - typedef typename TestCase::ParamType ParamType; - // A function that returns an instance of appropriate generator type. - typedef ParamGenerator(GeneratorCreationFunc)(); - typedef typename ParamNameGenFunc::Type ParamNameGeneratorFunc; - - explicit ParameterizedTestCaseInfo( - const char* name, CodeLocation code_location) - : test_case_name_(name), code_location_(code_location) {} - - // Test case base name for display purposes. - virtual const std::string& GetTestCaseName() const { return test_case_name_; } - // Test case id to verify identity. - virtual TypeId GetTestCaseTypeId() const { return GetTypeId(); } - // TEST_P macro uses AddTestPattern() to record information - // about a single test in a LocalTestInfo structure. - // test_case_name is the base name of the test case (without invocation - // prefix). test_base_name is the name of an individual test without - // parameter index. For the test SequenceA/FooTest.DoBar/1 FooTest is - // test case base name and DoBar is test base name. - void AddTestPattern(const char* test_case_name, - const char* test_base_name, - TestMetaFactoryBase* meta_factory) { - tests_.push_back(linked_ptr(new TestInfo(test_case_name, - test_base_name, - meta_factory))); - } - // INSTANTIATE_TEST_CASE_P macro uses AddGenerator() to record information - // about a generator. - int AddTestCaseInstantiation(const std::string& instantiation_name, - GeneratorCreationFunc* func, - ParamNameGeneratorFunc* name_func, - const char* file, int line) { - instantiations_.push_back( - InstantiationInfo(instantiation_name, func, name_func, file, line)); - return 0; // Return value used only to run this method in namespace scope. - } - // UnitTest class invokes this method to register tests in this test case - // test cases right before running tests in RUN_ALL_TESTS macro. - // This method should not be called more then once on any single - // instance of a ParameterizedTestCaseInfoBase derived class. - // UnitTest has a guard to prevent from calling this method more then once. - virtual void RegisterTests() { - for (typename TestInfoContainer::iterator test_it = tests_.begin(); - test_it != tests_.end(); ++test_it) { - linked_ptr test_info = *test_it; - for (typename InstantiationContainer::iterator gen_it = - instantiations_.begin(); gen_it != instantiations_.end(); - ++gen_it) { - const std::string& instantiation_name = gen_it->name; - ParamGenerator generator((*gen_it->generator)()); - ParamNameGeneratorFunc* name_func = gen_it->name_func; - const char* file = gen_it->file; - int line = gen_it->line; - - std::string test_case_name; - if ( !instantiation_name.empty() ) - test_case_name = instantiation_name + "/"; - test_case_name += test_info->test_case_base_name; - - size_t i = 0; - std::set test_param_names; - for (typename ParamGenerator::iterator param_it = - generator.begin(); - param_it != generator.end(); ++param_it, ++i) { - Message test_name_stream; - - std::string param_name = name_func( - TestParamInfo(*param_it, i)); - - GTEST_CHECK_(IsValidParamName(param_name)) - << "Parameterized test name '" << param_name - << "' is invalid, in " << file - << " line " << line << std::endl; - - GTEST_CHECK_(test_param_names.count(param_name) == 0) - << "Duplicate parameterized test name '" << param_name - << "', in " << file << " line " << line << std::endl; - - test_param_names.insert(param_name); - - test_name_stream << test_info->test_base_name << "/" << param_name; - MakeAndRegisterTestInfo( - test_case_name.c_str(), - test_name_stream.GetString().c_str(), - NULL, // No type parameter. - PrintToString(*param_it).c_str(), - code_location_, - GetTestCaseTypeId(), - TestCase::SetUpTestCase, - TestCase::TearDownTestCase, - test_info->test_meta_factory->CreateTestFactory(*param_it)); - } // for param_it - } // for gen_it - } // for test_it - } // RegisterTests - - private: - // LocalTestInfo structure keeps information about a single test registered - // with TEST_P macro. - struct TestInfo { - TestInfo(const char* a_test_case_base_name, - const char* a_test_base_name, - TestMetaFactoryBase* a_test_meta_factory) : - test_case_base_name(a_test_case_base_name), - test_base_name(a_test_base_name), - test_meta_factory(a_test_meta_factory) {} - - const std::string test_case_base_name; - const std::string test_base_name; - const scoped_ptr > test_meta_factory; - }; - typedef ::std::vector > TestInfoContainer; - // Records data received from INSTANTIATE_TEST_CASE_P macros: - // - struct InstantiationInfo { - InstantiationInfo(const std::string &name_in, - GeneratorCreationFunc* generator_in, - ParamNameGeneratorFunc* name_func_in, - const char* file_in, - int line_in) - : name(name_in), - generator(generator_in), - name_func(name_func_in), - file(file_in), - line(line_in) {} - - std::string name; - GeneratorCreationFunc* generator; - ParamNameGeneratorFunc* name_func; - const char* file; - int line; - }; - typedef ::std::vector InstantiationContainer; - - static bool IsValidParamName(const std::string& name) { - // Check for empty string - if (name.empty()) - return false; - - // Check for invalid characters - for (std::string::size_type index = 0; index < name.size(); ++index) { - if (!isalnum(name[index]) && name[index] != '_') - return false; - } - - return true; - } - - const std::string test_case_name_; - CodeLocation code_location_; - TestInfoContainer tests_; - InstantiationContainer instantiations_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestCaseInfo); -}; // class ParameterizedTestCaseInfo - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// ParameterizedTestCaseRegistry contains a map of ParameterizedTestCaseInfoBase -// classes accessed by test case names. TEST_P and INSTANTIATE_TEST_CASE_P -// macros use it to locate their corresponding ParameterizedTestCaseInfo -// descriptors. -class ParameterizedTestCaseRegistry { - public: - ParameterizedTestCaseRegistry() {} - ~ParameterizedTestCaseRegistry() { - for (TestCaseInfoContainer::iterator it = test_case_infos_.begin(); - it != test_case_infos_.end(); ++it) { - delete *it; - } - } - - // Looks up or creates and returns a structure containing information about - // tests and instantiations of a particular test case. - template - ParameterizedTestCaseInfo* GetTestCasePatternHolder( - const char* test_case_name, - CodeLocation code_location) { - ParameterizedTestCaseInfo* typed_test_info = NULL; - for (TestCaseInfoContainer::iterator it = test_case_infos_.begin(); - it != test_case_infos_.end(); ++it) { - if ((*it)->GetTestCaseName() == test_case_name) { - if ((*it)->GetTestCaseTypeId() != GetTypeId()) { - // Complain about incorrect usage of Google Test facilities - // and terminate the program since we cannot guaranty correct - // test case setup and tear-down in this case. - ReportInvalidTestCaseType(test_case_name, code_location); - posix::Abort(); - } else { - // At this point we are sure that the object we found is of the same - // type we are looking for, so we downcast it to that type - // without further checks. - typed_test_info = CheckedDowncastToActualType< - ParameterizedTestCaseInfo >(*it); - } - break; - } - } - if (typed_test_info == NULL) { - typed_test_info = new ParameterizedTestCaseInfo( - test_case_name, code_location); - test_case_infos_.push_back(typed_test_info); - } - return typed_test_info; - } - void RegisterTests() { - for (TestCaseInfoContainer::iterator it = test_case_infos_.begin(); - it != test_case_infos_.end(); ++it) { - (*it)->RegisterTests(); - } - } - - private: - typedef ::std::vector TestCaseInfoContainer; - - TestCaseInfoContainer test_case_infos_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestCaseRegistry); -}; - -} // namespace internal -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-port-arch.h b/test/gtest-1.8.0/include/gtest/internal/gtest-port-arch.h deleted file mode 100644 index f83700e06d..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-port-arch.h +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright 2015, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The Google C++ Testing and Mocking Framework (Google Test) -// -// This header file defines the GTEST_OS_* macro. -// It is separate from gtest-port.h so that custom/gtest-port.h can include it. - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_ - -// Determines the platform on which Google Test is compiled. -#ifdef __CYGWIN__ -# define GTEST_OS_CYGWIN 1 -#elif defined __SYMBIAN32__ -# define GTEST_OS_SYMBIAN 1 -#elif defined _WIN32 -# define GTEST_OS_WINDOWS 1 -# ifdef _WIN32_WCE -# define GTEST_OS_WINDOWS_MOBILE 1 -# elif defined(__MINGW__) || defined(__MINGW32__) -# define GTEST_OS_WINDOWS_MINGW 1 -# elif defined(WINAPI_FAMILY) -# include -# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -# define GTEST_OS_WINDOWS_DESKTOP 1 -# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) -# define GTEST_OS_WINDOWS_PHONE 1 -# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) -# define GTEST_OS_WINDOWS_RT 1 -# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_TV_TITLE) -# define GTEST_OS_WINDOWS_PHONE 1 -# define GTEST_OS_WINDOWS_TV_TITLE 1 -# else - // WINAPI_FAMILY defined but no known partition matched. - // Default to desktop. -# define GTEST_OS_WINDOWS_DESKTOP 1 -# endif -# else -# define GTEST_OS_WINDOWS_DESKTOP 1 -# endif // _WIN32_WCE -#elif defined __APPLE__ -# define GTEST_OS_MAC 1 -# if TARGET_OS_IPHONE -# define GTEST_OS_IOS 1 -# endif -#elif defined __FreeBSD__ -# define GTEST_OS_FREEBSD 1 -#elif defined __Fuchsia__ -# define GTEST_OS_FUCHSIA 1 -#elif defined __linux__ -# define GTEST_OS_LINUX 1 -# if defined __ANDROID__ -# define GTEST_OS_LINUX_ANDROID 1 -# endif -#elif defined __MVS__ -# define GTEST_OS_ZOS 1 -#elif defined(__sun) && defined(__SVR4) -# define GTEST_OS_SOLARIS 1 -#elif defined(_AIX) -# define GTEST_OS_AIX 1 -#elif defined(__hpux) -# define GTEST_OS_HPUX 1 -#elif defined __native_client__ -# define GTEST_OS_NACL 1 -#elif defined __NetBSD__ -# define GTEST_OS_NETBSD 1 -#elif defined __OpenBSD__ -# define GTEST_OS_OPENBSD 1 -#elif defined __QNX__ -# define GTEST_OS_QNX 1 -#endif // __CYGWIN__ - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-port.h b/test/gtest-1.8.0/include/gtest/internal/gtest-port.h deleted file mode 100644 index 437a4ed747..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-port.h +++ /dev/null @@ -1,2687 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: wan@google.com (Zhanyong Wan) -// -// Low-level types and utilities for porting Google Test to various -// platforms. All macros ending with _ and symbols defined in an -// internal namespace are subject to change without notice. Code -// outside Google Test MUST NOT USE THEM DIRECTLY. Macros that don't -// end with _ are part of Google Test's public API and can be used by -// code outside Google Test. -// -// This file is fundamental to Google Test. All other Google Test source -// files are expected to #include this. Therefore, it cannot #include -// any other Google Test header. - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ - -// Environment-describing macros -// ----------------------------- -// -// Google Test can be used in many different environments. Macros in -// this section tell Google Test what kind of environment it is being -// used in, such that Google Test can provide environment-specific -// features and implementations. -// -// Google Test tries to automatically detect the properties of its -// environment, so users usually don't need to worry about these -// macros. However, the automatic detection is not perfect. -// Sometimes it's necessary for a user to define some of the following -// macros in the build script to override Google Test's decisions. -// -// If the user doesn't define a macro in the list, Google Test will -// provide a default definition. After this header is #included, all -// macros in this list will be defined to either 1 or 0. -// -// Notes to maintainers: -// - Each macro here is a user-tweakable knob; do not grow the list -// lightly. -// - Use #if to key off these macros. Don't use #ifdef or "#if -// defined(...)", which will not work as these macros are ALWAYS -// defined. -// -// GTEST_HAS_CLONE - Define it to 1/0 to indicate that clone(2) -// is/isn't available. -// GTEST_HAS_EXCEPTIONS - Define it to 1/0 to indicate that exceptions -// are enabled. -// GTEST_HAS_GLOBAL_STRING - Define it to 1/0 to indicate that ::string -// is/isn't available -// GTEST_HAS_GLOBAL_WSTRING - Define it to 1/0 to indicate that ::wstring -// is/isn't available -// GTEST_HAS_POSIX_RE - Define it to 1/0 to indicate that POSIX regular -// expressions are/aren't available. -// GTEST_HAS_PTHREAD - Define it to 1/0 to indicate that -// is/isn't available. -// GTEST_HAS_RTTI - Define it to 1/0 to indicate that RTTI is/isn't -// enabled. -// GTEST_HAS_STD_WSTRING - Define it to 1/0 to indicate that -// std::wstring does/doesn't work (Google Test can -// be used where std::wstring is unavailable). -// GTEST_HAS_TR1_TUPLE - Define it to 1/0 to indicate tr1::tuple -// is/isn't available. -// GTEST_HAS_SEH - Define it to 1/0 to indicate whether the -// compiler supports Microsoft's "Structured -// Exception Handling". -// GTEST_HAS_STREAM_REDIRECTION -// - Define it to 1/0 to indicate whether the -// platform supports I/O stream redirection using -// dup() and dup2(). -// GTEST_USE_OWN_TR1_TUPLE - Define it to 1/0 to indicate whether Google -// Test's own tr1 tuple implementation should be -// used. Unused when the user sets -// GTEST_HAS_TR1_TUPLE to 0. -// GTEST_LANG_CXX11 - Define it to 1/0 to indicate that Google Test -// is building in C++11/C++98 mode. -// GTEST_LINKED_AS_SHARED_LIBRARY -// - Define to 1 when compiling tests that use -// Google Test as a shared library (known as -// DLL on Windows). -// GTEST_CREATE_SHARED_LIBRARY -// - Define to 1 when compiling Google Test itself -// as a shared library. -// GTEST_DEFAULT_DEATH_TEST_STYLE -// - The default value of --gtest_death_test_style. -// The legacy default has been "fast" in the open -// source version since 2008. The recommended value -// is "threadsafe", and can be set in -// custom/gtest-port.h. - -// Platform-indicating macros -// -------------------------- -// -// Macros indicating the platform on which Google Test is being used -// (a macro is defined to 1 if compiled on the given platform; -// otherwise UNDEFINED -- it's never defined to 0.). Google Test -// defines these macros automatically. Code outside Google Test MUST -// NOT define them. -// -// GTEST_OS_AIX - IBM AIX -// GTEST_OS_CYGWIN - Cygwin -// GTEST_OS_FREEBSD - FreeBSD -// GTEST_OS_FUCHSIA - Fuchsia -// GTEST_OS_HPUX - HP-UX -// GTEST_OS_LINUX - Linux -// GTEST_OS_LINUX_ANDROID - Google Android -// GTEST_OS_MAC - Mac OS X -// GTEST_OS_IOS - iOS -// GTEST_OS_NACL - Google Native Client (NaCl) -// GTEST_OS_NETBSD - NetBSD -// GTEST_OS_OPENBSD - OpenBSD -// GTEST_OS_QNX - QNX -// GTEST_OS_SOLARIS - Sun Solaris -// GTEST_OS_SYMBIAN - Symbian -// GTEST_OS_WINDOWS - Windows (Desktop, MinGW, or Mobile) -// GTEST_OS_WINDOWS_DESKTOP - Windows Desktop -// GTEST_OS_WINDOWS_MINGW - MinGW -// GTEST_OS_WINDOWS_MOBILE - Windows Mobile -// GTEST_OS_WINDOWS_PHONE - Windows Phone -// GTEST_OS_WINDOWS_RT - Windows Store App/WinRT -// GTEST_OS_ZOS - z/OS -// -// Among the platforms, Cygwin, Linux, Max OS X, and Windows have the -// most stable support. Since core members of the Google Test project -// don't have access to other platforms, support for them may be less -// stable. If you notice any problems on your platform, please notify -// googletestframework@googlegroups.com (patches for fixing them are -// even more welcome!). -// -// It is possible that none of the GTEST_OS_* macros are defined. - -// Feature-indicating macros -// ------------------------- -// -// Macros indicating which Google Test features are available (a macro -// is defined to 1 if the corresponding feature is supported; -// otherwise UNDEFINED -- it's never defined to 0.). Google Test -// defines these macros automatically. Code outside Google Test MUST -// NOT define them. -// -// These macros are public so that portable tests can be written. -// Such tests typically surround code using a feature with an #if -// which controls that code. For example: -// -// #if GTEST_HAS_DEATH_TEST -// EXPECT_DEATH(DoSomethingDeadly()); -// #endif -// -// GTEST_HAS_COMBINE - the Combine() function (for value-parameterized -// tests) -// GTEST_HAS_DEATH_TEST - death tests -// GTEST_HAS_TYPED_TEST - typed tests -// GTEST_HAS_TYPED_TEST_P - type-parameterized tests -// GTEST_IS_THREADSAFE - Google Test is thread-safe. -// GTEST_USES_POSIX_RE - enhanced POSIX regex is used. Do not confuse with -// GTEST_HAS_POSIX_RE (see above) which users can -// define themselves. -// GTEST_USES_SIMPLE_RE - our own simple regex is used; -// the above RE\b(s) are mutually exclusive. -// GTEST_CAN_COMPARE_NULL - accepts untyped NULL in EXPECT_EQ(). - -// Misc public macros -// ------------------ -// -// GTEST_FLAG(flag_name) - references the variable corresponding to -// the given Google Test flag. - -// Internal utilities -// ------------------ -// -// The following macros and utilities are for Google Test's INTERNAL -// use only. Code outside Google Test MUST NOT USE THEM DIRECTLY. -// -// Macros for basic C++ coding: -// GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning. -// GTEST_ATTRIBUTE_UNUSED_ - declares that a class' instances or a -// variable don't have to be used. -// GTEST_DISALLOW_ASSIGN_ - disables operator=. -// GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=. -// GTEST_MUST_USE_RESULT_ - declares that a function's result must be used. -// GTEST_INTENTIONAL_CONST_COND_PUSH_ - start code section where MSVC C4127 is -// suppressed (constant conditional). -// GTEST_INTENTIONAL_CONST_COND_POP_ - finish code section where MSVC C4127 -// is suppressed. -// -// C++11 feature wrappers: -// -// testing::internal::forward - portability wrapper for std::forward. -// testing::internal::move - portability wrapper for std::move. -// -// Synchronization: -// Mutex, MutexLock, ThreadLocal, GetThreadCount() -// - synchronization primitives. -// -// Template meta programming: -// is_pointer - as in TR1; needed on Symbian and IBM XL C/C++ only. -// IteratorTraits - partial implementation of std::iterator_traits, which -// is not available in libCstd when compiled with Sun C++. -// -// Smart pointers: -// scoped_ptr - as in TR2. -// -// Regular expressions: -// RE - a simple regular expression class using the POSIX -// Extended Regular Expression syntax on UNIX-like platforms -// or a reduced regular exception syntax on other -// platforms, including Windows. -// Logging: -// GTEST_LOG_() - logs messages at the specified severity level. -// LogToStderr() - directs all log messages to stderr. -// FlushInfoLog() - flushes informational log messages. -// -// Stdout and stderr capturing: -// CaptureStdout() - starts capturing stdout. -// GetCapturedStdout() - stops capturing stdout and returns the captured -// string. -// CaptureStderr() - starts capturing stderr. -// GetCapturedStderr() - stops capturing stderr and returns the captured -// string. -// -// Integer types: -// TypeWithSize - maps an integer to a int type. -// Int32, UInt32, Int64, UInt64, TimeInMillis -// - integers of known sizes. -// BiggestInt - the biggest signed integer type. -// -// Command-line utilities: -// GTEST_DECLARE_*() - declares a flag. -// GTEST_DEFINE_*() - defines a flag. -// GetInjectableArgvs() - returns the command line as a vector of strings. -// -// Environment variable utilities: -// GetEnv() - gets the value of an environment variable. -// BoolFromGTestEnv() - parses a bool environment variable. -// Int32FromGTestEnv() - parses an Int32 environment variable. -// StringFromGTestEnv() - parses a string environment variable. - -#include // for isspace, etc -#include // for ptrdiff_t -#include -#include -#include -#ifndef _WIN32_WCE -# include -# include -#endif // !_WIN32_WCE - -#if defined __APPLE__ -# include -# include -#endif - -// Brings in the definition of HAS_GLOBAL_STRING. This must be done -// BEFORE we test HAS_GLOBAL_STRING. -#include // NOLINT -#include // NOLINT -#include // NOLINT -#include // NOLINT -#include -#include // NOLINT - -#include "gtest/internal/gtest-port-arch.h" -#include "gtest/internal/custom/gtest-port.h" - -#if !defined(GTEST_DEV_EMAIL_) -# define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com" -# define GTEST_FLAG_PREFIX_ "gtest_" -# define GTEST_FLAG_PREFIX_DASH_ "gtest-" -# define GTEST_FLAG_PREFIX_UPPER_ "GTEST_" -# define GTEST_NAME_ "Google Test" -# define GTEST_PROJECT_URL_ "https://github.com/google/googletest/" -#endif // !defined(GTEST_DEV_EMAIL_) - -#if !defined(GTEST_INIT_GOOGLE_TEST_NAME_) -# define GTEST_INIT_GOOGLE_TEST_NAME_ "testing::InitGoogleTest" -#endif // !defined(GTEST_INIT_GOOGLE_TEST_NAME_) - -// Determines the version of gcc that is used to compile this. -#ifdef __GNUC__ -// 40302 means version 4.3.2. -# define GTEST_GCC_VER_ \ - (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__) -#endif // __GNUC__ - -// Macros for disabling Microsoft Visual C++ warnings. -// -// GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 4385) -// /* code that triggers warnings C4800 and C4385 */ -// GTEST_DISABLE_MSC_WARNINGS_POP_() -#if _MSC_VER >= 1500 -# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) \ - __pragma(warning(push)) \ - __pragma(warning(disable: warnings)) -# define GTEST_DISABLE_MSC_WARNINGS_POP_() \ - __pragma(warning(pop)) -#else -// Older versions of MSVC don't have __pragma. -# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) -# define GTEST_DISABLE_MSC_WARNINGS_POP_() -#endif - -#ifndef GTEST_LANG_CXX11 -// gcc and clang define __GXX_EXPERIMENTAL_CXX0X__ when -// -std={c,gnu}++{0x,11} is passed. The C++11 standard specifies a -// value for __cplusplus, and recent versions of clang, gcc, and -// probably other compilers set that too in C++11 mode. -# if __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L || _MSC_VER >= 1900 -// Compiling in at least C++11 mode. -# define GTEST_LANG_CXX11 1 -# else -# define GTEST_LANG_CXX11 0 -# endif -#endif - -// Distinct from C++11 language support, some environments don't provide -// proper C++11 library support. Notably, it's possible to build in -// C++11 mode when targeting Mac OS X 10.6, which has an old libstdc++ -// with no C++11 support. -// -// libstdc++ has sufficient C++11 support as of GCC 4.6.0, __GLIBCXX__ -// 20110325, but maintenance releases in the 4.4 and 4.5 series followed -// this date, so check for those versions by their date stamps. -// https://gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html#abi.versioning -#if GTEST_LANG_CXX11 && \ - (!defined(__GLIBCXX__) || ( \ - __GLIBCXX__ >= 20110325ul && /* GCC >= 4.6.0 */ \ - /* Blacklist of patch releases of older branches: */ \ - __GLIBCXX__ != 20110416ul && /* GCC 4.4.6 */ \ - __GLIBCXX__ != 20120313ul && /* GCC 4.4.7 */ \ - __GLIBCXX__ != 20110428ul && /* GCC 4.5.3 */ \ - __GLIBCXX__ != 20120702ul)) /* GCC 4.5.4 */ -# define GTEST_STDLIB_CXX11 1 -#endif - -// Only use C++11 library features if the library provides them. -#if GTEST_STDLIB_CXX11 -# define GTEST_HAS_STD_BEGIN_AND_END_ 1 -# define GTEST_HAS_STD_FORWARD_LIST_ 1 -# if !defined(_MSC_VER) || (_MSC_FULL_VER >= 190023824) -// works only with VS2015U2 and better -# define GTEST_HAS_STD_FUNCTION_ 1 -# endif -# define GTEST_HAS_STD_INITIALIZER_LIST_ 1 -# define GTEST_HAS_STD_MOVE_ 1 -# define GTEST_HAS_STD_UNIQUE_PTR_ 1 -# define GTEST_HAS_STD_SHARED_PTR_ 1 -# define GTEST_HAS_UNORDERED_MAP_ 1 -# define GTEST_HAS_UNORDERED_SET_ 1 -#endif - -// C++11 specifies that provides std::tuple. -// Some platforms still might not have it, however. -#if GTEST_LANG_CXX11 -# define GTEST_HAS_STD_TUPLE_ 1 -# if defined(__clang__) -// Inspired by http://clang.llvm.org/docs/LanguageExtensions.html#__has_include -# if defined(__has_include) && !__has_include() -# undef GTEST_HAS_STD_TUPLE_ -# endif -# elif defined(_MSC_VER) -// Inspired by boost/config/stdlib/dinkumware.hpp -# if defined(_CPPLIB_VER) && _CPPLIB_VER < 520 -# undef GTEST_HAS_STD_TUPLE_ -# endif -# elif defined(__GLIBCXX__) -// Inspired by boost/config/stdlib/libstdcpp3.hpp, -// http://gcc.gnu.org/gcc-4.2/changes.html and -// http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt01ch01.html#manual.intro.status.standard.200x -# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2) -# undef GTEST_HAS_STD_TUPLE_ -# endif -# endif -#endif - -// Brings in definitions for functions used in the testing::internal::posix -// namespace (read, write, close, chdir, isatty, stat). We do not currently -// use them on Windows Mobile. -#if GTEST_OS_WINDOWS -# if !GTEST_OS_WINDOWS_MOBILE -# include -# include -# endif -// In order to avoid having to include , use forward declaration -#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR) -// MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two -// separate (equivalent) structs, instead of using typedef -typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION; -#else -// Assume CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION. -// This assumption is verified by -// WindowsTypesTest.CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION. -typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; -#endif -#else -// This assumes that non-Windows OSes provide unistd.h. For OSes where this -// is not the case, we need to include headers that provide the functions -// mentioned above. -# include -# include -#endif // GTEST_OS_WINDOWS - -#if GTEST_OS_LINUX_ANDROID -// Used to define __ANDROID_API__ matching the target NDK API level. -# include // NOLINT -#endif - -// Defines this to true iff Google Test can use POSIX regular expressions. -#ifndef GTEST_HAS_POSIX_RE -# if GTEST_OS_LINUX_ANDROID -// On Android, is only available starting with Gingerbread. -# define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9) -# else -# define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS) -# endif -#endif - -#if GTEST_USES_PCRE -// The appropriate headers have already been included. - -#elif GTEST_HAS_POSIX_RE - -// On some platforms, needs someone to define size_t, and -// won't compile otherwise. We can #include it here as we already -// included , which is guaranteed to define size_t through -// . -# include // NOLINT - -# define GTEST_USES_POSIX_RE 1 - -#elif GTEST_OS_WINDOWS - -// is not available on Windows. Use our own simple regex -// implementation instead. -# define GTEST_USES_SIMPLE_RE 1 - -#else - -// may not be available on this platform. Use our own -// simple regex implementation instead. -# define GTEST_USES_SIMPLE_RE 1 - -#endif // GTEST_USES_PCRE - -#ifndef GTEST_HAS_EXCEPTIONS -// The user didn't tell us whether exceptions are enabled, so we need -// to figure it out. -# if defined(_MSC_VER) && defined(_CPPUNWIND) -// MSVC defines _CPPUNWIND to 1 iff exceptions are enabled. -# define GTEST_HAS_EXCEPTIONS 1 -# elif defined(__BORLANDC__) -// C++Builder's implementation of the STL uses the _HAS_EXCEPTIONS -// macro to enable exceptions, so we'll do the same. -// Assumes that exceptions are enabled by default. -# ifndef _HAS_EXCEPTIONS -# define _HAS_EXCEPTIONS 1 -# endif // _HAS_EXCEPTIONS -# define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS -# elif defined(__clang__) -// clang defines __EXCEPTIONS iff exceptions are enabled before clang 220714, -// but iff cleanups are enabled after that. In Obj-C++ files, there can be -// cleanups for ObjC exceptions which also need cleanups, even if C++ exceptions -// are disabled. clang has __has_feature(cxx_exceptions) which checks for C++ -// exceptions starting at clang r206352, but which checked for cleanups prior to -// that. To reliably check for C++ exception availability with clang, check for -// __EXCEPTIONS && __has_feature(cxx_exceptions). -# define GTEST_HAS_EXCEPTIONS (__EXCEPTIONS && __has_feature(cxx_exceptions)) -# elif defined(__GNUC__) && __EXCEPTIONS -// gcc defines __EXCEPTIONS to 1 iff exceptions are enabled. -# define GTEST_HAS_EXCEPTIONS 1 -# elif defined(__SUNPRO_CC) -// Sun Pro CC supports exceptions. However, there is no compile-time way of -// detecting whether they are enabled or not. Therefore, we assume that -// they are enabled unless the user tells us otherwise. -# define GTEST_HAS_EXCEPTIONS 1 -# elif defined(__IBMCPP__) && __EXCEPTIONS -// xlC defines __EXCEPTIONS to 1 iff exceptions are enabled. -# define GTEST_HAS_EXCEPTIONS 1 -# elif defined(__HP_aCC) -// Exception handling is in effect by default in HP aCC compiler. It has to -// be turned of by +noeh compiler option if desired. -# define GTEST_HAS_EXCEPTIONS 1 -# else -// For other compilers, we assume exceptions are disabled to be -// conservative. -# define GTEST_HAS_EXCEPTIONS 0 -# endif // defined(_MSC_VER) || defined(__BORLANDC__) -#endif // GTEST_HAS_EXCEPTIONS - -#if !defined(GTEST_HAS_STD_STRING) -// Even though we don't use this macro any longer, we keep it in case -// some clients still depend on it. -# define GTEST_HAS_STD_STRING 1 -#elif !GTEST_HAS_STD_STRING -// The user told us that ::std::string isn't available. -# error "::std::string isn't available." -#endif // !defined(GTEST_HAS_STD_STRING) - -#ifndef GTEST_HAS_GLOBAL_STRING -// The user didn't tell us whether ::string is available, so we need -// to figure it out. - -# define GTEST_HAS_GLOBAL_STRING 0 - -#endif // GTEST_HAS_GLOBAL_STRING - -#ifndef GTEST_HAS_STD_WSTRING -// The user didn't tell us whether ::std::wstring is available, so we need -// to figure it out. -// TODO(wan@google.com): uses autoconf to detect whether ::std::wstring -// is available. - -// Cygwin 1.7 and below doesn't support ::std::wstring. -// Solaris' libc++ doesn't support it either. Android has -// no support for it at least as recent as Froyo (2.2). -# define GTEST_HAS_STD_WSTRING \ - (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS)) - -#endif // GTEST_HAS_STD_WSTRING - -#ifndef GTEST_HAS_GLOBAL_WSTRING -// The user didn't tell us whether ::wstring is available, so we need -// to figure it out. -# define GTEST_HAS_GLOBAL_WSTRING \ - (GTEST_HAS_STD_WSTRING && GTEST_HAS_GLOBAL_STRING) -#endif // GTEST_HAS_GLOBAL_WSTRING - -// Determines whether RTTI is available. -#ifndef GTEST_HAS_RTTI -// The user didn't tell us whether RTTI is enabled, so we need to -// figure it out. - -# ifdef _MSC_VER - -# ifdef _CPPRTTI // MSVC defines this macro iff RTTI is enabled. -# define GTEST_HAS_RTTI 1 -# else -# define GTEST_HAS_RTTI 0 -# endif - -// Starting with version 4.3.2, gcc defines __GXX_RTTI iff RTTI is enabled. -# elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40302) - -# ifdef __GXX_RTTI -// When building against STLport with the Android NDK and with -// -frtti -fno-exceptions, the build fails at link time with undefined -// references to __cxa_bad_typeid. Note sure if STL or toolchain bug, -// so disable RTTI when detected. -# if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) && \ - !defined(__EXCEPTIONS) -# define GTEST_HAS_RTTI 0 -# else -# define GTEST_HAS_RTTI 1 -# endif // GTEST_OS_LINUX_ANDROID && __STLPORT_MAJOR && !__EXCEPTIONS -# else -# define GTEST_HAS_RTTI 0 -# endif // __GXX_RTTI - -// Clang defines __GXX_RTTI starting with version 3.0, but its manual recommends -// using has_feature instead. has_feature(cxx_rtti) is supported since 2.7, the -// first version with C++ support. -# elif defined(__clang__) - -# define GTEST_HAS_RTTI __has_feature(cxx_rtti) - -// Starting with version 9.0 IBM Visual Age defines __RTTI_ALL__ to 1 if -// both the typeid and dynamic_cast features are present. -# elif defined(__IBMCPP__) && (__IBMCPP__ >= 900) - -# ifdef __RTTI_ALL__ -# define GTEST_HAS_RTTI 1 -# else -# define GTEST_HAS_RTTI 0 -# endif - -# else - -// For all other compilers, we assume RTTI is enabled. -# define GTEST_HAS_RTTI 1 - -# endif // _MSC_VER - -#endif // GTEST_HAS_RTTI - -// It's this header's responsibility to #include when RTTI -// is enabled. -#if GTEST_HAS_RTTI -# include -#endif - -// Determines whether Google Test can use the pthreads library. -#ifndef GTEST_HAS_PTHREAD -// The user didn't tell us explicitly, so we make reasonable assumptions about -// which platforms have pthreads support. -// -// To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0 -// to your compiler flags. -#define GTEST_HAS_PTHREAD \ - (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX || GTEST_OS_QNX || \ - GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA) -#endif // GTEST_HAS_PTHREAD - -#if GTEST_HAS_PTHREAD -// gtest-port.h guarantees to #include when GTEST_HAS_PTHREAD is -// true. -# include // NOLINT - -// For timespec and nanosleep, used below. -# include // NOLINT -#endif - -// Determines if hash_map/hash_set are available. -// Only used for testing against those containers. -#if !defined(GTEST_HAS_HASH_MAP_) -# if defined(_MSC_VER) && (_MSC_VER < 1900) -# define GTEST_HAS_HASH_MAP_ 1 // Indicates that hash_map is available. -# define GTEST_HAS_HASH_SET_ 1 // Indicates that hash_set is available. -# endif // _MSC_VER -#endif // !defined(GTEST_HAS_HASH_MAP_) - -// Determines whether Google Test can use tr1/tuple. You can define -// this macro to 0 to prevent Google Test from using tuple (any -// feature depending on tuple with be disabled in this mode). -#ifndef GTEST_HAS_TR1_TUPLE -# if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) -// STLport, provided with the Android NDK, has neither or . -# define GTEST_HAS_TR1_TUPLE 0 -# elif defined(_MSC_VER) && (_MSC_VER >= 1910) -// Prevent `warning C4996: 'std::tr1': warning STL4002: -// The non-Standard std::tr1 namespace and TR1-only machinery -// are deprecated and will be REMOVED.` -# define GTEST_HAS_TR1_TUPLE 0 -# elif GTEST_LANG_CXX11 && defined(_LIBCPP_VERSION) -// libc++ doesn't support TR1. -# define GTEST_HAS_TR1_TUPLE 0 -# else -// The user didn't tell us not to do it, so we assume it's OK. -# define GTEST_HAS_TR1_TUPLE 1 -# endif -#endif // GTEST_HAS_TR1_TUPLE - -// Determines whether Google Test's own tr1 tuple implementation -// should be used. -#ifndef GTEST_USE_OWN_TR1_TUPLE -// We use our own tuple implementation on Symbian. -# if GTEST_OS_SYMBIAN -# define GTEST_USE_OWN_TR1_TUPLE 1 -# else -// The user didn't tell us, so we need to figure it out. - -// We use our own TR1 tuple if we aren't sure the user has an -// implementation of it already. At this time, libstdc++ 4.0.0+ and -// MSVC 2010 are the only mainstream standard libraries that come -// with a TR1 tuple implementation. NVIDIA's CUDA NVCC compiler -// pretends to be GCC by defining __GNUC__ and friends, but cannot -// compile GCC's tuple implementation. MSVC 2008 (9.0) provides TR1 -// tuple in a 323 MB Feature Pack download, which we cannot assume the -// user has. QNX's QCC compiler is a modified GCC but it doesn't -// support TR1 tuple. libc++ only provides std::tuple, in C++11 mode, -// and it can be used with some compilers that define __GNUC__. -# if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000) \ - && !GTEST_OS_QNX && !defined(_LIBCPP_VERSION)) \ - || (_MSC_VER >= 1600 && _MSC_VER < 1900) -# define GTEST_ENV_HAS_TR1_TUPLE_ 1 -# endif - -// C++11 specifies that provides std::tuple. Use that if gtest is used -// in C++11 mode and libstdc++ isn't very old (binaries targeting OS X 10.6 -// can build with clang but need to use gcc4.2's libstdc++). -# if GTEST_LANG_CXX11 && (!defined(__GLIBCXX__) || __GLIBCXX__ > 20110325) -# define GTEST_ENV_HAS_STD_TUPLE_ 1 -# endif - -# if GTEST_ENV_HAS_TR1_TUPLE_ || GTEST_ENV_HAS_STD_TUPLE_ -# define GTEST_USE_OWN_TR1_TUPLE 0 -# else -# define GTEST_USE_OWN_TR1_TUPLE 1 -# endif -# endif // GTEST_OS_SYMBIAN -#endif // GTEST_USE_OWN_TR1_TUPLE - -// To avoid conditional compilation we make it gtest-port.h's responsibility -// to #include the header implementing tuple. -#if GTEST_HAS_STD_TUPLE_ -# include // IWYU pragma: export -# define GTEST_TUPLE_NAMESPACE_ ::std -#endif // GTEST_HAS_STD_TUPLE_ - -// We include tr1::tuple even if std::tuple is available to define printers for -// them. -#if GTEST_HAS_TR1_TUPLE -# ifndef GTEST_TUPLE_NAMESPACE_ -# define GTEST_TUPLE_NAMESPACE_ ::std::tr1 -# endif // GTEST_TUPLE_NAMESPACE_ - -# if GTEST_USE_OWN_TR1_TUPLE -# include "gtest/internal/gtest-tuple.h" // IWYU pragma: export // NOLINT -# elif GTEST_OS_SYMBIAN - -// On Symbian, BOOST_HAS_TR1_TUPLE causes Boost's TR1 tuple library to -// use STLport's tuple implementation, which unfortunately doesn't -// work as the copy of STLport distributed with Symbian is incomplete. -// By making sure BOOST_HAS_TR1_TUPLE is undefined, we force Boost to -// use its own tuple implementation. -# ifdef BOOST_HAS_TR1_TUPLE -# undef BOOST_HAS_TR1_TUPLE -# endif // BOOST_HAS_TR1_TUPLE - -// This prevents , which defines -// BOOST_HAS_TR1_TUPLE, from being #included by Boost's . -# define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED -# include // IWYU pragma: export // NOLINT - -# elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000) -// GCC 4.0+ implements tr1/tuple in the header. This does -// not conform to the TR1 spec, which requires the header to be . - -# if !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302 -// Until version 4.3.2, gcc has a bug that causes , -// which is #included by , to not compile when RTTI is -// disabled. _TR1_FUNCTIONAL is the header guard for -// . Hence the following #define is a hack to prevent -// from being included. -# define _TR1_FUNCTIONAL 1 -# include -# undef _TR1_FUNCTIONAL // Allows the user to #include - // if they choose to. -# else -# include // NOLINT -# endif // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302 - -// VS 2010 now has tr1 support. -# elif _MSC_VER >= 1600 -# include // IWYU pragma: export // NOLINT - -# else // GTEST_USE_OWN_TR1_TUPLE -# include // IWYU pragma: export // NOLINT -# endif // GTEST_USE_OWN_TR1_TUPLE - -#endif // GTEST_HAS_TR1_TUPLE - -// Determines whether clone(2) is supported. -// Usually it will only be available on Linux, excluding -// Linux on the Itanium architecture. -// Also see http://linux.die.net/man/2/clone. -#ifndef GTEST_HAS_CLONE -// The user didn't tell us, so we need to figure it out. - -# if GTEST_OS_LINUX && !defined(__ia64__) -# if GTEST_OS_LINUX_ANDROID -// On Android, clone() became available at different API levels for each 32-bit -// architecture. -# if defined(__LP64__) || \ - (defined(__arm__) && __ANDROID_API__ >= 9) || \ - (defined(__mips__) && __ANDROID_API__ >= 12) || \ - (defined(__i386__) && __ANDROID_API__ >= 17) -# define GTEST_HAS_CLONE 1 -# else -# define GTEST_HAS_CLONE 0 -# endif -# else -# define GTEST_HAS_CLONE 1 -# endif -# else -# define GTEST_HAS_CLONE 0 -# endif // GTEST_OS_LINUX && !defined(__ia64__) - -#endif // GTEST_HAS_CLONE - -// Determines whether to support stream redirection. This is used to test -// output correctness and to implement death tests. -#ifndef GTEST_HAS_STREAM_REDIRECTION -// By default, we assume that stream redirection is supported on all -// platforms except known mobile ones. -# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || \ - GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT -# define GTEST_HAS_STREAM_REDIRECTION 0 -# else -# define GTEST_HAS_STREAM_REDIRECTION 1 -# endif // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_SYMBIAN -#endif // GTEST_HAS_STREAM_REDIRECTION - -// Determines whether to support death tests. -// Google Test does not support death tests for VC 7.1 and earlier as -// abort() in a VC 7.1 application compiled as GUI in debug config -// pops up a dialog window that cannot be suppressed programmatically. -#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ - (GTEST_OS_MAC && !GTEST_OS_IOS) || \ - (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ - GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \ - GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || \ - GTEST_OS_NETBSD || GTEST_OS_FUCHSIA) -# define GTEST_HAS_DEATH_TEST 1 -#endif - -// Determines whether to support type-driven tests. - -// Typed tests need and variadic macros, which GCC, VC++ 8.0, -// Sun Pro CC, IBM Visual Age, and HP aCC support. -#if defined(__GNUC__) || (_MSC_VER >= 1400) || defined(__SUNPRO_CC) || \ - defined(__IBMCPP__) || defined(__HP_aCC) -# define GTEST_HAS_TYPED_TEST 1 -# define GTEST_HAS_TYPED_TEST_P 1 -#endif - -// Determines whether to support Combine(). This only makes sense when -// value-parameterized tests are enabled. The implementation doesn't -// work on Sun Studio since it doesn't understand templated conversion -// operators. -#if (GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_) && !defined(__SUNPRO_CC) -# define GTEST_HAS_COMBINE 1 -#endif - -// Determines whether the system compiler uses UTF-16 for encoding wide strings. -#define GTEST_WIDE_STRING_USES_UTF16_ \ - (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_SYMBIAN || GTEST_OS_AIX) - -// Determines whether test results can be streamed to a socket. -#if GTEST_OS_LINUX -# define GTEST_CAN_STREAM_RESULTS_ 1 -#endif - -// Defines some utility macros. - -// The GNU compiler emits a warning if nested "if" statements are followed by -// an "else" statement and braces are not used to explicitly disambiguate the -// "else" binding. This leads to problems with code like: -// -// if (gate) -// ASSERT_*(condition) << "Some message"; -// -// The "switch (0) case 0:" idiom is used to suppress this. -#ifdef __INTEL_COMPILER -# define GTEST_AMBIGUOUS_ELSE_BLOCKER_ -#else -# define GTEST_AMBIGUOUS_ELSE_BLOCKER_ switch (0) case 0: default: // NOLINT -#endif - -// Use this annotation at the end of a struct/class definition to -// prevent the compiler from optimizing away instances that are never -// used. This is useful when all interesting logic happens inside the -// c'tor and / or d'tor. Example: -// -// struct Foo { -// Foo() { ... } -// } GTEST_ATTRIBUTE_UNUSED_; -// -// Also use it after a variable or parameter declaration to tell the -// compiler the variable/parameter does not have to be used. -#if defined(__GNUC__) && !defined(COMPILER_ICC) -# define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused)) -#elif defined(__clang__) -# if __has_attribute(unused) -# define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused)) -# endif -#endif -#ifndef GTEST_ATTRIBUTE_UNUSED_ -# define GTEST_ATTRIBUTE_UNUSED_ -#endif - -#if GTEST_LANG_CXX11 -# define GTEST_CXX11_EQUALS_DELETE_ = delete -#else // GTEST_LANG_CXX11 -# define GTEST_CXX11_EQUALS_DELETE_ -#endif // GTEST_LANG_CXX11 - -// Use this annotation before a function that takes a printf format string. -#if (defined(__GNUC__) || defined(__clang__)) && !defined(COMPILER_ICC) -# if defined(__MINGW_PRINTF_FORMAT) -// MinGW has two different printf implementations. Ensure the format macro -// matches the selected implementation. See -// https://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/. -# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \ - __attribute__((__format__(__MINGW_PRINTF_FORMAT, string_index, \ - first_to_check))) -# else -# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \ - __attribute__((__format__(__printf__, string_index, first_to_check))) -# endif -#else -# define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) -#endif - - -// A macro to disallow operator= -// This should be used in the private: declarations for a class. -#define GTEST_DISALLOW_ASSIGN_(type) \ - void operator=(type const &) GTEST_CXX11_EQUALS_DELETE_ - -// A macro to disallow copy constructor and operator= -// This should be used in the private: declarations for a class. -#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type) \ - type(type const &) GTEST_CXX11_EQUALS_DELETE_; \ - GTEST_DISALLOW_ASSIGN_(type) - -// Tell the compiler to warn about unused return values for functions declared -// with this macro. The macro should be used on function declarations -// following the argument list: -// -// Sprocket* AllocateSprocket() GTEST_MUST_USE_RESULT_; -#if defined(__GNUC__) && (GTEST_GCC_VER_ >= 30400) && !defined(COMPILER_ICC) -# define GTEST_MUST_USE_RESULT_ __attribute__ ((warn_unused_result)) -#else -# define GTEST_MUST_USE_RESULT_ -#endif // __GNUC__ && (GTEST_GCC_VER_ >= 30400) && !COMPILER_ICC - -// MS C++ compiler emits warning when a conditional expression is compile time -// constant. In some contexts this warning is false positive and needs to be -// suppressed. Use the following two macros in such cases: -// -// GTEST_INTENTIONAL_CONST_COND_PUSH_() -// while (true) { -// GTEST_INTENTIONAL_CONST_COND_POP_() -// } -# define GTEST_INTENTIONAL_CONST_COND_PUSH_() \ - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127) -# define GTEST_INTENTIONAL_CONST_COND_POP_() \ - GTEST_DISABLE_MSC_WARNINGS_POP_() - -// Determine whether the compiler supports Microsoft's Structured Exception -// Handling. This is supported by several Windows compilers but generally -// does not exist on any other system. -#ifndef GTEST_HAS_SEH -// The user didn't tell us, so we need to figure it out. - -# if defined(_MSC_VER) || defined(__BORLANDC__) -// These two compilers are known to support SEH. -# define GTEST_HAS_SEH 1 -# else -// Assume no SEH. -# define GTEST_HAS_SEH 0 -# endif - -#define GTEST_IS_THREADSAFE \ - (GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ \ - || (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) \ - || GTEST_HAS_PTHREAD) - -#endif // GTEST_HAS_SEH - -// GTEST_API_ qualifies all symbols that must be exported. The definitions below -// are guarded by #ifndef to give embedders a chance to define GTEST_API_ in -// gtest/internal/custom/gtest-port.h -#ifndef GTEST_API_ - -#ifdef _MSC_VER -# if GTEST_LINKED_AS_SHARED_LIBRARY -# define GTEST_API_ __declspec(dllimport) -# elif GTEST_CREATE_SHARED_LIBRARY -# define GTEST_API_ __declspec(dllexport) -# endif -#elif __GNUC__ >= 4 || defined(__clang__) -# define GTEST_API_ __attribute__((visibility ("default"))) -#endif // _MSC_VER - -#endif // GTEST_API_ - -#ifndef GTEST_API_ -# define GTEST_API_ -#endif // GTEST_API_ - -#ifndef GTEST_DEFAULT_DEATH_TEST_STYLE -# define GTEST_DEFAULT_DEATH_TEST_STYLE "fast" -#endif // GTEST_DEFAULT_DEATH_TEST_STYLE - -#ifdef __GNUC__ -// Ask the compiler to never inline a given function. -# define GTEST_NO_INLINE_ __attribute__((noinline)) -#else -# define GTEST_NO_INLINE_ -#endif - -// _LIBCPP_VERSION is defined by the libc++ library from the LLVM project. -#if !defined(GTEST_HAS_CXXABI_H_) -# if defined(__GLIBCXX__) || (defined(_LIBCPP_VERSION) && !defined(_MSC_VER)) -# define GTEST_HAS_CXXABI_H_ 1 -# else -# define GTEST_HAS_CXXABI_H_ 0 -# endif -#endif - -// A function level attribute to disable checking for use of uninitialized -// memory when built with MemorySanitizer. -#if defined(__clang__) -# if __has_feature(memory_sanitizer) -# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ \ - __attribute__((no_sanitize_memory)) -# else -# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ -# endif // __has_feature(memory_sanitizer) -#else -# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ -#endif // __clang__ - -// A function level attribute to disable AddressSanitizer instrumentation. -#if defined(__clang__) -# if __has_feature(address_sanitizer) -# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ \ - __attribute__((no_sanitize_address)) -# else -# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ -# endif // __has_feature(address_sanitizer) -#else -# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ -#endif // __clang__ - -// A function level attribute to disable ThreadSanitizer instrumentation. -#if defined(__clang__) -# if __has_feature(thread_sanitizer) -# define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ \ - __attribute__((no_sanitize_thread)) -# else -# define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ -# endif // __has_feature(thread_sanitizer) -#else -# define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ -#endif // __clang__ - -namespace testing { - -class Message; - -#if defined(GTEST_TUPLE_NAMESPACE_) -// Import tuple and friends into the ::testing namespace. -// It is part of our interface, having them in ::testing allows us to change -// their types as needed. -using GTEST_TUPLE_NAMESPACE_::get; -using GTEST_TUPLE_NAMESPACE_::make_tuple; -using GTEST_TUPLE_NAMESPACE_::tuple; -using GTEST_TUPLE_NAMESPACE_::tuple_size; -using GTEST_TUPLE_NAMESPACE_::tuple_element; -#endif // defined(GTEST_TUPLE_NAMESPACE_) - -namespace internal { - -// A secret type that Google Test users don't know about. It has no -// definition on purpose. Therefore it's impossible to create a -// Secret object, which is what we want. -class Secret; - -// The GTEST_COMPILE_ASSERT_ macro can be used to verify that a compile time -// expression is true. For example, you could use it to verify the -// size of a static array: -// -// GTEST_COMPILE_ASSERT_(GTEST_ARRAY_SIZE_(names) == NUM_NAMES, -// names_incorrect_size); -// -// or to make sure a struct is smaller than a certain size: -// -// GTEST_COMPILE_ASSERT_(sizeof(foo) < 128, foo_too_large); -// -// The second argument to the macro is the name of the variable. If -// the expression is false, most compilers will issue a warning/error -// containing the name of the variable. - -#if GTEST_LANG_CXX11 -# define GTEST_COMPILE_ASSERT_(expr, msg) static_assert(expr, #msg) -#else // !GTEST_LANG_CXX11 -template - struct CompileAssert { -}; - -# define GTEST_COMPILE_ASSERT_(expr, msg) \ - typedef ::testing::internal::CompileAssert<(static_cast(expr))> \ - msg[static_cast(expr) ? 1 : -1] GTEST_ATTRIBUTE_UNUSED_ -#endif // !GTEST_LANG_CXX11 - -// Implementation details of GTEST_COMPILE_ASSERT_: -// -// (In C++11, we simply use static_assert instead of the following) -// -// - GTEST_COMPILE_ASSERT_ works by defining an array type that has -1 -// elements (and thus is invalid) when the expression is false. -// -// - The simpler definition -// -// #define GTEST_COMPILE_ASSERT_(expr, msg) typedef char msg[(expr) ? 1 : -1] -// -// does not work, as gcc supports variable-length arrays whose sizes -// are determined at run-time (this is gcc's extension and not part -// of the C++ standard). As a result, gcc fails to reject the -// following code with the simple definition: -// -// int foo; -// GTEST_COMPILE_ASSERT_(foo, msg); // not supposed to compile as foo is -// // not a compile-time constant. -// -// - By using the type CompileAssert<(bool(expr))>, we ensures that -// expr is a compile-time constant. (Template arguments must be -// determined at compile-time.) -// -// - The outter parentheses in CompileAssert<(bool(expr))> are necessary -// to work around a bug in gcc 3.4.4 and 4.0.1. If we had written -// -// CompileAssert -// -// instead, these compilers will refuse to compile -// -// GTEST_COMPILE_ASSERT_(5 > 0, some_message); -// -// (They seem to think the ">" in "5 > 0" marks the end of the -// template argument list.) -// -// - The array size is (bool(expr) ? 1 : -1), instead of simply -// -// ((expr) ? 1 : -1). -// -// This is to avoid running into a bug in MS VC 7.1, which -// causes ((0.0) ? 1 : -1) to incorrectly evaluate to 1. - -// StaticAssertTypeEqHelper is used by StaticAssertTypeEq defined in gtest.h. -// -// This template is declared, but intentionally undefined. -template -struct StaticAssertTypeEqHelper; - -template -struct StaticAssertTypeEqHelper { - enum { value = true }; -}; - -// Same as std::is_same<>. -template -struct IsSame { - enum { value = false }; -}; -template -struct IsSame { - enum { value = true }; -}; - -// Evaluates to the number of elements in 'array'. -#define GTEST_ARRAY_SIZE_(array) (sizeof(array) / sizeof(array[0])) - -#if GTEST_HAS_GLOBAL_STRING -typedef ::string string; -#else -typedef ::std::string string; -#endif // GTEST_HAS_GLOBAL_STRING - -#if GTEST_HAS_GLOBAL_WSTRING -typedef ::wstring wstring; -#elif GTEST_HAS_STD_WSTRING -typedef ::std::wstring wstring; -#endif // GTEST_HAS_GLOBAL_WSTRING - -// A helper for suppressing warnings on constant condition. It just -// returns 'condition'. -GTEST_API_ bool IsTrue(bool condition); - -// Defines scoped_ptr. - -// This implementation of scoped_ptr is PARTIAL - it only contains -// enough stuff to satisfy Google Test's need. -template -class scoped_ptr { - public: - typedef T element_type; - - explicit scoped_ptr(T* p = NULL) : ptr_(p) {} - ~scoped_ptr() { reset(); } - - T& operator*() const { return *ptr_; } - T* operator->() const { return ptr_; } - T* get() const { return ptr_; } - - T* release() { - T* const ptr = ptr_; - ptr_ = NULL; - return ptr; - } - - void reset(T* p = NULL) { - if (p != ptr_) { - if (IsTrue(sizeof(T) > 0)) { // Makes sure T is a complete type. - delete ptr_; - } - ptr_ = p; - } - } - - friend void swap(scoped_ptr& a, scoped_ptr& b) { - using std::swap; - swap(a.ptr_, b.ptr_); - } - - private: - T* ptr_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(scoped_ptr); -}; - -// Defines RE. - -#if GTEST_USES_PCRE -using ::RE; -#elif GTEST_USES_POSIX_RE || GTEST_USES_SIMPLE_RE - -// A simple C++ wrapper for . It uses the POSIX Extended -// Regular Expression syntax. -class GTEST_API_ RE { - public: - // A copy constructor is required by the Standard to initialize object - // references from r-values. - RE(const RE& other) { Init(other.pattern()); } - - // Constructs an RE from a string. - RE(const ::std::string& regex) { Init(regex.c_str()); } // NOLINT - -# if GTEST_HAS_GLOBAL_STRING - - RE(const ::string& regex) { Init(regex.c_str()); } // NOLINT - -# endif // GTEST_HAS_GLOBAL_STRING - - RE(const char* regex) { Init(regex); } // NOLINT - ~RE(); - - // Returns the string representation of the regex. - const char* pattern() const { return pattern_; } - - // FullMatch(str, re) returns true iff regular expression re matches - // the entire str. - // PartialMatch(str, re) returns true iff regular expression re - // matches a substring of str (including str itself). - // - // TODO(wan@google.com): make FullMatch() and PartialMatch() work - // when str contains NUL characters. - static bool FullMatch(const ::std::string& str, const RE& re) { - return FullMatch(str.c_str(), re); - } - static bool PartialMatch(const ::std::string& str, const RE& re) { - return PartialMatch(str.c_str(), re); - } - -# if GTEST_HAS_GLOBAL_STRING - - static bool FullMatch(const ::string& str, const RE& re) { - return FullMatch(str.c_str(), re); - } - static bool PartialMatch(const ::string& str, const RE& re) { - return PartialMatch(str.c_str(), re); - } - -# endif // GTEST_HAS_GLOBAL_STRING - - static bool FullMatch(const char* str, const RE& re); - static bool PartialMatch(const char* str, const RE& re); - - private: - void Init(const char* regex); - - // We use a const char* instead of an std::string, as Google Test used to be - // used where std::string is not available. TODO(wan@google.com): change to - // std::string. - const char* pattern_; - bool is_valid_; - -# if GTEST_USES_POSIX_RE - - regex_t full_regex_; // For FullMatch(). - regex_t partial_regex_; // For PartialMatch(). - -# else // GTEST_USES_SIMPLE_RE - - const char* full_pattern_; // For FullMatch(); - -# endif - - GTEST_DISALLOW_ASSIGN_(RE); -}; - -#endif // GTEST_USES_PCRE - -// Formats a source file path and a line number as they would appear -// in an error message from the compiler used to compile this code. -GTEST_API_ ::std::string FormatFileLocation(const char* file, int line); - -// Formats a file location for compiler-independent XML output. -// Although this function is not platform dependent, we put it next to -// FormatFileLocation in order to contrast the two functions. -GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(const char* file, - int line); - -// Defines logging utilities: -// GTEST_LOG_(severity) - logs messages at the specified severity level. The -// message itself is streamed into the macro. -// LogToStderr() - directs all log messages to stderr. -// FlushInfoLog() - flushes informational log messages. - -enum GTestLogSeverity { - GTEST_INFO, - GTEST_WARNING, - GTEST_ERROR, - GTEST_FATAL -}; - -// Formats log entry severity, provides a stream object for streaming the -// log message, and terminates the message with a newline when going out of -// scope. -class GTEST_API_ GTestLog { - public: - GTestLog(GTestLogSeverity severity, const char* file, int line); - - // Flushes the buffers and, if severity is GTEST_FATAL, aborts the program. - ~GTestLog(); - - ::std::ostream& GetStream() { return ::std::cerr; } - - private: - const GTestLogSeverity severity_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestLog); -}; - -#if !defined(GTEST_LOG_) - -# define GTEST_LOG_(severity) \ - ::testing::internal::GTestLog(::testing::internal::GTEST_##severity, \ - __FILE__, __LINE__).GetStream() - -inline void LogToStderr() {} -inline void FlushInfoLog() { fflush(NULL); } - -#endif // !defined(GTEST_LOG_) - -#if !defined(GTEST_CHECK_) -// INTERNAL IMPLEMENTATION - DO NOT USE. -// -// GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition -// is not satisfied. -// Synopsys: -// GTEST_CHECK_(boolean_condition); -// or -// GTEST_CHECK_(boolean_condition) << "Additional message"; -// -// This checks the condition and if the condition is not satisfied -// it prints message about the condition violation, including the -// condition itself, plus additional message streamed into it, if any, -// and then it aborts the program. It aborts the program irrespective of -// whether it is built in the debug mode or not. -# define GTEST_CHECK_(condition) \ - GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ - if (::testing::internal::IsTrue(condition)) \ - ; \ - else \ - GTEST_LOG_(FATAL) << "Condition " #condition " failed. " -#endif // !defined(GTEST_CHECK_) - -// An all-mode assert to verify that the given POSIX-style function -// call returns 0 (indicating success). Known limitation: this -// doesn't expand to a balanced 'if' statement, so enclose the macro -// in {} if you need to use it as the only statement in an 'if' -// branch. -#define GTEST_CHECK_POSIX_SUCCESS_(posix_call) \ - if (const int gtest_error = (posix_call)) \ - GTEST_LOG_(FATAL) << #posix_call << "failed with error " \ - << gtest_error - -// Adds reference to a type if it is not a reference type, -// otherwise leaves it unchanged. This is the same as -// tr1::add_reference, which is not widely available yet. -template -struct AddReference { typedef T& type; }; // NOLINT -template -struct AddReference { typedef T& type; }; // NOLINT - -// A handy wrapper around AddReference that works when the argument T -// depends on template parameters. -#define GTEST_ADD_REFERENCE_(T) \ - typename ::testing::internal::AddReference::type - -// Transforms "T" into "const T&" according to standard reference collapsing -// rules (this is only needed as a backport for C++98 compilers that do not -// support reference collapsing). Specifically, it transforms: -// -// char ==> const char& -// const char ==> const char& -// char& ==> char& -// const char& ==> const char& -// -// Note that the non-const reference will not have "const" added. This is -// standard, and necessary so that "T" can always bind to "const T&". -template -struct ConstRef { typedef const T& type; }; -template -struct ConstRef { typedef T& type; }; - -// The argument T must depend on some template parameters. -#define GTEST_REFERENCE_TO_CONST_(T) \ - typename ::testing::internal::ConstRef::type - -#if GTEST_HAS_STD_MOVE_ -using std::forward; -using std::move; - -template -struct RvalueRef { - typedef T&& type; -}; -#else // GTEST_HAS_STD_MOVE_ -template -const T& move(const T& t) { - return t; -} -template -GTEST_ADD_REFERENCE_(T) forward(GTEST_ADD_REFERENCE_(T) t) { return t; } - -template -struct RvalueRef { - typedef const T& type; -}; -#endif // GTEST_HAS_STD_MOVE_ - -// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. -// -// Use ImplicitCast_ as a safe version of static_cast for upcasting in -// the type hierarchy (e.g. casting a Foo* to a SuperclassOfFoo* or a -// const Foo*). When you use ImplicitCast_, the compiler checks that -// the cast is safe. Such explicit ImplicitCast_s are necessary in -// surprisingly many situations where C++ demands an exact type match -// instead of an argument type convertable to a target type. -// -// The syntax for using ImplicitCast_ is the same as for static_cast: -// -// ImplicitCast_(expr) -// -// ImplicitCast_ would have been part of the C++ standard library, -// but the proposal was submitted too late. It will probably make -// its way into the language in the future. -// -// This relatively ugly name is intentional. It prevents clashes with -// similar functions users may have (e.g., implicit_cast). The internal -// namespace alone is not enough because the function can be found by ADL. -template -inline To ImplicitCast_(To x) { return x; } - -// When you upcast (that is, cast a pointer from type Foo to type -// SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts -// always succeed. When you downcast (that is, cast a pointer from -// type Foo to type SubclassOfFoo), static_cast<> isn't safe, because -// how do you know the pointer is really of type SubclassOfFoo? It -// could be a bare Foo, or of type DifferentSubclassOfFoo. Thus, -// when you downcast, you should use this macro. In debug mode, we -// use dynamic_cast<> to double-check the downcast is legal (we die -// if it's not). In normal mode, we do the efficient static_cast<> -// instead. Thus, it's important to test in debug mode to make sure -// the cast is legal! -// This is the only place in the code we should use dynamic_cast<>. -// In particular, you SHOULDN'T be using dynamic_cast<> in order to -// do RTTI (eg code like this: -// if (dynamic_cast(foo)) HandleASubclass1Object(foo); -// if (dynamic_cast(foo)) HandleASubclass2Object(foo); -// You should design the code some other way not to need this. -// -// This relatively ugly name is intentional. It prevents clashes with -// similar functions users may have (e.g., down_cast). The internal -// namespace alone is not enough because the function can be found by ADL. -template // use like this: DownCast_(foo); -inline To DownCast_(From* f) { // so we only accept pointers - // Ensures that To is a sub-type of From *. This test is here only - // for compile-time type checking, and has no overhead in an - // optimized build at run-time, as it will be optimized away - // completely. - GTEST_INTENTIONAL_CONST_COND_PUSH_() - if (false) { - GTEST_INTENTIONAL_CONST_COND_POP_() - const To to = NULL; - ::testing::internal::ImplicitCast_(to); - } - -#if GTEST_HAS_RTTI - // RTTI: debug mode only! - GTEST_CHECK_(f == NULL || dynamic_cast(f) != NULL); -#endif - return static_cast(f); -} - -// Downcasts the pointer of type Base to Derived. -// Derived must be a subclass of Base. The parameter MUST -// point to a class of type Derived, not any subclass of it. -// When RTTI is available, the function performs a runtime -// check to enforce this. -template -Derived* CheckedDowncastToActualType(Base* base) { -#if GTEST_HAS_RTTI - GTEST_CHECK_(typeid(*base) == typeid(Derived)); -#endif - -#if GTEST_HAS_DOWNCAST_ - return ::down_cast(base); -#elif GTEST_HAS_RTTI - return dynamic_cast(base); // NOLINT -#else - return static_cast(base); // Poor man's downcast. -#endif -} - -#if GTEST_HAS_STREAM_REDIRECTION - -// Defines the stderr capturer: -// CaptureStdout - starts capturing stdout. -// GetCapturedStdout - stops capturing stdout and returns the captured string. -// CaptureStderr - starts capturing stderr. -// GetCapturedStderr - stops capturing stderr and returns the captured string. -// -GTEST_API_ void CaptureStdout(); -GTEST_API_ std::string GetCapturedStdout(); -GTEST_API_ void CaptureStderr(); -GTEST_API_ std::string GetCapturedStderr(); - -#endif // GTEST_HAS_STREAM_REDIRECTION -// Returns the size (in bytes) of a file. -GTEST_API_ size_t GetFileSize(FILE* file); - -// Reads the entire content of a file as a string. -GTEST_API_ std::string ReadEntireFile(FILE* file); - -// All command line arguments. -GTEST_API_ std::vector GetArgvs(); - -#if GTEST_HAS_DEATH_TEST - -std::vector GetInjectableArgvs(); -// Deprecated: pass the args vector by value instead. -void SetInjectableArgvs(const std::vector* new_argvs); -void SetInjectableArgvs(const std::vector& new_argvs); -#if GTEST_HAS_GLOBAL_STRING -void SetInjectableArgvs(const std::vector< ::string>& new_argvs); -#endif // GTEST_HAS_GLOBAL_STRING -void ClearInjectableArgvs(); - -#endif // GTEST_HAS_DEATH_TEST - -// Defines synchronization primitives. -#if GTEST_IS_THREADSAFE -# if GTEST_HAS_PTHREAD -// Sleeps for (roughly) n milliseconds. This function is only for testing -// Google Test's own constructs. Don't use it in user tests, either -// directly or indirectly. -inline void SleepMilliseconds(int n) { - const timespec time = { - 0, // 0 seconds. - n * 1000L * 1000L, // And n ms. - }; - nanosleep(&time, NULL); -} -# endif // GTEST_HAS_PTHREAD - -# if GTEST_HAS_NOTIFICATION_ -// Notification has already been imported into the namespace. -// Nothing to do here. - -# elif GTEST_HAS_PTHREAD -// Allows a controller thread to pause execution of newly created -// threads until notified. Instances of this class must be created -// and destroyed in the controller thread. -// -// This class is only for testing Google Test's own constructs. Do not -// use it in user tests, either directly or indirectly. -class Notification { - public: - Notification() : notified_(false) { - GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, NULL)); - } - ~Notification() { - pthread_mutex_destroy(&mutex_); - } - - // Notifies all threads created with this notification to start. Must - // be called from the controller thread. - void Notify() { - pthread_mutex_lock(&mutex_); - notified_ = true; - pthread_mutex_unlock(&mutex_); - } - - // Blocks until the controller thread notifies. Must be called from a test - // thread. - void WaitForNotification() { - for (;;) { - pthread_mutex_lock(&mutex_); - const bool notified = notified_; - pthread_mutex_unlock(&mutex_); - if (notified) - break; - SleepMilliseconds(10); - } - } - - private: - pthread_mutex_t mutex_; - bool notified_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification); -}; - -# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT - -GTEST_API_ void SleepMilliseconds(int n); - -// Provides leak-safe Windows kernel handle ownership. -// Used in death tests and in threading support. -class GTEST_API_ AutoHandle { - public: - // Assume that Win32 HANDLE type is equivalent to void*. Doing so allows us to - // avoid including in this header file. Including is - // undesirable because it defines a lot of symbols and macros that tend to - // conflict with client code. This assumption is verified by - // WindowsTypesTest.HANDLEIsVoidStar. - typedef void* Handle; - AutoHandle(); - explicit AutoHandle(Handle handle); - - ~AutoHandle(); - - Handle Get() const; - void Reset(); - void Reset(Handle handle); - - private: - // Returns true iff the handle is a valid handle object that can be closed. - bool IsCloseable() const; - - Handle handle_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(AutoHandle); -}; - -// Allows a controller thread to pause execution of newly created -// threads until notified. Instances of this class must be created -// and destroyed in the controller thread. -// -// This class is only for testing Google Test's own constructs. Do not -// use it in user tests, either directly or indirectly. -class GTEST_API_ Notification { - public: - Notification(); - void Notify(); - void WaitForNotification(); - - private: - AutoHandle event_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification); -}; -# endif // GTEST_HAS_NOTIFICATION_ - -// On MinGW, we can have both GTEST_OS_WINDOWS and GTEST_HAS_PTHREAD -// defined, but we don't want to use MinGW's pthreads implementation, which -// has conformance problems with some versions of the POSIX standard. -# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW - -// As a C-function, ThreadFuncWithCLinkage cannot be templated itself. -// Consequently, it cannot select a correct instantiation of ThreadWithParam -// in order to call its Run(). Introducing ThreadWithParamBase as a -// non-templated base class for ThreadWithParam allows us to bypass this -// problem. -class ThreadWithParamBase { - public: - virtual ~ThreadWithParamBase() {} - virtual void Run() = 0; -}; - -// pthread_create() accepts a pointer to a function type with the C linkage. -// According to the Standard (7.5/1), function types with different linkages -// are different even if they are otherwise identical. Some compilers (for -// example, SunStudio) treat them as different types. Since class methods -// cannot be defined with C-linkage we need to define a free C-function to -// pass into pthread_create(). -extern "C" inline void* ThreadFuncWithCLinkage(void* thread) { - static_cast(thread)->Run(); - return NULL; -} - -// Helper class for testing Google Test's multi-threading constructs. -// To use it, write: -// -// void ThreadFunc(int param) { /* Do things with param */ } -// Notification thread_can_start; -// ... -// // The thread_can_start parameter is optional; you can supply NULL. -// ThreadWithParam thread(&ThreadFunc, 5, &thread_can_start); -// thread_can_start.Notify(); -// -// These classes are only for testing Google Test's own constructs. Do -// not use them in user tests, either directly or indirectly. -template -class ThreadWithParam : public ThreadWithParamBase { - public: - typedef void UserThreadFunc(T); - - ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start) - : func_(func), - param_(param), - thread_can_start_(thread_can_start), - finished_(false) { - ThreadWithParamBase* const base = this; - // The thread can be created only after all fields except thread_ - // have been initialized. - GTEST_CHECK_POSIX_SUCCESS_( - pthread_create(&thread_, 0, &ThreadFuncWithCLinkage, base)); - } - ~ThreadWithParam() { Join(); } - - void Join() { - if (!finished_) { - GTEST_CHECK_POSIX_SUCCESS_(pthread_join(thread_, 0)); - finished_ = true; - } - } - - virtual void Run() { - if (thread_can_start_ != NULL) - thread_can_start_->WaitForNotification(); - func_(param_); - } - - private: - UserThreadFunc* const func_; // User-supplied thread function. - const T param_; // User-supplied parameter to the thread function. - // When non-NULL, used to block execution until the controller thread - // notifies. - Notification* const thread_can_start_; - bool finished_; // true iff we know that the thread function has finished. - pthread_t thread_; // The native thread object. - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam); -}; -# endif // !GTEST_OS_WINDOWS && GTEST_HAS_PTHREAD || - // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ - -# if GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ -// Mutex and ThreadLocal have already been imported into the namespace. -// Nothing to do here. - -# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT - -// Mutex implements mutex on Windows platforms. It is used in conjunction -// with class MutexLock: -// -// Mutex mutex; -// ... -// MutexLock lock(&mutex); // Acquires the mutex and releases it at the -// // end of the current scope. -// -// A static Mutex *must* be defined or declared using one of the following -// macros: -// GTEST_DEFINE_STATIC_MUTEX_(g_some_mutex); -// GTEST_DECLARE_STATIC_MUTEX_(g_some_mutex); -// -// (A non-static Mutex is defined/declared in the usual way). -class GTEST_API_ Mutex { - public: - enum MutexType { kStatic = 0, kDynamic = 1 }; - // We rely on kStaticMutex being 0 as it is to what the linker initializes - // type_ in static mutexes. critical_section_ will be initialized lazily - // in ThreadSafeLazyInit(). - enum StaticConstructorSelector { kStaticMutex = 0 }; - - // This constructor intentionally does nothing. It relies on type_ being - // statically initialized to 0 (effectively setting it to kStatic) and on - // ThreadSafeLazyInit() to lazily initialize the rest of the members. - explicit Mutex(StaticConstructorSelector /*dummy*/) {} - - Mutex(); - ~Mutex(); - - void Lock(); - - void Unlock(); - - // Does nothing if the current thread holds the mutex. Otherwise, crashes - // with high probability. - void AssertHeld(); - - private: - // Initializes owner_thread_id_ and critical_section_ in static mutexes. - void ThreadSafeLazyInit(); - - // Per http://blogs.msdn.com/b/oldnewthing/archive/2004/02/23/78395.aspx, - // we assume that 0 is an invalid value for thread IDs. - unsigned int owner_thread_id_; - - // For static mutexes, we rely on these members being initialized to zeros - // by the linker. - MutexType type_; - long critical_section_init_phase_; // NOLINT - GTEST_CRITICAL_SECTION* critical_section_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex); -}; - -# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \ - extern ::testing::internal::Mutex mutex - -# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \ - ::testing::internal::Mutex mutex(::testing::internal::Mutex::kStaticMutex) - -// We cannot name this class MutexLock because the ctor declaration would -// conflict with a macro named MutexLock, which is defined on some -// platforms. That macro is used as a defensive measure to prevent against -// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than -// "MutexLock l(&mu)". Hence the typedef trick below. -class GTestMutexLock { - public: - explicit GTestMutexLock(Mutex* mutex) - : mutex_(mutex) { mutex_->Lock(); } - - ~GTestMutexLock() { mutex_->Unlock(); } - - private: - Mutex* const mutex_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock); -}; - -typedef GTestMutexLock MutexLock; - -// Base class for ValueHolder. Allows a caller to hold and delete a value -// without knowing its type. -class ThreadLocalValueHolderBase { - public: - virtual ~ThreadLocalValueHolderBase() {} -}; - -// Provides a way for a thread to send notifications to a ThreadLocal -// regardless of its parameter type. -class ThreadLocalBase { - public: - // Creates a new ValueHolder object holding a default value passed to - // this ThreadLocal's constructor and returns it. It is the caller's - // responsibility not to call this when the ThreadLocal instance already - // has a value on the current thread. - virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const = 0; - - protected: - ThreadLocalBase() {} - virtual ~ThreadLocalBase() {} - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocalBase); -}; - -// Maps a thread to a set of ThreadLocals that have values instantiated on that -// thread and notifies them when the thread exits. A ThreadLocal instance is -// expected to persist until all threads it has values on have terminated. -class GTEST_API_ ThreadLocalRegistry { - public: - // Registers thread_local_instance as having value on the current thread. - // Returns a value that can be used to identify the thread from other threads. - static ThreadLocalValueHolderBase* GetValueOnCurrentThread( - const ThreadLocalBase* thread_local_instance); - - // Invoked when a ThreadLocal instance is destroyed. - static void OnThreadLocalDestroyed( - const ThreadLocalBase* thread_local_instance); -}; - -class GTEST_API_ ThreadWithParamBase { - public: - void Join(); - - protected: - class Runnable { - public: - virtual ~Runnable() {} - virtual void Run() = 0; - }; - - ThreadWithParamBase(Runnable *runnable, Notification* thread_can_start); - virtual ~ThreadWithParamBase(); - - private: - AutoHandle thread_; -}; - -// Helper class for testing Google Test's multi-threading constructs. -template -class ThreadWithParam : public ThreadWithParamBase { - public: - typedef void UserThreadFunc(T); - - ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start) - : ThreadWithParamBase(new RunnableImpl(func, param), thread_can_start) { - } - virtual ~ThreadWithParam() {} - - private: - class RunnableImpl : public Runnable { - public: - RunnableImpl(UserThreadFunc* func, T param) - : func_(func), - param_(param) { - } - virtual ~RunnableImpl() {} - virtual void Run() { - func_(param_); - } - - private: - UserThreadFunc* const func_; - const T param_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(RunnableImpl); - }; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam); -}; - -// Implements thread-local storage on Windows systems. -// -// // Thread 1 -// ThreadLocal tl(100); // 100 is the default value for each thread. -// -// // Thread 2 -// tl.set(150); // Changes the value for thread 2 only. -// EXPECT_EQ(150, tl.get()); -// -// // Thread 1 -// EXPECT_EQ(100, tl.get()); // In thread 1, tl has the original value. -// tl.set(200); -// EXPECT_EQ(200, tl.get()); -// -// The template type argument T must have a public copy constructor. -// In addition, the default ThreadLocal constructor requires T to have -// a public default constructor. -// -// The users of a TheadLocal instance have to make sure that all but one -// threads (including the main one) using that instance have exited before -// destroying it. Otherwise, the per-thread objects managed for them by the -// ThreadLocal instance are not guaranteed to be destroyed on all platforms. -// -// Google Test only uses global ThreadLocal objects. That means they -// will die after main() has returned. Therefore, no per-thread -// object managed by Google Test will be leaked as long as all threads -// using Google Test have exited when main() returns. -template -class ThreadLocal : public ThreadLocalBase { - public: - ThreadLocal() : default_factory_(new DefaultValueHolderFactory()) {} - explicit ThreadLocal(const T& value) - : default_factory_(new InstanceValueHolderFactory(value)) {} - - ~ThreadLocal() { ThreadLocalRegistry::OnThreadLocalDestroyed(this); } - - T* pointer() { return GetOrCreateValue(); } - const T* pointer() const { return GetOrCreateValue(); } - const T& get() const { return *pointer(); } - void set(const T& value) { *pointer() = value; } - - private: - // Holds a value of T. Can be deleted via its base class without the caller - // knowing the type of T. - class ValueHolder : public ThreadLocalValueHolderBase { - public: - ValueHolder() : value_() {} - explicit ValueHolder(const T& value) : value_(value) {} - - T* pointer() { return &value_; } - - private: - T value_; - GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder); - }; - - - T* GetOrCreateValue() const { - return static_cast( - ThreadLocalRegistry::GetValueOnCurrentThread(this))->pointer(); - } - - virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const { - return default_factory_->MakeNewHolder(); - } - - class ValueHolderFactory { - public: - ValueHolderFactory() {} - virtual ~ValueHolderFactory() {} - virtual ValueHolder* MakeNewHolder() const = 0; - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory); - }; - - class DefaultValueHolderFactory : public ValueHolderFactory { - public: - DefaultValueHolderFactory() {} - virtual ValueHolder* MakeNewHolder() const { return new ValueHolder(); } - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory); - }; - - class InstanceValueHolderFactory : public ValueHolderFactory { - public: - explicit InstanceValueHolderFactory(const T& value) : value_(value) {} - virtual ValueHolder* MakeNewHolder() const { - return new ValueHolder(value_); - } - - private: - const T value_; // The value for each thread. - - GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory); - }; - - scoped_ptr default_factory_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal); -}; - -# elif GTEST_HAS_PTHREAD - -// MutexBase and Mutex implement mutex on pthreads-based platforms. -class MutexBase { - public: - // Acquires this mutex. - void Lock() { - GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&mutex_)); - owner_ = pthread_self(); - has_owner_ = true; - } - - // Releases this mutex. - void Unlock() { - // Since the lock is being released the owner_ field should no longer be - // considered valid. We don't protect writing to has_owner_ here, as it's - // the caller's responsibility to ensure that the current thread holds the - // mutex when this is called. - has_owner_ = false; - GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_)); - } - - // Does nothing if the current thread holds the mutex. Otherwise, crashes - // with high probability. - void AssertHeld() const { - GTEST_CHECK_(has_owner_ && pthread_equal(owner_, pthread_self())) - << "The current thread is not holding the mutex @" << this; - } - - // A static mutex may be used before main() is entered. It may even - // be used before the dynamic initialization stage. Therefore we - // must be able to initialize a static mutex object at link time. - // This means MutexBase has to be a POD and its member variables - // have to be public. - public: - pthread_mutex_t mutex_; // The underlying pthread mutex. - // has_owner_ indicates whether the owner_ field below contains a valid thread - // ID and is therefore safe to inspect (e.g., to use in pthread_equal()). All - // accesses to the owner_ field should be protected by a check of this field. - // An alternative might be to memset() owner_ to all zeros, but there's no - // guarantee that a zero'd pthread_t is necessarily invalid or even different - // from pthread_self(). - bool has_owner_; - pthread_t owner_; // The thread holding the mutex. -}; - -// Forward-declares a static mutex. -# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \ - extern ::testing::internal::MutexBase mutex - -// Defines and statically (i.e. at link time) initializes a static mutex. -// The initialization list here does not explicitly initialize each field, -// instead relying on default initialization for the unspecified fields. In -// particular, the owner_ field (a pthread_t) is not explicitly initialized. -// This allows initialization to work whether pthread_t is a scalar or struct. -// The flag -Wmissing-field-initializers must not be specified for this to work. -# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \ - ::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false } - -// The Mutex class can only be used for mutexes created at runtime. It -// shares its API with MutexBase otherwise. -class Mutex : public MutexBase { - public: - Mutex() { - GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, NULL)); - has_owner_ = false; - } - ~Mutex() { - GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&mutex_)); - } - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex); -}; - -// We cannot name this class MutexLock because the ctor declaration would -// conflict with a macro named MutexLock, which is defined on some -// platforms. That macro is used as a defensive measure to prevent against -// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than -// "MutexLock l(&mu)". Hence the typedef trick below. -class GTestMutexLock { - public: - explicit GTestMutexLock(MutexBase* mutex) - : mutex_(mutex) { mutex_->Lock(); } - - ~GTestMutexLock() { mutex_->Unlock(); } - - private: - MutexBase* const mutex_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock); -}; - -typedef GTestMutexLock MutexLock; - -// Helpers for ThreadLocal. - -// pthread_key_create() requires DeleteThreadLocalValue() to have -// C-linkage. Therefore it cannot be templatized to access -// ThreadLocal. Hence the need for class -// ThreadLocalValueHolderBase. -class ThreadLocalValueHolderBase { - public: - virtual ~ThreadLocalValueHolderBase() {} -}; - -// Called by pthread to delete thread-local data stored by -// pthread_setspecific(). -extern "C" inline void DeleteThreadLocalValue(void* value_holder) { - delete static_cast(value_holder); -} - -// Implements thread-local storage on pthreads-based systems. -template -class GTEST_API_ ThreadLocal { - public: - ThreadLocal() - : key_(CreateKey()), default_factory_(new DefaultValueHolderFactory()) {} - explicit ThreadLocal(const T& value) - : key_(CreateKey()), - default_factory_(new InstanceValueHolderFactory(value)) {} - - ~ThreadLocal() { - // Destroys the managed object for the current thread, if any. - DeleteThreadLocalValue(pthread_getspecific(key_)); - - // Releases resources associated with the key. This will *not* - // delete managed objects for other threads. - GTEST_CHECK_POSIX_SUCCESS_(pthread_key_delete(key_)); - } - - T* pointer() { return GetOrCreateValue(); } - const T* pointer() const { return GetOrCreateValue(); } - const T& get() const { return *pointer(); } - void set(const T& value) { *pointer() = value; } - - private: - // Holds a value of type T. - class ValueHolder : public ThreadLocalValueHolderBase { - public: - ValueHolder() : value_() {} - explicit ValueHolder(const T& value) : value_(value) {} - - T* pointer() { return &value_; } - - private: - T value_; - GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder); - }; - - static pthread_key_t CreateKey() { - pthread_key_t key; - // When a thread exits, DeleteThreadLocalValue() will be called on - // the object managed for that thread. - GTEST_CHECK_POSIX_SUCCESS_( - pthread_key_create(&key, &DeleteThreadLocalValue)); - return key; - } - - T* GetOrCreateValue() const { - ThreadLocalValueHolderBase* const holder = - static_cast(pthread_getspecific(key_)); - if (holder != NULL) { - return CheckedDowncastToActualType(holder)->pointer(); - } - - ValueHolder* const new_holder = default_factory_->MakeNewHolder(); - ThreadLocalValueHolderBase* const holder_base = new_holder; - GTEST_CHECK_POSIX_SUCCESS_(pthread_setspecific(key_, holder_base)); - return new_holder->pointer(); - } - - class ValueHolderFactory { - public: - ValueHolderFactory() {} - virtual ~ValueHolderFactory() {} - virtual ValueHolder* MakeNewHolder() const = 0; - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory); - }; - - class DefaultValueHolderFactory : public ValueHolderFactory { - public: - DefaultValueHolderFactory() {} - virtual ValueHolder* MakeNewHolder() const { return new ValueHolder(); } - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory); - }; - - class InstanceValueHolderFactory : public ValueHolderFactory { - public: - explicit InstanceValueHolderFactory(const T& value) : value_(value) {} - virtual ValueHolder* MakeNewHolder() const { - return new ValueHolder(value_); - } - - private: - const T value_; // The value for each thread. - - GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory); - }; - - // A key pthreads uses for looking up per-thread values. - const pthread_key_t key_; - scoped_ptr default_factory_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal); -}; - -# endif // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ - -#else // GTEST_IS_THREADSAFE - -// A dummy implementation of synchronization primitives (mutex, lock, -// and thread-local variable). Necessary for compiling Google Test where -// mutex is not supported - using Google Test in multiple threads is not -// supported on such platforms. - -class Mutex { - public: - Mutex() {} - void Lock() {} - void Unlock() {} - void AssertHeld() const {} -}; - -# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \ - extern ::testing::internal::Mutex mutex - -# define GTEST_DEFINE_STATIC_MUTEX_(mutex) ::testing::internal::Mutex mutex - -// We cannot name this class MutexLock because the ctor declaration would -// conflict with a macro named MutexLock, which is defined on some -// platforms. That macro is used as a defensive measure to prevent against -// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than -// "MutexLock l(&mu)". Hence the typedef trick below. -class GTestMutexLock { - public: - explicit GTestMutexLock(Mutex*) {} // NOLINT -}; - -typedef GTestMutexLock MutexLock; - -template -class GTEST_API_ ThreadLocal { - public: - ThreadLocal() : value_() {} - explicit ThreadLocal(const T& value) : value_(value) {} - T* pointer() { return &value_; } - const T* pointer() const { return &value_; } - const T& get() const { return value_; } - void set(const T& value) { value_ = value; } - private: - T value_; -}; - -#endif // GTEST_IS_THREADSAFE - -// Returns the number of threads running in the process, or 0 to indicate that -// we cannot detect it. -GTEST_API_ size_t GetThreadCount(); - -// Passing non-POD classes through ellipsis (...) crashes the ARM -// compiler and generates a warning in Sun Studio before 12u4. The Nokia Symbian -// and the IBM XL C/C++ compiler try to instantiate a copy constructor -// for objects passed through ellipsis (...), failing for uncopyable -// objects. We define this to ensure that only POD is passed through -// ellipsis on these systems. -#if defined(__SYMBIAN32__) || defined(__IBMCPP__) || \ - (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x5130) -// We lose support for NULL detection where the compiler doesn't like -// passing non-POD classes through ellipsis (...). -# define GTEST_ELLIPSIS_NEEDS_POD_ 1 -#else -# define GTEST_CAN_COMPARE_NULL 1 -#endif - -// The Nokia Symbian and IBM XL C/C++ compilers cannot decide between -// const T& and const T* in a function template. These compilers -// _can_ decide between class template specializations for T and T*, -// so a tr1::type_traits-like is_pointer works. -#if defined(__SYMBIAN32__) || defined(__IBMCPP__) -# define GTEST_NEEDS_IS_POINTER_ 1 -#endif - -template -struct bool_constant { - typedef bool_constant type; - static const bool value = bool_value; -}; -template const bool bool_constant::value; - -typedef bool_constant false_type; -typedef bool_constant true_type; - -template -struct is_same : public false_type {}; - -template -struct is_same : public true_type {}; - - -template -struct is_pointer : public false_type {}; - -template -struct is_pointer : public true_type {}; - -template -struct IteratorTraits { - typedef typename Iterator::value_type value_type; -}; - - -template -struct IteratorTraits { - typedef T value_type; -}; - -template -struct IteratorTraits { - typedef T value_type; -}; - -#if GTEST_OS_WINDOWS -# define GTEST_PATH_SEP_ "\\" -# define GTEST_HAS_ALT_PATH_SEP_ 1 -// The biggest signed integer type the compiler supports. -typedef __int64 BiggestInt; -#else -# define GTEST_PATH_SEP_ "/" -# define GTEST_HAS_ALT_PATH_SEP_ 0 -typedef long long BiggestInt; // NOLINT -#endif // GTEST_OS_WINDOWS - -// Utilities for char. - -// isspace(int ch) and friends accept an unsigned char or EOF. char -// may be signed, depending on the compiler (or compiler flags). -// Therefore we need to cast a char to unsigned char before calling -// isspace(), etc. - -inline bool IsAlpha(char ch) { - return isalpha(static_cast(ch)) != 0; -} -inline bool IsAlNum(char ch) { - return isalnum(static_cast(ch)) != 0; -} -inline bool IsDigit(char ch) { - return isdigit(static_cast(ch)) != 0; -} -inline bool IsLower(char ch) { - return islower(static_cast(ch)) != 0; -} -inline bool IsSpace(char ch) { - return isspace(static_cast(ch)) != 0; -} -inline bool IsUpper(char ch) { - return isupper(static_cast(ch)) != 0; -} -inline bool IsXDigit(char ch) { - return isxdigit(static_cast(ch)) != 0; -} -inline bool IsXDigit(wchar_t ch) { - const unsigned char low_byte = static_cast(ch); - return ch == low_byte && isxdigit(low_byte) != 0; -} - -inline char ToLower(char ch) { - return static_cast(tolower(static_cast(ch))); -} -inline char ToUpper(char ch) { - return static_cast(toupper(static_cast(ch))); -} - -inline std::string StripTrailingSpaces(std::string str) { - std::string::iterator it = str.end(); - while (it != str.begin() && IsSpace(*--it)) - it = str.erase(it); - return str; -} - -// The testing::internal::posix namespace holds wrappers for common -// POSIX functions. These wrappers hide the differences between -// Windows/MSVC and POSIX systems. Since some compilers define these -// standard functions as macros, the wrapper cannot have the same name -// as the wrapped function. - -namespace posix { - -// Functions with a different name on Windows. - -#if GTEST_OS_WINDOWS - -typedef struct _stat StatStruct; - -# ifdef __BORLANDC__ -inline int IsATTY(int fd) { return isatty(fd); } -inline int StrCaseCmp(const char* s1, const char* s2) { - return stricmp(s1, s2); -} -inline char* StrDup(const char* src) { return strdup(src); } -# else // !__BORLANDC__ -# if GTEST_OS_WINDOWS_MOBILE -inline int IsATTY(int /* fd */) { return 0; } -# else -inline int IsATTY(int fd) { return _isatty(fd); } -# endif // GTEST_OS_WINDOWS_MOBILE -inline int StrCaseCmp(const char* s1, const char* s2) { - return _stricmp(s1, s2); -} -inline char* StrDup(const char* src) { return _strdup(src); } -# endif // __BORLANDC__ - -# if GTEST_OS_WINDOWS_MOBILE -inline int FileNo(FILE* file) { return reinterpret_cast(_fileno(file)); } -// Stat(), RmDir(), and IsDir() are not needed on Windows CE at this -// time and thus not defined there. -# else -inline int FileNo(FILE* file) { return _fileno(file); } -inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); } -inline int RmDir(const char* dir) { return _rmdir(dir); } -inline bool IsDir(const StatStruct& st) { - return (_S_IFDIR & st.st_mode) != 0; -} -# endif // GTEST_OS_WINDOWS_MOBILE - -#else - -typedef struct stat StatStruct; - -inline int FileNo(FILE* file) { return fileno(file); } -inline int IsATTY(int fd) { return isatty(fd); } -inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); } -inline int StrCaseCmp(const char* s1, const char* s2) { - return strcasecmp(s1, s2); -} -inline char* StrDup(const char* src) { return strdup(src); } -inline int RmDir(const char* dir) { return rmdir(dir); } -inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); } - -#endif // GTEST_OS_WINDOWS - -// Functions deprecated by MSVC 8.0. - -GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996 /* deprecated function */) - -inline const char* StrNCpy(char* dest, const char* src, size_t n) { - return strncpy(dest, src, n); -} - -// ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and -// StrError() aren't needed on Windows CE at this time and thus not -// defined there. - -#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT -inline int ChDir(const char* dir) { return chdir(dir); } -#endif -inline FILE* FOpen(const char* path, const char* mode) { - return fopen(path, mode); -} -#if !GTEST_OS_WINDOWS_MOBILE -inline FILE *FReopen(const char* path, const char* mode, FILE* stream) { - return freopen(path, mode, stream); -} -inline FILE* FDOpen(int fd, const char* mode) { return fdopen(fd, mode); } -#endif -inline int FClose(FILE* fp) { return fclose(fp); } -#if !GTEST_OS_WINDOWS_MOBILE -inline int Read(int fd, void* buf, unsigned int count) { - return static_cast(read(fd, buf, count)); -} -inline int Write(int fd, const void* buf, unsigned int count) { - return static_cast(write(fd, buf, count)); -} -inline int Close(int fd) { return close(fd); } -inline const char* StrError(int errnum) { return strerror(errnum); } -#endif -inline const char* GetEnv(const char* name) { -#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT - // We are on Windows CE, which has no environment variables. - static_cast(name); // To prevent 'unused argument' warning. - return NULL; -#elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9) - // Environment variables which we programmatically clear will be set to the - // empty string rather than unset (NULL). Handle that case. - const char* const env = getenv(name); - return (env != NULL && env[0] != '\0') ? env : NULL; -#else - return getenv(name); -#endif -} - -GTEST_DISABLE_MSC_WARNINGS_POP_() - -#if GTEST_OS_WINDOWS_MOBILE -// Windows CE has no C library. The abort() function is used in -// several places in Google Test. This implementation provides a reasonable -// imitation of standard behaviour. -void Abort(); -#else -inline void Abort() { abort(); } -#endif // GTEST_OS_WINDOWS_MOBILE - -} // namespace posix - -// MSVC "deprecates" snprintf and issues warnings wherever it is used. In -// order to avoid these warnings, we need to use _snprintf or _snprintf_s on -// MSVC-based platforms. We map the GTEST_SNPRINTF_ macro to the appropriate -// function in order to achieve that. We use macro definition here because -// snprintf is a variadic function. -#if _MSC_VER >= 1400 && !GTEST_OS_WINDOWS_MOBILE -// MSVC 2005 and above support variadic macros. -# define GTEST_SNPRINTF_(buffer, size, format, ...) \ - _snprintf_s(buffer, size, size, format, __VA_ARGS__) -#elif defined(_MSC_VER) -// Windows CE does not define _snprintf_s and MSVC prior to 2005 doesn't -// complain about _snprintf. -# define GTEST_SNPRINTF_ _snprintf -#else -# define GTEST_SNPRINTF_ snprintf -#endif - -// The maximum number a BiggestInt can represent. This definition -// works no matter BiggestInt is represented in one's complement or -// two's complement. -// -// We cannot rely on numeric_limits in STL, as __int64 and long long -// are not part of standard C++ and numeric_limits doesn't need to be -// defined for them. -const BiggestInt kMaxBiggestInt = - ~(static_cast(1) << (8*sizeof(BiggestInt) - 1)); - -// This template class serves as a compile-time function from size to -// type. It maps a size in bytes to a primitive type with that -// size. e.g. -// -// TypeWithSize<4>::UInt -// -// is typedef-ed to be unsigned int (unsigned integer made up of 4 -// bytes). -// -// Such functionality should belong to STL, but I cannot find it -// there. -// -// Google Test uses this class in the implementation of floating-point -// comparison. -// -// For now it only handles UInt (unsigned int) as that's all Google Test -// needs. Other types can be easily added in the future if need -// arises. -template -class TypeWithSize { - public: - // This prevents the user from using TypeWithSize with incorrect - // values of N. - typedef void UInt; -}; - -// The specialization for size 4. -template <> -class TypeWithSize<4> { - public: - // unsigned int has size 4 in both gcc and MSVC. - // - // As base/basictypes.h doesn't compile on Windows, we cannot use - // uint32, uint64, and etc here. - typedef int Int; - typedef unsigned int UInt; -}; - -// The specialization for size 8. -template <> -class TypeWithSize<8> { - public: -#if GTEST_OS_WINDOWS - typedef __int64 Int; - typedef unsigned __int64 UInt; -#else - typedef long long Int; // NOLINT - typedef unsigned long long UInt; // NOLINT -#endif // GTEST_OS_WINDOWS -}; - -// Integer types of known sizes. -typedef TypeWithSize<4>::Int Int32; -typedef TypeWithSize<4>::UInt UInt32; -typedef TypeWithSize<8>::Int Int64; -typedef TypeWithSize<8>::UInt UInt64; -typedef TypeWithSize<8>::Int TimeInMillis; // Represents time in milliseconds. - -// Utilities for command line flags and environment variables. - -// Macro for referencing flags. -#if !defined(GTEST_FLAG) -# define GTEST_FLAG(name) FLAGS_gtest_##name -#endif // !defined(GTEST_FLAG) - -#if !defined(GTEST_USE_OWN_FLAGFILE_FLAG_) -# define GTEST_USE_OWN_FLAGFILE_FLAG_ 1 -#endif // !defined(GTEST_USE_OWN_FLAGFILE_FLAG_) - -#if !defined(GTEST_DECLARE_bool_) -# define GTEST_FLAG_SAVER_ ::testing::internal::GTestFlagSaver - -// Macros for declaring flags. -# define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name) -# define GTEST_DECLARE_int32_(name) \ - GTEST_API_ extern ::testing::internal::Int32 GTEST_FLAG(name) -# define GTEST_DECLARE_string_(name) \ - GTEST_API_ extern ::std::string GTEST_FLAG(name) - -// Macros for defining flags. -# define GTEST_DEFINE_bool_(name, default_val, doc) \ - GTEST_API_ bool GTEST_FLAG(name) = (default_val) -# define GTEST_DEFINE_int32_(name, default_val, doc) \ - GTEST_API_ ::testing::internal::Int32 GTEST_FLAG(name) = (default_val) -# define GTEST_DEFINE_string_(name, default_val, doc) \ - GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val) - -#endif // !defined(GTEST_DECLARE_bool_) - -// Thread annotations -#if !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_) -# define GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks) -# define GTEST_LOCK_EXCLUDED_(locks) -#endif // !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_) - -// Parses 'str' for a 32-bit signed integer. If successful, writes the result -// to *value and returns true; otherwise leaves *value unchanged and returns -// false. -// TODO(chandlerc): Find a better way to refactor flag and environment parsing -// out of both gtest-port.cc and gtest.cc to avoid exporting this utility -// function. -bool ParseInt32(const Message& src_text, const char* str, Int32* value); - -// Parses a bool/Int32/string from the environment variable -// corresponding to the given Google Test flag. -bool BoolFromGTestEnv(const char* flag, bool default_val); -GTEST_API_ Int32 Int32FromGTestEnv(const char* flag, Int32 default_val); -std::string OutputFlagAlsoCheckEnvVar(); -const char* StringFromGTestEnv(const char* flag, const char* default_val); - -} // namespace internal -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-string.h b/test/gtest-1.8.0/include/gtest/internal/gtest-string.h deleted file mode 100644 index 71eb840c1f..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-string.h +++ /dev/null @@ -1,167 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// -// The Google C++ Testing and Mocking Framework (Google Test) -// -// This header file declares the String class and functions used internally by -// Google Test. They are subject to change without notice. They should not used -// by code external to Google Test. -// -// This header file is #included by -// gtest/internal/gtest-internal.h. -// It should not be #included by other files. - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ - -#ifdef __BORLANDC__ -// string.h is not guaranteed to provide strcpy on C++ Builder. -# include -#endif - -#include -#include - -#include "gtest/internal/gtest-port.h" - -namespace testing { -namespace internal { - -// String - an abstract class holding static string utilities. -class GTEST_API_ String { - public: - // Static utility methods - - // Clones a 0-terminated C string, allocating memory using new. The - // caller is responsible for deleting the return value using - // delete[]. Returns the cloned string, or NULL if the input is - // NULL. - // - // This is different from strdup() in string.h, which allocates - // memory using malloc(). - static const char* CloneCString(const char* c_str); - -#if GTEST_OS_WINDOWS_MOBILE - // Windows CE does not have the 'ANSI' versions of Win32 APIs. To be - // able to pass strings to Win32 APIs on CE we need to convert them - // to 'Unicode', UTF-16. - - // Creates a UTF-16 wide string from the given ANSI string, allocating - // memory using new. The caller is responsible for deleting the return - // value using delete[]. Returns the wide string, or NULL if the - // input is NULL. - // - // The wide string is created using the ANSI codepage (CP_ACP) to - // match the behaviour of the ANSI versions of Win32 calls and the - // C runtime. - static LPCWSTR AnsiToUtf16(const char* c_str); - - // Creates an ANSI string from the given wide string, allocating - // memory using new. The caller is responsible for deleting the return - // value using delete[]. Returns the ANSI string, or NULL if the - // input is NULL. - // - // The returned string is created using the ANSI codepage (CP_ACP) to - // match the behaviour of the ANSI versions of Win32 calls and the - // C runtime. - static const char* Utf16ToAnsi(LPCWSTR utf16_str); -#endif - - // Compares two C strings. Returns true iff they have the same content. - // - // Unlike strcmp(), this function can handle NULL argument(s). A - // NULL C string is considered different to any non-NULL C string, - // including the empty string. - static bool CStringEquals(const char* lhs, const char* rhs); - - // Converts a wide C string to a String using the UTF-8 encoding. - // NULL will be converted to "(null)". If an error occurred during - // the conversion, "(failed to convert from wide string)" is - // returned. - static std::string ShowWideCString(const wchar_t* wide_c_str); - - // Compares two wide C strings. Returns true iff they have the same - // content. - // - // Unlike wcscmp(), this function can handle NULL argument(s). A - // NULL C string is considered different to any non-NULL C string, - // including the empty string. - static bool WideCStringEquals(const wchar_t* lhs, const wchar_t* rhs); - - // Compares two C strings, ignoring case. Returns true iff they - // have the same content. - // - // Unlike strcasecmp(), this function can handle NULL argument(s). - // A NULL C string is considered different to any non-NULL C string, - // including the empty string. - static bool CaseInsensitiveCStringEquals(const char* lhs, - const char* rhs); - - // Compares two wide C strings, ignoring case. Returns true iff they - // have the same content. - // - // Unlike wcscasecmp(), this function can handle NULL argument(s). - // A NULL C string is considered different to any non-NULL wide C string, - // including the empty string. - // NB: The implementations on different platforms slightly differ. - // On windows, this method uses _wcsicmp which compares according to LC_CTYPE - // environment variable. On GNU platform this method uses wcscasecmp - // which compares according to LC_CTYPE category of the current locale. - // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the - // current locale. - static bool CaseInsensitiveWideCStringEquals(const wchar_t* lhs, - const wchar_t* rhs); - - // Returns true iff the given string ends with the given suffix, ignoring - // case. Any string is considered to end with an empty suffix. - static bool EndsWithCaseInsensitive( - const std::string& str, const std::string& suffix); - - // Formats an int value as "%02d". - static std::string FormatIntWidth2(int value); // "%02d" for width == 2 - - // Formats an int value as "%X". - static std::string FormatHexInt(int value); - - // Formats a byte as "%02X". - static std::string FormatByte(unsigned char value); - - private: - String(); // Not meant to be instantiated. -}; // class String - -// Gets the content of the stringstream's buffer as an std::string. Each '\0' -// character in the buffer is replaced with "\\0". -GTEST_API_ std::string StringStreamToString(::std::stringstream* stream); - -} // namespace internal -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h b/test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h deleted file mode 100644 index e9b405340a..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h +++ /dev/null @@ -1,1020 +0,0 @@ -// This file was GENERATED by command: -// pump.py gtest-tuple.h.pump -// DO NOT EDIT BY HAND!!! - -// Copyright 2009 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Implements a subset of TR1 tuple needed by Google Test and Google Mock. - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ - -#include // For ::std::pair. - -// The compiler used in Symbian has a bug that prevents us from declaring the -// tuple template as a friend (it complains that tuple is redefined). This -// hack bypasses the bug by declaring the members that should otherwise be -// private as public. -// Sun Studio versions < 12 also have the above bug. -#if defined(__SYMBIAN32__) || (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590) -# define GTEST_DECLARE_TUPLE_AS_FRIEND_ public: -#else -# define GTEST_DECLARE_TUPLE_AS_FRIEND_ \ - template friend class tuple; \ - private: -#endif - -// Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that conflict -// with our own definitions. Therefore using our own tuple does not work on -// those compilers. -#if defined(_MSC_VER) && _MSC_VER >= 1600 /* 1600 is Visual Studio 2010 */ -# error "gtest's tuple doesn't compile on Visual Studio 2010 or later. \ -GTEST_USE_OWN_TR1_TUPLE must be set to 0 on those compilers." -#endif - -// GTEST_n_TUPLE_(T) is the type of an n-tuple. -#define GTEST_0_TUPLE_(T) tuple<> -#define GTEST_1_TUPLE_(T) tuple -#define GTEST_2_TUPLE_(T) tuple -#define GTEST_3_TUPLE_(T) tuple -#define GTEST_4_TUPLE_(T) tuple -#define GTEST_5_TUPLE_(T) tuple -#define GTEST_6_TUPLE_(T) tuple -#define GTEST_7_TUPLE_(T) tuple -#define GTEST_8_TUPLE_(T) tuple -#define GTEST_9_TUPLE_(T) tuple -#define GTEST_10_TUPLE_(T) tuple - -// GTEST_n_TYPENAMES_(T) declares a list of n typenames. -#define GTEST_0_TYPENAMES_(T) -#define GTEST_1_TYPENAMES_(T) typename T##0 -#define GTEST_2_TYPENAMES_(T) typename T##0, typename T##1 -#define GTEST_3_TYPENAMES_(T) typename T##0, typename T##1, typename T##2 -#define GTEST_4_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ - typename T##3 -#define GTEST_5_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ - typename T##3, typename T##4 -#define GTEST_6_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ - typename T##3, typename T##4, typename T##5 -#define GTEST_7_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ - typename T##3, typename T##4, typename T##5, typename T##6 -#define GTEST_8_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ - typename T##3, typename T##4, typename T##5, typename T##6, typename T##7 -#define GTEST_9_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ - typename T##3, typename T##4, typename T##5, typename T##6, \ - typename T##7, typename T##8 -#define GTEST_10_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ - typename T##3, typename T##4, typename T##5, typename T##6, \ - typename T##7, typename T##8, typename T##9 - -// In theory, defining stuff in the ::std namespace is undefined -// behavior. We can do this as we are playing the role of a standard -// library vendor. -namespace std { -namespace tr1 { - -template -class tuple; - -// Anything in namespace gtest_internal is Google Test's INTERNAL -// IMPLEMENTATION DETAIL and MUST NOT BE USED DIRECTLY in user code. -namespace gtest_internal { - -// ByRef::type is T if T is a reference; otherwise it's const T&. -template -struct ByRef { typedef const T& type; }; // NOLINT -template -struct ByRef { typedef T& type; }; // NOLINT - -// A handy wrapper for ByRef. -#define GTEST_BY_REF_(T) typename ::std::tr1::gtest_internal::ByRef::type - -// AddRef::type is T if T is a reference; otherwise it's T&. This -// is the same as tr1::add_reference::type. -template -struct AddRef { typedef T& type; }; // NOLINT -template -struct AddRef { typedef T& type; }; // NOLINT - -// A handy wrapper for AddRef. -#define GTEST_ADD_REF_(T) typename ::std::tr1::gtest_internal::AddRef::type - -// A helper for implementing get(). -template class Get; - -// A helper for implementing tuple_element. kIndexValid is true -// iff k < the number of fields in tuple type T. -template -struct TupleElement; - -template -struct TupleElement { - typedef T0 type; -}; - -template -struct TupleElement { - typedef T1 type; -}; - -template -struct TupleElement { - typedef T2 type; -}; - -template -struct TupleElement { - typedef T3 type; -}; - -template -struct TupleElement { - typedef T4 type; -}; - -template -struct TupleElement { - typedef T5 type; -}; - -template -struct TupleElement { - typedef T6 type; -}; - -template -struct TupleElement { - typedef T7 type; -}; - -template -struct TupleElement { - typedef T8 type; -}; - -template -struct TupleElement { - typedef T9 type; -}; - -} // namespace gtest_internal - -template <> -class tuple<> { - public: - tuple() {} - tuple(const tuple& /* t */) {} - tuple& operator=(const tuple& /* t */) { return *this; } -}; - -template -class GTEST_1_TUPLE_(T) { - public: - template friend class gtest_internal::Get; - - tuple() : f0_() {} - - explicit tuple(GTEST_BY_REF_(T0) f0) : f0_(f0) {} - - tuple(const tuple& t) : f0_(t.f0_) {} - - template - tuple(const GTEST_1_TUPLE_(U)& t) : f0_(t.f0_) {} - - tuple& operator=(const tuple& t) { return CopyFrom(t); } - - template - tuple& operator=(const GTEST_1_TUPLE_(U)& t) { - return CopyFrom(t); - } - - GTEST_DECLARE_TUPLE_AS_FRIEND_ - - template - tuple& CopyFrom(const GTEST_1_TUPLE_(U)& t) { - f0_ = t.f0_; - return *this; - } - - T0 f0_; -}; - -template -class GTEST_2_TUPLE_(T) { - public: - template friend class gtest_internal::Get; - - tuple() : f0_(), f1_() {} - - explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1) : f0_(f0), - f1_(f1) {} - - tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_) {} - - template - tuple(const GTEST_2_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_) {} - template - tuple(const ::std::pair& p) : f0_(p.first), f1_(p.second) {} - - tuple& operator=(const tuple& t) { return CopyFrom(t); } - - template - tuple& operator=(const GTEST_2_TUPLE_(U)& t) { - return CopyFrom(t); - } - template - tuple& operator=(const ::std::pair& p) { - f0_ = p.first; - f1_ = p.second; - return *this; - } - - GTEST_DECLARE_TUPLE_AS_FRIEND_ - - template - tuple& CopyFrom(const GTEST_2_TUPLE_(U)& t) { - f0_ = t.f0_; - f1_ = t.f1_; - return *this; - } - - T0 f0_; - T1 f1_; -}; - -template -class GTEST_3_TUPLE_(T) { - public: - template friend class gtest_internal::Get; - - tuple() : f0_(), f1_(), f2_() {} - - explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, - GTEST_BY_REF_(T2) f2) : f0_(f0), f1_(f1), f2_(f2) {} - - tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_) {} - - template - tuple(const GTEST_3_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_) {} - - tuple& operator=(const tuple& t) { return CopyFrom(t); } - - template - tuple& operator=(const GTEST_3_TUPLE_(U)& t) { - return CopyFrom(t); - } - - GTEST_DECLARE_TUPLE_AS_FRIEND_ - - template - tuple& CopyFrom(const GTEST_3_TUPLE_(U)& t) { - f0_ = t.f0_; - f1_ = t.f1_; - f2_ = t.f2_; - return *this; - } - - T0 f0_; - T1 f1_; - T2 f2_; -}; - -template -class GTEST_4_TUPLE_(T) { - public: - template friend class gtest_internal::Get; - - tuple() : f0_(), f1_(), f2_(), f3_() {} - - explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, - GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3) : f0_(f0), f1_(f1), f2_(f2), - f3_(f3) {} - - tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_) {} - - template - tuple(const GTEST_4_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), - f3_(t.f3_) {} - - tuple& operator=(const tuple& t) { return CopyFrom(t); } - - template - tuple& operator=(const GTEST_4_TUPLE_(U)& t) { - return CopyFrom(t); - } - - GTEST_DECLARE_TUPLE_AS_FRIEND_ - - template - tuple& CopyFrom(const GTEST_4_TUPLE_(U)& t) { - f0_ = t.f0_; - f1_ = t.f1_; - f2_ = t.f2_; - f3_ = t.f3_; - return *this; - } - - T0 f0_; - T1 f1_; - T2 f2_; - T3 f3_; -}; - -template -class GTEST_5_TUPLE_(T) { - public: - template friend class gtest_internal::Get; - - tuple() : f0_(), f1_(), f2_(), f3_(), f4_() {} - - explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, - GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, - GTEST_BY_REF_(T4) f4) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4) {} - - tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_), - f4_(t.f4_) {} - - template - tuple(const GTEST_5_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), - f3_(t.f3_), f4_(t.f4_) {} - - tuple& operator=(const tuple& t) { return CopyFrom(t); } - - template - tuple& operator=(const GTEST_5_TUPLE_(U)& t) { - return CopyFrom(t); - } - - GTEST_DECLARE_TUPLE_AS_FRIEND_ - - template - tuple& CopyFrom(const GTEST_5_TUPLE_(U)& t) { - f0_ = t.f0_; - f1_ = t.f1_; - f2_ = t.f2_; - f3_ = t.f3_; - f4_ = t.f4_; - return *this; - } - - T0 f0_; - T1 f1_; - T2 f2_; - T3 f3_; - T4 f4_; -}; - -template -class GTEST_6_TUPLE_(T) { - public: - template friend class gtest_internal::Get; - - tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_() {} - - explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, - GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4, - GTEST_BY_REF_(T5) f5) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4), - f5_(f5) {} - - tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_), - f4_(t.f4_), f5_(t.f5_) {} - - template - tuple(const GTEST_6_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), - f3_(t.f3_), f4_(t.f4_), f5_(t.f5_) {} - - tuple& operator=(const tuple& t) { return CopyFrom(t); } - - template - tuple& operator=(const GTEST_6_TUPLE_(U)& t) { - return CopyFrom(t); - } - - GTEST_DECLARE_TUPLE_AS_FRIEND_ - - template - tuple& CopyFrom(const GTEST_6_TUPLE_(U)& t) { - f0_ = t.f0_; - f1_ = t.f1_; - f2_ = t.f2_; - f3_ = t.f3_; - f4_ = t.f4_; - f5_ = t.f5_; - return *this; - } - - T0 f0_; - T1 f1_; - T2 f2_; - T3 f3_; - T4 f4_; - T5 f5_; -}; - -template -class GTEST_7_TUPLE_(T) { - public: - template friend class gtest_internal::Get; - - tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_() {} - - explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, - GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4, - GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6) : f0_(f0), f1_(f1), f2_(f2), - f3_(f3), f4_(f4), f5_(f5), f6_(f6) {} - - tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_), - f4_(t.f4_), f5_(t.f5_), f6_(t.f6_) {} - - template - tuple(const GTEST_7_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), - f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_) {} - - tuple& operator=(const tuple& t) { return CopyFrom(t); } - - template - tuple& operator=(const GTEST_7_TUPLE_(U)& t) { - return CopyFrom(t); - } - - GTEST_DECLARE_TUPLE_AS_FRIEND_ - - template - tuple& CopyFrom(const GTEST_7_TUPLE_(U)& t) { - f0_ = t.f0_; - f1_ = t.f1_; - f2_ = t.f2_; - f3_ = t.f3_; - f4_ = t.f4_; - f5_ = t.f5_; - f6_ = t.f6_; - return *this; - } - - T0 f0_; - T1 f1_; - T2 f2_; - T3 f3_; - T4 f4_; - T5 f5_; - T6 f6_; -}; - -template -class GTEST_8_TUPLE_(T) { - public: - template friend class gtest_internal::Get; - - tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_(), f7_() {} - - explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, - GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4, - GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6, - GTEST_BY_REF_(T7) f7) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4), - f5_(f5), f6_(f6), f7_(f7) {} - - tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_), - f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_) {} - - template - tuple(const GTEST_8_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), - f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_) {} - - tuple& operator=(const tuple& t) { return CopyFrom(t); } - - template - tuple& operator=(const GTEST_8_TUPLE_(U)& t) { - return CopyFrom(t); - } - - GTEST_DECLARE_TUPLE_AS_FRIEND_ - - template - tuple& CopyFrom(const GTEST_8_TUPLE_(U)& t) { - f0_ = t.f0_; - f1_ = t.f1_; - f2_ = t.f2_; - f3_ = t.f3_; - f4_ = t.f4_; - f5_ = t.f5_; - f6_ = t.f6_; - f7_ = t.f7_; - return *this; - } - - T0 f0_; - T1 f1_; - T2 f2_; - T3 f3_; - T4 f4_; - T5 f5_; - T6 f6_; - T7 f7_; -}; - -template -class GTEST_9_TUPLE_(T) { - public: - template friend class gtest_internal::Get; - - tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_(), f7_(), f8_() {} - - explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, - GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4, - GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6, GTEST_BY_REF_(T7) f7, - GTEST_BY_REF_(T8) f8) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4), - f5_(f5), f6_(f6), f7_(f7), f8_(f8) {} - - tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_), - f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_) {} - - template - tuple(const GTEST_9_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), - f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_) {} - - tuple& operator=(const tuple& t) { return CopyFrom(t); } - - template - tuple& operator=(const GTEST_9_TUPLE_(U)& t) { - return CopyFrom(t); - } - - GTEST_DECLARE_TUPLE_AS_FRIEND_ - - template - tuple& CopyFrom(const GTEST_9_TUPLE_(U)& t) { - f0_ = t.f0_; - f1_ = t.f1_; - f2_ = t.f2_; - f3_ = t.f3_; - f4_ = t.f4_; - f5_ = t.f5_; - f6_ = t.f6_; - f7_ = t.f7_; - f8_ = t.f8_; - return *this; - } - - T0 f0_; - T1 f1_; - T2 f2_; - T3 f3_; - T4 f4_; - T5 f5_; - T6 f6_; - T7 f7_; - T8 f8_; -}; - -template -class tuple { - public: - template friend class gtest_internal::Get; - - tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_(), f7_(), f8_(), - f9_() {} - - explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, - GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4, - GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6, GTEST_BY_REF_(T7) f7, - GTEST_BY_REF_(T8) f8, GTEST_BY_REF_(T9) f9) : f0_(f0), f1_(f1), f2_(f2), - f3_(f3), f4_(f4), f5_(f5), f6_(f6), f7_(f7), f8_(f8), f9_(f9) {} - - tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_), - f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_), f9_(t.f9_) {} - - template - tuple(const GTEST_10_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), - f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_), - f9_(t.f9_) {} - - tuple& operator=(const tuple& t) { return CopyFrom(t); } - - template - tuple& operator=(const GTEST_10_TUPLE_(U)& t) { - return CopyFrom(t); - } - - GTEST_DECLARE_TUPLE_AS_FRIEND_ - - template - tuple& CopyFrom(const GTEST_10_TUPLE_(U)& t) { - f0_ = t.f0_; - f1_ = t.f1_; - f2_ = t.f2_; - f3_ = t.f3_; - f4_ = t.f4_; - f5_ = t.f5_; - f6_ = t.f6_; - f7_ = t.f7_; - f8_ = t.f8_; - f9_ = t.f9_; - return *this; - } - - T0 f0_; - T1 f1_; - T2 f2_; - T3 f3_; - T4 f4_; - T5 f5_; - T6 f6_; - T7 f7_; - T8 f8_; - T9 f9_; -}; - -// 6.1.3.2 Tuple creation functions. - -// Known limitations: we don't support passing an -// std::tr1::reference_wrapper to make_tuple(). And we don't -// implement tie(). - -inline tuple<> make_tuple() { return tuple<>(); } - -template -inline GTEST_1_TUPLE_(T) make_tuple(const T0& f0) { - return GTEST_1_TUPLE_(T)(f0); -} - -template -inline GTEST_2_TUPLE_(T) make_tuple(const T0& f0, const T1& f1) { - return GTEST_2_TUPLE_(T)(f0, f1); -} - -template -inline GTEST_3_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2) { - return GTEST_3_TUPLE_(T)(f0, f1, f2); -} - -template -inline GTEST_4_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, - const T3& f3) { - return GTEST_4_TUPLE_(T)(f0, f1, f2, f3); -} - -template -inline GTEST_5_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, - const T3& f3, const T4& f4) { - return GTEST_5_TUPLE_(T)(f0, f1, f2, f3, f4); -} - -template -inline GTEST_6_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, - const T3& f3, const T4& f4, const T5& f5) { - return GTEST_6_TUPLE_(T)(f0, f1, f2, f3, f4, f5); -} - -template -inline GTEST_7_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, - const T3& f3, const T4& f4, const T5& f5, const T6& f6) { - return GTEST_7_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6); -} - -template -inline GTEST_8_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, - const T3& f3, const T4& f4, const T5& f5, const T6& f6, const T7& f7) { - return GTEST_8_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6, f7); -} - -template -inline GTEST_9_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, - const T3& f3, const T4& f4, const T5& f5, const T6& f6, const T7& f7, - const T8& f8) { - return GTEST_9_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6, f7, f8); -} - -template -inline GTEST_10_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, - const T3& f3, const T4& f4, const T5& f5, const T6& f6, const T7& f7, - const T8& f8, const T9& f9) { - return GTEST_10_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6, f7, f8, f9); -} - -// 6.1.3.3 Tuple helper classes. - -template struct tuple_size; - -template -struct tuple_size { - static const int value = 0; -}; - -template -struct tuple_size { - static const int value = 1; -}; - -template -struct tuple_size { - static const int value = 2; -}; - -template -struct tuple_size { - static const int value = 3; -}; - -template -struct tuple_size { - static const int value = 4; -}; - -template -struct tuple_size { - static const int value = 5; -}; - -template -struct tuple_size { - static const int value = 6; -}; - -template -struct tuple_size { - static const int value = 7; -}; - -template -struct tuple_size { - static const int value = 8; -}; - -template -struct tuple_size { - static const int value = 9; -}; - -template -struct tuple_size { - static const int value = 10; -}; - -template -struct tuple_element { - typedef typename gtest_internal::TupleElement< - k < (tuple_size::value), k, Tuple>::type type; -}; - -#define GTEST_TUPLE_ELEMENT_(k, Tuple) typename tuple_element::type - -// 6.1.3.4 Element access. - -namespace gtest_internal { - -template <> -class Get<0> { - public: - template - static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(0, Tuple)) - Field(Tuple& t) { return t.f0_; } // NOLINT - - template - static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(0, Tuple)) - ConstField(const Tuple& t) { return t.f0_; } -}; - -template <> -class Get<1> { - public: - template - static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(1, Tuple)) - Field(Tuple& t) { return t.f1_; } // NOLINT - - template - static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(1, Tuple)) - ConstField(const Tuple& t) { return t.f1_; } -}; - -template <> -class Get<2> { - public: - template - static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(2, Tuple)) - Field(Tuple& t) { return t.f2_; } // NOLINT - - template - static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(2, Tuple)) - ConstField(const Tuple& t) { return t.f2_; } -}; - -template <> -class Get<3> { - public: - template - static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(3, Tuple)) - Field(Tuple& t) { return t.f3_; } // NOLINT - - template - static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(3, Tuple)) - ConstField(const Tuple& t) { return t.f3_; } -}; - -template <> -class Get<4> { - public: - template - static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(4, Tuple)) - Field(Tuple& t) { return t.f4_; } // NOLINT - - template - static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(4, Tuple)) - ConstField(const Tuple& t) { return t.f4_; } -}; - -template <> -class Get<5> { - public: - template - static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(5, Tuple)) - Field(Tuple& t) { return t.f5_; } // NOLINT - - template - static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(5, Tuple)) - ConstField(const Tuple& t) { return t.f5_; } -}; - -template <> -class Get<6> { - public: - template - static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(6, Tuple)) - Field(Tuple& t) { return t.f6_; } // NOLINT - - template - static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(6, Tuple)) - ConstField(const Tuple& t) { return t.f6_; } -}; - -template <> -class Get<7> { - public: - template - static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(7, Tuple)) - Field(Tuple& t) { return t.f7_; } // NOLINT - - template - static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(7, Tuple)) - ConstField(const Tuple& t) { return t.f7_; } -}; - -template <> -class Get<8> { - public: - template - static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(8, Tuple)) - Field(Tuple& t) { return t.f8_; } // NOLINT - - template - static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(8, Tuple)) - ConstField(const Tuple& t) { return t.f8_; } -}; - -template <> -class Get<9> { - public: - template - static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(9, Tuple)) - Field(Tuple& t) { return t.f9_; } // NOLINT - - template - static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(9, Tuple)) - ConstField(const Tuple& t) { return t.f9_; } -}; - -} // namespace gtest_internal - -template -GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(k, GTEST_10_TUPLE_(T))) -get(GTEST_10_TUPLE_(T)& t) { - return gtest_internal::Get::Field(t); -} - -template -GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(k, GTEST_10_TUPLE_(T))) -get(const GTEST_10_TUPLE_(T)& t) { - return gtest_internal::Get::ConstField(t); -} - -// 6.1.3.5 Relational operators - -// We only implement == and !=, as we don't have a need for the rest yet. - -namespace gtest_internal { - -// SameSizeTuplePrefixComparator::Eq(t1, t2) returns true if the -// first k fields of t1 equals the first k fields of t2. -// SameSizeTuplePrefixComparator(k1, k2) would be a compiler error if -// k1 != k2. -template -struct SameSizeTuplePrefixComparator; - -template <> -struct SameSizeTuplePrefixComparator<0, 0> { - template - static bool Eq(const Tuple1& /* t1 */, const Tuple2& /* t2 */) { - return true; - } -}; - -template -struct SameSizeTuplePrefixComparator { - template - static bool Eq(const Tuple1& t1, const Tuple2& t2) { - return SameSizeTuplePrefixComparator::Eq(t1, t2) && - ::std::tr1::get(t1) == ::std::tr1::get(t2); - } -}; - -} // namespace gtest_internal - -template -inline bool operator==(const GTEST_10_TUPLE_(T)& t, - const GTEST_10_TUPLE_(U)& u) { - return gtest_internal::SameSizeTuplePrefixComparator< - tuple_size::value, - tuple_size::value>::Eq(t, u); -} - -template -inline bool operator!=(const GTEST_10_TUPLE_(T)& t, - const GTEST_10_TUPLE_(U)& u) { return !(t == u); } - -// 6.1.4 Pairs. -// Unimplemented. - -} // namespace tr1 -} // namespace std - -#undef GTEST_0_TUPLE_ -#undef GTEST_1_TUPLE_ -#undef GTEST_2_TUPLE_ -#undef GTEST_3_TUPLE_ -#undef GTEST_4_TUPLE_ -#undef GTEST_5_TUPLE_ -#undef GTEST_6_TUPLE_ -#undef GTEST_7_TUPLE_ -#undef GTEST_8_TUPLE_ -#undef GTEST_9_TUPLE_ -#undef GTEST_10_TUPLE_ - -#undef GTEST_0_TYPENAMES_ -#undef GTEST_1_TYPENAMES_ -#undef GTEST_2_TYPENAMES_ -#undef GTEST_3_TYPENAMES_ -#undef GTEST_4_TYPENAMES_ -#undef GTEST_5_TYPENAMES_ -#undef GTEST_6_TYPENAMES_ -#undef GTEST_7_TYPENAMES_ -#undef GTEST_8_TYPENAMES_ -#undef GTEST_9_TYPENAMES_ -#undef GTEST_10_TYPENAMES_ - -#undef GTEST_DECLARE_TUPLE_AS_FRIEND_ -#undef GTEST_BY_REF_ -#undef GTEST_ADD_REF_ -#undef GTEST_TUPLE_ELEMENT_ - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h.pump b/test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h.pump deleted file mode 100644 index 429ddfeeca..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h.pump +++ /dev/null @@ -1,347 +0,0 @@ -$$ -*- mode: c++; -*- -$var n = 10 $$ Maximum number of tuple fields we want to support. -$$ This meta comment fixes auto-indentation in Emacs. }} -// Copyright 2009 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Implements a subset of TR1 tuple needed by Google Test and Google Mock. - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ - -#include // For ::std::pair. - -// The compiler used in Symbian has a bug that prevents us from declaring the -// tuple template as a friend (it complains that tuple is redefined). This -// hack bypasses the bug by declaring the members that should otherwise be -// private as public. -// Sun Studio versions < 12 also have the above bug. -#if defined(__SYMBIAN32__) || (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590) -# define GTEST_DECLARE_TUPLE_AS_FRIEND_ public: -#else -# define GTEST_DECLARE_TUPLE_AS_FRIEND_ \ - template friend class tuple; \ - private: -#endif - -// Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that conflict -// with our own definitions. Therefore using our own tuple does not work on -// those compilers. -#if defined(_MSC_VER) && _MSC_VER >= 1600 /* 1600 is Visual Studio 2010 */ -# error "gtest's tuple doesn't compile on Visual Studio 2010 or later. \ -GTEST_USE_OWN_TR1_TUPLE must be set to 0 on those compilers." -#endif - - -$range i 0..n-1 -$range j 0..n -$range k 1..n -// GTEST_n_TUPLE_(T) is the type of an n-tuple. -#define GTEST_0_TUPLE_(T) tuple<> - -$for k [[ -$range m 0..k-1 -$range m2 k..n-1 -#define GTEST_$(k)_TUPLE_(T) tuple<$for m, [[T##$m]]$for m2 [[, void]]> - -]] - -// GTEST_n_TYPENAMES_(T) declares a list of n typenames. - -$for j [[ -$range m 0..j-1 -#define GTEST_$(j)_TYPENAMES_(T) $for m, [[typename T##$m]] - - -]] - -// In theory, defining stuff in the ::std namespace is undefined -// behavior. We can do this as we are playing the role of a standard -// library vendor. -namespace std { -namespace tr1 { - -template <$for i, [[typename T$i = void]]> -class tuple; - -// Anything in namespace gtest_internal is Google Test's INTERNAL -// IMPLEMENTATION DETAIL and MUST NOT BE USED DIRECTLY in user code. -namespace gtest_internal { - -// ByRef::type is T if T is a reference; otherwise it's const T&. -template -struct ByRef { typedef const T& type; }; // NOLINT -template -struct ByRef { typedef T& type; }; // NOLINT - -// A handy wrapper for ByRef. -#define GTEST_BY_REF_(T) typename ::std::tr1::gtest_internal::ByRef::type - -// AddRef::type is T if T is a reference; otherwise it's T&. This -// is the same as tr1::add_reference::type. -template -struct AddRef { typedef T& type; }; // NOLINT -template -struct AddRef { typedef T& type; }; // NOLINT - -// A handy wrapper for AddRef. -#define GTEST_ADD_REF_(T) typename ::std::tr1::gtest_internal::AddRef::type - -// A helper for implementing get(). -template class Get; - -// A helper for implementing tuple_element. kIndexValid is true -// iff k < the number of fields in tuple type T. -template -struct TupleElement; - - -$for i [[ -template -struct TupleElement { - typedef T$i type; -}; - - -]] -} // namespace gtest_internal - -template <> -class tuple<> { - public: - tuple() {} - tuple(const tuple& /* t */) {} - tuple& operator=(const tuple& /* t */) { return *this; } -}; - - -$for k [[ -$range m 0..k-1 -template -class $if k < n [[GTEST_$(k)_TUPLE_(T)]] $else [[tuple]] { - public: - template friend class gtest_internal::Get; - - tuple() : $for m, [[f$(m)_()]] {} - - explicit tuple($for m, [[GTEST_BY_REF_(T$m) f$m]]) : [[]] -$for m, [[f$(m)_(f$m)]] {} - - tuple(const tuple& t) : $for m, [[f$(m)_(t.f$(m)_)]] {} - - template - tuple(const GTEST_$(k)_TUPLE_(U)& t) : $for m, [[f$(m)_(t.f$(m)_)]] {} - -$if k == 2 [[ - template - tuple(const ::std::pair& p) : f0_(p.first), f1_(p.second) {} - -]] - - tuple& operator=(const tuple& t) { return CopyFrom(t); } - - template - tuple& operator=(const GTEST_$(k)_TUPLE_(U)& t) { - return CopyFrom(t); - } - -$if k == 2 [[ - template - tuple& operator=(const ::std::pair& p) { - f0_ = p.first; - f1_ = p.second; - return *this; - } - -]] - - GTEST_DECLARE_TUPLE_AS_FRIEND_ - - template - tuple& CopyFrom(const GTEST_$(k)_TUPLE_(U)& t) { - -$for m [[ - f$(m)_ = t.f$(m)_; - -]] - return *this; - } - - -$for m [[ - T$m f$(m)_; - -]] -}; - - -]] -// 6.1.3.2 Tuple creation functions. - -// Known limitations: we don't support passing an -// std::tr1::reference_wrapper to make_tuple(). And we don't -// implement tie(). - -inline tuple<> make_tuple() { return tuple<>(); } - -$for k [[ -$range m 0..k-1 - -template -inline GTEST_$(k)_TUPLE_(T) make_tuple($for m, [[const T$m& f$m]]) { - return GTEST_$(k)_TUPLE_(T)($for m, [[f$m]]); -} - -]] - -// 6.1.3.3 Tuple helper classes. - -template struct tuple_size; - - -$for j [[ -template -struct tuple_size { - static const int value = $j; -}; - - -]] -template -struct tuple_element { - typedef typename gtest_internal::TupleElement< - k < (tuple_size::value), k, Tuple>::type type; -}; - -#define GTEST_TUPLE_ELEMENT_(k, Tuple) typename tuple_element::type - -// 6.1.3.4 Element access. - -namespace gtest_internal { - - -$for i [[ -template <> -class Get<$i> { - public: - template - static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_($i, Tuple)) - Field(Tuple& t) { return t.f$(i)_; } // NOLINT - - template - static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_($i, Tuple)) - ConstField(const Tuple& t) { return t.f$(i)_; } -}; - - -]] -} // namespace gtest_internal - -template -GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(k, GTEST_$(n)_TUPLE_(T))) -get(GTEST_$(n)_TUPLE_(T)& t) { - return gtest_internal::Get::Field(t); -} - -template -GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(k, GTEST_$(n)_TUPLE_(T))) -get(const GTEST_$(n)_TUPLE_(T)& t) { - return gtest_internal::Get::ConstField(t); -} - -// 6.1.3.5 Relational operators - -// We only implement == and !=, as we don't have a need for the rest yet. - -namespace gtest_internal { - -// SameSizeTuplePrefixComparator::Eq(t1, t2) returns true if the -// first k fields of t1 equals the first k fields of t2. -// SameSizeTuplePrefixComparator(k1, k2) would be a compiler error if -// k1 != k2. -template -struct SameSizeTuplePrefixComparator; - -template <> -struct SameSizeTuplePrefixComparator<0, 0> { - template - static bool Eq(const Tuple1& /* t1 */, const Tuple2& /* t2 */) { - return true; - } -}; - -template -struct SameSizeTuplePrefixComparator { - template - static bool Eq(const Tuple1& t1, const Tuple2& t2) { - return SameSizeTuplePrefixComparator::Eq(t1, t2) && - ::std::tr1::get(t1) == ::std::tr1::get(t2); - } -}; - -} // namespace gtest_internal - -template -inline bool operator==(const GTEST_$(n)_TUPLE_(T)& t, - const GTEST_$(n)_TUPLE_(U)& u) { - return gtest_internal::SameSizeTuplePrefixComparator< - tuple_size::value, - tuple_size::value>::Eq(t, u); -} - -template -inline bool operator!=(const GTEST_$(n)_TUPLE_(T)& t, - const GTEST_$(n)_TUPLE_(U)& u) { return !(t == u); } - -// 6.1.4 Pairs. -// Unimplemented. - -} // namespace tr1 -} // namespace std - - -$for j [[ -#undef GTEST_$(j)_TUPLE_ - -]] - - -$for j [[ -#undef GTEST_$(j)_TYPENAMES_ - -]] - -#undef GTEST_DECLARE_TUPLE_AS_FRIEND_ -#undef GTEST_BY_REF_ -#undef GTEST_ADD_REF_ -#undef GTEST_TUPLE_ELEMENT_ - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h b/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h deleted file mode 100644 index 282b81fb0c..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h +++ /dev/null @@ -1,3347 +0,0 @@ -// This file was GENERATED by command: -// pump.py gtest-type-util.h.pump -// DO NOT EDIT BY HAND!!! - -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Type utilities needed for implementing typed and type-parameterized -// tests. This file is generated by a SCRIPT. DO NOT EDIT BY HAND! -// -// Currently we support at most 50 types in a list, and at most 50 -// type-parameterized tests in one type-parameterized test case. -// Please contact googletestframework@googlegroups.com if you need -// more. - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ - -#include "gtest/internal/gtest-port.h" - -// #ifdef __GNUC__ is too general here. It is possible to use gcc without using -// libstdc++ (which is where cxxabi.h comes from). -# if GTEST_HAS_CXXABI_H_ -# include -# elif defined(__HP_aCC) -# include -# endif // GTEST_HASH_CXXABI_H_ - -namespace testing { -namespace internal { - -// Canonicalizes a given name with respect to the Standard C++ Library. -// This handles removing the inline namespace within `std` that is -// used by various standard libraries (e.g., `std::__1`). Names outside -// of namespace std are returned unmodified. -inline std::string CanonicalizeForStdLibVersioning(std::string s) { - static const char prefix[] = "std::__"; - if (s.compare(0, strlen(prefix), prefix) == 0) { - std::string::size_type end = s.find("::", strlen(prefix)); - if (end != s.npos) { - // Erase everything between the initial `std` and the second `::`. - s.erase(strlen("std"), end - strlen("std")); - } - } - return s; -} - -// GetTypeName() returns a human-readable name of type T. -// NB: This function is also used in Google Mock, so don't move it inside of -// the typed-test-only section below. -template -std::string GetTypeName() { -# if GTEST_HAS_RTTI - - const char* const name = typeid(T).name(); -# if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC) - int status = 0; - // gcc's implementation of typeid(T).name() mangles the type name, - // so we have to demangle it. -# if GTEST_HAS_CXXABI_H_ - using abi::__cxa_demangle; -# endif // GTEST_HAS_CXXABI_H_ - char* const readable_name = __cxa_demangle(name, 0, 0, &status); - const std::string name_str(status == 0 ? readable_name : name); - free(readable_name); - return CanonicalizeForStdLibVersioning(name_str); -# else - return name; -# endif // GTEST_HAS_CXXABI_H_ || __HP_aCC - -# else - - return ""; - -# endif // GTEST_HAS_RTTI -} - -#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P - -// AssertyTypeEq::type is defined iff T1 and T2 are the same -// type. This can be used as a compile-time assertion to ensure that -// two types are equal. - -template -struct AssertTypeEq; - -template -struct AssertTypeEq { - typedef bool type; -}; - -// A unique type used as the default value for the arguments of class -// template Types. This allows us to simulate variadic templates -// (e.g. Types, Type, and etc), which C++ doesn't -// support directly. -struct None {}; - -// The following family of struct and struct templates are used to -// represent type lists. In particular, TypesN -// represents a type list with N types (T1, T2, ..., and TN) in it. -// Except for Types0, every struct in the family has two member types: -// Head for the first type in the list, and Tail for the rest of the -// list. - -// The empty type list. -struct Types0 {}; - -// Type lists of length 1, 2, 3, and so on. - -template -struct Types1 { - typedef T1 Head; - typedef Types0 Tail; -}; -template -struct Types2 { - typedef T1 Head; - typedef Types1 Tail; -}; - -template -struct Types3 { - typedef T1 Head; - typedef Types2 Tail; -}; - -template -struct Types4 { - typedef T1 Head; - typedef Types3 Tail; -}; - -template -struct Types5 { - typedef T1 Head; - typedef Types4 Tail; -}; - -template -struct Types6 { - typedef T1 Head; - typedef Types5 Tail; -}; - -template -struct Types7 { - typedef T1 Head; - typedef Types6 Tail; -}; - -template -struct Types8 { - typedef T1 Head; - typedef Types7 Tail; -}; - -template -struct Types9 { - typedef T1 Head; - typedef Types8 Tail; -}; - -template -struct Types10 { - typedef T1 Head; - typedef Types9 Tail; -}; - -template -struct Types11 { - typedef T1 Head; - typedef Types10 Tail; -}; - -template -struct Types12 { - typedef T1 Head; - typedef Types11 Tail; -}; - -template -struct Types13 { - typedef T1 Head; - typedef Types12 Tail; -}; - -template -struct Types14 { - typedef T1 Head; - typedef Types13 Tail; -}; - -template -struct Types15 { - typedef T1 Head; - typedef Types14 Tail; -}; - -template -struct Types16 { - typedef T1 Head; - typedef Types15 Tail; -}; - -template -struct Types17 { - typedef T1 Head; - typedef Types16 Tail; -}; - -template -struct Types18 { - typedef T1 Head; - typedef Types17 Tail; -}; - -template -struct Types19 { - typedef T1 Head; - typedef Types18 Tail; -}; - -template -struct Types20 { - typedef T1 Head; - typedef Types19 Tail; -}; - -template -struct Types21 { - typedef T1 Head; - typedef Types20 Tail; -}; - -template -struct Types22 { - typedef T1 Head; - typedef Types21 Tail; -}; - -template -struct Types23 { - typedef T1 Head; - typedef Types22 Tail; -}; - -template -struct Types24 { - typedef T1 Head; - typedef Types23 Tail; -}; - -template -struct Types25 { - typedef T1 Head; - typedef Types24 Tail; -}; - -template -struct Types26 { - typedef T1 Head; - typedef Types25 Tail; -}; - -template -struct Types27 { - typedef T1 Head; - typedef Types26 Tail; -}; - -template -struct Types28 { - typedef T1 Head; - typedef Types27 Tail; -}; - -template -struct Types29 { - typedef T1 Head; - typedef Types28 Tail; -}; - -template -struct Types30 { - typedef T1 Head; - typedef Types29 Tail; -}; - -template -struct Types31 { - typedef T1 Head; - typedef Types30 Tail; -}; - -template -struct Types32 { - typedef T1 Head; - typedef Types31 Tail; -}; - -template -struct Types33 { - typedef T1 Head; - typedef Types32 Tail; -}; - -template -struct Types34 { - typedef T1 Head; - typedef Types33 Tail; -}; - -template -struct Types35 { - typedef T1 Head; - typedef Types34 Tail; -}; - -template -struct Types36 { - typedef T1 Head; - typedef Types35 Tail; -}; - -template -struct Types37 { - typedef T1 Head; - typedef Types36 Tail; -}; - -template -struct Types38 { - typedef T1 Head; - typedef Types37 Tail; -}; - -template -struct Types39 { - typedef T1 Head; - typedef Types38 Tail; -}; - -template -struct Types40 { - typedef T1 Head; - typedef Types39 Tail; -}; - -template -struct Types41 { - typedef T1 Head; - typedef Types40 Tail; -}; - -template -struct Types42 { - typedef T1 Head; - typedef Types41 Tail; -}; - -template -struct Types43 { - typedef T1 Head; - typedef Types42 Tail; -}; - -template -struct Types44 { - typedef T1 Head; - typedef Types43 Tail; -}; - -template -struct Types45 { - typedef T1 Head; - typedef Types44 Tail; -}; - -template -struct Types46 { - typedef T1 Head; - typedef Types45 Tail; -}; - -template -struct Types47 { - typedef T1 Head; - typedef Types46 Tail; -}; - -template -struct Types48 { - typedef T1 Head; - typedef Types47 Tail; -}; - -template -struct Types49 { - typedef T1 Head; - typedef Types48 Tail; -}; - -template -struct Types50 { - typedef T1 Head; - typedef Types49 Tail; -}; - - -} // namespace internal - -// We don't want to require the users to write TypesN<...> directly, -// as that would require them to count the length. Types<...> is much -// easier to write, but generates horrible messages when there is a -// compiler error, as gcc insists on printing out each template -// argument, even if it has the default value (this means Types -// will appear as Types in the compiler -// errors). -// -// Our solution is to combine the best part of the two approaches: a -// user would write Types, and Google Test will translate -// that to TypesN internally to make error messages -// readable. The translation is done by the 'type' member of the -// Types template. -template -struct Types { - typedef internal::Types50 type; -}; - -template <> -struct Types { - typedef internal::Types0 type; -}; -template -struct Types { - typedef internal::Types1 type; -}; -template -struct Types { - typedef internal::Types2 type; -}; -template -struct Types { - typedef internal::Types3 type; -}; -template -struct Types { - typedef internal::Types4 type; -}; -template -struct Types { - typedef internal::Types5 type; -}; -template -struct Types { - typedef internal::Types6 type; -}; -template -struct Types { - typedef internal::Types7 type; -}; -template -struct Types { - typedef internal::Types8 type; -}; -template -struct Types { - typedef internal::Types9 type; -}; -template -struct Types { - typedef internal::Types10 type; -}; -template -struct Types { - typedef internal::Types11 type; -}; -template -struct Types { - typedef internal::Types12 type; -}; -template -struct Types { - typedef internal::Types13 type; -}; -template -struct Types { - typedef internal::Types14 type; -}; -template -struct Types { - typedef internal::Types15 type; -}; -template -struct Types { - typedef internal::Types16 type; -}; -template -struct Types { - typedef internal::Types17 type; -}; -template -struct Types { - typedef internal::Types18 type; -}; -template -struct Types { - typedef internal::Types19 type; -}; -template -struct Types { - typedef internal::Types20 type; -}; -template -struct Types { - typedef internal::Types21 type; -}; -template -struct Types { - typedef internal::Types22 type; -}; -template -struct Types { - typedef internal::Types23 type; -}; -template -struct Types { - typedef internal::Types24 type; -}; -template -struct Types { - typedef internal::Types25 type; -}; -template -struct Types { - typedef internal::Types26 type; -}; -template -struct Types { - typedef internal::Types27 type; -}; -template -struct Types { - typedef internal::Types28 type; -}; -template -struct Types { - typedef internal::Types29 type; -}; -template -struct Types { - typedef internal::Types30 type; -}; -template -struct Types { - typedef internal::Types31 type; -}; -template -struct Types { - typedef internal::Types32 type; -}; -template -struct Types { - typedef internal::Types33 type; -}; -template -struct Types { - typedef internal::Types34 type; -}; -template -struct Types { - typedef internal::Types35 type; -}; -template -struct Types { - typedef internal::Types36 type; -}; -template -struct Types { - typedef internal::Types37 type; -}; -template -struct Types { - typedef internal::Types38 type; -}; -template -struct Types { - typedef internal::Types39 type; -}; -template -struct Types { - typedef internal::Types40 type; -}; -template -struct Types { - typedef internal::Types41 type; -}; -template -struct Types { - typedef internal::Types42 type; -}; -template -struct Types { - typedef internal::Types43 type; -}; -template -struct Types { - typedef internal::Types44 type; -}; -template -struct Types { - typedef internal::Types45 type; -}; -template -struct Types { - typedef internal::Types46 type; -}; -template -struct Types { - typedef internal::Types47 type; -}; -template -struct Types { - typedef internal::Types48 type; -}; -template -struct Types { - typedef internal::Types49 type; -}; - -namespace internal { - -# define GTEST_TEMPLATE_ template class - -// The template "selector" struct TemplateSel is used to -// represent Tmpl, which must be a class template with one type -// parameter, as a type. TemplateSel::Bind::type is defined -// as the type Tmpl. This allows us to actually instantiate the -// template "selected" by TemplateSel. -// -// This trick is necessary for simulating typedef for class templates, -// which C++ doesn't support directly. -template -struct TemplateSel { - template - struct Bind { - typedef Tmpl type; - }; -}; - -# define GTEST_BIND_(TmplSel, T) \ - TmplSel::template Bind::type - -// A unique struct template used as the default value for the -// arguments of class template Templates. This allows us to simulate -// variadic templates (e.g. Templates, Templates, -// and etc), which C++ doesn't support directly. -template -struct NoneT {}; - -// The following family of struct and struct templates are used to -// represent template lists. In particular, TemplatesN represents a list of N templates (T1, T2, ..., and TN). Except -// for Templates0, every struct in the family has two member types: -// Head for the selector of the first template in the list, and Tail -// for the rest of the list. - -// The empty template list. -struct Templates0 {}; - -// Template lists of length 1, 2, 3, and so on. - -template -struct Templates1 { - typedef TemplateSel Head; - typedef Templates0 Tail; -}; -template -struct Templates2 { - typedef TemplateSel Head; - typedef Templates1 Tail; -}; - -template -struct Templates3 { - typedef TemplateSel Head; - typedef Templates2 Tail; -}; - -template -struct Templates4 { - typedef TemplateSel Head; - typedef Templates3 Tail; -}; - -template -struct Templates5 { - typedef TemplateSel Head; - typedef Templates4 Tail; -}; - -template -struct Templates6 { - typedef TemplateSel Head; - typedef Templates5 Tail; -}; - -template -struct Templates7 { - typedef TemplateSel Head; - typedef Templates6 Tail; -}; - -template -struct Templates8 { - typedef TemplateSel Head; - typedef Templates7 Tail; -}; - -template -struct Templates9 { - typedef TemplateSel Head; - typedef Templates8 Tail; -}; - -template -struct Templates10 { - typedef TemplateSel Head; - typedef Templates9 Tail; -}; - -template -struct Templates11 { - typedef TemplateSel Head; - typedef Templates10 Tail; -}; - -template -struct Templates12 { - typedef TemplateSel Head; - typedef Templates11 Tail; -}; - -template -struct Templates13 { - typedef TemplateSel Head; - typedef Templates12 Tail; -}; - -template -struct Templates14 { - typedef TemplateSel Head; - typedef Templates13 Tail; -}; - -template -struct Templates15 { - typedef TemplateSel Head; - typedef Templates14 Tail; -}; - -template -struct Templates16 { - typedef TemplateSel Head; - typedef Templates15 Tail; -}; - -template -struct Templates17 { - typedef TemplateSel Head; - typedef Templates16 Tail; -}; - -template -struct Templates18 { - typedef TemplateSel Head; - typedef Templates17 Tail; -}; - -template -struct Templates19 { - typedef TemplateSel Head; - typedef Templates18 Tail; -}; - -template -struct Templates20 { - typedef TemplateSel Head; - typedef Templates19 Tail; -}; - -template -struct Templates21 { - typedef TemplateSel Head; - typedef Templates20 Tail; -}; - -template -struct Templates22 { - typedef TemplateSel Head; - typedef Templates21 Tail; -}; - -template -struct Templates23 { - typedef TemplateSel Head; - typedef Templates22 Tail; -}; - -template -struct Templates24 { - typedef TemplateSel Head; - typedef Templates23 Tail; -}; - -template -struct Templates25 { - typedef TemplateSel Head; - typedef Templates24 Tail; -}; - -template -struct Templates26 { - typedef TemplateSel Head; - typedef Templates25 Tail; -}; - -template -struct Templates27 { - typedef TemplateSel Head; - typedef Templates26 Tail; -}; - -template -struct Templates28 { - typedef TemplateSel Head; - typedef Templates27 Tail; -}; - -template -struct Templates29 { - typedef TemplateSel Head; - typedef Templates28 Tail; -}; - -template -struct Templates30 { - typedef TemplateSel Head; - typedef Templates29 Tail; -}; - -template -struct Templates31 { - typedef TemplateSel Head; - typedef Templates30 Tail; -}; - -template -struct Templates32 { - typedef TemplateSel Head; - typedef Templates31 Tail; -}; - -template -struct Templates33 { - typedef TemplateSel Head; - typedef Templates32 Tail; -}; - -template -struct Templates34 { - typedef TemplateSel Head; - typedef Templates33 Tail; -}; - -template -struct Templates35 { - typedef TemplateSel Head; - typedef Templates34 Tail; -}; - -template -struct Templates36 { - typedef TemplateSel Head; - typedef Templates35 Tail; -}; - -template -struct Templates37 { - typedef TemplateSel Head; - typedef Templates36 Tail; -}; - -template -struct Templates38 { - typedef TemplateSel Head; - typedef Templates37 Tail; -}; - -template -struct Templates39 { - typedef TemplateSel Head; - typedef Templates38 Tail; -}; - -template -struct Templates40 { - typedef TemplateSel Head; - typedef Templates39 Tail; -}; - -template -struct Templates41 { - typedef TemplateSel Head; - typedef Templates40 Tail; -}; - -template -struct Templates42 { - typedef TemplateSel Head; - typedef Templates41 Tail; -}; - -template -struct Templates43 { - typedef TemplateSel Head; - typedef Templates42 Tail; -}; - -template -struct Templates44 { - typedef TemplateSel Head; - typedef Templates43 Tail; -}; - -template -struct Templates45 { - typedef TemplateSel Head; - typedef Templates44 Tail; -}; - -template -struct Templates46 { - typedef TemplateSel Head; - typedef Templates45 Tail; -}; - -template -struct Templates47 { - typedef TemplateSel Head; - typedef Templates46 Tail; -}; - -template -struct Templates48 { - typedef TemplateSel Head; - typedef Templates47 Tail; -}; - -template -struct Templates49 { - typedef TemplateSel Head; - typedef Templates48 Tail; -}; - -template -struct Templates50 { - typedef TemplateSel Head; - typedef Templates49 Tail; -}; - - -// We don't want to require the users to write TemplatesN<...> directly, -// as that would require them to count the length. Templates<...> is much -// easier to write, but generates horrible messages when there is a -// compiler error, as gcc insists on printing out each template -// argument, even if it has the default value (this means Templates -// will appear as Templates in the compiler -// errors). -// -// Our solution is to combine the best part of the two approaches: a -// user would write Templates, and Google Test will translate -// that to TemplatesN internally to make error messages -// readable. The translation is done by the 'type' member of the -// Templates template. -template -struct Templates { - typedef Templates50 type; -}; - -template <> -struct Templates { - typedef Templates0 type; -}; -template -struct Templates { - typedef Templates1 type; -}; -template -struct Templates { - typedef Templates2 type; -}; -template -struct Templates { - typedef Templates3 type; -}; -template -struct Templates { - typedef Templates4 type; -}; -template -struct Templates { - typedef Templates5 type; -}; -template -struct Templates { - typedef Templates6 type; -}; -template -struct Templates { - typedef Templates7 type; -}; -template -struct Templates { - typedef Templates8 type; -}; -template -struct Templates { - typedef Templates9 type; -}; -template -struct Templates { - typedef Templates10 type; -}; -template -struct Templates { - typedef Templates11 type; -}; -template -struct Templates { - typedef Templates12 type; -}; -template -struct Templates { - typedef Templates13 type; -}; -template -struct Templates { - typedef Templates14 type; -}; -template -struct Templates { - typedef Templates15 type; -}; -template -struct Templates { - typedef Templates16 type; -}; -template -struct Templates { - typedef Templates17 type; -}; -template -struct Templates { - typedef Templates18 type; -}; -template -struct Templates { - typedef Templates19 type; -}; -template -struct Templates { - typedef Templates20 type; -}; -template -struct Templates { - typedef Templates21 type; -}; -template -struct Templates { - typedef Templates22 type; -}; -template -struct Templates { - typedef Templates23 type; -}; -template -struct Templates { - typedef Templates24 type; -}; -template -struct Templates { - typedef Templates25 type; -}; -template -struct Templates { - typedef Templates26 type; -}; -template -struct Templates { - typedef Templates27 type; -}; -template -struct Templates { - typedef Templates28 type; -}; -template -struct Templates { - typedef Templates29 type; -}; -template -struct Templates { - typedef Templates30 type; -}; -template -struct Templates { - typedef Templates31 type; -}; -template -struct Templates { - typedef Templates32 type; -}; -template -struct Templates { - typedef Templates33 type; -}; -template -struct Templates { - typedef Templates34 type; -}; -template -struct Templates { - typedef Templates35 type; -}; -template -struct Templates { - typedef Templates36 type; -}; -template -struct Templates { - typedef Templates37 type; -}; -template -struct Templates { - typedef Templates38 type; -}; -template -struct Templates { - typedef Templates39 type; -}; -template -struct Templates { - typedef Templates40 type; -}; -template -struct Templates { - typedef Templates41 type; -}; -template -struct Templates { - typedef Templates42 type; -}; -template -struct Templates { - typedef Templates43 type; -}; -template -struct Templates { - typedef Templates44 type; -}; -template -struct Templates { - typedef Templates45 type; -}; -template -struct Templates { - typedef Templates46 type; -}; -template -struct Templates { - typedef Templates47 type; -}; -template -struct Templates { - typedef Templates48 type; -}; -template -struct Templates { - typedef Templates49 type; -}; - -// The TypeList template makes it possible to use either a single type -// or a Types<...> list in TYPED_TEST_CASE() and -// INSTANTIATE_TYPED_TEST_CASE_P(). - -template -struct TypeList { - typedef Types1 type; -}; - -template -struct TypeList > { - typedef typename Types::type type; -}; - -#endif // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P - -} // namespace internal -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h.pump b/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h.pump deleted file mode 100644 index eaa8880114..0000000000 --- a/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h.pump +++ /dev/null @@ -1,313 +0,0 @@ -$$ -*- mode: c++; -*- -$var n = 50 $$ Maximum length of type lists we want to support. -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Type utilities needed for implementing typed and type-parameterized -// tests. This file is generated by a SCRIPT. DO NOT EDIT BY HAND! -// -// Currently we support at most $n types in a list, and at most $n -// type-parameterized tests in one type-parameterized test case. -// Please contact googletestframework@googlegroups.com if you need -// more. - -#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ -#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ - -#include "gtest/internal/gtest-port.h" - -// #ifdef __GNUC__ is too general here. It is possible to use gcc without using -// libstdc++ (which is where cxxabi.h comes from). -# if GTEST_HAS_CXXABI_H_ -# include -# elif defined(__HP_aCC) -# include -# endif // GTEST_HASH_CXXABI_H_ - -namespace testing { -namespace internal { - -// Canonicalizes a given name with respect to the Standard C++ Library. -// This handles removing the inline namespace within `std` that is -// used by various standard libraries (e.g., `std::__1`). Names outside -// of namespace std are returned unmodified. -inline std::string CanonicalizeForStdLibVersioning(std::string s) { - static const char prefix[] = "std::__"; - if (s.compare(0, strlen(prefix), prefix) == 0) { - std::string::size_type end = s.find("::", strlen(prefix)); - if (end != s.npos) { - // Erase everything between the initial `std` and the second `::`. - s.erase(strlen("std"), end - strlen("std")); - } - } - return s; -} - -// GetTypeName() returns a human-readable name of type T. -// NB: This function is also used in Google Mock, so don't move it inside of -// the typed-test-only section below. -template -std::string GetTypeName() { -# if GTEST_HAS_RTTI - - const char* const name = typeid(T).name(); -# if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC) - int status = 0; - // gcc's implementation of typeid(T).name() mangles the type name, - // so we have to demangle it. -# if GTEST_HAS_CXXABI_H_ - using abi::__cxa_demangle; -# endif // GTEST_HAS_CXXABI_H_ - char* const readable_name = __cxa_demangle(name, 0, 0, &status); - const std::string name_str(status == 0 ? readable_name : name); - free(readable_name); - return CanonicalizeForStdLibVersioning(name_str); -# else - return name; -# endif // GTEST_HAS_CXXABI_H_ || __HP_aCC - -# else - - return ""; - -# endif // GTEST_HAS_RTTI -} - -#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P - -// AssertyTypeEq::type is defined iff T1 and T2 are the same -// type. This can be used as a compile-time assertion to ensure that -// two types are equal. - -template -struct AssertTypeEq; - -template -struct AssertTypeEq { - typedef bool type; -}; - -// A unique type used as the default value for the arguments of class -// template Types. This allows us to simulate variadic templates -// (e.g. Types, Type, and etc), which C++ doesn't -// support directly. -struct None {}; - -// The following family of struct and struct templates are used to -// represent type lists. In particular, TypesN -// represents a type list with N types (T1, T2, ..., and TN) in it. -// Except for Types0, every struct in the family has two member types: -// Head for the first type in the list, and Tail for the rest of the -// list. - -// The empty type list. -struct Types0 {}; - -// Type lists of length 1, 2, 3, and so on. - -template -struct Types1 { - typedef T1 Head; - typedef Types0 Tail; -}; - -$range i 2..n - -$for i [[ -$range j 1..i -$range k 2..i -template <$for j, [[typename T$j]]> -struct Types$i { - typedef T1 Head; - typedef Types$(i-1)<$for k, [[T$k]]> Tail; -}; - - -]] - -} // namespace internal - -// We don't want to require the users to write TypesN<...> directly, -// as that would require them to count the length. Types<...> is much -// easier to write, but generates horrible messages when there is a -// compiler error, as gcc insists on printing out each template -// argument, even if it has the default value (this means Types -// will appear as Types in the compiler -// errors). -// -// Our solution is to combine the best part of the two approaches: a -// user would write Types, and Google Test will translate -// that to TypesN internally to make error messages -// readable. The translation is done by the 'type' member of the -// Types template. - -$range i 1..n -template <$for i, [[typename T$i = internal::None]]> -struct Types { - typedef internal::Types$n<$for i, [[T$i]]> type; -}; - -template <> -struct Types<$for i, [[internal::None]]> { - typedef internal::Types0 type; -}; - -$range i 1..n-1 -$for i [[ -$range j 1..i -$range k i+1..n -template <$for j, [[typename T$j]]> -struct Types<$for j, [[T$j]]$for k[[, internal::None]]> { - typedef internal::Types$i<$for j, [[T$j]]> type; -}; - -]] - -namespace internal { - -# define GTEST_TEMPLATE_ template class - -// The template "selector" struct TemplateSel is used to -// represent Tmpl, which must be a class template with one type -// parameter, as a type. TemplateSel::Bind::type is defined -// as the type Tmpl. This allows us to actually instantiate the -// template "selected" by TemplateSel. -// -// This trick is necessary for simulating typedef for class templates, -// which C++ doesn't support directly. -template -struct TemplateSel { - template - struct Bind { - typedef Tmpl type; - }; -}; - -# define GTEST_BIND_(TmplSel, T) \ - TmplSel::template Bind::type - -// A unique struct template used as the default value for the -// arguments of class template Templates. This allows us to simulate -// variadic templates (e.g. Templates, Templates, -// and etc), which C++ doesn't support directly. -template -struct NoneT {}; - -// The following family of struct and struct templates are used to -// represent template lists. In particular, TemplatesN represents a list of N templates (T1, T2, ..., and TN). Except -// for Templates0, every struct in the family has two member types: -// Head for the selector of the first template in the list, and Tail -// for the rest of the list. - -// The empty template list. -struct Templates0 {}; - -// Template lists of length 1, 2, 3, and so on. - -template -struct Templates1 { - typedef TemplateSel Head; - typedef Templates0 Tail; -}; - -$range i 2..n - -$for i [[ -$range j 1..i -$range k 2..i -template <$for j, [[GTEST_TEMPLATE_ T$j]]> -struct Templates$i { - typedef TemplateSel Head; - typedef Templates$(i-1)<$for k, [[T$k]]> Tail; -}; - - -]] - -// We don't want to require the users to write TemplatesN<...> directly, -// as that would require them to count the length. Templates<...> is much -// easier to write, but generates horrible messages when there is a -// compiler error, as gcc insists on printing out each template -// argument, even if it has the default value (this means Templates -// will appear as Templates in the compiler -// errors). -// -// Our solution is to combine the best part of the two approaches: a -// user would write Templates, and Google Test will translate -// that to TemplatesN internally to make error messages -// readable. The translation is done by the 'type' member of the -// Templates template. - -$range i 1..n -template <$for i, [[GTEST_TEMPLATE_ T$i = NoneT]]> -struct Templates { - typedef Templates$n<$for i, [[T$i]]> type; -}; - -template <> -struct Templates<$for i, [[NoneT]]> { - typedef Templates0 type; -}; - -$range i 1..n-1 -$for i [[ -$range j 1..i -$range k i+1..n -template <$for j, [[GTEST_TEMPLATE_ T$j]]> -struct Templates<$for j, [[T$j]]$for k[[, NoneT]]> { - typedef Templates$i<$for j, [[T$j]]> type; -}; - -]] - -// The TypeList template makes it possible to use either a single type -// or a Types<...> list in TYPED_TEST_CASE() and -// INSTANTIATE_TYPED_TEST_CASE_P(). - -template -struct TypeList { - typedef Types1 type; -}; - - -$range i 1..n -template <$for i, [[typename T$i]]> -struct TypeList > { - typedef typename Types<$for i, [[T$i]]>::type type; -}; - -#endif // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P - -} // namespace internal -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ diff --git a/test/gtest-1.8.0/m4/acx_pthread.m4 b/test/gtest-1.8.0/m4/acx_pthread.m4 deleted file mode 100644 index 2cf20de144..0000000000 --- a/test/gtest-1.8.0/m4/acx_pthread.m4 +++ /dev/null @@ -1,363 +0,0 @@ -# This was retrieved from -# http://svn.0pointer.de/viewvc/trunk/common/acx_pthread.m4?revision=1277&root=avahi -# See also (perhaps for new versions?) -# http://svn.0pointer.de/viewvc/trunk/common/acx_pthread.m4?root=avahi -# -# We've rewritten the inconsistency check code (from avahi), to work -# more broadly. In particular, it no longer assumes ld accepts -zdefs. -# This caused a restructing of the code, but the functionality has only -# changed a little. - -dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -dnl -dnl @summary figure out how to build C programs using POSIX threads -dnl -dnl This macro figures out how to build C programs using POSIX threads. -dnl It sets the PTHREAD_LIBS output variable to the threads library and -dnl linker flags, and the PTHREAD_CFLAGS output variable to any special -dnl C compiler flags that are needed. (The user can also force certain -dnl compiler flags/libs to be tested by setting these environment -dnl variables.) -dnl -dnl Also sets PTHREAD_CC to any special C compiler that is needed for -dnl multi-threaded programs (defaults to the value of CC otherwise). -dnl (This is necessary on AIX to use the special cc_r compiler alias.) -dnl -dnl NOTE: You are assumed to not only compile your program with these -dnl flags, but also link it with them as well. e.g. you should link -dnl with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS -dnl $LIBS -dnl -dnl If you are only building threads programs, you may wish to use -dnl these variables in your default LIBS, CFLAGS, and CC: -dnl -dnl LIBS="$PTHREAD_LIBS $LIBS" -dnl CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -dnl CC="$PTHREAD_CC" -dnl -dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute -dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to -dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -dnl -dnl ACTION-IF-FOUND is a list of shell commands to run if a threads -dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to -dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the -dnl default action will define HAVE_PTHREAD. -dnl -dnl Please let the authors know if this macro fails on any platform, or -dnl if you have any other suggestions or comments. This macro was based -dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with -dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros -dnl posted by Alejandro Forero Cuervo to the autoconf macro repository. -dnl We are also grateful for the helpful feedback of numerous users. -dnl -dnl @category InstalledPackages -dnl @author Steven G. Johnson -dnl @version 2006-05-29 -dnl @license GPLWithACException -dnl -dnl Checks for GCC shared/pthread inconsistency based on work by -dnl Marcin Owsiany - - -AC_DEFUN([ACX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_SAVE -AC_LANG_C -acx_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) - AC_MSG_RESULT($acx_pthread_ok) - if test x"$acx_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case "${host_cpu}-${host_os}" in - *solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" - ;; -esac - -if test x"$acx_pthread_ok" = xno; then -for flag in $acx_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) - if test x"$acx_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [acx_pthread_ok=yes]) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT($acx_pthread_ok) - if test "x$acx_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$acx_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_MSG_CHECKING([for joinable pthread attribute]) - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_TRY_LINK([#include ], [int attr=$attr; return attr;], - [attr_name=$attr; break]) - done - AC_MSG_RESULT($attr_name) - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, - [Define to necessary symbol if this constant - uses a non-standard name on your system.]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; - esac - AC_MSG_RESULT(${flag}) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - # More AIX lossage: must compile with xlc_r or cc_r - if test x"$GCC" != xyes; then - AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) - else - PTHREAD_CC=$CC - fi - - # The next part tries to detect GCC inconsistency with -shared on some - # architectures and systems. The problem is that in certain - # configurations, when -shared is specified, GCC "forgets" to - # internally use various flags which are still necessary. - - # - # Prepare the flags - # - save_CFLAGS="$CFLAGS" - save_LIBS="$LIBS" - save_CC="$CC" - - # Try with the flags determined by the earlier checks. - # - # -Wl,-z,defs forces link-time symbol resolution, so that the - # linking checks with -shared actually have any value - # - # FIXME: -fPIC is required for -shared on many architectures, - # so we specify it here, but the right way would probably be to - # properly detect whether it is actually required. - CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CC="$PTHREAD_CC" - - # In order not to create several levels of indentation, we test - # the value of "$done" until we find the cure or run out of ideas. - done="no" - - # First, make sure the CFLAGS we added are actually accepted by our - # compiler. If not (and OS X's ld, for instance, does not accept -z), - # then we can't do this test. - if test x"$done" = xno; then - AC_MSG_CHECKING([whether to check for GCC pthread/shared inconsistencies]) - AC_TRY_LINK(,, , [done=yes]) - - if test "x$done" = xyes ; then - AC_MSG_RESULT([no]) - else - AC_MSG_RESULT([yes]) - fi - fi - - if test x"$done" = xno; then - AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [done=yes]) - - if test "x$done" = xyes; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - fi - - # - # Linux gcc on some architectures such as mips/mipsel forgets - # about -lpthread - # - if test x"$done" = xno; then - AC_MSG_CHECKING([whether -lpthread fixes that]) - LIBS="-lpthread $PTHREAD_LIBS $save_LIBS" - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [done=yes]) - - if test "x$done" = xyes; then - AC_MSG_RESULT([yes]) - PTHREAD_LIBS="-lpthread $PTHREAD_LIBS" - else - AC_MSG_RESULT([no]) - fi - fi - # - # FreeBSD 4.10 gcc forgets to use -lc_r instead of -lc - # - if test x"$done" = xno; then - AC_MSG_CHECKING([whether -lc_r fixes that]) - LIBS="-lc_r $PTHREAD_LIBS $save_LIBS" - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [done=yes]) - - if test "x$done" = xyes; then - AC_MSG_RESULT([yes]) - PTHREAD_LIBS="-lc_r $PTHREAD_LIBS" - else - AC_MSG_RESULT([no]) - fi - fi - if test x"$done" = xno; then - # OK, we have run out of ideas - AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries]) - - # so it's not safe to assume that we may use pthreads - acx_pthread_ok=no - fi - - CFLAGS="$save_CFLAGS" - LIBS="$save_LIBS" - CC="$save_CC" -else - PTHREAD_CC="$CC" -fi - -AC_SUBST(PTHREAD_LIBS) -AC_SUBST(PTHREAD_CFLAGS) -AC_SUBST(PTHREAD_CC) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_pthread_ok" = xyes; then - ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) - : -else - acx_pthread_ok=no - $2 -fi -AC_LANG_RESTORE -])dnl ACX_PTHREAD diff --git a/test/gtest-1.8.0/m4/gtest.m4 b/test/gtest-1.8.0/m4/gtest.m4 deleted file mode 100644 index 6598ba75a4..0000000000 --- a/test/gtest-1.8.0/m4/gtest.m4 +++ /dev/null @@ -1,74 +0,0 @@ -dnl GTEST_LIB_CHECK([minimum version [, -dnl action if found [,action if not found]]]) -dnl -dnl Check for the presence of the Google Test library, optionally at a minimum -dnl version, and indicate a viable version with the HAVE_GTEST flag. It defines -dnl standard variables for substitution including GTEST_CPPFLAGS, -dnl GTEST_CXXFLAGS, GTEST_LDFLAGS, and GTEST_LIBS. It also defines -dnl GTEST_VERSION as the version of Google Test found. Finally, it provides -dnl optional custom action slots in the event GTEST is found or not. -AC_DEFUN([GTEST_LIB_CHECK], -[ -dnl Provide a flag to enable or disable Google Test usage. -AC_ARG_ENABLE([gtest], - [AS_HELP_STRING([--enable-gtest], - [Enable tests using the Google C++ Testing Framework. - (Default is enabled.)])], - [], - [enable_gtest=]) -AC_ARG_VAR([GTEST_CONFIG], - [The exact path of Google Test's 'gtest-config' script.]) -AC_ARG_VAR([GTEST_CPPFLAGS], - [C-like preprocessor flags for Google Test.]) -AC_ARG_VAR([GTEST_CXXFLAGS], - [C++ compile flags for Google Test.]) -AC_ARG_VAR([GTEST_LDFLAGS], - [Linker path and option flags for Google Test.]) -AC_ARG_VAR([GTEST_LIBS], - [Library linking flags for Google Test.]) -AC_ARG_VAR([GTEST_VERSION], - [The version of Google Test available.]) -HAVE_GTEST="no" -AS_IF([test "x${enable_gtest}" != "xno"], - [AC_MSG_CHECKING([for 'gtest-config']) - AS_IF([test "x${enable_gtest}" != "xyes"], - [AS_IF([test -x "${enable_gtest}/scripts/gtest-config"], - [GTEST_CONFIG="${enable_gtest}/scripts/gtest-config"], - [GTEST_CONFIG="${enable_gtest}/bin/gtest-config"]) - AS_IF([test -x "${GTEST_CONFIG}"], [], - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([dnl -Unable to locate either a built or installed Google Test. -The specific location '${enable_gtest}' was provided for a built or installed -Google Test, but no 'gtest-config' script could be found at this location.]) - ])], - [AC_PATH_PROG([GTEST_CONFIG], [gtest-config])]) - AS_IF([test -x "${GTEST_CONFIG}"], - [AC_MSG_RESULT([${GTEST_CONFIG}]) - m4_ifval([$1], - [_gtest_min_version="--min-version=$1" - AC_MSG_CHECKING([for Google Test at least version >= $1])], - [_gtest_min_version="--min-version=0" - AC_MSG_CHECKING([for Google Test])]) - AS_IF([${GTEST_CONFIG} ${_gtest_min_version}], - [AC_MSG_RESULT([yes]) - HAVE_GTEST='yes'], - [AC_MSG_RESULT([no])])], - [AC_MSG_RESULT([no])]) - AS_IF([test "x${HAVE_GTEST}" = "xyes"], - [GTEST_CPPFLAGS=`${GTEST_CONFIG} --cppflags` - GTEST_CXXFLAGS=`${GTEST_CONFIG} --cxxflags` - GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags` - GTEST_LIBS=`${GTEST_CONFIG} --libs` - GTEST_VERSION=`${GTEST_CONFIG} --version` - AC_DEFINE([HAVE_GTEST],[1],[Defined when Google Test is available.])], - [AS_IF([test "x${enable_gtest}" = "xyes"], - [AC_MSG_ERROR([dnl -Google Test was enabled, but no viable version could be found.]) - ])])]) -AC_SUBST([HAVE_GTEST]) -AM_CONDITIONAL([HAVE_GTEST],[test "x$HAVE_GTEST" = "xyes"]) -AS_IF([test "x$HAVE_GTEST" = "xyes"], - [m4_ifval([$2], [$2])], - [m4_ifval([$3], [$3])]) -]) diff --git a/test/gtest-1.8.0/make/Makefile b/test/gtest-1.8.0/make/Makefile deleted file mode 100644 index 9ac74493ba..0000000000 --- a/test/gtest-1.8.0/make/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# A sample Makefile for building Google Test and using it in user -# tests. Please tweak it to suit your environment and project. You -# may want to move it to your project's root directory. -# -# SYNOPSIS: -# -# make [all] - makes everything. -# make TARGET - makes the given target. -# make clean - removes all files generated by make. - -# Please tweak the following variable definitions as needed by your -# project, except GTEST_HEADERS, which you can use in your own targets -# but shouldn't modify. - -# Points to the root of Google Test, relative to where this file is. -# Remember to tweak this if you move this file. -GTEST_DIR = .. - -# Where to find user code. -USER_DIR = ../samples - -# Flags passed to the preprocessor. -# Set Google Test's header directory as a system directory, such that -# the compiler doesn't generate warnings in Google Test headers. -CPPFLAGS += -isystem $(GTEST_DIR)/include - -# Flags passed to the C++ compiler. -CXXFLAGS += -g -Wall -Wextra -pthread - -# All tests produced by this Makefile. Remember to add new tests you -# created to the list. -TESTS = sample1_unittest - -# All Google Test headers. Usually you shouldn't change this -# definition. -GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \ - $(GTEST_DIR)/include/gtest/internal/*.h - -# House-keeping build targets. - -all : $(TESTS) - -clean : - rm -f $(TESTS) gtest.a gtest_main.a *.o - -# Builds gtest.a and gtest_main.a. - -# Usually you shouldn't tweak such internal variables, indicated by a -# trailing _. -GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_HEADERS) - -# For simplicity and to avoid depending on Google Test's -# implementation details, the dependencies specified below are -# conservative and not optimized. This is fine as Google Test -# compiles fast and for ordinary users its source rarely changes. -gtest-all.o : $(GTEST_SRCS_) - $(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \ - $(GTEST_DIR)/src/gtest-all.cc - -gtest_main.o : $(GTEST_SRCS_) - $(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \ - $(GTEST_DIR)/src/gtest_main.cc - -gtest.a : gtest-all.o - $(AR) $(ARFLAGS) $@ $^ - -gtest_main.a : gtest-all.o gtest_main.o - $(AR) $(ARFLAGS) $@ $^ - -# Builds a sample test. A test should link with either gtest.a or -# gtest_main.a, depending on whether it defines its own main() -# function. - -sample1.o : $(USER_DIR)/sample1.cc $(USER_DIR)/sample1.h $(GTEST_HEADERS) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/sample1.cc - -sample1_unittest.o : $(USER_DIR)/sample1_unittest.cc \ - $(USER_DIR)/sample1.h $(GTEST_HEADERS) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/sample1_unittest.cc - -sample1_unittest : sample1.o sample1_unittest.o gtest_main.a - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@ diff --git a/test/gtest-1.8.0/msvc/2010/gtest-md.sln b/test/gtest-1.8.0/msvc/2010/gtest-md.sln deleted file mode 100644 index e36b33b621..0000000000 --- a/test/gtest-1.8.0/msvc/2010/gtest-md.sln +++ /dev/null @@ -1,55 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-md", "gtest-md.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main-md", "gtest_main-md.vcxproj", "{3AF54C8A-10BF-4332-9147-F68ED9862033}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test-md", "gtest_prod_test-md.vcxproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest-md", "gtest_unittest-md.vcxproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|Win32.ActiveCfg = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|Win32.Build.0 = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|x64.ActiveCfg = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|x64.Build.0 = Release|x64 - {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug|Win32.ActiveCfg = Debug|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug|Win32.Build.0 = Debug|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug|x64.ActiveCfg = Debug|x64 - {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug|x64.Build.0 = Debug|x64 - {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release|Win32.ActiveCfg = Release|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release|Win32.Build.0 = Release|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release|x64.ActiveCfg = Release|x64 - {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release|x64.Build.0 = Release|x64 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug|Win32.ActiveCfg = Debug|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug|Win32.Build.0 = Debug|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug|x64.ActiveCfg = Debug|x64 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug|x64.Build.0 = Debug|x64 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release|Win32.ActiveCfg = Release|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release|Win32.Build.0 = Release|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release|x64.ActiveCfg = Release|x64 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release|x64.Build.0 = Release|x64 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug|Win32.ActiveCfg = Debug|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug|Win32.Build.0 = Debug|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug|x64.ActiveCfg = Debug|x64 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug|x64.Build.0 = Debug|x64 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release|Win32.ActiveCfg = Release|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release|Win32.Build.0 = Release|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release|x64.ActiveCfg = Release|x64 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/test/gtest-1.8.0/msvc/2010/gtest-md.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest-md.vcxproj deleted file mode 100644 index 16a6ff12f7..0000000000 --- a/test/gtest-1.8.0/msvc/2010/gtest-md.vcxproj +++ /dev/null @@ -1,149 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8} - Win32Proj - - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - gtestd - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - gtest - - - gtestd - - - gtest - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - - - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - - \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/2010/gtest.sln b/test/gtest-1.8.0/msvc/2010/gtest.sln deleted file mode 100644 index cacd5c0ce6..0000000000 --- a/test/gtest-1.8.0/msvc/2010/gtest.sln +++ /dev/null @@ -1,55 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "gtest_main.vcxproj", "{3AF54C8A-10BF-4332-9147-F68ED9862032}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest", "gtest_unittest.vcxproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test", "gtest_prod_test.vcxproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|Win32.ActiveCfg = Debug|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|Win32.Build.0 = Debug|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|x64.ActiveCfg = Debug|x64 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|x64.Build.0 = Debug|x64 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|Win32.ActiveCfg = Release|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|Win32.Build.0 = Release|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|x64.ActiveCfg = Release|x64 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|x64.Build.0 = Release|x64 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|Win32.ActiveCfg = Debug|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|Win32.Build.0 = Debug|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|x64.ActiveCfg = Debug|x64 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|x64.Build.0 = Debug|x64 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|Win32.ActiveCfg = Release|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|Win32.Build.0 = Release|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|x64.ActiveCfg = Release|x64 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|x64.Build.0 = Release|x64 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|Win32.ActiveCfg = Debug|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|Win32.Build.0 = Debug|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|x64.ActiveCfg = Debug|x64 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|x64.Build.0 = Debug|x64 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|Win32.ActiveCfg = Release|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|Win32.Build.0 = Release|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|x64.ActiveCfg = Release|x64 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/test/gtest-1.8.0/msvc/2010/gtest.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest.vcxproj deleted file mode 100644 index 2c76683582..0000000000 --- a/test/gtest-1.8.0/msvc/2010/gtest.vcxproj +++ /dev/null @@ -1,139 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} - Win32Proj - - - - StaticLibrary - MultiByte - v141 - - - StaticLibrary - MultiByte - v141 - - - StaticLibrary - MultiByte - v141 - - - StaticLibrary - MultiByte - v141 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - - - gtestd - - - gtest - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - - - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - - \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/2010/gtest_main-md.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest_main-md.vcxproj deleted file mode 100644 index 3d773895b7..0000000000 --- a/test/gtest-1.8.0/msvc/2010/gtest_main-md.vcxproj +++ /dev/null @@ -1,154 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {3AF54C8A-10BF-4332-9147-F68ED9862033} - Win32Proj - - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - gtest_maind - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - gtest_main - - - gtest_maind - - - gtest_main - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - - - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be8} - - - - - - \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/2010/gtest_main.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest_main.vcxproj deleted file mode 100644 index 8fb25897c8..0000000000 --- a/test/gtest-1.8.0/msvc/2010/gtest_main.vcxproj +++ /dev/null @@ -1,162 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {3AF54C8A-10BF-4332-9147-F68ED9862032} - Win32Proj - - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - gtest_maind - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - gtest_main - - - gtest_maind - - - gtest_main - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - $(OutDir)$(ProjectName)d.lib - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - $(OutDir)$(ProjectName)d.lib - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - $(OutDir)$(ProjectName).lib - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - $(OutDir)$(ProjectName).lib - - - - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - - - - \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/2010/gtest_prod_test-md.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest_prod_test-md.vcxproj deleted file mode 100644 index 830e5dce41..0000000000 --- a/test/gtest-1.8.0/msvc/2010/gtest_prod_test-md.vcxproj +++ /dev/null @@ -1,199 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB} - Win32Proj - - - - Application - MultiByte - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - true - true - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - false - false - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - gtest_prod_test - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - gtest_prod_test - - - gtest_prod_test - - - gtest_prod_test - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - EditAndContinue - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - $(OutDir)gtest_prod_test.pdb - Console - MachineX86 - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - $(OutDir)gtest_prod_test.pdb - Console - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - Use - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - Console - true - true - MachineX86 - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - Use - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - Console - true - true - - - - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - - - - - - - - {3af54c8a-10bf-4332-9147-f68ed9862033} - - - - - - \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/2010/gtest_prod_test.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest_prod_test.vcxproj deleted file mode 100644 index d42e13511d..0000000000 --- a/test/gtest-1.8.0/msvc/2010/gtest_prod_test.vcxproj +++ /dev/null @@ -1,191 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA} - Win32Proj - - - - Application - MultiByte - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - true - true - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - false - false - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Use - Level3 - EditAndContinue - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - $(OutDir)gtest_prod_test.pdb - Console - MachineX86 - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - $(OutDir)gtest_prod_test.pdb - Console - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - Console - true - true - MachineX86 - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - Console - true - true - - - - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - - - - - - - - {3af54c8a-10bf-4332-9147-f68ed9862032} - - - - - - \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/2010/gtest_unittest-md.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest_unittest-md.vcxproj deleted file mode 100644 index 93b0dc4e1a..0000000000 --- a/test/gtest-1.8.0/msvc/2010/gtest_unittest-md.vcxproj +++ /dev/null @@ -1,188 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {4D9FDFB5-986A-4139-823C-F4EE0ED481A2} - Win32Proj - - - - Application - MultiByte - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - true - true - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - false - false - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - gtest_unittest - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)$(ProjectName)\ - gtest_unittest - - - gtest_unittest - - - gtest_unittest - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - EditAndContinue - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - $(OutDir)gtest_unittest.pdb - Console - MachineX86 - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - $(OutDir)gtest_unittest.pdb - Console - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - Use - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - Console - true - true - MachineX86 - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - Use - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - Console - true - true - - - - - MinSpace - MinSpace - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - Default - Default - - - - - ProgramDatabase - ProgramDatabase - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - - - - - {3af54c8a-10bf-4332-9147-f68ed9862033} - - - - - - \ No newline at end of file diff --git a/test/gtest-1.8.0/msvc/2010/gtest_unittest.vcxproj b/test/gtest-1.8.0/msvc/2010/gtest_unittest.vcxproj deleted file mode 100644 index ec6abde7da..0000000000 --- a/test/gtest-1.8.0/msvc/2010/gtest_unittest.vcxproj +++ /dev/null @@ -1,180 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1} - Win32Proj - - - - Application - MultiByte - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - true - true - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - false - false - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - - - $(SolutionDir)$(SolutionName)\$(Platform)-$(Configuration)\ - $(OutDir)temp\$(ProjectName)\ - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Use - Level3 - EditAndContinue - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - $(OutDir)gtest_unittest.pdb - Console - MachineX86 - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - $(OutDir)gtest_unittest.pdb - Console - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - Console - true - true - MachineX86 - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - ..\..\include;..\..;%(AdditionalIncludeDirectories) - - - true - Console - true - true - - - - - MinSpace - MinSpace - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - Default - Default - - - - - ProgramDatabase - ProgramDatabase - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - - - - - - - - - {3af54c8a-10bf-4332-9147-f68ed9862032} - - - - - - \ No newline at end of file diff --git a/test/gtest-1.8.0/samples/prime_tables.h b/test/gtest-1.8.0/samples/prime_tables.h deleted file mode 100644 index 55a3b44efd..0000000000 --- a/test/gtest-1.8.0/samples/prime_tables.h +++ /dev/null @@ -1,127 +0,0 @@ -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// Author: vladl@google.com (Vlad Losev) - -// This provides interface PrimeTable that determines whether a number is a -// prime and determines a next prime number. This interface is used -// in Google Test samples demonstrating use of parameterized tests. - -#ifndef GTEST_SAMPLES_PRIME_TABLES_H_ -#define GTEST_SAMPLES_PRIME_TABLES_H_ - -#include - -// The prime table interface. -class PrimeTable { - public: - virtual ~PrimeTable() {} - - // Returns true iff n is a prime number. - virtual bool IsPrime(int n) const = 0; - - // Returns the smallest prime number greater than p; or returns -1 - // if the next prime is beyond the capacity of the table. - virtual int GetNextPrime(int p) const = 0; -}; - -// Implementation #1 calculates the primes on-the-fly. -class OnTheFlyPrimeTable : public PrimeTable { - public: - virtual bool IsPrime(int n) const { - if (n <= 1) return false; - - for (int i = 2; i*i <= n; i++) { - // n is divisible by an integer other than 1 and itself. - if ((n % i) == 0) return false; - } - - return true; - } - - virtual int GetNextPrime(int p) const { - for (int n = p + 1; n > 0; n++) { - if (IsPrime(n)) return n; - } - - return -1; - } -}; - -// Implementation #2 pre-calculates the primes and stores the result -// in an array. -class PreCalculatedPrimeTable : public PrimeTable { - public: - // 'max' specifies the maximum number the prime table holds. - explicit PreCalculatedPrimeTable(int max) - : is_prime_size_(max + 1), is_prime_(new bool[max + 1]) { - CalculatePrimesUpTo(max); - } - virtual ~PreCalculatedPrimeTable() { delete[] is_prime_; } - - virtual bool IsPrime(int n) const { - return 0 <= n && n < is_prime_size_ && is_prime_[n]; - } - - virtual int GetNextPrime(int p) const { - for (int n = p + 1; n < is_prime_size_; n++) { - if (is_prime_[n]) return n; - } - - return -1; - } - - private: - void CalculatePrimesUpTo(int max) { - ::std::fill(is_prime_, is_prime_ + is_prime_size_, true); - is_prime_[0] = is_prime_[1] = false; - - // Checks every candidate for prime number (we know that 2 is the only even - // prime). - for (int i = 2; i*i <= max; i += i%2+1) { - if (!is_prime_[i]) continue; - - // Marks all multiples of i (except i itself) as non-prime. - // We are starting here from i-th multiplier, because all smaller - // complex numbers were already marked. - for (int j = i*i; j <= max; j += i) { - is_prime_[j] = false; - } - } - } - - const int is_prime_size_; - bool* const is_prime_; - - // Disables compiler warning "assignment operator could not be generated." - void operator=(const PreCalculatedPrimeTable& rhs); -}; - -#endif // GTEST_SAMPLES_PRIME_TABLES_H_ diff --git a/test/gtest-1.8.0/samples/sample1.cc b/test/gtest-1.8.0/samples/sample1.cc deleted file mode 100644 index 7c08b28f3b..0000000000 --- a/test/gtest-1.8.0/samples/sample1.cc +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// A sample program demonstrating using Google C++ testing framework. -// -// Author: wan@google.com (Zhanyong Wan) - -#include "sample1.h" - -// Returns n! (the factorial of n). For negative n, n! is defined to be 1. -int Factorial(int n) { - int result = 1; - for (int i = 1; i <= n; i++) { - result *= i; - } - - return result; -} - -// Returns true iff n is a prime number. -bool IsPrime(int n) { - // Trivial case 1: small numbers - if (n <= 1) return false; - - // Trivial case 2: even numbers - if (n % 2 == 0) return n == 2; - - // Now, we have that n is odd and n >= 3. - - // Try to divide n by every odd number i, starting from 3 - for (int i = 3; ; i += 2) { - // We only have to try i up to the square root of n - if (i > n/i) break; - - // Now, we have i <= n/i < n. - // If n is divisible by i, n is not prime. - if (n % i == 0) return false; - } - - // n has no integer factor in the range (1, n), and thus is prime. - return true; -} diff --git a/test/gtest-1.8.0/samples/sample1.h b/test/gtest-1.8.0/samples/sample1.h deleted file mode 100644 index 3dfeb98c45..0000000000 --- a/test/gtest-1.8.0/samples/sample1.h +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// A sample program demonstrating using Google C++ testing framework. -// -// Author: wan@google.com (Zhanyong Wan) - -#ifndef GTEST_SAMPLES_SAMPLE1_H_ -#define GTEST_SAMPLES_SAMPLE1_H_ - -// Returns n! (the factorial of n). For negative n, n! is defined to be 1. -int Factorial(int n); - -// Returns true iff n is a prime number. -bool IsPrime(int n); - -#endif // GTEST_SAMPLES_SAMPLE1_H_ diff --git a/test/gtest-1.8.0/samples/sample10_unittest.cc b/test/gtest-1.8.0/samples/sample10_unittest.cc deleted file mode 100644 index 10aa7620f0..0000000000 --- a/test/gtest-1.8.0/samples/sample10_unittest.cc +++ /dev/null @@ -1,140 +0,0 @@ -// Copyright 2009 Google Inc. All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vladl@google.com (Vlad Losev) - -// This sample shows how to use Google Test listener API to implement -// a primitive leak checker. - -#include -#include - -#include "gtest/gtest.h" -using ::testing::EmptyTestEventListener; -using ::testing::InitGoogleTest; -using ::testing::Test; -using ::testing::TestEventListeners; -using ::testing::TestInfo; -using ::testing::TestPartResult; -using ::testing::UnitTest; - -namespace { -// We will track memory used by this class. -class Water { - public: - // Normal Water declarations go here. - - // operator new and operator delete help us control water allocation. - void* operator new(size_t allocation_size) { - allocated_++; - return malloc(allocation_size); - } - - void operator delete(void* block, size_t /* allocation_size */) { - allocated_--; - free(block); - } - - static int allocated() { return allocated_; } - - private: - static int allocated_; -}; - -int Water::allocated_ = 0; - -// This event listener monitors how many Water objects are created and -// destroyed by each test, and reports a failure if a test leaks some Water -// objects. It does this by comparing the number of live Water objects at -// the beginning of a test and at the end of a test. -class LeakChecker : public EmptyTestEventListener { - private: - // Called before a test starts. - virtual void OnTestStart(const TestInfo& /* test_info */) { - initially_allocated_ = Water::allocated(); - } - - // Called after a test ends. - virtual void OnTestEnd(const TestInfo& /* test_info */) { - int difference = Water::allocated() - initially_allocated_; - - // You can generate a failure in any event handler except - // OnTestPartResult. Just use an appropriate Google Test assertion to do - // it. - EXPECT_LE(difference, 0) << "Leaked " << difference << " unit(s) of Water!"; - } - - int initially_allocated_; -}; - -TEST(ListenersTest, DoesNotLeak) { - Water* water = new Water; - delete water; -} - -// This should fail when the --check_for_leaks command line flag is -// specified. -TEST(ListenersTest, LeaksWater) { - Water* water = new Water; - EXPECT_TRUE(water != NULL); -} -} // namespace - -int main(int argc, char **argv) { - InitGoogleTest(&argc, argv); - - bool check_for_leaks = false; - if (argc > 1 && strcmp(argv[1], "--check_for_leaks") == 0 ) - check_for_leaks = true; - else - printf("%s\n", "Run this program with --check_for_leaks to enable " - "custom leak checking in the tests."); - - // If we are given the --check_for_leaks command line flag, installs the - // leak checker. - if (check_for_leaks) { - TestEventListeners& listeners = UnitTest::GetInstance()->listeners(); - - // Adds the leak checker to the end of the test event listener list, - // after the default text output printer and the default XML report - // generator. - // - // The order is important - it ensures that failures generated in the - // leak checker's OnTestEnd() method are processed by the text and XML - // printers *before* their OnTestEnd() methods are called, such that - // they are attributed to the right test. Remember that a listener - // receives an OnXyzStart event *after* listeners preceding it in the - // list received that event, and receives an OnXyzEnd event *before* - // listeners preceding it. - // - // We don't need to worry about deleting the new listener later, as - // Google Test will do it. - listeners.Append(new LeakChecker); - } - return RUN_ALL_TESTS(); -} diff --git a/test/gtest-1.8.0/samples/sample1_unittest.cc b/test/gtest-1.8.0/samples/sample1_unittest.cc deleted file mode 100644 index 8376bb4310..0000000000 --- a/test/gtest-1.8.0/samples/sample1_unittest.cc +++ /dev/null @@ -1,154 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// A sample program demonstrating using Google C++ testing framework. -// -// Author: wan@google.com (Zhanyong Wan) - - -// This sample shows how to write a simple unit test for a function, -// using Google C++ testing framework. -// -// Writing a unit test using Google C++ testing framework is easy as 1-2-3: - - -// Step 1. Include necessary header files such that the stuff your -// test logic needs is declared. -// -// Don't forget gtest.h, which declares the testing framework. - -#include -#include "sample1.h" -#include "gtest/gtest.h" -namespace { - -// Step 2. Use the TEST macro to define your tests. -// -// TEST has two parameters: the test case name and the test name. -// After using the macro, you should define your test logic between a -// pair of braces. You can use a bunch of macros to indicate the -// success or failure of a test. EXPECT_TRUE and EXPECT_EQ are -// examples of such macros. For a complete list, see gtest.h. -// -// -// -// In Google Test, tests are grouped into test cases. This is how we -// keep test code organized. You should put logically related tests -// into the same test case. -// -// The test case name and the test name should both be valid C++ -// identifiers. And you should not use underscore (_) in the names. -// -// Google Test guarantees that each test you define is run exactly -// once, but it makes no guarantee on the order the tests are -// executed. Therefore, you should write your tests in such a way -// that their results don't depend on their order. -// -// - - -// Tests Factorial(). - -// Tests factorial of negative numbers. -TEST(FactorialTest, Negative) { - // This test is named "Negative", and belongs to the "FactorialTest" - // test case. - EXPECT_EQ(1, Factorial(-5)); - EXPECT_EQ(1, Factorial(-1)); - EXPECT_GT(Factorial(-10), 0); - - // - // - // EXPECT_EQ(expected, actual) is the same as - // - // EXPECT_TRUE((expected) == (actual)) - // - // except that it will print both the expected value and the actual - // value when the assertion fails. This is very helpful for - // debugging. Therefore in this case EXPECT_EQ is preferred. - // - // On the other hand, EXPECT_TRUE accepts any Boolean expression, - // and is thus more general. - // - // -} - -// Tests factorial of 0. -TEST(FactorialTest, Zero) { - EXPECT_EQ(1, Factorial(0)); -} - -// Tests factorial of positive numbers. -TEST(FactorialTest, Positive) { - EXPECT_EQ(1, Factorial(1)); - EXPECT_EQ(2, Factorial(2)); - EXPECT_EQ(6, Factorial(3)); - EXPECT_EQ(40320, Factorial(8)); -} - - -// Tests IsPrime() - -// Tests negative input. -TEST(IsPrimeTest, Negative) { - // This test belongs to the IsPrimeTest test case. - - EXPECT_FALSE(IsPrime(-1)); - EXPECT_FALSE(IsPrime(-2)); - EXPECT_FALSE(IsPrime(INT_MIN)); -} - -// Tests some trivial cases. -TEST(IsPrimeTest, Trivial) { - EXPECT_FALSE(IsPrime(0)); - EXPECT_FALSE(IsPrime(1)); - EXPECT_TRUE(IsPrime(2)); - EXPECT_TRUE(IsPrime(3)); -} - -// Tests positive input. -TEST(IsPrimeTest, Positive) { - EXPECT_FALSE(IsPrime(4)); - EXPECT_TRUE(IsPrime(5)); - EXPECT_FALSE(IsPrime(6)); - EXPECT_TRUE(IsPrime(23)); -} -} // namespace - -// Step 3. Call RUN_ALL_TESTS() in main(). -// -// We do this by linking in src/gtest_main.cc file, which consists of -// a main() function which calls RUN_ALL_TESTS() for us. -// -// This runs all the tests you've defined, prints the result, and -// returns 0 if successful, or 1 otherwise. -// -// Did you notice that we didn't register the tests? The -// RUN_ALL_TESTS() macro magically knows about all the tests we -// defined. Isn't this convenient? diff --git a/test/gtest-1.8.0/samples/sample2.cc b/test/gtest-1.8.0/samples/sample2.cc deleted file mode 100644 index 5f763b9bdf..0000000000 --- a/test/gtest-1.8.0/samples/sample2.cc +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// A sample program demonstrating using Google C++ testing framework. -// -// Author: wan@google.com (Zhanyong Wan) - -#include "sample2.h" - -#include - -// Clones a 0-terminated C string, allocating memory using new. -const char* MyString::CloneCString(const char* a_c_string) { - if (a_c_string == NULL) return NULL; - - const size_t len = strlen(a_c_string); - char* const clone = new char[ len + 1 ]; - memcpy(clone, a_c_string, len + 1); - - return clone; -} - -// Sets the 0-terminated C string this MyString object -// represents. -void MyString::Set(const char* a_c_string) { - // Makes sure this works when c_string == c_string_ - const char* const temp = MyString::CloneCString(a_c_string); - delete[] c_string_; - c_string_ = temp; -} diff --git a/test/gtest-1.8.0/samples/sample2.h b/test/gtest-1.8.0/samples/sample2.h deleted file mode 100644 index cb485c70fb..0000000000 --- a/test/gtest-1.8.0/samples/sample2.h +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// A sample program demonstrating using Google C++ testing framework. -// -// Author: wan@google.com (Zhanyong Wan) - -#ifndef GTEST_SAMPLES_SAMPLE2_H_ -#define GTEST_SAMPLES_SAMPLE2_H_ - -#include - - -// A simple string class. -class MyString { - private: - const char* c_string_; - const MyString& operator=(const MyString& rhs); - - public: - // Clones a 0-terminated C string, allocating memory using new. - static const char* CloneCString(const char* a_c_string); - - //////////////////////////////////////////////////////////// - // - // C'tors - - // The default c'tor constructs a NULL string. - MyString() : c_string_(NULL) {} - - // Constructs a MyString by cloning a 0-terminated C string. - explicit MyString(const char* a_c_string) : c_string_(NULL) { - Set(a_c_string); - } - - // Copy c'tor - MyString(const MyString& string) : c_string_(NULL) { - Set(string.c_string_); - } - - //////////////////////////////////////////////////////////// - // - // D'tor. MyString is intended to be a final class, so the d'tor - // doesn't need to be virtual. - ~MyString() { delete[] c_string_; } - - // Gets the 0-terminated C string this MyString object represents. - const char* c_string() const { return c_string_; } - - size_t Length() const { - return c_string_ == NULL ? 0 : strlen(c_string_); - } - - // Sets the 0-terminated C string this MyString object represents. - void Set(const char* c_string); -}; - - -#endif // GTEST_SAMPLES_SAMPLE2_H_ diff --git a/test/gtest-1.8.0/samples/sample2_unittest.cc b/test/gtest-1.8.0/samples/sample2_unittest.cc deleted file mode 100644 index df522da548..0000000000 --- a/test/gtest-1.8.0/samples/sample2_unittest.cc +++ /dev/null @@ -1,110 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// A sample program demonstrating using Google C++ testing framework. -// -// Author: wan@google.com (Zhanyong Wan) - - -// This sample shows how to write a more complex unit test for a class -// that has multiple member functions. -// -// Usually, it's a good idea to have one test for each method in your -// class. You don't have to do that exactly, but it helps to keep -// your tests organized. You may also throw in additional tests as -// needed. - -#include "sample2.h" -#include "gtest/gtest.h" -namespace { -// In this example, we test the MyString class (a simple string). - -// Tests the default c'tor. -TEST(MyString, DefaultConstructor) { - const MyString s; - - // Asserts that s.c_string() returns NULL. - // - // - // - // If we write NULL instead of - // - // static_cast(NULL) - // - // in this assertion, it will generate a warning on gcc 3.4. The - // reason is that EXPECT_EQ needs to know the types of its - // arguments in order to print them when it fails. Since NULL is - // #defined as 0, the compiler will use the formatter function for - // int to print it. However, gcc thinks that NULL should be used as - // a pointer, not an int, and therefore complains. - // - // The root of the problem is C++'s lack of distinction between the - // integer number 0 and the null pointer constant. Unfortunately, - // we have to live with this fact. - // - // - EXPECT_STREQ(NULL, s.c_string()); - - EXPECT_EQ(0u, s.Length()); -} - -const char kHelloString[] = "Hello, world!"; - -// Tests the c'tor that accepts a C string. -TEST(MyString, ConstructorFromCString) { - const MyString s(kHelloString); - EXPECT_EQ(0, strcmp(s.c_string(), kHelloString)); - EXPECT_EQ(sizeof(kHelloString)/sizeof(kHelloString[0]) - 1, - s.Length()); -} - -// Tests the copy c'tor. -TEST(MyString, CopyConstructor) { - const MyString s1(kHelloString); - const MyString s2 = s1; - EXPECT_EQ(0, strcmp(s2.c_string(), kHelloString)); -} - -// Tests the Set method. -TEST(MyString, Set) { - MyString s; - - s.Set(kHelloString); - EXPECT_EQ(0, strcmp(s.c_string(), kHelloString)); - - // Set should work when the input pointer is the same as the one - // already in the MyString object. - s.Set(s.c_string()); - EXPECT_EQ(0, strcmp(s.c_string(), kHelloString)); - - // Can we set the MyString to NULL? - s.Set(NULL); - EXPECT_STREQ(NULL, s.c_string()); -} -} // namespace diff --git a/test/gtest-1.8.0/samples/sample3-inl.h b/test/gtest-1.8.0/samples/sample3-inl.h deleted file mode 100644 index 7e3084d638..0000000000 --- a/test/gtest-1.8.0/samples/sample3-inl.h +++ /dev/null @@ -1,172 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// A sample program demonstrating using Google C++ testing framework. -// -// Author: wan@google.com (Zhanyong Wan) - -#ifndef GTEST_SAMPLES_SAMPLE3_INL_H_ -#define GTEST_SAMPLES_SAMPLE3_INL_H_ - -#include - - -// Queue is a simple queue implemented as a singled-linked list. -// -// The element type must support copy constructor. -template // E is the element type -class Queue; - -// QueueNode is a node in a Queue, which consists of an element of -// type E and a pointer to the next node. -template // E is the element type -class QueueNode { - friend class Queue; - - public: - // Gets the element in this node. - const E& element() const { return element_; } - - // Gets the next node in the queue. - QueueNode* next() { return next_; } - const QueueNode* next() const { return next_; } - - private: - // Creates a node with a given element value. The next pointer is - // set to NULL. - explicit QueueNode(const E& an_element) : element_(an_element), next_(NULL) {} - - // We disable the default assignment operator and copy c'tor. - const QueueNode& operator = (const QueueNode&); - QueueNode(const QueueNode&); - - E element_; - QueueNode* next_; -}; - -template // E is the element type. -class Queue { - public: - // Creates an empty queue. - Queue() : head_(NULL), last_(NULL), size_(0) {} - - // D'tor. Clears the queue. - ~Queue() { Clear(); } - - // Clears the queue. - void Clear() { - if (size_ > 0) { - // 1. Deletes every node. - QueueNode* node = head_; - QueueNode* next = node->next(); - for (; ;) { - delete node; - node = next; - if (node == NULL) break; - next = node->next(); - } - - // 2. Resets the member variables. - head_ = last_ = NULL; - size_ = 0; - } - } - - // Gets the number of elements. - size_t Size() const { return size_; } - - // Gets the first element of the queue, or NULL if the queue is empty. - QueueNode* Head() { return head_; } - const QueueNode* Head() const { return head_; } - - // Gets the last element of the queue, or NULL if the queue is empty. - QueueNode* Last() { return last_; } - const QueueNode* Last() const { return last_; } - - // Adds an element to the end of the queue. A copy of the element is - // created using the copy constructor, and then stored in the queue. - // Changes made to the element in the queue doesn't affect the source - // object, and vice versa. - void Enqueue(const E& element) { - QueueNode* new_node = new QueueNode(element); - - if (size_ == 0) { - head_ = last_ = new_node; - size_ = 1; - } else { - last_->next_ = new_node; - last_ = new_node; - size_++; - } - } - - // Removes the head of the queue and returns it. Returns NULL if - // the queue is empty. - E* Dequeue() { - if (size_ == 0) { - return NULL; - } - - const QueueNode* const old_head = head_; - head_ = head_->next_; - size_--; - if (size_ == 0) { - last_ = NULL; - } - - E* element = new E(old_head->element()); - delete old_head; - - return element; - } - - // Applies a function/functor on each element of the queue, and - // returns the result in a new queue. The original queue is not - // affected. - template - Queue* Map(F function) const { - Queue* new_queue = new Queue(); - for (const QueueNode* node = head_; node != NULL; node = node->next_) { - new_queue->Enqueue(function(node->element())); - } - - return new_queue; - } - - private: - QueueNode* head_; // The first node of the queue. - QueueNode* last_; // The last node of the queue. - size_t size_; // The number of elements in the queue. - - // We disallow copying a queue. - Queue(const Queue&); - const Queue& operator = (const Queue&); -}; - -#endif // GTEST_SAMPLES_SAMPLE3_INL_H_ diff --git a/test/gtest-1.8.0/samples/sample3_unittest.cc b/test/gtest-1.8.0/samples/sample3_unittest.cc deleted file mode 100644 index 7f51fd89c0..0000000000 --- a/test/gtest-1.8.0/samples/sample3_unittest.cc +++ /dev/null @@ -1,152 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// A sample program demonstrating using Google C++ testing framework. -// -// Author: wan@google.com (Zhanyong Wan) - - -// In this example, we use a more advanced feature of Google Test called -// test fixture. -// -// A test fixture is a place to hold objects and functions shared by -// all tests in a test case. Using a test fixture avoids duplicating -// the test code necessary to initialize and cleanup those common -// objects for each test. It is also useful for defining sub-routines -// that your tests need to invoke a lot. -// -// -// -// The tests share the test fixture in the sense of code sharing, not -// data sharing. Each test is given its own fresh copy of the -// fixture. You cannot expect the data modified by one test to be -// passed on to another test, which is a bad idea. -// -// The reason for this design is that tests should be independent and -// repeatable. In particular, a test should not fail as the result of -// another test's failure. If one test depends on info produced by -// another test, then the two tests should really be one big test. -// -// The macros for indicating the success/failure of a test -// (EXPECT_TRUE, FAIL, etc) need to know what the current test is -// (when Google Test prints the test result, it tells you which test -// each failure belongs to). Technically, these macros invoke a -// member function of the Test class. Therefore, you cannot use them -// in a global function. That's why you should put test sub-routines -// in a test fixture. -// -// - -#include "sample3-inl.h" -#include "gtest/gtest.h" -namespace { -// To use a test fixture, derive a class from testing::Test. -class QueueTestSmpl3 : public testing::Test { - protected: // You should make the members protected s.t. they can be - // accessed from sub-classes. - - // virtual void SetUp() will be called before each test is run. You - // should define it if you need to initialize the variables. - // Otherwise, this can be skipped. - virtual void SetUp() { - q1_.Enqueue(1); - q2_.Enqueue(2); - q2_.Enqueue(3); - } - - // virtual void TearDown() will be called after each test is run. - // You should define it if there is cleanup work to do. Otherwise, - // you don't have to provide it. - // - // virtual void TearDown() { - // } - - // A helper function that some test uses. - static int Double(int n) { - return 2*n; - } - - // A helper function for testing Queue::Map(). - void MapTester(const Queue * q) { - // Creates a new queue, where each element is twice as big as the - // corresponding one in q. - const Queue * const new_q = q->Map(Double); - - // Verifies that the new queue has the same size as q. - ASSERT_EQ(q->Size(), new_q->Size()); - - // Verifies the relationship between the elements of the two queues. - for ( const QueueNode * n1 = q->Head(), * n2 = new_q->Head(); - n1 != NULL; n1 = n1->next(), n2 = n2->next() ) { - EXPECT_EQ(2 * n1->element(), n2->element()); - } - - delete new_q; - } - - // Declares the variables your tests want to use. - Queue q0_; - Queue q1_; - Queue q2_; -}; - -// When you have a test fixture, you define a test using TEST_F -// instead of TEST. - -// Tests the default c'tor. -TEST_F(QueueTestSmpl3, DefaultConstructor) { - // You can access data in the test fixture here. - EXPECT_EQ(0u, q0_.Size()); -} - -// Tests Dequeue(). -TEST_F(QueueTestSmpl3, Dequeue) { - int * n = q0_.Dequeue(); - EXPECT_TRUE(n == NULL); - - n = q1_.Dequeue(); - ASSERT_TRUE(n != NULL); - EXPECT_EQ(1, *n); - EXPECT_EQ(0u, q1_.Size()); - delete n; - - n = q2_.Dequeue(); - ASSERT_TRUE(n != NULL); - EXPECT_EQ(2, *n); - EXPECT_EQ(1u, q2_.Size()); - delete n; -} - -// Tests the Queue::Map() function. -TEST_F(QueueTestSmpl3, Map) { - MapTester(&q0_); - MapTester(&q1_); - MapTester(&q2_); -} -} // namespace diff --git a/test/gtest-1.8.0/samples/sample4.cc b/test/gtest-1.8.0/samples/sample4.cc deleted file mode 100644 index ae44bda6f1..0000000000 --- a/test/gtest-1.8.0/samples/sample4.cc +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// A sample program demonstrating using Google C++ testing framework. -// -// Author: wan@google.com (Zhanyong Wan) - -#include - -#include "sample4.h" - -// Returns the current counter value, and increments it. -int Counter::Increment() { - return counter_++; -} - -// Prints the current counter value to STDOUT. -void Counter::Print() const { - printf("%d", counter_); -} diff --git a/test/gtest-1.8.0/samples/sample4.h b/test/gtest-1.8.0/samples/sample4.h deleted file mode 100644 index cd60f0dd2d..0000000000 --- a/test/gtest-1.8.0/samples/sample4.h +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// A sample program demonstrating using Google C++ testing framework. -// -// Author: wan@google.com (Zhanyong Wan) - -#ifndef GTEST_SAMPLES_SAMPLE4_H_ -#define GTEST_SAMPLES_SAMPLE4_H_ - -// A simple monotonic counter. -class Counter { - private: - int counter_; - - public: - // Creates a counter that starts at 0. - Counter() : counter_(0) {} - - // Returns the current counter value, and increments it. - int Increment(); - - // Prints the current counter value to STDOUT. - void Print() const; -}; - -#endif // GTEST_SAMPLES_SAMPLE4_H_ diff --git a/test/gtest-1.8.0/samples/sample4_unittest.cc b/test/gtest-1.8.0/samples/sample4_unittest.cc deleted file mode 100644 index 7bf9ea3449..0000000000 --- a/test/gtest-1.8.0/samples/sample4_unittest.cc +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -#include "sample4.h" -#include "gtest/gtest.h" - -namespace { -// Tests the Increment() method. - -TEST(Counter, Increment) { - Counter c; - - // EXPECT_EQ() evaluates its arguments exactly once, so they - // can have side effects. - - EXPECT_EQ(0, c.Increment()); - EXPECT_EQ(1, c.Increment()); - EXPECT_EQ(2, c.Increment()); -} - -} // namespace diff --git a/test/gtest-1.8.0/samples/sample5_unittest.cc b/test/gtest-1.8.0/samples/sample5_unittest.cc deleted file mode 100644 index 401a58a5b7..0000000000 --- a/test/gtest-1.8.0/samples/sample5_unittest.cc +++ /dev/null @@ -1,199 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// This sample teaches how to reuse a test fixture in multiple test -// cases by deriving sub-fixtures from it. -// -// When you define a test fixture, you specify the name of the test -// case that will use this fixture. Therefore, a test fixture can -// be used by only one test case. -// -// Sometimes, more than one test cases may want to use the same or -// slightly different test fixtures. For example, you may want to -// make sure that all tests for a GUI library don't leak important -// system resources like fonts and brushes. In Google Test, you do -// this by putting the shared logic in a super (as in "super class") -// test fixture, and then have each test case use a fixture derived -// from this super fixture. - -#include -#include -#include "gtest/gtest.h" -#include "sample1.h" -#include "sample3-inl.h" -namespace { -// In this sample, we want to ensure that every test finishes within -// ~5 seconds. If a test takes longer to run, we consider it a -// failure. -// -// We put the code for timing a test in a test fixture called -// "QuickTest". QuickTest is intended to be the super fixture that -// other fixtures derive from, therefore there is no test case with -// the name "QuickTest". This is OK. -// -// Later, we will derive multiple test fixtures from QuickTest. -class QuickTest : public testing::Test { - protected: - // Remember that SetUp() is run immediately before a test starts. - // This is a good place to record the start time. - virtual void SetUp() { - start_time_ = time(NULL); - } - - // TearDown() is invoked immediately after a test finishes. Here we - // check if the test was too slow. - virtual void TearDown() { - // Gets the time when the test finishes - const time_t end_time = time(NULL); - - // Asserts that the test took no more than ~5 seconds. Did you - // know that you can use assertions in SetUp() and TearDown() as - // well? - EXPECT_TRUE(end_time - start_time_ <= 5) << "The test took too long."; - } - - // The UTC time (in seconds) when the test starts - time_t start_time_; -}; - - -// We derive a fixture named IntegerFunctionTest from the QuickTest -// fixture. All tests using this fixture will be automatically -// required to be quick. -class IntegerFunctionTest : public QuickTest { - // We don't need any more logic than already in the QuickTest fixture. - // Therefore the body is empty. -}; - - -// Now we can write tests in the IntegerFunctionTest test case. - -// Tests Factorial() -TEST_F(IntegerFunctionTest, Factorial) { - // Tests factorial of negative numbers. - EXPECT_EQ(1, Factorial(-5)); - EXPECT_EQ(1, Factorial(-1)); - EXPECT_GT(Factorial(-10), 0); - - // Tests factorial of 0. - EXPECT_EQ(1, Factorial(0)); - - // Tests factorial of positive numbers. - EXPECT_EQ(1, Factorial(1)); - EXPECT_EQ(2, Factorial(2)); - EXPECT_EQ(6, Factorial(3)); - EXPECT_EQ(40320, Factorial(8)); -} - - -// Tests IsPrime() -TEST_F(IntegerFunctionTest, IsPrime) { - // Tests negative input. - EXPECT_FALSE(IsPrime(-1)); - EXPECT_FALSE(IsPrime(-2)); - EXPECT_FALSE(IsPrime(INT_MIN)); - - // Tests some trivial cases. - EXPECT_FALSE(IsPrime(0)); - EXPECT_FALSE(IsPrime(1)); - EXPECT_TRUE(IsPrime(2)); - EXPECT_TRUE(IsPrime(3)); - - // Tests positive input. - EXPECT_FALSE(IsPrime(4)); - EXPECT_TRUE(IsPrime(5)); - EXPECT_FALSE(IsPrime(6)); - EXPECT_TRUE(IsPrime(23)); -} - - -// The next test case (named "QueueTest") also needs to be quick, so -// we derive another fixture from QuickTest. -// -// The QueueTest test fixture has some logic and shared objects in -// addition to what's in QuickTest already. We define the additional -// stuff inside the body of the test fixture, as usual. -class QueueTest : public QuickTest { - protected: - virtual void SetUp() { - // First, we need to set up the super fixture (QuickTest). - QuickTest::SetUp(); - - // Second, some additional setup for this fixture. - q1_.Enqueue(1); - q2_.Enqueue(2); - q2_.Enqueue(3); - } - - // By default, TearDown() inherits the behavior of - // QuickTest::TearDown(). As we have no additional cleaning work - // for QueueTest, we omit it here. - // - // virtual void TearDown() { - // QuickTest::TearDown(); - // } - - Queue q0_; - Queue q1_; - Queue q2_; -}; - - -// Now, let's write tests using the QueueTest fixture. - -// Tests the default constructor. -TEST_F(QueueTest, DefaultConstructor) { - EXPECT_EQ(0u, q0_.Size()); -} - -// Tests Dequeue(). -TEST_F(QueueTest, Dequeue) { - int* n = q0_.Dequeue(); - EXPECT_TRUE(n == NULL); - - n = q1_.Dequeue(); - EXPECT_TRUE(n != NULL); - EXPECT_EQ(1, *n); - EXPECT_EQ(0u, q1_.Size()); - delete n; - - n = q2_.Dequeue(); - EXPECT_TRUE(n != NULL); - EXPECT_EQ(2, *n); - EXPECT_EQ(1u, q2_.Size()); - delete n; -} -} // namespace -// If necessary, you can derive further test fixtures from a derived -// fixture itself. For example, you can derive another fixture from -// QueueTest. Google Test imposes no limit on how deep the hierarchy -// can be. In practice, however, you probably don't want it to be too -// deep as to be confusing. diff --git a/test/gtest-1.8.0/samples/sample6_unittest.cc b/test/gtest-1.8.0/samples/sample6_unittest.cc deleted file mode 100644 index 1faf0c3d3b..0000000000 --- a/test/gtest-1.8.0/samples/sample6_unittest.cc +++ /dev/null @@ -1,225 +0,0 @@ -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// This sample shows how to test common properties of multiple -// implementations of the same interface (aka interface tests). - -// The interface and its implementations are in this header. -#include "prime_tables.h" - -#include "gtest/gtest.h" -namespace { -// First, we define some factory functions for creating instances of -// the implementations. You may be able to skip this step if all your -// implementations can be constructed the same way. - -template -PrimeTable* CreatePrimeTable(); - -template <> -PrimeTable* CreatePrimeTable() { - return new OnTheFlyPrimeTable; -} - -template <> -PrimeTable* CreatePrimeTable() { - return new PreCalculatedPrimeTable(10000); -} - -// Then we define a test fixture class template. -template -class PrimeTableTest : public testing::Test { - protected: - // The ctor calls the factory function to create a prime table - // implemented by T. - PrimeTableTest() : table_(CreatePrimeTable()) {} - - virtual ~PrimeTableTest() { delete table_; } - - // Note that we test an implementation via the base interface - // instead of the actual implementation class. This is important - // for keeping the tests close to the real world scenario, where the - // implementation is invoked via the base interface. It avoids - // got-yas where the implementation class has a method that shadows - // a method with the same name (but slightly different argument - // types) in the base interface, for example. - PrimeTable* const table_; -}; - -#if GTEST_HAS_TYPED_TEST - -using testing::Types; - -// Google Test offers two ways for reusing tests for different types. -// The first is called "typed tests". You should use it if you -// already know *all* the types you are gonna exercise when you write -// the tests. - -// To write a typed test case, first use -// -// TYPED_TEST_CASE(TestCaseName, TypeList); -// -// to declare it and specify the type parameters. As with TEST_F, -// TestCaseName must match the test fixture name. - -// The list of types we want to test. -typedef Types Implementations; - -TYPED_TEST_CASE(PrimeTableTest, Implementations); - -// Then use TYPED_TEST(TestCaseName, TestName) to define a typed test, -// similar to TEST_F. -TYPED_TEST(PrimeTableTest, ReturnsFalseForNonPrimes) { - // Inside the test body, you can refer to the type parameter by - // TypeParam, and refer to the fixture class by TestFixture. We - // don't need them in this example. - - // Since we are in the template world, C++ requires explicitly - // writing 'this->' when referring to members of the fixture class. - // This is something you have to learn to live with. - EXPECT_FALSE(this->table_->IsPrime(-5)); - EXPECT_FALSE(this->table_->IsPrime(0)); - EXPECT_FALSE(this->table_->IsPrime(1)); - EXPECT_FALSE(this->table_->IsPrime(4)); - EXPECT_FALSE(this->table_->IsPrime(6)); - EXPECT_FALSE(this->table_->IsPrime(100)); -} - -TYPED_TEST(PrimeTableTest, ReturnsTrueForPrimes) { - EXPECT_TRUE(this->table_->IsPrime(2)); - EXPECT_TRUE(this->table_->IsPrime(3)); - EXPECT_TRUE(this->table_->IsPrime(5)); - EXPECT_TRUE(this->table_->IsPrime(7)); - EXPECT_TRUE(this->table_->IsPrime(11)); - EXPECT_TRUE(this->table_->IsPrime(131)); -} - -TYPED_TEST(PrimeTableTest, CanGetNextPrime) { - EXPECT_EQ(2, this->table_->GetNextPrime(0)); - EXPECT_EQ(3, this->table_->GetNextPrime(2)); - EXPECT_EQ(5, this->table_->GetNextPrime(3)); - EXPECT_EQ(7, this->table_->GetNextPrime(5)); - EXPECT_EQ(11, this->table_->GetNextPrime(7)); - EXPECT_EQ(131, this->table_->GetNextPrime(128)); -} - -// That's it! Google Test will repeat each TYPED_TEST for each type -// in the type list specified in TYPED_TEST_CASE. Sit back and be -// happy that you don't have to define them multiple times. - -#endif // GTEST_HAS_TYPED_TEST - -#if GTEST_HAS_TYPED_TEST_P - -using testing::Types; - -// Sometimes, however, you don't yet know all the types that you want -// to test when you write the tests. For example, if you are the -// author of an interface and expect other people to implement it, you -// might want to write a set of tests to make sure each implementation -// conforms to some basic requirements, but you don't know what -// implementations will be written in the future. -// -// How can you write the tests without committing to the type -// parameters? That's what "type-parameterized tests" can do for you. -// It is a bit more involved than typed tests, but in return you get a -// test pattern that can be reused in many contexts, which is a big -// win. Here's how you do it: - -// First, define a test fixture class template. Here we just reuse -// the PrimeTableTest fixture defined earlier: - -template -class PrimeTableTest2 : public PrimeTableTest { -}; - -// Then, declare the test case. The argument is the name of the test -// fixture, and also the name of the test case (as usual). The _P -// suffix is for "parameterized" or "pattern". -TYPED_TEST_CASE_P(PrimeTableTest2); - -// Next, use TYPED_TEST_P(TestCaseName, TestName) to define a test, -// similar to what you do with TEST_F. -TYPED_TEST_P(PrimeTableTest2, ReturnsFalseForNonPrimes) { - EXPECT_FALSE(this->table_->IsPrime(-5)); - EXPECT_FALSE(this->table_->IsPrime(0)); - EXPECT_FALSE(this->table_->IsPrime(1)); - EXPECT_FALSE(this->table_->IsPrime(4)); - EXPECT_FALSE(this->table_->IsPrime(6)); - EXPECT_FALSE(this->table_->IsPrime(100)); -} - -TYPED_TEST_P(PrimeTableTest2, ReturnsTrueForPrimes) { - EXPECT_TRUE(this->table_->IsPrime(2)); - EXPECT_TRUE(this->table_->IsPrime(3)); - EXPECT_TRUE(this->table_->IsPrime(5)); - EXPECT_TRUE(this->table_->IsPrime(7)); - EXPECT_TRUE(this->table_->IsPrime(11)); - EXPECT_TRUE(this->table_->IsPrime(131)); -} - -TYPED_TEST_P(PrimeTableTest2, CanGetNextPrime) { - EXPECT_EQ(2, this->table_->GetNextPrime(0)); - EXPECT_EQ(3, this->table_->GetNextPrime(2)); - EXPECT_EQ(5, this->table_->GetNextPrime(3)); - EXPECT_EQ(7, this->table_->GetNextPrime(5)); - EXPECT_EQ(11, this->table_->GetNextPrime(7)); - EXPECT_EQ(131, this->table_->GetNextPrime(128)); -} - -// Type-parameterized tests involve one extra step: you have to -// enumerate the tests you defined: -REGISTER_TYPED_TEST_CASE_P( - PrimeTableTest2, // The first argument is the test case name. - // The rest of the arguments are the test names. - ReturnsFalseForNonPrimes, ReturnsTrueForPrimes, CanGetNextPrime); - -// At this point the test pattern is done. However, you don't have -// any real test yet as you haven't said which types you want to run -// the tests with. - -// To turn the abstract test pattern into real tests, you instantiate -// it with a list of types. Usually the test pattern will be defined -// in a .h file, and anyone can #include and instantiate it. You can -// even instantiate it more than once in the same program. To tell -// different instances apart, you give each of them a name, which will -// become part of the test case name and can be used in test filters. - -// The list of types we want to test. Note that it doesn't have to be -// defined at the time we write the TYPED_TEST_P()s. -typedef Types - PrimeTableImplementations; -INSTANTIATE_TYPED_TEST_CASE_P(OnTheFlyAndPreCalculated, // Instance name - PrimeTableTest2, // Test case name - PrimeTableImplementations); // Type list - -#endif // GTEST_HAS_TYPED_TEST_P -} // namespace diff --git a/test/gtest-1.8.0/samples/sample7_unittest.cc b/test/gtest-1.8.0/samples/sample7_unittest.cc deleted file mode 100644 index efa972899e..0000000000 --- a/test/gtest-1.8.0/samples/sample7_unittest.cc +++ /dev/null @@ -1,118 +0,0 @@ -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vladl@google.com (Vlad Losev) - -// This sample shows how to test common properties of multiple -// implementations of an interface (aka interface tests) using -// value-parameterized tests. Each test in the test case has -// a parameter that is an interface pointer to an implementation -// tested. - -// The interface and its implementations are in this header. -#include "prime_tables.h" - -#include "gtest/gtest.h" -namespace { - -using ::testing::TestWithParam; -using ::testing::Values; - -// As a general rule, to prevent a test from affecting the tests that come -// after it, you should create and destroy the tested objects for each test -// instead of reusing them. In this sample we will define a simple factory -// function for PrimeTable objects. We will instantiate objects in test's -// SetUp() method and delete them in TearDown() method. -typedef PrimeTable* CreatePrimeTableFunc(); - -PrimeTable* CreateOnTheFlyPrimeTable() { - return new OnTheFlyPrimeTable(); -} - -template -PrimeTable* CreatePreCalculatedPrimeTable() { - return new PreCalculatedPrimeTable(max_precalculated); -} - -// Inside the test body, fixture constructor, SetUp(), and TearDown() you -// can refer to the test parameter by GetParam(). In this case, the test -// parameter is a factory function which we call in fixture's SetUp() to -// create and store an instance of PrimeTable. -class PrimeTableTestSmpl7 : public TestWithParam { - public: - virtual ~PrimeTableTestSmpl7() { delete table_; } - virtual void SetUp() { table_ = (*GetParam())(); } - virtual void TearDown() { - delete table_; - table_ = NULL; - } - - protected: - PrimeTable* table_; -}; - -TEST_P(PrimeTableTestSmpl7, ReturnsFalseForNonPrimes) { - EXPECT_FALSE(table_->IsPrime(-5)); - EXPECT_FALSE(table_->IsPrime(0)); - EXPECT_FALSE(table_->IsPrime(1)); - EXPECT_FALSE(table_->IsPrime(4)); - EXPECT_FALSE(table_->IsPrime(6)); - EXPECT_FALSE(table_->IsPrime(100)); -} - -TEST_P(PrimeTableTestSmpl7, ReturnsTrueForPrimes) { - EXPECT_TRUE(table_->IsPrime(2)); - EXPECT_TRUE(table_->IsPrime(3)); - EXPECT_TRUE(table_->IsPrime(5)); - EXPECT_TRUE(table_->IsPrime(7)); - EXPECT_TRUE(table_->IsPrime(11)); - EXPECT_TRUE(table_->IsPrime(131)); -} - -TEST_P(PrimeTableTestSmpl7, CanGetNextPrime) { - EXPECT_EQ(2, table_->GetNextPrime(0)); - EXPECT_EQ(3, table_->GetNextPrime(2)); - EXPECT_EQ(5, table_->GetNextPrime(3)); - EXPECT_EQ(7, table_->GetNextPrime(5)); - EXPECT_EQ(11, table_->GetNextPrime(7)); - EXPECT_EQ(131, table_->GetNextPrime(128)); -} - -// In order to run value-parameterized tests, you need to instantiate them, -// or bind them to a list of values which will be used as test parameters. -// You can instantiate them in a different translation module, or even -// instantiate them several times. -// -// Here, we instantiate our tests with a list of two PrimeTable object -// factory functions: -INSTANTIATE_TEST_CASE_P(OnTheFlyAndPreCalculated, PrimeTableTestSmpl7, - Values(&CreateOnTheFlyPrimeTable, - &CreatePreCalculatedPrimeTable<1000>)); - -} // namespace diff --git a/test/gtest-1.8.0/samples/sample8_unittest.cc b/test/gtest-1.8.0/samples/sample8_unittest.cc deleted file mode 100644 index b0ff2d1fdc..0000000000 --- a/test/gtest-1.8.0/samples/sample8_unittest.cc +++ /dev/null @@ -1,174 +0,0 @@ -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vladl@google.com (Vlad Losev) - -// This sample shows how to test code relying on some global flag variables. -// Combine() helps with generating all possible combinations of such flags, -// and each test is given one combination as a parameter. - -// Use class definitions to test from this header. -#include "prime_tables.h" - -#include "gtest/gtest.h" -namespace { -#if GTEST_HAS_COMBINE - -// Suppose we want to introduce a new, improved implementation of PrimeTable -// which combines speed of PrecalcPrimeTable and versatility of -// OnTheFlyPrimeTable (see prime_tables.h). Inside it instantiates both -// PrecalcPrimeTable and OnTheFlyPrimeTable and uses the one that is more -// appropriate under the circumstances. But in low memory conditions, it can be -// told to instantiate without PrecalcPrimeTable instance at all and use only -// OnTheFlyPrimeTable. -class HybridPrimeTable : public PrimeTable { - public: - HybridPrimeTable(bool force_on_the_fly, int max_precalculated) - : on_the_fly_impl_(new OnTheFlyPrimeTable), - precalc_impl_(force_on_the_fly ? NULL : - new PreCalculatedPrimeTable(max_precalculated)), - max_precalculated_(max_precalculated) {} - virtual ~HybridPrimeTable() { - delete on_the_fly_impl_; - delete precalc_impl_; - } - - virtual bool IsPrime(int n) const { - if (precalc_impl_ != NULL && n < max_precalculated_) - return precalc_impl_->IsPrime(n); - else - return on_the_fly_impl_->IsPrime(n); - } - - virtual int GetNextPrime(int p) const { - int next_prime = -1; - if (precalc_impl_ != NULL && p < max_precalculated_) - next_prime = precalc_impl_->GetNextPrime(p); - - return next_prime != -1 ? next_prime : on_the_fly_impl_->GetNextPrime(p); - } - - private: - OnTheFlyPrimeTable* on_the_fly_impl_; - PreCalculatedPrimeTable* precalc_impl_; - int max_precalculated_; -}; - -using ::testing::TestWithParam; -using ::testing::Bool; -using ::testing::Values; -using ::testing::Combine; - -// To test all code paths for HybridPrimeTable we must test it with numbers -// both within and outside PreCalculatedPrimeTable's capacity and also with -// PreCalculatedPrimeTable disabled. We do this by defining fixture which will -// accept different combinations of parameters for instantiating a -// HybridPrimeTable instance. -class PrimeTableTest : public TestWithParam< ::testing::tuple > { - protected: - virtual void SetUp() { - // This can be written as - // - // bool force_on_the_fly; - // int max_precalculated; - // tie(force_on_the_fly, max_precalculated) = GetParam(); - // - // once the Google C++ Style Guide allows use of ::std::tr1::tie. - // - bool force_on_the_fly = ::testing::get<0>(GetParam()); - int max_precalculated = ::testing::get<1>(GetParam()); - table_ = new HybridPrimeTable(force_on_the_fly, max_precalculated); - } - virtual void TearDown() { - delete table_; - table_ = NULL; - } - HybridPrimeTable* table_; -}; - -TEST_P(PrimeTableTest, ReturnsFalseForNonPrimes) { - // Inside the test body, you can refer to the test parameter by GetParam(). - // In this case, the test parameter is a PrimeTable interface pointer which - // we can use directly. - // Please note that you can also save it in the fixture's SetUp() method - // or constructor and use saved copy in the tests. - - EXPECT_FALSE(table_->IsPrime(-5)); - EXPECT_FALSE(table_->IsPrime(0)); - EXPECT_FALSE(table_->IsPrime(1)); - EXPECT_FALSE(table_->IsPrime(4)); - EXPECT_FALSE(table_->IsPrime(6)); - EXPECT_FALSE(table_->IsPrime(100)); -} - -TEST_P(PrimeTableTest, ReturnsTrueForPrimes) { - EXPECT_TRUE(table_->IsPrime(2)); - EXPECT_TRUE(table_->IsPrime(3)); - EXPECT_TRUE(table_->IsPrime(5)); - EXPECT_TRUE(table_->IsPrime(7)); - EXPECT_TRUE(table_->IsPrime(11)); - EXPECT_TRUE(table_->IsPrime(131)); -} - -TEST_P(PrimeTableTest, CanGetNextPrime) { - EXPECT_EQ(2, table_->GetNextPrime(0)); - EXPECT_EQ(3, table_->GetNextPrime(2)); - EXPECT_EQ(5, table_->GetNextPrime(3)); - EXPECT_EQ(7, table_->GetNextPrime(5)); - EXPECT_EQ(11, table_->GetNextPrime(7)); - EXPECT_EQ(131, table_->GetNextPrime(128)); -} - -// In order to run value-parameterized tests, you need to instantiate them, -// or bind them to a list of values which will be used as test parameters. -// You can instantiate them in a different translation module, or even -// instantiate them several times. -// -// Here, we instantiate our tests with a list of parameters. We must combine -// all variations of the boolean flag suppressing PrecalcPrimeTable and some -// meaningful values for tests. We choose a small value (1), and a value that -// will put some of the tested numbers beyond the capability of the -// PrecalcPrimeTable instance and some inside it (10). Combine will produce all -// possible combinations. -INSTANTIATE_TEST_CASE_P(MeaningfulTestParameters, - PrimeTableTest, - Combine(Bool(), Values(1, 10))); - -#else - -// Google Test may not support Combine() with some compilers. If we -// use conditional compilation to compile out all code referring to -// the gtest_main library, MSVC linker will not link that library at -// all and consequently complain about missing entry point defined in -// that library (fatal error LNK1561: entry point must be -// defined). This dummy test keeps gtest_main linked in. -TEST(DummyTest, CombineIsNotSupportedOnThisPlatform) {} - -#endif // GTEST_HAS_COMBINE -} // namespace diff --git a/test/gtest-1.8.0/samples/sample9_unittest.cc b/test/gtest-1.8.0/samples/sample9_unittest.cc deleted file mode 100644 index 75584bb04a..0000000000 --- a/test/gtest-1.8.0/samples/sample9_unittest.cc +++ /dev/null @@ -1,157 +0,0 @@ -// Copyright 2009 Google Inc. All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vladl@google.com (Vlad Losev) - -// This sample shows how to use Google Test listener API to implement -// an alternative console output and how to use the UnitTest reflection API -// to enumerate test cases and tests and to inspect their results. - -#include - -#include "gtest/gtest.h" - -using ::testing::EmptyTestEventListener; -using ::testing::InitGoogleTest; -using ::testing::Test; -using ::testing::TestCase; -using ::testing::TestEventListeners; -using ::testing::TestInfo; -using ::testing::TestPartResult; -using ::testing::UnitTest; -namespace { -// Provides alternative output mode which produces minimal amount of -// information about tests. -class TersePrinter : public EmptyTestEventListener { - private: - // Called before any test activity starts. - virtual void OnTestProgramStart(const UnitTest& /* unit_test */) {} - - // Called after all test activities have ended. - virtual void OnTestProgramEnd(const UnitTest& unit_test) { - fprintf(stdout, "TEST %s\n", unit_test.Passed() ? "PASSED" : "FAILED"); - fflush(stdout); - } - - // Called before a test starts. - virtual void OnTestStart(const TestInfo& test_info) { - fprintf(stdout, - "*** Test %s.%s starting.\n", - test_info.test_case_name(), - test_info.name()); - fflush(stdout); - } - - // Called after a failed assertion or a SUCCEED() invocation. - virtual void OnTestPartResult(const TestPartResult& test_part_result) { - fprintf(stdout, - "%s in %s:%d\n%s\n", - test_part_result.failed() ? "*** Failure" : "Success", - test_part_result.file_name(), - test_part_result.line_number(), - test_part_result.summary()); - fflush(stdout); - } - - // Called after a test ends. - virtual void OnTestEnd(const TestInfo& test_info) { - fprintf(stdout, - "*** Test %s.%s ending.\n", - test_info.test_case_name(), - test_info.name()); - fflush(stdout); - } -}; // class TersePrinter - -TEST(CustomOutputTest, PrintsMessage) { - printf("Printing something from the test body...\n"); -} - -TEST(CustomOutputTest, Succeeds) { - SUCCEED() << "SUCCEED() has been invoked from here"; -} - -TEST(CustomOutputTest, Fails) { - EXPECT_EQ(1, 2) - << "This test fails in order to demonstrate alternative failure messages"; -} -} // namespace - -int main(int argc, char **argv) { - InitGoogleTest(&argc, argv); - - bool terse_output = false; - if (argc > 1 && strcmp(argv[1], "--terse_output") == 0 ) - terse_output = true; - else - printf("%s\n", "Run this program with --terse_output to change the way " - "it prints its output."); - - UnitTest& unit_test = *UnitTest::GetInstance(); - - // If we are given the --terse_output command line flag, suppresses the - // standard output and attaches own result printer. - if (terse_output) { - TestEventListeners& listeners = unit_test.listeners(); - - // Removes the default console output listener from the list so it will - // not receive events from Google Test and won't print any output. Since - // this operation transfers ownership of the listener to the caller we - // have to delete it as well. - delete listeners.Release(listeners.default_result_printer()); - - // Adds the custom output listener to the list. It will now receive - // events from Google Test and print the alternative output. We don't - // have to worry about deleting it since Google Test assumes ownership - // over it after adding it to the list. - listeners.Append(new TersePrinter); - } - int ret_val = RUN_ALL_TESTS(); - - // This is an example of using the UnitTest reflection API to inspect test - // results. Here we discount failures from the tests we expected to fail. - int unexpectedly_failed_tests = 0; - for (int i = 0; i < unit_test.total_test_case_count(); ++i) { - const TestCase& test_case = *unit_test.GetTestCase(i); - for (int j = 0; j < test_case.total_test_count(); ++j) { - const TestInfo& test_info = *test_case.GetTestInfo(j); - // Counts failed tests that were not meant to fail (those without - // 'Fails' in the name). - if (test_info.result()->Failed() && - strcmp(test_info.name(), "Fails") != 0) { - unexpectedly_failed_tests++; - } - } - } - - // Test that were meant to fail should not affect the test program outcome. - if (unexpectedly_failed_tests == 0) - ret_val = 0; - - return ret_val; -} diff --git a/test/gtest-1.8.0/scripts/common.py b/test/gtest-1.8.0/scripts/common.py deleted file mode 100644 index 3c0347a75b..0000000000 --- a/test/gtest-1.8.0/scripts/common.py +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 2013 Google Inc. All Rights Reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Shared utilities for writing scripts for Google Test/Mock.""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - - -import os -import re - - -# Matches the line from 'svn info .' output that describes what SVN -# path the current local directory corresponds to. For example, in -# a googletest SVN workspace's trunk/test directory, the output will be: -# -# URL: https://googletest.googlecode.com/svn/trunk/test -_SVN_INFO_URL_RE = re.compile(r'^URL: https://(\w+)\.googlecode\.com/svn(.*)') - - -def GetCommandOutput(command): - """Runs the shell command and returns its stdout as a list of lines.""" - - f = os.popen(command, 'r') - lines = [line.strip() for line in f.readlines()] - f.close() - return lines - - -def GetSvnInfo(): - """Returns the project name and the current SVN workspace's root path.""" - - for line in GetCommandOutput('svn info .'): - m = _SVN_INFO_URL_RE.match(line) - if m: - project = m.group(1) # googletest or googlemock - rel_path = m.group(2) - root = os.path.realpath(rel_path.count('/') * '../') - return project, root - - return None, None - - -def GetSvnTrunk(): - """Returns the current SVN workspace's trunk root path.""" - - _, root = GetSvnInfo() - return root + '/trunk' if root else None - - -def IsInGTestSvn(): - project, _ = GetSvnInfo() - return project == 'googletest' - - -def IsInGMockSvn(): - project, _ = GetSvnInfo() - return project == 'googlemock' diff --git a/test/gtest-1.8.0/scripts/fuse_gtest_files.py b/test/gtest-1.8.0/scripts/fuse_gtest_files.py deleted file mode 100644 index 9a5c8d367f..0000000000 --- a/test/gtest-1.8.0/scripts/fuse_gtest_files.py +++ /dev/null @@ -1,253 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2009, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""fuse_gtest_files.py v0.2.0 -Fuses Google Test source code into a .h file and a .cc file. - -SYNOPSIS - fuse_gtest_files.py [GTEST_ROOT_DIR] OUTPUT_DIR - - Scans GTEST_ROOT_DIR for Google Test source code, and generates - two files: OUTPUT_DIR/gtest/gtest.h and OUTPUT_DIR/gtest/gtest-all.cc. - Then you can build your tests by adding OUTPUT_DIR to the include - search path and linking with OUTPUT_DIR/gtest/gtest-all.cc. These - two files contain everything you need to use Google Test. Hence - you can "install" Google Test by copying them to wherever you want. - - GTEST_ROOT_DIR can be omitted and defaults to the parent - directory of the directory holding this script. - -EXAMPLES - ./fuse_gtest_files.py fused_gtest - ./fuse_gtest_files.py path/to/unpacked/gtest fused_gtest - -This tool is experimental. In particular, it assumes that there is no -conditional inclusion of Google Test headers. Please report any -problems to googletestframework@googlegroups.com. You can read -https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuide.md for -more information. -""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import os -import re -try: - from sets import Set as set # For Python 2.3 compatibility -except ImportError: - pass -import sys - -# We assume that this file is in the scripts/ directory in the Google -# Test root directory. -DEFAULT_GTEST_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..') - -# Regex for matching '#include "gtest/..."'. -INCLUDE_GTEST_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(gtest/.+)"') - -# Regex for matching '#include "src/..."'. -INCLUDE_SRC_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(src/.+)"') - -# Where to find the source seed files. -GTEST_H_SEED = 'include/gtest/gtest.h' -GTEST_SPI_H_SEED = 'include/gtest/gtest-spi.h' -GTEST_ALL_CC_SEED = 'src/gtest-all.cc' - -# Where to put the generated files. -GTEST_H_OUTPUT = 'gtest/gtest.h' -GTEST_ALL_CC_OUTPUT = 'gtest/gtest-all.cc' - - -def VerifyFileExists(directory, relative_path): - """Verifies that the given file exists; aborts on failure. - - relative_path is the file path relative to the given directory. - """ - - if not os.path.isfile(os.path.join(directory, relative_path)): - print('ERROR: Cannot find %s in directory %s.' % (relative_path, - directory)) - print('Please either specify a valid project root directory ' - 'or omit it on the command line.') - sys.exit(1) - - -def ValidateGTestRootDir(gtest_root): - """Makes sure gtest_root points to a valid gtest root directory. - - The function aborts the program on failure. - """ - - VerifyFileExists(gtest_root, GTEST_H_SEED) - VerifyFileExists(gtest_root, GTEST_ALL_CC_SEED) - - -def VerifyOutputFile(output_dir, relative_path): - """Verifies that the given output file path is valid. - - relative_path is relative to the output_dir directory. - """ - - # Makes sure the output file either doesn't exist or can be overwritten. - output_file = os.path.join(output_dir, relative_path) - if os.path.exists(output_file): - # TODO(wan@google.com): The following user-interaction doesn't - # work with automated processes. We should provide a way for the - # Makefile to force overwriting the files. - print('%s already exists in directory %s - overwrite it? (y/N) ' % - (relative_path, output_dir)) - answer = sys.stdin.readline().strip() - if answer not in ['y', 'Y']: - print('ABORTED.') - sys.exit(1) - - # Makes sure the directory holding the output file exists; creates - # it and all its ancestors if necessary. - parent_directory = os.path.dirname(output_file) - if not os.path.isdir(parent_directory): - os.makedirs(parent_directory) - - -def ValidateOutputDir(output_dir): - """Makes sure output_dir points to a valid output directory. - - The function aborts the program on failure. - """ - - VerifyOutputFile(output_dir, GTEST_H_OUTPUT) - VerifyOutputFile(output_dir, GTEST_ALL_CC_OUTPUT) - - -def FuseGTestH(gtest_root, output_dir): - """Scans folder gtest_root to generate gtest/gtest.h in output_dir.""" - - output_file = open(os.path.join(output_dir, GTEST_H_OUTPUT), 'w') - processed_files = set() # Holds all gtest headers we've processed. - - def ProcessFile(gtest_header_path): - """Processes the given gtest header file.""" - - # We don't process the same header twice. - if gtest_header_path in processed_files: - return - - processed_files.add(gtest_header_path) - - # Reads each line in the given gtest header. - for line in open(os.path.join(gtest_root, gtest_header_path), 'r'): - m = INCLUDE_GTEST_FILE_REGEX.match(line) - if m: - # It's '#include "gtest/..."' - let's process it recursively. - ProcessFile('include/' + m.group(1)) - else: - # Otherwise we copy the line unchanged to the output file. - output_file.write(line) - - ProcessFile(GTEST_H_SEED) - output_file.close() - - -def FuseGTestAllCcToFile(gtest_root, output_file): - """Scans folder gtest_root to generate gtest/gtest-all.cc in output_file.""" - - processed_files = set() - - def ProcessFile(gtest_source_file): - """Processes the given gtest source file.""" - - # We don't process the same #included file twice. - if gtest_source_file in processed_files: - return - - processed_files.add(gtest_source_file) - - # Reads each line in the given gtest source file. - for line in open(os.path.join(gtest_root, gtest_source_file), 'r'): - m = INCLUDE_GTEST_FILE_REGEX.match(line) - if m: - if 'include/' + m.group(1) == GTEST_SPI_H_SEED: - # It's '#include "gtest/gtest-spi.h"'. This file is not - # #included by "gtest/gtest.h", so we need to process it. - ProcessFile(GTEST_SPI_H_SEED) - else: - # It's '#include "gtest/foo.h"' where foo is not gtest-spi. - # We treat it as '#include "gtest/gtest.h"', as all other - # gtest headers are being fused into gtest.h and cannot be - # #included directly. - - # There is no need to #include "gtest/gtest.h" more than once. - if not GTEST_H_SEED in processed_files: - processed_files.add(GTEST_H_SEED) - output_file.write('#include "%s"\n' % (GTEST_H_OUTPUT,)) - else: - m = INCLUDE_SRC_FILE_REGEX.match(line) - if m: - # It's '#include "src/foo"' - let's process it recursively. - ProcessFile(m.group(1)) - else: - output_file.write(line) - - ProcessFile(GTEST_ALL_CC_SEED) - - -def FuseGTestAllCc(gtest_root, output_dir): - """Scans folder gtest_root to generate gtest/gtest-all.cc in output_dir.""" - - output_file = open(os.path.join(output_dir, GTEST_ALL_CC_OUTPUT), 'w') - FuseGTestAllCcToFile(gtest_root, output_file) - output_file.close() - - -def FuseGTest(gtest_root, output_dir): - """Fuses gtest.h and gtest-all.cc.""" - - ValidateGTestRootDir(gtest_root) - ValidateOutputDir(output_dir) - - FuseGTestH(gtest_root, output_dir) - FuseGTestAllCc(gtest_root, output_dir) - - -def main(): - argc = len(sys.argv) - if argc == 2: - # fuse_gtest_files.py OUTPUT_DIR - FuseGTest(DEFAULT_GTEST_ROOT_DIR, sys.argv[1]) - elif argc == 3: - # fuse_gtest_files.py GTEST_ROOT_DIR OUTPUT_DIR - FuseGTest(sys.argv[1], sys.argv[2]) - else: - print(__doc__) - sys.exit(1) - - -if __name__ == '__main__': - main() diff --git a/test/gtest-1.8.0/scripts/gen_gtest_pred_impl.py b/test/gtest-1.8.0/scripts/gen_gtest_pred_impl.py deleted file mode 100644 index b43efdf41e..0000000000 --- a/test/gtest-1.8.0/scripts/gen_gtest_pred_impl.py +++ /dev/null @@ -1,730 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2006, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""gen_gtest_pred_impl.py v0.1 - -Generates the implementation of Google Test predicate assertions and -accompanying tests. - -Usage: - - gen_gtest_pred_impl.py MAX_ARITY - -where MAX_ARITY is a positive integer. - -The command generates the implementation of up-to MAX_ARITY-ary -predicate assertions, and writes it to file gtest_pred_impl.h in the -directory where the script is. It also generates the accompanying -unit test in file gtest_pred_impl_unittest.cc. -""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import os -import sys -import time - -# Where this script is. -SCRIPT_DIR = os.path.dirname(sys.argv[0]) - -# Where to store the generated header. -HEADER = os.path.join(SCRIPT_DIR, '../include/gtest/gtest_pred_impl.h') - -# Where to store the generated unit test. -UNIT_TEST = os.path.join(SCRIPT_DIR, '../test/gtest_pred_impl_unittest.cc') - - -def HeaderPreamble(n): - """Returns the preamble for the header file. - - Args: - n: the maximum arity of the predicate macros to be generated. - """ - - # A map that defines the values used in the preamble template. - DEFS = { - 'today' : time.strftime('%m/%d/%Y'), - 'year' : time.strftime('%Y'), - 'command' : '%s %s' % (os.path.basename(sys.argv[0]), n), - 'n' : n - } - - return ( -"""// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// This file is AUTOMATICALLY GENERATED on %(today)s by command -// '%(command)s'. DO NOT EDIT BY HAND! -// -// Implements a family of generic predicate assertion macros. - -#ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ -#define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ - -#include "gtest/gtest.h" - -namespace testing { - -// This header implements a family of generic predicate assertion -// macros: -// -// ASSERT_PRED_FORMAT1(pred_format, v1) -// ASSERT_PRED_FORMAT2(pred_format, v1, v2) -// ... -// -// where pred_format is a function or functor that takes n (in the -// case of ASSERT_PRED_FORMATn) values and their source expression -// text, and returns a testing::AssertionResult. See the definition -// of ASSERT_EQ in gtest.h for an example. -// -// If you don't care about formatting, you can use the more -// restrictive version: -// -// ASSERT_PRED1(pred, v1) -// ASSERT_PRED2(pred, v1, v2) -// ... -// -// where pred is an n-ary function or functor that returns bool, -// and the values v1, v2, ..., must support the << operator for -// streaming to std::ostream. -// -// We also define the EXPECT_* variations. -// -// For now we only support predicates whose arity is at most %(n)s. -// Please email googletestframework@googlegroups.com if you need -// support for higher arities. - -// GTEST_ASSERT_ is the basic statement to which all of the assertions -// in this file reduce. Don't use this in your code. - -#define GTEST_ASSERT_(expression, on_failure) \\ - GTEST_AMBIGUOUS_ELSE_BLOCKER_ \\ - if (const ::testing::AssertionResult gtest_ar = (expression)) \\ - ; \\ - else \\ - on_failure(gtest_ar.failure_message()) -""" % DEFS) - - -def Arity(n): - """Returns the English name of the given arity.""" - - if n < 0: - return None - elif n <= 3: - return ['nullary', 'unary', 'binary', 'ternary'][n] - else: - return '%s-ary' % n - - -def Title(word): - """Returns the given word in title case. The difference between - this and string's title() method is that Title('4-ary') is '4-ary' - while '4-ary'.title() is '4-Ary'.""" - - return word[0].upper() + word[1:] - - -def OneTo(n): - """Returns the list [1, 2, 3, ..., n].""" - - return range(1, n + 1) - - -def Iter(n, format, sep=''): - """Given a positive integer n, a format string that contains 0 or - more '%s' format specs, and optionally a separator string, returns - the join of n strings, each formatted with the format string on an - iterator ranged from 1 to n. - - Example: - - Iter(3, 'v%s', sep=', ') returns 'v1, v2, v3'. - """ - - # How many '%s' specs are in format? - spec_count = len(format.split('%s')) - 1 - return sep.join([format % (spec_count * (i,)) for i in OneTo(n)]) - - -def ImplementationForArity(n): - """Returns the implementation of n-ary predicate assertions.""" - - # A map the defines the values used in the implementation template. - DEFS = { - 'n' : str(n), - 'vs' : Iter(n, 'v%s', sep=', '), - 'vts' : Iter(n, '#v%s', sep=', '), - 'arity' : Arity(n), - 'Arity' : Title(Arity(n)) - } - - impl = """ - -// Helper function for implementing {EXPECT|ASSERT}_PRED%(n)s. Don't use -// this in your code. -template -AssertionResult AssertPred%(n)sHelper(const char* pred_text""" % DEFS - - impl += Iter(n, """, - const char* e%s""") - - impl += """, - Pred pred""" - - impl += Iter(n, """, - const T%s& v%s""") - - impl += """) { - if (pred(%(vs)s)) return AssertionSuccess(); - -""" % DEFS - - impl += ' return AssertionFailure() << pred_text << "("' - - impl += Iter(n, """ - << e%s""", sep=' << ", "') - - impl += ' << ") evaluates to false, where"' - - impl += Iter(n, """ - << "\\n" << e%s << " evaluates to " << v%s""") - - impl += """; -} - -// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT%(n)s. -// Don't use this in your code. -#define GTEST_PRED_FORMAT%(n)s_(pred_format, %(vs)s, on_failure)\\ - GTEST_ASSERT_(pred_format(%(vts)s, %(vs)s), \\ - on_failure) - -// Internal macro for implementing {EXPECT|ASSERT}_PRED%(n)s. Don't use -// this in your code. -#define GTEST_PRED%(n)s_(pred, %(vs)s, on_failure)\\ - GTEST_ASSERT_(::testing::AssertPred%(n)sHelper(#pred""" % DEFS - - impl += Iter(n, """, \\ - #v%s""") - - impl += """, \\ - pred""" - - impl += Iter(n, """, \\ - v%s""") - - impl += """), on_failure) - -// %(Arity)s predicate assertion macros. -#define EXPECT_PRED_FORMAT%(n)s(pred_format, %(vs)s) \\ - GTEST_PRED_FORMAT%(n)s_(pred_format, %(vs)s, GTEST_NONFATAL_FAILURE_) -#define EXPECT_PRED%(n)s(pred, %(vs)s) \\ - GTEST_PRED%(n)s_(pred, %(vs)s, GTEST_NONFATAL_FAILURE_) -#define ASSERT_PRED_FORMAT%(n)s(pred_format, %(vs)s) \\ - GTEST_PRED_FORMAT%(n)s_(pred_format, %(vs)s, GTEST_FATAL_FAILURE_) -#define ASSERT_PRED%(n)s(pred, %(vs)s) \\ - GTEST_PRED%(n)s_(pred, %(vs)s, GTEST_FATAL_FAILURE_) - -""" % DEFS - - return impl - - -def HeaderPostamble(): - """Returns the postamble for the header file.""" - - return """ - -} // namespace testing - -#endif // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ -""" - - -def GenerateFile(path, content): - """Given a file path and a content string - overwrites it with the given content. - """ - print 'Updating file %s . . .' % path - f = file(path, 'w+') - print >>f, content, - f.close() - - print 'File %s has been updated.' % path - - -def GenerateHeader(n): - """Given the maximum arity n, updates the header file that implements - the predicate assertions. - """ - GenerateFile(HEADER, - HeaderPreamble(n) - + ''.join([ImplementationForArity(i) for i in OneTo(n)]) - + HeaderPostamble()) - - -def UnitTestPreamble(): - """Returns the preamble for the unit test file.""" - - # A map that defines the values used in the preamble template. - DEFS = { - 'today' : time.strftime('%m/%d/%Y'), - 'year' : time.strftime('%Y'), - 'command' : '%s %s' % (os.path.basename(sys.argv[0]), sys.argv[1]), - } - - return ( -"""// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// This file is AUTOMATICALLY GENERATED on %(today)s by command -// '%(command)s'. DO NOT EDIT BY HAND! - -// Regression test for gtest_pred_impl.h -// -// This file is generated by a script and quite long. If you intend to -// learn how Google Test works by reading its unit tests, read -// gtest_unittest.cc instead. -// -// This is intended as a regression test for the Google Test predicate -// assertions. We compile it as part of the gtest_unittest target -// only to keep the implementation tidy and compact, as it is quite -// involved to set up the stage for testing Google Test using Google -// Test itself. -// -// Currently, gtest_unittest takes ~11 seconds to run in the testing -// daemon. In the future, if it grows too large and needs much more -// time to finish, we should consider separating this file into a -// stand-alone regression test. - -#include - -#include "gtest/gtest.h" -#include "gtest/gtest-spi.h" - -// A user-defined data type. -struct Bool { - explicit Bool(int val) : value(val != 0) {} - - bool operator>(int n) const { return value > Bool(n).value; } - - Bool operator+(const Bool& rhs) const { return Bool(value + rhs.value); } - - bool operator==(const Bool& rhs) const { return value == rhs.value; } - - bool value; -}; - -// Enables Bool to be used in assertions. -std::ostream& operator<<(std::ostream& os, const Bool& x) { - return os << (x.value ? "true" : "false"); -} - -""" % DEFS) - - -def TestsForArity(n): - """Returns the tests for n-ary predicate assertions.""" - - # A map that defines the values used in the template for the tests. - DEFS = { - 'n' : n, - 'es' : Iter(n, 'e%s', sep=', '), - 'vs' : Iter(n, 'v%s', sep=', '), - 'vts' : Iter(n, '#v%s', sep=', '), - 'tvs' : Iter(n, 'T%s v%s', sep=', '), - 'int_vs' : Iter(n, 'int v%s', sep=', '), - 'Bool_vs' : Iter(n, 'Bool v%s', sep=', '), - 'types' : Iter(n, 'typename T%s', sep=', '), - 'v_sum' : Iter(n, 'v%s', sep=' + '), - 'arity' : Arity(n), - 'Arity' : Title(Arity(n)), - } - - tests = ( -"""// Sample functions/functors for testing %(arity)s predicate assertions. - -// A %(arity)s predicate function. -template <%(types)s> -bool PredFunction%(n)s(%(tvs)s) { - return %(v_sum)s > 0; -} - -// The following two functions are needed to circumvent a bug in -// gcc 2.95.3, which sometimes has problem with the above template -// function. -bool PredFunction%(n)sInt(%(int_vs)s) { - return %(v_sum)s > 0; -} -bool PredFunction%(n)sBool(%(Bool_vs)s) { - return %(v_sum)s > 0; -} -""" % DEFS) - - tests += """ -// A %(arity)s predicate functor. -struct PredFunctor%(n)s { - template <%(types)s> - bool operator()(""" % DEFS - - tests += Iter(n, 'const T%s& v%s', sep=""", - """) - - tests += """) { - return %(v_sum)s > 0; - } -}; -""" % DEFS - - tests += """ -// A %(arity)s predicate-formatter function. -template <%(types)s> -testing::AssertionResult PredFormatFunction%(n)s(""" % DEFS - - tests += Iter(n, 'const char* e%s', sep=""", - """) - - tests += Iter(n, """, - const T%s& v%s""") - - tests += """) { - if (PredFunction%(n)s(%(vs)s)) - return testing::AssertionSuccess(); - - return testing::AssertionFailure() - << """ % DEFS - - tests += Iter(n, 'e%s', sep=' << " + " << ') - - tests += """ - << " is expected to be positive, but evaluates to " - << %(v_sum)s << "."; -} -""" % DEFS - - tests += """ -// A %(arity)s predicate-formatter functor. -struct PredFormatFunctor%(n)s { - template <%(types)s> - testing::AssertionResult operator()(""" % DEFS - - tests += Iter(n, 'const char* e%s', sep=""", - """) - - tests += Iter(n, """, - const T%s& v%s""") - - tests += """) const { - return PredFormatFunction%(n)s(%(es)s, %(vs)s); - } -}; -""" % DEFS - - tests += """ -// Tests for {EXPECT|ASSERT}_PRED_FORMAT%(n)s. - -class Predicate%(n)sTest : public testing::Test { - protected: - virtual void SetUp() { - expected_to_finish_ = true; - finished_ = false;""" % DEFS - - tests += """ - """ + Iter(n, 'n%s_ = ') + """0; - } -""" - - tests += """ - virtual void TearDown() { - // Verifies that each of the predicate's arguments was evaluated - // exactly once.""" - - tests += ''.join([""" - EXPECT_EQ(1, n%s_) << - "The predicate assertion didn't evaluate argument %s " - "exactly once.";""" % (i, i + 1) for i in OneTo(n)]) - - tests += """ - - // Verifies that the control flow in the test function is expected. - if (expected_to_finish_ && !finished_) { - FAIL() << "The predicate assertion unexpactedly aborted the test."; - } else if (!expected_to_finish_ && finished_) { - FAIL() << "The failed predicate assertion didn't abort the test " - "as expected."; - } - } - - // true iff the test function is expected to run to finish. - static bool expected_to_finish_; - - // true iff the test function did run to finish. - static bool finished_; -""" % DEFS - - tests += Iter(n, """ - static int n%s_;""") - - tests += """ -}; - -bool Predicate%(n)sTest::expected_to_finish_; -bool Predicate%(n)sTest::finished_; -""" % DEFS - - tests += Iter(n, """int Predicate%%(n)sTest::n%s_; -""") % DEFS - - tests += """ -typedef Predicate%(n)sTest EXPECT_PRED_FORMAT%(n)sTest; -typedef Predicate%(n)sTest ASSERT_PRED_FORMAT%(n)sTest; -typedef Predicate%(n)sTest EXPECT_PRED%(n)sTest; -typedef Predicate%(n)sTest ASSERT_PRED%(n)sTest; -""" % DEFS - - def GenTest(use_format, use_assert, expect_failure, - use_functor, use_user_type): - """Returns the test for a predicate assertion macro. - - Args: - use_format: true iff the assertion is a *_PRED_FORMAT*. - use_assert: true iff the assertion is a ASSERT_*. - expect_failure: true iff the assertion is expected to fail. - use_functor: true iff the first argument of the assertion is - a functor (as opposed to a function) - use_user_type: true iff the predicate functor/function takes - argument(s) of a user-defined type. - - Example: - - GenTest(1, 0, 0, 1, 0) returns a test that tests the behavior - of a successful EXPECT_PRED_FORMATn() that takes a functor - whose arguments have built-in types.""" - - if use_assert: - assrt = 'ASSERT' # 'assert' is reserved, so we cannot use - # that identifier here. - else: - assrt = 'EXPECT' - - assertion = assrt + '_PRED' - - if use_format: - pred_format = 'PredFormat' - assertion += '_FORMAT' - else: - pred_format = 'Pred' - - assertion += '%(n)s' % DEFS - - if use_functor: - pred_format_type = 'functor' - pred_format += 'Functor%(n)s()' - else: - pred_format_type = 'function' - pred_format += 'Function%(n)s' - if not use_format: - if use_user_type: - pred_format += 'Bool' - else: - pred_format += 'Int' - - test_name = pred_format_type.title() - - if use_user_type: - arg_type = 'user-defined type (Bool)' - test_name += 'OnUserType' - if expect_failure: - arg = 'Bool(n%s_++)' - else: - arg = 'Bool(++n%s_)' - else: - arg_type = 'built-in type (int)' - test_name += 'OnBuiltInType' - if expect_failure: - arg = 'n%s_++' - else: - arg = '++n%s_' - - if expect_failure: - successful_or_failed = 'failed' - expected_or_not = 'expected.' - test_name += 'Failure' - else: - successful_or_failed = 'successful' - expected_or_not = 'UNEXPECTED!' - test_name += 'Success' - - # A map that defines the values used in the test template. - defs = DEFS.copy() - defs.update({ - 'assert' : assrt, - 'assertion' : assertion, - 'test_name' : test_name, - 'pf_type' : pred_format_type, - 'pf' : pred_format, - 'arg_type' : arg_type, - 'arg' : arg, - 'successful' : successful_or_failed, - 'expected' : expected_or_not, - }) - - test = """ -// Tests a %(successful)s %(assertion)s where the -// predicate-formatter is a %(pf_type)s on a %(arg_type)s. -TEST_F(%(assertion)sTest, %(test_name)s) {""" % defs - - indent = (len(assertion) + 3)*' ' - extra_indent = '' - - if expect_failure: - extra_indent = ' ' - if use_assert: - test += """ - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT""" - else: - test += """ - EXPECT_NONFATAL_FAILURE({ // NOLINT""" - - test += '\n' + extra_indent + """ %(assertion)s(%(pf)s""" % defs - - test = test % defs - test += Iter(n, ',\n' + indent + extra_indent + '%(arg)s' % defs) - test += ');\n' + extra_indent + ' finished_ = true;\n' - - if expect_failure: - test += ' }, "");\n' - - test += '}\n' - return test - - # Generates tests for all 2**6 = 64 combinations. - tests += ''.join([GenTest(use_format, use_assert, expect_failure, - use_functor, use_user_type) - for use_format in [0, 1] - for use_assert in [0, 1] - for expect_failure in [0, 1] - for use_functor in [0, 1] - for use_user_type in [0, 1] - ]) - - return tests - - -def UnitTestPostamble(): - """Returns the postamble for the tests.""" - - return '' - - -def GenerateUnitTest(n): - """Returns the tests for up-to n-ary predicate assertions.""" - - GenerateFile(UNIT_TEST, - UnitTestPreamble() - + ''.join([TestsForArity(i) for i in OneTo(n)]) - + UnitTestPostamble()) - - -def _Main(): - """The entry point of the script. Generates the header file and its - unit test.""" - - if len(sys.argv) != 2: - print __doc__ - print 'Author: ' + __author__ - sys.exit(1) - - n = int(sys.argv[1]) - GenerateHeader(n) - GenerateUnitTest(n) - - -if __name__ == '__main__': - _Main() diff --git a/test/gtest-1.8.0/scripts/gtest-config.in b/test/gtest-1.8.0/scripts/gtest-config.in deleted file mode 100644 index 780f8432ef..0000000000 --- a/test/gtest-1.8.0/scripts/gtest-config.in +++ /dev/null @@ -1,274 +0,0 @@ -#!/bin/sh - -# These variables are automatically filled in by the configure script. -name="@PACKAGE_TARNAME@" -version="@PACKAGE_VERSION@" - -show_usage() -{ - echo "Usage: gtest-config [OPTIONS...]" -} - -show_help() -{ - show_usage - cat <<\EOF - -The `gtest-config' script provides access to the necessary compile and linking -flags to connect with Google C++ Testing Framework, both in a build prior to -installation, and on the system proper after installation. The installation -overrides may be issued in combination with any other queries, but will only -affect installation queries if called on a built but not installed gtest. The -installation queries may not be issued with any other types of queries, and -only one installation query may be made at a time. The version queries and -compiler flag queries may be combined as desired but not mixed. Different -version queries are always combined with logical "and" semantics, and only the -last of any particular query is used while all previous ones ignored. All -versions must be specified as a sequence of numbers separated by periods. -Compiler flag queries output the union of the sets of flags when combined. - - Examples: - gtest-config --min-version=1.0 || echo "Insufficient Google Test version." - - g++ $(gtest-config --cppflags --cxxflags) -o foo.o -c foo.cpp - g++ $(gtest-config --ldflags --libs) -o foo foo.o - - # When using a built but not installed Google Test: - g++ $(../../my_gtest_build/scripts/gtest-config ...) ... - - # When using an installed Google Test, but with installation overrides: - export GTEST_PREFIX="/opt" - g++ $(gtest-config --libdir="/opt/lib64" ...) ... - - Help: - --usage brief usage information - --help display this help message - - Installation Overrides: - --prefix= overrides the installation prefix - --exec-prefix= overrides the executable installation prefix - --libdir= overrides the library installation prefix - --includedir= overrides the header file installation prefix - - Installation Queries: - --prefix installation prefix - --exec-prefix executable installation prefix - --libdir library installation directory - --includedir header file installation directory - --version the version of the Google Test installation - - Version Queries: - --min-version=VERSION return 0 if the version is at least VERSION - --exact-version=VERSION return 0 if the version is exactly VERSION - --max-version=VERSION return 0 if the version is at most VERSION - - Compilation Flag Queries: - --cppflags compile flags specific to the C-like preprocessors - --cxxflags compile flags appropriate for C++ programs - --ldflags linker flags - --libs libraries for linking - -EOF -} - -# This function bounds our version with a min and a max. It uses some clever -# POSIX-compliant variable expansion to portably do all the work in the shell -# and avoid any dependency on a particular "sed" or "awk" implementation. -# Notable is that it will only ever compare the first 3 components of versions. -# Further components will be cleanly stripped off. All versions must be -# unadorned, so "v1.0" will *not* work. The minimum version must be in $1, and -# the max in $2. TODO(chandlerc@google.com): If this ever breaks, we should -# investigate expanding this via autom4te from AS_VERSION_COMPARE rather than -# continuing to maintain our own shell version. -check_versions() -{ - major_version=${version%%.*} - minor_version="0" - point_version="0" - if test "${version#*.}" != "${version}"; then - minor_version=${version#*.} - minor_version=${minor_version%%.*} - fi - if test "${version#*.*.}" != "${version}"; then - point_version=${version#*.*.} - point_version=${point_version%%.*} - fi - - min_version="$1" - min_major_version=${min_version%%.*} - min_minor_version="0" - min_point_version="0" - if test "${min_version#*.}" != "${min_version}"; then - min_minor_version=${min_version#*.} - min_minor_version=${min_minor_version%%.*} - fi - if test "${min_version#*.*.}" != "${min_version}"; then - min_point_version=${min_version#*.*.} - min_point_version=${min_point_version%%.*} - fi - - max_version="$2" - max_major_version=${max_version%%.*} - max_minor_version="0" - max_point_version="0" - if test "${max_version#*.}" != "${max_version}"; then - max_minor_version=${max_version#*.} - max_minor_version=${max_minor_version%%.*} - fi - if test "${max_version#*.*.}" != "${max_version}"; then - max_point_version=${max_version#*.*.} - max_point_version=${max_point_version%%.*} - fi - - test $(($major_version)) -lt $(($min_major_version)) && exit 1 - if test $(($major_version)) -eq $(($min_major_version)); then - test $(($minor_version)) -lt $(($min_minor_version)) && exit 1 - if test $(($minor_version)) -eq $(($min_minor_version)); then - test $(($point_version)) -lt $(($min_point_version)) && exit 1 - fi - fi - - test $(($major_version)) -gt $(($max_major_version)) && exit 1 - if test $(($major_version)) -eq $(($max_major_version)); then - test $(($minor_version)) -gt $(($max_minor_version)) && exit 1 - if test $(($minor_version)) -eq $(($max_minor_version)); then - test $(($point_version)) -gt $(($max_point_version)) && exit 1 - fi - fi - - exit 0 -} - -# Show the usage line when no arguments are specified. -if test $# -eq 0; then - show_usage - exit 1 -fi - -while test $# -gt 0; do - case $1 in - --usage) show_usage; exit 0;; - --help) show_help; exit 0;; - - # Installation overrides - --prefix=*) GTEST_PREFIX=${1#--prefix=};; - --exec-prefix=*) GTEST_EXEC_PREFIX=${1#--exec-prefix=};; - --libdir=*) GTEST_LIBDIR=${1#--libdir=};; - --includedir=*) GTEST_INCLUDEDIR=${1#--includedir=};; - - # Installation queries - --prefix|--exec-prefix|--libdir|--includedir|--version) - if test -n "${do_query}"; then - show_usage - exit 1 - fi - do_query=${1#--} - ;; - - # Version checking - --min-version=*) - do_check_versions=yes - min_version=${1#--min-version=} - ;; - --max-version=*) - do_check_versions=yes - max_version=${1#--max-version=} - ;; - --exact-version=*) - do_check_versions=yes - exact_version=${1#--exact-version=} - ;; - - # Compiler flag output - --cppflags) echo_cppflags=yes;; - --cxxflags) echo_cxxflags=yes;; - --ldflags) echo_ldflags=yes;; - --libs) echo_libs=yes;; - - # Everything else is an error - *) show_usage; exit 1;; - esac - shift -done - -# These have defaults filled in by the configure script but can also be -# overridden by environment variables or command line parameters. -prefix="${GTEST_PREFIX:-@prefix@}" -exec_prefix="${GTEST_EXEC_PREFIX:-@exec_prefix@}" -libdir="${GTEST_LIBDIR:-@libdir@}" -includedir="${GTEST_INCLUDEDIR:-@includedir@}" - -# We try and detect if our binary is not located at its installed location. If -# it's not, we provide variables pointing to the source and build tree rather -# than to the install tree. This allows building against a just-built gtest -# rather than an installed gtest. -bindir="@bindir@" -this_relative_bindir=`dirname $0` -this_bindir=`cd ${this_relative_bindir}; pwd -P` -if test "${this_bindir}" = "${this_bindir%${bindir}}"; then - # The path to the script doesn't end in the bindir sequence from Autoconf, - # assume that we are in a build tree. - build_dir=`dirname ${this_bindir}` - src_dir=`cd ${this_bindir}; cd @top_srcdir@; pwd -P` - - # TODO(chandlerc@google.com): This is a dangerous dependency on libtool, we - # should work to remove it, and/or remove libtool altogether, replacing it - # with direct references to the library and a link path. - gtest_libs="${build_dir}/lib/libgtest.la @PTHREAD_CFLAGS@ @PTHREAD_LIBS@" - gtest_ldflags="" - - # We provide hooks to include from either the source or build dir, where the - # build dir is always preferred. This will potentially allow us to write - # build rules for generated headers and have them automatically be preferred - # over provided versions. - gtest_cppflags="-I${build_dir}/include -I${src_dir}/include" - gtest_cxxflags="@PTHREAD_CFLAGS@" -else - # We're using an installed gtest, although it may be staged under some - # prefix. Assume (as our own libraries do) that we can resolve the prefix, - # and are present in the dynamic link paths. - gtest_ldflags="-L${libdir}" - gtest_libs="-l${name} @PTHREAD_CFLAGS@ @PTHREAD_LIBS@" - gtest_cppflags="-I${includedir}" - gtest_cxxflags="@PTHREAD_CFLAGS@" -fi - -# Do an installation query if requested. -if test -n "$do_query"; then - case $do_query in - prefix) echo $prefix; exit 0;; - exec-prefix) echo $exec_prefix; exit 0;; - libdir) echo $libdir; exit 0;; - includedir) echo $includedir; exit 0;; - version) echo $version; exit 0;; - *) show_usage; exit 1;; - esac -fi - -# Do a version check if requested. -if test "$do_check_versions" = "yes"; then - # Make sure we didn't receive a bad combination of parameters. - test "$echo_cppflags" = "yes" && show_usage && exit 1 - test "$echo_cxxflags" = "yes" && show_usage && exit 1 - test "$echo_ldflags" = "yes" && show_usage && exit 1 - test "$echo_libs" = "yes" && show_usage && exit 1 - - if test "$exact_version" != ""; then - check_versions $exact_version $exact_version - # unreachable - else - check_versions ${min_version:-0.0.0} ${max_version:-9999.9999.9999} - # unreachable - fi -fi - -# Do the output in the correct order so that these can be used in-line of -# a compiler invocation. -output="" -test "$echo_cppflags" = "yes" && output="$output $gtest_cppflags" -test "$echo_cxxflags" = "yes" && output="$output $gtest_cxxflags" -test "$echo_ldflags" = "yes" && output="$output $gtest_ldflags" -test "$echo_libs" = "yes" && output="$output $gtest_libs" -echo $output - -exit 0 diff --git a/test/gtest-1.8.0/scripts/pump.py b/test/gtest-1.8.0/scripts/pump.py deleted file mode 100644 index 5efb653c20..0000000000 --- a/test/gtest-1.8.0/scripts/pump.py +++ /dev/null @@ -1,855 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""pump v0.2.0 - Pretty Useful for Meta Programming. - -A tool for preprocessor meta programming. Useful for generating -repetitive boilerplate code. Especially useful for writing C++ -classes, functions, macros, and templates that need to work with -various number of arguments. - -USAGE: - pump.py SOURCE_FILE - -EXAMPLES: - pump.py foo.cc.pump - Converts foo.cc.pump to foo.cc. - -GRAMMAR: - CODE ::= ATOMIC_CODE* - ATOMIC_CODE ::= $var ID = EXPRESSION - | $var ID = [[ CODE ]] - | $range ID EXPRESSION..EXPRESSION - | $for ID SEPARATOR [[ CODE ]] - | $($) - | $ID - | $(EXPRESSION) - | $if EXPRESSION [[ CODE ]] ELSE_BRANCH - | [[ CODE ]] - | RAW_CODE - SEPARATOR ::= RAW_CODE | EMPTY - ELSE_BRANCH ::= $else [[ CODE ]] - | $elif EXPRESSION [[ CODE ]] ELSE_BRANCH - | EMPTY - EXPRESSION has Python syntax. -""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import os -import re -import sys - - -TOKEN_TABLE = [ - (re.compile(r'\$var\s+'), '$var'), - (re.compile(r'\$elif\s+'), '$elif'), - (re.compile(r'\$else\s+'), '$else'), - (re.compile(r'\$for\s+'), '$for'), - (re.compile(r'\$if\s+'), '$if'), - (re.compile(r'\$range\s+'), '$range'), - (re.compile(r'\$[_A-Za-z]\w*'), '$id'), - (re.compile(r'\$\(\$\)'), '$($)'), - (re.compile(r'\$'), '$'), - (re.compile(r'\[\[\n?'), '[['), - (re.compile(r'\]\]\n?'), ']]'), - ] - - -class Cursor: - """Represents a position (line and column) in a text file.""" - - def __init__(self, line=-1, column=-1): - self.line = line - self.column = column - - def __eq__(self, rhs): - return self.line == rhs.line and self.column == rhs.column - - def __ne__(self, rhs): - return not self == rhs - - def __lt__(self, rhs): - return self.line < rhs.line or ( - self.line == rhs.line and self.column < rhs.column) - - def __le__(self, rhs): - return self < rhs or self == rhs - - def __gt__(self, rhs): - return rhs < self - - def __ge__(self, rhs): - return rhs <= self - - def __str__(self): - if self == Eof(): - return 'EOF' - else: - return '%s(%s)' % (self.line + 1, self.column) - - def __add__(self, offset): - return Cursor(self.line, self.column + offset) - - def __sub__(self, offset): - return Cursor(self.line, self.column - offset) - - def Clone(self): - """Returns a copy of self.""" - - return Cursor(self.line, self.column) - - -# Special cursor to indicate the end-of-file. -def Eof(): - """Returns the special cursor to denote the end-of-file.""" - return Cursor(-1, -1) - - -class Token: - """Represents a token in a Pump source file.""" - - def __init__(self, start=None, end=None, value=None, token_type=None): - if start is None: - self.start = Eof() - else: - self.start = start - if end is None: - self.end = Eof() - else: - self.end = end - self.value = value - self.token_type = token_type - - def __str__(self): - return 'Token @%s: \'%s\' type=%s' % ( - self.start, self.value, self.token_type) - - def Clone(self): - """Returns a copy of self.""" - - return Token(self.start.Clone(), self.end.Clone(), self.value, - self.token_type) - - -def StartsWith(lines, pos, string): - """Returns True iff the given position in lines starts with 'string'.""" - - return lines[pos.line][pos.column:].startswith(string) - - -def FindFirstInLine(line, token_table): - best_match_start = -1 - for (regex, token_type) in token_table: - m = regex.search(line) - if m: - # We found regex in lines - if best_match_start < 0 or m.start() < best_match_start: - best_match_start = m.start() - best_match_length = m.end() - m.start() - best_match_token_type = token_type - - if best_match_start < 0: - return None - - return (best_match_start, best_match_length, best_match_token_type) - - -def FindFirst(lines, token_table, cursor): - """Finds the first occurrence of any string in strings in lines.""" - - start = cursor.Clone() - cur_line_number = cursor.line - for line in lines[start.line:]: - if cur_line_number == start.line: - line = line[start.column:] - m = FindFirstInLine(line, token_table) - if m: - # We found a regex in line. - (start_column, length, token_type) = m - if cur_line_number == start.line: - start_column += start.column - found_start = Cursor(cur_line_number, start_column) - found_end = found_start + length - return MakeToken(lines, found_start, found_end, token_type) - cur_line_number += 1 - # We failed to find str in lines - return None - - -def SubString(lines, start, end): - """Returns a substring in lines.""" - - if end == Eof(): - end = Cursor(len(lines) - 1, len(lines[-1])) - - if start >= end: - return '' - - if start.line == end.line: - return lines[start.line][start.column:end.column] - - result_lines = ([lines[start.line][start.column:]] + - lines[start.line + 1:end.line] + - [lines[end.line][:end.column]]) - return ''.join(result_lines) - - -def StripMetaComments(str): - """Strip meta comments from each line in the given string.""" - - # First, completely remove lines containing nothing but a meta - # comment, including the trailing \n. - str = re.sub(r'^\s*\$\$.*\n', '', str) - - # Then, remove meta comments from contentful lines. - return re.sub(r'\s*\$\$.*', '', str) - - -def MakeToken(lines, start, end, token_type): - """Creates a new instance of Token.""" - - return Token(start, end, SubString(lines, start, end), token_type) - - -def ParseToken(lines, pos, regex, token_type): - line = lines[pos.line][pos.column:] - m = regex.search(line) - if m and not m.start(): - return MakeToken(lines, pos, pos + m.end(), token_type) - else: - print 'ERROR: %s expected at %s.' % (token_type, pos) - sys.exit(1) - - -ID_REGEX = re.compile(r'[_A-Za-z]\w*') -EQ_REGEX = re.compile(r'=') -REST_OF_LINE_REGEX = re.compile(r'.*?(?=$|\$\$)') -OPTIONAL_WHITE_SPACES_REGEX = re.compile(r'\s*') -WHITE_SPACE_REGEX = re.compile(r'\s') -DOT_DOT_REGEX = re.compile(r'\.\.') - - -def Skip(lines, pos, regex): - line = lines[pos.line][pos.column:] - m = re.search(regex, line) - if m and not m.start(): - return pos + m.end() - else: - return pos - - -def SkipUntil(lines, pos, regex, token_type): - line = lines[pos.line][pos.column:] - m = re.search(regex, line) - if m: - return pos + m.start() - else: - print ('ERROR: %s expected on line %s after column %s.' % - (token_type, pos.line + 1, pos.column)) - sys.exit(1) - - -def ParseExpTokenInParens(lines, pos): - def ParseInParens(pos): - pos = Skip(lines, pos, OPTIONAL_WHITE_SPACES_REGEX) - pos = Skip(lines, pos, r'\(') - pos = Parse(pos) - pos = Skip(lines, pos, r'\)') - return pos - - def Parse(pos): - pos = SkipUntil(lines, pos, r'\(|\)', ')') - if SubString(lines, pos, pos + 1) == '(': - pos = Parse(pos + 1) - pos = Skip(lines, pos, r'\)') - return Parse(pos) - else: - return pos - - start = pos.Clone() - pos = ParseInParens(pos) - return MakeToken(lines, start, pos, 'exp') - - -def RStripNewLineFromToken(token): - if token.value.endswith('\n'): - return Token(token.start, token.end, token.value[:-1], token.token_type) - else: - return token - - -def TokenizeLines(lines, pos): - while True: - found = FindFirst(lines, TOKEN_TABLE, pos) - if not found: - yield MakeToken(lines, pos, Eof(), 'code') - return - - if found.start == pos: - prev_token = None - prev_token_rstripped = None - else: - prev_token = MakeToken(lines, pos, found.start, 'code') - prev_token_rstripped = RStripNewLineFromToken(prev_token) - - if found.token_type == '$var': - if prev_token_rstripped: - yield prev_token_rstripped - yield found - id_token = ParseToken(lines, found.end, ID_REGEX, 'id') - yield id_token - pos = Skip(lines, id_token.end, OPTIONAL_WHITE_SPACES_REGEX) - - eq_token = ParseToken(lines, pos, EQ_REGEX, '=') - yield eq_token - pos = Skip(lines, eq_token.end, r'\s*') - - if SubString(lines, pos, pos + 2) != '[[': - exp_token = ParseToken(lines, pos, REST_OF_LINE_REGEX, 'exp') - yield exp_token - pos = Cursor(exp_token.end.line + 1, 0) - elif found.token_type == '$for': - if prev_token_rstripped: - yield prev_token_rstripped - yield found - id_token = ParseToken(lines, found.end, ID_REGEX, 'id') - yield id_token - pos = Skip(lines, id_token.end, WHITE_SPACE_REGEX) - elif found.token_type == '$range': - if prev_token_rstripped: - yield prev_token_rstripped - yield found - id_token = ParseToken(lines, found.end, ID_REGEX, 'id') - yield id_token - pos = Skip(lines, id_token.end, OPTIONAL_WHITE_SPACES_REGEX) - - dots_pos = SkipUntil(lines, pos, DOT_DOT_REGEX, '..') - yield MakeToken(lines, pos, dots_pos, 'exp') - yield MakeToken(lines, dots_pos, dots_pos + 2, '..') - pos = dots_pos + 2 - new_pos = Cursor(pos.line + 1, 0) - yield MakeToken(lines, pos, new_pos, 'exp') - pos = new_pos - elif found.token_type == '$': - if prev_token: - yield prev_token - yield found - exp_token = ParseExpTokenInParens(lines, found.end) - yield exp_token - pos = exp_token.end - elif (found.token_type == ']]' or found.token_type == '$if' or - found.token_type == '$elif' or found.token_type == '$else'): - if prev_token_rstripped: - yield prev_token_rstripped - yield found - pos = found.end - else: - if prev_token: - yield prev_token - yield found - pos = found.end - - -def Tokenize(s): - """A generator that yields the tokens in the given string.""" - if s != '': - lines = s.splitlines(True) - for token in TokenizeLines(lines, Cursor(0, 0)): - yield token - - -class CodeNode: - def __init__(self, atomic_code_list=None): - self.atomic_code = atomic_code_list - - -class VarNode: - def __init__(self, identifier=None, atomic_code=None): - self.identifier = identifier - self.atomic_code = atomic_code - - -class RangeNode: - def __init__(self, identifier=None, exp1=None, exp2=None): - self.identifier = identifier - self.exp1 = exp1 - self.exp2 = exp2 - - -class ForNode: - def __init__(self, identifier=None, sep=None, code=None): - self.identifier = identifier - self.sep = sep - self.code = code - - -class ElseNode: - def __init__(self, else_branch=None): - self.else_branch = else_branch - - -class IfNode: - def __init__(self, exp=None, then_branch=None, else_branch=None): - self.exp = exp - self.then_branch = then_branch - self.else_branch = else_branch - - -class RawCodeNode: - def __init__(self, token=None): - self.raw_code = token - - -class LiteralDollarNode: - def __init__(self, token): - self.token = token - - -class ExpNode: - def __init__(self, token, python_exp): - self.token = token - self.python_exp = python_exp - - -def PopFront(a_list): - head = a_list[0] - a_list[:1] = [] - return head - - -def PushFront(a_list, elem): - a_list[:0] = [elem] - - -def PopToken(a_list, token_type=None): - token = PopFront(a_list) - if token_type is not None and token.token_type != token_type: - print 'ERROR: %s expected at %s' % (token_type, token.start) - print 'ERROR: %s found instead' % (token,) - sys.exit(1) - - return token - - -def PeekToken(a_list): - if not a_list: - return None - - return a_list[0] - - -def ParseExpNode(token): - python_exp = re.sub(r'([_A-Za-z]\w*)', r'self.GetValue("\1")', token.value) - return ExpNode(token, python_exp) - - -def ParseElseNode(tokens): - def Pop(token_type=None): - return PopToken(tokens, token_type) - - next = PeekToken(tokens) - if not next: - return None - if next.token_type == '$else': - Pop('$else') - Pop('[[') - code_node = ParseCodeNode(tokens) - Pop(']]') - return code_node - elif next.token_type == '$elif': - Pop('$elif') - exp = Pop('code') - Pop('[[') - code_node = ParseCodeNode(tokens) - Pop(']]') - inner_else_node = ParseElseNode(tokens) - return CodeNode([IfNode(ParseExpNode(exp), code_node, inner_else_node)]) - elif not next.value.strip(): - Pop('code') - return ParseElseNode(tokens) - else: - return None - - -def ParseAtomicCodeNode(tokens): - def Pop(token_type=None): - return PopToken(tokens, token_type) - - head = PopFront(tokens) - t = head.token_type - if t == 'code': - return RawCodeNode(head) - elif t == '$var': - id_token = Pop('id') - Pop('=') - next = PeekToken(tokens) - if next.token_type == 'exp': - exp_token = Pop() - return VarNode(id_token, ParseExpNode(exp_token)) - Pop('[[') - code_node = ParseCodeNode(tokens) - Pop(']]') - return VarNode(id_token, code_node) - elif t == '$for': - id_token = Pop('id') - next_token = PeekToken(tokens) - if next_token.token_type == 'code': - sep_token = next_token - Pop('code') - else: - sep_token = None - Pop('[[') - code_node = ParseCodeNode(tokens) - Pop(']]') - return ForNode(id_token, sep_token, code_node) - elif t == '$if': - exp_token = Pop('code') - Pop('[[') - code_node = ParseCodeNode(tokens) - Pop(']]') - else_node = ParseElseNode(tokens) - return IfNode(ParseExpNode(exp_token), code_node, else_node) - elif t == '$range': - id_token = Pop('id') - exp1_token = Pop('exp') - Pop('..') - exp2_token = Pop('exp') - return RangeNode(id_token, ParseExpNode(exp1_token), - ParseExpNode(exp2_token)) - elif t == '$id': - return ParseExpNode(Token(head.start + 1, head.end, head.value[1:], 'id')) - elif t == '$($)': - return LiteralDollarNode(head) - elif t == '$': - exp_token = Pop('exp') - return ParseExpNode(exp_token) - elif t == '[[': - code_node = ParseCodeNode(tokens) - Pop(']]') - return code_node - else: - PushFront(tokens, head) - return None - - -def ParseCodeNode(tokens): - atomic_code_list = [] - while True: - if not tokens: - break - atomic_code_node = ParseAtomicCodeNode(tokens) - if atomic_code_node: - atomic_code_list.append(atomic_code_node) - else: - break - return CodeNode(atomic_code_list) - - -def ParseToAST(pump_src_text): - """Convert the given Pump source text into an AST.""" - tokens = list(Tokenize(pump_src_text)) - code_node = ParseCodeNode(tokens) - return code_node - - -class Env: - def __init__(self): - self.variables = [] - self.ranges = [] - - def Clone(self): - clone = Env() - clone.variables = self.variables[:] - clone.ranges = self.ranges[:] - return clone - - def PushVariable(self, var, value): - # If value looks like an int, store it as an int. - try: - int_value = int(value) - if ('%s' % int_value) == value: - value = int_value - except Exception: - pass - self.variables[:0] = [(var, value)] - - def PopVariable(self): - self.variables[:1] = [] - - def PushRange(self, var, lower, upper): - self.ranges[:0] = [(var, lower, upper)] - - def PopRange(self): - self.ranges[:1] = [] - - def GetValue(self, identifier): - for (var, value) in self.variables: - if identifier == var: - return value - - print 'ERROR: meta variable %s is undefined.' % (identifier,) - sys.exit(1) - - def EvalExp(self, exp): - try: - result = eval(exp.python_exp) - except Exception, e: - print 'ERROR: caught exception %s: %s' % (e.__class__.__name__, e) - print ('ERROR: failed to evaluate meta expression %s at %s' % - (exp.python_exp, exp.token.start)) - sys.exit(1) - return result - - def GetRange(self, identifier): - for (var, lower, upper) in self.ranges: - if identifier == var: - return (lower, upper) - - print 'ERROR: range %s is undefined.' % (identifier,) - sys.exit(1) - - -class Output: - def __init__(self): - self.string = '' - - def GetLastLine(self): - index = self.string.rfind('\n') - if index < 0: - return '' - - return self.string[index + 1:] - - def Append(self, s): - self.string += s - - -def RunAtomicCode(env, node, output): - if isinstance(node, VarNode): - identifier = node.identifier.value.strip() - result = Output() - RunAtomicCode(env.Clone(), node.atomic_code, result) - value = result.string - env.PushVariable(identifier, value) - elif isinstance(node, RangeNode): - identifier = node.identifier.value.strip() - lower = int(env.EvalExp(node.exp1)) - upper = int(env.EvalExp(node.exp2)) - env.PushRange(identifier, lower, upper) - elif isinstance(node, ForNode): - identifier = node.identifier.value.strip() - if node.sep is None: - sep = '' - else: - sep = node.sep.value - (lower, upper) = env.GetRange(identifier) - for i in range(lower, upper + 1): - new_env = env.Clone() - new_env.PushVariable(identifier, i) - RunCode(new_env, node.code, output) - if i != upper: - output.Append(sep) - elif isinstance(node, RawCodeNode): - output.Append(node.raw_code.value) - elif isinstance(node, IfNode): - cond = env.EvalExp(node.exp) - if cond: - RunCode(env.Clone(), node.then_branch, output) - elif node.else_branch is not None: - RunCode(env.Clone(), node.else_branch, output) - elif isinstance(node, ExpNode): - value = env.EvalExp(node) - output.Append('%s' % (value,)) - elif isinstance(node, LiteralDollarNode): - output.Append('$') - elif isinstance(node, CodeNode): - RunCode(env.Clone(), node, output) - else: - print 'BAD' - print node - sys.exit(1) - - -def RunCode(env, code_node, output): - for atomic_code in code_node.atomic_code: - RunAtomicCode(env, atomic_code, output) - - -def IsSingleLineComment(cur_line): - return '//' in cur_line - - -def IsInPreprocessorDirective(prev_lines, cur_line): - if cur_line.lstrip().startswith('#'): - return True - return prev_lines and prev_lines[-1].endswith('\\') - - -def WrapComment(line, output): - loc = line.find('//') - before_comment = line[:loc].rstrip() - if before_comment == '': - indent = loc - else: - output.append(before_comment) - indent = len(before_comment) - len(before_comment.lstrip()) - prefix = indent*' ' + '// ' - max_len = 80 - len(prefix) - comment = line[loc + 2:].strip() - segs = [seg for seg in re.split(r'(\w+\W*)', comment) if seg != ''] - cur_line = '' - for seg in segs: - if len((cur_line + seg).rstrip()) < max_len: - cur_line += seg - else: - if cur_line.strip() != '': - output.append(prefix + cur_line.rstrip()) - cur_line = seg.lstrip() - if cur_line.strip() != '': - output.append(prefix + cur_line.strip()) - - -def WrapCode(line, line_concat, output): - indent = len(line) - len(line.lstrip()) - prefix = indent*' ' # Prefix of the current line - max_len = 80 - indent - len(line_concat) # Maximum length of the current line - new_prefix = prefix + 4*' ' # Prefix of a continuation line - new_max_len = max_len - 4 # Maximum length of a continuation line - # Prefers to wrap a line after a ',' or ';'. - segs = [seg for seg in re.split(r'([^,;]+[,;]?)', line.strip()) if seg != ''] - cur_line = '' # The current line without leading spaces. - for seg in segs: - # If the line is still too long, wrap at a space. - while cur_line == '' and len(seg.strip()) > max_len: - seg = seg.lstrip() - split_at = seg.rfind(' ', 0, max_len) - output.append(prefix + seg[:split_at].strip() + line_concat) - seg = seg[split_at + 1:] - prefix = new_prefix - max_len = new_max_len - - if len((cur_line + seg).rstrip()) < max_len: - cur_line = (cur_line + seg).lstrip() - else: - output.append(prefix + cur_line.rstrip() + line_concat) - prefix = new_prefix - max_len = new_max_len - cur_line = seg.lstrip() - if cur_line.strip() != '': - output.append(prefix + cur_line.strip()) - - -def WrapPreprocessorDirective(line, output): - WrapCode(line, ' \\', output) - - -def WrapPlainCode(line, output): - WrapCode(line, '', output) - - -def IsMultiLineIWYUPragma(line): - return re.search(r'/\* IWYU pragma: ', line) - - -def IsHeaderGuardIncludeOrOneLineIWYUPragma(line): - return (re.match(r'^#(ifndef|define|endif\s*//)\s*[\w_]+\s*$', line) or - re.match(r'^#include\s', line) or - # Don't break IWYU pragmas, either; that causes iwyu.py problems. - re.search(r'// IWYU pragma: ', line)) - - -def WrapLongLine(line, output): - line = line.rstrip() - if len(line) <= 80: - output.append(line) - elif IsSingleLineComment(line): - if IsHeaderGuardIncludeOrOneLineIWYUPragma(line): - # The style guide made an exception to allow long header guard lines, - # includes and IWYU pragmas. - output.append(line) - else: - WrapComment(line, output) - elif IsInPreprocessorDirective(output, line): - if IsHeaderGuardIncludeOrOneLineIWYUPragma(line): - # The style guide made an exception to allow long header guard lines, - # includes and IWYU pragmas. - output.append(line) - else: - WrapPreprocessorDirective(line, output) - elif IsMultiLineIWYUPragma(line): - output.append(line) - else: - WrapPlainCode(line, output) - - -def BeautifyCode(string): - lines = string.splitlines() - output = [] - for line in lines: - WrapLongLine(line, output) - output2 = [line.rstrip() for line in output] - return '\n'.join(output2) + '\n' - - -def ConvertFromPumpSource(src_text): - """Return the text generated from the given Pump source text.""" - ast = ParseToAST(StripMetaComments(src_text)) - output = Output() - RunCode(Env(), ast, output) - return BeautifyCode(output.string) - - -def main(argv): - if len(argv) == 1: - print __doc__ - sys.exit(1) - - file_path = argv[-1] - output_str = ConvertFromPumpSource(file(file_path, 'r').read()) - if file_path.endswith('.pump'): - output_file_path = file_path[:-5] - else: - output_file_path = '-' - if output_file_path == '-': - print output_str, - else: - output_file = file(output_file_path, 'w') - output_file.write('// This file was GENERATED by command:\n') - output_file.write('// %s %s\n' % - (os.path.basename(__file__), os.path.basename(file_path))) - output_file.write('// DO NOT EDIT BY HAND!!!\n\n') - output_file.write(output_str) - output_file.close() - - -if __name__ == '__main__': - main(sys.argv) diff --git a/test/gtest-1.8.0/scripts/release_docs.py b/test/gtest-1.8.0/scripts/release_docs.py deleted file mode 100644 index 1291347f67..0000000000 --- a/test/gtest-1.8.0/scripts/release_docs.py +++ /dev/null @@ -1,158 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2013 Google Inc. All Rights Reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Script for branching Google Test/Mock wiki pages for a new version. - -SYNOPSIS - release_docs.py NEW_RELEASE_VERSION - - Google Test and Google Mock's external user documentation is in - interlinked wiki files. When we release a new version of - Google Test or Google Mock, we need to branch the wiki files - such that users of a specific version of Google Test/Mock can - look up documenation relevant for that version. This script - automates that process by: - - - branching the current wiki pages (which document the - behavior of the SVN trunk head) to pages for the specified - version (e.g. branching FAQ.wiki to V2_6_FAQ.wiki when - NEW_RELEASE_VERSION is 2.6); - - updating the links in the branched files to point to the branched - version (e.g. a link in V2_6_FAQ.wiki that pointed to - Primer.wiki#Anchor will now point to V2_6_Primer.wiki#Anchor). - - NOTE: NEW_RELEASE_VERSION must be a NEW version number for - which the wiki pages don't yet exist; otherwise you'll get SVN - errors like "svn: Path 'V1_7_PumpManual.wiki' is not a - directory" when running the script. - -EXAMPLE - $ cd PATH/TO/GTEST_SVN_WORKSPACE/trunk - $ scripts/release_docs.py 2.6 # create wiki pages for v2.6 - $ svn status # verify the file list - $ svn diff # verify the file contents - $ svn commit -m "release wiki pages for v2.6" -""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import os -import re -import sys - -import common - - -# Wiki pages that shouldn't be branched for every gtest/gmock release. -GTEST_UNVERSIONED_WIKIS = ['DevGuide.wiki'] -GMOCK_UNVERSIONED_WIKIS = [ - 'DesignDoc.wiki', - 'DevGuide.wiki', - 'KnownIssues.wiki' - ] - - -def DropWikiSuffix(wiki_filename): - """Removes the .wiki suffix (if any) from the given filename.""" - - return (wiki_filename[:-len('.wiki')] if wiki_filename.endswith('.wiki') - else wiki_filename) - - -class WikiBrancher(object): - """Branches ...""" - - def __init__(self, dot_version): - self.project, svn_root_path = common.GetSvnInfo() - if self.project not in ('googletest', 'googlemock'): - sys.exit('This script must be run in a gtest or gmock SVN workspace.') - self.wiki_dir = svn_root_path + '/wiki' - # Turn '2.6' to 'V2_6_'. - self.version_prefix = 'V' + dot_version.replace('.', '_') + '_' - self.files_to_branch = self.GetFilesToBranch() - page_names = [DropWikiSuffix(f) for f in self.files_to_branch] - # A link to Foo.wiki is in one of the following forms: - # [Foo words] - # [Foo#Anchor words] - # [http://code.google.com/.../wiki/Foo words] - # [http://code.google.com/.../wiki/Foo#Anchor words] - # We want to replace 'Foo' with 'V2_6_Foo' in the above cases. - self.search_for_re = re.compile( - # This regex matches either - # [Foo - # or - # /wiki/Foo - # followed by a space or a #, where Foo is the name of an - # unversioned wiki page. - r'(\[|/wiki/)(%s)([ #])' % '|'.join(page_names)) - self.replace_with = r'\1%s\2\3' % (self.version_prefix,) - - def GetFilesToBranch(self): - """Returns a list of .wiki file names that need to be branched.""" - - unversioned_wikis = (GTEST_UNVERSIONED_WIKIS if self.project == 'googletest' - else GMOCK_UNVERSIONED_WIKIS) - return [f for f in os.listdir(self.wiki_dir) - if (f.endswith('.wiki') and - not re.match(r'^V\d', f) and # Excluded versioned .wiki files. - f not in unversioned_wikis)] - - def BranchFiles(self): - """Branches the .wiki files needed to be branched.""" - - print 'Branching %d .wiki files:' % (len(self.files_to_branch),) - os.chdir(self.wiki_dir) - for f in self.files_to_branch: - command = 'svn cp %s %s%s' % (f, self.version_prefix, f) - print command - os.system(command) - - def UpdateLinksInBranchedFiles(self): - - for f in self.files_to_branch: - source_file = os.path.join(self.wiki_dir, f) - versioned_file = os.path.join(self.wiki_dir, self.version_prefix + f) - print 'Updating links in %s.' % (versioned_file,) - text = file(source_file, 'r').read() - new_text = self.search_for_re.sub(self.replace_with, text) - file(versioned_file, 'w').write(new_text) - - -def main(): - if len(sys.argv) != 2: - sys.exit(__doc__) - - brancher = WikiBrancher(sys.argv[1]) - brancher.BranchFiles() - brancher.UpdateLinksInBranchedFiles() - - -if __name__ == '__main__': - main() diff --git a/test/gtest-1.8.0/scripts/test/Makefile b/test/gtest-1.8.0/scripts/test/Makefile deleted file mode 100644 index cdff584637..0000000000 --- a/test/gtest-1.8.0/scripts/test/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# A Makefile for fusing Google Test and building a sample test against it. -# -# SYNOPSIS: -# -# make [all] - makes everything. -# make TARGET - makes the given target. -# make check - makes everything and runs the built sample test. -# make clean - removes all files generated by make. - -# Points to the root of fused Google Test, relative to where this file is. -FUSED_GTEST_DIR = output - -# Paths to the fused gtest files. -FUSED_GTEST_H = $(FUSED_GTEST_DIR)/gtest/gtest.h -FUSED_GTEST_ALL_CC = $(FUSED_GTEST_DIR)/gtest/gtest-all.cc - -# Where to find the sample test. -SAMPLE_DIR = ../../samples - -# Where to find gtest_main.cc. -GTEST_MAIN_CC = ../../src/gtest_main.cc - -# Flags passed to the preprocessor. -# We have no idea here whether pthreads is available in the system, so -# disable its use. -CPPFLAGS += -I$(FUSED_GTEST_DIR) -DGTEST_HAS_PTHREAD=0 - -# Flags passed to the C++ compiler. -CXXFLAGS += -g - -all : sample1_unittest - -check : all - ./sample1_unittest - -clean : - rm -rf $(FUSED_GTEST_DIR) sample1_unittest *.o - -$(FUSED_GTEST_H) : - ../fuse_gtest_files.py $(FUSED_GTEST_DIR) - -$(FUSED_GTEST_ALL_CC) : - ../fuse_gtest_files.py $(FUSED_GTEST_DIR) - -gtest-all.o : $(FUSED_GTEST_H) $(FUSED_GTEST_ALL_CC) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(FUSED_GTEST_DIR)/gtest/gtest-all.cc - -gtest_main.o : $(FUSED_GTEST_H) $(GTEST_MAIN_CC) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(GTEST_MAIN_CC) - -sample1.o : $(SAMPLE_DIR)/sample1.cc $(SAMPLE_DIR)/sample1.h - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(SAMPLE_DIR)/sample1.cc - -sample1_unittest.o : $(SAMPLE_DIR)/sample1_unittest.cc \ - $(SAMPLE_DIR)/sample1.h $(FUSED_GTEST_H) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(SAMPLE_DIR)/sample1_unittest.cc - -sample1_unittest : sample1.o sample1_unittest.o gtest-all.o gtest_main.o - $(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ diff --git a/test/gtest-1.8.0/scripts/upload.py b/test/gtest-1.8.0/scripts/upload.py deleted file mode 100644 index 81e8e04d72..0000000000 --- a/test/gtest-1.8.0/scripts/upload.py +++ /dev/null @@ -1,1387 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2007 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Tool for uploading diffs from a version control system to the codereview app. - -Usage summary: upload.py [options] [-- diff_options] - -Diff options are passed to the diff command of the underlying system. - -Supported version control systems: - Git - Mercurial - Subversion - -It is important for Git/Mercurial users to specify a tree/node/branch to diff -against by using the '--rev' option. -""" -# This code is derived from appcfg.py in the App Engine SDK (open source), -# and from ASPN recipe #146306. - -import cookielib -import getpass -import logging -import md5 -import mimetypes -import optparse -import os -import re -import socket -import subprocess -import sys -import urllib -import urllib2 -import urlparse - -try: - import readline -except ImportError: - pass - -# The logging verbosity: -# 0: Errors only. -# 1: Status messages. -# 2: Info logs. -# 3: Debug logs. -verbosity = 1 - -# Max size of patch or base file. -MAX_UPLOAD_SIZE = 900 * 1024 - - -def GetEmail(prompt): - """Prompts the user for their email address and returns it. - - The last used email address is saved to a file and offered up as a suggestion - to the user. If the user presses enter without typing in anything the last - used email address is used. If the user enters a new address, it is saved - for next time we prompt. - - """ - last_email_file_name = os.path.expanduser("~/.last_codereview_email_address") - last_email = "" - if os.path.exists(last_email_file_name): - try: - last_email_file = open(last_email_file_name, "r") - last_email = last_email_file.readline().strip("\n") - last_email_file.close() - prompt += " [%s]" % last_email - except IOError, e: - pass - email = raw_input(prompt + ": ").strip() - if email: - try: - last_email_file = open(last_email_file_name, "w") - last_email_file.write(email) - last_email_file.close() - except IOError, e: - pass - else: - email = last_email - return email - - -def StatusUpdate(msg): - """Print a status message to stdout. - - If 'verbosity' is greater than 0, print the message. - - Args: - msg: The string to print. - """ - if verbosity > 0: - print msg - - -def ErrorExit(msg): - """Print an error message to stderr and exit.""" - print >>sys.stderr, msg - sys.exit(1) - - -class ClientLoginError(urllib2.HTTPError): - """Raised to indicate there was an error authenticating with ClientLogin.""" - - def __init__(self, url, code, msg, headers, args): - urllib2.HTTPError.__init__(self, url, code, msg, headers, None) - self.args = args - self.reason = args["Error"] - - -class AbstractRpcServer(object): - """Provides a common interface for a simple RPC server.""" - - def __init__(self, host, auth_function, host_override=None, extra_headers={}, - save_cookies=False): - """Creates a new HttpRpcServer. - - Args: - host: The host to send requests to. - auth_function: A function that takes no arguments and returns an - (email, password) tuple when called. Will be called if authentication - is required. - host_override: The host header to send to the server (defaults to host). - extra_headers: A dict of extra headers to append to every request. - save_cookies: If True, save the authentication cookies to local disk. - If False, use an in-memory cookiejar instead. Subclasses must - implement this functionality. Defaults to False. - """ - self.host = host - self.host_override = host_override - self.auth_function = auth_function - self.authenticated = False - self.extra_headers = extra_headers - self.save_cookies = save_cookies - self.opener = self._GetOpener() - if self.host_override: - logging.info("Server: %s; Host: %s", self.host, self.host_override) - else: - logging.info("Server: %s", self.host) - - def _GetOpener(self): - """Returns an OpenerDirector for making HTTP requests. - - Returns: - A urllib2.OpenerDirector object. - """ - raise NotImplementedError() - - def _CreateRequest(self, url, data=None): - """Creates a new urllib request.""" - logging.debug("Creating request for: '%s' with payload:\n%s", url, data) - req = urllib2.Request(url, data=data) - if self.host_override: - req.add_header("Host", self.host_override) - for key, value in self.extra_headers.iteritems(): - req.add_header(key, value) - return req - - def _GetAuthToken(self, email, password): - """Uses ClientLogin to authenticate the user, returning an auth token. - - Args: - email: The user's email address - password: The user's password - - Raises: - ClientLoginError: If there was an error authenticating with ClientLogin. - HTTPError: If there was some other form of HTTP error. - - Returns: - The authentication token returned by ClientLogin. - """ - account_type = "GOOGLE" - if self.host.endswith(".google.com"): - # Needed for use inside Google. - account_type = "HOSTED" - req = self._CreateRequest( - url="https://www.google.com/accounts/ClientLogin", - data=urllib.urlencode({ - "Email": email, - "Passwd": password, - "service": "ah", - "source": "rietveld-codereview-upload", - "accountType": account_type, - }), - ) - try: - response = self.opener.open(req) - response_body = response.read() - response_dict = dict(x.split("=") - for x in response_body.split("\n") if x) - return response_dict["Auth"] - except urllib2.HTTPError, e: - if e.code == 403: - body = e.read() - response_dict = dict(x.split("=", 1) for x in body.split("\n") if x) - raise ClientLoginError(req.get_full_url(), e.code, e.msg, - e.headers, response_dict) - else: - raise - - def _GetAuthCookie(self, auth_token): - """Fetches authentication cookies for an authentication token. - - Args: - auth_token: The authentication token returned by ClientLogin. - - Raises: - HTTPError: If there was an error fetching the authentication cookies. - """ - # This is a dummy value to allow us to identify when we're successful. - continue_location = "http://localhost/" - args = {"continue": continue_location, "auth": auth_token} - req = self._CreateRequest("http://%s/_ah/login?%s" % - (self.host, urllib.urlencode(args))) - try: - response = self.opener.open(req) - except urllib2.HTTPError, e: - response = e - if (response.code != 302 or - response.info()["location"] != continue_location): - raise urllib2.HTTPError(req.get_full_url(), response.code, response.msg, - response.headers, response.fp) - self.authenticated = True - - def _Authenticate(self): - """Authenticates the user. - - The authentication process works as follows: - 1) We get a username and password from the user - 2) We use ClientLogin to obtain an AUTH token for the user - (see http://code.google.com/apis/accounts/AuthForInstalledApps.html). - 3) We pass the auth token to /_ah/login on the server to obtain an - authentication cookie. If login was successful, it tries to redirect - us to the URL we provided. - - If we attempt to access the upload API without first obtaining an - authentication cookie, it returns a 401 response and directs us to - authenticate ourselves with ClientLogin. - """ - for i in range(3): - credentials = self.auth_function() - try: - auth_token = self._GetAuthToken(credentials[0], credentials[1]) - except ClientLoginError, e: - if e.reason == "BadAuthentication": - print >>sys.stderr, "Invalid username or password." - continue - if e.reason == "CaptchaRequired": - print >>sys.stderr, ( - "Please go to\n" - "https://www.google.com/accounts/DisplayUnlockCaptcha\n" - "and verify you are a human. Then try again.") - break - if e.reason == "NotVerified": - print >>sys.stderr, "Account not verified." - break - if e.reason == "TermsNotAgreed": - print >>sys.stderr, "User has not agreed to TOS." - break - if e.reason == "AccountDeleted": - print >>sys.stderr, "The user account has been deleted." - break - if e.reason == "AccountDisabled": - print >>sys.stderr, "The user account has been disabled." - break - if e.reason == "ServiceDisabled": - print >>sys.stderr, ("The user's access to the service has been " - "disabled.") - break - if e.reason == "ServiceUnavailable": - print >>sys.stderr, "The service is not available; try again later." - break - raise - self._GetAuthCookie(auth_token) - return - - def Send(self, request_path, payload=None, - content_type="application/octet-stream", - timeout=None, - **kwargs): - """Sends an RPC and returns the response. - - Args: - request_path: The path to send the request to, eg /api/appversion/create. - payload: The body of the request, or None to send an empty request. - content_type: The Content-Type header to use. - timeout: timeout in seconds; default None i.e. no timeout. - (Note: for large requests on OS X, the timeout doesn't work right.) - kwargs: Any keyword arguments are converted into query string parameters. - - Returns: - The response body, as a string. - """ - # TODO: Don't require authentication. Let the server say - # whether it is necessary. - if not self.authenticated: - self._Authenticate() - - old_timeout = socket.getdefaulttimeout() - socket.setdefaulttimeout(timeout) - try: - tries = 0 - while True: - tries += 1 - args = dict(kwargs) - url = "http://%s%s" % (self.host, request_path) - if args: - url += "?" + urllib.urlencode(args) - req = self._CreateRequest(url=url, data=payload) - req.add_header("Content-Type", content_type) - try: - f = self.opener.open(req) - response = f.read() - f.close() - return response - except urllib2.HTTPError, e: - if tries > 3: - raise - elif e.code == 401: - self._Authenticate() -## elif e.code >= 500 and e.code < 600: -## # Server Error - try again. -## continue - else: - raise - finally: - socket.setdefaulttimeout(old_timeout) - - -class HttpRpcServer(AbstractRpcServer): - """Provides a simplified RPC-style interface for HTTP requests.""" - - def _Authenticate(self): - """Save the cookie jar after authentication.""" - super(HttpRpcServer, self)._Authenticate() - if self.save_cookies: - StatusUpdate("Saving authentication cookies to %s" % self.cookie_file) - self.cookie_jar.save() - - def _GetOpener(self): - """Returns an OpenerDirector that supports cookies and ignores redirects. - - Returns: - A urllib2.OpenerDirector object. - """ - opener = urllib2.OpenerDirector() - opener.add_handler(urllib2.ProxyHandler()) - opener.add_handler(urllib2.UnknownHandler()) - opener.add_handler(urllib2.HTTPHandler()) - opener.add_handler(urllib2.HTTPDefaultErrorHandler()) - opener.add_handler(urllib2.HTTPSHandler()) - opener.add_handler(urllib2.HTTPErrorProcessor()) - if self.save_cookies: - self.cookie_file = os.path.expanduser("~/.codereview_upload_cookies") - self.cookie_jar = cookielib.MozillaCookieJar(self.cookie_file) - if os.path.exists(self.cookie_file): - try: - self.cookie_jar.load() - self.authenticated = True - StatusUpdate("Loaded authentication cookies from %s" % - self.cookie_file) - except (cookielib.LoadError, IOError): - # Failed to load cookies - just ignore them. - pass - else: - # Create an empty cookie file with mode 600 - fd = os.open(self.cookie_file, os.O_CREAT, 0600) - os.close(fd) - # Always chmod the cookie file - os.chmod(self.cookie_file, 0600) - else: - # Don't save cookies across runs of update.py. - self.cookie_jar = cookielib.CookieJar() - opener.add_handler(urllib2.HTTPCookieProcessor(self.cookie_jar)) - return opener - - -parser = optparse.OptionParser(usage="%prog [options] [-- diff_options]") -parser.add_option("-y", "--assume_yes", action="store_true", - dest="assume_yes", default=False, - help="Assume that the answer to yes/no questions is 'yes'.") -# Logging -group = parser.add_option_group("Logging options") -group.add_option("-q", "--quiet", action="store_const", const=0, - dest="verbose", help="Print errors only.") -group.add_option("-v", "--verbose", action="store_const", const=2, - dest="verbose", default=1, - help="Print info level logs (default).") -group.add_option("--noisy", action="store_const", const=3, - dest="verbose", help="Print all logs.") -# Review server -group = parser.add_option_group("Review server options") -group.add_option("-s", "--server", action="store", dest="server", - default="codereview.appspot.com", - metavar="SERVER", - help=("The server to upload to. The format is host[:port]. " - "Defaults to 'codereview.appspot.com'.")) -group.add_option("-e", "--email", action="store", dest="email", - metavar="EMAIL", default=None, - help="The username to use. Will prompt if omitted.") -group.add_option("-H", "--host", action="store", dest="host", - metavar="HOST", default=None, - help="Overrides the Host header sent with all RPCs.") -group.add_option("--no_cookies", action="store_false", - dest="save_cookies", default=True, - help="Do not save authentication cookies to local disk.") -# Issue -group = parser.add_option_group("Issue options") -group.add_option("-d", "--description", action="store", dest="description", - metavar="DESCRIPTION", default=None, - help="Optional description when creating an issue.") -group.add_option("-f", "--description_file", action="store", - dest="description_file", metavar="DESCRIPTION_FILE", - default=None, - help="Optional path of a file that contains " - "the description when creating an issue.") -group.add_option("-r", "--reviewers", action="store", dest="reviewers", - metavar="REVIEWERS", default=None, - help="Add reviewers (comma separated email addresses).") -group.add_option("--cc", action="store", dest="cc", - metavar="CC", default=None, - help="Add CC (comma separated email addresses).") -# Upload options -group = parser.add_option_group("Patch options") -group.add_option("-m", "--message", action="store", dest="message", - metavar="MESSAGE", default=None, - help="A message to identify the patch. " - "Will prompt if omitted.") -group.add_option("-i", "--issue", type="int", action="store", - metavar="ISSUE", default=None, - help="Issue number to which to add. Defaults to new issue.") -group.add_option("--download_base", action="store_true", - dest="download_base", default=False, - help="Base files will be downloaded by the server " - "(side-by-side diffs may not work on files with CRs).") -group.add_option("--rev", action="store", dest="revision", - metavar="REV", default=None, - help="Branch/tree/revision to diff against (used by DVCS).") -group.add_option("--send_mail", action="store_true", - dest="send_mail", default=False, - help="Send notification email to reviewers.") - - -def GetRpcServer(options): - """Returns an instance of an AbstractRpcServer. - - Returns: - A new AbstractRpcServer, on which RPC calls can be made. - """ - - rpc_server_class = HttpRpcServer - - def GetUserCredentials(): - """Prompts the user for a username and password.""" - email = options.email - if email is None: - email = GetEmail("Email (login for uploading to %s)" % options.server) - password = getpass.getpass("Password for %s: " % email) - return (email, password) - - # If this is the dev_appserver, use fake authentication. - host = (options.host or options.server).lower() - if host == "localhost" or host.startswith("localhost:"): - email = options.email - if email is None: - email = "test@example.com" - logging.info("Using debug user %s. Override with --email" % email) - server = rpc_server_class( - options.server, - lambda: (email, "password"), - host_override=options.host, - extra_headers={"Cookie": - 'dev_appserver_login="%s:False"' % email}, - save_cookies=options.save_cookies) - # Don't try to talk to ClientLogin. - server.authenticated = True - return server - - return rpc_server_class(options.server, GetUserCredentials, - host_override=options.host, - save_cookies=options.save_cookies) - - -def EncodeMultipartFormData(fields, files): - """Encode form fields for multipart/form-data. - - Args: - fields: A sequence of (name, value) elements for regular form fields. - files: A sequence of (name, filename, value) elements for data to be - uploaded as files. - Returns: - (content_type, body) ready for httplib.HTTP instance. - - Source: - http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/146306 - """ - BOUNDARY = '-M-A-G-I-C---B-O-U-N-D-A-R-Y-' - CRLF = '\r\n' - lines = [] - for (key, value) in fields: - lines.append('--' + BOUNDARY) - lines.append('Content-Disposition: form-data; name="%s"' % key) - lines.append('') - lines.append(value) - for (key, filename, value) in files: - lines.append('--' + BOUNDARY) - lines.append('Content-Disposition: form-data; name="%s"; filename="%s"' % - (key, filename)) - lines.append('Content-Type: %s' % GetContentType(filename)) - lines.append('') - lines.append(value) - lines.append('--' + BOUNDARY + '--') - lines.append('') - body = CRLF.join(lines) - content_type = 'multipart/form-data; boundary=%s' % BOUNDARY - return content_type, body - - -def GetContentType(filename): - """Helper to guess the content-type from the filename.""" - return mimetypes.guess_type(filename)[0] or 'application/octet-stream' - - -# Use a shell for subcommands on Windows to get a PATH search. -use_shell = sys.platform.startswith("win") - -def RunShellWithReturnCode(command, print_output=False, - universal_newlines=True): - """Executes a command and returns the output from stdout and the return code. - - Args: - command: Command to execute. - print_output: If True, the output is printed to stdout. - If False, both stdout and stderr are ignored. - universal_newlines: Use universal_newlines flag (default: True). - - Returns: - Tuple (output, return code) - """ - logging.info("Running %s", command) - p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - shell=use_shell, universal_newlines=universal_newlines) - if print_output: - output_array = [] - while True: - line = p.stdout.readline() - if not line: - break - print line.strip("\n") - output_array.append(line) - output = "".join(output_array) - else: - output = p.stdout.read() - p.wait() - errout = p.stderr.read() - if print_output and errout: - print >>sys.stderr, errout - p.stdout.close() - p.stderr.close() - return output, p.returncode - - -def RunShell(command, silent_ok=False, universal_newlines=True, - print_output=False): - data, retcode = RunShellWithReturnCode(command, print_output, - universal_newlines) - if retcode: - ErrorExit("Got error status from %s:\n%s" % (command, data)) - if not silent_ok and not data: - ErrorExit("No output from %s" % command) - return data - - -class VersionControlSystem(object): - """Abstract base class providing an interface to the VCS.""" - - def __init__(self, options): - """Constructor. - - Args: - options: Command line options. - """ - self.options = options - - def GenerateDiff(self, args): - """Return the current diff as a string. - - Args: - args: Extra arguments to pass to the diff command. - """ - raise NotImplementedError( - "abstract method -- subclass %s must override" % self.__class__) - - def GetUnknownFiles(self): - """Return a list of files unknown to the VCS.""" - raise NotImplementedError( - "abstract method -- subclass %s must override" % self.__class__) - - def CheckForUnknownFiles(self): - """Show an "are you sure?" prompt if there are unknown files.""" - unknown_files = self.GetUnknownFiles() - if unknown_files: - print "The following files are not added to version control:" - for line in unknown_files: - print line - prompt = "Are you sure to continue?(y/N) " - answer = raw_input(prompt).strip() - if answer != "y": - ErrorExit("User aborted") - - def GetBaseFile(self, filename): - """Get the content of the upstream version of a file. - - Returns: - A tuple (base_content, new_content, is_binary, status) - base_content: The contents of the base file. - new_content: For text files, this is empty. For binary files, this is - the contents of the new file, since the diff output won't contain - information to reconstruct the current file. - is_binary: True iff the file is binary. - status: The status of the file. - """ - - raise NotImplementedError( - "abstract method -- subclass %s must override" % self.__class__) - - - def GetBaseFiles(self, diff): - """Helper that calls GetBase file for each file in the patch. - - Returns: - A dictionary that maps from filename to GetBaseFile's tuple. Filenames - are retrieved based on lines that start with "Index:" or - "Property changes on:". - """ - files = {} - for line in diff.splitlines(True): - if line.startswith('Index:') or line.startswith('Property changes on:'): - unused, filename = line.split(':', 1) - # On Windows if a file has property changes its filename uses '\' - # instead of '/'. - filename = filename.strip().replace('\\', '/') - files[filename] = self.GetBaseFile(filename) - return files - - - def UploadBaseFiles(self, issue, rpc_server, patch_list, patchset, options, - files): - """Uploads the base files (and if necessary, the current ones as well).""" - - def UploadFile(filename, file_id, content, is_binary, status, is_base): - """Uploads a file to the server.""" - file_too_large = False - if is_base: - type = "base" - else: - type = "current" - if len(content) > MAX_UPLOAD_SIZE: - print ("Not uploading the %s file for %s because it's too large." % - (type, filename)) - file_too_large = True - content = "" - checksum = md5.new(content).hexdigest() - if options.verbose > 0 and not file_too_large: - print "Uploading %s file for %s" % (type, filename) - url = "/%d/upload_content/%d/%d" % (int(issue), int(patchset), file_id) - form_fields = [("filename", filename), - ("status", status), - ("checksum", checksum), - ("is_binary", str(is_binary)), - ("is_current", str(not is_base)), - ] - if file_too_large: - form_fields.append(("file_too_large", "1")) - if options.email: - form_fields.append(("user", options.email)) - ctype, body = EncodeMultipartFormData(form_fields, - [("data", filename, content)]) - response_body = rpc_server.Send(url, body, - content_type=ctype) - if not response_body.startswith("OK"): - StatusUpdate(" --> %s" % response_body) - sys.exit(1) - - patches = dict() - [patches.setdefault(v, k) for k, v in patch_list] - for filename in patches.keys(): - base_content, new_content, is_binary, status = files[filename] - file_id_str = patches.get(filename) - if file_id_str.find("nobase") != -1: - base_content = None - file_id_str = file_id_str[file_id_str.rfind("_") + 1:] - file_id = int(file_id_str) - if base_content != None: - UploadFile(filename, file_id, base_content, is_binary, status, True) - if new_content != None: - UploadFile(filename, file_id, new_content, is_binary, status, False) - - def IsImage(self, filename): - """Returns true if the filename has an image extension.""" - mimetype = mimetypes.guess_type(filename)[0] - if not mimetype: - return False - return mimetype.startswith("image/") - - -class SubversionVCS(VersionControlSystem): - """Implementation of the VersionControlSystem interface for Subversion.""" - - def __init__(self, options): - super(SubversionVCS, self).__init__(options) - if self.options.revision: - match = re.match(r"(\d+)(:(\d+))?", self.options.revision) - if not match: - ErrorExit("Invalid Subversion revision %s." % self.options.revision) - self.rev_start = match.group(1) - self.rev_end = match.group(3) - else: - self.rev_start = self.rev_end = None - # Cache output from "svn list -r REVNO dirname". - # Keys: dirname, Values: 2-tuple (output for start rev and end rev). - self.svnls_cache = {} - # SVN base URL is required to fetch files deleted in an older revision. - # Result is cached to not guess it over and over again in GetBaseFile(). - required = self.options.download_base or self.options.revision is not None - self.svn_base = self._GuessBase(required) - - def GuessBase(self, required): - """Wrapper for _GuessBase.""" - return self.svn_base - - def _GuessBase(self, required): - """Returns the SVN base URL. - - Args: - required: If true, exits if the url can't be guessed, otherwise None is - returned. - """ - info = RunShell(["svn", "info"]) - for line in info.splitlines(): - words = line.split() - if len(words) == 2 and words[0] == "URL:": - url = words[1] - scheme, netloc, path, params, query, fragment = urlparse.urlparse(url) - username, netloc = urllib.splituser(netloc) - if username: - logging.info("Removed username from base URL") - if netloc.endswith("svn.python.org"): - if netloc == "svn.python.org": - if path.startswith("/projects/"): - path = path[9:] - elif netloc != "pythondev@svn.python.org": - ErrorExit("Unrecognized Python URL: %s" % url) - base = "http://svn.python.org/view/*checkout*%s/" % path - logging.info("Guessed Python base = %s", base) - elif netloc.endswith("svn.collab.net"): - if path.startswith("/repos/"): - path = path[6:] - base = "http://svn.collab.net/viewvc/*checkout*%s/" % path - logging.info("Guessed CollabNet base = %s", base) - elif netloc.endswith(".googlecode.com"): - path = path + "/" - base = urlparse.urlunparse(("http", netloc, path, params, - query, fragment)) - logging.info("Guessed Google Code base = %s", base) - else: - path = path + "/" - base = urlparse.urlunparse((scheme, netloc, path, params, - query, fragment)) - logging.info("Guessed base = %s", base) - return base - if required: - ErrorExit("Can't find URL in output from svn info") - return None - - def GenerateDiff(self, args): - cmd = ["svn", "diff"] - if self.options.revision: - cmd += ["-r", self.options.revision] - cmd.extend(args) - data = RunShell(cmd) - count = 0 - for line in data.splitlines(): - if line.startswith("Index:") or line.startswith("Property changes on:"): - count += 1 - logging.info(line) - if not count: - ErrorExit("No valid patches found in output from svn diff") - return data - - def _CollapseKeywords(self, content, keyword_str): - """Collapses SVN keywords.""" - # svn cat translates keywords but svn diff doesn't. As a result of this - # behavior patching.PatchChunks() fails with a chunk mismatch error. - # This part was originally written by the Review Board development team - # who had the same problem (http://reviews.review-board.org/r/276/). - # Mapping of keywords to known aliases - svn_keywords = { - # Standard keywords - 'Date': ['Date', 'LastChangedDate'], - 'Revision': ['Revision', 'LastChangedRevision', 'Rev'], - 'Author': ['Author', 'LastChangedBy'], - 'HeadURL': ['HeadURL', 'URL'], - 'Id': ['Id'], - - # Aliases - 'LastChangedDate': ['LastChangedDate', 'Date'], - 'LastChangedRevision': ['LastChangedRevision', 'Rev', 'Revision'], - 'LastChangedBy': ['LastChangedBy', 'Author'], - 'URL': ['URL', 'HeadURL'], - } - - def repl(m): - if m.group(2): - return "$%s::%s$" % (m.group(1), " " * len(m.group(3))) - return "$%s$" % m.group(1) - keywords = [keyword - for name in keyword_str.split(" ") - for keyword in svn_keywords.get(name, [])] - return re.sub(r"\$(%s):(:?)([^\$]+)\$" % '|'.join(keywords), repl, content) - - def GetUnknownFiles(self): - status = RunShell(["svn", "status", "--ignore-externals"], silent_ok=True) - unknown_files = [] - for line in status.split("\n"): - if line and line[0] == "?": - unknown_files.append(line) - return unknown_files - - def ReadFile(self, filename): - """Returns the contents of a file.""" - file = open(filename, 'rb') - result = "" - try: - result = file.read() - finally: - file.close() - return result - - def GetStatus(self, filename): - """Returns the status of a file.""" - if not self.options.revision: - status = RunShell(["svn", "status", "--ignore-externals", filename]) - if not status: - ErrorExit("svn status returned no output for %s" % filename) - status_lines = status.splitlines() - # If file is in a cl, the output will begin with - # "\n--- Changelist 'cl_name':\n". See - # http://svn.collab.net/repos/svn/trunk/notes/changelist-design.txt - if (len(status_lines) == 3 and - not status_lines[0] and - status_lines[1].startswith("--- Changelist")): - status = status_lines[2] - else: - status = status_lines[0] - # If we have a revision to diff against we need to run "svn list" - # for the old and the new revision and compare the results to get - # the correct status for a file. - else: - dirname, relfilename = os.path.split(filename) - if dirname not in self.svnls_cache: - cmd = ["svn", "list", "-r", self.rev_start, dirname or "."] - out, returncode = RunShellWithReturnCode(cmd) - if returncode: - ErrorExit("Failed to get status for %s." % filename) - old_files = out.splitlines() - args = ["svn", "list"] - if self.rev_end: - args += ["-r", self.rev_end] - cmd = args + [dirname or "."] - out, returncode = RunShellWithReturnCode(cmd) - if returncode: - ErrorExit("Failed to run command %s" % cmd) - self.svnls_cache[dirname] = (old_files, out.splitlines()) - old_files, new_files = self.svnls_cache[dirname] - if relfilename in old_files and relfilename not in new_files: - status = "D " - elif relfilename in old_files and relfilename in new_files: - status = "M " - else: - status = "A " - return status - - def GetBaseFile(self, filename): - status = self.GetStatus(filename) - base_content = None - new_content = None - - # If a file is copied its status will be "A +", which signifies - # "addition-with-history". See "svn st" for more information. We need to - # upload the original file or else diff parsing will fail if the file was - # edited. - if status[0] == "A" and status[3] != "+": - # We'll need to upload the new content if we're adding a binary file - # since diff's output won't contain it. - mimetype = RunShell(["svn", "propget", "svn:mime-type", filename], - silent_ok=True) - base_content = "" - is_binary = mimetype and not mimetype.startswith("text/") - if is_binary and self.IsImage(filename): - new_content = self.ReadFile(filename) - elif (status[0] in ("M", "D", "R") or - (status[0] == "A" and status[3] == "+") or # Copied file. - (status[0] == " " and status[1] == "M")): # Property change. - args = [] - if self.options.revision: - url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start) - else: - # Don't change filename, it's needed later. - url = filename - args += ["-r", "BASE"] - cmd = ["svn"] + args + ["propget", "svn:mime-type", url] - mimetype, returncode = RunShellWithReturnCode(cmd) - if returncode: - # File does not exist in the requested revision. - # Reset mimetype, it contains an error message. - mimetype = "" - get_base = False - is_binary = mimetype and not mimetype.startswith("text/") - if status[0] == " ": - # Empty base content just to force an upload. - base_content = "" - elif is_binary: - if self.IsImage(filename): - get_base = True - if status[0] == "M": - if not self.rev_end: - new_content = self.ReadFile(filename) - else: - url = "%s/%s@%s" % (self.svn_base, filename, self.rev_end) - new_content = RunShell(["svn", "cat", url], - universal_newlines=True, silent_ok=True) - else: - base_content = "" - else: - get_base = True - - if get_base: - if is_binary: - universal_newlines = False - else: - universal_newlines = True - if self.rev_start: - # "svn cat -r REV delete_file.txt" doesn't work. cat requires - # the full URL with "@REV" appended instead of using "-r" option. - url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start) - base_content = RunShell(["svn", "cat", url], - universal_newlines=universal_newlines, - silent_ok=True) - else: - base_content = RunShell(["svn", "cat", filename], - universal_newlines=universal_newlines, - silent_ok=True) - if not is_binary: - args = [] - if self.rev_start: - url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start) - else: - url = filename - args += ["-r", "BASE"] - cmd = ["svn"] + args + ["propget", "svn:keywords", url] - keywords, returncode = RunShellWithReturnCode(cmd) - if keywords and not returncode: - base_content = self._CollapseKeywords(base_content, keywords) - else: - StatusUpdate("svn status returned unexpected output: %s" % status) - sys.exit(1) - return base_content, new_content, is_binary, status[0:5] - - -class GitVCS(VersionControlSystem): - """Implementation of the VersionControlSystem interface for Git.""" - - def __init__(self, options): - super(GitVCS, self).__init__(options) - # Map of filename -> hash of base file. - self.base_hashes = {} - - def GenerateDiff(self, extra_args): - # This is more complicated than svn's GenerateDiff because we must convert - # the diff output to include an svn-style "Index:" line as well as record - # the hashes of the base files, so we can upload them along with our diff. - if self.options.revision: - extra_args = [self.options.revision] + extra_args - gitdiff = RunShell(["git", "diff", "--full-index"] + extra_args) - svndiff = [] - filecount = 0 - filename = None - for line in gitdiff.splitlines(): - match = re.match(r"diff --git a/(.*) b/.*$", line) - if match: - filecount += 1 - filename = match.group(1) - svndiff.append("Index: %s\n" % filename) - else: - # The "index" line in a git diff looks like this (long hashes elided): - # index 82c0d44..b2cee3f 100755 - # We want to save the left hash, as that identifies the base file. - match = re.match(r"index (\w+)\.\.", line) - if match: - self.base_hashes[filename] = match.group(1) - svndiff.append(line + "\n") - if not filecount: - ErrorExit("No valid patches found in output from git diff") - return "".join(svndiff) - - def GetUnknownFiles(self): - status = RunShell(["git", "ls-files", "--exclude-standard", "--others"], - silent_ok=True) - return status.splitlines() - - def GetBaseFile(self, filename): - hash = self.base_hashes[filename] - base_content = None - new_content = None - is_binary = False - if hash == "0" * 40: # All-zero hash indicates no base file. - status = "A" - base_content = "" - else: - status = "M" - base_content, returncode = RunShellWithReturnCode(["git", "show", hash]) - if returncode: - ErrorExit("Got error status from 'git show %s'" % hash) - return (base_content, new_content, is_binary, status) - - -class MercurialVCS(VersionControlSystem): - """Implementation of the VersionControlSystem interface for Mercurial.""" - - def __init__(self, options, repo_dir): - super(MercurialVCS, self).__init__(options) - # Absolute path to repository (we can be in a subdir) - self.repo_dir = os.path.normpath(repo_dir) - # Compute the subdir - cwd = os.path.normpath(os.getcwd()) - assert cwd.startswith(self.repo_dir) - self.subdir = cwd[len(self.repo_dir):].lstrip(r"\/") - if self.options.revision: - self.base_rev = self.options.revision - else: - self.base_rev = RunShell(["hg", "parent", "-q"]).split(':')[1].strip() - - def _GetRelPath(self, filename): - """Get relative path of a file according to the current directory, - given its logical path in the repo.""" - assert filename.startswith(self.subdir), filename - return filename[len(self.subdir):].lstrip(r"\/") - - def GenerateDiff(self, extra_args): - # If no file specified, restrict to the current subdir - extra_args = extra_args or ["."] - cmd = ["hg", "diff", "--git", "-r", self.base_rev] + extra_args - data = RunShell(cmd, silent_ok=True) - svndiff = [] - filecount = 0 - for line in data.splitlines(): - m = re.match("diff --git a/(\S+) b/(\S+)", line) - if m: - # Modify line to make it look like as it comes from svn diff. - # With this modification no changes on the server side are required - # to make upload.py work with Mercurial repos. - # NOTE: for proper handling of moved/copied files, we have to use - # the second filename. - filename = m.group(2) - svndiff.append("Index: %s" % filename) - svndiff.append("=" * 67) - filecount += 1 - logging.info(line) - else: - svndiff.append(line) - if not filecount: - ErrorExit("No valid patches found in output from hg diff") - return "\n".join(svndiff) + "\n" - - def GetUnknownFiles(self): - """Return a list of files unknown to the VCS.""" - args = [] - status = RunShell(["hg", "status", "--rev", self.base_rev, "-u", "."], - silent_ok=True) - unknown_files = [] - for line in status.splitlines(): - st, fn = line.split(" ", 1) - if st == "?": - unknown_files.append(fn) - return unknown_files - - def GetBaseFile(self, filename): - # "hg status" and "hg cat" both take a path relative to the current subdir - # rather than to the repo root, but "hg diff" has given us the full path - # to the repo root. - base_content = "" - new_content = None - is_binary = False - oldrelpath = relpath = self._GetRelPath(filename) - # "hg status -C" returns two lines for moved/copied files, one otherwise - out = RunShell(["hg", "status", "-C", "--rev", self.base_rev, relpath]) - out = out.splitlines() - # HACK: strip error message about missing file/directory if it isn't in - # the working copy - if out[0].startswith('%s: ' % relpath): - out = out[1:] - if len(out) > 1: - # Moved/copied => considered as modified, use old filename to - # retrieve base contents - oldrelpath = out[1].strip() - status = "M" - else: - status, _ = out[0].split(' ', 1) - if status != "A": - base_content = RunShell(["hg", "cat", "-r", self.base_rev, oldrelpath], - silent_ok=True) - is_binary = "\0" in base_content # Mercurial's heuristic - if status != "R": - new_content = open(relpath, "rb").read() - is_binary = is_binary or "\0" in new_content - if is_binary and base_content: - # Fetch again without converting newlines - base_content = RunShell(["hg", "cat", "-r", self.base_rev, oldrelpath], - silent_ok=True, universal_newlines=False) - if not is_binary or not self.IsImage(relpath): - new_content = None - return base_content, new_content, is_binary, status - - -# NOTE: The SplitPatch function is duplicated in engine.py, keep them in sync. -def SplitPatch(data): - """Splits a patch into separate pieces for each file. - - Args: - data: A string containing the output of svn diff. - - Returns: - A list of 2-tuple (filename, text) where text is the svn diff output - pertaining to filename. - """ - patches = [] - filename = None - diff = [] - for line in data.splitlines(True): - new_filename = None - if line.startswith('Index:'): - unused, new_filename = line.split(':', 1) - new_filename = new_filename.strip() - elif line.startswith('Property changes on:'): - unused, temp_filename = line.split(':', 1) - # When a file is modified, paths use '/' between directories, however - # when a property is modified '\' is used on Windows. Make them the same - # otherwise the file shows up twice. - temp_filename = temp_filename.strip().replace('\\', '/') - if temp_filename != filename: - # File has property changes but no modifications, create a new diff. - new_filename = temp_filename - if new_filename: - if filename and diff: - patches.append((filename, ''.join(diff))) - filename = new_filename - diff = [line] - continue - if diff is not None: - diff.append(line) - if filename and diff: - patches.append((filename, ''.join(diff))) - return patches - - -def UploadSeparatePatches(issue, rpc_server, patchset, data, options): - """Uploads a separate patch for each file in the diff output. - - Returns a list of [patch_key, filename] for each file. - """ - patches = SplitPatch(data) - rv = [] - for patch in patches: - if len(patch[1]) > MAX_UPLOAD_SIZE: - print ("Not uploading the patch for " + patch[0] + - " because the file is too large.") - continue - form_fields = [("filename", patch[0])] - if not options.download_base: - form_fields.append(("content_upload", "1")) - files = [("data", "data.diff", patch[1])] - ctype, body = EncodeMultipartFormData(form_fields, files) - url = "/%d/upload_patch/%d" % (int(issue), int(patchset)) - print "Uploading patch for " + patch[0] - response_body = rpc_server.Send(url, body, content_type=ctype) - lines = response_body.splitlines() - if not lines or lines[0] != "OK": - StatusUpdate(" --> %s" % response_body) - sys.exit(1) - rv.append([lines[1], patch[0]]) - return rv - - -def GuessVCS(options): - """Helper to guess the version control system. - - This examines the current directory, guesses which VersionControlSystem - we're using, and returns an instance of the appropriate class. Exit with an - error if we can't figure it out. - - Returns: - A VersionControlSystem instance. Exits if the VCS can't be guessed. - """ - # Mercurial has a command to get the base directory of a repository - # Try running it, but don't die if we don't have hg installed. - # NOTE: we try Mercurial first as it can sit on top of an SVN working copy. - try: - out, returncode = RunShellWithReturnCode(["hg", "root"]) - if returncode == 0: - return MercurialVCS(options, out.strip()) - except OSError, (errno, message): - if errno != 2: # ENOENT -- they don't have hg installed. - raise - - # Subversion has a .svn in all working directories. - if os.path.isdir('.svn'): - logging.info("Guessed VCS = Subversion") - return SubversionVCS(options) - - # Git has a command to test if you're in a git tree. - # Try running it, but don't die if we don't have git installed. - try: - out, returncode = RunShellWithReturnCode(["git", "rev-parse", - "--is-inside-work-tree"]) - if returncode == 0: - return GitVCS(options) - except OSError, (errno, message): - if errno != 2: # ENOENT -- they don't have git installed. - raise - - ErrorExit(("Could not guess version control system. " - "Are you in a working copy directory?")) - - -def RealMain(argv, data=None): - """The real main function. - - Args: - argv: Command line arguments. - data: Diff contents. If None (default) the diff is generated by - the VersionControlSystem implementation returned by GuessVCS(). - - Returns: - A 2-tuple (issue id, patchset id). - The patchset id is None if the base files are not uploaded by this - script (applies only to SVN checkouts). - """ - logging.basicConfig(format=("%(asctime).19s %(levelname)s %(filename)s:" - "%(lineno)s %(message)s ")) - os.environ['LC_ALL'] = 'C' - options, args = parser.parse_args(argv[1:]) - global verbosity - verbosity = options.verbose - if verbosity >= 3: - logging.getLogger().setLevel(logging.DEBUG) - elif verbosity >= 2: - logging.getLogger().setLevel(logging.INFO) - vcs = GuessVCS(options) - if isinstance(vcs, SubversionVCS): - # base field is only allowed for Subversion. - # Note: Fetching base files may become deprecated in future releases. - base = vcs.GuessBase(options.download_base) - else: - base = None - if not base and options.download_base: - options.download_base = True - logging.info("Enabled upload of base file") - if not options.assume_yes: - vcs.CheckForUnknownFiles() - if data is None: - data = vcs.GenerateDiff(args) - files = vcs.GetBaseFiles(data) - if verbosity >= 1: - print "Upload server:", options.server, "(change with -s/--server)" - if options.issue: - prompt = "Message describing this patch set: " - else: - prompt = "New issue subject: " - message = options.message or raw_input(prompt).strip() - if not message: - ErrorExit("A non-empty message is required") - rpc_server = GetRpcServer(options) - form_fields = [("subject", message)] - if base: - form_fields.append(("base", base)) - if options.issue: - form_fields.append(("issue", str(options.issue))) - if options.email: - form_fields.append(("user", options.email)) - if options.reviewers: - for reviewer in options.reviewers.split(','): - if "@" in reviewer and not reviewer.split("@")[1].count(".") == 1: - ErrorExit("Invalid email address: %s" % reviewer) - form_fields.append(("reviewers", options.reviewers)) - if options.cc: - for cc in options.cc.split(','): - if "@" in cc and not cc.split("@")[1].count(".") == 1: - ErrorExit("Invalid email address: %s" % cc) - form_fields.append(("cc", options.cc)) - description = options.description - if options.description_file: - if options.description: - ErrorExit("Can't specify description and description_file") - file = open(options.description_file, 'r') - description = file.read() - file.close() - if description: - form_fields.append(("description", description)) - # Send a hash of all the base file so the server can determine if a copy - # already exists in an earlier patchset. - base_hashes = "" - for file, info in files.iteritems(): - if not info[0] is None: - checksum = md5.new(info[0]).hexdigest() - if base_hashes: - base_hashes += "|" - base_hashes += checksum + ":" + file - form_fields.append(("base_hashes", base_hashes)) - # If we're uploading base files, don't send the email before the uploads, so - # that it contains the file status. - if options.send_mail and options.download_base: - form_fields.append(("send_mail", "1")) - if not options.download_base: - form_fields.append(("content_upload", "1")) - if len(data) > MAX_UPLOAD_SIZE: - print "Patch is large, so uploading file patches separately." - uploaded_diff_file = [] - form_fields.append(("separate_patches", "1")) - else: - uploaded_diff_file = [("data", "data.diff", data)] - ctype, body = EncodeMultipartFormData(form_fields, uploaded_diff_file) - response_body = rpc_server.Send("/upload", body, content_type=ctype) - patchset = None - if not options.download_base or not uploaded_diff_file: - lines = response_body.splitlines() - if len(lines) >= 2: - msg = lines[0] - patchset = lines[1].strip() - patches = [x.split(" ", 1) for x in lines[2:]] - else: - msg = response_body - else: - msg = response_body - StatusUpdate(msg) - if not response_body.startswith("Issue created.") and \ - not response_body.startswith("Issue updated."): - sys.exit(0) - issue = msg[msg.rfind("/")+1:] - - if not uploaded_diff_file: - result = UploadSeparatePatches(issue, rpc_server, patchset, data, options) - if not options.download_base: - patches = result - - if not options.download_base: - vcs.UploadBaseFiles(issue, rpc_server, patches, patchset, options, files) - if options.send_mail: - rpc_server.Send("/" + issue + "/mail", payload="") - return issue, patchset - - -def main(): - try: - RealMain(sys.argv) - except KeyboardInterrupt: - print - StatusUpdate("Interrupted.") - sys.exit(1) - - -if __name__ == "__main__": - main() diff --git a/test/gtest-1.8.0/scripts/upload_gtest.py b/test/gtest-1.8.0/scripts/upload_gtest.py deleted file mode 100644 index be19ae8091..0000000000 --- a/test/gtest-1.8.0/scripts/upload_gtest.py +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2009, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""upload_gtest.py v0.1.0 -- uploads a Google Test patch for review. - -This simple wrapper passes all command line flags and ---cc=googletestframework@googlegroups.com to upload.py. - -USAGE: upload_gtest.py [options for upload.py] -""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import os -import sys - -CC_FLAG = '--cc=' -GTEST_GROUP = 'googletestframework@googlegroups.com' - - -def main(): - # Finds the path to upload.py, assuming it is in the same directory - # as this file. - my_dir = os.path.dirname(os.path.abspath(__file__)) - upload_py_path = os.path.join(my_dir, 'upload.py') - - # Adds Google Test discussion group to the cc line if it's not there - # already. - upload_py_argv = [upload_py_path] - found_cc_flag = False - for arg in sys.argv[1:]: - if arg.startswith(CC_FLAG): - found_cc_flag = True - cc_line = arg[len(CC_FLAG):] - cc_list = [addr for addr in cc_line.split(',') if addr] - if GTEST_GROUP not in cc_list: - cc_list.append(GTEST_GROUP) - upload_py_argv.append(CC_FLAG + ','.join(cc_list)) - else: - upload_py_argv.append(arg) - - if not found_cc_flag: - upload_py_argv.append(CC_FLAG + GTEST_GROUP) - - # Invokes upload.py with the modified command line flags. - os.execv(upload_py_path, upload_py_argv) - - -if __name__ == '__main__': - main() diff --git a/test/gtest-1.8.0/src/gtest-all.cc b/test/gtest-1.8.0/src/gtest-all.cc deleted file mode 100644 index 5872a2e62f..0000000000 --- a/test/gtest-1.8.0/src/gtest-all.cc +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: mheule@google.com (Markus Heule) -// -// Google C++ Testing and Mocking Framework (Google Test) -// -// Sometimes it's desirable to build Google Test by compiling a single file. -// This file serves this purpose. - -// This line ensures that gtest.h can be compiled on its own, even -// when it's fused. -#include "gtest/gtest.h" - -// The following lines pull in the real gtest *.cc files. -#include "src/gtest.cc" -#include "src/gtest-death-test.cc" -#include "src/gtest-filepath.cc" -#include "src/gtest-port.cc" -#include "src/gtest-printers.cc" -#include "src/gtest-test-part.cc" -#include "src/gtest-typed-test.cc" diff --git a/test/gtest-1.8.0/src/gtest-death-test.cc b/test/gtest-1.8.0/src/gtest-death-test.cc deleted file mode 100644 index b397992488..0000000000 --- a/test/gtest-1.8.0/src/gtest-death-test.cc +++ /dev/null @@ -1,1537 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan), vladl@google.com (Vlad Losev) -// -// This file implements death tests. - -#include "gtest/gtest-death-test.h" -#include "gtest/internal/gtest-port.h" -#include "gtest/internal/custom/gtest.h" - -#if GTEST_HAS_DEATH_TEST - -# if GTEST_OS_MAC -# include -# endif // GTEST_OS_MAC - -# include -# include -# include - -# if GTEST_OS_LINUX -# include -# endif // GTEST_OS_LINUX - -# include - -# if GTEST_OS_WINDOWS -# include -# else -# include -# include -# endif // GTEST_OS_WINDOWS - -# if GTEST_OS_QNX -# include -# endif // GTEST_OS_QNX - -# if GTEST_OS_FUCHSIA -# include -# include -# include -# endif // GTEST_OS_FUCHSIA - -#endif // GTEST_HAS_DEATH_TEST - -#include "gtest/gtest-message.h" -#include "gtest/internal/gtest-string.h" -#include "src/gtest-internal-inl.h" - -namespace testing { - -// Constants. - -// The default death test style. -// -// This is defined in internal/gtest-port.h as "fast", but can be overridden by -// a definition in internal/custom/gtest-port.h. The recommended value, which is -// used internally at Google, is "threadsafe". -static const char kDefaultDeathTestStyle[] = GTEST_DEFAULT_DEATH_TEST_STYLE; - -GTEST_DEFINE_string_( - death_test_style, - internal::StringFromGTestEnv("death_test_style", kDefaultDeathTestStyle), - "Indicates how to run a death test in a forked child process: " - "\"threadsafe\" (child process re-executes the test binary " - "from the beginning, running only the specific death test) or " - "\"fast\" (child process runs the death test immediately " - "after forking)."); - -GTEST_DEFINE_bool_( - death_test_use_fork, - internal::BoolFromGTestEnv("death_test_use_fork", false), - "Instructs to use fork()/_exit() instead of clone() in death tests. " - "Ignored and always uses fork() on POSIX systems where clone() is not " - "implemented. Useful when running under valgrind or similar tools if " - "those do not support clone(). Valgrind 3.3.1 will just fail if " - "it sees an unsupported combination of clone() flags. " - "It is not recommended to use this flag w/o valgrind though it will " - "work in 99% of the cases. Once valgrind is fixed, this flag will " - "most likely be removed."); - -namespace internal { -GTEST_DEFINE_string_( - internal_run_death_test, "", - "Indicates the file, line number, temporal index of " - "the single death test to run, and a file descriptor to " - "which a success code may be sent, all separated by " - "the '|' characters. This flag is specified if and only if the current " - "process is a sub-process launched for running a thread-safe " - "death test. FOR INTERNAL USE ONLY."); -} // namespace internal - -#if GTEST_HAS_DEATH_TEST - -namespace internal { - -// Valid only for fast death tests. Indicates the code is running in the -// child process of a fast style death test. -# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA -static bool g_in_fast_death_test_child = false; -# endif - -// Returns a Boolean value indicating whether the caller is currently -// executing in the context of the death test child process. Tools such as -// Valgrind heap checkers may need this to modify their behavior in death -// tests. IMPORTANT: This is an internal utility. Using it may break the -// implementation of death tests. User code MUST NOT use it. -bool InDeathTestChild() { -# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA - - // On Windows and Fuchsia, death tests are thread-safe regardless of the value - // of the death_test_style flag. - return !GTEST_FLAG(internal_run_death_test).empty(); - -# else - - if (GTEST_FLAG(death_test_style) == "threadsafe") - return !GTEST_FLAG(internal_run_death_test).empty(); - else - return g_in_fast_death_test_child; -#endif -} - -} // namespace internal - -// ExitedWithCode constructor. -ExitedWithCode::ExitedWithCode(int exit_code) : exit_code_(exit_code) { -} - -// ExitedWithCode function-call operator. -bool ExitedWithCode::operator()(int exit_status) const { -# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA - - return exit_status == exit_code_; - -# else - - return WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == exit_code_; - -# endif // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA -} - -# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA -// KilledBySignal constructor. -KilledBySignal::KilledBySignal(int signum) : signum_(signum) { -} - -// KilledBySignal function-call operator. -bool KilledBySignal::operator()(int exit_status) const { -# if defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_) - { - bool result; - if (GTEST_KILLED_BY_SIGNAL_OVERRIDE_(signum_, exit_status, &result)) { - return result; - } - } -# endif // defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_) - return WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum_; -} -# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA - -namespace internal { - -// Utilities needed for death tests. - -// Generates a textual description of a given exit code, in the format -// specified by wait(2). -static std::string ExitSummary(int exit_code) { - Message m; - -# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA - - m << "Exited with exit status " << exit_code; - -# else - - if (WIFEXITED(exit_code)) { - m << "Exited with exit status " << WEXITSTATUS(exit_code); - } else if (WIFSIGNALED(exit_code)) { - m << "Terminated by signal " << WTERMSIG(exit_code); - } -# ifdef WCOREDUMP - if (WCOREDUMP(exit_code)) { - m << " (core dumped)"; - } -# endif -# endif // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA - - return m.GetString(); -} - -// Returns true if exit_status describes a process that was terminated -// by a signal, or exited normally with a nonzero exit code. -bool ExitedUnsuccessfully(int exit_status) { - return !ExitedWithCode(0)(exit_status); -} - -# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA -// Generates a textual failure message when a death test finds more than -// one thread running, or cannot determine the number of threads, prior -// to executing the given statement. It is the responsibility of the -// caller not to pass a thread_count of 1. -static std::string DeathTestThreadWarning(size_t thread_count) { - Message msg; - msg << "Death tests use fork(), which is unsafe particularly" - << " in a threaded context. For this test, " << GTEST_NAME_ << " "; - if (thread_count == 0) - msg << "couldn't detect the number of threads."; - else - msg << "detected " << thread_count << " threads."; - return msg.GetString(); -} -# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA - -// Flag characters for reporting a death test that did not die. -static const char kDeathTestLived = 'L'; -static const char kDeathTestReturned = 'R'; -static const char kDeathTestThrew = 'T'; -static const char kDeathTestInternalError = 'I'; - -#if GTEST_OS_FUCHSIA - -// File descriptor used for the pipe in the child process. -static const int kFuchsiaReadPipeFd = 3; - -#endif - -// An enumeration describing all of the possible ways that a death test can -// conclude. DIED means that the process died while executing the test -// code; LIVED means that process lived beyond the end of the test code; -// RETURNED means that the test statement attempted to execute a return -// statement, which is not allowed; THREW means that the test statement -// returned control by throwing an exception. IN_PROGRESS means the test -// has not yet concluded. -// TODO(vladl@google.com): Unify names and possibly values for -// AbortReason, DeathTestOutcome, and flag characters above. -enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW }; - -// Routine for aborting the program which is safe to call from an -// exec-style death test child process, in which case the error -// message is propagated back to the parent process. Otherwise, the -// message is simply printed to stderr. In either case, the program -// then exits with status 1. -static void DeathTestAbort(const std::string& message) { - // On a POSIX system, this function may be called from a threadsafe-style - // death test child process, which operates on a very small stack. Use - // the heap for any additional non-minuscule memory requirements. - const InternalRunDeathTestFlag* const flag = - GetUnitTestImpl()->internal_run_death_test_flag(); - if (flag != NULL) { - FILE* parent = posix::FDOpen(flag->write_fd(), "w"); - fputc(kDeathTestInternalError, parent); - fprintf(parent, "%s", message.c_str()); - fflush(parent); - _exit(1); - } else { - fprintf(stderr, "%s", message.c_str()); - fflush(stderr); - posix::Abort(); - } -} - -// A replacement for CHECK that calls DeathTestAbort if the assertion -// fails. -# define GTEST_DEATH_TEST_CHECK_(expression) \ - do { \ - if (!::testing::internal::IsTrue(expression)) { \ - DeathTestAbort( \ - ::std::string("CHECK failed: File ") + __FILE__ + ", line " \ - + ::testing::internal::StreamableToString(__LINE__) + ": " \ - + #expression); \ - } \ - } while (::testing::internal::AlwaysFalse()) - -// This macro is similar to GTEST_DEATH_TEST_CHECK_, but it is meant for -// evaluating any system call that fulfills two conditions: it must return -// -1 on failure, and set errno to EINTR when it is interrupted and -// should be tried again. The macro expands to a loop that repeatedly -// evaluates the expression as long as it evaluates to -1 and sets -// errno to EINTR. If the expression evaluates to -1 but errno is -// something other than EINTR, DeathTestAbort is called. -# define GTEST_DEATH_TEST_CHECK_SYSCALL_(expression) \ - do { \ - int gtest_retval; \ - do { \ - gtest_retval = (expression); \ - } while (gtest_retval == -1 && errno == EINTR); \ - if (gtest_retval == -1) { \ - DeathTestAbort( \ - ::std::string("CHECK failed: File ") + __FILE__ + ", line " \ - + ::testing::internal::StreamableToString(__LINE__) + ": " \ - + #expression + " != -1"); \ - } \ - } while (::testing::internal::AlwaysFalse()) - -// Returns the message describing the last system error in errno. -std::string GetLastErrnoDescription() { - return errno == 0 ? "" : posix::StrError(errno); -} - -// This is called from a death test parent process to read a failure -// message from the death test child process and log it with the FATAL -// severity. On Windows, the message is read from a pipe handle. On other -// platforms, it is read from a file descriptor. -static void FailFromInternalError(int fd) { - Message error; - char buffer[256]; - int num_read; - - do { - while ((num_read = posix::Read(fd, buffer, 255)) > 0) { - buffer[num_read] = '\0'; - error << buffer; - } - } while (num_read == -1 && errno == EINTR); - - if (num_read == 0) { - GTEST_LOG_(FATAL) << error.GetString(); - } else { - const int last_error = errno; - GTEST_LOG_(FATAL) << "Error while reading death test internal: " - << GetLastErrnoDescription() << " [" << last_error << "]"; - } -} - -// Death test constructor. Increments the running death test count -// for the current test. -DeathTest::DeathTest() { - TestInfo* const info = GetUnitTestImpl()->current_test_info(); - if (info == NULL) { - DeathTestAbort("Cannot run a death test outside of a TEST or " - "TEST_F construct"); - } -} - -// Creates and returns a death test by dispatching to the current -// death test factory. -bool DeathTest::Create(const char* statement, const RE* regex, - const char* file, int line, DeathTest** test) { - return GetUnitTestImpl()->death_test_factory()->Create( - statement, regex, file, line, test); -} - -const char* DeathTest::LastMessage() { - return last_death_test_message_.c_str(); -} - -void DeathTest::set_last_death_test_message(const std::string& message) { - last_death_test_message_ = message; -} - -std::string DeathTest::last_death_test_message_; - -// Provides cross platform implementation for some death functionality. -class DeathTestImpl : public DeathTest { - protected: - DeathTestImpl(const char* a_statement, const RE* a_regex) - : statement_(a_statement), - regex_(a_regex), - spawned_(false), - status_(-1), - outcome_(IN_PROGRESS), - read_fd_(-1), - write_fd_(-1) {} - - // read_fd_ is expected to be closed and cleared by a derived class. - ~DeathTestImpl() { GTEST_DEATH_TEST_CHECK_(read_fd_ == -1); } - - void Abort(AbortReason reason); - virtual bool Passed(bool status_ok); - - const char* statement() const { return statement_; } - const RE* regex() const { return regex_; } - bool spawned() const { return spawned_; } - void set_spawned(bool is_spawned) { spawned_ = is_spawned; } - int status() const { return status_; } - void set_status(int a_status) { status_ = a_status; } - DeathTestOutcome outcome() const { return outcome_; } - void set_outcome(DeathTestOutcome an_outcome) { outcome_ = an_outcome; } - int read_fd() const { return read_fd_; } - void set_read_fd(int fd) { read_fd_ = fd; } - int write_fd() const { return write_fd_; } - void set_write_fd(int fd) { write_fd_ = fd; } - - // Called in the parent process only. Reads the result code of the death - // test child process via a pipe, interprets it to set the outcome_ - // member, and closes read_fd_. Outputs diagnostics and terminates in - // case of unexpected codes. - void ReadAndInterpretStatusByte(); - - private: - // The textual content of the code this object is testing. This class - // doesn't own this string and should not attempt to delete it. - const char* const statement_; - // The regular expression which test output must match. DeathTestImpl - // doesn't own this object and should not attempt to delete it. - const RE* const regex_; - // True if the death test child process has been successfully spawned. - bool spawned_; - // The exit status of the child process. - int status_; - // How the death test concluded. - DeathTestOutcome outcome_; - // Descriptor to the read end of the pipe to the child process. It is - // always -1 in the child process. The child keeps its write end of the - // pipe in write_fd_. - int read_fd_; - // Descriptor to the child's write end of the pipe to the parent process. - // It is always -1 in the parent process. The parent keeps its end of the - // pipe in read_fd_. - int write_fd_; -}; - -// Called in the parent process only. Reads the result code of the death -// test child process via a pipe, interprets it to set the outcome_ -// member, and closes read_fd_. Outputs diagnostics and terminates in -// case of unexpected codes. -void DeathTestImpl::ReadAndInterpretStatusByte() { - char flag; - int bytes_read; - - // The read() here blocks until data is available (signifying the - // failure of the death test) or until the pipe is closed (signifying - // its success), so it's okay to call this in the parent before - // the child process has exited. - do { - bytes_read = posix::Read(read_fd(), &flag, 1); - } while (bytes_read == -1 && errno == EINTR); - - if (bytes_read == 0) { - set_outcome(DIED); - } else if (bytes_read == 1) { - switch (flag) { - case kDeathTestReturned: - set_outcome(RETURNED); - break; - case kDeathTestThrew: - set_outcome(THREW); - break; - case kDeathTestLived: - set_outcome(LIVED); - break; - case kDeathTestInternalError: - FailFromInternalError(read_fd()); // Does not return. - break; - default: - GTEST_LOG_(FATAL) << "Death test child process reported " - << "unexpected status byte (" - << static_cast(flag) << ")"; - } - } else { - GTEST_LOG_(FATAL) << "Read from death test child process failed: " - << GetLastErrnoDescription(); - } - GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Close(read_fd())); - set_read_fd(-1); -} - -// Signals that the death test code which should have exited, didn't. -// Should be called only in a death test child process. -// Writes a status byte to the child's status file descriptor, then -// calls _exit(1). -void DeathTestImpl::Abort(AbortReason reason) { - // The parent process considers the death test to be a failure if - // it finds any data in our pipe. So, here we write a single flag byte - // to the pipe, then exit. - const char status_ch = - reason == TEST_DID_NOT_DIE ? kDeathTestLived : - reason == TEST_THREW_EXCEPTION ? kDeathTestThrew : kDeathTestReturned; - - GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Write(write_fd(), &status_ch, 1)); - // We are leaking the descriptor here because on some platforms (i.e., - // when built as Windows DLL), destructors of global objects will still - // run after calling _exit(). On such systems, write_fd_ will be - // indirectly closed from the destructor of UnitTestImpl, causing double - // close if it is also closed here. On debug configurations, double close - // may assert. As there are no in-process buffers to flush here, we are - // relying on the OS to close the descriptor after the process terminates - // when the destructors are not run. - _exit(1); // Exits w/o any normal exit hooks (we were supposed to crash) -} - -// Returns an indented copy of stderr output for a death test. -// This makes distinguishing death test output lines from regular log lines -// much easier. -static ::std::string FormatDeathTestOutput(const ::std::string& output) { - ::std::string ret; - for (size_t at = 0; ; ) { - const size_t line_end = output.find('\n', at); - ret += "[ DEATH ] "; - if (line_end == ::std::string::npos) { - ret += output.substr(at); - break; - } - ret += output.substr(at, line_end + 1 - at); - at = line_end + 1; - } - return ret; -} - -// Assesses the success or failure of a death test, using both private -// members which have previously been set, and one argument: -// -// Private data members: -// outcome: An enumeration describing how the death test -// concluded: DIED, LIVED, THREW, or RETURNED. The death test -// fails in the latter three cases. -// status: The exit status of the child process. On *nix, it is in the -// in the format specified by wait(2). On Windows, this is the -// value supplied to the ExitProcess() API or a numeric code -// of the exception that terminated the program. -// regex: A regular expression object to be applied to -// the test's captured standard error output; the death test -// fails if it does not match. -// -// Argument: -// status_ok: true if exit_status is acceptable in the context of -// this particular death test, which fails if it is false -// -// Returns true iff all of the above conditions are met. Otherwise, the -// first failing condition, in the order given above, is the one that is -// reported. Also sets the last death test message string. -bool DeathTestImpl::Passed(bool status_ok) { - if (!spawned()) - return false; - - const std::string error_message = GetCapturedStderr(); - - bool success = false; - Message buffer; - - buffer << "Death test: " << statement() << "\n"; - switch (outcome()) { - case LIVED: - buffer << " Result: failed to die.\n" - << " Error msg:\n" << FormatDeathTestOutput(error_message); - break; - case THREW: - buffer << " Result: threw an exception.\n" - << " Error msg:\n" << FormatDeathTestOutput(error_message); - break; - case RETURNED: - buffer << " Result: illegal return in test statement.\n" - << " Error msg:\n" << FormatDeathTestOutput(error_message); - break; - case DIED: - if (status_ok) { -# if GTEST_USES_PCRE - // PCRE regexes support embedded NULs. - // GTEST_USES_PCRE is defined only in google3 mode - const bool matched = RE::PartialMatch(error_message, *regex()); -# else - const bool matched = RE::PartialMatch(error_message.c_str(), *regex()); -# endif // GTEST_USES_PCRE - if (matched) { - success = true; - } else { - buffer << " Result: died but not with expected error.\n" - << " Expected: " << regex()->pattern() << "\n" - << "Actual msg:\n" << FormatDeathTestOutput(error_message); - } - } else { - buffer << " Result: died but not with expected exit code:\n" - << " " << ExitSummary(status()) << "\n" - << "Actual msg:\n" << FormatDeathTestOutput(error_message); - } - break; - case IN_PROGRESS: - default: - GTEST_LOG_(FATAL) - << "DeathTest::Passed somehow called before conclusion of test"; - } - - DeathTest::set_last_death_test_message(buffer.GetString()); - return success; -} - -# if GTEST_OS_WINDOWS -// WindowsDeathTest implements death tests on Windows. Due to the -// specifics of starting new processes on Windows, death tests there are -// always threadsafe, and Google Test considers the -// --gtest_death_test_style=fast setting to be equivalent to -// --gtest_death_test_style=threadsafe there. -// -// A few implementation notes: Like the Linux version, the Windows -// implementation uses pipes for child-to-parent communication. But due to -// the specifics of pipes on Windows, some extra steps are required: -// -// 1. The parent creates a communication pipe and stores handles to both -// ends of it. -// 2. The parent starts the child and provides it with the information -// necessary to acquire the handle to the write end of the pipe. -// 3. The child acquires the write end of the pipe and signals the parent -// using a Windows event. -// 4. Now the parent can release the write end of the pipe on its side. If -// this is done before step 3, the object's reference count goes down to -// 0 and it is destroyed, preventing the child from acquiring it. The -// parent now has to release it, or read operations on the read end of -// the pipe will not return when the child terminates. -// 5. The parent reads child's output through the pipe (outcome code and -// any possible error messages) from the pipe, and its stderr and then -// determines whether to fail the test. -// -// Note: to distinguish Win32 API calls from the local method and function -// calls, the former are explicitly resolved in the global namespace. -// -class WindowsDeathTest : public DeathTestImpl { - public: - WindowsDeathTest(const char* a_statement, - const RE* a_regex, - const char* file, - int line) - : DeathTestImpl(a_statement, a_regex), file_(file), line_(line) {} - - // All of these virtual functions are inherited from DeathTest. - virtual int Wait(); - virtual TestRole AssumeRole(); - - private: - // The name of the file in which the death test is located. - const char* const file_; - // The line number on which the death test is located. - const int line_; - // Handle to the write end of the pipe to the child process. - AutoHandle write_handle_; - // Child process handle. - AutoHandle child_handle_; - // Event the child process uses to signal the parent that it has - // acquired the handle to the write end of the pipe. After seeing this - // event the parent can release its own handles to make sure its - // ReadFile() calls return when the child terminates. - AutoHandle event_handle_; -}; - -// Waits for the child in a death test to exit, returning its exit -// status, or 0 if no child process exists. As a side effect, sets the -// outcome data member. -int WindowsDeathTest::Wait() { - if (!spawned()) - return 0; - - // Wait until the child either signals that it has acquired the write end - // of the pipe or it dies. - const HANDLE wait_handles[2] = { child_handle_.Get(), event_handle_.Get() }; - switch (::WaitForMultipleObjects(2, - wait_handles, - FALSE, // Waits for any of the handles. - INFINITE)) { - case WAIT_OBJECT_0: - case WAIT_OBJECT_0 + 1: - break; - default: - GTEST_DEATH_TEST_CHECK_(false); // Should not get here. - } - - // The child has acquired the write end of the pipe or exited. - // We release the handle on our side and continue. - write_handle_.Reset(); - event_handle_.Reset(); - - ReadAndInterpretStatusByte(); - - // Waits for the child process to exit if it haven't already. This - // returns immediately if the child has already exited, regardless of - // whether previous calls to WaitForMultipleObjects synchronized on this - // handle or not. - GTEST_DEATH_TEST_CHECK_( - WAIT_OBJECT_0 == ::WaitForSingleObject(child_handle_.Get(), - INFINITE)); - DWORD status_code; - GTEST_DEATH_TEST_CHECK_( - ::GetExitCodeProcess(child_handle_.Get(), &status_code) != FALSE); - child_handle_.Reset(); - set_status(static_cast(status_code)); - return status(); -} - -// The AssumeRole process for a Windows death test. It creates a child -// process with the same executable as the current process to run the -// death test. The child process is given the --gtest_filter and -// --gtest_internal_run_death_test flags such that it knows to run the -// current death test only. -DeathTest::TestRole WindowsDeathTest::AssumeRole() { - const UnitTestImpl* const impl = GetUnitTestImpl(); - const InternalRunDeathTestFlag* const flag = - impl->internal_run_death_test_flag(); - const TestInfo* const info = impl->current_test_info(); - const int death_test_index = info->result()->death_test_count(); - - if (flag != NULL) { - // ParseInternalRunDeathTestFlag() has performed all the necessary - // processing. - set_write_fd(flag->write_fd()); - return EXECUTE_TEST; - } - - // WindowsDeathTest uses an anonymous pipe to communicate results of - // a death test. - SECURITY_ATTRIBUTES handles_are_inheritable = { - sizeof(SECURITY_ATTRIBUTES), NULL, TRUE }; - HANDLE read_handle, write_handle; - GTEST_DEATH_TEST_CHECK_( - ::CreatePipe(&read_handle, &write_handle, &handles_are_inheritable, - 0) // Default buffer size. - != FALSE); - set_read_fd(::_open_osfhandle(reinterpret_cast(read_handle), - O_RDONLY)); - write_handle_.Reset(write_handle); - event_handle_.Reset(::CreateEvent( - &handles_are_inheritable, - TRUE, // The event will automatically reset to non-signaled state. - FALSE, // The initial state is non-signalled. - NULL)); // The even is unnamed. - GTEST_DEATH_TEST_CHECK_(event_handle_.Get() != NULL); - const std::string filter_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" + - info->test_case_name() + "." + info->name(); - const std::string internal_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + - "=" + file_ + "|" + StreamableToString(line_) + "|" + - StreamableToString(death_test_index) + "|" + - StreamableToString(static_cast(::GetCurrentProcessId())) + - // size_t has the same width as pointers on both 32-bit and 64-bit - // Windows platforms. - // See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx. - "|" + StreamableToString(reinterpret_cast(write_handle)) + - "|" + StreamableToString(reinterpret_cast(event_handle_.Get())); - - char executable_path[_MAX_PATH + 1]; // NOLINT - GTEST_DEATH_TEST_CHECK_( - _MAX_PATH + 1 != ::GetModuleFileNameA(NULL, - executable_path, - _MAX_PATH)); - - std::string command_line = - std::string(::GetCommandLineA()) + " " + filter_flag + " \"" + - internal_flag + "\""; - - DeathTest::set_last_death_test_message(""); - - CaptureStderr(); - // Flush the log buffers since the log streams are shared with the child. - FlushInfoLog(); - - // The child process will share the standard handles with the parent. - STARTUPINFOA startup_info; - memset(&startup_info, 0, sizeof(STARTUPINFO)); - startup_info.dwFlags = STARTF_USESTDHANDLES; - startup_info.hStdInput = ::GetStdHandle(STD_INPUT_HANDLE); - startup_info.hStdOutput = ::GetStdHandle(STD_OUTPUT_HANDLE); - startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE); - - PROCESS_INFORMATION process_info; - GTEST_DEATH_TEST_CHECK_(::CreateProcessA( - executable_path, - const_cast(command_line.c_str()), - NULL, // Retuned process handle is not inheritable. - NULL, // Retuned thread handle is not inheritable. - TRUE, // Child inherits all inheritable handles (for write_handle_). - 0x0, // Default creation flags. - NULL, // Inherit the parent's environment. - UnitTest::GetInstance()->original_working_dir(), - &startup_info, - &process_info) != FALSE); - child_handle_.Reset(process_info.hProcess); - ::CloseHandle(process_info.hThread); - set_spawned(true); - return OVERSEE_TEST; -} - -# elif GTEST_OS_FUCHSIA - -class FuchsiaDeathTest : public DeathTestImpl { - public: - FuchsiaDeathTest(const char* a_statement, - const RE* a_regex, - const char* file, - int line) - : DeathTestImpl(a_statement, a_regex), file_(file), line_(line) {} - - // All of these virtual functions are inherited from DeathTest. - virtual int Wait(); - virtual TestRole AssumeRole(); - - private: - // The name of the file in which the death test is located. - const char* const file_; - // The line number on which the death test is located. - const int line_; - - zx_handle_t child_process_; -}; - -// Utility class for accumulating command-line arguments. -class Arguments { - public: - Arguments() { - args_.push_back(NULL); - } - - ~Arguments() { - for (std::vector::iterator i = args_.begin(); i != args_.end(); - ++i) { - free(*i); - } - } - void AddArgument(const char* argument) { - args_.insert(args_.end() - 1, posix::StrDup(argument)); - } - - template - void AddArguments(const ::std::vector& arguments) { - for (typename ::std::vector::const_iterator i = arguments.begin(); - i != arguments.end(); - ++i) { - args_.insert(args_.end() - 1, posix::StrDup(i->c_str())); - } - } - char* const* Argv() { - return &args_[0]; - } - - int size() { - return args_.size() - 1; - } - - private: - std::vector args_; -}; - -// Waits for the child in a death test to exit, returning its exit -// status, or 0 if no child process exists. As a side effect, sets the -// outcome data member. -int FuchsiaDeathTest::Wait() { - if (!spawned()) - return 0; - - // Wait for child process to terminate. - zx_status_t status_zx; - zx_signals_t signals; - status_zx = zx_object_wait_one( - child_process_, - ZX_PROCESS_TERMINATED, - ZX_TIME_INFINITE, - &signals); - GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK); - - ReadAndInterpretStatusByte(); - - zx_info_process_t buffer; - status_zx = zx_object_get_info( - child_process_, - ZX_INFO_PROCESS, - &buffer, - sizeof(buffer), - nullptr, - nullptr); - GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK); - - GTEST_DEATH_TEST_CHECK_(buffer.exited); - set_status(buffer.return_code); - return status(); -} - -// The AssumeRole process for a Fuchsia death test. It creates a child -// process with the same executable as the current process to run the -// death test. The child process is given the --gtest_filter and -// --gtest_internal_run_death_test flags such that it knows to run the -// current death test only. -DeathTest::TestRole FuchsiaDeathTest::AssumeRole() { - const UnitTestImpl* const impl = GetUnitTestImpl(); - const InternalRunDeathTestFlag* const flag = - impl->internal_run_death_test_flag(); - const TestInfo* const info = impl->current_test_info(); - const int death_test_index = info->result()->death_test_count(); - - if (flag != NULL) { - // ParseInternalRunDeathTestFlag() has performed all the necessary - // processing. - set_write_fd(kFuchsiaReadPipeFd); - return EXECUTE_TEST; - } - - CaptureStderr(); - // Flush the log buffers since the log streams are shared with the child. - FlushInfoLog(); - - // Build the child process command line. - const std::string filter_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" - + info->test_case_name() + "." + info->name(); - const std::string internal_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "=" - + file_ + "|" - + StreamableToString(line_) + "|" - + StreamableToString(death_test_index); - Arguments args; - args.AddArguments(GetInjectableArgvs()); - args.AddArgument(filter_flag.c_str()); - args.AddArgument(internal_flag.c_str()); - - // Build the child process launcher. - zx_status_t status; - launchpad_t* lp; - status = launchpad_create(ZX_HANDLE_INVALID, args.Argv()[0], &lp); - GTEST_DEATH_TEST_CHECK_(status == ZX_OK); - - // Build the pipe for communication with the child. - int read_fd; - status = launchpad_add_pipe(lp, &read_fd, kFuchsiaReadPipeFd); - GTEST_DEATH_TEST_CHECK_(status == ZX_OK); - set_read_fd(read_fd); - - // Set the command line arguments. - status = launchpad_load_from_file(lp, args.Argv()[0]); - GTEST_DEATH_TEST_CHECK_(status == ZX_OK); - status = launchpad_set_args(lp, args.size(), args.Argv()); - GTEST_DEATH_TEST_CHECK_(status == ZX_OK); - - // Clone all the things (environment, stdio, namespace, ...). - launchpad_clone(lp, LP_CLONE_ALL); - - // Launch the child process. - status = launchpad_go(lp, &child_process_, nullptr); - GTEST_DEATH_TEST_CHECK_(status == ZX_OK); - - set_spawned(true); - return OVERSEE_TEST; -} - -#else // We are neither on Windows, nor on Fuchsia. - -// ForkingDeathTest provides implementations for most of the abstract -// methods of the DeathTest interface. Only the AssumeRole method is -// left undefined. -class ForkingDeathTest : public DeathTestImpl { - public: - ForkingDeathTest(const char* statement, const RE* regex); - - // All of these virtual functions are inherited from DeathTest. - virtual int Wait(); - - protected: - void set_child_pid(pid_t child_pid) { child_pid_ = child_pid; } - - private: - // PID of child process during death test; 0 in the child process itself. - pid_t child_pid_; -}; - -// Constructs a ForkingDeathTest. -ForkingDeathTest::ForkingDeathTest(const char* a_statement, const RE* a_regex) - : DeathTestImpl(a_statement, a_regex), - child_pid_(-1) {} - -// Waits for the child in a death test to exit, returning its exit -// status, or 0 if no child process exists. As a side effect, sets the -// outcome data member. -int ForkingDeathTest::Wait() { - if (!spawned()) - return 0; - - ReadAndInterpretStatusByte(); - - int status_value; - GTEST_DEATH_TEST_CHECK_SYSCALL_(waitpid(child_pid_, &status_value, 0)); - set_status(status_value); - return status_value; -} - -// A concrete death test class that forks, then immediately runs the test -// in the child process. -class NoExecDeathTest : public ForkingDeathTest { - public: - NoExecDeathTest(const char* a_statement, const RE* a_regex) : - ForkingDeathTest(a_statement, a_regex) { } - virtual TestRole AssumeRole(); -}; - -// The AssumeRole process for a fork-and-run death test. It implements a -// straightforward fork, with a simple pipe to transmit the status byte. -DeathTest::TestRole NoExecDeathTest::AssumeRole() { - const size_t thread_count = GetThreadCount(); - if (thread_count != 1) { - GTEST_LOG_(WARNING) << DeathTestThreadWarning(thread_count); - } - - int pipe_fd[2]; - GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1); - - DeathTest::set_last_death_test_message(""); - CaptureStderr(); - // When we fork the process below, the log file buffers are copied, but the - // file descriptors are shared. We flush all log files here so that closing - // the file descriptors in the child process doesn't throw off the - // synchronization between descriptors and buffers in the parent process. - // This is as close to the fork as possible to avoid a race condition in case - // there are multiple threads running before the death test, and another - // thread writes to the log file. - FlushInfoLog(); - - const pid_t child_pid = fork(); - GTEST_DEATH_TEST_CHECK_(child_pid != -1); - set_child_pid(child_pid); - if (child_pid == 0) { - GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[0])); - set_write_fd(pipe_fd[1]); - // Redirects all logging to stderr in the child process to prevent - // concurrent writes to the log files. We capture stderr in the parent - // process and append the child process' output to a log. - LogToStderr(); - // Event forwarding to the listeners of event listener API mush be shut - // down in death test subprocesses. - GetUnitTestImpl()->listeners()->SuppressEventForwarding(); - g_in_fast_death_test_child = true; - return EXECUTE_TEST; - } else { - GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1])); - set_read_fd(pipe_fd[0]); - set_spawned(true); - return OVERSEE_TEST; - } -} - -// A concrete death test class that forks and re-executes the main -// program from the beginning, with command-line flags set that cause -// only this specific death test to be run. -class ExecDeathTest : public ForkingDeathTest { - public: - ExecDeathTest(const char* a_statement, const RE* a_regex, - const char* file, int line) : - ForkingDeathTest(a_statement, a_regex), file_(file), line_(line) { } - virtual TestRole AssumeRole(); - private: - static ::std::vector GetArgvsForDeathTestChildProcess() { - ::std::vector args = GetInjectableArgvs(); -# if defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_) - ::std::vector extra_args = - GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_(); - args.insert(args.end(), extra_args.begin(), extra_args.end()); -# endif // defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_) - return args; - } - // The name of the file in which the death test is located. - const char* const file_; - // The line number on which the death test is located. - const int line_; -}; - -// Utility class for accumulating command-line arguments. -class Arguments { - public: - Arguments() { - args_.push_back(NULL); - } - - ~Arguments() { - for (std::vector::iterator i = args_.begin(); i != args_.end(); - ++i) { - free(*i); - } - } - void AddArgument(const char* argument) { - args_.insert(args_.end() - 1, posix::StrDup(argument)); - } - - template - void AddArguments(const ::std::vector& arguments) { - for (typename ::std::vector::const_iterator i = arguments.begin(); - i != arguments.end(); - ++i) { - args_.insert(args_.end() - 1, posix::StrDup(i->c_str())); - } - } - char* const* Argv() { - return &args_[0]; - } - - private: - std::vector args_; -}; - -// A struct that encompasses the arguments to the child process of a -// threadsafe-style death test process. -struct ExecDeathTestArgs { - char* const* argv; // Command-line arguments for the child's call to exec - int close_fd; // File descriptor to close; the read end of a pipe -}; - -# if GTEST_OS_MAC -inline char** GetEnviron() { - // When Google Test is built as a framework on MacOS X, the environ variable - // is unavailable. Apple's documentation (man environ) recommends using - // _NSGetEnviron() instead. - return *_NSGetEnviron(); -} -# else -// Some POSIX platforms expect you to declare environ. extern "C" makes -// it reside in the global namespace. -extern "C" char** environ; -inline char** GetEnviron() { return environ; } -# endif // GTEST_OS_MAC - -# if !GTEST_OS_QNX -// The main function for a threadsafe-style death test child process. -// This function is called in a clone()-ed process and thus must avoid -// any potentially unsafe operations like malloc or libc functions. -static int ExecDeathTestChildMain(void* child_arg) { - ExecDeathTestArgs* const args = static_cast(child_arg); - GTEST_DEATH_TEST_CHECK_SYSCALL_(close(args->close_fd)); - - // We need to execute the test program in the same environment where - // it was originally invoked. Therefore we change to the original - // working directory first. - const char* const original_dir = - UnitTest::GetInstance()->original_working_dir(); - // We can safely call chdir() as it's a direct system call. - if (chdir(original_dir) != 0) { - DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " + - GetLastErrnoDescription()); - return EXIT_FAILURE; - } - - // We can safely call execve() as it's a direct system call. We - // cannot use execvp() as it's a libc function and thus potentially - // unsafe. Since execve() doesn't search the PATH, the user must - // invoke the test program via a valid path that contains at least - // one path separator. - execve(args->argv[0], args->argv, GetEnviron()); - DeathTestAbort(std::string("execve(") + args->argv[0] + ", ...) in " + - original_dir + " failed: " + - GetLastErrnoDescription()); - return EXIT_FAILURE; -} -# endif // !GTEST_OS_QNX - -# if GTEST_HAS_CLONE -// Two utility routines that together determine the direction the stack -// grows. -// This could be accomplished more elegantly by a single recursive -// function, but we want to guard against the unlikely possibility of -// a smart compiler optimizing the recursion away. -// -// GTEST_NO_INLINE_ is required to prevent GCC 4.6 from inlining -// StackLowerThanAddress into StackGrowsDown, which then doesn't give -// correct answer. -static void StackLowerThanAddress(const void* ptr, - bool* result) GTEST_NO_INLINE_; -static void StackLowerThanAddress(const void* ptr, bool* result) { - int dummy; - *result = (&dummy < ptr); -} - -// Make sure AddressSanitizer does not tamper with the stack here. -GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ -static bool StackGrowsDown() { - int dummy; - bool result; - StackLowerThanAddress(&dummy, &result); - return result; -} -# endif // GTEST_HAS_CLONE - -// Spawns a child process with the same executable as the current process in -// a thread-safe manner and instructs it to run the death test. The -// implementation uses fork(2) + exec. On systems where clone(2) is -// available, it is used instead, being slightly more thread-safe. On QNX, -// fork supports only single-threaded environments, so this function uses -// spawn(2) there instead. The function dies with an error message if -// anything goes wrong. -static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) { - ExecDeathTestArgs args = { argv, close_fd }; - pid_t child_pid = -1; - -# if GTEST_OS_QNX - // Obtains the current directory and sets it to be closed in the child - // process. - const int cwd_fd = open(".", O_RDONLY); - GTEST_DEATH_TEST_CHECK_(cwd_fd != -1); - GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(cwd_fd, F_SETFD, FD_CLOEXEC)); - // We need to execute the test program in the same environment where - // it was originally invoked. Therefore we change to the original - // working directory first. - const char* const original_dir = - UnitTest::GetInstance()->original_working_dir(); - // We can safely call chdir() as it's a direct system call. - if (chdir(original_dir) != 0) { - DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " + - GetLastErrnoDescription()); - return EXIT_FAILURE; - } - - int fd_flags; - // Set close_fd to be closed after spawn. - GTEST_DEATH_TEST_CHECK_SYSCALL_(fd_flags = fcntl(close_fd, F_GETFD)); - GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(close_fd, F_SETFD, - fd_flags | FD_CLOEXEC)); - struct inheritance inherit = {0}; - // spawn is a system call. - child_pid = spawn(args.argv[0], 0, NULL, &inherit, args.argv, GetEnviron()); - // Restores the current working directory. - GTEST_DEATH_TEST_CHECK_(fchdir(cwd_fd) != -1); - GTEST_DEATH_TEST_CHECK_SYSCALL_(close(cwd_fd)); - -# else // GTEST_OS_QNX -# if GTEST_OS_LINUX - // When a SIGPROF signal is received while fork() or clone() are executing, - // the process may hang. To avoid this, we ignore SIGPROF here and re-enable - // it after the call to fork()/clone() is complete. - struct sigaction saved_sigprof_action; - struct sigaction ignore_sigprof_action; - memset(&ignore_sigprof_action, 0, sizeof(ignore_sigprof_action)); - sigemptyset(&ignore_sigprof_action.sa_mask); - ignore_sigprof_action.sa_handler = SIG_IGN; - GTEST_DEATH_TEST_CHECK_SYSCALL_(sigaction( - SIGPROF, &ignore_sigprof_action, &saved_sigprof_action)); -# endif // GTEST_OS_LINUX - -# if GTEST_HAS_CLONE - const bool use_fork = GTEST_FLAG(death_test_use_fork); - - if (!use_fork) { - static const bool stack_grows_down = StackGrowsDown(); - const size_t stack_size = getpagesize(); - // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead. - void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE, - MAP_ANON | MAP_PRIVATE, -1, 0); - GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED); - - // Maximum stack alignment in bytes: For a downward-growing stack, this - // amount is subtracted from size of the stack space to get an address - // that is within the stack space and is aligned on all systems we care - // about. As far as I know there is no ABI with stack alignment greater - // than 64. We assume stack and stack_size already have alignment of - // kMaxStackAlignment. - const size_t kMaxStackAlignment = 64; - void* const stack_top = - static_cast(stack) + - (stack_grows_down ? stack_size - kMaxStackAlignment : 0); - GTEST_DEATH_TEST_CHECK_(stack_size > kMaxStackAlignment && - reinterpret_cast(stack_top) % kMaxStackAlignment == 0); - - child_pid = clone(&ExecDeathTestChildMain, stack_top, SIGCHLD, &args); - - GTEST_DEATH_TEST_CHECK_(munmap(stack, stack_size) != -1); - } -# else - const bool use_fork = true; -# endif // GTEST_HAS_CLONE - - if (use_fork && (child_pid = fork()) == 0) { - ExecDeathTestChildMain(&args); - _exit(0); - } -# endif // GTEST_OS_QNX -# if GTEST_OS_LINUX - GTEST_DEATH_TEST_CHECK_SYSCALL_( - sigaction(SIGPROF, &saved_sigprof_action, NULL)); -# endif // GTEST_OS_LINUX - - GTEST_DEATH_TEST_CHECK_(child_pid != -1); - return child_pid; -} - -// The AssumeRole process for a fork-and-exec death test. It re-executes the -// main program from the beginning, setting the --gtest_filter -// and --gtest_internal_run_death_test flags to cause only the current -// death test to be re-run. -DeathTest::TestRole ExecDeathTest::AssumeRole() { - const UnitTestImpl* const impl = GetUnitTestImpl(); - const InternalRunDeathTestFlag* const flag = - impl->internal_run_death_test_flag(); - const TestInfo* const info = impl->current_test_info(); - const int death_test_index = info->result()->death_test_count(); - - if (flag != NULL) { - set_write_fd(flag->write_fd()); - return EXECUTE_TEST; - } - - int pipe_fd[2]; - GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1); - // Clear the close-on-exec flag on the write end of the pipe, lest - // it be closed when the child process does an exec: - GTEST_DEATH_TEST_CHECK_(fcntl(pipe_fd[1], F_SETFD, 0) != -1); - - const std::string filter_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" - + info->test_case_name() + "." + info->name(); - const std::string internal_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "=" - + file_ + "|" + StreamableToString(line_) + "|" - + StreamableToString(death_test_index) + "|" - + StreamableToString(pipe_fd[1]); - Arguments args; - args.AddArguments(GetArgvsForDeathTestChildProcess()); - args.AddArgument(filter_flag.c_str()); - args.AddArgument(internal_flag.c_str()); - - DeathTest::set_last_death_test_message(""); - - CaptureStderr(); - // See the comment in NoExecDeathTest::AssumeRole for why the next line - // is necessary. - FlushInfoLog(); - - const pid_t child_pid = ExecDeathTestSpawnChild(args.Argv(), pipe_fd[0]); - GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1])); - set_child_pid(child_pid); - set_read_fd(pipe_fd[0]); - set_spawned(true); - return OVERSEE_TEST; -} - -# endif // !GTEST_OS_WINDOWS - -// Creates a concrete DeathTest-derived class that depends on the -// --gtest_death_test_style flag, and sets the pointer pointed to -// by the "test" argument to its address. If the test should be -// skipped, sets that pointer to NULL. Returns true, unless the -// flag is set to an invalid value. -bool DefaultDeathTestFactory::Create(const char* statement, const RE* regex, - const char* file, int line, - DeathTest** test) { - UnitTestImpl* const impl = GetUnitTestImpl(); - const InternalRunDeathTestFlag* const flag = - impl->internal_run_death_test_flag(); - const int death_test_index = impl->current_test_info() - ->increment_death_test_count(); - - if (flag != NULL) { - if (death_test_index > flag->index()) { - DeathTest::set_last_death_test_message( - "Death test count (" + StreamableToString(death_test_index) - + ") somehow exceeded expected maximum (" - + StreamableToString(flag->index()) + ")"); - return false; - } - - if (!(flag->file() == file && flag->line() == line && - flag->index() == death_test_index)) { - *test = NULL; - return true; - } - } - -# if GTEST_OS_WINDOWS - - if (GTEST_FLAG(death_test_style) == "threadsafe" || - GTEST_FLAG(death_test_style) == "fast") { - *test = new WindowsDeathTest(statement, regex, file, line); - } - -# elif GTEST_OS_FUCHSIA - - if (GTEST_FLAG(death_test_style) == "threadsafe" || - GTEST_FLAG(death_test_style) == "fast") { - *test = new FuchsiaDeathTest(statement, regex, file, line); - } - -# else - - if (GTEST_FLAG(death_test_style) == "threadsafe") { - *test = new ExecDeathTest(statement, regex, file, line); - } else if (GTEST_FLAG(death_test_style) == "fast") { - *test = new NoExecDeathTest(statement, regex); - } - -# endif // GTEST_OS_WINDOWS - - else { // NOLINT - this is more readable than unbalanced brackets inside #if. - DeathTest::set_last_death_test_message( - "Unknown death test style \"" + GTEST_FLAG(death_test_style) - + "\" encountered"); - return false; - } - - return true; -} - -# if GTEST_OS_WINDOWS -// Recreates the pipe and event handles from the provided parameters, -// signals the event, and returns a file descriptor wrapped around the pipe -// handle. This function is called in the child process only. -static int GetStatusFileDescriptor(unsigned int parent_process_id, - size_t write_handle_as_size_t, - size_t event_handle_as_size_t) { - AutoHandle parent_process_handle(::OpenProcess(PROCESS_DUP_HANDLE, - FALSE, // Non-inheritable. - parent_process_id)); - if (parent_process_handle.Get() == INVALID_HANDLE_VALUE) { - DeathTestAbort("Unable to open parent process " + - StreamableToString(parent_process_id)); - } - - // TODO(vladl@google.com): Replace the following check with a - // compile-time assertion when available. - GTEST_CHECK_(sizeof(HANDLE) <= sizeof(size_t)); - - const HANDLE write_handle = - reinterpret_cast(write_handle_as_size_t); - HANDLE dup_write_handle; - - // The newly initialized handle is accessible only in the parent - // process. To obtain one accessible within the child, we need to use - // DuplicateHandle. - if (!::DuplicateHandle(parent_process_handle.Get(), write_handle, - ::GetCurrentProcess(), &dup_write_handle, - 0x0, // Requested privileges ignored since - // DUPLICATE_SAME_ACCESS is used. - FALSE, // Request non-inheritable handler. - DUPLICATE_SAME_ACCESS)) { - DeathTestAbort("Unable to duplicate the pipe handle " + - StreamableToString(write_handle_as_size_t) + - " from the parent process " + - StreamableToString(parent_process_id)); - } - - const HANDLE event_handle = reinterpret_cast(event_handle_as_size_t); - HANDLE dup_event_handle; - - if (!::DuplicateHandle(parent_process_handle.Get(), event_handle, - ::GetCurrentProcess(), &dup_event_handle, - 0x0, - FALSE, - DUPLICATE_SAME_ACCESS)) { - DeathTestAbort("Unable to duplicate the event handle " + - StreamableToString(event_handle_as_size_t) + - " from the parent process " + - StreamableToString(parent_process_id)); - } - - const int write_fd = - ::_open_osfhandle(reinterpret_cast(dup_write_handle), O_APPEND); - if (write_fd == -1) { - DeathTestAbort("Unable to convert pipe handle " + - StreamableToString(write_handle_as_size_t) + - " to a file descriptor"); - } - - // Signals the parent that the write end of the pipe has been acquired - // so the parent can release its own write end. - ::SetEvent(dup_event_handle); - - return write_fd; -} -# endif // GTEST_OS_WINDOWS - -// Returns a newly created InternalRunDeathTestFlag object with fields -// initialized from the GTEST_FLAG(internal_run_death_test) flag if -// the flag is specified; otherwise returns NULL. -InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() { - if (GTEST_FLAG(internal_run_death_test) == "") return NULL; - - // GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we - // can use it here. - int line = -1; - int index = -1; - ::std::vector< ::std::string> fields; - SplitString(GTEST_FLAG(internal_run_death_test).c_str(), '|', &fields); - int write_fd = -1; - -# if GTEST_OS_WINDOWS - - unsigned int parent_process_id = 0; - size_t write_handle_as_size_t = 0; - size_t event_handle_as_size_t = 0; - - if (fields.size() != 6 - || !ParseNaturalNumber(fields[1], &line) - || !ParseNaturalNumber(fields[2], &index) - || !ParseNaturalNumber(fields[3], &parent_process_id) - || !ParseNaturalNumber(fields[4], &write_handle_as_size_t) - || !ParseNaturalNumber(fields[5], &event_handle_as_size_t)) { - DeathTestAbort("Bad --gtest_internal_run_death_test flag: " + - GTEST_FLAG(internal_run_death_test)); - } - write_fd = GetStatusFileDescriptor(parent_process_id, - write_handle_as_size_t, - event_handle_as_size_t); - -# elif GTEST_OS_FUCHSIA - - if (fields.size() != 3 - || !ParseNaturalNumber(fields[1], &line) - || !ParseNaturalNumber(fields[2], &index)) { - DeathTestAbort("Bad --gtest_internal_run_death_test flag: " - + GTEST_FLAG(internal_run_death_test)); - } - -# else - - if (fields.size() != 4 - || !ParseNaturalNumber(fields[1], &line) - || !ParseNaturalNumber(fields[2], &index) - || !ParseNaturalNumber(fields[3], &write_fd)) { - DeathTestAbort("Bad --gtest_internal_run_death_test flag: " - + GTEST_FLAG(internal_run_death_test)); - } - -# endif // GTEST_OS_WINDOWS - - return new InternalRunDeathTestFlag(fields[0], line, index, write_fd); -} - -} // namespace internal - -#endif // GTEST_HAS_DEATH_TEST - -} // namespace testing diff --git a/test/gtest-1.8.0/src/gtest-filepath.cc b/test/gtest-1.8.0/src/gtest-filepath.cc deleted file mode 100644 index 6b76ea0f37..0000000000 --- a/test/gtest-1.8.0/src/gtest-filepath.cc +++ /dev/null @@ -1,385 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#include "gtest/internal/gtest-filepath.h" - -#include -#include "gtest/internal/gtest-port.h" -#include "gtest/gtest-message.h" - -#if GTEST_OS_WINDOWS_MOBILE -# include -#elif GTEST_OS_WINDOWS -# include -# include -#elif GTEST_OS_SYMBIAN -// Symbian OpenC has PATH_MAX in sys/syslimits.h -# include -#else -# include -# include // Some Linux distributions define PATH_MAX here. -#endif // GTEST_OS_WINDOWS_MOBILE - -#include "gtest/internal/gtest-string.h" - -#if GTEST_OS_WINDOWS -# define GTEST_PATH_MAX_ _MAX_PATH -#elif defined(PATH_MAX) -# define GTEST_PATH_MAX_ PATH_MAX -#elif defined(_XOPEN_PATH_MAX) -# define GTEST_PATH_MAX_ _XOPEN_PATH_MAX -#else -# define GTEST_PATH_MAX_ _POSIX_PATH_MAX -#endif // GTEST_OS_WINDOWS - -namespace testing { -namespace internal { - -#if GTEST_OS_WINDOWS -// On Windows, '\\' is the standard path separator, but many tools and the -// Windows API also accept '/' as an alternate path separator. Unless otherwise -// noted, a file path can contain either kind of path separators, or a mixture -// of them. -const char kPathSeparator = '\\'; -const char kAlternatePathSeparator = '/'; -const char kAlternatePathSeparatorString[] = "/"; -# if GTEST_OS_WINDOWS_MOBILE -// Windows CE doesn't have a current directory. You should not use -// the current directory in tests on Windows CE, but this at least -// provides a reasonable fallback. -const char kCurrentDirectoryString[] = "\\"; -// Windows CE doesn't define INVALID_FILE_ATTRIBUTES -const DWORD kInvalidFileAttributes = 0xffffffff; -# else -const char kCurrentDirectoryString[] = ".\\"; -# endif // GTEST_OS_WINDOWS_MOBILE -#else -const char kPathSeparator = '/'; -const char kCurrentDirectoryString[] = "./"; -#endif // GTEST_OS_WINDOWS - -// Returns whether the given character is a valid path separator. -static bool IsPathSeparator(char c) { -#if GTEST_HAS_ALT_PATH_SEP_ - return (c == kPathSeparator) || (c == kAlternatePathSeparator); -#else - return c == kPathSeparator; -#endif -} - -// Returns the current working directory, or "" if unsuccessful. -FilePath FilePath::GetCurrentDir() { -#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT - // Windows CE doesn't have a current directory, so we just return - // something reasonable. - return FilePath(kCurrentDirectoryString); -#elif GTEST_OS_WINDOWS - char cwd[GTEST_PATH_MAX_ + 1] = { '\0' }; - return FilePath(_getcwd(cwd, sizeof(cwd)) == NULL ? "" : cwd); -#else - char cwd[GTEST_PATH_MAX_ + 1] = { '\0' }; - char* result = getcwd(cwd, sizeof(cwd)); -# if GTEST_OS_NACL - // getcwd will likely fail in NaCl due to the sandbox, so return something - // reasonable. The user may have provided a shim implementation for getcwd, - // however, so fallback only when failure is detected. - return FilePath(result == NULL ? kCurrentDirectoryString : cwd); -# endif // GTEST_OS_NACL - return FilePath(result == NULL ? "" : cwd); -#endif // GTEST_OS_WINDOWS_MOBILE -} - -// Returns a copy of the FilePath with the case-insensitive extension removed. -// Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns -// FilePath("dir/file"). If a case-insensitive extension is not -// found, returns a copy of the original FilePath. -FilePath FilePath::RemoveExtension(const char* extension) const { - const std::string dot_extension = std::string(".") + extension; - if (String::EndsWithCaseInsensitive(pathname_, dot_extension)) { - return FilePath(pathname_.substr( - 0, pathname_.length() - dot_extension.length())); - } - return *this; -} - -// Returns a pointer to the last occurrence of a valid path separator in -// the FilePath. On Windows, for example, both '/' and '\' are valid path -// separators. Returns NULL if no path separator was found. -const char* FilePath::FindLastPathSeparator() const { - const char* const last_sep = strrchr(c_str(), kPathSeparator); -#if GTEST_HAS_ALT_PATH_SEP_ - const char* const last_alt_sep = strrchr(c_str(), kAlternatePathSeparator); - // Comparing two pointers of which only one is NULL is undefined. - if (last_alt_sep != NULL && - (last_sep == NULL || last_alt_sep > last_sep)) { - return last_alt_sep; - } -#endif - return last_sep; -} - -// Returns a copy of the FilePath with the directory part removed. -// Example: FilePath("path/to/file").RemoveDirectoryName() returns -// FilePath("file"). If there is no directory part ("just_a_file"), it returns -// the FilePath unmodified. If there is no file part ("just_a_dir/") it -// returns an empty FilePath (""). -// On Windows platform, '\' is the path separator, otherwise it is '/'. -FilePath FilePath::RemoveDirectoryName() const { - const char* const last_sep = FindLastPathSeparator(); - return last_sep ? FilePath(last_sep + 1) : *this; -} - -// RemoveFileName returns the directory path with the filename removed. -// Example: FilePath("path/to/file").RemoveFileName() returns "path/to/". -// If the FilePath is "a_file" or "/a_file", RemoveFileName returns -// FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does -// not have a file, like "just/a/dir/", it returns the FilePath unmodified. -// On Windows platform, '\' is the path separator, otherwise it is '/'. -FilePath FilePath::RemoveFileName() const { - const char* const last_sep = FindLastPathSeparator(); - std::string dir; - if (last_sep) { - dir = std::string(c_str(), last_sep + 1 - c_str()); - } else { - dir = kCurrentDirectoryString; - } - return FilePath(dir); -} - -// Helper functions for naming files in a directory for xml output. - -// Given directory = "dir", base_name = "test", number = 0, -// extension = "xml", returns "dir/test.xml". If number is greater -// than zero (e.g., 12), returns "dir/test_12.xml". -// On Windows platform, uses \ as the separator rather than /. -FilePath FilePath::MakeFileName(const FilePath& directory, - const FilePath& base_name, - int number, - const char* extension) { - std::string file; - if (number == 0) { - file = base_name.string() + "." + extension; - } else { - file = base_name.string() + "_" + StreamableToString(number) - + "." + extension; - } - return ConcatPaths(directory, FilePath(file)); -} - -// Given directory = "dir", relative_path = "test.xml", returns "dir/test.xml". -// On Windows, uses \ as the separator rather than /. -FilePath FilePath::ConcatPaths(const FilePath& directory, - const FilePath& relative_path) { - if (directory.IsEmpty()) - return relative_path; - const FilePath dir(directory.RemoveTrailingPathSeparator()); - return FilePath(dir.string() + kPathSeparator + relative_path.string()); -} - -// Returns true if pathname describes something findable in the file-system, -// either a file, directory, or whatever. -bool FilePath::FileOrDirectoryExists() const { -#if GTEST_OS_WINDOWS_MOBILE - LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str()); - const DWORD attributes = GetFileAttributes(unicode); - delete [] unicode; - return attributes != kInvalidFileAttributes; -#else - posix::StatStruct file_stat; - return posix::Stat(pathname_.c_str(), &file_stat) == 0; -#endif // GTEST_OS_WINDOWS_MOBILE -} - -// Returns true if pathname describes a directory in the file-system -// that exists. -bool FilePath::DirectoryExists() const { - bool result = false; -#if GTEST_OS_WINDOWS - // Don't strip off trailing separator if path is a root directory on - // Windows (like "C:\\"). - const FilePath& path(IsRootDirectory() ? *this : - RemoveTrailingPathSeparator()); -#else - const FilePath& path(*this); -#endif - -#if GTEST_OS_WINDOWS_MOBILE - LPCWSTR unicode = String::AnsiToUtf16(path.c_str()); - const DWORD attributes = GetFileAttributes(unicode); - delete [] unicode; - if ((attributes != kInvalidFileAttributes) && - (attributes & FILE_ATTRIBUTE_DIRECTORY)) { - result = true; - } -#else - posix::StatStruct file_stat; - result = posix::Stat(path.c_str(), &file_stat) == 0 && - posix::IsDir(file_stat); -#endif // GTEST_OS_WINDOWS_MOBILE - - return result; -} - -// Returns true if pathname describes a root directory. (Windows has one -// root directory per disk drive.) -bool FilePath::IsRootDirectory() const { -#if GTEST_OS_WINDOWS - // TODO(wan@google.com): on Windows a network share like - // \\server\share can be a root directory, although it cannot be the - // current directory. Handle this properly. - return pathname_.length() == 3 && IsAbsolutePath(); -#else - return pathname_.length() == 1 && IsPathSeparator(pathname_.c_str()[0]); -#endif -} - -// Returns true if pathname describes an absolute path. -bool FilePath::IsAbsolutePath() const { - const char* const name = pathname_.c_str(); -#if GTEST_OS_WINDOWS - return pathname_.length() >= 3 && - ((name[0] >= 'a' && name[0] <= 'z') || - (name[0] >= 'A' && name[0] <= 'Z')) && - name[1] == ':' && - IsPathSeparator(name[2]); -#else - return IsPathSeparator(name[0]); -#endif -} - -// Returns a pathname for a file that does not currently exist. The pathname -// will be directory/base_name.extension or -// directory/base_name_.extension if directory/base_name.extension -// already exists. The number will be incremented until a pathname is found -// that does not already exist. -// Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'. -// There could be a race condition if two or more processes are calling this -// function at the same time -- they could both pick the same filename. -FilePath FilePath::GenerateUniqueFileName(const FilePath& directory, - const FilePath& base_name, - const char* extension) { - FilePath full_pathname; - int number = 0; - do { - full_pathname.Set(MakeFileName(directory, base_name, number++, extension)); - } while (full_pathname.FileOrDirectoryExists()); - return full_pathname; -} - -// Returns true if FilePath ends with a path separator, which indicates that -// it is intended to represent a directory. Returns false otherwise. -// This does NOT check that a directory (or file) actually exists. -bool FilePath::IsDirectory() const { - return !pathname_.empty() && - IsPathSeparator(pathname_.c_str()[pathname_.length() - 1]); -} - -// Create directories so that path exists. Returns true if successful or if -// the directories already exist; returns false if unable to create directories -// for any reason. -bool FilePath::CreateDirectoriesRecursively() const { - if (!this->IsDirectory()) { - return false; - } - - if (pathname_.length() == 0 || this->DirectoryExists()) { - return true; - } - - const FilePath parent(this->RemoveTrailingPathSeparator().RemoveFileName()); - return parent.CreateDirectoriesRecursively() && this->CreateFolder(); -} - -// Create the directory so that path exists. Returns true if successful or -// if the directory already exists; returns false if unable to create the -// directory for any reason, including if the parent directory does not -// exist. Not named "CreateDirectory" because that's a macro on Windows. -bool FilePath::CreateFolder() const { -#if GTEST_OS_WINDOWS_MOBILE - FilePath removed_sep(this->RemoveTrailingPathSeparator()); - LPCWSTR unicode = String::AnsiToUtf16(removed_sep.c_str()); - int result = CreateDirectory(unicode, NULL) ? 0 : -1; - delete [] unicode; -#elif GTEST_OS_WINDOWS - int result = _mkdir(pathname_.c_str()); -#else - int result = mkdir(pathname_.c_str(), 0777); -#endif // GTEST_OS_WINDOWS_MOBILE - - if (result == -1) { - return this->DirectoryExists(); // An error is OK if the directory exists. - } - return true; // No error. -} - -// If input name has a trailing separator character, remove it and return the -// name, otherwise return the name string unmodified. -// On Windows platform, uses \ as the separator, other platforms use /. -FilePath FilePath::RemoveTrailingPathSeparator() const { - return IsDirectory() - ? FilePath(pathname_.substr(0, pathname_.length() - 1)) - : *this; -} - -// Removes any redundant separators that might be in the pathname. -// For example, "bar///foo" becomes "bar/foo". Does not eliminate other -// redundancies that might be in a pathname involving "." or "..". -// TODO(wan@google.com): handle Windows network shares (e.g. \\server\share). -void FilePath::Normalize() { - if (pathname_.c_str() == NULL) { - pathname_ = ""; - return; - } - const char* src = pathname_.c_str(); - char* const dest = new char[pathname_.length() + 1]; - char* dest_ptr = dest; - memset(dest_ptr, 0, pathname_.length() + 1); - - while (*src != '\0') { - *dest_ptr = *src; - if (!IsPathSeparator(*src)) { - src++; - } else { -#if GTEST_HAS_ALT_PATH_SEP_ - if (*dest_ptr == kAlternatePathSeparator) { - *dest_ptr = kPathSeparator; - } -#endif - while (IsPathSeparator(*src)) - src++; - } - dest_ptr++; - } - *dest_ptr = '\0'; - pathname_ = dest; - delete[] dest; -} - -} // namespace internal -} // namespace testing diff --git a/test/gtest-1.8.0/src/gtest-internal-inl.h b/test/gtest-1.8.0/src/gtest-internal-inl.h deleted file mode 100644 index e77c8b6caf..0000000000 --- a/test/gtest-1.8.0/src/gtest-internal-inl.h +++ /dev/null @@ -1,1175 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Utility functions and classes used by the Google C++ testing framework. -// -// Author: wan@google.com (Zhanyong Wan) -// -// This file contains purely Google Test's internal implementation. Please -// DO NOT #INCLUDE IT IN A USER PROGRAM. - -#ifndef GTEST_SRC_GTEST_INTERNAL_INL_H_ -#define GTEST_SRC_GTEST_INTERNAL_INL_H_ - -#ifndef _WIN32_WCE -# include -#endif // !_WIN32_WCE -#include -#include // For strtoll/_strtoul64/malloc/free. -#include // For memmove. - -#include -#include -#include - -#include "gtest/internal/gtest-port.h" - -#if GTEST_CAN_STREAM_RESULTS_ -# include // NOLINT -# include // NOLINT -#endif - -#if GTEST_OS_WINDOWS -# include // NOLINT -#endif // GTEST_OS_WINDOWS - -#include "gtest/gtest.h" -#include "gtest/gtest-spi.h" - -namespace testing { - -// Declares the flags. -// -// We don't want the users to modify this flag in the code, but want -// Google Test's own unit tests to be able to access it. Therefore we -// declare it here as opposed to in gtest.h. -GTEST_DECLARE_bool_(death_test_use_fork); - -namespace internal { - -// The value of GetTestTypeId() as seen from within the Google Test -// library. This is solely for testing GetTestTypeId(). -GTEST_API_ extern const TypeId kTestTypeIdInGoogleTest; - -// Names of the flags (needed for parsing Google Test flags). -const char kAlsoRunDisabledTestsFlag[] = "also_run_disabled_tests"; -const char kBreakOnFailureFlag[] = "break_on_failure"; -const char kCatchExceptionsFlag[] = "catch_exceptions"; -const char kColorFlag[] = "color"; -const char kFilterFlag[] = "filter"; -const char kListTestsFlag[] = "list_tests"; -const char kOutputFlag[] = "output"; -const char kPrintTimeFlag[] = "print_time"; -const char kPrintUTF8Flag[] = "print_utf8"; -const char kRandomSeedFlag[] = "random_seed"; -const char kRepeatFlag[] = "repeat"; -const char kShuffleFlag[] = "shuffle"; -const char kStackTraceDepthFlag[] = "stack_trace_depth"; -const char kStreamResultToFlag[] = "stream_result_to"; -const char kThrowOnFailureFlag[] = "throw_on_failure"; -const char kFlagfileFlag[] = "flagfile"; - -// A valid random seed must be in [1, kMaxRandomSeed]. -const int kMaxRandomSeed = 99999; - -// g_help_flag is true iff the --help flag or an equivalent form is -// specified on the command line. -GTEST_API_ extern bool g_help_flag; - -// Returns the current time in milliseconds. -GTEST_API_ TimeInMillis GetTimeInMillis(); - -// Returns true iff Google Test should use colors in the output. -GTEST_API_ bool ShouldUseColor(bool stdout_is_tty); - -// Formats the given time in milliseconds as seconds. -GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms); - -// Converts the given time in milliseconds to a date string in the ISO 8601 -// format, without the timezone information. N.B.: due to the use the -// non-reentrant localtime() function, this function is not thread safe. Do -// not use it in any code that can be called from multiple threads. -GTEST_API_ std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms); - -// Parses a string for an Int32 flag, in the form of "--flag=value". -// -// On success, stores the value of the flag in *value, and returns -// true. On failure, returns false without changing *value. -GTEST_API_ bool ParseInt32Flag( - const char* str, const char* flag, Int32* value); - -// Returns a random seed in range [1, kMaxRandomSeed] based on the -// given --gtest_random_seed flag value. -inline int GetRandomSeedFromFlag(Int32 random_seed_flag) { - const unsigned int raw_seed = (random_seed_flag == 0) ? - static_cast(GetTimeInMillis()) : - static_cast(random_seed_flag); - - // Normalizes the actual seed to range [1, kMaxRandomSeed] such that - // it's easy to type. - const int normalized_seed = - static_cast((raw_seed - 1U) % - static_cast(kMaxRandomSeed)) + 1; - return normalized_seed; -} - -// Returns the first valid random seed after 'seed'. The behavior is -// undefined if 'seed' is invalid. The seed after kMaxRandomSeed is -// considered to be 1. -inline int GetNextRandomSeed(int seed) { - GTEST_CHECK_(1 <= seed && seed <= kMaxRandomSeed) - << "Invalid random seed " << seed << " - must be in [1, " - << kMaxRandomSeed << "]."; - const int next_seed = seed + 1; - return (next_seed > kMaxRandomSeed) ? 1 : next_seed; -} - -// This class saves the values of all Google Test flags in its c'tor, and -// restores them in its d'tor. -class GTestFlagSaver { - public: - // The c'tor. - GTestFlagSaver() { - also_run_disabled_tests_ = GTEST_FLAG(also_run_disabled_tests); - break_on_failure_ = GTEST_FLAG(break_on_failure); - catch_exceptions_ = GTEST_FLAG(catch_exceptions); - color_ = GTEST_FLAG(color); - death_test_style_ = GTEST_FLAG(death_test_style); - death_test_use_fork_ = GTEST_FLAG(death_test_use_fork); - filter_ = GTEST_FLAG(filter); - internal_run_death_test_ = GTEST_FLAG(internal_run_death_test); - list_tests_ = GTEST_FLAG(list_tests); - output_ = GTEST_FLAG(output); - print_time_ = GTEST_FLAG(print_time); - print_utf8_ = GTEST_FLAG(print_utf8); - random_seed_ = GTEST_FLAG(random_seed); - repeat_ = GTEST_FLAG(repeat); - shuffle_ = GTEST_FLAG(shuffle); - stack_trace_depth_ = GTEST_FLAG(stack_trace_depth); - stream_result_to_ = GTEST_FLAG(stream_result_to); - throw_on_failure_ = GTEST_FLAG(throw_on_failure); - } - - // The d'tor is not virtual. DO NOT INHERIT FROM THIS CLASS. - ~GTestFlagSaver() { - GTEST_FLAG(also_run_disabled_tests) = also_run_disabled_tests_; - GTEST_FLAG(break_on_failure) = break_on_failure_; - GTEST_FLAG(catch_exceptions) = catch_exceptions_; - GTEST_FLAG(color) = color_; - GTEST_FLAG(death_test_style) = death_test_style_; - GTEST_FLAG(death_test_use_fork) = death_test_use_fork_; - GTEST_FLAG(filter) = filter_; - GTEST_FLAG(internal_run_death_test) = internal_run_death_test_; - GTEST_FLAG(list_tests) = list_tests_; - GTEST_FLAG(output) = output_; - GTEST_FLAG(print_time) = print_time_; - GTEST_FLAG(print_utf8) = print_utf8_; - GTEST_FLAG(random_seed) = random_seed_; - GTEST_FLAG(repeat) = repeat_; - GTEST_FLAG(shuffle) = shuffle_; - GTEST_FLAG(stack_trace_depth) = stack_trace_depth_; - GTEST_FLAG(stream_result_to) = stream_result_to_; - GTEST_FLAG(throw_on_failure) = throw_on_failure_; - } - - private: - // Fields for saving the original values of flags. - bool also_run_disabled_tests_; - bool break_on_failure_; - bool catch_exceptions_; - std::string color_; - std::string death_test_style_; - bool death_test_use_fork_; - std::string filter_; - std::string internal_run_death_test_; - bool list_tests_; - std::string output_; - bool print_time_; - bool print_utf8_; - internal::Int32 random_seed_; - internal::Int32 repeat_; - bool shuffle_; - internal::Int32 stack_trace_depth_; - std::string stream_result_to_; - bool throw_on_failure_; -} GTEST_ATTRIBUTE_UNUSED_; - -// Converts a Unicode code point to a narrow string in UTF-8 encoding. -// code_point parameter is of type UInt32 because wchar_t may not be -// wide enough to contain a code point. -// If the code_point is not a valid Unicode code point -// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted -// to "(Invalid Unicode 0xXXXXXXXX)". -GTEST_API_ std::string CodePointToUtf8(UInt32 code_point); - -// Converts a wide string to a narrow string in UTF-8 encoding. -// The wide string is assumed to have the following encoding: -// UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin, Symbian OS) -// UTF-32 if sizeof(wchar_t) == 4 (on Linux) -// Parameter str points to a null-terminated wide string. -// Parameter num_chars may additionally limit the number -// of wchar_t characters processed. -1 is used when the entire string -// should be processed. -// If the string contains code points that are not valid Unicode code points -// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output -// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding -// and contains invalid UTF-16 surrogate pairs, values in those pairs -// will be encoded as individual Unicode characters from Basic Normal Plane. -GTEST_API_ std::string WideStringToUtf8(const wchar_t* str, int num_chars); - -// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file -// if the variable is present. If a file already exists at this location, this -// function will write over it. If the variable is present, but the file cannot -// be created, prints an error and exits. -void WriteToShardStatusFileIfNeeded(); - -// Checks whether sharding is enabled by examining the relevant -// environment variable values. If the variables are present, -// but inconsistent (e.g., shard_index >= total_shards), prints -// an error and exits. If in_subprocess_for_death_test, sharding is -// disabled because it must only be applied to the original test -// process. Otherwise, we could filter out death tests we intended to execute. -GTEST_API_ bool ShouldShard(const char* total_shards_str, - const char* shard_index_str, - bool in_subprocess_for_death_test); - -// Parses the environment variable var as an Int32. If it is unset, -// returns default_val. If it is not an Int32, prints an error and -// and aborts. -GTEST_API_ Int32 Int32FromEnvOrDie(const char* env_var, Int32 default_val); - -// Given the total number of shards, the shard index, and the test id, -// returns true iff the test should be run on this shard. The test id is -// some arbitrary but unique non-negative integer assigned to each test -// method. Assumes that 0 <= shard_index < total_shards. -GTEST_API_ bool ShouldRunTestOnShard( - int total_shards, int shard_index, int test_id); - -// STL container utilities. - -// Returns the number of elements in the given container that satisfy -// the given predicate. -template -inline int CountIf(const Container& c, Predicate predicate) { - // Implemented as an explicit loop since std::count_if() in libCstd on - // Solaris has a non-standard signature. - int count = 0; - for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) { - if (predicate(*it)) - ++count; - } - return count; -} - -// Applies a function/functor to each element in the container. -template -void ForEach(const Container& c, Functor functor) { - std::for_each(c.begin(), c.end(), functor); -} - -// Returns the i-th element of the vector, or default_value if i is not -// in range [0, v.size()). -template -inline E GetElementOr(const std::vector& v, int i, E default_value) { - return (i < 0 || i >= static_cast(v.size())) ? default_value : v[i]; -} - -// Performs an in-place shuffle of a range of the vector's elements. -// 'begin' and 'end' are element indices as an STL-style range; -// i.e. [begin, end) are shuffled, where 'end' == size() means to -// shuffle to the end of the vector. -template -void ShuffleRange(internal::Random* random, int begin, int end, - std::vector* v) { - const int size = static_cast(v->size()); - GTEST_CHECK_(0 <= begin && begin <= size) - << "Invalid shuffle range start " << begin << ": must be in range [0, " - << size << "]."; - GTEST_CHECK_(begin <= end && end <= size) - << "Invalid shuffle range finish " << end << ": must be in range [" - << begin << ", " << size << "]."; - - // Fisher-Yates shuffle, from - // http://en.wikipedia.org/wiki/Fisher-Yates_shuffle - for (int range_width = end - begin; range_width >= 2; range_width--) { - const int last_in_range = begin + range_width - 1; - const int selected = begin + random->Generate(range_width); - std::swap((*v)[selected], (*v)[last_in_range]); - } -} - -// Performs an in-place shuffle of the vector's elements. -template -inline void Shuffle(internal::Random* random, std::vector* v) { - ShuffleRange(random, 0, static_cast(v->size()), v); -} - -// A function for deleting an object. Handy for being used as a -// functor. -template -static void Delete(T* x) { - delete x; -} - -// A predicate that checks the key of a TestProperty against a known key. -// -// TestPropertyKeyIs is copyable. -class TestPropertyKeyIs { - public: - // Constructor. - // - // TestPropertyKeyIs has NO default constructor. - explicit TestPropertyKeyIs(const std::string& key) : key_(key) {} - - // Returns true iff the test name of test property matches on key_. - bool operator()(const TestProperty& test_property) const { - return test_property.key() == key_; - } - - private: - std::string key_; -}; - -// Class UnitTestOptions. -// -// This class contains functions for processing options the user -// specifies when running the tests. It has only static members. -// -// In most cases, the user can specify an option using either an -// environment variable or a command line flag. E.g. you can set the -// test filter using either GTEST_FILTER or --gtest_filter. If both -// the variable and the flag are present, the latter overrides the -// former. -class GTEST_API_ UnitTestOptions { - public: - // Functions for processing the gtest_output flag. - - // Returns the output format, or "" for normal printed output. - static std::string GetOutputFormat(); - - // Returns the absolute path of the requested output file, or the - // default (test_detail.xml in the original working directory) if - // none was explicitly specified. - static std::string GetAbsolutePathToOutputFile(); - - // Functions for processing the gtest_filter flag. - - // Returns true iff the wildcard pattern matches the string. The - // first ':' or '\0' character in pattern marks the end of it. - // - // This recursive algorithm isn't very efficient, but is clear and - // works well enough for matching test names, which are short. - static bool PatternMatchesString(const char *pattern, const char *str); - - // Returns true iff the user-specified filter matches the test case - // name and the test name. - static bool FilterMatchesTest(const std::string &test_case_name, - const std::string &test_name); - -#if GTEST_OS_WINDOWS - // Function for supporting the gtest_catch_exception flag. - - // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the - // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise. - // This function is useful as an __except condition. - static int GTestShouldProcessSEH(DWORD exception_code); -#endif // GTEST_OS_WINDOWS - - // Returns true if "name" matches the ':' separated list of glob-style - // filters in "filter". - static bool MatchesFilter(const std::string& name, const char* filter); -}; - -// Returns the current application's name, removing directory path if that -// is present. Used by UnitTestOptions::GetOutputFile. -GTEST_API_ FilePath GetCurrentExecutableName(); - -// The role interface for getting the OS stack trace as a string. -class OsStackTraceGetterInterface { - public: - OsStackTraceGetterInterface() {} - virtual ~OsStackTraceGetterInterface() {} - - // Returns the current OS stack trace as an std::string. Parameters: - // - // max_depth - the maximum number of stack frames to be included - // in the trace. - // skip_count - the number of top frames to be skipped; doesn't count - // against max_depth. - virtual std::string CurrentStackTrace(int max_depth, int skip_count) = 0; - - // UponLeavingGTest() should be called immediately before Google Test calls - // user code. It saves some information about the current stack that - // CurrentStackTrace() will use to find and hide Google Test stack frames. - virtual void UponLeavingGTest() = 0; - - // This string is inserted in place of stack frames that are part of - // Google Test's implementation. - static const char* const kElidedFramesMarker; - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetterInterface); -}; - -// A working implementation of the OsStackTraceGetterInterface interface. -class OsStackTraceGetter : public OsStackTraceGetterInterface { - public: - OsStackTraceGetter() {} - - virtual std::string CurrentStackTrace(int max_depth, int skip_count); - virtual void UponLeavingGTest(); - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetter); -}; - -// Information about a Google Test trace point. -struct TraceInfo { - const char* file; - int line; - std::string message; -}; - -// This is the default global test part result reporter used in UnitTestImpl. -// This class should only be used by UnitTestImpl. -class DefaultGlobalTestPartResultReporter - : public TestPartResultReporterInterface { - public: - explicit DefaultGlobalTestPartResultReporter(UnitTestImpl* unit_test); - // Implements the TestPartResultReporterInterface. Reports the test part - // result in the current test. - virtual void ReportTestPartResult(const TestPartResult& result); - - private: - UnitTestImpl* const unit_test_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultGlobalTestPartResultReporter); -}; - -// This is the default per thread test part result reporter used in -// UnitTestImpl. This class should only be used by UnitTestImpl. -class DefaultPerThreadTestPartResultReporter - : public TestPartResultReporterInterface { - public: - explicit DefaultPerThreadTestPartResultReporter(UnitTestImpl* unit_test); - // Implements the TestPartResultReporterInterface. The implementation just - // delegates to the current global test part result reporter of *unit_test_. - virtual void ReportTestPartResult(const TestPartResult& result); - - private: - UnitTestImpl* const unit_test_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultPerThreadTestPartResultReporter); -}; - -// The private implementation of the UnitTest class. We don't protect -// the methods under a mutex, as this class is not accessible by a -// user and the UnitTest class that delegates work to this class does -// proper locking. -class GTEST_API_ UnitTestImpl { - public: - explicit UnitTestImpl(UnitTest* parent); - virtual ~UnitTestImpl(); - - // There are two different ways to register your own TestPartResultReporter. - // You can register your own repoter to listen either only for test results - // from the current thread or for results from all threads. - // By default, each per-thread test result repoter just passes a new - // TestPartResult to the global test result reporter, which registers the - // test part result for the currently running test. - - // Returns the global test part result reporter. - TestPartResultReporterInterface* GetGlobalTestPartResultReporter(); - - // Sets the global test part result reporter. - void SetGlobalTestPartResultReporter( - TestPartResultReporterInterface* reporter); - - // Returns the test part result reporter for the current thread. - TestPartResultReporterInterface* GetTestPartResultReporterForCurrentThread(); - - // Sets the test part result reporter for the current thread. - void SetTestPartResultReporterForCurrentThread( - TestPartResultReporterInterface* reporter); - - // Gets the number of successful test cases. - int successful_test_case_count() const; - - // Gets the number of failed test cases. - int failed_test_case_count() const; - - // Gets the number of all test cases. - int total_test_case_count() const; - - // Gets the number of all test cases that contain at least one test - // that should run. - int test_case_to_run_count() const; - - // Gets the number of successful tests. - int successful_test_count() const; - - // Gets the number of failed tests. - int failed_test_count() const; - - // Gets the number of disabled tests that will be reported in the XML report. - int reportable_disabled_test_count() const; - - // Gets the number of disabled tests. - int disabled_test_count() const; - - // Gets the number of tests to be printed in the XML report. - int reportable_test_count() const; - - // Gets the number of all tests. - int total_test_count() const; - - // Gets the number of tests that should run. - int test_to_run_count() const; - - // Gets the time of the test program start, in ms from the start of the - // UNIX epoch. - TimeInMillis start_timestamp() const { return start_timestamp_; } - - // Gets the elapsed time, in milliseconds. - TimeInMillis elapsed_time() const { return elapsed_time_; } - - // Returns true iff the unit test passed (i.e. all test cases passed). - bool Passed() const { return !Failed(); } - - // Returns true iff the unit test failed (i.e. some test case failed - // or something outside of all tests failed). - bool Failed() const { - return failed_test_case_count() > 0 || ad_hoc_test_result()->Failed(); - } - - // Gets the i-th test case among all the test cases. i can range from 0 to - // total_test_case_count() - 1. If i is not in that range, returns NULL. - const TestCase* GetTestCase(int i) const { - const int index = GetElementOr(test_case_indices_, i, -1); - return index < 0 ? NULL : test_cases_[i]; - } - - // Gets the i-th test case among all the test cases. i can range from 0 to - // total_test_case_count() - 1. If i is not in that range, returns NULL. - TestCase* GetMutableTestCase(int i) { - const int index = GetElementOr(test_case_indices_, i, -1); - return index < 0 ? NULL : test_cases_[index]; - } - - // Provides access to the event listener list. - TestEventListeners* listeners() { return &listeners_; } - - // Returns the TestResult for the test that's currently running, or - // the TestResult for the ad hoc test if no test is running. - TestResult* current_test_result(); - - // Returns the TestResult for the ad hoc test. - const TestResult* ad_hoc_test_result() const { return &ad_hoc_test_result_; } - - // Sets the OS stack trace getter. - // - // Does nothing if the input and the current OS stack trace getter - // are the same; otherwise, deletes the old getter and makes the - // input the current getter. - void set_os_stack_trace_getter(OsStackTraceGetterInterface* getter); - - // Returns the current OS stack trace getter if it is not NULL; - // otherwise, creates an OsStackTraceGetter, makes it the current - // getter, and returns it. - OsStackTraceGetterInterface* os_stack_trace_getter(); - - // Returns the current OS stack trace as an std::string. - // - // The maximum number of stack frames to be included is specified by - // the gtest_stack_trace_depth flag. The skip_count parameter - // specifies the number of top frames to be skipped, which doesn't - // count against the number of frames to be included. - // - // For example, if Foo() calls Bar(), which in turn calls - // CurrentOsStackTraceExceptTop(1), Foo() will be included in the - // trace but Bar() and CurrentOsStackTraceExceptTop() won't. - std::string CurrentOsStackTraceExceptTop(int skip_count) GTEST_NO_INLINE_; - - // Finds and returns a TestCase with the given name. If one doesn't - // exist, creates one and returns it. - // - // Arguments: - // - // test_case_name: name of the test case - // type_param: the name of the test's type parameter, or NULL if - // this is not a typed or a type-parameterized test. - // set_up_tc: pointer to the function that sets up the test case - // tear_down_tc: pointer to the function that tears down the test case - TestCase* GetTestCase(const char* test_case_name, - const char* type_param, - Test::SetUpTestCaseFunc set_up_tc, - Test::TearDownTestCaseFunc tear_down_tc); - - // Adds a TestInfo to the unit test. - // - // Arguments: - // - // set_up_tc: pointer to the function that sets up the test case - // tear_down_tc: pointer to the function that tears down the test case - // test_info: the TestInfo object - void AddTestInfo(Test::SetUpTestCaseFunc set_up_tc, - Test::TearDownTestCaseFunc tear_down_tc, - TestInfo* test_info) { - // In order to support thread-safe death tests, we need to - // remember the original working directory when the test program - // was first invoked. We cannot do this in RUN_ALL_TESTS(), as - // the user may have changed the current directory before calling - // RUN_ALL_TESTS(). Therefore we capture the current directory in - // AddTestInfo(), which is called to register a TEST or TEST_F - // before main() is reached. - if (original_working_dir_.IsEmpty()) { - original_working_dir_.Set(FilePath::GetCurrentDir()); - GTEST_CHECK_(!original_working_dir_.IsEmpty()) - << "Failed to get the current working directory."; - } - - GetTestCase(test_info->test_case_name(), - test_info->type_param(), - set_up_tc, - tear_down_tc)->AddTestInfo(test_info); - } - - // Returns ParameterizedTestCaseRegistry object used to keep track of - // value-parameterized tests and instantiate and register them. - internal::ParameterizedTestCaseRegistry& parameterized_test_registry() { - return parameterized_test_registry_; - } - - // Sets the TestCase object for the test that's currently running. - void set_current_test_case(TestCase* a_current_test_case) { - current_test_case_ = a_current_test_case; - } - - // Sets the TestInfo object for the test that's currently running. If - // current_test_info is NULL, the assertion results will be stored in - // ad_hoc_test_result_. - void set_current_test_info(TestInfo* a_current_test_info) { - current_test_info_ = a_current_test_info; - } - - // Registers all parameterized tests defined using TEST_P and - // INSTANTIATE_TEST_CASE_P, creating regular tests for each test/parameter - // combination. This method can be called more then once; it has guards - // protecting from registering the tests more then once. If - // value-parameterized tests are disabled, RegisterParameterizedTests is - // present but does nothing. - void RegisterParameterizedTests(); - - // Runs all tests in this UnitTest object, prints the result, and - // returns true if all tests are successful. If any exception is - // thrown during a test, this test is considered to be failed, but - // the rest of the tests will still be run. - bool RunAllTests(); - - // Clears the results of all tests, except the ad hoc tests. - void ClearNonAdHocTestResult() { - ForEach(test_cases_, TestCase::ClearTestCaseResult); - } - - // Clears the results of ad-hoc test assertions. - void ClearAdHocTestResult() { - ad_hoc_test_result_.Clear(); - } - - // Adds a TestProperty to the current TestResult object when invoked in a - // context of a test or a test case, or to the global property set. If the - // result already contains a property with the same key, the value will be - // updated. - void RecordProperty(const TestProperty& test_property); - - enum ReactionToSharding { - HONOR_SHARDING_PROTOCOL, - IGNORE_SHARDING_PROTOCOL - }; - - // Matches the full name of each test against the user-specified - // filter to decide whether the test should run, then records the - // result in each TestCase and TestInfo object. - // If shard_tests == HONOR_SHARDING_PROTOCOL, further filters tests - // based on sharding variables in the environment. - // Returns the number of tests that should run. - int FilterTests(ReactionToSharding shard_tests); - - // Prints the names of the tests matching the user-specified filter flag. - void ListTestsMatchingFilter(); - - const TestCase* current_test_case() const { return current_test_case_; } - TestInfo* current_test_info() { return current_test_info_; } - const TestInfo* current_test_info() const { return current_test_info_; } - - // Returns the vector of environments that need to be set-up/torn-down - // before/after the tests are run. - std::vector& environments() { return environments_; } - - // Getters for the per-thread Google Test trace stack. - std::vector& gtest_trace_stack() { - return *(gtest_trace_stack_.pointer()); - } - const std::vector& gtest_trace_stack() const { - return gtest_trace_stack_.get(); - } - -#if GTEST_HAS_DEATH_TEST - void InitDeathTestSubprocessControlInfo() { - internal_run_death_test_flag_.reset(ParseInternalRunDeathTestFlag()); - } - // Returns a pointer to the parsed --gtest_internal_run_death_test - // flag, or NULL if that flag was not specified. - // This information is useful only in a death test child process. - // Must not be called before a call to InitGoogleTest. - const InternalRunDeathTestFlag* internal_run_death_test_flag() const { - return internal_run_death_test_flag_.get(); - } - - // Returns a pointer to the current death test factory. - internal::DeathTestFactory* death_test_factory() { - return death_test_factory_.get(); - } - - void SuppressTestEventsIfInSubprocess(); - - friend class ReplaceDeathTestFactory; -#endif // GTEST_HAS_DEATH_TEST - - // Initializes the event listener performing XML output as specified by - // UnitTestOptions. Must not be called before InitGoogleTest. - void ConfigureXmlOutput(); - -#if GTEST_CAN_STREAM_RESULTS_ - // Initializes the event listener for streaming test results to a socket. - // Must not be called before InitGoogleTest. - void ConfigureStreamingOutput(); -#endif - - // Performs initialization dependent upon flag values obtained in - // ParseGoogleTestFlagsOnly. Is called from InitGoogleTest after the call to - // ParseGoogleTestFlagsOnly. In case a user neglects to call InitGoogleTest - // this function is also called from RunAllTests. Since this function can be - // called more than once, it has to be idempotent. - void PostFlagParsingInit(); - - // Gets the random seed used at the start of the current test iteration. - int random_seed() const { return random_seed_; } - - // Gets the random number generator. - internal::Random* random() { return &random_; } - - // Shuffles all test cases, and the tests within each test case, - // making sure that death tests are still run first. - void ShuffleTests(); - - // Restores the test cases and tests to their order before the first shuffle. - void UnshuffleTests(); - - // Returns the value of GTEST_FLAG(catch_exceptions) at the moment - // UnitTest::Run() starts. - bool catch_exceptions() const { return catch_exceptions_; } - - private: - friend class ::testing::UnitTest; - - // Used by UnitTest::Run() to capture the state of - // GTEST_FLAG(catch_exceptions) at the moment it starts. - void set_catch_exceptions(bool value) { catch_exceptions_ = value; } - - // The UnitTest object that owns this implementation object. - UnitTest* const parent_; - - // The working directory when the first TEST() or TEST_F() was - // executed. - internal::FilePath original_working_dir_; - - // The default test part result reporters. - DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_; - DefaultPerThreadTestPartResultReporter - default_per_thread_test_part_result_reporter_; - - // Points to (but doesn't own) the global test part result reporter. - TestPartResultReporterInterface* global_test_part_result_repoter_; - - // Protects read and write access to global_test_part_result_reporter_. - internal::Mutex global_test_part_result_reporter_mutex_; - - // Points to (but doesn't own) the per-thread test part result reporter. - internal::ThreadLocal - per_thread_test_part_result_reporter_; - - // The vector of environments that need to be set-up/torn-down - // before/after the tests are run. - std::vector environments_; - - // The vector of TestCases in their original order. It owns the - // elements in the vector. - std::vector test_cases_; - - // Provides a level of indirection for the test case list to allow - // easy shuffling and restoring the test case order. The i-th - // element of this vector is the index of the i-th test case in the - // shuffled order. - std::vector test_case_indices_; - - // ParameterizedTestRegistry object used to register value-parameterized - // tests. - internal::ParameterizedTestCaseRegistry parameterized_test_registry_; - - // Indicates whether RegisterParameterizedTests() has been called already. - bool parameterized_tests_registered_; - - // Index of the last death test case registered. Initially -1. - int last_death_test_case_; - - // This points to the TestCase for the currently running test. It - // changes as Google Test goes through one test case after another. - // When no test is running, this is set to NULL and Google Test - // stores assertion results in ad_hoc_test_result_. Initially NULL. - TestCase* current_test_case_; - - // This points to the TestInfo for the currently running test. It - // changes as Google Test goes through one test after another. When - // no test is running, this is set to NULL and Google Test stores - // assertion results in ad_hoc_test_result_. Initially NULL. - TestInfo* current_test_info_; - - // Normally, a user only writes assertions inside a TEST or TEST_F, - // or inside a function called by a TEST or TEST_F. Since Google - // Test keeps track of which test is current running, it can - // associate such an assertion with the test it belongs to. - // - // If an assertion is encountered when no TEST or TEST_F is running, - // Google Test attributes the assertion result to an imaginary "ad hoc" - // test, and records the result in ad_hoc_test_result_. - TestResult ad_hoc_test_result_; - - // The list of event listeners that can be used to track events inside - // Google Test. - TestEventListeners listeners_; - - // The OS stack trace getter. Will be deleted when the UnitTest - // object is destructed. By default, an OsStackTraceGetter is used, - // but the user can set this field to use a custom getter if that is - // desired. - OsStackTraceGetterInterface* os_stack_trace_getter_; - - // True iff PostFlagParsingInit() has been called. - bool post_flag_parse_init_performed_; - - // The random number seed used at the beginning of the test run. - int random_seed_; - - // Our random number generator. - internal::Random random_; - - // The time of the test program start, in ms from the start of the - // UNIX epoch. - TimeInMillis start_timestamp_; - - // How long the test took to run, in milliseconds. - TimeInMillis elapsed_time_; - -#if GTEST_HAS_DEATH_TEST - // The decomposed components of the gtest_internal_run_death_test flag, - // parsed when RUN_ALL_TESTS is called. - internal::scoped_ptr internal_run_death_test_flag_; - internal::scoped_ptr death_test_factory_; -#endif // GTEST_HAS_DEATH_TEST - - // A per-thread stack of traces created by the SCOPED_TRACE() macro. - internal::ThreadLocal > gtest_trace_stack_; - - // The value of GTEST_FLAG(catch_exceptions) at the moment RunAllTests() - // starts. - bool catch_exceptions_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTestImpl); -}; // class UnitTestImpl - -// Convenience function for accessing the global UnitTest -// implementation object. -inline UnitTestImpl* GetUnitTestImpl() { - return UnitTest::GetInstance()->impl(); -} - -#if GTEST_USES_SIMPLE_RE - -// Internal helper functions for implementing the simple regular -// expression matcher. -GTEST_API_ bool IsInSet(char ch, const char* str); -GTEST_API_ bool IsAsciiDigit(char ch); -GTEST_API_ bool IsAsciiPunct(char ch); -GTEST_API_ bool IsRepeat(char ch); -GTEST_API_ bool IsAsciiWhiteSpace(char ch); -GTEST_API_ bool IsAsciiWordChar(char ch); -GTEST_API_ bool IsValidEscape(char ch); -GTEST_API_ bool AtomMatchesChar(bool escaped, char pattern, char ch); -GTEST_API_ bool ValidateRegex(const char* regex); -GTEST_API_ bool MatchRegexAtHead(const char* regex, const char* str); -GTEST_API_ bool MatchRepetitionAndRegexAtHead( - bool escaped, char ch, char repeat, const char* regex, const char* str); -GTEST_API_ bool MatchRegexAnywhere(const char* regex, const char* str); - -#endif // GTEST_USES_SIMPLE_RE - -// Parses the command line for Google Test flags, without initializing -// other parts of Google Test. -GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, char** argv); -GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv); - -#if GTEST_HAS_DEATH_TEST - -// Returns the message describing the last system error, regardless of the -// platform. -GTEST_API_ std::string GetLastErrnoDescription(); - -// Attempts to parse a string into a positive integer pointed to by the -// number parameter. Returns true if that is possible. -// GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we can use -// it here. -template -bool ParseNaturalNumber(const ::std::string& str, Integer* number) { - // Fail fast if the given string does not begin with a digit; - // this bypasses strtoXXX's "optional leading whitespace and plus - // or minus sign" semantics, which are undesirable here. - if (str.empty() || !IsDigit(str[0])) { - return false; - } - errno = 0; - - char* end; - // BiggestConvertible is the largest integer type that system-provided - // string-to-number conversion routines can return. - -# if GTEST_OS_WINDOWS && !defined(__GNUC__) - - // MSVC and C++ Builder define __int64 instead of the standard long long. - typedef unsigned __int64 BiggestConvertible; - const BiggestConvertible parsed = _strtoui64(str.c_str(), &end, 10); - -# else - - typedef unsigned long long BiggestConvertible; // NOLINT - const BiggestConvertible parsed = strtoull(str.c_str(), &end, 10); - -# endif // GTEST_OS_WINDOWS && !defined(__GNUC__) - - const bool parse_success = *end == '\0' && errno == 0; - - // TODO(vladl@google.com): Convert this to compile time assertion when it is - // available. - GTEST_CHECK_(sizeof(Integer) <= sizeof(parsed)); - - const Integer result = static_cast(parsed); - if (parse_success && static_cast(result) == parsed) { - *number = result; - return true; - } - return false; -} -#endif // GTEST_HAS_DEATH_TEST - -// TestResult contains some private methods that should be hidden from -// Google Test user but are required for testing. This class allow our tests -// to access them. -// -// This class is supplied only for the purpose of testing Google Test's own -// constructs. Do not use it in user tests, either directly or indirectly. -class TestResultAccessor { - public: - static void RecordProperty(TestResult* test_result, - const std::string& xml_element, - const TestProperty& property) { - test_result->RecordProperty(xml_element, property); - } - - static void ClearTestPartResults(TestResult* test_result) { - test_result->ClearTestPartResults(); - } - - static const std::vector& test_part_results( - const TestResult& test_result) { - return test_result.test_part_results(); - } -}; - -#if GTEST_CAN_STREAM_RESULTS_ - -// Streams test results to the given port on the given host machine. -class StreamingListener : public EmptyTestEventListener { - public: - // Abstract base class for writing strings to a socket. - class AbstractSocketWriter { - public: - virtual ~AbstractSocketWriter() {} - - // Sends a string to the socket. - virtual void Send(const std::string& message) = 0; - - // Closes the socket. - virtual void CloseConnection() {} - - // Sends a string and a newline to the socket. - void SendLn(const std::string& message) { Send(message + "\n"); } - }; - - // Concrete class for actually writing strings to a socket. - class SocketWriter : public AbstractSocketWriter { - public: - SocketWriter(const std::string& host, const std::string& port) - : sockfd_(-1), host_name_(host), port_num_(port) { - MakeConnection(); - } - - virtual ~SocketWriter() { - if (sockfd_ != -1) - CloseConnection(); - } - - // Sends a string to the socket. - virtual void Send(const std::string& message) { - GTEST_CHECK_(sockfd_ != -1) - << "Send() can be called only when there is a connection."; - - const int len = static_cast(message.length()); - if (write(sockfd_, message.c_str(), len) != len) { - GTEST_LOG_(WARNING) - << "stream_result_to: failed to stream to " - << host_name_ << ":" << port_num_; - } - } - - private: - // Creates a client socket and connects to the server. - void MakeConnection(); - - // Closes the socket. - void CloseConnection() { - GTEST_CHECK_(sockfd_ != -1) - << "CloseConnection() can be called only when there is a connection."; - - close(sockfd_); - sockfd_ = -1; - } - - int sockfd_; // socket file descriptor - const std::string host_name_; - const std::string port_num_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(SocketWriter); - }; // class SocketWriter - - // Escapes '=', '&', '%', and '\n' characters in str as "%xx". - static std::string UrlEncode(const char* str); - - StreamingListener(const std::string& host, const std::string& port) - : socket_writer_(new SocketWriter(host, port)) { - Start(); - } - - explicit StreamingListener(AbstractSocketWriter* socket_writer) - : socket_writer_(socket_writer) { Start(); } - - void OnTestProgramStart(const UnitTest& /* unit_test */) { - SendLn("event=TestProgramStart"); - } - - void OnTestProgramEnd(const UnitTest& unit_test) { - // Note that Google Test current only report elapsed time for each - // test iteration, not for the entire test program. - SendLn("event=TestProgramEnd&passed=" + FormatBool(unit_test.Passed())); - - // Notify the streaming server to stop. - socket_writer_->CloseConnection(); - } - - void OnTestIterationStart(const UnitTest& /* unit_test */, int iteration) { - SendLn("event=TestIterationStart&iteration=" + - StreamableToString(iteration)); - } - - void OnTestIterationEnd(const UnitTest& unit_test, int /* iteration */) { - SendLn("event=TestIterationEnd&passed=" + - FormatBool(unit_test.Passed()) + "&elapsed_time=" + - StreamableToString(unit_test.elapsed_time()) + "ms"); - } - - void OnTestCaseStart(const TestCase& test_case) { - SendLn(std::string("event=TestCaseStart&name=") + test_case.name()); - } - - void OnTestCaseEnd(const TestCase& test_case) { - SendLn("event=TestCaseEnd&passed=" + FormatBool(test_case.Passed()) - + "&elapsed_time=" + StreamableToString(test_case.elapsed_time()) - + "ms"); - } - - void OnTestStart(const TestInfo& test_info) { - SendLn(std::string("event=TestStart&name=") + test_info.name()); - } - - void OnTestEnd(const TestInfo& test_info) { - SendLn("event=TestEnd&passed=" + - FormatBool((test_info.result())->Passed()) + - "&elapsed_time=" + - StreamableToString((test_info.result())->elapsed_time()) + "ms"); - } - - void OnTestPartResult(const TestPartResult& test_part_result) { - const char* file_name = test_part_result.file_name(); - if (file_name == NULL) - file_name = ""; - SendLn("event=TestPartResult&file=" + UrlEncode(file_name) + - "&line=" + StreamableToString(test_part_result.line_number()) + - "&message=" + UrlEncode(test_part_result.message())); - } - - private: - // Sends the given message and a newline to the socket. - void SendLn(const std::string& message) { socket_writer_->SendLn(message); } - - // Called at the start of streaming to notify the receiver what - // protocol we are using. - void Start() { SendLn("gtest_streaming_protocol_version=1.0"); } - - std::string FormatBool(bool value) { return value ? "1" : "0"; } - - const scoped_ptr socket_writer_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamingListener); -}; // class StreamingListener - -#endif // GTEST_CAN_STREAM_RESULTS_ - -} // namespace internal -} // namespace testing - -#endif // GTEST_SRC_GTEST_INTERNAL_INL_H_ diff --git a/test/gtest-1.8.0/src/gtest-port.cc b/test/gtest-1.8.0/src/gtest-port.cc deleted file mode 100644 index f8a0ad65a9..0000000000 --- a/test/gtest-1.8.0/src/gtest-port.cc +++ /dev/null @@ -1,1277 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -#include "gtest/internal/gtest-port.h" - -#include -#include -#include -#include -#include - -#if GTEST_OS_WINDOWS -# include -# include -# include -# include // Used in ThreadLocal. -#else -# include -#endif // GTEST_OS_WINDOWS - -#if GTEST_OS_MAC -# include -# include -# include -#endif // GTEST_OS_MAC - -#if GTEST_OS_QNX -# include -# include -# include -#endif // GTEST_OS_QNX - -#if GTEST_OS_AIX -# include -# include -#endif // GTEST_OS_AIX - -#if GTEST_OS_FUCHSIA -# include -# include -#endif // GTEST_OS_FUCHSIA - -#include "gtest/gtest-spi.h" -#include "gtest/gtest-message.h" -#include "gtest/internal/gtest-internal.h" -#include "gtest/internal/gtest-string.h" -#include "src/gtest-internal-inl.h" - -namespace testing { -namespace internal { - -#if defined(_MSC_VER) || defined(__BORLANDC__) -// MSVC and C++Builder do not provide a definition of STDERR_FILENO. -const int kStdOutFileno = 1; -const int kStdErrFileno = 2; -#else -const int kStdOutFileno = STDOUT_FILENO; -const int kStdErrFileno = STDERR_FILENO; -#endif // _MSC_VER - -#if GTEST_OS_LINUX - -namespace { -template -T ReadProcFileField(const std::string& filename, int field) { - std::string dummy; - std::ifstream file(filename.c_str()); - while (field-- > 0) { - file >> dummy; - } - T output = 0; - file >> output; - return output; -} -} // namespace - -// Returns the number of active threads, or 0 when there is an error. -size_t GetThreadCount() { - const std::string filename = - (Message() << "/proc/" << getpid() << "/stat").GetString(); - return ReadProcFileField(filename, 19); -} - -#elif GTEST_OS_MAC - -size_t GetThreadCount() { - const task_t task = mach_task_self(); - mach_msg_type_number_t thread_count; - thread_act_array_t thread_list; - const kern_return_t status = task_threads(task, &thread_list, &thread_count); - if (status == KERN_SUCCESS) { - // task_threads allocates resources in thread_list and we need to free them - // to avoid leaks. - vm_deallocate(task, - reinterpret_cast(thread_list), - sizeof(thread_t) * thread_count); - return static_cast(thread_count); - } else { - return 0; - } -} - -#elif GTEST_OS_QNX - -// Returns the number of threads running in the process, or 0 to indicate that -// we cannot detect it. -size_t GetThreadCount() { - const int fd = open("/proc/self/as", O_RDONLY); - if (fd < 0) { - return 0; - } - procfs_info process_info; - const int status = - devctl(fd, DCMD_PROC_INFO, &process_info, sizeof(process_info), NULL); - close(fd); - if (status == EOK) { - return static_cast(process_info.num_threads); - } else { - return 0; - } -} - -#elif GTEST_OS_AIX - -size_t GetThreadCount() { - struct procentry64 entry; - pid_t pid = getpid(); - int status = getprocs64(&entry, sizeof(entry), NULL, 0, &pid, 1); - if (status == 1) { - return entry.pi_thcount; - } else { - return 0; - } -} - -#elif GTEST_OS_FUCHSIA - -size_t GetThreadCount() { - int dummy_buffer; - size_t avail; - zx_status_t status = zx_object_get_info( - zx_process_self(), - ZX_INFO_PROCESS_THREADS, - &dummy_buffer, - 0, - nullptr, - &avail); - if (status == ZX_OK) { - return avail; - } else { - return 0; - } -} - -#else - -size_t GetThreadCount() { - // There's no portable way to detect the number of threads, so we just - // return 0 to indicate that we cannot detect it. - return 0; -} - -#endif // GTEST_OS_LINUX - -#if GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS - -void SleepMilliseconds(int n) { - ::Sleep(n); -} - -AutoHandle::AutoHandle() - : handle_(INVALID_HANDLE_VALUE) {} - -AutoHandle::AutoHandle(Handle handle) - : handle_(handle) {} - -AutoHandle::~AutoHandle() { - Reset(); -} - -AutoHandle::Handle AutoHandle::Get() const { - return handle_; -} - -void AutoHandle::Reset() { - Reset(INVALID_HANDLE_VALUE); -} - -void AutoHandle::Reset(HANDLE handle) { - // Resetting with the same handle we already own is invalid. - if (handle_ != handle) { - if (IsCloseable()) { - ::CloseHandle(handle_); - } - handle_ = handle; - } else { - GTEST_CHECK_(!IsCloseable()) - << "Resetting a valid handle to itself is likely a programmer error " - "and thus not allowed."; - } -} - -bool AutoHandle::IsCloseable() const { - // Different Windows APIs may use either of these values to represent an - // invalid handle. - return handle_ != NULL && handle_ != INVALID_HANDLE_VALUE; -} - -Notification::Notification() - : event_(::CreateEvent(NULL, // Default security attributes. - TRUE, // Do not reset automatically. - FALSE, // Initially unset. - NULL)) { // Anonymous event. - GTEST_CHECK_(event_.Get() != NULL); -} - -void Notification::Notify() { - GTEST_CHECK_(::SetEvent(event_.Get()) != FALSE); -} - -void Notification::WaitForNotification() { - GTEST_CHECK_( - ::WaitForSingleObject(event_.Get(), INFINITE) == WAIT_OBJECT_0); -} - -Mutex::Mutex() - : owner_thread_id_(0), - type_(kDynamic), - critical_section_init_phase_(0), - critical_section_(new CRITICAL_SECTION) { - ::InitializeCriticalSection(critical_section_); -} - -Mutex::~Mutex() { - // Static mutexes are leaked intentionally. It is not thread-safe to try - // to clean them up. - // TODO(yukawa): Switch to Slim Reader/Writer (SRW) Locks, which requires - // nothing to clean it up but is available only on Vista and later. - // http://msdn.microsoft.com/en-us/library/windows/desktop/aa904937.aspx - if (type_ == kDynamic) { - ::DeleteCriticalSection(critical_section_); - delete critical_section_; - critical_section_ = NULL; - } -} - -void Mutex::Lock() { - ThreadSafeLazyInit(); - ::EnterCriticalSection(critical_section_); - owner_thread_id_ = ::GetCurrentThreadId(); -} - -void Mutex::Unlock() { - ThreadSafeLazyInit(); - // We don't protect writing to owner_thread_id_ here, as it's the - // caller's responsibility to ensure that the current thread holds the - // mutex when this is called. - owner_thread_id_ = 0; - ::LeaveCriticalSection(critical_section_); -} - -// Does nothing if the current thread holds the mutex. Otherwise, crashes -// with high probability. -void Mutex::AssertHeld() { - ThreadSafeLazyInit(); - GTEST_CHECK_(owner_thread_id_ == ::GetCurrentThreadId()) - << "The current thread is not holding the mutex @" << this; -} - -// Initializes owner_thread_id_ and critical_section_ in static mutexes. -void Mutex::ThreadSafeLazyInit() { - // Dynamic mutexes are initialized in the constructor. - if (type_ == kStatic) { - switch ( - ::InterlockedCompareExchange(&critical_section_init_phase_, 1L, 0L)) { - case 0: - // If critical_section_init_phase_ was 0 before the exchange, we - // are the first to test it and need to perform the initialization. - owner_thread_id_ = 0; - critical_section_ = new CRITICAL_SECTION; - ::InitializeCriticalSection(critical_section_); - // Updates the critical_section_init_phase_ to 2 to signal - // initialization complete. - GTEST_CHECK_(::InterlockedCompareExchange( - &critical_section_init_phase_, 2L, 1L) == - 1L); - break; - case 1: - // Somebody else is already initializing the mutex; spin until they - // are done. - while (::InterlockedCompareExchange(&critical_section_init_phase_, - 2L, - 2L) != 2L) { - // Possibly yields the rest of the thread's time slice to other - // threads. - ::Sleep(0); - } - break; - - case 2: - break; // The mutex is already initialized and ready for use. - - default: - GTEST_CHECK_(false) - << "Unexpected value of critical_section_init_phase_ " - << "while initializing a static mutex."; - } - } -} - -namespace { - -class ThreadWithParamSupport : public ThreadWithParamBase { - public: - static HANDLE CreateThread(Runnable* runnable, - Notification* thread_can_start) { - ThreadMainParam* param = new ThreadMainParam(runnable, thread_can_start); - DWORD thread_id; - // TODO(yukawa): Consider to use _beginthreadex instead. - HANDLE thread_handle = ::CreateThread( - NULL, // Default security. - 0, // Default stack size. - &ThreadWithParamSupport::ThreadMain, - param, // Parameter to ThreadMainStatic - 0x0, // Default creation flags. - &thread_id); // Need a valid pointer for the call to work under Win98. - GTEST_CHECK_(thread_handle != NULL) << "CreateThread failed with error " - << ::GetLastError() << "."; - if (thread_handle == NULL) { - delete param; - } - return thread_handle; - } - - private: - struct ThreadMainParam { - ThreadMainParam(Runnable* runnable, Notification* thread_can_start) - : runnable_(runnable), - thread_can_start_(thread_can_start) { - } - scoped_ptr runnable_; - // Does not own. - Notification* thread_can_start_; - }; - - static DWORD WINAPI ThreadMain(void* ptr) { - // Transfers ownership. - scoped_ptr param(static_cast(ptr)); - if (param->thread_can_start_ != NULL) - param->thread_can_start_->WaitForNotification(); - param->runnable_->Run(); - return 0; - } - - // Prohibit instantiation. - ThreadWithParamSupport(); - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParamSupport); -}; - -} // namespace - -ThreadWithParamBase::ThreadWithParamBase(Runnable *runnable, - Notification* thread_can_start) - : thread_(ThreadWithParamSupport::CreateThread(runnable, - thread_can_start)) { -} - -ThreadWithParamBase::~ThreadWithParamBase() { - Join(); -} - -void ThreadWithParamBase::Join() { - GTEST_CHECK_(::WaitForSingleObject(thread_.Get(), INFINITE) == WAIT_OBJECT_0) - << "Failed to join the thread with error " << ::GetLastError() << "."; -} - -// Maps a thread to a set of ThreadIdToThreadLocals that have values -// instantiated on that thread and notifies them when the thread exits. A -// ThreadLocal instance is expected to persist until all threads it has -// values on have terminated. -class ThreadLocalRegistryImpl { - public: - // Registers thread_local_instance as having value on the current thread. - // Returns a value that can be used to identify the thread from other threads. - static ThreadLocalValueHolderBase* GetValueOnCurrentThread( - const ThreadLocalBase* thread_local_instance) { - DWORD current_thread = ::GetCurrentThreadId(); - MutexLock lock(&mutex_); - ThreadIdToThreadLocals* const thread_to_thread_locals = - GetThreadLocalsMapLocked(); - ThreadIdToThreadLocals::iterator thread_local_pos = - thread_to_thread_locals->find(current_thread); - if (thread_local_pos == thread_to_thread_locals->end()) { - thread_local_pos = thread_to_thread_locals->insert( - std::make_pair(current_thread, ThreadLocalValues())).first; - StartWatcherThreadFor(current_thread); - } - ThreadLocalValues& thread_local_values = thread_local_pos->second; - ThreadLocalValues::iterator value_pos = - thread_local_values.find(thread_local_instance); - if (value_pos == thread_local_values.end()) { - value_pos = - thread_local_values - .insert(std::make_pair( - thread_local_instance, - linked_ptr( - thread_local_instance->NewValueForCurrentThread()))) - .first; - } - return value_pos->second.get(); - } - - static void OnThreadLocalDestroyed( - const ThreadLocalBase* thread_local_instance) { - std::vector > value_holders; - // Clean up the ThreadLocalValues data structure while holding the lock, but - // defer the destruction of the ThreadLocalValueHolderBases. - { - MutexLock lock(&mutex_); - ThreadIdToThreadLocals* const thread_to_thread_locals = - GetThreadLocalsMapLocked(); - for (ThreadIdToThreadLocals::iterator it = - thread_to_thread_locals->begin(); - it != thread_to_thread_locals->end(); - ++it) { - ThreadLocalValues& thread_local_values = it->second; - ThreadLocalValues::iterator value_pos = - thread_local_values.find(thread_local_instance); - if (value_pos != thread_local_values.end()) { - value_holders.push_back(value_pos->second); - thread_local_values.erase(value_pos); - // This 'if' can only be successful at most once, so theoretically we - // could break out of the loop here, but we don't bother doing so. - } - } - } - // Outside the lock, let the destructor for 'value_holders' deallocate the - // ThreadLocalValueHolderBases. - } - - static void OnThreadExit(DWORD thread_id) { - GTEST_CHECK_(thread_id != 0) << ::GetLastError(); - std::vector > value_holders; - // Clean up the ThreadIdToThreadLocals data structure while holding the - // lock, but defer the destruction of the ThreadLocalValueHolderBases. - { - MutexLock lock(&mutex_); - ThreadIdToThreadLocals* const thread_to_thread_locals = - GetThreadLocalsMapLocked(); - ThreadIdToThreadLocals::iterator thread_local_pos = - thread_to_thread_locals->find(thread_id); - if (thread_local_pos != thread_to_thread_locals->end()) { - ThreadLocalValues& thread_local_values = thread_local_pos->second; - for (ThreadLocalValues::iterator value_pos = - thread_local_values.begin(); - value_pos != thread_local_values.end(); - ++value_pos) { - value_holders.push_back(value_pos->second); - } - thread_to_thread_locals->erase(thread_local_pos); - } - } - // Outside the lock, let the destructor for 'value_holders' deallocate the - // ThreadLocalValueHolderBases. - } - - private: - // In a particular thread, maps a ThreadLocal object to its value. - typedef std::map > ThreadLocalValues; - // Stores all ThreadIdToThreadLocals having values in a thread, indexed by - // thread's ID. - typedef std::map ThreadIdToThreadLocals; - - // Holds the thread id and thread handle that we pass from - // StartWatcherThreadFor to WatcherThreadFunc. - typedef std::pair ThreadIdAndHandle; - - static void StartWatcherThreadFor(DWORD thread_id) { - // The returned handle will be kept in thread_map and closed by - // watcher_thread in WatcherThreadFunc. - HANDLE thread = ::OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, - FALSE, - thread_id); - GTEST_CHECK_(thread != NULL); - // We need to pass a valid thread ID pointer into CreateThread for it - // to work correctly under Win98. - DWORD watcher_thread_id; - HANDLE watcher_thread = ::CreateThread( - NULL, // Default security. - 0, // Default stack size - &ThreadLocalRegistryImpl::WatcherThreadFunc, - reinterpret_cast(new ThreadIdAndHandle(thread_id, thread)), - CREATE_SUSPENDED, - &watcher_thread_id); - GTEST_CHECK_(watcher_thread != NULL); - // Give the watcher thread the same priority as ours to avoid being - // blocked by it. - ::SetThreadPriority(watcher_thread, - ::GetThreadPriority(::GetCurrentThread())); - ::ResumeThread(watcher_thread); - ::CloseHandle(watcher_thread); - } - - // Monitors exit from a given thread and notifies those - // ThreadIdToThreadLocals about thread termination. - static DWORD WINAPI WatcherThreadFunc(LPVOID param) { - const ThreadIdAndHandle* tah = - reinterpret_cast(param); - GTEST_CHECK_( - ::WaitForSingleObject(tah->second, INFINITE) == WAIT_OBJECT_0); - OnThreadExit(tah->first); - ::CloseHandle(tah->second); - delete tah; - return 0; - } - - // Returns map of thread local instances. - static ThreadIdToThreadLocals* GetThreadLocalsMapLocked() { - mutex_.AssertHeld(); - static ThreadIdToThreadLocals* map = new ThreadIdToThreadLocals; - return map; - } - - // Protects access to GetThreadLocalsMapLocked() and its return value. - static Mutex mutex_; - // Protects access to GetThreadMapLocked() and its return value. - static Mutex thread_map_mutex_; -}; - -Mutex ThreadLocalRegistryImpl::mutex_(Mutex::kStaticMutex); -Mutex ThreadLocalRegistryImpl::thread_map_mutex_(Mutex::kStaticMutex); - -ThreadLocalValueHolderBase* ThreadLocalRegistry::GetValueOnCurrentThread( - const ThreadLocalBase* thread_local_instance) { - return ThreadLocalRegistryImpl::GetValueOnCurrentThread( - thread_local_instance); -} - -void ThreadLocalRegistry::OnThreadLocalDestroyed( - const ThreadLocalBase* thread_local_instance) { - ThreadLocalRegistryImpl::OnThreadLocalDestroyed(thread_local_instance); -} - -#endif // GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS - -#if GTEST_USES_POSIX_RE - -// Implements RE. Currently only needed for death tests. - -RE::~RE() { - if (is_valid_) { - // regfree'ing an invalid regex might crash because the content - // of the regex is undefined. Since the regex's are essentially - // the same, one cannot be valid (or invalid) without the other - // being so too. - regfree(&partial_regex_); - regfree(&full_regex_); - } - free(const_cast(pattern_)); -} - -// Returns true iff regular expression re matches the entire str. -bool RE::FullMatch(const char* str, const RE& re) { - if (!re.is_valid_) return false; - - regmatch_t match; - return regexec(&re.full_regex_, str, 1, &match, 0) == 0; -} - -// Returns true iff regular expression re matches a substring of str -// (including str itself). -bool RE::PartialMatch(const char* str, const RE& re) { - if (!re.is_valid_) return false; - - regmatch_t match; - return regexec(&re.partial_regex_, str, 1, &match, 0) == 0; -} - -// Initializes an RE from its string representation. -void RE::Init(const char* regex) { - pattern_ = posix::StrDup(regex); - - // Reserves enough bytes to hold the regular expression used for a - // full match. - const size_t full_regex_len = strlen(regex) + 10; - char* const full_pattern = new char[full_regex_len]; - - snprintf(full_pattern, full_regex_len, "^(%s)$", regex); - is_valid_ = regcomp(&full_regex_, full_pattern, REG_EXTENDED) == 0; - // We want to call regcomp(&partial_regex_, ...) even if the - // previous expression returns false. Otherwise partial_regex_ may - // not be properly initialized can may cause trouble when it's - // freed. - // - // Some implementation of POSIX regex (e.g. on at least some - // versions of Cygwin) doesn't accept the empty string as a valid - // regex. We change it to an equivalent form "()" to be safe. - if (is_valid_) { - const char* const partial_regex = (*regex == '\0') ? "()" : regex; - is_valid_ = regcomp(&partial_regex_, partial_regex, REG_EXTENDED) == 0; - } - EXPECT_TRUE(is_valid_) - << "Regular expression \"" << regex - << "\" is not a valid POSIX Extended regular expression."; - - delete[] full_pattern; -} - -#elif GTEST_USES_SIMPLE_RE - -// Returns true iff ch appears anywhere in str (excluding the -// terminating '\0' character). -bool IsInSet(char ch, const char* str) { - return ch != '\0' && strchr(str, ch) != NULL; -} - -// Returns true iff ch belongs to the given classification. Unlike -// similar functions in , these aren't affected by the -// current locale. -bool IsAsciiDigit(char ch) { return '0' <= ch && ch <= '9'; } -bool IsAsciiPunct(char ch) { - return IsInSet(ch, "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~"); -} -bool IsRepeat(char ch) { return IsInSet(ch, "?*+"); } -bool IsAsciiWhiteSpace(char ch) { return IsInSet(ch, " \f\n\r\t\v"); } -bool IsAsciiWordChar(char ch) { - return ('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z') || - ('0' <= ch && ch <= '9') || ch == '_'; -} - -// Returns true iff "\\c" is a supported escape sequence. -bool IsValidEscape(char c) { - return (IsAsciiPunct(c) || IsInSet(c, "dDfnrsStvwW")); -} - -// Returns true iff the given atom (specified by escaped and pattern) -// matches ch. The result is undefined if the atom is invalid. -bool AtomMatchesChar(bool escaped, char pattern_char, char ch) { - if (escaped) { // "\\p" where p is pattern_char. - switch (pattern_char) { - case 'd': return IsAsciiDigit(ch); - case 'D': return !IsAsciiDigit(ch); - case 'f': return ch == '\f'; - case 'n': return ch == '\n'; - case 'r': return ch == '\r'; - case 's': return IsAsciiWhiteSpace(ch); - case 'S': return !IsAsciiWhiteSpace(ch); - case 't': return ch == '\t'; - case 'v': return ch == '\v'; - case 'w': return IsAsciiWordChar(ch); - case 'W': return !IsAsciiWordChar(ch); - } - return IsAsciiPunct(pattern_char) && pattern_char == ch; - } - - return (pattern_char == '.' && ch != '\n') || pattern_char == ch; -} - -// Helper function used by ValidateRegex() to format error messages. -static std::string FormatRegexSyntaxError(const char* regex, int index) { - return (Message() << "Syntax error at index " << index - << " in simple regular expression \"" << regex << "\": ").GetString(); -} - -// Generates non-fatal failures and returns false if regex is invalid; -// otherwise returns true. -bool ValidateRegex(const char* regex) { - if (regex == NULL) { - // TODO(wan@google.com): fix the source file location in the - // assertion failures to match where the regex is used in user - // code. - ADD_FAILURE() << "NULL is not a valid simple regular expression."; - return false; - } - - bool is_valid = true; - - // True iff ?, *, or + can follow the previous atom. - bool prev_repeatable = false; - for (int i = 0; regex[i]; i++) { - if (regex[i] == '\\') { // An escape sequence - i++; - if (regex[i] == '\0') { - ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1) - << "'\\' cannot appear at the end."; - return false; - } - - if (!IsValidEscape(regex[i])) { - ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1) - << "invalid escape sequence \"\\" << regex[i] << "\"."; - is_valid = false; - } - prev_repeatable = true; - } else { // Not an escape sequence. - const char ch = regex[i]; - - if (ch == '^' && i > 0) { - ADD_FAILURE() << FormatRegexSyntaxError(regex, i) - << "'^' can only appear at the beginning."; - is_valid = false; - } else if (ch == '$' && regex[i + 1] != '\0') { - ADD_FAILURE() << FormatRegexSyntaxError(regex, i) - << "'$' can only appear at the end."; - is_valid = false; - } else if (IsInSet(ch, "()[]{}|")) { - ADD_FAILURE() << FormatRegexSyntaxError(regex, i) - << "'" << ch << "' is unsupported."; - is_valid = false; - } else if (IsRepeat(ch) && !prev_repeatable) { - ADD_FAILURE() << FormatRegexSyntaxError(regex, i) - << "'" << ch << "' can only follow a repeatable token."; - is_valid = false; - } - - prev_repeatable = !IsInSet(ch, "^$?*+"); - } - } - - return is_valid; -} - -// Matches a repeated regex atom followed by a valid simple regular -// expression. The regex atom is defined as c if escaped is false, -// or \c otherwise. repeat is the repetition meta character (?, *, -// or +). The behavior is undefined if str contains too many -// characters to be indexable by size_t, in which case the test will -// probably time out anyway. We are fine with this limitation as -// std::string has it too. -bool MatchRepetitionAndRegexAtHead( - bool escaped, char c, char repeat, const char* regex, - const char* str) { - const size_t min_count = (repeat == '+') ? 1 : 0; - const size_t max_count = (repeat == '?') ? 1 : - static_cast(-1) - 1; - // We cannot call numeric_limits::max() as it conflicts with the - // max() macro on Windows. - - for (size_t i = 0; i <= max_count; ++i) { - // We know that the atom matches each of the first i characters in str. - if (i >= min_count && MatchRegexAtHead(regex, str + i)) { - // We have enough matches at the head, and the tail matches too. - // Since we only care about *whether* the pattern matches str - // (as opposed to *how* it matches), there is no need to find a - // greedy match. - return true; - } - if (str[i] == '\0' || !AtomMatchesChar(escaped, c, str[i])) - return false; - } - return false; -} - -// Returns true iff regex matches a prefix of str. regex must be a -// valid simple regular expression and not start with "^", or the -// result is undefined. -bool MatchRegexAtHead(const char* regex, const char* str) { - if (*regex == '\0') // An empty regex matches a prefix of anything. - return true; - - // "$" only matches the end of a string. Note that regex being - // valid guarantees that there's nothing after "$" in it. - if (*regex == '$') - return *str == '\0'; - - // Is the first thing in regex an escape sequence? - const bool escaped = *regex == '\\'; - if (escaped) - ++regex; - if (IsRepeat(regex[1])) { - // MatchRepetitionAndRegexAtHead() calls MatchRegexAtHead(), so - // here's an indirect recursion. It terminates as the regex gets - // shorter in each recursion. - return MatchRepetitionAndRegexAtHead( - escaped, regex[0], regex[1], regex + 2, str); - } else { - // regex isn't empty, isn't "$", and doesn't start with a - // repetition. We match the first atom of regex with the first - // character of str and recurse. - return (*str != '\0') && AtomMatchesChar(escaped, *regex, *str) && - MatchRegexAtHead(regex + 1, str + 1); - } -} - -// Returns true iff regex matches any substring of str. regex must be -// a valid simple regular expression, or the result is undefined. -// -// The algorithm is recursive, but the recursion depth doesn't exceed -// the regex length, so we won't need to worry about running out of -// stack space normally. In rare cases the time complexity can be -// exponential with respect to the regex length + the string length, -// but usually it's must faster (often close to linear). -bool MatchRegexAnywhere(const char* regex, const char* str) { - if (regex == NULL || str == NULL) - return false; - - if (*regex == '^') - return MatchRegexAtHead(regex + 1, str); - - // A successful match can be anywhere in str. - do { - if (MatchRegexAtHead(regex, str)) - return true; - } while (*str++ != '\0'); - return false; -} - -// Implements the RE class. - -RE::~RE() { - free(const_cast(pattern_)); - free(const_cast(full_pattern_)); -} - -// Returns true iff regular expression re matches the entire str. -bool RE::FullMatch(const char* str, const RE& re) { - return re.is_valid_ && MatchRegexAnywhere(re.full_pattern_, str); -} - -// Returns true iff regular expression re matches a substring of str -// (including str itself). -bool RE::PartialMatch(const char* str, const RE& re) { - return re.is_valid_ && MatchRegexAnywhere(re.pattern_, str); -} - -// Initializes an RE from its string representation. -void RE::Init(const char* regex) { - pattern_ = full_pattern_ = NULL; - if (regex != NULL) { - pattern_ = posix::StrDup(regex); - } - - is_valid_ = ValidateRegex(regex); - if (!is_valid_) { - // No need to calculate the full pattern when the regex is invalid. - return; - } - - const size_t len = strlen(regex); - // Reserves enough bytes to hold the regular expression used for a - // full match: we need space to prepend a '^', append a '$', and - // terminate the string with '\0'. - char* buffer = static_cast(malloc(len + 3)); - full_pattern_ = buffer; - - if (*regex != '^') - *buffer++ = '^'; // Makes sure full_pattern_ starts with '^'. - - // We don't use snprintf or strncpy, as they trigger a warning when - // compiled with VC++ 8.0. - memcpy(buffer, regex, len); - buffer += len; - - if (len == 0 || regex[len - 1] != '$') - *buffer++ = '$'; // Makes sure full_pattern_ ends with '$'. - - *buffer = '\0'; -} - -#endif // GTEST_USES_POSIX_RE - -const char kUnknownFile[] = "unknown file"; - -// Formats a source file path and a line number as they would appear -// in an error message from the compiler used to compile this code. -GTEST_API_ ::std::string FormatFileLocation(const char* file, int line) { - const std::string file_name(file == NULL ? kUnknownFile : file); - - if (line < 0) { - return file_name + ":"; - } -#ifdef _MSC_VER - return file_name + "(" + StreamableToString(line) + "):"; -#else - return file_name + ":" + StreamableToString(line) + ":"; -#endif // _MSC_VER -} - -// Formats a file location for compiler-independent XML output. -// Although this function is not platform dependent, we put it next to -// FormatFileLocation in order to contrast the two functions. -// Note that FormatCompilerIndependentFileLocation() does NOT append colon -// to the file location it produces, unlike FormatFileLocation(). -GTEST_API_ ::std::string FormatCompilerIndependentFileLocation( - const char* file, int line) { - const std::string file_name(file == NULL ? kUnknownFile : file); - - if (line < 0) - return file_name; - else - return file_name + ":" + StreamableToString(line); -} - -GTestLog::GTestLog(GTestLogSeverity severity, const char* file, int line) - : severity_(severity) { - const char* const marker = - severity == GTEST_INFO ? "[ INFO ]" : - severity == GTEST_WARNING ? "[WARNING]" : - severity == GTEST_ERROR ? "[ ERROR ]" : "[ FATAL ]"; - GetStream() << ::std::endl << marker << " " - << FormatFileLocation(file, line).c_str() << ": "; -} - -// Flushes the buffers and, if severity is GTEST_FATAL, aborts the program. -GTestLog::~GTestLog() { - GetStream() << ::std::endl; - if (severity_ == GTEST_FATAL) { - fflush(stderr); - posix::Abort(); - } -} - -// Disable Microsoft deprecation warnings for POSIX functions called from -// this class (creat, dup, dup2, and close) -GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996) - -#if GTEST_HAS_STREAM_REDIRECTION - -// Object that captures an output stream (stdout/stderr). -class CapturedStream { - public: - // The ctor redirects the stream to a temporary file. - explicit CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) { -# if GTEST_OS_WINDOWS - char temp_dir_path[MAX_PATH + 1] = { '\0' }; // NOLINT - char temp_file_path[MAX_PATH + 1] = { '\0' }; // NOLINT - - ::GetTempPathA(sizeof(temp_dir_path), temp_dir_path); - const UINT success = ::GetTempFileNameA(temp_dir_path, - "gtest_redir", - 0, // Generate unique file name. - temp_file_path); - GTEST_CHECK_(success != 0) - << "Unable to create a temporary file in " << temp_dir_path; - const int captured_fd = creat(temp_file_path, _S_IREAD | _S_IWRITE); - GTEST_CHECK_(captured_fd != -1) << "Unable to open temporary file " - << temp_file_path; - filename_ = temp_file_path; -# else - // There's no guarantee that a test has write access to the current - // directory, so we create the temporary file in the /tmp directory - // instead. We use /tmp on most systems, and /sdcard on Android. - // That's because Android doesn't have /tmp. -# if GTEST_OS_LINUX_ANDROID - // Note: Android applications are expected to call the framework's - // Context.getExternalStorageDirectory() method through JNI to get - // the location of the world-writable SD Card directory. However, - // this requires a Context handle, which cannot be retrieved - // globally from native code. Doing so also precludes running the - // code as part of a regular standalone executable, which doesn't - // run in a Dalvik process (e.g. when running it through 'adb shell'). - // - // The location /sdcard is directly accessible from native code - // and is the only location (unofficially) supported by the Android - // team. It's generally a symlink to the real SD Card mount point - // which can be /mnt/sdcard, /mnt/sdcard0, /system/media/sdcard, or - // other OEM-customized locations. Never rely on these, and always - // use /sdcard. - char name_template[] = "/sdcard/gtest_captured_stream.XXXXXX"; -# else - char name_template[] = "/tmp/captured_stream.XXXXXX"; -# endif // GTEST_OS_LINUX_ANDROID - const int captured_fd = mkstemp(name_template); - filename_ = name_template; -# endif // GTEST_OS_WINDOWS - fflush(NULL); - dup2(captured_fd, fd_); - close(captured_fd); - } - - ~CapturedStream() { - remove(filename_.c_str()); - } - - std::string GetCapturedString() { - if (uncaptured_fd_ != -1) { - // Restores the original stream. - fflush(NULL); - dup2(uncaptured_fd_, fd_); - close(uncaptured_fd_); - uncaptured_fd_ = -1; - } - - FILE* const file = posix::FOpen(filename_.c_str(), "r"); - const std::string content = ReadEntireFile(file); - posix::FClose(file); - return content; - } - - private: - const int fd_; // A stream to capture. - int uncaptured_fd_; - // Name of the temporary file holding the stderr output. - ::std::string filename_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(CapturedStream); -}; - -GTEST_DISABLE_MSC_WARNINGS_POP_() - -static CapturedStream* g_captured_stderr = NULL; -static CapturedStream* g_captured_stdout = NULL; - -// Starts capturing an output stream (stdout/stderr). -static void CaptureStream(int fd, const char* stream_name, - CapturedStream** stream) { - if (*stream != NULL) { - GTEST_LOG_(FATAL) << "Only one " << stream_name - << " capturer can exist at a time."; - } - *stream = new CapturedStream(fd); -} - -// Stops capturing the output stream and returns the captured string. -static std::string GetCapturedStream(CapturedStream** captured_stream) { - const std::string content = (*captured_stream)->GetCapturedString(); - - delete *captured_stream; - *captured_stream = NULL; - - return content; -} - -// Starts capturing stdout. -void CaptureStdout() { - CaptureStream(kStdOutFileno, "stdout", &g_captured_stdout); -} - -// Starts capturing stderr. -void CaptureStderr() { - CaptureStream(kStdErrFileno, "stderr", &g_captured_stderr); -} - -// Stops capturing stdout and returns the captured string. -std::string GetCapturedStdout() { - return GetCapturedStream(&g_captured_stdout); -} - -// Stops capturing stderr and returns the captured string. -std::string GetCapturedStderr() { - return GetCapturedStream(&g_captured_stderr); -} - -#endif // GTEST_HAS_STREAM_REDIRECTION - - - - - -size_t GetFileSize(FILE* file) { - fseek(file, 0, SEEK_END); - return static_cast(ftell(file)); -} - -std::string ReadEntireFile(FILE* file) { - const size_t file_size = GetFileSize(file); - char* const buffer = new char[file_size]; - - size_t bytes_last_read = 0; // # of bytes read in the last fread() - size_t bytes_read = 0; // # of bytes read so far - - fseek(file, 0, SEEK_SET); - - // Keeps reading the file until we cannot read further or the - // pre-determined file size is reached. - do { - bytes_last_read = fread(buffer+bytes_read, 1, file_size-bytes_read, file); - bytes_read += bytes_last_read; - } while (bytes_last_read > 0 && bytes_read < file_size); - - const std::string content(buffer, bytes_read); - delete[] buffer; - - return content; -} - -#if GTEST_HAS_DEATH_TEST -static const std::vector* g_injected_test_argvs = NULL; // Owned. - -std::vector GetInjectableArgvs() { - if (g_injected_test_argvs != NULL) { - return *g_injected_test_argvs; - } - return GetArgvs(); -} - -void SetInjectableArgvs(const std::vector* new_argvs) { - if (g_injected_test_argvs != new_argvs) delete g_injected_test_argvs; - g_injected_test_argvs = new_argvs; -} - -void SetInjectableArgvs(const std::vector& new_argvs) { - SetInjectableArgvs( - new std::vector(new_argvs.begin(), new_argvs.end())); -} - -#if GTEST_HAS_GLOBAL_STRING -void SetInjectableArgvs(const std::vector< ::string>& new_argvs) { - SetInjectableArgvs( - new std::vector(new_argvs.begin(), new_argvs.end())); -} -#endif // GTEST_HAS_GLOBAL_STRING - -void ClearInjectableArgvs() { - delete g_injected_test_argvs; - g_injected_test_argvs = NULL; -} -#endif // GTEST_HAS_DEATH_TEST - -#if GTEST_OS_WINDOWS_MOBILE -namespace posix { -void Abort() { - DebugBreak(); - TerminateProcess(GetCurrentProcess(), 1); -} -} // namespace posix -#endif // GTEST_OS_WINDOWS_MOBILE - -// Returns the name of the environment variable corresponding to the -// given flag. For example, FlagToEnvVar("foo") will return -// "GTEST_FOO" in the open-source version. -static std::string FlagToEnvVar(const char* flag) { - const std::string full_flag = - (Message() << GTEST_FLAG_PREFIX_ << flag).GetString(); - - Message env_var; - for (size_t i = 0; i != full_flag.length(); i++) { - env_var << ToUpper(full_flag.c_str()[i]); - } - - return env_var.GetString(); -} - -// Parses 'str' for a 32-bit signed integer. If successful, writes -// the result to *value and returns true; otherwise leaves *value -// unchanged and returns false. -bool ParseInt32(const Message& src_text, const char* str, Int32* value) { - // Parses the environment variable as a decimal integer. - char* end = NULL; - const long long_value = strtol(str, &end, 10); // NOLINT - - // Has strtol() consumed all characters in the string? - if (*end != '\0') { - // No - an invalid character was encountered. - Message msg; - msg << "WARNING: " << src_text - << " is expected to be a 32-bit integer, but actually" - << " has value \"" << str << "\".\n"; - printf("%s", msg.GetString().c_str()); - fflush(stdout); - return false; - } - - // Is the parsed value in the range of an Int32? - const Int32 result = static_cast(long_value); - if (long_value == LONG_MAX || long_value == LONG_MIN || - // The parsed value overflows as a long. (strtol() returns - // LONG_MAX or LONG_MIN when the input overflows.) - result != long_value - // The parsed value overflows as an Int32. - ) { - Message msg; - msg << "WARNING: " << src_text - << " is expected to be a 32-bit integer, but actually" - << " has value " << str << ", which overflows.\n"; - printf("%s", msg.GetString().c_str()); - fflush(stdout); - return false; - } - - *value = result; - return true; -} - -// Reads and returns the Boolean environment variable corresponding to -// the given flag; if it's not set, returns default_value. -// -// The value is considered true iff it's not "0". -bool BoolFromGTestEnv(const char* flag, bool default_value) { -#if defined(GTEST_GET_BOOL_FROM_ENV_) - return GTEST_GET_BOOL_FROM_ENV_(flag, default_value); -#else - const std::string env_var = FlagToEnvVar(flag); - const char* const string_value = posix::GetEnv(env_var.c_str()); - return string_value == NULL ? - default_value : strcmp(string_value, "0") != 0; -#endif // defined(GTEST_GET_BOOL_FROM_ENV_) -} - -// Reads and returns a 32-bit integer stored in the environment -// variable corresponding to the given flag; if it isn't set or -// doesn't represent a valid 32-bit integer, returns default_value. -Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) { -#if defined(GTEST_GET_INT32_FROM_ENV_) - return GTEST_GET_INT32_FROM_ENV_(flag, default_value); -#else - const std::string env_var = FlagToEnvVar(flag); - const char* const string_value = posix::GetEnv(env_var.c_str()); - if (string_value == NULL) { - // The environment variable is not set. - return default_value; - } - - Int32 result = default_value; - if (!ParseInt32(Message() << "Environment variable " << env_var, - string_value, &result)) { - printf("The default value %s is used.\n", - (Message() << default_value).GetString().c_str()); - fflush(stdout); - return default_value; - } - - return result; -#endif // defined(GTEST_GET_INT32_FROM_ENV_) -} - -// As a special case for the 'output' flag, if GTEST_OUTPUT is not -// set, we look for XML_OUTPUT_FILE, which is set by the Bazel build -// system. The value of XML_OUTPUT_FILE is a filename without the -// "xml:" prefix of GTEST_OUTPUT. -// Note that this is meant to be called at the call site so it does -// not check that the flag is 'output' -// In essence this checks an env variable called XML_OUTPUT_FILE -// and if it is set we prepend "xml:" to its value, if it not set we return "" -std::string OutputFlagAlsoCheckEnvVar(){ - std::string default_value_for_output_flag = ""; - const char* xml_output_file_env = posix::GetEnv("XML_OUTPUT_FILE"); - if (NULL != xml_output_file_env) { - default_value_for_output_flag = std::string("xml:") + xml_output_file_env; - } - return default_value_for_output_flag; -} - -// Reads and returns the string environment variable corresponding to -// the given flag; if it's not set, returns default_value. -const char* StringFromGTestEnv(const char* flag, const char* default_value) { -#if defined(GTEST_GET_STRING_FROM_ENV_) - return GTEST_GET_STRING_FROM_ENV_(flag, default_value); -#else - const std::string env_var = FlagToEnvVar(flag); - const char* const value = posix::GetEnv(env_var.c_str()); - return value == NULL ? default_value : value; -#endif // defined(GTEST_GET_STRING_FROM_ENV_) -} - -} // namespace internal -} // namespace testing diff --git a/test/gtest-1.8.0/src/gtest-printers.cc b/test/gtest-1.8.0/src/gtest-printers.cc deleted file mode 100644 index eeba17fbf9..0000000000 --- a/test/gtest-1.8.0/src/gtest-printers.cc +++ /dev/null @@ -1,458 +0,0 @@ -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Test - The Google C++ Testing and Mocking Framework -// -// This file implements a universal value printer that can print a -// value of any type T: -// -// void ::testing::internal::UniversalPrinter::Print(value, ostream_ptr); -// -// It uses the << operator when possible, and prints the bytes in the -// object otherwise. A user can override its behavior for a class -// type Foo by defining either operator<<(::std::ostream&, const Foo&) -// or void PrintTo(const Foo&, ::std::ostream*) in the namespace that -// defines Foo. - -#include "gtest/gtest-printers.h" -#include -#include -#include -#include // NOLINT -#include -#include "gtest/internal/gtest-port.h" -#include "src/gtest-internal-inl.h" - -namespace testing { - -namespace { - -using ::std::ostream; - -// Prints a segment of bytes in the given object. -GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ -GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ -GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ -void PrintByteSegmentInObjectTo(const unsigned char* obj_bytes, size_t start, - size_t count, ostream* os) { - char text[5] = ""; - for (size_t i = 0; i != count; i++) { - const size_t j = start + i; - if (i != 0) { - // Organizes the bytes into groups of 2 for easy parsing by - // human. - if ((j % 2) == 0) - *os << ' '; - else - *os << '-'; - } - GTEST_SNPRINTF_(text, sizeof(text), "%02X", obj_bytes[j]); - *os << text; - } -} - -// Prints the bytes in the given value to the given ostream. -void PrintBytesInObjectToImpl(const unsigned char* obj_bytes, size_t count, - ostream* os) { - // Tells the user how big the object is. - *os << count << "-byte object <"; - - const size_t kThreshold = 132; - const size_t kChunkSize = 64; - // If the object size is bigger than kThreshold, we'll have to omit - // some details by printing only the first and the last kChunkSize - // bytes. - // TODO(wan): let the user control the threshold using a flag. - if (count < kThreshold) { - PrintByteSegmentInObjectTo(obj_bytes, 0, count, os); - } else { - PrintByteSegmentInObjectTo(obj_bytes, 0, kChunkSize, os); - *os << " ... "; - // Rounds up to 2-byte boundary. - const size_t resume_pos = (count - kChunkSize + 1)/2*2; - PrintByteSegmentInObjectTo(obj_bytes, resume_pos, count - resume_pos, os); - } - *os << ">"; -} - -} // namespace - -namespace internal2 { - -// Delegates to PrintBytesInObjectToImpl() to print the bytes in the -// given object. The delegation simplifies the implementation, which -// uses the << operator and thus is easier done outside of the -// ::testing::internal namespace, which contains a << operator that -// sometimes conflicts with the one in STL. -void PrintBytesInObjectTo(const unsigned char* obj_bytes, size_t count, - ostream* os) { - PrintBytesInObjectToImpl(obj_bytes, count, os); -} - -} // namespace internal2 - -namespace internal { - -// Depending on the value of a char (or wchar_t), we print it in one -// of three formats: -// - as is if it's a printable ASCII (e.g. 'a', '2', ' '), -// - as a hexadecimal escape sequence (e.g. '\x7F'), or -// - as a special escape sequence (e.g. '\r', '\n'). -enum CharFormat { - kAsIs, - kHexEscape, - kSpecialEscape -}; - -// Returns true if c is a printable ASCII character. We test the -// value of c directly instead of calling isprint(), which is buggy on -// Windows Mobile. -inline bool IsPrintableAscii(wchar_t c) { - return 0x20 <= c && c <= 0x7E; -} - -// Prints a wide or narrow char c as a character literal without the -// quotes, escaping it when necessary; returns how c was formatted. -// The template argument UnsignedChar is the unsigned version of Char, -// which is the type of c. -template -static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) { - switch (static_cast(c)) { - case L'\0': - *os << "\\0"; - break; - case L'\'': - *os << "\\'"; - break; - case L'\\': - *os << "\\\\"; - break; - case L'\a': - *os << "\\a"; - break; - case L'\b': - *os << "\\b"; - break; - case L'\f': - *os << "\\f"; - break; - case L'\n': - *os << "\\n"; - break; - case L'\r': - *os << "\\r"; - break; - case L'\t': - *os << "\\t"; - break; - case L'\v': - *os << "\\v"; - break; - default: - if (IsPrintableAscii(c)) { - *os << static_cast(c); - return kAsIs; - } else { - ostream::fmtflags flags = os->flags(); - *os << "\\x" << std::hex << std::uppercase - << static_cast(static_cast(c)); - os->flags(flags); - return kHexEscape; - } - } - return kSpecialEscape; -} - -// Prints a wchar_t c as if it's part of a string literal, escaping it when -// necessary; returns how c was formatted. -static CharFormat PrintAsStringLiteralTo(wchar_t c, ostream* os) { - switch (c) { - case L'\'': - *os << "'"; - return kAsIs; - case L'"': - *os << "\\\""; - return kSpecialEscape; - default: - return PrintAsCharLiteralTo(c, os); - } -} - -// Prints a char c as if it's part of a string literal, escaping it when -// necessary; returns how c was formatted. -static CharFormat PrintAsStringLiteralTo(char c, ostream* os) { - return PrintAsStringLiteralTo( - static_cast(static_cast(c)), os); -} - -// Prints a wide or narrow character c and its code. '\0' is printed -// as "'\\0'", other unprintable characters are also properly escaped -// using the standard C++ escape sequence. The template argument -// UnsignedChar is the unsigned version of Char, which is the type of c. -template -void PrintCharAndCodeTo(Char c, ostream* os) { - // First, print c as a literal in the most readable form we can find. - *os << ((sizeof(c) > 1) ? "L'" : "'"); - const CharFormat format = PrintAsCharLiteralTo(c, os); - *os << "'"; - - // To aid user debugging, we also print c's code in decimal, unless - // it's 0 (in which case c was printed as '\\0', making the code - // obvious). - if (c == 0) - return; - *os << " (" << static_cast(c); - - // For more convenience, we print c's code again in hexadecimal, - // unless c was already printed in the form '\x##' or the code is in - // [1, 9]. - if (format == kHexEscape || (1 <= c && c <= 9)) { - // Do nothing. - } else { - *os << ", 0x" << String::FormatHexInt(static_cast(c)); - } - *os << ")"; -} - -void PrintTo(unsigned char c, ::std::ostream* os) { - PrintCharAndCodeTo(c, os); -} -void PrintTo(signed char c, ::std::ostream* os) { - PrintCharAndCodeTo(c, os); -} - -// Prints a wchar_t as a symbol if it is printable or as its internal -// code otherwise and also as its code. L'\0' is printed as "L'\\0'". -void PrintTo(wchar_t wc, ostream* os) { - PrintCharAndCodeTo(wc, os); -} - -// Prints the given array of characters to the ostream. CharType must be either -// char or wchar_t. -// The array starts at begin, the length is len, it may include '\0' characters -// and may not be NUL-terminated. -template -GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ -GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ -GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ -static CharFormat PrintCharsAsStringTo( - const CharType* begin, size_t len, ostream* os) { - const char* const kQuoteBegin = sizeof(CharType) == 1 ? "\"" : "L\""; - *os << kQuoteBegin; - bool is_previous_hex = false; - CharFormat print_format = kAsIs; - for (size_t index = 0; index < len; ++index) { - const CharType cur = begin[index]; - if (is_previous_hex && IsXDigit(cur)) { - // Previous character is of '\x..' form and this character can be - // interpreted as another hexadecimal digit in its number. Break string to - // disambiguate. - *os << "\" " << kQuoteBegin; - } - is_previous_hex = PrintAsStringLiteralTo(cur, os) == kHexEscape; - // Remember if any characters required hex escaping. - if (is_previous_hex) { - print_format = kHexEscape; - } - } - *os << "\""; - return print_format; -} - -// Prints a (const) char/wchar_t array of 'len' elements, starting at address -// 'begin'. CharType must be either char or wchar_t. -template -GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ -GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ -GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ -static void UniversalPrintCharArray( - const CharType* begin, size_t len, ostream* os) { - // The code - // const char kFoo[] = "foo"; - // generates an array of 4, not 3, elements, with the last one being '\0'. - // - // Therefore when printing a char array, we don't print the last element if - // it's '\0', such that the output matches the string literal as it's - // written in the source code. - if (len > 0 && begin[len - 1] == '\0') { - PrintCharsAsStringTo(begin, len - 1, os); - return; - } - - // If, however, the last element in the array is not '\0', e.g. - // const char kFoo[] = { 'f', 'o', 'o' }; - // we must print the entire array. We also print a message to indicate - // that the array is not NUL-terminated. - PrintCharsAsStringTo(begin, len, os); - *os << " (no terminating NUL)"; -} - -// Prints a (const) char array of 'len' elements, starting at address 'begin'. -void UniversalPrintArray(const char* begin, size_t len, ostream* os) { - UniversalPrintCharArray(begin, len, os); -} - -// Prints a (const) wchar_t array of 'len' elements, starting at address -// 'begin'. -void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) { - UniversalPrintCharArray(begin, len, os); -} - -// Prints the given C string to the ostream. -void PrintTo(const char* s, ostream* os) { - if (s == NULL) { - *os << "NULL"; - } else { - *os << ImplicitCast_(s) << " pointing to "; - PrintCharsAsStringTo(s, strlen(s), os); - } -} - -// MSVC compiler can be configured to define whar_t as a typedef -// of unsigned short. Defining an overload for const wchar_t* in that case -// would cause pointers to unsigned shorts be printed as wide strings, -// possibly accessing more memory than intended and causing invalid -// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when -// wchar_t is implemented as a native type. -#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED) -// Prints the given wide C string to the ostream. -void PrintTo(const wchar_t* s, ostream* os) { - if (s == NULL) { - *os << "NULL"; - } else { - *os << ImplicitCast_(s) << " pointing to "; - PrintCharsAsStringTo(s, std::wcslen(s), os); - } -} -#endif // wchar_t is native - -namespace { - -bool ContainsUnprintableControlCodes(const char* str, size_t length) { - const unsigned char *s = reinterpret_cast(str); - - for (size_t i = 0; i < length; i++) { - unsigned char ch = *s++; - if (std::iscntrl(ch)) { - switch (ch) { - case '\t': - case '\n': - case '\r': - break; - default: - return true; - } - } - } - return false; -} - -bool IsUTF8TrailByte(unsigned char t) { return 0x80 <= t && t<= 0xbf; } - -bool IsValidUTF8(const char* str, size_t length) { - const unsigned char *s = reinterpret_cast(str); - - for (size_t i = 0; i < length;) { - unsigned char lead = s[i++]; - - if (lead <= 0x7f) { - continue; // single-byte character (ASCII) 0..7F - } - if (lead < 0xc2) { - return false; // trail byte or non-shortest form - } else if (lead <= 0xdf && (i + 1) <= length && IsUTF8TrailByte(s[i])) { - ++i; // 2-byte character - } else if (0xe0 <= lead && lead <= 0xef && (i + 2) <= length && - IsUTF8TrailByte(s[i]) && - IsUTF8TrailByte(s[i + 1]) && - // check for non-shortest form and surrogate - (lead != 0xe0 || s[i] >= 0xa0) && - (lead != 0xed || s[i] < 0xa0)) { - i += 2; // 3-byte character - } else if (0xf0 <= lead && lead <= 0xf4 && (i + 3) <= length && - IsUTF8TrailByte(s[i]) && - IsUTF8TrailByte(s[i + 1]) && - IsUTF8TrailByte(s[i + 2]) && - // check for non-shortest form - (lead != 0xf0 || s[i] >= 0x90) && - (lead != 0xf4 || s[i] < 0x90)) { - i += 3; // 4-byte character - } else { - return false; - } - } - return true; -} - -void ConditionalPrintAsText(const char* str, size_t length, ostream* os) { - if (!ContainsUnprintableControlCodes(str, length) && - IsValidUTF8(str, length)) { - *os << "\n As Text: \"" << str << "\""; - } -} - -} // anonymous namespace - -// Prints a ::string object. -#if GTEST_HAS_GLOBAL_STRING -void PrintStringTo(const ::string& s, ostream* os) { - if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) { - if (GTEST_FLAG(print_utf8)) { - ConditionalPrintAsText(s.data(), s.size(), os); - } - } -} -#endif // GTEST_HAS_GLOBAL_STRING - -void PrintStringTo(const ::std::string& s, ostream* os) { - if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) { - if (GTEST_FLAG(print_utf8)) { - ConditionalPrintAsText(s.data(), s.size(), os); - } - } -} - -// Prints a ::wstring object. -#if GTEST_HAS_GLOBAL_WSTRING -void PrintWideStringTo(const ::wstring& s, ostream* os) { - PrintCharsAsStringTo(s.data(), s.size(), os); -} -#endif // GTEST_HAS_GLOBAL_WSTRING - -#if GTEST_HAS_STD_WSTRING -void PrintWideStringTo(const ::std::wstring& s, ostream* os) { - PrintCharsAsStringTo(s.data(), s.size(), os); -} -#endif // GTEST_HAS_STD_WSTRING - -} // namespace internal - -} // namespace testing diff --git a/test/gtest-1.8.0/src/gtest-test-part.cc b/test/gtest-1.8.0/src/gtest-test-part.cc deleted file mode 100644 index 4c5f2e378e..0000000000 --- a/test/gtest-1.8.0/src/gtest-test-part.cc +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: mheule@google.com (Markus Heule) -// -// The Google C++ Testing and Mocking Framework (Google Test) - -#include "gtest/gtest-test-part.h" -#include "src/gtest-internal-inl.h" - -namespace testing { - -using internal::GetUnitTestImpl; - -// Gets the summary of the failure message by omitting the stack trace -// in it. -std::string TestPartResult::ExtractSummary(const char* message) { - const char* const stack_trace = strstr(message, internal::kStackTraceMarker); - return stack_trace == NULL ? message : - std::string(message, stack_trace); -} - -// Prints a TestPartResult object. -std::ostream& operator<<(std::ostream& os, const TestPartResult& result) { - return os - << result.file_name() << ":" << result.line_number() << ": " - << (result.type() == TestPartResult::kSuccess ? "Success" : - result.type() == TestPartResult::kFatalFailure ? "Fatal failure" : - "Non-fatal failure") << ":\n" - << result.message() << std::endl; -} - -// Appends a TestPartResult to the array. -void TestPartResultArray::Append(const TestPartResult& result) { - array_.push_back(result); -} - -// Returns the TestPartResult at the given index (0-based). -const TestPartResult& TestPartResultArray::GetTestPartResult(int index) const { - if (index < 0 || index >= size()) { - printf("\nInvalid index (%d) into TestPartResultArray.\n", index); - internal::posix::Abort(); - } - - return array_[index]; -} - -// Returns the number of TestPartResult objects in the array. -int TestPartResultArray::size() const { - return static_cast(array_.size()); -} - -namespace internal { - -HasNewFatalFailureHelper::HasNewFatalFailureHelper() - : has_new_fatal_failure_(false), - original_reporter_(GetUnitTestImpl()-> - GetTestPartResultReporterForCurrentThread()) { - GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(this); -} - -HasNewFatalFailureHelper::~HasNewFatalFailureHelper() { - GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread( - original_reporter_); -} - -void HasNewFatalFailureHelper::ReportTestPartResult( - const TestPartResult& result) { - if (result.fatally_failed()) - has_new_fatal_failure_ = true; - original_reporter_->ReportTestPartResult(result); -} - -} // namespace internal - -} // namespace testing diff --git a/test/gtest-1.8.0/src/gtest-typed-test.cc b/test/gtest-1.8.0/src/gtest-typed-test.cc deleted file mode 100644 index b358243465..0000000000 --- a/test/gtest-1.8.0/src/gtest-typed-test.cc +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -#include "gtest/gtest-typed-test.h" - -#include "gtest/gtest.h" - -namespace testing { -namespace internal { - -#if GTEST_HAS_TYPED_TEST_P - -// Skips to the first non-space char in str. Returns an empty string if str -// contains only whitespace characters. -static const char* SkipSpaces(const char* str) { - while (IsSpace(*str)) - str++; - return str; -} - -static std::vector SplitIntoTestNames(const char* src) { - std::vector name_vec; - src = SkipSpaces(src); - for (; src != NULL; src = SkipComma(src)) { - name_vec.push_back(StripTrailingSpaces(GetPrefixUntilComma(src))); - } - return name_vec; -} - -// Verifies that registered_tests match the test names in -// registered_tests_; returns registered_tests if successful, or -// aborts the program otherwise. -const char* TypedTestCasePState::VerifyRegisteredTestNames( - const char* file, int line, const char* registered_tests) { - typedef RegisteredTestsMap::const_iterator RegisteredTestIter; - registered_ = true; - - std::vector name_vec = SplitIntoTestNames(registered_tests); - - Message errors; - - std::set tests; - for (std::vector::const_iterator name_it = name_vec.begin(); - name_it != name_vec.end(); ++name_it) { - const std::string& name = *name_it; - if (tests.count(name) != 0) { - errors << "Test " << name << " is listed more than once.\n"; - continue; - } - - bool found = false; - for (RegisteredTestIter it = registered_tests_.begin(); - it != registered_tests_.end(); - ++it) { - if (name == it->first) { - found = true; - break; - } - } - - if (found) { - tests.insert(name); - } else { - errors << "No test named " << name - << " can be found in this test case.\n"; - } - } - - for (RegisteredTestIter it = registered_tests_.begin(); - it != registered_tests_.end(); - ++it) { - if (tests.count(it->first) == 0) { - errors << "You forgot to list test " << it->first << ".\n"; - } - } - - const std::string& errors_str = errors.GetString(); - if (errors_str != "") { - fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(), - errors_str.c_str()); - fflush(stderr); - posix::Abort(); - } - - return registered_tests; -} - -#endif // GTEST_HAS_TYPED_TEST_P - -} // namespace internal -} // namespace testing diff --git a/test/gtest-1.8.0/src/gtest.cc b/test/gtest-1.8.0/src/gtest.cc deleted file mode 100644 index 5406392dde..0000000000 --- a/test/gtest-1.8.0/src/gtest.cc +++ /dev/null @@ -1,5845 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// The Google C++ Testing and Mocking Framework (Google Test) - -#include "gtest/gtest.h" -#include "gtest/internal/custom/gtest.h" -#include "gtest/gtest-spi.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include // NOLINT -#include -#include - -#if GTEST_OS_LINUX - -// TODO(kenton@google.com): Use autoconf to detect availability of -// gettimeofday(). -# define GTEST_HAS_GETTIMEOFDAY_ 1 - -# include // NOLINT -# include // NOLINT -# include // NOLINT -// Declares vsnprintf(). This header is not available on Windows. -# include // NOLINT -# include // NOLINT -# include // NOLINT -# include // NOLINT -# include - -#elif GTEST_OS_SYMBIAN -# define GTEST_HAS_GETTIMEOFDAY_ 1 -# include // NOLINT - -#elif GTEST_OS_ZOS -# define GTEST_HAS_GETTIMEOFDAY_ 1 -# include // NOLINT - -// On z/OS we additionally need strings.h for strcasecmp. -# include // NOLINT - -#elif GTEST_OS_WINDOWS_MOBILE // We are on Windows CE. - -# include // NOLINT -# undef min - -#elif GTEST_OS_WINDOWS // We are on Windows proper. - -# include // NOLINT -# include // NOLINT -# include // NOLINT -# include // NOLINT - -# if GTEST_OS_WINDOWS_MINGW -// MinGW has gettimeofday() but not _ftime64(). -// TODO(kenton@google.com): Use autoconf to detect availability of -// gettimeofday(). -// TODO(kenton@google.com): There are other ways to get the time on -// Windows, like GetTickCount() or GetSystemTimeAsFileTime(). MinGW -// supports these. consider using them instead. -# define GTEST_HAS_GETTIMEOFDAY_ 1 -# include // NOLINT -# endif // GTEST_OS_WINDOWS_MINGW - -// cpplint thinks that the header is already included, so we want to -// silence it. -# include // NOLINT -# undef min - -#else - -// Assume other platforms have gettimeofday(). -// TODO(kenton@google.com): Use autoconf to detect availability of -// gettimeofday(). -# define GTEST_HAS_GETTIMEOFDAY_ 1 - -// cpplint thinks that the header is already included, so we want to -// silence it. -# include // NOLINT -# include // NOLINT - -#endif // GTEST_OS_LINUX - -#if GTEST_HAS_EXCEPTIONS -# include -#endif - -#if GTEST_CAN_STREAM_RESULTS_ -# include // NOLINT -# include // NOLINT -# include // NOLINT -# include // NOLINT -#endif - -#include "src/gtest-internal-inl.h" - -#if GTEST_OS_WINDOWS -# define vsnprintf _vsnprintf -#endif // GTEST_OS_WINDOWS - -namespace testing { - -using internal::CountIf; -using internal::ForEach; -using internal::GetElementOr; -using internal::Shuffle; - -// Constants. - -// A test whose test case name or test name matches this filter is -// disabled and not run. -static const char kDisableTestFilter[] = "DISABLED_*:*/DISABLED_*"; - -// A test case whose name matches this filter is considered a death -// test case and will be run before test cases whose name doesn't -// match this filter. -static const char kDeathTestCaseFilter[] = "*DeathTest:*DeathTest/*"; - -// A test filter that matches everything. -static const char kUniversalFilter[] = "*"; - -// The default output format. -static const char kDefaultOutputFormat[] = "xml"; -// The default output file. -static const char kDefaultOutputFile[] = "test_detail"; - -// The environment variable name for the test shard index. -static const char kTestShardIndex[] = "GTEST_SHARD_INDEX"; -// The environment variable name for the total number of test shards. -static const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS"; -// The environment variable name for the test shard status file. -static const char kTestShardStatusFile[] = "GTEST_SHARD_STATUS_FILE"; - -namespace internal { - -// The text used in failure messages to indicate the start of the -// stack trace. -const char kStackTraceMarker[] = "\nStack trace:\n"; - -// g_help_flag is true iff the --help flag or an equivalent form is -// specified on the command line. -bool g_help_flag = false; - -} // namespace internal - -static const char* GetDefaultFilter() { -#ifdef GTEST_TEST_FILTER_ENV_VAR_ - const char* const testbridge_test_only = getenv(GTEST_TEST_FILTER_ENV_VAR_); - if (testbridge_test_only != NULL) { - return testbridge_test_only; - } -#endif // GTEST_TEST_FILTER_ENV_VAR_ - return kUniversalFilter; -} - -GTEST_DEFINE_bool_( - also_run_disabled_tests, - internal::BoolFromGTestEnv("also_run_disabled_tests", false), - "Run disabled tests too, in addition to the tests normally being run."); - -GTEST_DEFINE_bool_( - break_on_failure, - internal::BoolFromGTestEnv("break_on_failure", false), - "True iff a failed assertion should be a debugger break-point."); - -GTEST_DEFINE_bool_( - catch_exceptions, - internal::BoolFromGTestEnv("catch_exceptions", true), - "True iff " GTEST_NAME_ - " should catch exceptions and treat them as test failures."); - -GTEST_DEFINE_string_( - color, - internal::StringFromGTestEnv("color", "auto"), - "Whether to use colors in the output. Valid values: yes, no, " - "and auto. 'auto' means to use colors if the output is " - "being sent to a terminal and the TERM environment variable " - "is set to a terminal type that supports colors."); - -GTEST_DEFINE_string_( - filter, - internal::StringFromGTestEnv("filter", GetDefaultFilter()), - "A colon-separated list of glob (not regex) patterns " - "for filtering the tests to run, optionally followed by a " - "'-' and a : separated list of negative patterns (tests to " - "exclude). A test is run if it matches one of the positive " - "patterns and does not match any of the negative patterns."); - -GTEST_DEFINE_bool_(list_tests, false, - "List all tests without running them."); - -// The net priority order after flag processing is thus: -// --gtest_output command line flag -// GTEST_OUTPUT environment variable -// XML_OUTPUT_FILE environment variable -// '' -GTEST_DEFINE_string_( - output, - internal::StringFromGTestEnv("output", - internal::OutputFlagAlsoCheckEnvVar().c_str()), - "A format (defaults to \"xml\" but can be specified to be \"json\"), " - "optionally followed by a colon and an output file name or directory. " - "A directory is indicated by a trailing pathname separator. " - "Examples: \"xml:filename.xml\", \"xml::directoryname/\". " - "If a directory is specified, output files will be created " - "within that directory, with file-names based on the test " - "executable's name and, if necessary, made unique by adding " - "digits."); - -GTEST_DEFINE_bool_( - print_time, - internal::BoolFromGTestEnv("print_time", true), - "True iff " GTEST_NAME_ - " should display elapsed time in text output."); - -GTEST_DEFINE_bool_( - print_utf8, - internal::BoolFromGTestEnv("print_utf8", true), - "True iff " GTEST_NAME_ - " prints UTF8 characters as text."); - -GTEST_DEFINE_int32_( - random_seed, - internal::Int32FromGTestEnv("random_seed", 0), - "Random number seed to use when shuffling test orders. Must be in range " - "[1, 99999], or 0 to use a seed based on the current time."); - -GTEST_DEFINE_int32_( - repeat, - internal::Int32FromGTestEnv("repeat", 1), - "How many times to repeat each test. Specify a negative number " - "for repeating forever. Useful for shaking out flaky tests."); - -GTEST_DEFINE_bool_( - show_internal_stack_frames, false, - "True iff " GTEST_NAME_ " should include internal stack frames when " - "printing test failure stack traces."); - -GTEST_DEFINE_bool_( - shuffle, - internal::BoolFromGTestEnv("shuffle", false), - "True iff " GTEST_NAME_ - " should randomize tests' order on every run."); - -GTEST_DEFINE_int32_( - stack_trace_depth, - internal::Int32FromGTestEnv("stack_trace_depth", kMaxStackTraceDepth), - "The maximum number of stack frames to print when an " - "assertion fails. The valid range is 0 through 100, inclusive."); - -GTEST_DEFINE_string_( - stream_result_to, - internal::StringFromGTestEnv("stream_result_to", ""), - "This flag specifies the host name and the port number on which to stream " - "test results. Example: \"localhost:555\". The flag is effective only on " - "Linux."); - -GTEST_DEFINE_bool_( - throw_on_failure, - internal::BoolFromGTestEnv("throw_on_failure", false), - "When this flag is specified, a failed assertion will throw an exception " - "if exceptions are enabled or exit the program with a non-zero code " - "otherwise. For use with an external test framework."); - -#if GTEST_USE_OWN_FLAGFILE_FLAG_ -GTEST_DEFINE_string_( - flagfile, - internal::StringFromGTestEnv("flagfile", ""), - "This flag specifies the flagfile to read command-line flags from."); -#endif // GTEST_USE_OWN_FLAGFILE_FLAG_ - -namespace internal { - -// Generates a random number from [0, range), using a Linear -// Congruential Generator (LCG). Crashes if 'range' is 0 or greater -// than kMaxRange. -UInt32 Random::Generate(UInt32 range) { - // These constants are the same as are used in glibc's rand(3). - // Use wider types than necessary to prevent unsigned overflow diagnostics. - state_ = static_cast(1103515245ULL*state_ + 12345U) % kMaxRange; - - GTEST_CHECK_(range > 0) - << "Cannot generate a number in the range [0, 0)."; - GTEST_CHECK_(range <= kMaxRange) - << "Generation of a number in [0, " << range << ") was requested, " - << "but this can only generate numbers in [0, " << kMaxRange << ")."; - - // Converting via modulus introduces a bit of downward bias, but - // it's simple, and a linear congruential generator isn't too good - // to begin with. - return state_ % range; -} - -// GTestIsInitialized() returns true iff the user has initialized -// Google Test. Useful for catching the user mistake of not initializing -// Google Test before calling RUN_ALL_TESTS(). -static bool GTestIsInitialized() { return GetArgvs().size() > 0; } - -// Iterates over a vector of TestCases, keeping a running sum of the -// results of calling a given int-returning method on each. -// Returns the sum. -static int SumOverTestCaseList(const std::vector& case_list, - int (TestCase::*method)() const) { - int sum = 0; - for (size_t i = 0; i < case_list.size(); i++) { - sum += (case_list[i]->*method)(); - } - return sum; -} - -// Returns true iff the test case passed. -static bool TestCasePassed(const TestCase* test_case) { - return test_case->should_run() && test_case->Passed(); -} - -// Returns true iff the test case failed. -static bool TestCaseFailed(const TestCase* test_case) { - return test_case->should_run() && test_case->Failed(); -} - -// Returns true iff test_case contains at least one test that should -// run. -static bool ShouldRunTestCase(const TestCase* test_case) { - return test_case->should_run(); -} - -// AssertHelper constructor. -AssertHelper::AssertHelper(TestPartResult::Type type, - const char* file, - int line, - const char* message) - : data_(new AssertHelperData(type, file, line, message)) { -} - -AssertHelper::~AssertHelper() { - delete data_; -} - -// Message assignment, for assertion streaming support. -void AssertHelper::operator=(const Message& message) const { - UnitTest::GetInstance()-> - AddTestPartResult(data_->type, data_->file, data_->line, - AppendUserMessage(data_->message, message), - UnitTest::GetInstance()->impl() - ->CurrentOsStackTraceExceptTop(1) - // Skips the stack frame for this function itself. - ); // NOLINT -} - -// Mutex for linked pointers. -GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_linked_ptr_mutex); - -// A copy of all command line arguments. Set by InitGoogleTest(). -::std::vector g_argvs; - -::std::vector GetArgvs() { -#if defined(GTEST_CUSTOM_GET_ARGVS_) - // GTEST_CUSTOM_GET_ARGVS_() may return a container of std::string or - // ::string. This code converts it to the appropriate type. - const auto& custom = GTEST_CUSTOM_GET_ARGVS_(); - return ::std::vector(custom.begin(), custom.end()); -#else // defined(GTEST_CUSTOM_GET_ARGVS_) - return g_argvs; -#endif // defined(GTEST_CUSTOM_GET_ARGVS_) -} - -// Returns the current application's name, removing directory path if that -// is present. -FilePath GetCurrentExecutableName() { - FilePath result; - -#if GTEST_OS_WINDOWS - result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe")); -#else - result.Set(FilePath(GetArgvs()[0])); -#endif // GTEST_OS_WINDOWS - - return result.RemoveDirectoryName(); -} - -// Functions for processing the gtest_output flag. - -// Returns the output format, or "" for normal printed output. -std::string UnitTestOptions::GetOutputFormat() { - const char* const gtest_output_flag = GTEST_FLAG(output).c_str(); - if (gtest_output_flag == NULL) return std::string(""); - - const char* const colon = strchr(gtest_output_flag, ':'); - return (colon == NULL) ? - std::string(gtest_output_flag) : - std::string(gtest_output_flag, colon - gtest_output_flag); -} - -// Returns the name of the requested output file, or the default if none -// was explicitly specified. -std::string UnitTestOptions::GetAbsolutePathToOutputFile() { - const char* const gtest_output_flag = GTEST_FLAG(output).c_str(); - if (gtest_output_flag == NULL) - return ""; - - std::string format = GetOutputFormat(); - if (format.empty()) - format = std::string(kDefaultOutputFormat); - - const char* const colon = strchr(gtest_output_flag, ':'); - if (colon == NULL) - return internal::FilePath::MakeFileName( - internal::FilePath( - UnitTest::GetInstance()->original_working_dir()), - internal::FilePath(kDefaultOutputFile), 0, - format.c_str()).string(); - - internal::FilePath output_name(colon + 1); - if (!output_name.IsAbsolutePath()) - // TODO(wan@google.com): on Windows \some\path is not an absolute - // path (as its meaning depends on the current drive), yet the - // following logic for turning it into an absolute path is wrong. - // Fix it. - output_name = internal::FilePath::ConcatPaths( - internal::FilePath(UnitTest::GetInstance()->original_working_dir()), - internal::FilePath(colon + 1)); - - if (!output_name.IsDirectory()) - return output_name.string(); - - internal::FilePath result(internal::FilePath::GenerateUniqueFileName( - output_name, internal::GetCurrentExecutableName(), - GetOutputFormat().c_str())); - return result.string(); -} - -// Returns true iff the wildcard pattern matches the string. The -// first ':' or '\0' character in pattern marks the end of it. -// -// This recursive algorithm isn't very efficient, but is clear and -// works well enough for matching test names, which are short. -bool UnitTestOptions::PatternMatchesString(const char *pattern, - const char *str) { - switch (*pattern) { - case '\0': - case ':': // Either ':' or '\0' marks the end of the pattern. - return *str == '\0'; - case '?': // Matches any single character. - return *str != '\0' && PatternMatchesString(pattern + 1, str + 1); - case '*': // Matches any string (possibly empty) of characters. - return (*str != '\0' && PatternMatchesString(pattern, str + 1)) || - PatternMatchesString(pattern + 1, str); - default: // Non-special character. Matches itself. - return *pattern == *str && - PatternMatchesString(pattern + 1, str + 1); - } -} - -bool UnitTestOptions::MatchesFilter( - const std::string& name, const char* filter) { - const char *cur_pattern = filter; - for (;;) { - if (PatternMatchesString(cur_pattern, name.c_str())) { - return true; - } - - // Finds the next pattern in the filter. - cur_pattern = strchr(cur_pattern, ':'); - - // Returns if no more pattern can be found. - if (cur_pattern == NULL) { - return false; - } - - // Skips the pattern separater (the ':' character). - cur_pattern++; - } -} - -// Returns true iff the user-specified filter matches the test case -// name and the test name. -bool UnitTestOptions::FilterMatchesTest(const std::string &test_case_name, - const std::string &test_name) { - const std::string& full_name = test_case_name + "." + test_name.c_str(); - - // Split --gtest_filter at '-', if there is one, to separate into - // positive filter and negative filter portions - const char* const p = GTEST_FLAG(filter).c_str(); - const char* const dash = strchr(p, '-'); - std::string positive; - std::string negative; - if (dash == NULL) { - positive = GTEST_FLAG(filter).c_str(); // Whole string is a positive filter - negative = ""; - } else { - positive = std::string(p, dash); // Everything up to the dash - negative = std::string(dash + 1); // Everything after the dash - if (positive.empty()) { - // Treat '-test1' as the same as '*-test1' - positive = kUniversalFilter; - } - } - - // A filter is a colon-separated list of patterns. It matches a - // test if any pattern in it matches the test. - return (MatchesFilter(full_name, positive.c_str()) && - !MatchesFilter(full_name, negative.c_str())); -} - -#if GTEST_HAS_SEH -// Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the -// given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise. -// This function is useful as an __except condition. -int UnitTestOptions::GTestShouldProcessSEH(DWORD exception_code) { - // Google Test should handle a SEH exception if: - // 1. the user wants it to, AND - // 2. this is not a breakpoint exception, AND - // 3. this is not a C++ exception (VC++ implements them via SEH, - // apparently). - // - // SEH exception code for C++ exceptions. - // (see http://support.microsoft.com/kb/185294 for more information). - const DWORD kCxxExceptionCode = 0xe06d7363; - - bool should_handle = true; - - if (!GTEST_FLAG(catch_exceptions)) - should_handle = false; - else if (exception_code == EXCEPTION_BREAKPOINT) - should_handle = false; - else if (exception_code == kCxxExceptionCode) - should_handle = false; - - return should_handle ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; -} -#endif // GTEST_HAS_SEH - -} // namespace internal - -// The c'tor sets this object as the test part result reporter used by -// Google Test. The 'result' parameter specifies where to report the -// results. Intercepts only failures from the current thread. -ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter( - TestPartResultArray* result) - : intercept_mode_(INTERCEPT_ONLY_CURRENT_THREAD), - result_(result) { - Init(); -} - -// The c'tor sets this object as the test part result reporter used by -// Google Test. The 'result' parameter specifies where to report the -// results. -ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter( - InterceptMode intercept_mode, TestPartResultArray* result) - : intercept_mode_(intercept_mode), - result_(result) { - Init(); -} - -void ScopedFakeTestPartResultReporter::Init() { - internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); - if (intercept_mode_ == INTERCEPT_ALL_THREADS) { - old_reporter_ = impl->GetGlobalTestPartResultReporter(); - impl->SetGlobalTestPartResultReporter(this); - } else { - old_reporter_ = impl->GetTestPartResultReporterForCurrentThread(); - impl->SetTestPartResultReporterForCurrentThread(this); - } -} - -// The d'tor restores the test part result reporter used by Google Test -// before. -ScopedFakeTestPartResultReporter::~ScopedFakeTestPartResultReporter() { - internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); - if (intercept_mode_ == INTERCEPT_ALL_THREADS) { - impl->SetGlobalTestPartResultReporter(old_reporter_); - } else { - impl->SetTestPartResultReporterForCurrentThread(old_reporter_); - } -} - -// Increments the test part result count and remembers the result. -// This method is from the TestPartResultReporterInterface interface. -void ScopedFakeTestPartResultReporter::ReportTestPartResult( - const TestPartResult& result) { - result_->Append(result); -} - -namespace internal { - -// Returns the type ID of ::testing::Test. We should always call this -// instead of GetTypeId< ::testing::Test>() to get the type ID of -// testing::Test. This is to work around a suspected linker bug when -// using Google Test as a framework on Mac OS X. The bug causes -// GetTypeId< ::testing::Test>() to return different values depending -// on whether the call is from the Google Test framework itself or -// from user test code. GetTestTypeId() is guaranteed to always -// return the same value, as it always calls GetTypeId<>() from the -// gtest.cc, which is within the Google Test framework. -TypeId GetTestTypeId() { - return GetTypeId(); -} - -// The value of GetTestTypeId() as seen from within the Google Test -// library. This is solely for testing GetTestTypeId(). -extern const TypeId kTestTypeIdInGoogleTest = GetTestTypeId(); - -// This predicate-formatter checks that 'results' contains a test part -// failure of the given type and that the failure message contains the -// given substring. -static AssertionResult HasOneFailure(const char* /* results_expr */, - const char* /* type_expr */, - const char* /* substr_expr */, - const TestPartResultArray& results, - TestPartResult::Type type, - const std::string& substr) { - const std::string expected(type == TestPartResult::kFatalFailure ? - "1 fatal failure" : - "1 non-fatal failure"); - Message msg; - if (results.size() != 1) { - msg << "Expected: " << expected << "\n" - << " Actual: " << results.size() << " failures"; - for (int i = 0; i < results.size(); i++) { - msg << "\n" << results.GetTestPartResult(i); - } - return AssertionFailure() << msg; - } - - const TestPartResult& r = results.GetTestPartResult(0); - if (r.type() != type) { - return AssertionFailure() << "Expected: " << expected << "\n" - << " Actual:\n" - << r; - } - - if (strstr(r.message(), substr.c_str()) == NULL) { - return AssertionFailure() << "Expected: " << expected << " containing \"" - << substr << "\"\n" - << " Actual:\n" - << r; - } - - return AssertionSuccess(); -} - -// The constructor of SingleFailureChecker remembers where to look up -// test part results, what type of failure we expect, and what -// substring the failure message should contain. -SingleFailureChecker::SingleFailureChecker(const TestPartResultArray* results, - TestPartResult::Type type, - const std::string& substr) - : results_(results), type_(type), substr_(substr) {} - -// The destructor of SingleFailureChecker verifies that the given -// TestPartResultArray contains exactly one failure that has the given -// type and contains the given substring. If that's not the case, a -// non-fatal failure will be generated. -SingleFailureChecker::~SingleFailureChecker() { - EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_); -} - -DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter( - UnitTestImpl* unit_test) : unit_test_(unit_test) {} - -void DefaultGlobalTestPartResultReporter::ReportTestPartResult( - const TestPartResult& result) { - unit_test_->current_test_result()->AddTestPartResult(result); - unit_test_->listeners()->repeater()->OnTestPartResult(result); -} - -DefaultPerThreadTestPartResultReporter::DefaultPerThreadTestPartResultReporter( - UnitTestImpl* unit_test) : unit_test_(unit_test) {} - -void DefaultPerThreadTestPartResultReporter::ReportTestPartResult( - const TestPartResult& result) { - unit_test_->GetGlobalTestPartResultReporter()->ReportTestPartResult(result); -} - -// Returns the global test part result reporter. -TestPartResultReporterInterface* -UnitTestImpl::GetGlobalTestPartResultReporter() { - internal::MutexLock lock(&global_test_part_result_reporter_mutex_); - return global_test_part_result_repoter_; -} - -// Sets the global test part result reporter. -void UnitTestImpl::SetGlobalTestPartResultReporter( - TestPartResultReporterInterface* reporter) { - internal::MutexLock lock(&global_test_part_result_reporter_mutex_); - global_test_part_result_repoter_ = reporter; -} - -// Returns the test part result reporter for the current thread. -TestPartResultReporterInterface* -UnitTestImpl::GetTestPartResultReporterForCurrentThread() { - return per_thread_test_part_result_reporter_.get(); -} - -// Sets the test part result reporter for the current thread. -void UnitTestImpl::SetTestPartResultReporterForCurrentThread( - TestPartResultReporterInterface* reporter) { - per_thread_test_part_result_reporter_.set(reporter); -} - -// Gets the number of successful test cases. -int UnitTestImpl::successful_test_case_count() const { - return CountIf(test_cases_, TestCasePassed); -} - -// Gets the number of failed test cases. -int UnitTestImpl::failed_test_case_count() const { - return CountIf(test_cases_, TestCaseFailed); -} - -// Gets the number of all test cases. -int UnitTestImpl::total_test_case_count() const { - return static_cast(test_cases_.size()); -} - -// Gets the number of all test cases that contain at least one test -// that should run. -int UnitTestImpl::test_case_to_run_count() const { - return CountIf(test_cases_, ShouldRunTestCase); -} - -// Gets the number of successful tests. -int UnitTestImpl::successful_test_count() const { - return SumOverTestCaseList(test_cases_, &TestCase::successful_test_count); -} - -// Gets the number of failed tests. -int UnitTestImpl::failed_test_count() const { - return SumOverTestCaseList(test_cases_, &TestCase::failed_test_count); -} - -// Gets the number of disabled tests that will be reported in the XML report. -int UnitTestImpl::reportable_disabled_test_count() const { - return SumOverTestCaseList(test_cases_, - &TestCase::reportable_disabled_test_count); -} - -// Gets the number of disabled tests. -int UnitTestImpl::disabled_test_count() const { - return SumOverTestCaseList(test_cases_, &TestCase::disabled_test_count); -} - -// Gets the number of tests to be printed in the XML report. -int UnitTestImpl::reportable_test_count() const { - return SumOverTestCaseList(test_cases_, &TestCase::reportable_test_count); -} - -// Gets the number of all tests. -int UnitTestImpl::total_test_count() const { - return SumOverTestCaseList(test_cases_, &TestCase::total_test_count); -} - -// Gets the number of tests that should run. -int UnitTestImpl::test_to_run_count() const { - return SumOverTestCaseList(test_cases_, &TestCase::test_to_run_count); -} - -// Returns the current OS stack trace as an std::string. -// -// The maximum number of stack frames to be included is specified by -// the gtest_stack_trace_depth flag. The skip_count parameter -// specifies the number of top frames to be skipped, which doesn't -// count against the number of frames to be included. -// -// For example, if Foo() calls Bar(), which in turn calls -// CurrentOsStackTraceExceptTop(1), Foo() will be included in the -// trace but Bar() and CurrentOsStackTraceExceptTop() won't. -std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) { - return os_stack_trace_getter()->CurrentStackTrace( - static_cast(GTEST_FLAG(stack_trace_depth)), - skip_count + 1 - // Skips the user-specified number of frames plus this function - // itself. - ); // NOLINT -} - -// Returns the current time in milliseconds. -TimeInMillis GetTimeInMillis() { -#if GTEST_OS_WINDOWS_MOBILE || defined(__BORLANDC__) - // Difference between 1970-01-01 and 1601-01-01 in milliseconds. - // http://analogous.blogspot.com/2005/04/epoch.html - const TimeInMillis kJavaEpochToWinFileTimeDelta = - static_cast(116444736UL) * 100000UL; - const DWORD kTenthMicrosInMilliSecond = 10000; - - SYSTEMTIME now_systime; - FILETIME now_filetime; - ULARGE_INTEGER now_int64; - // TODO(kenton@google.com): Shouldn't this just use - // GetSystemTimeAsFileTime()? - GetSystemTime(&now_systime); - if (SystemTimeToFileTime(&now_systime, &now_filetime)) { - now_int64.LowPart = now_filetime.dwLowDateTime; - now_int64.HighPart = now_filetime.dwHighDateTime; - now_int64.QuadPart = (now_int64.QuadPart / kTenthMicrosInMilliSecond) - - kJavaEpochToWinFileTimeDelta; - return now_int64.QuadPart; - } - return 0; -#elif GTEST_OS_WINDOWS && !GTEST_HAS_GETTIMEOFDAY_ - __timeb64 now; - - // MSVC 8 deprecates _ftime64(), so we want to suppress warning 4996 - // (deprecated function) there. - // TODO(kenton@google.com): Use GetTickCount()? Or use - // SystemTimeToFileTime() - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996) - _ftime64(&now); - GTEST_DISABLE_MSC_WARNINGS_POP_() - - return static_cast(now.time) * 1000 + now.millitm; -#elif GTEST_HAS_GETTIMEOFDAY_ - struct timeval now; - gettimeofday(&now, NULL); - return static_cast(now.tv_sec) * 1000 + now.tv_usec / 1000; -#else -# error "Don't know how to get the current time on your system." -#endif -} - -// Utilities - -// class String. - -#if GTEST_OS_WINDOWS_MOBILE -// Creates a UTF-16 wide string from the given ANSI string, allocating -// memory using new. The caller is responsible for deleting the return -// value using delete[]. Returns the wide string, or NULL if the -// input is NULL. -LPCWSTR String::AnsiToUtf16(const char* ansi) { - if (!ansi) return NULL; - const int length = strlen(ansi); - const int unicode_length = - MultiByteToWideChar(CP_ACP, 0, ansi, length, - NULL, 0); - WCHAR* unicode = new WCHAR[unicode_length + 1]; - MultiByteToWideChar(CP_ACP, 0, ansi, length, - unicode, unicode_length); - unicode[unicode_length] = 0; - return unicode; -} - -// Creates an ANSI string from the given wide string, allocating -// memory using new. The caller is responsible for deleting the return -// value using delete[]. Returns the ANSI string, or NULL if the -// input is NULL. -const char* String::Utf16ToAnsi(LPCWSTR utf16_str) { - if (!utf16_str) return NULL; - const int ansi_length = - WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, - NULL, 0, NULL, NULL); - char* ansi = new char[ansi_length + 1]; - WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, - ansi, ansi_length, NULL, NULL); - ansi[ansi_length] = 0; - return ansi; -} - -#endif // GTEST_OS_WINDOWS_MOBILE - -// Compares two C strings. Returns true iff they have the same content. -// -// Unlike strcmp(), this function can handle NULL argument(s). A NULL -// C string is considered different to any non-NULL C string, -// including the empty string. -bool String::CStringEquals(const char * lhs, const char * rhs) { - if ( lhs == NULL ) return rhs == NULL; - - if ( rhs == NULL ) return false; - - return strcmp(lhs, rhs) == 0; -} - -#if GTEST_HAS_STD_WSTRING || GTEST_HAS_GLOBAL_WSTRING - -// Converts an array of wide chars to a narrow string using the UTF-8 -// encoding, and streams the result to the given Message object. -static void StreamWideCharsToMessage(const wchar_t* wstr, size_t length, - Message* msg) { - for (size_t i = 0; i != length; ) { // NOLINT - if (wstr[i] != L'\0') { - *msg << WideStringToUtf8(wstr + i, static_cast(length - i)); - while (i != length && wstr[i] != L'\0') - i++; - } else { - *msg << '\0'; - i++; - } - } -} - -#endif // GTEST_HAS_STD_WSTRING || GTEST_HAS_GLOBAL_WSTRING - -void SplitString(const ::std::string& str, char delimiter, - ::std::vector< ::std::string>* dest) { - ::std::vector< ::std::string> parsed; - ::std::string::size_type pos = 0; - while (::testing::internal::AlwaysTrue()) { - const ::std::string::size_type colon = str.find(delimiter, pos); - if (colon == ::std::string::npos) { - parsed.push_back(str.substr(pos)); - break; - } else { - parsed.push_back(str.substr(pos, colon - pos)); - pos = colon + 1; - } - } - dest->swap(parsed); -} - -} // namespace internal - -// Constructs an empty Message. -// We allocate the stringstream separately because otherwise each use of -// ASSERT/EXPECT in a procedure adds over 200 bytes to the procedure's -// stack frame leading to huge stack frames in some cases; gcc does not reuse -// the stack space. -Message::Message() : ss_(new ::std::stringstream) { - // By default, we want there to be enough precision when printing - // a double to a Message. - *ss_ << std::setprecision(std::numeric_limits::digits10 + 2); -} - -// These two overloads allow streaming a wide C string to a Message -// using the UTF-8 encoding. -Message& Message::operator <<(const wchar_t* wide_c_str) { - return *this << internal::String::ShowWideCString(wide_c_str); -} -Message& Message::operator <<(wchar_t* wide_c_str) { - return *this << internal::String::ShowWideCString(wide_c_str); -} - -#if GTEST_HAS_STD_WSTRING -// Converts the given wide string to a narrow string using the UTF-8 -// encoding, and streams the result to this Message object. -Message& Message::operator <<(const ::std::wstring& wstr) { - internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this); - return *this; -} -#endif // GTEST_HAS_STD_WSTRING - -#if GTEST_HAS_GLOBAL_WSTRING -// Converts the given wide string to a narrow string using the UTF-8 -// encoding, and streams the result to this Message object. -Message& Message::operator <<(const ::wstring& wstr) { - internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this); - return *this; -} -#endif // GTEST_HAS_GLOBAL_WSTRING - -// Gets the text streamed to this object so far as an std::string. -// Each '\0' character in the buffer is replaced with "\\0". -std::string Message::GetString() const { - return internal::StringStreamToString(ss_.get()); -} - -// AssertionResult constructors. -// Used in EXPECT_TRUE/FALSE(assertion_result). -AssertionResult::AssertionResult(const AssertionResult& other) - : success_(other.success_), - message_(other.message_.get() != NULL ? - new ::std::string(*other.message_) : - static_cast< ::std::string*>(NULL)) { -} - -// Swaps two AssertionResults. -void AssertionResult::swap(AssertionResult& other) { - using std::swap; - swap(success_, other.success_); - swap(message_, other.message_); -} - -// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE. -AssertionResult AssertionResult::operator!() const { - AssertionResult negation(!success_); - if (message_.get() != NULL) - negation << *message_; - return negation; -} - -// Makes a successful assertion result. -AssertionResult AssertionSuccess() { - return AssertionResult(true); -} - -// Makes a failed assertion result. -AssertionResult AssertionFailure() { - return AssertionResult(false); -} - -// Makes a failed assertion result with the given failure message. -// Deprecated; use AssertionFailure() << message. -AssertionResult AssertionFailure(const Message& message) { - return AssertionFailure() << message; -} - -namespace internal { - -namespace edit_distance { -std::vector CalculateOptimalEdits(const std::vector& left, - const std::vector& right) { - std::vector > costs( - left.size() + 1, std::vector(right.size() + 1)); - std::vector > best_move( - left.size() + 1, std::vector(right.size() + 1)); - - // Populate for empty right. - for (size_t l_i = 0; l_i < costs.size(); ++l_i) { - costs[l_i][0] = static_cast(l_i); - best_move[l_i][0] = kRemove; - } - // Populate for empty left. - for (size_t r_i = 1; r_i < costs[0].size(); ++r_i) { - costs[0][r_i] = static_cast(r_i); - best_move[0][r_i] = kAdd; - } - - for (size_t l_i = 0; l_i < left.size(); ++l_i) { - for (size_t r_i = 0; r_i < right.size(); ++r_i) { - if (left[l_i] == right[r_i]) { - // Found a match. Consume it. - costs[l_i + 1][r_i + 1] = costs[l_i][r_i]; - best_move[l_i + 1][r_i + 1] = kMatch; - continue; - } - - const double add = costs[l_i + 1][r_i]; - const double remove = costs[l_i][r_i + 1]; - const double replace = costs[l_i][r_i]; - if (add < remove && add < replace) { - costs[l_i + 1][r_i + 1] = add + 1; - best_move[l_i + 1][r_i + 1] = kAdd; - } else if (remove < add && remove < replace) { - costs[l_i + 1][r_i + 1] = remove + 1; - best_move[l_i + 1][r_i + 1] = kRemove; - } else { - // We make replace a little more expensive than add/remove to lower - // their priority. - costs[l_i + 1][r_i + 1] = replace + 1.00001; - best_move[l_i + 1][r_i + 1] = kReplace; - } - } - } - - // Reconstruct the best path. We do it in reverse order. - std::vector best_path; - for (size_t l_i = left.size(), r_i = right.size(); l_i > 0 || r_i > 0;) { - EditType move = best_move[l_i][r_i]; - best_path.push_back(move); - l_i -= move != kAdd; - r_i -= move != kRemove; - } - std::reverse(best_path.begin(), best_path.end()); - return best_path; -} - -namespace { - -// Helper class to convert string into ids with deduplication. -class InternalStrings { - public: - size_t GetId(const std::string& str) { - IdMap::iterator it = ids_.find(str); - if (it != ids_.end()) return it->second; - size_t id = ids_.size(); - return ids_[str] = id; - } - - private: - typedef std::map IdMap; - IdMap ids_; -}; - -} // namespace - -std::vector CalculateOptimalEdits( - const std::vector& left, - const std::vector& right) { - std::vector left_ids, right_ids; - { - InternalStrings intern_table; - for (size_t i = 0; i < left.size(); ++i) { - left_ids.push_back(intern_table.GetId(left[i])); - } - for (size_t i = 0; i < right.size(); ++i) { - right_ids.push_back(intern_table.GetId(right[i])); - } - } - return CalculateOptimalEdits(left_ids, right_ids); -} - -namespace { - -// Helper class that holds the state for one hunk and prints it out to the -// stream. -// It reorders adds/removes when possible to group all removes before all -// adds. It also adds the hunk header before printint into the stream. -class Hunk { - public: - Hunk(size_t left_start, size_t right_start) - : left_start_(left_start), - right_start_(right_start), - adds_(), - removes_(), - common_() {} - - void PushLine(char edit, const char* line) { - switch (edit) { - case ' ': - ++common_; - FlushEdits(); - hunk_.push_back(std::make_pair(' ', line)); - break; - case '-': - ++removes_; - hunk_removes_.push_back(std::make_pair('-', line)); - break; - case '+': - ++adds_; - hunk_adds_.push_back(std::make_pair('+', line)); - break; - } - } - - void PrintTo(std::ostream* os) { - PrintHeader(os); - FlushEdits(); - for (std::list >::const_iterator it = - hunk_.begin(); - it != hunk_.end(); ++it) { - *os << it->first << it->second << "\n"; - } - } - - bool has_edits() const { return adds_ || removes_; } - - private: - void FlushEdits() { - hunk_.splice(hunk_.end(), hunk_removes_); - hunk_.splice(hunk_.end(), hunk_adds_); - } - - // Print a unified diff header for one hunk. - // The format is - // "@@ -, +, @@" - // where the left/right parts are omitted if unnecessary. - void PrintHeader(std::ostream* ss) const { - *ss << "@@ "; - if (removes_) { - *ss << "-" << left_start_ << "," << (removes_ + common_); - } - if (removes_ && adds_) { - *ss << " "; - } - if (adds_) { - *ss << "+" << right_start_ << "," << (adds_ + common_); - } - *ss << " @@\n"; - } - - size_t left_start_, right_start_; - size_t adds_, removes_, common_; - std::list > hunk_, hunk_adds_, hunk_removes_; -}; - -} // namespace - -// Create a list of diff hunks in Unified diff format. -// Each hunk has a header generated by PrintHeader above plus a body with -// lines prefixed with ' ' for no change, '-' for deletion and '+' for -// addition. -// 'context' represents the desired unchanged prefix/suffix around the diff. -// If two hunks are close enough that their contexts overlap, then they are -// joined into one hunk. -std::string CreateUnifiedDiff(const std::vector& left, - const std::vector& right, - size_t context) { - const std::vector edits = CalculateOptimalEdits(left, right); - - size_t l_i = 0, r_i = 0, edit_i = 0; - std::stringstream ss; - while (edit_i < edits.size()) { - // Find first edit. - while (edit_i < edits.size() && edits[edit_i] == kMatch) { - ++l_i; - ++r_i; - ++edit_i; - } - - // Find the first line to include in the hunk. - const size_t prefix_context = std::min(l_i, context); - Hunk hunk(l_i - prefix_context + 1, r_i - prefix_context + 1); - for (size_t i = prefix_context; i > 0; --i) { - hunk.PushLine(' ', left[l_i - i].c_str()); - } - - // Iterate the edits until we found enough suffix for the hunk or the input - // is over. - size_t n_suffix = 0; - for (; edit_i < edits.size(); ++edit_i) { - if (n_suffix >= context) { - // Continue only if the next hunk is very close. - std::vector::const_iterator it = edits.begin() + edit_i; - while (it != edits.end() && *it == kMatch) ++it; - if (it == edits.end() || (it - edits.begin()) - edit_i >= context) { - // There is no next edit or it is too far away. - break; - } - } - - EditType edit = edits[edit_i]; - // Reset count when a non match is found. - n_suffix = edit == kMatch ? n_suffix + 1 : 0; - - if (edit == kMatch || edit == kRemove || edit == kReplace) { - hunk.PushLine(edit == kMatch ? ' ' : '-', left[l_i].c_str()); - } - if (edit == kAdd || edit == kReplace) { - hunk.PushLine('+', right[r_i].c_str()); - } - - // Advance indices, depending on edit type. - l_i += edit != kAdd; - r_i += edit != kRemove; - } - - if (!hunk.has_edits()) { - // We are done. We don't want this hunk. - break; - } - - hunk.PrintTo(&ss); - } - return ss.str(); -} - -} // namespace edit_distance - -namespace { - -// The string representation of the values received in EqFailure() are already -// escaped. Split them on escaped '\n' boundaries. Leave all other escaped -// characters the same. -std::vector SplitEscapedString(const std::string& str) { - std::vector lines; - size_t start = 0, end = str.size(); - if (end > 2 && str[0] == '"' && str[end - 1] == '"') { - ++start; - --end; - } - bool escaped = false; - for (size_t i = start; i + 1 < end; ++i) { - if (escaped) { - escaped = false; - if (str[i] == 'n') { - lines.push_back(str.substr(start, i - start - 1)); - start = i + 1; - } - } else { - escaped = str[i] == '\\'; - } - } - lines.push_back(str.substr(start, end - start)); - return lines; -} - -} // namespace - -// Constructs and returns the message for an equality assertion -// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure. -// -// The first four parameters are the expressions used in the assertion -// and their values, as strings. For example, for ASSERT_EQ(foo, bar) -// where foo is 5 and bar is 6, we have: -// -// lhs_expression: "foo" -// rhs_expression: "bar" -// lhs_value: "5" -// rhs_value: "6" -// -// The ignoring_case parameter is true iff the assertion is a -// *_STRCASEEQ*. When it's true, the string "Ignoring case" will -// be inserted into the message. -AssertionResult EqFailure(const char* lhs_expression, - const char* rhs_expression, - const std::string& lhs_value, - const std::string& rhs_value, - bool ignoring_case) { - Message msg; - msg << "Expected equality of these values:"; - msg << "\n " << lhs_expression; - if (lhs_value != lhs_expression) { - msg << "\n Which is: " << lhs_value; - } - msg << "\n " << rhs_expression; - if (rhs_value != rhs_expression) { - msg << "\n Which is: " << rhs_value; - } - - if (ignoring_case) { - msg << "\nIgnoring case"; - } - - if (!lhs_value.empty() && !rhs_value.empty()) { - const std::vector lhs_lines = - SplitEscapedString(lhs_value); - const std::vector rhs_lines = - SplitEscapedString(rhs_value); - if (lhs_lines.size() > 1 || rhs_lines.size() > 1) { - msg << "\nWith diff:\n" - << edit_distance::CreateUnifiedDiff(lhs_lines, rhs_lines); - } - } - - return AssertionFailure() << msg; -} - -// Constructs a failure message for Boolean assertions such as EXPECT_TRUE. -std::string GetBoolAssertionFailureMessage( - const AssertionResult& assertion_result, - const char* expression_text, - const char* actual_predicate_value, - const char* expected_predicate_value) { - const char* actual_message = assertion_result.message(); - Message msg; - msg << "Value of: " << expression_text - << "\n Actual: " << actual_predicate_value; - if (actual_message[0] != '\0') - msg << " (" << actual_message << ")"; - msg << "\nExpected: " << expected_predicate_value; - return msg.GetString(); -} - -// Helper function for implementing ASSERT_NEAR. -AssertionResult DoubleNearPredFormat(const char* expr1, - const char* expr2, - const char* abs_error_expr, - double val1, - double val2, - double abs_error) { - const double diff = fabs(val1 - val2); - if (diff <= abs_error) return AssertionSuccess(); - - // TODO(wan): do not print the value of an expression if it's - // already a literal. - return AssertionFailure() - << "The difference between " << expr1 << " and " << expr2 - << " is " << diff << ", which exceeds " << abs_error_expr << ", where\n" - << expr1 << " evaluates to " << val1 << ",\n" - << expr2 << " evaluates to " << val2 << ", and\n" - << abs_error_expr << " evaluates to " << abs_error << "."; -} - - -// Helper template for implementing FloatLE() and DoubleLE(). -template -AssertionResult FloatingPointLE(const char* expr1, - const char* expr2, - RawType val1, - RawType val2) { - // Returns success if val1 is less than val2, - if (val1 < val2) { - return AssertionSuccess(); - } - - // or if val1 is almost equal to val2. - const FloatingPoint lhs(val1), rhs(val2); - if (lhs.AlmostEquals(rhs)) { - return AssertionSuccess(); - } - - // Note that the above two checks will both fail if either val1 or - // val2 is NaN, as the IEEE floating-point standard requires that - // any predicate involving a NaN must return false. - - ::std::stringstream val1_ss; - val1_ss << std::setprecision(std::numeric_limits::digits10 + 2) - << val1; - - ::std::stringstream val2_ss; - val2_ss << std::setprecision(std::numeric_limits::digits10 + 2) - << val2; - - return AssertionFailure() - << "Expected: (" << expr1 << ") <= (" << expr2 << ")\n" - << " Actual: " << StringStreamToString(&val1_ss) << " vs " - << StringStreamToString(&val2_ss); -} - -} // namespace internal - -// Asserts that val1 is less than, or almost equal to, val2. Fails -// otherwise. In particular, it fails if either val1 or val2 is NaN. -AssertionResult FloatLE(const char* expr1, const char* expr2, - float val1, float val2) { - return internal::FloatingPointLE(expr1, expr2, val1, val2); -} - -// Asserts that val1 is less than, or almost equal to, val2. Fails -// otherwise. In particular, it fails if either val1 or val2 is NaN. -AssertionResult DoubleLE(const char* expr1, const char* expr2, - double val1, double val2) { - return internal::FloatingPointLE(expr1, expr2, val1, val2); -} - -namespace internal { - -// The helper function for {ASSERT|EXPECT}_EQ with int or enum -// arguments. -AssertionResult CmpHelperEQ(const char* lhs_expression, - const char* rhs_expression, - BiggestInt lhs, - BiggestInt rhs) { - if (lhs == rhs) { - return AssertionSuccess(); - } - - return EqFailure(lhs_expression, - rhs_expression, - FormatForComparisonFailureMessage(lhs, rhs), - FormatForComparisonFailureMessage(rhs, lhs), - false); -} - -// A macro for implementing the helper functions needed to implement -// ASSERT_?? and EXPECT_?? with integer or enum arguments. It is here -// just to avoid copy-and-paste of similar code. -#define GTEST_IMPL_CMP_HELPER_(op_name, op)\ -AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \ - BiggestInt val1, BiggestInt val2) {\ - if (val1 op val2) {\ - return AssertionSuccess();\ - } else {\ - return AssertionFailure() \ - << "Expected: (" << expr1 << ") " #op " (" << expr2\ - << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\ - << " vs " << FormatForComparisonFailureMessage(val2, val1);\ - }\ -} - -// Implements the helper function for {ASSERT|EXPECT}_NE with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(NE, !=) -// Implements the helper function for {ASSERT|EXPECT}_LE with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(LE, <=) -// Implements the helper function for {ASSERT|EXPECT}_LT with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(LT, < ) -// Implements the helper function for {ASSERT|EXPECT}_GE with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(GE, >=) -// Implements the helper function for {ASSERT|EXPECT}_GT with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(GT, > ) - -#undef GTEST_IMPL_CMP_HELPER_ - -// The helper function for {ASSERT|EXPECT}_STREQ. -AssertionResult CmpHelperSTREQ(const char* lhs_expression, - const char* rhs_expression, - const char* lhs, - const char* rhs) { - if (String::CStringEquals(lhs, rhs)) { - return AssertionSuccess(); - } - - return EqFailure(lhs_expression, - rhs_expression, - PrintToString(lhs), - PrintToString(rhs), - false); -} - -// The helper function for {ASSERT|EXPECT}_STRCASEEQ. -AssertionResult CmpHelperSTRCASEEQ(const char* lhs_expression, - const char* rhs_expression, - const char* lhs, - const char* rhs) { - if (String::CaseInsensitiveCStringEquals(lhs, rhs)) { - return AssertionSuccess(); - } - - return EqFailure(lhs_expression, - rhs_expression, - PrintToString(lhs), - PrintToString(rhs), - true); -} - -// The helper function for {ASSERT|EXPECT}_STRNE. -AssertionResult CmpHelperSTRNE(const char* s1_expression, - const char* s2_expression, - const char* s1, - const char* s2) { - if (!String::CStringEquals(s1, s2)) { - return AssertionSuccess(); - } else { - return AssertionFailure() << "Expected: (" << s1_expression << ") != (" - << s2_expression << "), actual: \"" - << s1 << "\" vs \"" << s2 << "\""; - } -} - -// The helper function for {ASSERT|EXPECT}_STRCASENE. -AssertionResult CmpHelperSTRCASENE(const char* s1_expression, - const char* s2_expression, - const char* s1, - const char* s2) { - if (!String::CaseInsensitiveCStringEquals(s1, s2)) { - return AssertionSuccess(); - } else { - return AssertionFailure() - << "Expected: (" << s1_expression << ") != (" - << s2_expression << ") (ignoring case), actual: \"" - << s1 << "\" vs \"" << s2 << "\""; - } -} - -} // namespace internal - -namespace { - -// Helper functions for implementing IsSubString() and IsNotSubstring(). - -// This group of overloaded functions return true iff needle is a -// substring of haystack. NULL is considered a substring of itself -// only. - -bool IsSubstringPred(const char* needle, const char* haystack) { - if (needle == NULL || haystack == NULL) - return needle == haystack; - - return strstr(haystack, needle) != NULL; -} - -bool IsSubstringPred(const wchar_t* needle, const wchar_t* haystack) { - if (needle == NULL || haystack == NULL) - return needle == haystack; - - return wcsstr(haystack, needle) != NULL; -} - -// StringType here can be either ::std::string or ::std::wstring. -template -bool IsSubstringPred(const StringType& needle, - const StringType& haystack) { - return haystack.find(needle) != StringType::npos; -} - -// This function implements either IsSubstring() or IsNotSubstring(), -// depending on the value of the expected_to_be_substring parameter. -// StringType here can be const char*, const wchar_t*, ::std::string, -// or ::std::wstring. -template -AssertionResult IsSubstringImpl( - bool expected_to_be_substring, - const char* needle_expr, const char* haystack_expr, - const StringType& needle, const StringType& haystack) { - if (IsSubstringPred(needle, haystack) == expected_to_be_substring) - return AssertionSuccess(); - - const bool is_wide_string = sizeof(needle[0]) > 1; - const char* const begin_string_quote = is_wide_string ? "L\"" : "\""; - return AssertionFailure() - << "Value of: " << needle_expr << "\n" - << " Actual: " << begin_string_quote << needle << "\"\n" - << "Expected: " << (expected_to_be_substring ? "" : "not ") - << "a substring of " << haystack_expr << "\n" - << "Which is: " << begin_string_quote << haystack << "\""; -} - -} // namespace - -// IsSubstring() and IsNotSubstring() check whether needle is a -// substring of haystack (NULL is considered a substring of itself -// only), and return an appropriate error message when they fail. - -AssertionResult IsSubstring( - const char* needle_expr, const char* haystack_expr, - const char* needle, const char* haystack) { - return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack); -} - -AssertionResult IsSubstring( - const char* needle_expr, const char* haystack_expr, - const wchar_t* needle, const wchar_t* haystack) { - return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack); -} - -AssertionResult IsNotSubstring( - const char* needle_expr, const char* haystack_expr, - const char* needle, const char* haystack) { - return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack); -} - -AssertionResult IsNotSubstring( - const char* needle_expr, const char* haystack_expr, - const wchar_t* needle, const wchar_t* haystack) { - return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack); -} - -AssertionResult IsSubstring( - const char* needle_expr, const char* haystack_expr, - const ::std::string& needle, const ::std::string& haystack) { - return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack); -} - -AssertionResult IsNotSubstring( - const char* needle_expr, const char* haystack_expr, - const ::std::string& needle, const ::std::string& haystack) { - return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack); -} - -#if GTEST_HAS_STD_WSTRING -AssertionResult IsSubstring( - const char* needle_expr, const char* haystack_expr, - const ::std::wstring& needle, const ::std::wstring& haystack) { - return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack); -} - -AssertionResult IsNotSubstring( - const char* needle_expr, const char* haystack_expr, - const ::std::wstring& needle, const ::std::wstring& haystack) { - return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack); -} -#endif // GTEST_HAS_STD_WSTRING - -namespace internal { - -#if GTEST_OS_WINDOWS - -namespace { - -// Helper function for IsHRESULT{SuccessFailure} predicates -AssertionResult HRESULTFailureHelper(const char* expr, - const char* expected, - long hr) { // NOLINT -# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_TV_TITLE - - // Windows CE doesn't support FormatMessage. - const char error_text[] = ""; - -# else - - // Looks up the human-readable system message for the HRESULT code - // and since we're not passing any params to FormatMessage, we don't - // want inserts expanded. - const DWORD kFlags = FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS; - const DWORD kBufSize = 4096; - // Gets the system's human readable message string for this HRESULT. - char error_text[kBufSize] = { '\0' }; - DWORD message_length = ::FormatMessageA(kFlags, - 0, // no source, we're asking system - hr, // the error - 0, // no line width restrictions - error_text, // output buffer - kBufSize, // buf size - NULL); // no arguments for inserts - // Trims tailing white space (FormatMessage leaves a trailing CR-LF) - for (; message_length && IsSpace(error_text[message_length - 1]); - --message_length) { - error_text[message_length - 1] = '\0'; - } - -# endif // GTEST_OS_WINDOWS_MOBILE - - const std::string error_hex("0x" + String::FormatHexInt(hr)); - return ::testing::AssertionFailure() - << "Expected: " << expr << " " << expected << ".\n" - << " Actual: " << error_hex << " " << error_text << "\n"; -} - -} // namespace - -AssertionResult IsHRESULTSuccess(const char* expr, long hr) { // NOLINT - if (SUCCEEDED(hr)) { - return AssertionSuccess(); - } - return HRESULTFailureHelper(expr, "succeeds", hr); -} - -AssertionResult IsHRESULTFailure(const char* expr, long hr) { // NOLINT - if (FAILED(hr)) { - return AssertionSuccess(); - } - return HRESULTFailureHelper(expr, "fails", hr); -} - -#endif // GTEST_OS_WINDOWS - -// Utility functions for encoding Unicode text (wide strings) in -// UTF-8. - -// A Unicode code-point can have up to 21 bits, and is encoded in UTF-8 -// like this: -// -// Code-point length Encoding -// 0 - 7 bits 0xxxxxxx -// 8 - 11 bits 110xxxxx 10xxxxxx -// 12 - 16 bits 1110xxxx 10xxxxxx 10xxxxxx -// 17 - 21 bits 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx - -// The maximum code-point a one-byte UTF-8 sequence can represent. -const UInt32 kMaxCodePoint1 = (static_cast(1) << 7) - 1; - -// The maximum code-point a two-byte UTF-8 sequence can represent. -const UInt32 kMaxCodePoint2 = (static_cast(1) << (5 + 6)) - 1; - -// The maximum code-point a three-byte UTF-8 sequence can represent. -const UInt32 kMaxCodePoint3 = (static_cast(1) << (4 + 2*6)) - 1; - -// The maximum code-point a four-byte UTF-8 sequence can represent. -const UInt32 kMaxCodePoint4 = (static_cast(1) << (3 + 3*6)) - 1; - -// Chops off the n lowest bits from a bit pattern. Returns the n -// lowest bits. As a side effect, the original bit pattern will be -// shifted to the right by n bits. -inline UInt32 ChopLowBits(UInt32* bits, int n) { - const UInt32 low_bits = *bits & ((static_cast(1) << n) - 1); - *bits >>= n; - return low_bits; -} - -// Converts a Unicode code point to a narrow string in UTF-8 encoding. -// code_point parameter is of type UInt32 because wchar_t may not be -// wide enough to contain a code point. -// If the code_point is not a valid Unicode code point -// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted -// to "(Invalid Unicode 0xXXXXXXXX)". -std::string CodePointToUtf8(UInt32 code_point) { - if (code_point > kMaxCodePoint4) { - return "(Invalid Unicode 0x" + String::FormatHexInt(code_point) + ")"; - } - - char str[5]; // Big enough for the largest valid code point. - if (code_point <= kMaxCodePoint1) { - str[1] = '\0'; - str[0] = static_cast(code_point); // 0xxxxxxx - } else if (code_point <= kMaxCodePoint2) { - str[2] = '\0'; - str[1] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx - str[0] = static_cast(0xC0 | code_point); // 110xxxxx - } else if (code_point <= kMaxCodePoint3) { - str[3] = '\0'; - str[2] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx - str[1] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx - str[0] = static_cast(0xE0 | code_point); // 1110xxxx - } else { // code_point <= kMaxCodePoint4 - str[4] = '\0'; - str[3] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx - str[2] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx - str[1] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx - str[0] = static_cast(0xF0 | code_point); // 11110xxx - } - return str; -} - -// The following two functions only make sense if the system -// uses UTF-16 for wide string encoding. All supported systems -// with 16 bit wchar_t (Windows, Cygwin, Symbian OS) do use UTF-16. - -// Determines if the arguments constitute UTF-16 surrogate pair -// and thus should be combined into a single Unicode code point -// using CreateCodePointFromUtf16SurrogatePair. -inline bool IsUtf16SurrogatePair(wchar_t first, wchar_t second) { - return sizeof(wchar_t) == 2 && - (first & 0xFC00) == 0xD800 && (second & 0xFC00) == 0xDC00; -} - -// Creates a Unicode code point from UTF16 surrogate pair. -inline UInt32 CreateCodePointFromUtf16SurrogatePair(wchar_t first, - wchar_t second) { - const UInt32 mask = (1 << 10) - 1; - return (sizeof(wchar_t) == 2) ? - (((first & mask) << 10) | (second & mask)) + 0x10000 : - // This function should not be called when the condition is - // false, but we provide a sensible default in case it is. - static_cast(first); -} - -// Converts a wide string to a narrow string in UTF-8 encoding. -// The wide string is assumed to have the following encoding: -// UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin, Symbian OS) -// UTF-32 if sizeof(wchar_t) == 4 (on Linux) -// Parameter str points to a null-terminated wide string. -// Parameter num_chars may additionally limit the number -// of wchar_t characters processed. -1 is used when the entire string -// should be processed. -// If the string contains code points that are not valid Unicode code points -// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output -// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding -// and contains invalid UTF-16 surrogate pairs, values in those pairs -// will be encoded as individual Unicode characters from Basic Normal Plane. -std::string WideStringToUtf8(const wchar_t* str, int num_chars) { - if (num_chars == -1) - num_chars = static_cast(wcslen(str)); - - ::std::stringstream stream; - for (int i = 0; i < num_chars; ++i) { - UInt32 unicode_code_point; - - if (str[i] == L'\0') { - break; - } else if (i + 1 < num_chars && IsUtf16SurrogatePair(str[i], str[i + 1])) { - unicode_code_point = CreateCodePointFromUtf16SurrogatePair(str[i], - str[i + 1]); - i++; - } else { - unicode_code_point = static_cast(str[i]); - } - - stream << CodePointToUtf8(unicode_code_point); - } - return StringStreamToString(&stream); -} - -// Converts a wide C string to an std::string using the UTF-8 encoding. -// NULL will be converted to "(null)". -std::string String::ShowWideCString(const wchar_t * wide_c_str) { - if (wide_c_str == NULL) return "(null)"; - - return internal::WideStringToUtf8(wide_c_str, -1); -} - -// Compares two wide C strings. Returns true iff they have the same -// content. -// -// Unlike wcscmp(), this function can handle NULL argument(s). A NULL -// C string is considered different to any non-NULL C string, -// including the empty string. -bool String::WideCStringEquals(const wchar_t * lhs, const wchar_t * rhs) { - if (lhs == NULL) return rhs == NULL; - - if (rhs == NULL) return false; - - return wcscmp(lhs, rhs) == 0; -} - -// Helper function for *_STREQ on wide strings. -AssertionResult CmpHelperSTREQ(const char* lhs_expression, - const char* rhs_expression, - const wchar_t* lhs, - const wchar_t* rhs) { - if (String::WideCStringEquals(lhs, rhs)) { - return AssertionSuccess(); - } - - return EqFailure(lhs_expression, - rhs_expression, - PrintToString(lhs), - PrintToString(rhs), - false); -} - -// Helper function for *_STRNE on wide strings. -AssertionResult CmpHelperSTRNE(const char* s1_expression, - const char* s2_expression, - const wchar_t* s1, - const wchar_t* s2) { - if (!String::WideCStringEquals(s1, s2)) { - return AssertionSuccess(); - } - - return AssertionFailure() << "Expected: (" << s1_expression << ") != (" - << s2_expression << "), actual: " - << PrintToString(s1) - << " vs " << PrintToString(s2); -} - -// Compares two C strings, ignoring case. Returns true iff they have -// the same content. -// -// Unlike strcasecmp(), this function can handle NULL argument(s). A -// NULL C string is considered different to any non-NULL C string, -// including the empty string. -bool String::CaseInsensitiveCStringEquals(const char * lhs, const char * rhs) { - if (lhs == NULL) - return rhs == NULL; - if (rhs == NULL) - return false; - return posix::StrCaseCmp(lhs, rhs) == 0; -} - - // Compares two wide C strings, ignoring case. Returns true iff they - // have the same content. - // - // Unlike wcscasecmp(), this function can handle NULL argument(s). - // A NULL C string is considered different to any non-NULL wide C string, - // including the empty string. - // NB: The implementations on different platforms slightly differ. - // On windows, this method uses _wcsicmp which compares according to LC_CTYPE - // environment variable. On GNU platform this method uses wcscasecmp - // which compares according to LC_CTYPE category of the current locale. - // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the - // current locale. -bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs, - const wchar_t* rhs) { - if (lhs == NULL) return rhs == NULL; - - if (rhs == NULL) return false; - -#if GTEST_OS_WINDOWS - return _wcsicmp(lhs, rhs) == 0; -#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID - return wcscasecmp(lhs, rhs) == 0; -#else - // Android, Mac OS X and Cygwin don't define wcscasecmp. - // Other unknown OSes may not define it either. - wint_t left, right; - do { - left = towlower(*lhs++); - right = towlower(*rhs++); - } while (left && left == right); - return left == right; -#endif // OS selector -} - -// Returns true iff str ends with the given suffix, ignoring case. -// Any string is considered to end with an empty suffix. -bool String::EndsWithCaseInsensitive( - const std::string& str, const std::string& suffix) { - const size_t str_len = str.length(); - const size_t suffix_len = suffix.length(); - return (str_len >= suffix_len) && - CaseInsensitiveCStringEquals(str.c_str() + str_len - suffix_len, - suffix.c_str()); -} - -// Formats an int value as "%02d". -std::string String::FormatIntWidth2(int value) { - std::stringstream ss; - ss << std::setfill('0') << std::setw(2) << value; - return ss.str(); -} - -// Formats an int value as "%X". -std::string String::FormatHexInt(int value) { - std::stringstream ss; - ss << std::hex << std::uppercase << value; - return ss.str(); -} - -// Formats a byte as "%02X". -std::string String::FormatByte(unsigned char value) { - std::stringstream ss; - ss << std::setfill('0') << std::setw(2) << std::hex << std::uppercase - << static_cast(value); - return ss.str(); -} - -// Converts the buffer in a stringstream to an std::string, converting NUL -// bytes to "\\0" along the way. -std::string StringStreamToString(::std::stringstream* ss) { - const ::std::string& str = ss->str(); - const char* const start = str.c_str(); - const char* const end = start + str.length(); - - std::string result; - result.reserve(2 * (end - start)); - for (const char* ch = start; ch != end; ++ch) { - if (*ch == '\0') { - result += "\\0"; // Replaces NUL with "\\0"; - } else { - result += *ch; - } - } - - return result; -} - -// Appends the user-supplied message to the Google-Test-generated message. -std::string AppendUserMessage(const std::string& gtest_msg, - const Message& user_msg) { - // Appends the user message if it's non-empty. - const std::string user_msg_string = user_msg.GetString(); - if (user_msg_string.empty()) { - return gtest_msg; - } - - return gtest_msg + "\n" + user_msg_string; -} - -} // namespace internal - -// class TestResult - -// Creates an empty TestResult. -TestResult::TestResult() - : death_test_count_(0), - elapsed_time_(0) { -} - -// D'tor. -TestResult::~TestResult() { -} - -// Returns the i-th test part result among all the results. i can -// range from 0 to total_part_count() - 1. If i is not in that range, -// aborts the program. -const TestPartResult& TestResult::GetTestPartResult(int i) const { - if (i < 0 || i >= total_part_count()) - internal::posix::Abort(); - return test_part_results_.at(i); -} - -// Returns the i-th test property. i can range from 0 to -// test_property_count() - 1. If i is not in that range, aborts the -// program. -const TestProperty& TestResult::GetTestProperty(int i) const { - if (i < 0 || i >= test_property_count()) - internal::posix::Abort(); - return test_properties_.at(i); -} - -// Clears the test part results. -void TestResult::ClearTestPartResults() { - test_part_results_.clear(); -} - -// Adds a test part result to the list. -void TestResult::AddTestPartResult(const TestPartResult& test_part_result) { - test_part_results_.push_back(test_part_result); -} - -// Adds a test property to the list. If a property with the same key as the -// supplied property is already represented, the value of this test_property -// replaces the old value for that key. -void TestResult::RecordProperty(const std::string& xml_element, - const TestProperty& test_property) { - if (!ValidateTestProperty(xml_element, test_property)) { - return; - } - internal::MutexLock lock(&test_properites_mutex_); - const std::vector::iterator property_with_matching_key = - std::find_if(test_properties_.begin(), test_properties_.end(), - internal::TestPropertyKeyIs(test_property.key())); - if (property_with_matching_key == test_properties_.end()) { - test_properties_.push_back(test_property); - return; - } - property_with_matching_key->SetValue(test_property.value()); -} - -// The list of reserved attributes used in the element of XML -// output. -static const char* const kReservedTestSuitesAttributes[] = { - "disabled", - "errors", - "failures", - "name", - "random_seed", - "tests", - "time", - "timestamp" -}; - -// The list of reserved attributes used in the element of XML -// output. -static const char* const kReservedTestSuiteAttributes[] = { - "disabled", - "errors", - "failures", - "name", - "tests", - "time" -}; - -// The list of reserved attributes used in the element of XML output. -static const char* const kReservedTestCaseAttributes[] = { - "classname", - "name", - "status", - "time", - "type_param", - "value_param" -}; - -template -std::vector ArrayAsVector(const char* const (&array)[kSize]) { - return std::vector(array, array + kSize); -} - -static std::vector GetReservedAttributesForElement( - const std::string& xml_element) { - if (xml_element == "testsuites") { - return ArrayAsVector(kReservedTestSuitesAttributes); - } else if (xml_element == "testsuite") { - return ArrayAsVector(kReservedTestSuiteAttributes); - } else if (xml_element == "testcase") { - return ArrayAsVector(kReservedTestCaseAttributes); - } else { - GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element; - } - // This code is unreachable but some compilers may not realizes that. - return std::vector(); -} - -static std::string FormatWordList(const std::vector& words) { - Message word_list; - for (size_t i = 0; i < words.size(); ++i) { - if (i > 0 && words.size() > 2) { - word_list << ", "; - } - if (i == words.size() - 1) { - word_list << "and "; - } - word_list << "'" << words[i] << "'"; - } - return word_list.GetString(); -} - -static bool ValidateTestPropertyName( - const std::string& property_name, - const std::vector& reserved_names) { - if (std::find(reserved_names.begin(), reserved_names.end(), property_name) != - reserved_names.end()) { - ADD_FAILURE() << "Reserved key used in RecordProperty(): " << property_name - << " (" << FormatWordList(reserved_names) - << " are reserved by " << GTEST_NAME_ << ")"; - return false; - } - return true; -} - -// Adds a failure if the key is a reserved attribute of the element named -// xml_element. Returns true if the property is valid. -bool TestResult::ValidateTestProperty(const std::string& xml_element, - const TestProperty& test_property) { - return ValidateTestPropertyName(test_property.key(), - GetReservedAttributesForElement(xml_element)); -} - -// Clears the object. -void TestResult::Clear() { - test_part_results_.clear(); - test_properties_.clear(); - death_test_count_ = 0; - elapsed_time_ = 0; -} - -// Returns true iff the test failed. -bool TestResult::Failed() const { - for (int i = 0; i < total_part_count(); ++i) { - if (GetTestPartResult(i).failed()) - return true; - } - return false; -} - -// Returns true iff the test part fatally failed. -static bool TestPartFatallyFailed(const TestPartResult& result) { - return result.fatally_failed(); -} - -// Returns true iff the test fatally failed. -bool TestResult::HasFatalFailure() const { - return CountIf(test_part_results_, TestPartFatallyFailed) > 0; -} - -// Returns true iff the test part non-fatally failed. -static bool TestPartNonfatallyFailed(const TestPartResult& result) { - return result.nonfatally_failed(); -} - -// Returns true iff the test has a non-fatal failure. -bool TestResult::HasNonfatalFailure() const { - return CountIf(test_part_results_, TestPartNonfatallyFailed) > 0; -} - -// Gets the number of all test parts. This is the sum of the number -// of successful test parts and the number of failed test parts. -int TestResult::total_part_count() const { - return static_cast(test_part_results_.size()); -} - -// Returns the number of the test properties. -int TestResult::test_property_count() const { - return static_cast(test_properties_.size()); -} - -// class Test - -// Creates a Test object. - -// The c'tor saves the states of all flags. -Test::Test() - : gtest_flag_saver_(new GTEST_FLAG_SAVER_) { -} - -// The d'tor restores the states of all flags. The actual work is -// done by the d'tor of the gtest_flag_saver_ field, and thus not -// visible here. -Test::~Test() { -} - -// Sets up the test fixture. -// -// A sub-class may override this. -void Test::SetUp() { -} - -// Tears down the test fixture. -// -// A sub-class may override this. -void Test::TearDown() { -} - -// Allows user supplied key value pairs to be recorded for later output. -void Test::RecordProperty(const std::string& key, const std::string& value) { - UnitTest::GetInstance()->RecordProperty(key, value); -} - -// Allows user supplied key value pairs to be recorded for later output. -void Test::RecordProperty(const std::string& key, int value) { - Message value_message; - value_message << value; - RecordProperty(key, value_message.GetString().c_str()); -} - -namespace internal { - -void ReportFailureInUnknownLocation(TestPartResult::Type result_type, - const std::string& message) { - // This function is a friend of UnitTest and as such has access to - // AddTestPartResult. - UnitTest::GetInstance()->AddTestPartResult( - result_type, - NULL, // No info about the source file where the exception occurred. - -1, // We have no info on which line caused the exception. - message, - ""); // No stack trace, either. -} - -} // namespace internal - -// Google Test requires all tests in the same test case to use the same test -// fixture class. This function checks if the current test has the -// same fixture class as the first test in the current test case. If -// yes, it returns true; otherwise it generates a Google Test failure and -// returns false. -bool Test::HasSameFixtureClass() { - internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); - const TestCase* const test_case = impl->current_test_case(); - - // Info about the first test in the current test case. - const TestInfo* const first_test_info = test_case->test_info_list()[0]; - const internal::TypeId first_fixture_id = first_test_info->fixture_class_id_; - const char* const first_test_name = first_test_info->name(); - - // Info about the current test. - const TestInfo* const this_test_info = impl->current_test_info(); - const internal::TypeId this_fixture_id = this_test_info->fixture_class_id_; - const char* const this_test_name = this_test_info->name(); - - if (this_fixture_id != first_fixture_id) { - // Is the first test defined using TEST? - const bool first_is_TEST = first_fixture_id == internal::GetTestTypeId(); - // Is this test defined using TEST? - const bool this_is_TEST = this_fixture_id == internal::GetTestTypeId(); - - if (first_is_TEST || this_is_TEST) { - // Both TEST and TEST_F appear in same test case, which is incorrect. - // Tell the user how to fix this. - - // Gets the name of the TEST and the name of the TEST_F. Note - // that first_is_TEST and this_is_TEST cannot both be true, as - // the fixture IDs are different for the two tests. - const char* const TEST_name = - first_is_TEST ? first_test_name : this_test_name; - const char* const TEST_F_name = - first_is_TEST ? this_test_name : first_test_name; - - ADD_FAILURE() - << "All tests in the same test case must use the same test fixture\n" - << "class, so mixing TEST_F and TEST in the same test case is\n" - << "illegal. In test case " << this_test_info->test_case_name() - << ",\n" - << "test " << TEST_F_name << " is defined using TEST_F but\n" - << "test " << TEST_name << " is defined using TEST. You probably\n" - << "want to change the TEST to TEST_F or move it to another test\n" - << "case."; - } else { - // Two fixture classes with the same name appear in two different - // namespaces, which is not allowed. Tell the user how to fix this. - ADD_FAILURE() - << "All tests in the same test case must use the same test fixture\n" - << "class. However, in test case " - << this_test_info->test_case_name() << ",\n" - << "you defined test " << first_test_name - << " and test " << this_test_name << "\n" - << "using two different test fixture classes. This can happen if\n" - << "the two classes are from different namespaces or translation\n" - << "units and have the same name. You should probably rename one\n" - << "of the classes to put the tests into different test cases."; - } - return false; - } - - return true; -} - -#if GTEST_HAS_SEH - -// Adds an "exception thrown" fatal failure to the current test. This -// function returns its result via an output parameter pointer because VC++ -// prohibits creation of objects with destructors on stack in functions -// using __try (see error C2712). -static std::string* FormatSehExceptionMessage(DWORD exception_code, - const char* location) { - Message message; - message << "SEH exception with code 0x" << std::setbase(16) << - exception_code << std::setbase(10) << " thrown in " << location << "."; - - return new std::string(message.GetString()); -} - -#endif // GTEST_HAS_SEH - -namespace internal { - -#if GTEST_HAS_EXCEPTIONS - -// Adds an "exception thrown" fatal failure to the current test. -static std::string FormatCxxExceptionMessage(const char* description, - const char* location) { - Message message; - if (description != NULL) { - message << "C++ exception with description \"" << description << "\""; - } else { - message << "Unknown C++ exception"; - } - message << " thrown in " << location << "."; - - return message.GetString(); -} - -static std::string PrintTestPartResultToString( - const TestPartResult& test_part_result); - -GoogleTestFailureException::GoogleTestFailureException( - const TestPartResult& failure) - : ::std::runtime_error(PrintTestPartResultToString(failure).c_str()) {} - -#endif // GTEST_HAS_EXCEPTIONS - -// We put these helper functions in the internal namespace as IBM's xlC -// compiler rejects the code if they were declared static. - -// Runs the given method and handles SEH exceptions it throws, when -// SEH is supported; returns the 0-value for type Result in case of an -// SEH exception. (Microsoft compilers cannot handle SEH and C++ -// exceptions in the same function. Therefore, we provide a separate -// wrapper function for handling SEH exceptions.) -template -Result HandleSehExceptionsInMethodIfSupported( - T* object, Result (T::*method)(), const char* location) { -#if GTEST_HAS_SEH - __try { - return (object->*method)(); - } __except (internal::UnitTestOptions::GTestShouldProcessSEH( // NOLINT - GetExceptionCode())) { - // We create the exception message on the heap because VC++ prohibits - // creation of objects with destructors on stack in functions using __try - // (see error C2712). - std::string* exception_message = FormatSehExceptionMessage( - GetExceptionCode(), location); - internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure, - *exception_message); - delete exception_message; - return static_cast(0); - } -#else - (void)location; - return (object->*method)(); -#endif // GTEST_HAS_SEH -} - -// Runs the given method and catches and reports C++ and/or SEH-style -// exceptions, if they are supported; returns the 0-value for type -// Result in case of an SEH exception. -template -Result HandleExceptionsInMethodIfSupported( - T* object, Result (T::*method)(), const char* location) { - // NOTE: The user code can affect the way in which Google Test handles - // exceptions by setting GTEST_FLAG(catch_exceptions), but only before - // RUN_ALL_TESTS() starts. It is technically possible to check the flag - // after the exception is caught and either report or re-throw the - // exception based on the flag's value: - // - // try { - // // Perform the test method. - // } catch (...) { - // if (GTEST_FLAG(catch_exceptions)) - // // Report the exception as failure. - // else - // throw; // Re-throws the original exception. - // } - // - // However, the purpose of this flag is to allow the program to drop into - // the debugger when the exception is thrown. On most platforms, once the - // control enters the catch block, the exception origin information is - // lost and the debugger will stop the program at the point of the - // re-throw in this function -- instead of at the point of the original - // throw statement in the code under test. For this reason, we perform - // the check early, sacrificing the ability to affect Google Test's - // exception handling in the method where the exception is thrown. - if (internal::GetUnitTestImpl()->catch_exceptions()) { -#if GTEST_HAS_EXCEPTIONS - try { - return HandleSehExceptionsInMethodIfSupported(object, method, location); - } catch (const AssertionException&) { // NOLINT - // This failure was reported already. - } catch (const internal::GoogleTestFailureException&) { // NOLINT - // This exception type can only be thrown by a failed Google - // Test assertion with the intention of letting another testing - // framework catch it. Therefore we just re-throw it. - throw; - } catch (const std::exception& e) { // NOLINT - internal::ReportFailureInUnknownLocation( - TestPartResult::kFatalFailure, - FormatCxxExceptionMessage(e.what(), location)); - } catch (...) { // NOLINT - internal::ReportFailureInUnknownLocation( - TestPartResult::kFatalFailure, - FormatCxxExceptionMessage(NULL, location)); - } - return static_cast(0); -#else - return HandleSehExceptionsInMethodIfSupported(object, method, location); -#endif // GTEST_HAS_EXCEPTIONS - } else { - return (object->*method)(); - } -} - -} // namespace internal - -// Runs the test and updates the test result. -void Test::Run() { - if (!HasSameFixtureClass()) return; - - internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported(this, &Test::SetUp, "SetUp()"); - // We will run the test only if SetUp() was successful. - if (!HasFatalFailure()) { - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported( - this, &Test::TestBody, "the test body"); - } - - // However, we want to clean up as much as possible. Hence we will - // always call TearDown(), even if SetUp() or the test body has - // failed. - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported( - this, &Test::TearDown, "TearDown()"); -} - -// Returns true iff the current test has a fatal failure. -bool Test::HasFatalFailure() { - return internal::GetUnitTestImpl()->current_test_result()->HasFatalFailure(); -} - -// Returns true iff the current test has a non-fatal failure. -bool Test::HasNonfatalFailure() { - return internal::GetUnitTestImpl()->current_test_result()-> - HasNonfatalFailure(); -} - -// class TestInfo - -// Constructs a TestInfo object. It assumes ownership of the test factory -// object. -TestInfo::TestInfo(const std::string& a_test_case_name, - const std::string& a_name, - const char* a_type_param, - const char* a_value_param, - internal::CodeLocation a_code_location, - internal::TypeId fixture_class_id, - internal::TestFactoryBase* factory) - : test_case_name_(a_test_case_name), - name_(a_name), - type_param_(a_type_param ? new std::string(a_type_param) : NULL), - value_param_(a_value_param ? new std::string(a_value_param) : NULL), - location_(a_code_location), - fixture_class_id_(fixture_class_id), - should_run_(false), - is_disabled_(false), - matches_filter_(false), - factory_(factory), - result_() {} - -// Destructs a TestInfo object. -TestInfo::~TestInfo() { delete factory_; } - -namespace internal { - -// Creates a new TestInfo object and registers it with Google Test; -// returns the created object. -// -// Arguments: -// -// test_case_name: name of the test case -// name: name of the test -// type_param: the name of the test's type parameter, or NULL if -// this is not a typed or a type-parameterized test. -// value_param: text representation of the test's value parameter, -// or NULL if this is not a value-parameterized test. -// code_location: code location where the test is defined -// fixture_class_id: ID of the test fixture class -// set_up_tc: pointer to the function that sets up the test case -// tear_down_tc: pointer to the function that tears down the test case -// factory: pointer to the factory that creates a test object. -// The newly created TestInfo instance will assume -// ownership of the factory object. -TestInfo* MakeAndRegisterTestInfo( - const char* test_case_name, - const char* name, - const char* type_param, - const char* value_param, - CodeLocation code_location, - TypeId fixture_class_id, - SetUpTestCaseFunc set_up_tc, - TearDownTestCaseFunc tear_down_tc, - TestFactoryBase* factory) { - TestInfo* const test_info = - new TestInfo(test_case_name, name, type_param, value_param, - code_location, fixture_class_id, factory); - GetUnitTestImpl()->AddTestInfo(set_up_tc, tear_down_tc, test_info); - return test_info; -} - -void ReportInvalidTestCaseType(const char* test_case_name, - CodeLocation code_location) { - Message errors; - errors - << "Attempted redefinition of test case " << test_case_name << ".\n" - << "All tests in the same test case must use the same test fixture\n" - << "class. However, in test case " << test_case_name << ", you tried\n" - << "to define a test using a fixture class different from the one\n" - << "used earlier. This can happen if the two fixture classes are\n" - << "from different namespaces and have the same name. You should\n" - << "probably rename one of the classes to put the tests into different\n" - << "test cases."; - - GTEST_LOG_(ERROR) << FormatFileLocation(code_location.file.c_str(), - code_location.line) - << " " << errors.GetString(); -} -} // namespace internal - -namespace { - -// A predicate that checks the test name of a TestInfo against a known -// value. -// -// This is used for implementation of the TestCase class only. We put -// it in the anonymous namespace to prevent polluting the outer -// namespace. -// -// TestNameIs is copyable. -class TestNameIs { - public: - // Constructor. - // - // TestNameIs has NO default constructor. - explicit TestNameIs(const char* name) - : name_(name) {} - - // Returns true iff the test name of test_info matches name_. - bool operator()(const TestInfo * test_info) const { - return test_info && test_info->name() == name_; - } - - private: - std::string name_; -}; - -} // namespace - -namespace internal { - -// This method expands all parameterized tests registered with macros TEST_P -// and INSTANTIATE_TEST_CASE_P into regular tests and registers those. -// This will be done just once during the program runtime. -void UnitTestImpl::RegisterParameterizedTests() { - if (!parameterized_tests_registered_) { - parameterized_test_registry_.RegisterTests(); - parameterized_tests_registered_ = true; - } -} - -} // namespace internal - -// Creates the test object, runs it, records its result, and then -// deletes it. -void TestInfo::Run() { - if (!should_run_) return; - - // Tells UnitTest where to store test result. - internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); - impl->set_current_test_info(this); - - TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater(); - - // Notifies the unit test event listeners that a test is about to start. - repeater->OnTestStart(*this); - - const TimeInMillis start = internal::GetTimeInMillis(); - - impl->os_stack_trace_getter()->UponLeavingGTest(); - - // Creates the test object. - Test* const test = internal::HandleExceptionsInMethodIfSupported( - factory_, &internal::TestFactoryBase::CreateTest, - "the test fixture's constructor"); - - // Runs the test only if the test object was created and its - // constructor didn't generate a fatal failure. - if ((test != NULL) && !Test::HasFatalFailure()) { - // This doesn't throw as all user code that can throw are wrapped into - // exception handling code. - test->Run(); - } - - // Deletes the test object. - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported( - test, &Test::DeleteSelf_, "the test fixture's destructor"); - - result_.set_elapsed_time(internal::GetTimeInMillis() - start); - - // Notifies the unit test event listener that a test has just finished. - repeater->OnTestEnd(*this); - - // Tells UnitTest to stop associating assertion results to this - // test. - impl->set_current_test_info(NULL); -} - -// class TestCase - -// Gets the number of successful tests in this test case. -int TestCase::successful_test_count() const { - return CountIf(test_info_list_, TestPassed); -} - -// Gets the number of failed tests in this test case. -int TestCase::failed_test_count() const { - return CountIf(test_info_list_, TestFailed); -} - -// Gets the number of disabled tests that will be reported in the XML report. -int TestCase::reportable_disabled_test_count() const { - return CountIf(test_info_list_, TestReportableDisabled); -} - -// Gets the number of disabled tests in this test case. -int TestCase::disabled_test_count() const { - return CountIf(test_info_list_, TestDisabled); -} - -// Gets the number of tests to be printed in the XML report. -int TestCase::reportable_test_count() const { - return CountIf(test_info_list_, TestReportable); -} - -// Get the number of tests in this test case that should run. -int TestCase::test_to_run_count() const { - return CountIf(test_info_list_, ShouldRunTest); -} - -// Gets the number of all tests. -int TestCase::total_test_count() const { - return static_cast(test_info_list_.size()); -} - -// Creates a TestCase with the given name. -// -// Arguments: -// -// name: name of the test case -// a_type_param: the name of the test case's type parameter, or NULL if -// this is not a typed or a type-parameterized test case. -// set_up_tc: pointer to the function that sets up the test case -// tear_down_tc: pointer to the function that tears down the test case -TestCase::TestCase(const char* a_name, const char* a_type_param, - Test::SetUpTestCaseFunc set_up_tc, - Test::TearDownTestCaseFunc tear_down_tc) - : name_(a_name), - type_param_(a_type_param ? new std::string(a_type_param) : NULL), - set_up_tc_(set_up_tc), - tear_down_tc_(tear_down_tc), - should_run_(false), - elapsed_time_(0) { -} - -// Destructor of TestCase. -TestCase::~TestCase() { - // Deletes every Test in the collection. - ForEach(test_info_list_, internal::Delete); -} - -// Returns the i-th test among all the tests. i can range from 0 to -// total_test_count() - 1. If i is not in that range, returns NULL. -const TestInfo* TestCase::GetTestInfo(int i) const { - const int index = GetElementOr(test_indices_, i, -1); - return index < 0 ? NULL : test_info_list_[index]; -} - -// Returns the i-th test among all the tests. i can range from 0 to -// total_test_count() - 1. If i is not in that range, returns NULL. -TestInfo* TestCase::GetMutableTestInfo(int i) { - const int index = GetElementOr(test_indices_, i, -1); - return index < 0 ? NULL : test_info_list_[index]; -} - -// Adds a test to this test case. Will delete the test upon -// destruction of the TestCase object. -void TestCase::AddTestInfo(TestInfo * test_info) { - test_info_list_.push_back(test_info); - test_indices_.push_back(static_cast(test_indices_.size())); -} - -// Runs every test in this TestCase. -void TestCase::Run() { - if (!should_run_) return; - - internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); - impl->set_current_test_case(this); - - TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater(); - - repeater->OnTestCaseStart(*this); - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported( - this, &TestCase::RunSetUpTestCase, "SetUpTestCase()"); - - const internal::TimeInMillis start = internal::GetTimeInMillis(); - for (int i = 0; i < total_test_count(); i++) { - GetMutableTestInfo(i)->Run(); - } - elapsed_time_ = internal::GetTimeInMillis() - start; - - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported( - this, &TestCase::RunTearDownTestCase, "TearDownTestCase()"); - - repeater->OnTestCaseEnd(*this); - impl->set_current_test_case(NULL); -} - -// Clears the results of all tests in this test case. -void TestCase::ClearResult() { - ad_hoc_test_result_.Clear(); - ForEach(test_info_list_, TestInfo::ClearTestResult); -} - -// Shuffles the tests in this test case. -void TestCase::ShuffleTests(internal::Random* random) { - Shuffle(random, &test_indices_); -} - -// Restores the test order to before the first shuffle. -void TestCase::UnshuffleTests() { - for (size_t i = 0; i < test_indices_.size(); i++) { - test_indices_[i] = static_cast(i); - } -} - -// Formats a countable noun. Depending on its quantity, either the -// singular form or the plural form is used. e.g. -// -// FormatCountableNoun(1, "formula", "formuli") returns "1 formula". -// FormatCountableNoun(5, "book", "books") returns "5 books". -static std::string FormatCountableNoun(int count, - const char * singular_form, - const char * plural_form) { - return internal::StreamableToString(count) + " " + - (count == 1 ? singular_form : plural_form); -} - -// Formats the count of tests. -static std::string FormatTestCount(int test_count) { - return FormatCountableNoun(test_count, "test", "tests"); -} - -// Formats the count of test cases. -static std::string FormatTestCaseCount(int test_case_count) { - return FormatCountableNoun(test_case_count, "test case", "test cases"); -} - -// Converts a TestPartResult::Type enum to human-friendly string -// representation. Both kNonFatalFailure and kFatalFailure are translated -// to "Failure", as the user usually doesn't care about the difference -// between the two when viewing the test result. -static const char * TestPartResultTypeToString(TestPartResult::Type type) { - switch (type) { - case TestPartResult::kSuccess: - return "Success"; - - case TestPartResult::kNonFatalFailure: - case TestPartResult::kFatalFailure: -#ifdef _MSC_VER - return "error: "; -#else - return "Failure\n"; -#endif - default: - return "Unknown result type"; - } -} - -namespace internal { - -// Prints a TestPartResult to an std::string. -static std::string PrintTestPartResultToString( - const TestPartResult& test_part_result) { - return (Message() - << internal::FormatFileLocation(test_part_result.file_name(), - test_part_result.line_number()) - << " " << TestPartResultTypeToString(test_part_result.type()) - << test_part_result.message()).GetString(); -} - -// Prints a TestPartResult. -static void PrintTestPartResult(const TestPartResult& test_part_result) { - const std::string& result = - PrintTestPartResultToString(test_part_result); - printf("%s\n", result.c_str()); - fflush(stdout); - // If the test program runs in Visual Studio or a debugger, the - // following statements add the test part result message to the Output - // window such that the user can double-click on it to jump to the - // corresponding source code location; otherwise they do nothing. -#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE - // We don't call OutputDebugString*() on Windows Mobile, as printing - // to stdout is done by OutputDebugString() there already - we don't - // want the same message printed twice. - ::OutputDebugStringA(result.c_str()); - ::OutputDebugStringA("\n"); -#endif -} - -// class PrettyUnitTestResultPrinter - -enum GTestColor { - COLOR_DEFAULT, - COLOR_RED, - COLOR_GREEN, - COLOR_YELLOW -}; - -#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \ - !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW - -// Returns the character attribute for the given color. -static WORD GetColorAttribute(GTestColor color) { - switch (color) { - case COLOR_RED: return FOREGROUND_RED; - case COLOR_GREEN: return FOREGROUND_GREEN; - case COLOR_YELLOW: return FOREGROUND_RED | FOREGROUND_GREEN; - default: return 0; - } -} - -static int GetBitOffset(WORD color_mask) { - if (color_mask == 0) return 0; - - int bitOffset = 0; - while ((color_mask & 1) == 0) { - color_mask >>= 1; - ++bitOffset; - } - return bitOffset; -} - -static WORD GetNewColor(GTestColor color, WORD old_color_attrs) { - // Let's reuse the BG - static const WORD background_mask = BACKGROUND_BLUE | BACKGROUND_GREEN | - BACKGROUND_RED | BACKGROUND_INTENSITY; - static const WORD foreground_mask = FOREGROUND_BLUE | FOREGROUND_GREEN | - FOREGROUND_RED | FOREGROUND_INTENSITY; - const WORD existing_bg = old_color_attrs & background_mask; - - WORD new_color = - GetColorAttribute(color) | existing_bg | FOREGROUND_INTENSITY; - static const int bg_bitOffset = GetBitOffset(background_mask); - static const int fg_bitOffset = GetBitOffset(foreground_mask); - - if (((new_color & background_mask) >> bg_bitOffset) == - ((new_color & foreground_mask) >> fg_bitOffset)) { - new_color ^= FOREGROUND_INTENSITY; // invert intensity - } - return new_color; -} - -#else - -// Returns the ANSI color code for the given color. COLOR_DEFAULT is -// an invalid input. -static const char* GetAnsiColorCode(GTestColor color) { - switch (color) { - case COLOR_RED: return "1"; - case COLOR_GREEN: return "2"; - case COLOR_YELLOW: return "3"; - default: return NULL; - }; -} - -#endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE - -// Returns true iff Google Test should use colors in the output. -bool ShouldUseColor(bool stdout_is_tty) { - const char* const gtest_color = GTEST_FLAG(color).c_str(); - - if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) { -#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW - // On Windows the TERM variable is usually not set, but the - // console there does support colors. - return stdout_is_tty; -#else - // On non-Windows platforms, we rely on the TERM variable. - const char* const term = posix::GetEnv("TERM"); - const bool term_supports_color = - String::CStringEquals(term, "xterm") || - String::CStringEquals(term, "xterm-color") || - String::CStringEquals(term, "xterm-256color") || - String::CStringEquals(term, "screen") || - String::CStringEquals(term, "screen-256color") || - String::CStringEquals(term, "tmux") || - String::CStringEquals(term, "tmux-256color") || - String::CStringEquals(term, "rxvt-unicode") || - String::CStringEquals(term, "rxvt-unicode-256color") || - String::CStringEquals(term, "linux") || - String::CStringEquals(term, "cygwin"); - return stdout_is_tty && term_supports_color; -#endif // GTEST_OS_WINDOWS - } - - return String::CaseInsensitiveCStringEquals(gtest_color, "yes") || - String::CaseInsensitiveCStringEquals(gtest_color, "true") || - String::CaseInsensitiveCStringEquals(gtest_color, "t") || - String::CStringEquals(gtest_color, "1"); - // We take "yes", "true", "t", and "1" as meaning "yes". If the - // value is neither one of these nor "auto", we treat it as "no" to - // be conservative. -} - -// Helpers for printing colored strings to stdout. Note that on Windows, we -// cannot simply emit special characters and have the terminal change colors. -// This routine must actually emit the characters rather than return a string -// that would be colored when printed, as can be done on Linux. -static void ColoredPrintf(GTestColor color, const char* fmt, ...) { - va_list args; - va_start(args, fmt); - -#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS || \ - GTEST_OS_IOS || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT - const bool use_color = AlwaysFalse(); -#else - static const bool in_color_mode = - ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0); - const bool use_color = in_color_mode && (color != COLOR_DEFAULT); -#endif // GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS - // The '!= 0' comparison is necessary to satisfy MSVC 7.1. - - if (!use_color) { - vprintf(fmt, args); - va_end(args); - return; - } - -#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \ - !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW - const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE); - - // Gets the current text color. - CONSOLE_SCREEN_BUFFER_INFO buffer_info; - GetConsoleScreenBufferInfo(stdout_handle, &buffer_info); - const WORD old_color_attrs = buffer_info.wAttributes; - const WORD new_color = GetNewColor(color, old_color_attrs); - - // We need to flush the stream buffers into the console before each - // SetConsoleTextAttribute call lest it affect the text that is already - // printed but has not yet reached the console. - fflush(stdout); - SetConsoleTextAttribute(stdout_handle, new_color); - - vprintf(fmt, args); - - fflush(stdout); - // Restores the text color. - SetConsoleTextAttribute(stdout_handle, old_color_attrs); -#else - printf("\033[0;3%sm", GetAnsiColorCode(color)); - vprintf(fmt, args); - printf("\033[m"); // Resets the terminal to default. -#endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE - va_end(args); -} - -// Text printed in Google Test's text output and --gtest_list_tests -// output to label the type parameter and value parameter for a test. -static const char kTypeParamLabel[] = "TypeParam"; -static const char kValueParamLabel[] = "GetParam()"; - -static void PrintFullTestCommentIfPresent(const TestInfo& test_info) { - const char* const type_param = test_info.type_param(); - const char* const value_param = test_info.value_param(); - - if (type_param != NULL || value_param != NULL) { - printf(", where "); - if (type_param != NULL) { - printf("%s = %s", kTypeParamLabel, type_param); - if (value_param != NULL) - printf(" and "); - } - if (value_param != NULL) { - printf("%s = %s", kValueParamLabel, value_param); - } - } -} - -// This class implements the TestEventListener interface. -// -// Class PrettyUnitTestResultPrinter is copyable. -class PrettyUnitTestResultPrinter : public TestEventListener { - public: - PrettyUnitTestResultPrinter() {} - static void PrintTestName(const char * test_case, const char * test) { - printf("%s.%s", test_case, test); - } - - // The following methods override what's in the TestEventListener class. - virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {} - virtual void OnTestIterationStart(const UnitTest& unit_test, int iteration); - virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test); - virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {} - virtual void OnTestCaseStart(const TestCase& test_case); - virtual void OnTestStart(const TestInfo& test_info); - virtual void OnTestPartResult(const TestPartResult& result); - virtual void OnTestEnd(const TestInfo& test_info); - virtual void OnTestCaseEnd(const TestCase& test_case); - virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test); - virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {} - virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration); - virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {} - - private: - static void PrintFailedTests(const UnitTest& unit_test); -}; - - // Fired before each iteration of tests starts. -void PrettyUnitTestResultPrinter::OnTestIterationStart( - const UnitTest& unit_test, int iteration) { - if (GTEST_FLAG(repeat) != 1) - printf("\nRepeating all tests (iteration %d) . . .\n\n", iteration + 1); - - const char* const filter = GTEST_FLAG(filter).c_str(); - - // Prints the filter if it's not *. This reminds the user that some - // tests may be skipped. - if (!String::CStringEquals(filter, kUniversalFilter)) { - ColoredPrintf(COLOR_YELLOW, - "Note: %s filter = %s\n", GTEST_NAME_, filter); - } - - if (internal::ShouldShard(kTestTotalShards, kTestShardIndex, false)) { - const Int32 shard_index = Int32FromEnvOrDie(kTestShardIndex, -1); - ColoredPrintf(COLOR_YELLOW, - "Note: This is test shard %d of %s.\n", - static_cast(shard_index) + 1, - internal::posix::GetEnv(kTestTotalShards)); - } - - if (GTEST_FLAG(shuffle)) { - ColoredPrintf(COLOR_YELLOW, - "Note: Randomizing tests' orders with a seed of %d .\n", - unit_test.random_seed()); - } - ColoredPrintf(COLOR_GREEN, "[==========] "); - printf("Running %s from %s.\n", - FormatTestCount(unit_test.test_to_run_count()).c_str(), - FormatTestCaseCount(unit_test.test_case_to_run_count()).c_str()); - fflush(stdout); -} - -void PrettyUnitTestResultPrinter::OnEnvironmentsSetUpStart( - const UnitTest& /*unit_test*/) { - ColoredPrintf(COLOR_GREEN, "[----------] "); - printf("Global test environment set-up.\n"); - fflush(stdout); -} - -void PrettyUnitTestResultPrinter::OnTestCaseStart(const TestCase& test_case) { - const std::string counts = - FormatCountableNoun(test_case.test_to_run_count(), "test", "tests"); - ColoredPrintf(COLOR_GREEN, "[----------] "); - printf("%s from %s", counts.c_str(), test_case.name()); - if (test_case.type_param() == NULL) { - printf("\n"); - } else { - printf(", where %s = %s\n", kTypeParamLabel, test_case.type_param()); - } - fflush(stdout); -} - -void PrettyUnitTestResultPrinter::OnTestStart(const TestInfo& test_info) { - ColoredPrintf(COLOR_GREEN, "[ RUN ] "); - PrintTestName(test_info.test_case_name(), test_info.name()); - printf("\n"); - fflush(stdout); -} - -// Called after an assertion failure. -void PrettyUnitTestResultPrinter::OnTestPartResult( - const TestPartResult& result) { - // If the test part succeeded, we don't need to do anything. - if (result.type() == TestPartResult::kSuccess) - return; - - // Print failure message from the assertion (e.g. expected this and got that). - PrintTestPartResult(result); - fflush(stdout); -} - -void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) { - if (test_info.result()->Passed()) { - ColoredPrintf(COLOR_GREEN, "[ OK ] "); - } else { - ColoredPrintf(COLOR_RED, "[ FAILED ] "); - } - PrintTestName(test_info.test_case_name(), test_info.name()); - if (test_info.result()->Failed()) - PrintFullTestCommentIfPresent(test_info); - - if (GTEST_FLAG(print_time)) { - printf(" (%s ms)\n", internal::StreamableToString( - test_info.result()->elapsed_time()).c_str()); - } else { - printf("\n"); - } - fflush(stdout); -} - -void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) { - if (!GTEST_FLAG(print_time)) return; - - const std::string counts = - FormatCountableNoun(test_case.test_to_run_count(), "test", "tests"); - ColoredPrintf(COLOR_GREEN, "[----------] "); - printf("%s from %s (%s ms total)\n\n", - counts.c_str(), test_case.name(), - internal::StreamableToString(test_case.elapsed_time()).c_str()); - fflush(stdout); -} - -void PrettyUnitTestResultPrinter::OnEnvironmentsTearDownStart( - const UnitTest& /*unit_test*/) { - ColoredPrintf(COLOR_GREEN, "[----------] "); - printf("Global test environment tear-down\n"); - fflush(stdout); -} - -// Internal helper for printing the list of failed tests. -void PrettyUnitTestResultPrinter::PrintFailedTests(const UnitTest& unit_test) { - const int failed_test_count = unit_test.failed_test_count(); - if (failed_test_count == 0) { - return; - } - - for (int i = 0; i < unit_test.total_test_case_count(); ++i) { - const TestCase& test_case = *unit_test.GetTestCase(i); - if (!test_case.should_run() || (test_case.failed_test_count() == 0)) { - continue; - } - for (int j = 0; j < test_case.total_test_count(); ++j) { - const TestInfo& test_info = *test_case.GetTestInfo(j); - if (!test_info.should_run() || test_info.result()->Passed()) { - continue; - } - ColoredPrintf(COLOR_RED, "[ FAILED ] "); - printf("%s.%s", test_case.name(), test_info.name()); - PrintFullTestCommentIfPresent(test_info); - printf("\n"); - } - } -} - -void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test, - int /*iteration*/) { - ColoredPrintf(COLOR_GREEN, "[==========] "); - printf("%s from %s ran.", - FormatTestCount(unit_test.test_to_run_count()).c_str(), - FormatTestCaseCount(unit_test.test_case_to_run_count()).c_str()); - if (GTEST_FLAG(print_time)) { - printf(" (%s ms total)", - internal::StreamableToString(unit_test.elapsed_time()).c_str()); - } - printf("\n"); - ColoredPrintf(COLOR_GREEN, "[ PASSED ] "); - printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str()); - - int num_failures = unit_test.failed_test_count(); - if (!unit_test.Passed()) { - const int failed_test_count = unit_test.failed_test_count(); - ColoredPrintf(COLOR_RED, "[ FAILED ] "); - printf("%s, listed below:\n", FormatTestCount(failed_test_count).c_str()); - PrintFailedTests(unit_test); - printf("\n%2d FAILED %s\n", num_failures, - num_failures == 1 ? "TEST" : "TESTS"); - } - - int num_disabled = unit_test.reportable_disabled_test_count(); - if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) { - if (!num_failures) { - printf("\n"); // Add a spacer if no FAILURE banner is displayed. - } - ColoredPrintf(COLOR_YELLOW, - " YOU HAVE %d DISABLED %s\n\n", - num_disabled, - num_disabled == 1 ? "TEST" : "TESTS"); - } - // Ensure that Google Test output is printed before, e.g., heapchecker output. - fflush(stdout); -} - -// End PrettyUnitTestResultPrinter - -// class TestEventRepeater -// -// This class forwards events to other event listeners. -class TestEventRepeater : public TestEventListener { - public: - TestEventRepeater() : forwarding_enabled_(true) {} - virtual ~TestEventRepeater(); - void Append(TestEventListener *listener); - TestEventListener* Release(TestEventListener* listener); - - // Controls whether events will be forwarded to listeners_. Set to false - // in death test child processes. - bool forwarding_enabled() const { return forwarding_enabled_; } - void set_forwarding_enabled(bool enable) { forwarding_enabled_ = enable; } - - virtual void OnTestProgramStart(const UnitTest& unit_test); - virtual void OnTestIterationStart(const UnitTest& unit_test, int iteration); - virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test); - virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test); - virtual void OnTestCaseStart(const TestCase& test_case); - virtual void OnTestStart(const TestInfo& test_info); - virtual void OnTestPartResult(const TestPartResult& result); - virtual void OnTestEnd(const TestInfo& test_info); - virtual void OnTestCaseEnd(const TestCase& test_case); - virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test); - virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test); - virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration); - virtual void OnTestProgramEnd(const UnitTest& unit_test); - - private: - // Controls whether events will be forwarded to listeners_. Set to false - // in death test child processes. - bool forwarding_enabled_; - // The list of listeners that receive events. - std::vector listeners_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventRepeater); -}; - -TestEventRepeater::~TestEventRepeater() { - ForEach(listeners_, Delete); -} - -void TestEventRepeater::Append(TestEventListener *listener) { - listeners_.push_back(listener); -} - -// TODO(vladl@google.com): Factor the search functionality into Vector::Find. -TestEventListener* TestEventRepeater::Release(TestEventListener *listener) { - for (size_t i = 0; i < listeners_.size(); ++i) { - if (listeners_[i] == listener) { - listeners_.erase(listeners_.begin() + i); - return listener; - } - } - - return NULL; -} - -// Since most methods are very similar, use macros to reduce boilerplate. -// This defines a member that forwards the call to all listeners. -#define GTEST_REPEATER_METHOD_(Name, Type) \ -void TestEventRepeater::Name(const Type& parameter) { \ - if (forwarding_enabled_) { \ - for (size_t i = 0; i < listeners_.size(); i++) { \ - listeners_[i]->Name(parameter); \ - } \ - } \ -} -// This defines a member that forwards the call to all listeners in reverse -// order. -#define GTEST_REVERSE_REPEATER_METHOD_(Name, Type) \ -void TestEventRepeater::Name(const Type& parameter) { \ - if (forwarding_enabled_) { \ - for (int i = static_cast(listeners_.size()) - 1; i >= 0; i--) { \ - listeners_[i]->Name(parameter); \ - } \ - } \ -} - -GTEST_REPEATER_METHOD_(OnTestProgramStart, UnitTest) -GTEST_REPEATER_METHOD_(OnEnvironmentsSetUpStart, UnitTest) -GTEST_REPEATER_METHOD_(OnTestCaseStart, TestCase) -GTEST_REPEATER_METHOD_(OnTestStart, TestInfo) -GTEST_REPEATER_METHOD_(OnTestPartResult, TestPartResult) -GTEST_REPEATER_METHOD_(OnEnvironmentsTearDownStart, UnitTest) -GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsSetUpEnd, UnitTest) -GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsTearDownEnd, UnitTest) -GTEST_REVERSE_REPEATER_METHOD_(OnTestEnd, TestInfo) -GTEST_REVERSE_REPEATER_METHOD_(OnTestCaseEnd, TestCase) -GTEST_REVERSE_REPEATER_METHOD_(OnTestProgramEnd, UnitTest) - -#undef GTEST_REPEATER_METHOD_ -#undef GTEST_REVERSE_REPEATER_METHOD_ - -void TestEventRepeater::OnTestIterationStart(const UnitTest& unit_test, - int iteration) { - if (forwarding_enabled_) { - for (size_t i = 0; i < listeners_.size(); i++) { - listeners_[i]->OnTestIterationStart(unit_test, iteration); - } - } -} - -void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test, - int iteration) { - if (forwarding_enabled_) { - for (int i = static_cast(listeners_.size()) - 1; i >= 0; i--) { - listeners_[i]->OnTestIterationEnd(unit_test, iteration); - } - } -} - -// End TestEventRepeater - -// This class generates an XML output file. -class XmlUnitTestResultPrinter : public EmptyTestEventListener { - public: - explicit XmlUnitTestResultPrinter(const char* output_file); - - virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration); - - private: - // Is c a whitespace character that is normalized to a space character - // when it appears in an XML attribute value? - static bool IsNormalizableWhitespace(char c) { - return c == 0x9 || c == 0xA || c == 0xD; - } - - // May c appear in a well-formed XML document? - static bool IsValidXmlCharacter(char c) { - return IsNormalizableWhitespace(c) || c >= 0x20; - } - - // Returns an XML-escaped copy of the input string str. If - // is_attribute is true, the text is meant to appear as an attribute - // value, and normalizable whitespace is preserved by replacing it - // with character references. - static std::string EscapeXml(const std::string& str, bool is_attribute); - - // Returns the given string with all characters invalid in XML removed. - static std::string RemoveInvalidXmlCharacters(const std::string& str); - - // Convenience wrapper around EscapeXml when str is an attribute value. - static std::string EscapeXmlAttribute(const std::string& str) { - return EscapeXml(str, true); - } - - // Convenience wrapper around EscapeXml when str is not an attribute value. - static std::string EscapeXmlText(const char* str) { - return EscapeXml(str, false); - } - - // Verifies that the given attribute belongs to the given element and - // streams the attribute as XML. - static void OutputXmlAttribute(std::ostream* stream, - const std::string& element_name, - const std::string& name, - const std::string& value); - - // Streams an XML CDATA section, escaping invalid CDATA sequences as needed. - static void OutputXmlCDataSection(::std::ostream* stream, const char* data); - - // Streams an XML representation of a TestInfo object. - static void OutputXmlTestInfo(::std::ostream* stream, - const char* test_case_name, - const TestInfo& test_info); - - // Prints an XML representation of a TestCase object - static void PrintXmlTestCase(::std::ostream* stream, - const TestCase& test_case); - - // Prints an XML summary of unit_test to output stream out. - static void PrintXmlUnitTest(::std::ostream* stream, - const UnitTest& unit_test); - - // Produces a string representing the test properties in a result as space - // delimited XML attributes based on the property key="value" pairs. - // When the std::string is not empty, it includes a space at the beginning, - // to delimit this attribute from prior attributes. - static std::string TestPropertiesAsXmlAttributes(const TestResult& result); - - // Streams an XML representation of the test properties of a TestResult - // object. - static void OutputXmlTestProperties(std::ostream* stream, - const TestResult& result); - - // The output file. - const std::string output_file_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(XmlUnitTestResultPrinter); -}; - -// Creates a new XmlUnitTestResultPrinter. -XmlUnitTestResultPrinter::XmlUnitTestResultPrinter(const char* output_file) - : output_file_(output_file) { - if (output_file_.c_str() == NULL || output_file_.empty()) { - GTEST_LOG_(FATAL) << "XML output file may not be null"; - } -} - -// Called after the unit test ends. -void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test, - int /*iteration*/) { - FILE* xmlout = NULL; - FilePath output_file(output_file_); - FilePath output_dir(output_file.RemoveFileName()); - - if (output_dir.CreateDirectoriesRecursively()) { - xmlout = posix::FOpen(output_file_.c_str(), "w"); - } - if (xmlout == NULL) { - // TODO(wan): report the reason of the failure. - // - // We don't do it for now as: - // - // 1. There is no urgent need for it. - // 2. It's a bit involved to make the errno variable thread-safe on - // all three operating systems (Linux, Windows, and Mac OS). - // 3. To interpret the meaning of errno in a thread-safe way, - // we need the strerror_r() function, which is not available on - // Windows. - - GTEST_LOG_(FATAL) << "Unable to open file \"" << output_file_ << "\""; - } - std::stringstream stream; - PrintXmlUnitTest(&stream, unit_test); - fprintf(xmlout, "%s", StringStreamToString(&stream).c_str()); - fclose(xmlout); -} - -// Returns an XML-escaped copy of the input string str. If is_attribute -// is true, the text is meant to appear as an attribute value, and -// normalizable whitespace is preserved by replacing it with character -// references. -// -// Invalid XML characters in str, if any, are stripped from the output. -// It is expected that most, if not all, of the text processed by this -// module will consist of ordinary English text. -// If this module is ever modified to produce version 1.1 XML output, -// most invalid characters can be retained using character references. -// TODO(wan): It might be nice to have a minimally invasive, human-readable -// escaping scheme for invalid characters, rather than dropping them. -std::string XmlUnitTestResultPrinter::EscapeXml( - const std::string& str, bool is_attribute) { - Message m; - - for (size_t i = 0; i < str.size(); ++i) { - const char ch = str[i]; - switch (ch) { - case '<': - m << "<"; - break; - case '>': - m << ">"; - break; - case '&': - m << "&"; - break; - case '\'': - if (is_attribute) - m << "'"; - else - m << '\''; - break; - case '"': - if (is_attribute) - m << """; - else - m << '"'; - break; - default: - if (IsValidXmlCharacter(ch)) { - if (is_attribute && IsNormalizableWhitespace(ch)) - m << "&#x" << String::FormatByte(static_cast(ch)) - << ";"; - else - m << ch; - } - break; - } - } - - return m.GetString(); -} - -// Returns the given string with all characters invalid in XML removed. -// Currently invalid characters are dropped from the string. An -// alternative is to replace them with certain characters such as . or ?. -std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters( - const std::string& str) { - std::string output; - output.reserve(str.size()); - for (std::string::const_iterator it = str.begin(); it != str.end(); ++it) - if (IsValidXmlCharacter(*it)) - output.push_back(*it); - - return output; -} - -// The following routines generate an XML representation of a UnitTest -// object. -// -// This is how Google Test concepts map to the DTD: -// -// <-- corresponds to a UnitTest object -// <-- corresponds to a TestCase object -// <-- corresponds to a TestInfo object -// ... -// ... -// ... -// <-- individual assertion failures -// -// -// - -// Formats the given time in milliseconds as seconds. -std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) { - ::std::stringstream ss; - ss << (static_cast(ms) * 1e-3); - return ss.str(); -} - -static bool PortableLocaltime(time_t seconds, struct tm* out) { -#if defined(_MSC_VER) - return localtime_s(out, &seconds) == 0; -#elif defined(__MINGW32__) || defined(__MINGW64__) - // MINGW provides neither localtime_r nor localtime_s, but uses - // Windows' localtime(), which has a thread-local tm buffer. - struct tm* tm_ptr = localtime(&seconds); // NOLINT - if (tm_ptr == NULL) - return false; - *out = *tm_ptr; - return true; -#else - return localtime_r(&seconds, out) != NULL; -#endif -} - -// Converts the given epoch time in milliseconds to a date string in the ISO -// 8601 format, without the timezone information. -std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms) { - struct tm time_struct; - if (!PortableLocaltime(static_cast(ms / 1000), &time_struct)) - return ""; - // YYYY-MM-DDThh:mm:ss - return StreamableToString(time_struct.tm_year + 1900) + "-" + - String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" + - String::FormatIntWidth2(time_struct.tm_mday) + "T" + - String::FormatIntWidth2(time_struct.tm_hour) + ":" + - String::FormatIntWidth2(time_struct.tm_min) + ":" + - String::FormatIntWidth2(time_struct.tm_sec); -} - -// Streams an XML CDATA section, escaping invalid CDATA sequences as needed. -void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream, - const char* data) { - const char* segment = data; - *stream << ""); - if (next_segment != NULL) { - stream->write( - segment, static_cast(next_segment - segment)); - *stream << "]]>]]>"); - } else { - *stream << segment; - break; - } - } - *stream << "]]>"; -} - -void XmlUnitTestResultPrinter::OutputXmlAttribute( - std::ostream* stream, - const std::string& element_name, - const std::string& name, - const std::string& value) { - const std::vector& allowed_names = - GetReservedAttributesForElement(element_name); - - GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) != - allowed_names.end()) - << "Attribute " << name << " is not allowed for element <" << element_name - << ">."; - - *stream << " " << name << "=\"" << EscapeXmlAttribute(value) << "\""; -} - -// Prints an XML representation of a TestInfo object. -// TODO(wan): There is also value in printing properties with the plain printer. -void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream, - const char* test_case_name, - const TestInfo& test_info) { - const TestResult& result = *test_info.result(); - const std::string kTestcase = "testcase"; - - if (test_info.is_in_another_shard()) { - return; - } - - *stream << " \n"; - } - const std::string location = - internal::FormatCompilerIndependentFileLocation(part.file_name(), - part.line_number()); - const std::string summary = location + "\n" + part.summary(); - *stream << " "; - const std::string detail = location + "\n" + part.message(); - OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str()); - *stream << "\n"; - } - } - - if (failures == 0 && result.test_property_count() == 0) { - *stream << " />\n"; - } else { - if (failures == 0) { - *stream << ">\n"; - } - OutputXmlTestProperties(stream, result); - *stream << " \n"; - } -} - -// Prints an XML representation of a TestCase object -void XmlUnitTestResultPrinter::PrintXmlTestCase(std::ostream* stream, - const TestCase& test_case) { - const std::string kTestsuite = "testsuite"; - *stream << " <" << kTestsuite; - OutputXmlAttribute(stream, kTestsuite, "name", test_case.name()); - OutputXmlAttribute(stream, kTestsuite, "tests", - StreamableToString(test_case.reportable_test_count())); - OutputXmlAttribute(stream, kTestsuite, "failures", - StreamableToString(test_case.failed_test_count())); - OutputXmlAttribute( - stream, kTestsuite, "disabled", - StreamableToString(test_case.reportable_disabled_test_count())); - OutputXmlAttribute(stream, kTestsuite, "errors", "0"); - OutputXmlAttribute(stream, kTestsuite, "time", - FormatTimeInMillisAsSeconds(test_case.elapsed_time())); - *stream << TestPropertiesAsXmlAttributes(test_case.ad_hoc_test_result()) - << ">\n"; - - for (int i = 0; i < test_case.total_test_count(); ++i) { - if (test_case.GetTestInfo(i)->is_reportable()) - OutputXmlTestInfo(stream, test_case.name(), *test_case.GetTestInfo(i)); - } - *stream << " \n"; -} - -// Prints an XML summary of unit_test to output stream out. -void XmlUnitTestResultPrinter::PrintXmlUnitTest(std::ostream* stream, - const UnitTest& unit_test) { - const std::string kTestsuites = "testsuites"; - - *stream << "\n"; - *stream << "<" << kTestsuites; - - OutputXmlAttribute(stream, kTestsuites, "tests", - StreamableToString(unit_test.reportable_test_count())); - OutputXmlAttribute(stream, kTestsuites, "failures", - StreamableToString(unit_test.failed_test_count())); - OutputXmlAttribute( - stream, kTestsuites, "disabled", - StreamableToString(unit_test.reportable_disabled_test_count())); - OutputXmlAttribute(stream, kTestsuites, "errors", "0"); - OutputXmlAttribute( - stream, kTestsuites, "timestamp", - FormatEpochTimeInMillisAsIso8601(unit_test.start_timestamp())); - OutputXmlAttribute(stream, kTestsuites, "time", - FormatTimeInMillisAsSeconds(unit_test.elapsed_time())); - - if (GTEST_FLAG(shuffle)) { - OutputXmlAttribute(stream, kTestsuites, "random_seed", - StreamableToString(unit_test.random_seed())); - } - *stream << TestPropertiesAsXmlAttributes(unit_test.ad_hoc_test_result()); - - OutputXmlAttribute(stream, kTestsuites, "name", "AllTests"); - *stream << ">\n"; - - for (int i = 0; i < unit_test.total_test_case_count(); ++i) { - if (unit_test.GetTestCase(i)->reportable_test_count() > 0) - PrintXmlTestCase(stream, *unit_test.GetTestCase(i)); - } - *stream << "\n"; -} - -// Produces a string representing the test properties in a result as space -// delimited XML attributes based on the property key="value" pairs. -std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes( - const TestResult& result) { - Message attributes; - for (int i = 0; i < result.test_property_count(); ++i) { - const TestProperty& property = result.GetTestProperty(i); - attributes << " " << property.key() << "=" - << "\"" << EscapeXmlAttribute(property.value()) << "\""; - } - return attributes.GetString(); -} - -void XmlUnitTestResultPrinter::OutputXmlTestProperties( - std::ostream* stream, const TestResult& result) { - const std::string kProperties = "properties"; - const std::string kProperty = "property"; - - if (result.test_property_count() <= 0) { - return; - } - - *stream << "<" << kProperties << ">\n"; - for (int i = 0; i < result.test_property_count(); ++i) { - const TestProperty& property = result.GetTestProperty(i); - *stream << "<" << kProperty; - *stream << " name=\"" << EscapeXmlAttribute(property.key()) << "\""; - *stream << " value=\"" << EscapeXmlAttribute(property.value()) << "\""; - *stream << "/>\n"; - } - *stream << "\n"; -} - -// End XmlUnitTestResultPrinter - - -// This class generates an JSON output file. -class JsonUnitTestResultPrinter : public EmptyTestEventListener { - public: - explicit JsonUnitTestResultPrinter(const char* output_file); - - virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration); - - private: - // Returns an JSON-escaped copy of the input string str. - static std::string EscapeJson(const std::string& str); - - //// Verifies that the given attribute belongs to the given element and - //// streams the attribute as JSON. - static void OutputJsonKey(std::ostream* stream, - const std::string& element_name, - const std::string& name, - const std::string& value, - const std::string& indent, - bool comma = true); - static void OutputJsonKey(std::ostream* stream, - const std::string& element_name, - const std::string& name, - int value, - const std::string& indent, - bool comma = true); - - // Streams a JSON representation of a TestInfo object. - static void OutputJsonTestInfo(::std::ostream* stream, - const char* test_case_name, - const TestInfo& test_info); - - // Prints a JSON representation of a TestCase object - static void PrintJsonTestCase(::std::ostream* stream, - const TestCase& test_case); - - // Prints a JSON summary of unit_test to output stream out. - static void PrintJsonUnitTest(::std::ostream* stream, - const UnitTest& unit_test); - - // Produces a string representing the test properties in a result as - // a JSON dictionary. - static std::string TestPropertiesAsJson(const TestResult& result, - const std::string& indent); - - // The output file. - const std::string output_file_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(JsonUnitTestResultPrinter); -}; - -// Creates a new JsonUnitTestResultPrinter. -JsonUnitTestResultPrinter::JsonUnitTestResultPrinter(const char* output_file) - : output_file_(output_file) { - if (output_file_.empty()) { - GTEST_LOG_(FATAL) << "JSON output file may not be null"; - } -} - -void JsonUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test, - int /*iteration*/) { - FILE* jsonout = NULL; - FilePath output_file(output_file_); - FilePath output_dir(output_file.RemoveFileName()); - - if (output_dir.CreateDirectoriesRecursively()) { - jsonout = posix::FOpen(output_file_.c_str(), "w"); - } - if (jsonout == NULL) { - // TODO(phosek): report the reason of the failure. - // - // We don't do it for now as: - // - // 1. There is no urgent need for it. - // 2. It's a bit involved to make the errno variable thread-safe on - // all three operating systems (Linux, Windows, and Mac OS). - // 3. To interpret the meaning of errno in a thread-safe way, - // we need the strerror_r() function, which is not available on - // Windows. - GTEST_LOG_(FATAL) << "Unable to open file \"" - << output_file_ << "\""; - } - std::stringstream stream; - PrintJsonUnitTest(&stream, unit_test); - fprintf(jsonout, "%s", StringStreamToString(&stream).c_str()); - fclose(jsonout); -} - -// Returns an JSON-escaped copy of the input string str. -std::string JsonUnitTestResultPrinter::EscapeJson(const std::string& str) { - Message m; - - for (size_t i = 0; i < str.size(); ++i) { - const char ch = str[i]; - switch (ch) { - case '\\': - case '"': - case '/': - m << '\\' << ch; - break; - case '\b': - m << "\\b"; - break; - case '\t': - m << "\\t"; - break; - case '\n': - m << "\\n"; - break; - case '\f': - m << "\\f"; - break; - case '\r': - m << "\\r"; - break; - default: - if (ch < ' ') { - m << "\\u00" << String::FormatByte(static_cast(ch)); - } else { - m << ch; - } - break; - } - } - - return m.GetString(); -} - -// The following routines generate an JSON representation of a UnitTest -// object. - -// Formats the given time in milliseconds as seconds. -static std::string FormatTimeInMillisAsDuration(TimeInMillis ms) { - ::std::stringstream ss; - ss << (static_cast(ms) * 1e-3) << "s"; - return ss.str(); -} - -// Converts the given epoch time in milliseconds to a date string in the -// RFC3339 format, without the timezone information. -static std::string FormatEpochTimeInMillisAsRFC3339(TimeInMillis ms) { - struct tm time_struct; - if (!PortableLocaltime(static_cast(ms / 1000), &time_struct)) - return ""; - // YYYY-MM-DDThh:mm:ss - return StreamableToString(time_struct.tm_year + 1900) + "-" + - String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" + - String::FormatIntWidth2(time_struct.tm_mday) + "T" + - String::FormatIntWidth2(time_struct.tm_hour) + ":" + - String::FormatIntWidth2(time_struct.tm_min) + ":" + - String::FormatIntWidth2(time_struct.tm_sec) + "Z"; -} - -static inline std::string Indent(int width) { - return std::string(width, ' '); -} - -void JsonUnitTestResultPrinter::OutputJsonKey( - std::ostream* stream, - const std::string& element_name, - const std::string& name, - const std::string& value, - const std::string& indent, - bool comma) { - const std::vector& allowed_names = - GetReservedAttributesForElement(element_name); - - GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) != - allowed_names.end()) - << "Key \"" << name << "\" is not allowed for value \"" << element_name - << "\"."; - - *stream << indent << "\"" << name << "\": \"" << EscapeJson(value) << "\""; - if (comma) - *stream << ",\n"; -} - -void JsonUnitTestResultPrinter::OutputJsonKey( - std::ostream* stream, - const std::string& element_name, - const std::string& name, - int value, - const std::string& indent, - bool comma) { - const std::vector& allowed_names = - GetReservedAttributesForElement(element_name); - - GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) != - allowed_names.end()) - << "Key \"" << name << "\" is not allowed for value \"" << element_name - << "\"."; - - *stream << indent << "\"" << name << "\": " << StreamableToString(value); - if (comma) - *stream << ",\n"; -} - -// Prints a JSON representation of a TestInfo object. -void JsonUnitTestResultPrinter::OutputJsonTestInfo(::std::ostream* stream, - const char* test_case_name, - const TestInfo& test_info) { - const TestResult& result = *test_info.result(); - const std::string kTestcase = "testcase"; - const std::string kIndent = Indent(10); - - *stream << Indent(8) << "{\n"; - OutputJsonKey(stream, kTestcase, "name", test_info.name(), kIndent); - - if (test_info.value_param() != NULL) { - OutputJsonKey(stream, kTestcase, "value_param", - test_info.value_param(), kIndent); - } - if (test_info.type_param() != NULL) { - OutputJsonKey(stream, kTestcase, "type_param", test_info.type_param(), - kIndent); - } - - OutputJsonKey(stream, kTestcase, "status", - test_info.should_run() ? "RUN" : "NOTRUN", kIndent); - OutputJsonKey(stream, kTestcase, "time", - FormatTimeInMillisAsDuration(result.elapsed_time()), kIndent); - OutputJsonKey(stream, kTestcase, "classname", test_case_name, kIndent, false); - *stream << TestPropertiesAsJson(result, kIndent); - - int failures = 0; - for (int i = 0; i < result.total_part_count(); ++i) { - const TestPartResult& part = result.GetTestPartResult(i); - if (part.failed()) { - *stream << ",\n"; - if (++failures == 1) { - *stream << kIndent << "\"" << "failures" << "\": [\n"; - } - const std::string location = - internal::FormatCompilerIndependentFileLocation(part.file_name(), - part.line_number()); - const std::string message = EscapeJson(location + "\n" + part.message()); - *stream << kIndent << " {\n" - << kIndent << " \"failure\": \"" << message << "\",\n" - << kIndent << " \"type\": \"\"\n" - << kIndent << " }"; - } - } - - if (failures > 0) - *stream << "\n" << kIndent << "]"; - *stream << "\n" << Indent(8) << "}"; -} - -// Prints an JSON representation of a TestCase object -void JsonUnitTestResultPrinter::PrintJsonTestCase(std::ostream* stream, - const TestCase& test_case) { - const std::string kTestsuite = "testsuite"; - const std::string kIndent = Indent(6); - - *stream << Indent(4) << "{\n"; - OutputJsonKey(stream, kTestsuite, "name", test_case.name(), kIndent); - OutputJsonKey(stream, kTestsuite, "tests", test_case.reportable_test_count(), - kIndent); - OutputJsonKey(stream, kTestsuite, "failures", test_case.failed_test_count(), - kIndent); - OutputJsonKey(stream, kTestsuite, "disabled", - test_case.reportable_disabled_test_count(), kIndent); - OutputJsonKey(stream, kTestsuite, "errors", 0, kIndent); - OutputJsonKey(stream, kTestsuite, "time", - FormatTimeInMillisAsDuration(test_case.elapsed_time()), kIndent, - false); - *stream << TestPropertiesAsJson(test_case.ad_hoc_test_result(), kIndent) - << ",\n"; - - *stream << kIndent << "\"" << kTestsuite << "\": [\n"; - - bool comma = false; - for (int i = 0; i < test_case.total_test_count(); ++i) { - if (test_case.GetTestInfo(i)->is_reportable()) { - if (comma) { - *stream << ",\n"; - } else { - comma = true; - } - OutputJsonTestInfo(stream, test_case.name(), *test_case.GetTestInfo(i)); - } - } - *stream << "\n" << kIndent << "]\n" << Indent(4) << "}"; -} - -// Prints a JSON summary of unit_test to output stream out. -void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream, - const UnitTest& unit_test) { - const std::string kTestsuites = "testsuites"; - const std::string kIndent = Indent(2); - *stream << "{\n"; - - OutputJsonKey(stream, kTestsuites, "tests", unit_test.reportable_test_count(), - kIndent); - OutputJsonKey(stream, kTestsuites, "failures", unit_test.failed_test_count(), - kIndent); - OutputJsonKey(stream, kTestsuites, "disabled", - unit_test.reportable_disabled_test_count(), kIndent); - OutputJsonKey(stream, kTestsuites, "errors", 0, kIndent); - if (GTEST_FLAG(shuffle)) { - OutputJsonKey(stream, kTestsuites, "random_seed", unit_test.random_seed(), - kIndent); - } - OutputJsonKey(stream, kTestsuites, "timestamp", - FormatEpochTimeInMillisAsRFC3339(unit_test.start_timestamp()), - kIndent); - OutputJsonKey(stream, kTestsuites, "time", - FormatTimeInMillisAsDuration(unit_test.elapsed_time()), kIndent, - false); - - *stream << TestPropertiesAsJson(unit_test.ad_hoc_test_result(), kIndent) - << ",\n"; - - OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent); - *stream << kIndent << "\"" << kTestsuites << "\": [\n"; - - bool comma = false; - for (int i = 0; i < unit_test.total_test_case_count(); ++i) { - if (unit_test.GetTestCase(i)->reportable_test_count() > 0) { - if (comma) { - *stream << ",\n"; - } else { - comma = true; - } - PrintJsonTestCase(stream, *unit_test.GetTestCase(i)); - } - } - - *stream << "\n" << kIndent << "]\n" << "}\n"; -} - -// Produces a string representing the test properties in a result as -// a JSON dictionary. -std::string JsonUnitTestResultPrinter::TestPropertiesAsJson( - const TestResult& result, const std::string& indent) { - Message attributes; - for (int i = 0; i < result.test_property_count(); ++i) { - const TestProperty& property = result.GetTestProperty(i); - attributes << ",\n" << indent << "\"" << property.key() << "\": " - << "\"" << EscapeJson(property.value()) << "\""; - } - return attributes.GetString(); -} - -// End JsonUnitTestResultPrinter - -#if GTEST_CAN_STREAM_RESULTS_ - -// Checks if str contains '=', '&', '%' or '\n' characters. If yes, -// replaces them by "%xx" where xx is their hexadecimal value. For -// example, replaces "=" with "%3D". This algorithm is O(strlen(str)) -// in both time and space -- important as the input str may contain an -// arbitrarily long test failure message and stack trace. -std::string StreamingListener::UrlEncode(const char* str) { - std::string result; - result.reserve(strlen(str) + 1); - for (char ch = *str; ch != '\0'; ch = *++str) { - switch (ch) { - case '%': - case '=': - case '&': - case '\n': - result.append("%" + String::FormatByte(static_cast(ch))); - break; - default: - result.push_back(ch); - break; - } - } - return result; -} - -void StreamingListener::SocketWriter::MakeConnection() { - GTEST_CHECK_(sockfd_ == -1) - << "MakeConnection() can't be called when there is already a connection."; - - addrinfo hints; - memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; // To allow both IPv4 and IPv6 addresses. - hints.ai_socktype = SOCK_STREAM; - addrinfo* servinfo = NULL; - - // Use the getaddrinfo() to get a linked list of IP addresses for - // the given host name. - const int error_num = getaddrinfo( - host_name_.c_str(), port_num_.c_str(), &hints, &servinfo); - if (error_num != 0) { - GTEST_LOG_(WARNING) << "stream_result_to: getaddrinfo() failed: " - << gai_strerror(error_num); - } - - // Loop through all the results and connect to the first we can. - for (addrinfo* cur_addr = servinfo; sockfd_ == -1 && cur_addr != NULL; - cur_addr = cur_addr->ai_next) { - sockfd_ = socket( - cur_addr->ai_family, cur_addr->ai_socktype, cur_addr->ai_protocol); - if (sockfd_ != -1) { - // Connect the client socket to the server socket. - if (connect(sockfd_, cur_addr->ai_addr, cur_addr->ai_addrlen) == -1) { - close(sockfd_); - sockfd_ = -1; - } - } - } - - freeaddrinfo(servinfo); // all done with this structure - - if (sockfd_ == -1) { - GTEST_LOG_(WARNING) << "stream_result_to: failed to connect to " - << host_name_ << ":" << port_num_; - } -} - -// End of class Streaming Listener -#endif // GTEST_CAN_STREAM_RESULTS__ - -// class OsStackTraceGetter - -const char* const OsStackTraceGetterInterface::kElidedFramesMarker = - "... " GTEST_NAME_ " internal frames ..."; - -std::string OsStackTraceGetter::CurrentStackTrace(int /*max_depth*/, - int /*skip_count*/) { - return ""; -} - -void OsStackTraceGetter::UponLeavingGTest() {} - -// A helper class that creates the premature-exit file in its -// constructor and deletes the file in its destructor. -class ScopedPrematureExitFile { - public: - explicit ScopedPrematureExitFile(const char* premature_exit_filepath) - : premature_exit_filepath_(premature_exit_filepath ? - premature_exit_filepath : "") { - // If a path to the premature-exit file is specified... - if (!premature_exit_filepath_.empty()) { - // create the file with a single "0" character in it. I/O - // errors are ignored as there's nothing better we can do and we - // don't want to fail the test because of this. - FILE* pfile = posix::FOpen(premature_exit_filepath, "w"); - fwrite("0", 1, 1, pfile); - fclose(pfile); - } - } - - ~ScopedPrematureExitFile() { - if (!premature_exit_filepath_.empty()) { - int retval = remove(premature_exit_filepath_.c_str()); - if (retval) { - GTEST_LOG_(ERROR) << "Failed to remove premature exit filepath \"" - << premature_exit_filepath_ << "\" with error " - << retval; - } - } - } - - private: - const std::string premature_exit_filepath_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedPrematureExitFile); -}; - -} // namespace internal - -// class TestEventListeners - -TestEventListeners::TestEventListeners() - : repeater_(new internal::TestEventRepeater()), - default_result_printer_(NULL), - default_xml_generator_(NULL) { -} - -TestEventListeners::~TestEventListeners() { delete repeater_; } - -// Returns the standard listener responsible for the default console -// output. Can be removed from the listeners list to shut down default -// console output. Note that removing this object from the listener list -// with Release transfers its ownership to the user. -void TestEventListeners::Append(TestEventListener* listener) { - repeater_->Append(listener); -} - -// Removes the given event listener from the list and returns it. It then -// becomes the caller's responsibility to delete the listener. Returns -// NULL if the listener is not found in the list. -TestEventListener* TestEventListeners::Release(TestEventListener* listener) { - if (listener == default_result_printer_) - default_result_printer_ = NULL; - else if (listener == default_xml_generator_) - default_xml_generator_ = NULL; - return repeater_->Release(listener); -} - -// Returns repeater that broadcasts the TestEventListener events to all -// subscribers. -TestEventListener* TestEventListeners::repeater() { return repeater_; } - -// Sets the default_result_printer attribute to the provided listener. -// The listener is also added to the listener list and previous -// default_result_printer is removed from it and deleted. The listener can -// also be NULL in which case it will not be added to the list. Does -// nothing if the previous and the current listener objects are the same. -void TestEventListeners::SetDefaultResultPrinter(TestEventListener* listener) { - if (default_result_printer_ != listener) { - // It is an error to pass this method a listener that is already in the - // list. - delete Release(default_result_printer_); - default_result_printer_ = listener; - if (listener != NULL) - Append(listener); - } -} - -// Sets the default_xml_generator attribute to the provided listener. The -// listener is also added to the listener list and previous -// default_xml_generator is removed from it and deleted. The listener can -// also be NULL in which case it will not be added to the list. Does -// nothing if the previous and the current listener objects are the same. -void TestEventListeners::SetDefaultXmlGenerator(TestEventListener* listener) { - if (default_xml_generator_ != listener) { - // It is an error to pass this method a listener that is already in the - // list. - delete Release(default_xml_generator_); - default_xml_generator_ = listener; - if (listener != NULL) - Append(listener); - } -} - -// Controls whether events will be forwarded by the repeater to the -// listeners in the list. -bool TestEventListeners::EventForwardingEnabled() const { - return repeater_->forwarding_enabled(); -} - -void TestEventListeners::SuppressEventForwarding() { - repeater_->set_forwarding_enabled(false); -} - -// class UnitTest - -// Gets the singleton UnitTest object. The first time this method is -// called, a UnitTest object is constructed and returned. Consecutive -// calls will return the same object. -// -// We don't protect this under mutex_ as a user is not supposed to -// call this before main() starts, from which point on the return -// value will never change. -UnitTest* UnitTest::GetInstance() { - // When compiled with MSVC 7.1 in optimized mode, destroying the - // UnitTest object upon exiting the program messes up the exit code, - // causing successful tests to appear failed. We have to use a - // different implementation in this case to bypass the compiler bug. - // This implementation makes the compiler happy, at the cost of - // leaking the UnitTest object. - - // CodeGear C++Builder insists on a public destructor for the - // default implementation. Use this implementation to keep good OO - // design with private destructor. - -#if (_MSC_VER == 1310 && !defined(_DEBUG)) || defined(__BORLANDC__) - static UnitTest* const instance = new UnitTest; - return instance; -#else - static UnitTest instance; - return &instance; -#endif // (_MSC_VER == 1310 && !defined(_DEBUG)) || defined(__BORLANDC__) -} - -// Gets the number of successful test cases. -int UnitTest::successful_test_case_count() const { - return impl()->successful_test_case_count(); -} - -// Gets the number of failed test cases. -int UnitTest::failed_test_case_count() const { - return impl()->failed_test_case_count(); -} - -// Gets the number of all test cases. -int UnitTest::total_test_case_count() const { - return impl()->total_test_case_count(); -} - -// Gets the number of all test cases that contain at least one test -// that should run. -int UnitTest::test_case_to_run_count() const { - return impl()->test_case_to_run_count(); -} - -// Gets the number of successful tests. -int UnitTest::successful_test_count() const { - return impl()->successful_test_count(); -} - -// Gets the number of failed tests. -int UnitTest::failed_test_count() const { return impl()->failed_test_count(); } - -// Gets the number of disabled tests that will be reported in the XML report. -int UnitTest::reportable_disabled_test_count() const { - return impl()->reportable_disabled_test_count(); -} - -// Gets the number of disabled tests. -int UnitTest::disabled_test_count() const { - return impl()->disabled_test_count(); -} - -// Gets the number of tests to be printed in the XML report. -int UnitTest::reportable_test_count() const { - return impl()->reportable_test_count(); -} - -// Gets the number of all tests. -int UnitTest::total_test_count() const { return impl()->total_test_count(); } - -// Gets the number of tests that should run. -int UnitTest::test_to_run_count() const { return impl()->test_to_run_count(); } - -// Gets the time of the test program start, in ms from the start of the -// UNIX epoch. -internal::TimeInMillis UnitTest::start_timestamp() const { - return impl()->start_timestamp(); -} - -// Gets the elapsed time, in milliseconds. -internal::TimeInMillis UnitTest::elapsed_time() const { - return impl()->elapsed_time(); -} - -// Returns true iff the unit test passed (i.e. all test cases passed). -bool UnitTest::Passed() const { return impl()->Passed(); } - -// Returns true iff the unit test failed (i.e. some test case failed -// or something outside of all tests failed). -bool UnitTest::Failed() const { return impl()->Failed(); } - -// Gets the i-th test case among all the test cases. i can range from 0 to -// total_test_case_count() - 1. If i is not in that range, returns NULL. -const TestCase* UnitTest::GetTestCase(int i) const { - return impl()->GetTestCase(i); -} - -// Returns the TestResult containing information on test failures and -// properties logged outside of individual test cases. -const TestResult& UnitTest::ad_hoc_test_result() const { - return *impl()->ad_hoc_test_result(); -} - -// Gets the i-th test case among all the test cases. i can range from 0 to -// total_test_case_count() - 1. If i is not in that range, returns NULL. -TestCase* UnitTest::GetMutableTestCase(int i) { - return impl()->GetMutableTestCase(i); -} - -// Returns the list of event listeners that can be used to track events -// inside Google Test. -TestEventListeners& UnitTest::listeners() { - return *impl()->listeners(); -} - -// Registers and returns a global test environment. When a test -// program is run, all global test environments will be set-up in the -// order they were registered. After all tests in the program have -// finished, all global test environments will be torn-down in the -// *reverse* order they were registered. -// -// The UnitTest object takes ownership of the given environment. -// -// We don't protect this under mutex_, as we only support calling it -// from the main thread. -Environment* UnitTest::AddEnvironment(Environment* env) { - if (env == NULL) { - return NULL; - } - - impl_->environments().push_back(env); - return env; -} - -// Adds a TestPartResult to the current TestResult object. All Google Test -// assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call -// this to report their results. The user code should use the -// assertion macros instead of calling this directly. -void UnitTest::AddTestPartResult( - TestPartResult::Type result_type, - const char* file_name, - int line_number, - const std::string& message, - const std::string& os_stack_trace) GTEST_LOCK_EXCLUDED_(mutex_) { - Message msg; - msg << message; - - internal::MutexLock lock(&mutex_); - if (impl_->gtest_trace_stack().size() > 0) { - msg << "\n" << GTEST_NAME_ << " trace:"; - - for (int i = static_cast(impl_->gtest_trace_stack().size()); - i > 0; --i) { - const internal::TraceInfo& trace = impl_->gtest_trace_stack()[i - 1]; - msg << "\n" << internal::FormatFileLocation(trace.file, trace.line) - << " " << trace.message; - } - } - - if (os_stack_trace.c_str() != NULL && !os_stack_trace.empty()) { - msg << internal::kStackTraceMarker << os_stack_trace; - } - - const TestPartResult result = - TestPartResult(result_type, file_name, line_number, - msg.GetString().c_str()); - impl_->GetTestPartResultReporterForCurrentThread()-> - ReportTestPartResult(result); - - if (result_type != TestPartResult::kSuccess) { - // gtest_break_on_failure takes precedence over - // gtest_throw_on_failure. This allows a user to set the latter - // in the code (perhaps in order to use Google Test assertions - // with another testing framework) and specify the former on the - // command line for debugging. - if (GTEST_FLAG(break_on_failure)) { -#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT - // Using DebugBreak on Windows allows gtest to still break into a debugger - // when a failure happens and both the --gtest_break_on_failure and - // the --gtest_catch_exceptions flags are specified. - DebugBreak(); -#elif (!defined(__native_client__)) && \ - ((defined(__clang__) || defined(__GNUC__)) && \ - (defined(__x86_64__) || defined(__i386__))) - // with clang/gcc we can achieve the same effect on x86 by invoking int3 - asm("int3"); -#else - // Dereference NULL through a volatile pointer to prevent the compiler - // from removing. We use this rather than abort() or __builtin_trap() for - // portability: Symbian doesn't implement abort() well, and some debuggers - // don't correctly trap abort(). - *static_cast(NULL) = 1; -#endif // GTEST_OS_WINDOWS - } else if (GTEST_FLAG(throw_on_failure)) { -#if GTEST_HAS_EXCEPTIONS - throw internal::GoogleTestFailureException(result); -#else - // We cannot call abort() as it generates a pop-up in debug mode - // that cannot be suppressed in VC 7.1 or below. - exit(1); -#endif - } - } -} - -// Adds a TestProperty to the current TestResult object when invoked from -// inside a test, to current TestCase's ad_hoc_test_result_ when invoked -// from SetUpTestCase or TearDownTestCase, or to the global property set -// when invoked elsewhere. If the result already contains a property with -// the same key, the value will be updated. -void UnitTest::RecordProperty(const std::string& key, - const std::string& value) { - impl_->RecordProperty(TestProperty(key, value)); -} - -// Runs all tests in this UnitTest object and prints the result. -// Returns 0 if successful, or 1 otherwise. -// -// We don't protect this under mutex_, as we only support calling it -// from the main thread. -int UnitTest::Run() { - const bool in_death_test_child_process = - internal::GTEST_FLAG(internal_run_death_test).length() > 0; - - // Google Test implements this protocol for catching that a test - // program exits before returning control to Google Test: - // - // 1. Upon start, Google Test creates a file whose absolute path - // is specified by the environment variable - // TEST_PREMATURE_EXIT_FILE. - // 2. When Google Test has finished its work, it deletes the file. - // - // This allows a test runner to set TEST_PREMATURE_EXIT_FILE before - // running a Google-Test-based test program and check the existence - // of the file at the end of the test execution to see if it has - // exited prematurely. - - // If we are in the child process of a death test, don't - // create/delete the premature exit file, as doing so is unnecessary - // and will confuse the parent process. Otherwise, create/delete - // the file upon entering/leaving this function. If the program - // somehow exits before this function has a chance to return, the - // premature-exit file will be left undeleted, causing a test runner - // that understands the premature-exit-file protocol to report the - // test as having failed. - const internal::ScopedPrematureExitFile premature_exit_file( - in_death_test_child_process ? - NULL : internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE")); - - // Captures the value of GTEST_FLAG(catch_exceptions). This value will be - // used for the duration of the program. - impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions)); - -#if GTEST_HAS_SEH - // Either the user wants Google Test to catch exceptions thrown by the - // tests or this is executing in the context of death test child - // process. In either case the user does not want to see pop-up dialogs - // about crashes - they are expected. - if (impl()->catch_exceptions() || in_death_test_child_process) { -# if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT - // SetErrorMode doesn't exist on CE. - SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT | - SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX); -# endif // !GTEST_OS_WINDOWS_MOBILE - -# if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE - // Death test children can be terminated with _abort(). On Windows, - // _abort() can show a dialog with a warning message. This forces the - // abort message to go to stderr instead. - _set_error_mode(_OUT_TO_STDERR); -# endif - -# if _MSC_VER >= 1400 && !GTEST_OS_WINDOWS_MOBILE - // In the debug version, Visual Studio pops up a separate dialog - // offering a choice to debug the aborted program. We need to suppress - // this dialog or it will pop up for every EXPECT/ASSERT_DEATH statement - // executed. Google Test will notify the user of any unexpected - // failure via stderr. - // - // VC++ doesn't define _set_abort_behavior() prior to the version 8.0. - // Users of prior VC versions shall suffer the agony and pain of - // clicking through the countless debug dialogs. - // TODO(vladl@google.com): find a way to suppress the abort dialog() in the - // debug mode when compiled with VC 7.1 or lower. - if (!GTEST_FLAG(break_on_failure)) - _set_abort_behavior( - 0x0, // Clear the following flags: - _WRITE_ABORT_MSG | _CALL_REPORTFAULT); // pop-up window, core dump. -# endif - } -#endif // GTEST_HAS_SEH - - return internal::HandleExceptionsInMethodIfSupported( - impl(), - &internal::UnitTestImpl::RunAllTests, - "auxiliary test code (environments or event listeners)") ? 0 : 1; -} - -// Returns the working directory when the first TEST() or TEST_F() was -// executed. -const char* UnitTest::original_working_dir() const { - return impl_->original_working_dir_.c_str(); -} - -// Returns the TestCase object for the test that's currently running, -// or NULL if no test is running. -const TestCase* UnitTest::current_test_case() const - GTEST_LOCK_EXCLUDED_(mutex_) { - internal::MutexLock lock(&mutex_); - return impl_->current_test_case(); -} - -// Returns the TestInfo object for the test that's currently running, -// or NULL if no test is running. -const TestInfo* UnitTest::current_test_info() const - GTEST_LOCK_EXCLUDED_(mutex_) { - internal::MutexLock lock(&mutex_); - return impl_->current_test_info(); -} - -// Returns the random seed used at the start of the current test run. -int UnitTest::random_seed() const { return impl_->random_seed(); } - -// Returns ParameterizedTestCaseRegistry object used to keep track of -// value-parameterized tests and instantiate and register them. -internal::ParameterizedTestCaseRegistry& - UnitTest::parameterized_test_registry() - GTEST_LOCK_EXCLUDED_(mutex_) { - return impl_->parameterized_test_registry(); -} - -// Creates an empty UnitTest. -UnitTest::UnitTest() { - impl_ = new internal::UnitTestImpl(this); -} - -// Destructor of UnitTest. -UnitTest::~UnitTest() { - delete impl_; -} - -// Pushes a trace defined by SCOPED_TRACE() on to the per-thread -// Google Test trace stack. -void UnitTest::PushGTestTrace(const internal::TraceInfo& trace) - GTEST_LOCK_EXCLUDED_(mutex_) { - internal::MutexLock lock(&mutex_); - impl_->gtest_trace_stack().push_back(trace); -} - -// Pops a trace from the per-thread Google Test trace stack. -void UnitTest::PopGTestTrace() - GTEST_LOCK_EXCLUDED_(mutex_) { - internal::MutexLock lock(&mutex_); - impl_->gtest_trace_stack().pop_back(); -} - -namespace internal { - -UnitTestImpl::UnitTestImpl(UnitTest* parent) - : parent_(parent), - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355 /* using this in initializer */) - default_global_test_part_result_reporter_(this), - default_per_thread_test_part_result_reporter_(this), - GTEST_DISABLE_MSC_WARNINGS_POP_() - global_test_part_result_repoter_( - &default_global_test_part_result_reporter_), - per_thread_test_part_result_reporter_( - &default_per_thread_test_part_result_reporter_), - parameterized_test_registry_(), - parameterized_tests_registered_(false), - last_death_test_case_(-1), - current_test_case_(NULL), - current_test_info_(NULL), - ad_hoc_test_result_(), - os_stack_trace_getter_(NULL), - post_flag_parse_init_performed_(false), - random_seed_(0), // Will be overridden by the flag before first use. - random_(0), // Will be reseeded before first use. - start_timestamp_(0), - elapsed_time_(0), -#if GTEST_HAS_DEATH_TEST - death_test_factory_(new DefaultDeathTestFactory), -#endif - // Will be overridden by the flag before first use. - catch_exceptions_(false) { - listeners()->SetDefaultResultPrinter(new PrettyUnitTestResultPrinter); -} - -UnitTestImpl::~UnitTestImpl() { - // Deletes every TestCase. - ForEach(test_cases_, internal::Delete); - - // Deletes every Environment. - ForEach(environments_, internal::Delete); - - delete os_stack_trace_getter_; -} - -// Adds a TestProperty to the current TestResult object when invoked in a -// context of a test, to current test case's ad_hoc_test_result when invoke -// from SetUpTestCase/TearDownTestCase, or to the global property set -// otherwise. If the result already contains a property with the same key, -// the value will be updated. -void UnitTestImpl::RecordProperty(const TestProperty& test_property) { - std::string xml_element; - TestResult* test_result; // TestResult appropriate for property recording. - - if (current_test_info_ != NULL) { - xml_element = "testcase"; - test_result = &(current_test_info_->result_); - } else if (current_test_case_ != NULL) { - xml_element = "testsuite"; - test_result = &(current_test_case_->ad_hoc_test_result_); - } else { - xml_element = "testsuites"; - test_result = &ad_hoc_test_result_; - } - test_result->RecordProperty(xml_element, test_property); -} - -#if GTEST_HAS_DEATH_TEST -// Disables event forwarding if the control is currently in a death test -// subprocess. Must not be called before InitGoogleTest. -void UnitTestImpl::SuppressTestEventsIfInSubprocess() { - if (internal_run_death_test_flag_.get() != NULL) - listeners()->SuppressEventForwarding(); -} -#endif // GTEST_HAS_DEATH_TEST - -// Initializes event listeners performing XML output as specified by -// UnitTestOptions. Must not be called before InitGoogleTest. -void UnitTestImpl::ConfigureXmlOutput() { - const std::string& output_format = UnitTestOptions::GetOutputFormat(); - if (output_format == "xml") { - listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter( - UnitTestOptions::GetAbsolutePathToOutputFile().c_str())); - } else if (output_format == "json") { - listeners()->SetDefaultXmlGenerator(new JsonUnitTestResultPrinter( - UnitTestOptions::GetAbsolutePathToOutputFile().c_str())); - } else if (output_format != "") { - GTEST_LOG_(WARNING) << "WARNING: unrecognized output format \"" - << output_format << "\" ignored."; - } -} - -#if GTEST_CAN_STREAM_RESULTS_ -// Initializes event listeners for streaming test results in string form. -// Must not be called before InitGoogleTest. -void UnitTestImpl::ConfigureStreamingOutput() { - const std::string& target = GTEST_FLAG(stream_result_to); - if (!target.empty()) { - const size_t pos = target.find(':'); - if (pos != std::string::npos) { - listeners()->Append(new StreamingListener(target.substr(0, pos), - target.substr(pos+1))); - } else { - GTEST_LOG_(WARNING) << "unrecognized streaming target \"" << target - << "\" ignored."; - } - } -} -#endif // GTEST_CAN_STREAM_RESULTS_ - -// Performs initialization dependent upon flag values obtained in -// ParseGoogleTestFlagsOnly. Is called from InitGoogleTest after the call to -// ParseGoogleTestFlagsOnly. In case a user neglects to call InitGoogleTest -// this function is also called from RunAllTests. Since this function can be -// called more than once, it has to be idempotent. -void UnitTestImpl::PostFlagParsingInit() { - // Ensures that this function does not execute more than once. - if (!post_flag_parse_init_performed_) { - post_flag_parse_init_performed_ = true; - -#if defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_) - // Register to send notifications about key process state changes. - listeners()->Append(new GTEST_CUSTOM_TEST_EVENT_LISTENER_()); -#endif // defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_) - -#if GTEST_HAS_DEATH_TEST - InitDeathTestSubprocessControlInfo(); - SuppressTestEventsIfInSubprocess(); -#endif // GTEST_HAS_DEATH_TEST - - // Registers parameterized tests. This makes parameterized tests - // available to the UnitTest reflection API without running - // RUN_ALL_TESTS. - RegisterParameterizedTests(); - - // Configures listeners for XML output. This makes it possible for users - // to shut down the default XML output before invoking RUN_ALL_TESTS. - ConfigureXmlOutput(); - -#if GTEST_CAN_STREAM_RESULTS_ - // Configures listeners for streaming test results to the specified server. - ConfigureStreamingOutput(); -#endif // GTEST_CAN_STREAM_RESULTS_ - } -} - -// A predicate that checks the name of a TestCase against a known -// value. -// -// This is used for implementation of the UnitTest class only. We put -// it in the anonymous namespace to prevent polluting the outer -// namespace. -// -// TestCaseNameIs is copyable. -class TestCaseNameIs { - public: - // Constructor. - explicit TestCaseNameIs(const std::string& name) - : name_(name) {} - - // Returns true iff the name of test_case matches name_. - bool operator()(const TestCase* test_case) const { - return test_case != NULL && strcmp(test_case->name(), name_.c_str()) == 0; - } - - private: - std::string name_; -}; - -// Finds and returns a TestCase with the given name. If one doesn't -// exist, creates one and returns it. It's the CALLER'S -// RESPONSIBILITY to ensure that this function is only called WHEN THE -// TESTS ARE NOT SHUFFLED. -// -// Arguments: -// -// test_case_name: name of the test case -// type_param: the name of the test case's type parameter, or NULL if -// this is not a typed or a type-parameterized test case. -// set_up_tc: pointer to the function that sets up the test case -// tear_down_tc: pointer to the function that tears down the test case -TestCase* UnitTestImpl::GetTestCase(const char* test_case_name, - const char* type_param, - Test::SetUpTestCaseFunc set_up_tc, - Test::TearDownTestCaseFunc tear_down_tc) { - // Can we find a TestCase with the given name? - const std::vector::const_iterator test_case = - std::find_if(test_cases_.begin(), test_cases_.end(), - TestCaseNameIs(test_case_name)); - - if (test_case != test_cases_.end()) - return *test_case; - - // No. Let's create one. - TestCase* const new_test_case = - new TestCase(test_case_name, type_param, set_up_tc, tear_down_tc); - - // Is this a death test case? - if (internal::UnitTestOptions::MatchesFilter(test_case_name, - kDeathTestCaseFilter)) { - // Yes. Inserts the test case after the last death test case - // defined so far. This only works when the test cases haven't - // been shuffled. Otherwise we may end up running a death test - // after a non-death test. - ++last_death_test_case_; - test_cases_.insert(test_cases_.begin() + last_death_test_case_, - new_test_case); - } else { - // No. Appends to the end of the list. - test_cases_.push_back(new_test_case); - } - - test_case_indices_.push_back(static_cast(test_case_indices_.size())); - return new_test_case; -} - -// Helpers for setting up / tearing down the given environment. They -// are for use in the ForEach() function. -static void SetUpEnvironment(Environment* env) { env->SetUp(); } -static void TearDownEnvironment(Environment* env) { env->TearDown(); } - -// Runs all tests in this UnitTest object, prints the result, and -// returns true if all tests are successful. If any exception is -// thrown during a test, the test is considered to be failed, but the -// rest of the tests will still be run. -// -// When parameterized tests are enabled, it expands and registers -// parameterized tests first in RegisterParameterizedTests(). -// All other functions called from RunAllTests() may safely assume that -// parameterized tests are ready to be counted and run. -bool UnitTestImpl::RunAllTests() { - // True iff Google Test is initialized before RUN_ALL_TESTS() is called. - const bool gtest_is_initialized_before_run_all_tests = GTestIsInitialized(); - - // Do not run any test if the --help flag was specified. - if (g_help_flag) - return true; - - // Repeats the call to the post-flag parsing initialization in case the - // user didn't call InitGoogleTest. - PostFlagParsingInit(); - - // Even if sharding is not on, test runners may want to use the - // GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding - // protocol. - internal::WriteToShardStatusFileIfNeeded(); - - // True iff we are in a subprocess for running a thread-safe-style - // death test. - bool in_subprocess_for_death_test = false; - -#if GTEST_HAS_DEATH_TEST - in_subprocess_for_death_test = (internal_run_death_test_flag_.get() != NULL); -# if defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_) - if (in_subprocess_for_death_test) { - GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_(); - } -# endif // defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_) -#endif // GTEST_HAS_DEATH_TEST - - const bool should_shard = ShouldShard(kTestTotalShards, kTestShardIndex, - in_subprocess_for_death_test); - - // Compares the full test names with the filter to decide which - // tests to run. - const bool has_tests_to_run = FilterTests(should_shard - ? HONOR_SHARDING_PROTOCOL - : IGNORE_SHARDING_PROTOCOL) > 0; - - // Lists the tests and exits if the --gtest_list_tests flag was specified. - if (GTEST_FLAG(list_tests)) { - // This must be called *after* FilterTests() has been called. - ListTestsMatchingFilter(); - return true; - } - - random_seed_ = GTEST_FLAG(shuffle) ? - GetRandomSeedFromFlag(GTEST_FLAG(random_seed)) : 0; - - // True iff at least one test has failed. - bool failed = false; - - TestEventListener* repeater = listeners()->repeater(); - - start_timestamp_ = GetTimeInMillis(); - repeater->OnTestProgramStart(*parent_); - - // How many times to repeat the tests? We don't want to repeat them - // when we are inside the subprocess of a death test. - const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat); - // Repeats forever if the repeat count is negative. - const bool forever = repeat < 0; - for (int i = 0; forever || i != repeat; i++) { - // We want to preserve failures generated by ad-hoc test - // assertions executed before RUN_ALL_TESTS(). - ClearNonAdHocTestResult(); - - const TimeInMillis start = GetTimeInMillis(); - - // Shuffles test cases and tests if requested. - if (has_tests_to_run && GTEST_FLAG(shuffle)) { - random()->Reseed(random_seed_); - // This should be done before calling OnTestIterationStart(), - // such that a test event listener can see the actual test order - // in the event. - ShuffleTests(); - } - - // Tells the unit test event listeners that the tests are about to start. - repeater->OnTestIterationStart(*parent_, i); - - // Runs each test case if there is at least one test to run. - if (has_tests_to_run) { - // Sets up all environments beforehand. - repeater->OnEnvironmentsSetUpStart(*parent_); - ForEach(environments_, SetUpEnvironment); - repeater->OnEnvironmentsSetUpEnd(*parent_); - - // Runs the tests only if there was no fatal failure during global - // set-up. - if (!Test::HasFatalFailure()) { - for (int test_index = 0; test_index < total_test_case_count(); - test_index++) { - GetMutableTestCase(test_index)->Run(); - } - } - - // Tears down all environments in reverse order afterwards. - repeater->OnEnvironmentsTearDownStart(*parent_); - std::for_each(environments_.rbegin(), environments_.rend(), - TearDownEnvironment); - repeater->OnEnvironmentsTearDownEnd(*parent_); - } - - elapsed_time_ = GetTimeInMillis() - start; - - // Tells the unit test event listener that the tests have just finished. - repeater->OnTestIterationEnd(*parent_, i); - - // Gets the result and clears it. - if (!Passed()) { - failed = true; - } - - // Restores the original test order after the iteration. This - // allows the user to quickly repro a failure that happens in the - // N-th iteration without repeating the first (N - 1) iterations. - // This is not enclosed in "if (GTEST_FLAG(shuffle)) { ... }", in - // case the user somehow changes the value of the flag somewhere - // (it's always safe to unshuffle the tests). - UnshuffleTests(); - - if (GTEST_FLAG(shuffle)) { - // Picks a new random seed for each iteration. - random_seed_ = GetNextRandomSeed(random_seed_); - } - } - - repeater->OnTestProgramEnd(*parent_); - - if (!gtest_is_initialized_before_run_all_tests) { - ColoredPrintf( - COLOR_RED, - "\nIMPORTANT NOTICE - DO NOT IGNORE:\n" - "This test program did NOT call " GTEST_INIT_GOOGLE_TEST_NAME_ - "() before calling RUN_ALL_TESTS(). This is INVALID. Soon " GTEST_NAME_ - " will start to enforce the valid usage. " - "Please fix it ASAP, or IT WILL START TO FAIL.\n"); // NOLINT -#if GTEST_FOR_GOOGLE_ - ColoredPrintf(COLOR_RED, - "For more details, see http://wiki/Main/ValidGUnitMain.\n"); -#endif // GTEST_FOR_GOOGLE_ - } - - return !failed; -} - -// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file -// if the variable is present. If a file already exists at this location, this -// function will write over it. If the variable is present, but the file cannot -// be created, prints an error and exits. -void WriteToShardStatusFileIfNeeded() { - const char* const test_shard_file = posix::GetEnv(kTestShardStatusFile); - if (test_shard_file != NULL) { - FILE* const file = posix::FOpen(test_shard_file, "w"); - if (file == NULL) { - ColoredPrintf(COLOR_RED, - "Could not write to the test shard status file \"%s\" " - "specified by the %s environment variable.\n", - test_shard_file, kTestShardStatusFile); - fflush(stdout); - exit(EXIT_FAILURE); - } - fclose(file); - } -} - -// Checks whether sharding is enabled by examining the relevant -// environment variable values. If the variables are present, -// but inconsistent (i.e., shard_index >= total_shards), prints -// an error and exits. If in_subprocess_for_death_test, sharding is -// disabled because it must only be applied to the original test -// process. Otherwise, we could filter out death tests we intended to execute. -bool ShouldShard(const char* total_shards_env, - const char* shard_index_env, - bool in_subprocess_for_death_test) { - if (in_subprocess_for_death_test) { - return false; - } - - const Int32 total_shards = Int32FromEnvOrDie(total_shards_env, -1); - const Int32 shard_index = Int32FromEnvOrDie(shard_index_env, -1); - - if (total_shards == -1 && shard_index == -1) { - return false; - } else if (total_shards == -1 && shard_index != -1) { - const Message msg = Message() - << "Invalid environment variables: you have " - << kTestShardIndex << " = " << shard_index - << ", but have left " << kTestTotalShards << " unset.\n"; - ColoredPrintf(COLOR_RED, msg.GetString().c_str()); - fflush(stdout); - exit(EXIT_FAILURE); - } else if (total_shards != -1 && shard_index == -1) { - const Message msg = Message() - << "Invalid environment variables: you have " - << kTestTotalShards << " = " << total_shards - << ", but have left " << kTestShardIndex << " unset.\n"; - ColoredPrintf(COLOR_RED, msg.GetString().c_str()); - fflush(stdout); - exit(EXIT_FAILURE); - } else if (shard_index < 0 || shard_index >= total_shards) { - const Message msg = Message() - << "Invalid environment variables: we require 0 <= " - << kTestShardIndex << " < " << kTestTotalShards - << ", but you have " << kTestShardIndex << "=" << shard_index - << ", " << kTestTotalShards << "=" << total_shards << ".\n"; - ColoredPrintf(COLOR_RED, msg.GetString().c_str()); - fflush(stdout); - exit(EXIT_FAILURE); - } - - return total_shards > 1; -} - -// Parses the environment variable var as an Int32. If it is unset, -// returns default_val. If it is not an Int32, prints an error -// and aborts. -Int32 Int32FromEnvOrDie(const char* var, Int32 default_val) { - const char* str_val = posix::GetEnv(var); - if (str_val == NULL) { - return default_val; - } - - Int32 result; - if (!ParseInt32(Message() << "The value of environment variable " << var, - str_val, &result)) { - exit(EXIT_FAILURE); - } - return result; -} - -// Given the total number of shards, the shard index, and the test id, -// returns true iff the test should be run on this shard. The test id is -// some arbitrary but unique non-negative integer assigned to each test -// method. Assumes that 0 <= shard_index < total_shards. -bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) { - return (test_id % total_shards) == shard_index; -} - -// Compares the name of each test with the user-specified filter to -// decide whether the test should be run, then records the result in -// each TestCase and TestInfo object. -// If shard_tests == true, further filters tests based on sharding -// variables in the environment - see -// https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuide.md -// . Returns the number of tests that should run. -int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) { - const Int32 total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ? - Int32FromEnvOrDie(kTestTotalShards, -1) : -1; - const Int32 shard_index = shard_tests == HONOR_SHARDING_PROTOCOL ? - Int32FromEnvOrDie(kTestShardIndex, -1) : -1; - - // num_runnable_tests are the number of tests that will - // run across all shards (i.e., match filter and are not disabled). - // num_selected_tests are the number of tests to be run on - // this shard. - int num_runnable_tests = 0; - int num_selected_tests = 0; - for (size_t i = 0; i < test_cases_.size(); i++) { - TestCase* const test_case = test_cases_[i]; - const std::string &test_case_name = test_case->name(); - test_case->set_should_run(false); - - for (size_t j = 0; j < test_case->test_info_list().size(); j++) { - TestInfo* const test_info = test_case->test_info_list()[j]; - const std::string test_name(test_info->name()); - // A test is disabled if test case name or test name matches - // kDisableTestFilter. - const bool is_disabled = - internal::UnitTestOptions::MatchesFilter(test_case_name, - kDisableTestFilter) || - internal::UnitTestOptions::MatchesFilter(test_name, - kDisableTestFilter); - test_info->is_disabled_ = is_disabled; - - const bool matches_filter = - internal::UnitTestOptions::FilterMatchesTest(test_case_name, - test_name); - test_info->matches_filter_ = matches_filter; - - const bool is_runnable = - (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) && - matches_filter; - - const bool is_in_another_shard = - shard_tests != IGNORE_SHARDING_PROTOCOL && - !ShouldRunTestOnShard(total_shards, shard_index, num_runnable_tests); - test_info->is_in_another_shard_ = is_in_another_shard; - const bool is_selected = is_runnable && !is_in_another_shard; - - num_runnable_tests += is_runnable; - num_selected_tests += is_selected; - - test_info->should_run_ = is_selected; - test_case->set_should_run(test_case->should_run() || is_selected); - } - } - return num_selected_tests; -} - -// Prints the given C-string on a single line by replacing all '\n' -// characters with string "\\n". If the output takes more than -// max_length characters, only prints the first max_length characters -// and "...". -static void PrintOnOneLine(const char* str, int max_length) { - if (str != NULL) { - for (int i = 0; *str != '\0'; ++str) { - if (i >= max_length) { - printf("..."); - break; - } - if (*str == '\n') { - printf("\\n"); - i += 2; - } else { - printf("%c", *str); - ++i; - } - } - } -} - -// Prints the names of the tests matching the user-specified filter flag. -void UnitTestImpl::ListTestsMatchingFilter() { - // Print at most this many characters for each type/value parameter. - const int kMaxParamLength = 250; - - for (size_t i = 0; i < test_cases_.size(); i++) { - const TestCase* const test_case = test_cases_[i]; - bool printed_test_case_name = false; - - for (size_t j = 0; j < test_case->test_info_list().size(); j++) { - const TestInfo* const test_info = - test_case->test_info_list()[j]; - if (test_info->matches_filter_) { - if (!printed_test_case_name) { - printed_test_case_name = true; - printf("%s.", test_case->name()); - if (test_case->type_param() != NULL) { - printf(" # %s = ", kTypeParamLabel); - // We print the type parameter on a single line to make - // the output easy to parse by a program. - PrintOnOneLine(test_case->type_param(), kMaxParamLength); - } - printf("\n"); - } - printf(" %s", test_info->name()); - if (test_info->value_param() != NULL) { - printf(" # %s = ", kValueParamLabel); - // We print the value parameter on a single line to make the - // output easy to parse by a program. - PrintOnOneLine(test_info->value_param(), kMaxParamLength); - } - printf("\n"); - } - } - } - fflush(stdout); -} - -// Sets the OS stack trace getter. -// -// Does nothing if the input and the current OS stack trace getter are -// the same; otherwise, deletes the old getter and makes the input the -// current getter. -void UnitTestImpl::set_os_stack_trace_getter( - OsStackTraceGetterInterface* getter) { - if (os_stack_trace_getter_ != getter) { - delete os_stack_trace_getter_; - os_stack_trace_getter_ = getter; - } -} - -// Returns the current OS stack trace getter if it is not NULL; -// otherwise, creates an OsStackTraceGetter, makes it the current -// getter, and returns it. -OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() { - if (os_stack_trace_getter_ == NULL) { -#ifdef GTEST_OS_STACK_TRACE_GETTER_ - os_stack_trace_getter_ = new GTEST_OS_STACK_TRACE_GETTER_; -#else - os_stack_trace_getter_ = new OsStackTraceGetter; -#endif // GTEST_OS_STACK_TRACE_GETTER_ - } - - return os_stack_trace_getter_; -} - -// Returns the most specific TestResult currently running. -TestResult* UnitTestImpl::current_test_result() { - if (current_test_info_ != NULL) { - return ¤t_test_info_->result_; - } - if (current_test_case_ != NULL) { - return ¤t_test_case_->ad_hoc_test_result_; - } - return &ad_hoc_test_result_; -} - -// Shuffles all test cases, and the tests within each test case, -// making sure that death tests are still run first. -void UnitTestImpl::ShuffleTests() { - // Shuffles the death test cases. - ShuffleRange(random(), 0, last_death_test_case_ + 1, &test_case_indices_); - - // Shuffles the non-death test cases. - ShuffleRange(random(), last_death_test_case_ + 1, - static_cast(test_cases_.size()), &test_case_indices_); - - // Shuffles the tests inside each test case. - for (size_t i = 0; i < test_cases_.size(); i++) { - test_cases_[i]->ShuffleTests(random()); - } -} - -// Restores the test cases and tests to their order before the first shuffle. -void UnitTestImpl::UnshuffleTests() { - for (size_t i = 0; i < test_cases_.size(); i++) { - // Unshuffles the tests in each test case. - test_cases_[i]->UnshuffleTests(); - // Resets the index of each test case. - test_case_indices_[i] = static_cast(i); - } -} - -// Returns the current OS stack trace as an std::string. -// -// The maximum number of stack frames to be included is specified by -// the gtest_stack_trace_depth flag. The skip_count parameter -// specifies the number of top frames to be skipped, which doesn't -// count against the number of frames to be included. -// -// For example, if Foo() calls Bar(), which in turn calls -// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in -// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't. -std::string GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/, - int skip_count) { - // We pass skip_count + 1 to skip this wrapper function in addition - // to what the user really wants to skip. - return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1); -} - -// Used by the GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_ macro to -// suppress unreachable code warnings. -namespace { -class ClassUniqueToAlwaysTrue {}; -} - -bool IsTrue(bool condition) { return condition; } - -bool AlwaysTrue() { -#if GTEST_HAS_EXCEPTIONS - // This condition is always false so AlwaysTrue() never actually throws, - // but it makes the compiler think that it may throw. - if (IsTrue(false)) - throw ClassUniqueToAlwaysTrue(); -#endif // GTEST_HAS_EXCEPTIONS - return true; -} - -// If *pstr starts with the given prefix, modifies *pstr to be right -// past the prefix and returns true; otherwise leaves *pstr unchanged -// and returns false. None of pstr, *pstr, and prefix can be NULL. -bool SkipPrefix(const char* prefix, const char** pstr) { - const size_t prefix_len = strlen(prefix); - if (strncmp(*pstr, prefix, prefix_len) == 0) { - *pstr += prefix_len; - return true; - } - return false; -} - -// Parses a string as a command line flag. The string should have -// the format "--flag=value". When def_optional is true, the "=value" -// part can be omitted. -// -// Returns the value of the flag, or NULL if the parsing failed. -static const char* ParseFlagValue(const char* str, const char* flag, - bool def_optional) { - // str and flag must not be NULL. - if (str == NULL || flag == NULL) return NULL; - - // The flag must start with "--" followed by GTEST_FLAG_PREFIX_. - const std::string flag_str = std::string("--") + GTEST_FLAG_PREFIX_ + flag; - const size_t flag_len = flag_str.length(); - if (strncmp(str, flag_str.c_str(), flag_len) != 0) return NULL; - - // Skips the flag name. - const char* flag_end = str + flag_len; - - // When def_optional is true, it's OK to not have a "=value" part. - if (def_optional && (flag_end[0] == '\0')) { - return flag_end; - } - - // If def_optional is true and there are more characters after the - // flag name, or if def_optional is false, there must be a '=' after - // the flag name. - if (flag_end[0] != '=') return NULL; - - // Returns the string after "=". - return flag_end + 1; -} - -// Parses a string for a bool flag, in the form of either -// "--flag=value" or "--flag". -// -// In the former case, the value is taken as true as long as it does -// not start with '0', 'f', or 'F'. -// -// In the latter case, the value is taken as true. -// -// On success, stores the value of the flag in *value, and returns -// true. On failure, returns false without changing *value. -static bool ParseBoolFlag(const char* str, const char* flag, bool* value) { - // Gets the value of the flag as a string. - const char* const value_str = ParseFlagValue(str, flag, true); - - // Aborts if the parsing failed. - if (value_str == NULL) return false; - - // Converts the string value to a bool. - *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F'); - return true; -} - -// Parses a string for an Int32 flag, in the form of -// "--flag=value". -// -// On success, stores the value of the flag in *value, and returns -// true. On failure, returns false without changing *value. -bool ParseInt32Flag(const char* str, const char* flag, Int32* value) { - // Gets the value of the flag as a string. - const char* const value_str = ParseFlagValue(str, flag, false); - - // Aborts if the parsing failed. - if (value_str == NULL) return false; - - // Sets *value to the value of the flag. - return ParseInt32(Message() << "The value of flag --" << flag, - value_str, value); -} - -// Parses a string for a string flag, in the form of -// "--flag=value". -// -// On success, stores the value of the flag in *value, and returns -// true. On failure, returns false without changing *value. -template -static bool ParseStringFlag(const char* str, const char* flag, String* value) { - // Gets the value of the flag as a string. - const char* const value_str = ParseFlagValue(str, flag, false); - - // Aborts if the parsing failed. - if (value_str == NULL) return false; - - // Sets *value to the value of the flag. - *value = value_str; - return true; -} - -// Determines whether a string has a prefix that Google Test uses for its -// flags, i.e., starts with GTEST_FLAG_PREFIX_ or GTEST_FLAG_PREFIX_DASH_. -// If Google Test detects that a command line flag has its prefix but is not -// recognized, it will print its help message. Flags starting with -// GTEST_INTERNAL_PREFIX_ followed by "internal_" are considered Google Test -// internal flags and do not trigger the help message. -static bool HasGoogleTestFlagPrefix(const char* str) { - return (SkipPrefix("--", &str) || - SkipPrefix("-", &str) || - SkipPrefix("/", &str)) && - !SkipPrefix(GTEST_FLAG_PREFIX_ "internal_", &str) && - (SkipPrefix(GTEST_FLAG_PREFIX_, &str) || - SkipPrefix(GTEST_FLAG_PREFIX_DASH_, &str)); -} - -// Prints a string containing code-encoded text. The following escape -// sequences can be used in the string to control the text color: -// -// @@ prints a single '@' character. -// @R changes the color to red. -// @G changes the color to green. -// @Y changes the color to yellow. -// @D changes to the default terminal text color. -// -// TODO(wan@google.com): Write tests for this once we add stdout -// capturing to Google Test. -static void PrintColorEncoded(const char* str) { - GTestColor color = COLOR_DEFAULT; // The current color. - - // Conceptually, we split the string into segments divided by escape - // sequences. Then we print one segment at a time. At the end of - // each iteration, the str pointer advances to the beginning of the - // next segment. - for (;;) { - const char* p = strchr(str, '@'); - if (p == NULL) { - ColoredPrintf(color, "%s", str); - return; - } - - ColoredPrintf(color, "%s", std::string(str, p).c_str()); - - const char ch = p[1]; - str = p + 2; - if (ch == '@') { - ColoredPrintf(color, "@"); - } else if (ch == 'D') { - color = COLOR_DEFAULT; - } else if (ch == 'R') { - color = COLOR_RED; - } else if (ch == 'G') { - color = COLOR_GREEN; - } else if (ch == 'Y') { - color = COLOR_YELLOW; - } else { - --str; - } - } -} - -static const char kColorEncodedHelpMessage[] = -"This program contains tests written using " GTEST_NAME_ ". You can use the\n" -"following command line flags to control its behavior:\n" -"\n" -"Test Selection:\n" -" @G--" GTEST_FLAG_PREFIX_ "list_tests@D\n" -" List the names of all tests instead of running them. The name of\n" -" TEST(Foo, Bar) is \"Foo.Bar\".\n" -" @G--" GTEST_FLAG_PREFIX_ "filter=@YPOSTIVE_PATTERNS" - "[@G-@YNEGATIVE_PATTERNS]@D\n" -" Run only the tests whose name matches one of the positive patterns but\n" -" none of the negative patterns. '?' matches any single character; '*'\n" -" matches any substring; ':' separates two patterns.\n" -" @G--" GTEST_FLAG_PREFIX_ "also_run_disabled_tests@D\n" -" Run all disabled tests too.\n" -"\n" -"Test Execution:\n" -" @G--" GTEST_FLAG_PREFIX_ "repeat=@Y[COUNT]@D\n" -" Run the tests repeatedly; use a negative count to repeat forever.\n" -" @G--" GTEST_FLAG_PREFIX_ "shuffle@D\n" -" Randomize tests' orders on every iteration.\n" -" @G--" GTEST_FLAG_PREFIX_ "random_seed=@Y[NUMBER]@D\n" -" Random number seed to use for shuffling test orders (between 1 and\n" -" 99999, or 0 to use a seed based on the current time).\n" -"\n" -"Test Output:\n" -" @G--" GTEST_FLAG_PREFIX_ "color=@Y(@Gyes@Y|@Gno@Y|@Gauto@Y)@D\n" -" Enable/disable colored output. The default is @Gauto@D.\n" -" -@G-" GTEST_FLAG_PREFIX_ "print_time=0@D\n" -" Don't print the elapsed time of each test.\n" -" @G--" GTEST_FLAG_PREFIX_ "output=@Y(@Gjson@Y|@Gxml@Y)[@G:@YDIRECTORY_PATH@G" - GTEST_PATH_SEP_ "@Y|@G:@YFILE_PATH]@D\n" -" Generate a JSON or XML report in the given directory or with the given\n" -" file name. @YFILE_PATH@D defaults to @Gtest_details.xml@D.\n" -# if GTEST_CAN_STREAM_RESULTS_ -" @G--" GTEST_FLAG_PREFIX_ "stream_result_to=@YHOST@G:@YPORT@D\n" -" Stream test results to the given server.\n" -# endif // GTEST_CAN_STREAM_RESULTS_ -"\n" -"Assertion Behavior:\n" -# if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS -" @G--" GTEST_FLAG_PREFIX_ "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n" -" Set the default death test style.\n" -# endif // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS -" @G--" GTEST_FLAG_PREFIX_ "break_on_failure@D\n" -" Turn assertion failures into debugger break-points.\n" -" @G--" GTEST_FLAG_PREFIX_ "throw_on_failure@D\n" -" Turn assertion failures into C++ exceptions for use by an external\n" -" test framework.\n" -" @G--" GTEST_FLAG_PREFIX_ "catch_exceptions=0@D\n" -" Do not report exceptions as test failures. Instead, allow them\n" -" to crash the program or throw a pop-up (on Windows).\n" -"\n" -"Except for @G--" GTEST_FLAG_PREFIX_ "list_tests@D, you can alternatively set " - "the corresponding\n" -"environment variable of a flag (all letters in upper-case). For example, to\n" -"disable colored text output, you can either specify @G--" GTEST_FLAG_PREFIX_ - "color=no@D or set\n" -"the @G" GTEST_FLAG_PREFIX_UPPER_ "COLOR@D environment variable to @Gno@D.\n" -"\n" -"For more information, please read the " GTEST_NAME_ " documentation at\n" -"@G" GTEST_PROJECT_URL_ "@D. If you find a bug in " GTEST_NAME_ "\n" -"(not one in your own code or tests), please report it to\n" -"@G<" GTEST_DEV_EMAIL_ ">@D.\n"; - -static bool ParseGoogleTestFlag(const char* const arg) { - return ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag, - >EST_FLAG(also_run_disabled_tests)) || - ParseBoolFlag(arg, kBreakOnFailureFlag, - >EST_FLAG(break_on_failure)) || - ParseBoolFlag(arg, kCatchExceptionsFlag, - >EST_FLAG(catch_exceptions)) || - ParseStringFlag(arg, kColorFlag, >EST_FLAG(color)) || - ParseStringFlag(arg, kDeathTestStyleFlag, - >EST_FLAG(death_test_style)) || - ParseBoolFlag(arg, kDeathTestUseFork, - >EST_FLAG(death_test_use_fork)) || - ParseStringFlag(arg, kFilterFlag, >EST_FLAG(filter)) || - ParseStringFlag(arg, kInternalRunDeathTestFlag, - >EST_FLAG(internal_run_death_test)) || - ParseBoolFlag(arg, kListTestsFlag, >EST_FLAG(list_tests)) || - ParseStringFlag(arg, kOutputFlag, >EST_FLAG(output)) || - ParseBoolFlag(arg, kPrintTimeFlag, >EST_FLAG(print_time)) || - ParseBoolFlag(arg, kPrintUTF8Flag, >EST_FLAG(print_utf8)) || - ParseInt32Flag(arg, kRandomSeedFlag, >EST_FLAG(random_seed)) || - ParseInt32Flag(arg, kRepeatFlag, >EST_FLAG(repeat)) || - ParseBoolFlag(arg, kShuffleFlag, >EST_FLAG(shuffle)) || - ParseInt32Flag(arg, kStackTraceDepthFlag, - >EST_FLAG(stack_trace_depth)) || - ParseStringFlag(arg, kStreamResultToFlag, - >EST_FLAG(stream_result_to)) || - ParseBoolFlag(arg, kThrowOnFailureFlag, - >EST_FLAG(throw_on_failure)); -} - -#if GTEST_USE_OWN_FLAGFILE_FLAG_ -static void LoadFlagsFromFile(const std::string& path) { - FILE* flagfile = posix::FOpen(path.c_str(), "r"); - if (!flagfile) { - GTEST_LOG_(FATAL) << "Unable to open file \"" << GTEST_FLAG(flagfile) - << "\""; - } - std::string contents(ReadEntireFile(flagfile)); - posix::FClose(flagfile); - std::vector lines; - SplitString(contents, '\n', &lines); - for (size_t i = 0; i < lines.size(); ++i) { - if (lines[i].empty()) - continue; - if (!ParseGoogleTestFlag(lines[i].c_str())) - g_help_flag = true; - } -} -#endif // GTEST_USE_OWN_FLAGFILE_FLAG_ - -// Parses the command line for Google Test flags, without initializing -// other parts of Google Test. The type parameter CharType can be -// instantiated to either char or wchar_t. -template -void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) { - for (int i = 1; i < *argc; i++) { - const std::string arg_string = StreamableToString(argv[i]); - const char* const arg = arg_string.c_str(); - - using internal::ParseBoolFlag; - using internal::ParseInt32Flag; - using internal::ParseStringFlag; - - bool remove_flag = false; - if (ParseGoogleTestFlag(arg)) { - remove_flag = true; -#if GTEST_USE_OWN_FLAGFILE_FLAG_ - } else if (ParseStringFlag(arg, kFlagfileFlag, >EST_FLAG(flagfile))) { - LoadFlagsFromFile(GTEST_FLAG(flagfile)); - remove_flag = true; -#endif // GTEST_USE_OWN_FLAGFILE_FLAG_ - } else if (arg_string == "--help" || arg_string == "-h" || - arg_string == "-?" || arg_string == "/?" || - HasGoogleTestFlagPrefix(arg)) { - // Both help flag and unrecognized Google Test flags (excluding - // internal ones) trigger help display. - g_help_flag = true; - } - - if (remove_flag) { - // Shift the remainder of the argv list left by one. Note - // that argv has (*argc + 1) elements, the last one always being - // NULL. The following loop moves the trailing NULL element as - // well. - for (int j = i; j != *argc; j++) { - argv[j] = argv[j + 1]; - } - - // Decrements the argument count. - (*argc)--; - - // We also need to decrement the iterator as we just removed - // an element. - i--; - } - } - - if (g_help_flag) { - // We print the help here instead of in RUN_ALL_TESTS(), as the - // latter may not be called at all if the user is using Google - // Test with another testing framework. - PrintColorEncoded(kColorEncodedHelpMessage); - } -} - -// Parses the command line for Google Test flags, without initializing -// other parts of Google Test. -void ParseGoogleTestFlagsOnly(int* argc, char** argv) { - ParseGoogleTestFlagsOnlyImpl(argc, argv); -} -void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) { - ParseGoogleTestFlagsOnlyImpl(argc, argv); -} - -// The internal implementation of InitGoogleTest(). -// -// The type parameter CharType can be instantiated to either char or -// wchar_t. -template -void InitGoogleTestImpl(int* argc, CharType** argv) { - // We don't want to run the initialization code twice. - if (GTestIsInitialized()) return; - - if (*argc <= 0) return; - - g_argvs.clear(); - for (int i = 0; i != *argc; i++) { - g_argvs.push_back(StreamableToString(argv[i])); - } - - ParseGoogleTestFlagsOnly(argc, argv); - GetUnitTestImpl()->PostFlagParsingInit(); -} - -} // namespace internal - -// Initializes Google Test. This must be called before calling -// RUN_ALL_TESTS(). In particular, it parses a command line for the -// flags that Google Test recognizes. Whenever a Google Test flag is -// seen, it is removed from argv, and *argc is decremented. -// -// No value is returned. Instead, the Google Test flag variables are -// updated. -// -// Calling the function for the second time has no user-visible effect. -void InitGoogleTest(int* argc, char** argv) { -#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) - GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv); -#else // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) - internal::InitGoogleTestImpl(argc, argv); -#endif // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) -} - -// This overloaded version can be used in Windows programs compiled in -// UNICODE mode. -void InitGoogleTest(int* argc, wchar_t** argv) { -#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) - GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv); -#else // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) - internal::InitGoogleTestImpl(argc, argv); -#endif // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) -} - -std::string TempDir() { -#if defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_) - return GTEST_CUSTOM_TEMPDIR_FUNCTION_(); -#endif - -#if GTEST_OS_WINDOWS_MOBILE - return "\\temp\\"; -#elif GTEST_OS_WINDOWS - const char* temp_dir = internal::posix::GetEnv("TEMP"); - if (temp_dir == NULL || temp_dir[0] == '\0') - return "\\temp\\"; - else if (temp_dir[strlen(temp_dir) - 1] == '\\') - return temp_dir; - else - return std::string(temp_dir) + "\\"; -#elif GTEST_OS_LINUX_ANDROID - return "/sdcard/"; -#else - return "/tmp/"; -#endif // GTEST_OS_WINDOWS_MOBILE -} - -// Class ScopedTrace - -// Pushes the given source file location and message onto a per-thread -// trace stack maintained by Google Test. -void ScopedTrace::PushTrace(const char* file, int line, std::string message) { - internal::TraceInfo trace; - trace.file = file; - trace.line = line; - trace.message.swap(message); - - UnitTest::GetInstance()->PushGTestTrace(trace); -} - -// Pops the info pushed by the c'tor. -ScopedTrace::~ScopedTrace() - GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { - UnitTest::GetInstance()->PopGTestTrace(); -} - -} // namespace testing diff --git a/test/gtest-1.8.0/src/gtest_main.cc b/test/gtest-1.8.0/src/gtest_main.cc deleted file mode 100644 index 5e9c94cbb8..0000000000 --- a/test/gtest-1.8.0/src/gtest_main.cc +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include "gtest/gtest.h" - -GTEST_API_ int main(int argc, char **argv) { - printf("Running main() from gtest_main.cc\n"); - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/test/gtest-1.8.0/test/BUILD.bazel b/test/gtest-1.8.0/test/BUILD.bazel deleted file mode 100644 index 6ea18ec691..0000000000 --- a/test/gtest-1.8.0/test/BUILD.bazel +++ /dev/null @@ -1,380 +0,0 @@ -# Copyright 2017 Google Inc. -# All Rights Reserved. -# -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Author: misterg@google.com (Gennadiy Civil) -# -# Bazel BUILD for The Google C++ Testing Framework (Google Test) - -licenses(["notice"]) - -""" gtest own tests """ - -#on windows exclude gtest-tuple.h and gtest-tuple_test.cc -cc_test( - name = "gtest_all_test", - size = "small", - srcs = glob( - include = [ - "gtest-*.cc", - "*.h", - "googletest/include/gtest/**/*.h", - ], - exclude = [ - "gtest-unittest-api_test.cc", - "gtest-tuple_test.cc", - "googletest/src/gtest-all.cc", - "gtest_all_test.cc", - "gtest-death-test_ex_test.cc", - "gtest-listener_test.cc", - "gtest-unittest-api_test.cc", - "gtest-param-test_test.cc", - ], - ) + select({ - "//:windows": [], - "//:windows_msvc": [], - "//conditions:default": [ - "gtest-tuple_test.cc", - ], - }), - copts = select({ - "//:windows": ["-DGTEST_USE_OWN_TR1_TUPLE=0"], - "//:windows_msvc": ["-DGTEST_USE_OWN_TR1_TUPLE=0"], - "//conditions:default": ["-DGTEST_USE_OWN_TR1_TUPLE=1"], - }), - includes = [ - "googletest", - "googletest/include", - "googletest/include/internal", - "googletest/test", - ], - linkopts = select({ - "//:windows": [], - "//:windows_msvc": [], - "//conditions:default": [ - "-pthread", - ], - }), - deps = ["//:gtest_main"], -) - -#These googletest tests have their own main() -cc_test( - name = "gtest-listener_test", - size = "small", - srcs = [ - "gtest-listener_test.cc", - ], - deps = [ - "//:gtest", - ], -) - -cc_test( - name = "gtest-unittest-api_test", - size = "small", - srcs = [ - "gtest-unittest-api_test.cc", - ], - deps = [ - "//:gtest", - ], -) - -cc_test( - name = "gtest-param-test_test", - size = "small", - srcs = [ - "gtest-param-test2_test.cc", - "gtest-param-test_test.cc", - "gtest-param-test_test.h", - ], - deps = [ - "//:gtest", - ], -) - -cc_test( - name = "gtest_unittest", - size = "small", - srcs = ["gtest_unittest.cc"], - args = ["--heap_check=strict"], - shard_count = 2, - deps = ["//:gtest_main"], -) - -# Py tests - -py_library( - name = "gtest_test_utils", - testonly = 1, - srcs = ["gtest_test_utils.py"], - -) - -cc_binary( - name = "gtest_help_test_", - testonly = 1, - srcs = ["gtest_help_test_.cc"], - deps = ["//:gtest_main"], -) -py_test( - name = "gtest_help_test", - size = "small", - srcs = ["gtest_help_test.py"], - data = [":gtest_help_test_"], - deps = [":gtest_test_utils"], -) - -cc_binary( - name = "gtest_output_test_", - testonly = 1, - srcs = ["gtest_output_test_.cc"], - deps = ["//:gtest"], -) - -py_test( - name = "gtest_output_test", - size = "small", - srcs = ["gtest_output_test.py"], - data = [ - "gtest_output_test_golden_lin.txt", - ":gtest_output_test_", - ], - deps = [":gtest_test_utils"], -) - -cc_binary( - name = "gtest_color_test_", - testonly = 1, - srcs = ["gtest_color_test_.cc"], - deps = ["//:gtest"], -) -py_test( - name = "gtest_color_test", - size = "small", - srcs = ["gtest_color_test.py"], - data = [":gtest_color_test_"], - deps = [":gtest_test_utils"], -) - -cc_binary( - name = "gtest_env_var_test_", - testonly = 1, - srcs = ["gtest_env_var_test_.cc"], - deps = ["//:gtest"], -) - -py_test( - name = "gtest_env_var_test", - size = "small", - srcs = ["gtest_env_var_test.py"], - data = [":gtest_env_var_test_"], - deps = [":gtest_test_utils"], -) - -cc_binary( - name = "gtest_filter_unittest_", - testonly = 1, - srcs = ["gtest_filter_unittest_.cc"], - deps = ["//:gtest"], -) - -py_test( - name = "gtest_filter_unittest", - size = "small", - srcs = ["gtest_filter_unittest.py"], - data = [":gtest_filter_unittest_"], - deps = [":gtest_test_utils"], -) - -cc_binary( - name = "gtest_break_on_failure_unittest_", - testonly = 1, - srcs = ["gtest_break_on_failure_unittest_.cc"], - deps = ["//:gtest"], -) - -py_test( - name = "gtest_break_on_failure_unittest", - size = "small", - srcs = ["gtest_break_on_failure_unittest.py"], - data = [":gtest_break_on_failure_unittest_"], - deps = [":gtest_test_utils"], -) - -cc_test( - name = "gtest_assert_by_exception_test", - size = "small", - srcs = ["gtest_assert_by_exception_test.cc"], - deps = ["//:gtest"], -) - -cc_binary( - name = "gtest_throw_on_failure_test_", - testonly = 1, - srcs = ["gtest_throw_on_failure_test_.cc"], - deps = ["//:gtest"], -) - -py_test( - name = "gtest_throw_on_failure_test", - size = "small", - srcs = ["gtest_throw_on_failure_test.py"], - data = [":gtest_throw_on_failure_test_"], - deps = [":gtest_test_utils"], -) - -cc_binary( - name = "gtest_list_tests_unittest_", - testonly = 1, - srcs = ["gtest_list_tests_unittest_.cc"], - deps = ["//:gtest"], -) - -py_test( - name = "gtest_list_tests_unittest", - size = "small", - srcs = ["gtest_list_tests_unittest.py"], - data = [":gtest_list_tests_unittest_"], - deps = [":gtest_test_utils"], -) - -cc_binary( - name = "gtest_shuffle_test_", - srcs = ["gtest_shuffle_test_.cc"], - deps = ["//:gtest"], -) - -py_test( - name = "gtest_shuffle_test", - size = "small", - srcs = ["gtest_shuffle_test.py"], - data = [":gtest_shuffle_test_"], - deps = [":gtest_test_utils"], -) - -cc_binary( - name = "gtest_catch_exceptions_no_ex_test_", - testonly = 1, - srcs = ["gtest_catch_exceptions_test_.cc"], - deps = ["//:gtest_main"], -) - -cc_binary( - name = "gtest_catch_exceptions_ex_test_", - testonly = 1, - srcs = ["gtest_catch_exceptions_test_.cc"], - copts = ["-fexceptions"], - deps = ["//:gtest_main"], -) - -py_test( - name = "gtest_catch_exceptions_test", - size = "small", - srcs = ["gtest_catch_exceptions_test.py"], - data = [ - ":gtest_catch_exceptions_ex_test_", - ":gtest_catch_exceptions_no_ex_test_", - ], - deps = [":gtest_test_utils"], -) - -cc_binary( - name = "gtest_xml_output_unittest_", - testonly = 1, - srcs = ["gtest_xml_output_unittest_.cc"], - deps = ["//:gtest"], -) - -cc_test( - name = "gtest_no_test_unittest", - size = "small", - srcs = ["gtest_no_test_unittest.cc"], - deps = ["//:gtest"], -) - -py_test( - name = "gtest_xml_output_unittest", - size = "small", - srcs = [ - "gtest_xml_output_unittest.py", - "gtest_xml_test_utils.py", - ], - data = [ - # We invoke gtest_no_test_unittest to verify the XML output - # when the test program contains no test definition. - ":gtest_no_test_unittest", - ":gtest_xml_output_unittest_", - ], - deps = [":gtest_test_utils"], -) - -cc_binary( - name = "gtest_xml_outfile1_test_", - testonly = 1, - srcs = ["gtest_xml_outfile1_test_.cc"], - deps = ["//:gtest_main"], -) - -cc_binary( - name = "gtest_xml_outfile2_test_", - testonly = 1, - srcs = ["gtest_xml_outfile2_test_.cc"], - deps = ["//:gtest_main"], -) - -py_test( - name = "gtest_xml_outfiles_test", - size = "small", - srcs = [ - "gtest_xml_outfiles_test.py", - "gtest_xml_test_utils.py", - ], - data = [ - ":gtest_xml_outfile1_test_", - ":gtest_xml_outfile2_test_", - ], - deps = [":gtest_test_utils"], -) - -cc_binary( - name = "gtest_uninitialized_test_", - testonly = 1, - srcs = ["gtest_uninitialized_test_.cc"], - deps = ["//:gtest"], -) - -py_test( - name = "gtest_uninitialized_test", - size = "medium", - srcs = ["gtest_uninitialized_test.py"], - data = [":gtest_uninitialized_test_"], - deps = [":gtest_test_utils"], -) diff --git a/test/gtest-1.8.0/test/gtest-death-test_ex_test.cc b/test/gtest-1.8.0/test/gtest-death-test_ex_test.cc deleted file mode 100644 index b50a13d5e2..0000000000 --- a/test/gtest-1.8.0/test/gtest-death-test_ex_test.cc +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright 2010, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vladl@google.com (Vlad Losev) -// -// Tests that verify interaction of exceptions and death tests. - -#include "gtest/gtest-death-test.h" -#include "gtest/gtest.h" - -#if GTEST_HAS_DEATH_TEST - -# if GTEST_HAS_SEH -# include // For RaiseException(). -# endif - -# include "gtest/gtest-spi.h" - -# if GTEST_HAS_EXCEPTIONS - -# include // For std::exception. - -// Tests that death tests report thrown exceptions as failures and that the -// exceptions do not escape death test macros. -TEST(CxxExceptionDeathTest, ExceptionIsFailure) { - try { - EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(throw 1, ""), "threw an exception"); - } catch (...) { // NOLINT - FAIL() << "An exception escaped a death test macro invocation " - << "with catch_exceptions " - << (testing::GTEST_FLAG(catch_exceptions) ? "enabled" : "disabled"); - } -} - -class TestException : public std::exception { - public: - virtual const char* what() const throw() { return "exceptional message"; } -}; - -TEST(CxxExceptionDeathTest, PrintsMessageForStdExceptions) { - // Verifies that the exception message is quoted in the failure text. - EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(throw TestException(), ""), - "exceptional message"); - // Verifies that the location is mentioned in the failure text. - EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(throw TestException(), ""), - "gtest-death-test_ex_test.cc"); -} -# endif // GTEST_HAS_EXCEPTIONS - -# if GTEST_HAS_SEH -// Tests that enabling interception of SEH exceptions with the -// catch_exceptions flag does not interfere with SEH exceptions being -// treated as death by death tests. -TEST(SehExceptionDeasTest, CatchExceptionsDoesNotInterfere) { - EXPECT_DEATH(RaiseException(42, 0x0, 0, NULL), "") - << "with catch_exceptions " - << (testing::GTEST_FLAG(catch_exceptions) ? "enabled" : "disabled"); -} -# endif - -#endif // GTEST_HAS_DEATH_TEST - -int main(int argc, char** argv) { - testing::InitGoogleTest(&argc, argv); - testing::GTEST_FLAG(catch_exceptions) = GTEST_ENABLE_CATCH_EXCEPTIONS_ != 0; - return RUN_ALL_TESTS(); -} diff --git a/test/gtest-1.8.0/test/gtest-death-test_test.cc b/test/gtest-1.8.0/test/gtest-death-test_test.cc deleted file mode 100644 index 37261cb63c..0000000000 --- a/test/gtest-1.8.0/test/gtest-death-test_test.cc +++ /dev/null @@ -1,1424 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// Tests for death tests. - -#include "gtest/gtest-death-test.h" -#include "gtest/gtest.h" -#include "gtest/internal/gtest-filepath.h" - -using testing::internal::AlwaysFalse; -using testing::internal::AlwaysTrue; - -#if GTEST_HAS_DEATH_TEST - -# if GTEST_OS_WINDOWS -# include // For chdir(). -# else -# include -# include // For waitpid. -# endif // GTEST_OS_WINDOWS - -# include -# include -# include - -# if GTEST_OS_LINUX -# include -# endif // GTEST_OS_LINUX - -# include "gtest/gtest-spi.h" -# include "src/gtest-internal-inl.h" - -namespace posix = ::testing::internal::posix; - -using testing::Message; -using testing::internal::DeathTest; -using testing::internal::DeathTestFactory; -using testing::internal::FilePath; -using testing::internal::GetLastErrnoDescription; -using testing::internal::GetUnitTestImpl; -using testing::internal::InDeathTestChild; -using testing::internal::ParseNaturalNumber; - -namespace testing { -namespace internal { - -// A helper class whose objects replace the death test factory for a -// single UnitTest object during their lifetimes. -class ReplaceDeathTestFactory { - public: - explicit ReplaceDeathTestFactory(DeathTestFactory* new_factory) - : unit_test_impl_(GetUnitTestImpl()) { - old_factory_ = unit_test_impl_->death_test_factory_.release(); - unit_test_impl_->death_test_factory_.reset(new_factory); - } - - ~ReplaceDeathTestFactory() { - unit_test_impl_->death_test_factory_.release(); - unit_test_impl_->death_test_factory_.reset(old_factory_); - } - private: - // Prevents copying ReplaceDeathTestFactory objects. - ReplaceDeathTestFactory(const ReplaceDeathTestFactory&); - void operator=(const ReplaceDeathTestFactory&); - - UnitTestImpl* unit_test_impl_; - DeathTestFactory* old_factory_; -}; - -} // namespace internal -} // namespace testing - -void DieWithMessage(const ::std::string& message) { - fprintf(stderr, "%s", message.c_str()); - fflush(stderr); // Make sure the text is printed before the process exits. - - // We call _exit() instead of exit(), as the former is a direct - // system call and thus safer in the presence of threads. exit() - // will invoke user-defined exit-hooks, which may do dangerous - // things that conflict with death tests. - // - // Some compilers can recognize that _exit() never returns and issue the - // 'unreachable code' warning for code following this function, unless - // fooled by a fake condition. - if (AlwaysTrue()) - _exit(1); -} - -void DieInside(const ::std::string& function) { - DieWithMessage("death inside " + function + "()."); -} - -// Tests that death tests work. - -class TestForDeathTest : public testing::Test { - protected: - TestForDeathTest() : original_dir_(FilePath::GetCurrentDir()) {} - - virtual ~TestForDeathTest() { - posix::ChDir(original_dir_.c_str()); - } - - // A static member function that's expected to die. - static void StaticMemberFunction() { DieInside("StaticMemberFunction"); } - - // A method of the test fixture that may die. - void MemberFunction() { - if (should_die_) - DieInside("MemberFunction"); - } - - // True iff MemberFunction() should die. - bool should_die_; - const FilePath original_dir_; -}; - -// A class with a member function that may die. -class MayDie { - public: - explicit MayDie(bool should_die) : should_die_(should_die) {} - - // A member function that may die. - void MemberFunction() const { - if (should_die_) - DieInside("MayDie::MemberFunction"); - } - - private: - // True iff MemberFunction() should die. - bool should_die_; -}; - -// A global function that's expected to die. -void GlobalFunction() { DieInside("GlobalFunction"); } - -// A non-void function that's expected to die. -int NonVoidFunction() { - DieInside("NonVoidFunction"); - return 1; -} - -// A unary function that may die. -void DieIf(bool should_die) { - if (should_die) - DieInside("DieIf"); -} - -// A binary function that may die. -bool DieIfLessThan(int x, int y) { - if (x < y) { - DieInside("DieIfLessThan"); - } - return true; -} - -// Tests that ASSERT_DEATH can be used outside a TEST, TEST_F, or test fixture. -void DeathTestSubroutine() { - EXPECT_DEATH(GlobalFunction(), "death.*GlobalFunction"); - ASSERT_DEATH(GlobalFunction(), "death.*GlobalFunction"); -} - -// Death in dbg, not opt. -int DieInDebugElse12(int* sideeffect) { - if (sideeffect) *sideeffect = 12; - -# ifndef NDEBUG - - DieInside("DieInDebugElse12"); - -# endif // NDEBUG - - return 12; -} - -# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA - -// Tests the ExitedWithCode predicate. -TEST(ExitStatusPredicateTest, ExitedWithCode) { - // On Windows, the process's exit code is the same as its exit status, - // so the predicate just compares the its input with its parameter. - EXPECT_TRUE(testing::ExitedWithCode(0)(0)); - EXPECT_TRUE(testing::ExitedWithCode(1)(1)); - EXPECT_TRUE(testing::ExitedWithCode(42)(42)); - EXPECT_FALSE(testing::ExitedWithCode(0)(1)); - EXPECT_FALSE(testing::ExitedWithCode(1)(0)); -} - -# else - -// Returns the exit status of a process that calls _exit(2) with a -// given exit code. This is a helper function for the -// ExitStatusPredicateTest test suite. -static int NormalExitStatus(int exit_code) { - pid_t child_pid = fork(); - if (child_pid == 0) { - _exit(exit_code); - } - int status; - waitpid(child_pid, &status, 0); - return status; -} - -// Returns the exit status of a process that raises a given signal. -// If the signal does not cause the process to die, then it returns -// instead the exit status of a process that exits normally with exit -// code 1. This is a helper function for the ExitStatusPredicateTest -// test suite. -static int KilledExitStatus(int signum) { - pid_t child_pid = fork(); - if (child_pid == 0) { - raise(signum); - _exit(1); - } - int status; - waitpid(child_pid, &status, 0); - return status; -} - -// Tests the ExitedWithCode predicate. -TEST(ExitStatusPredicateTest, ExitedWithCode) { - const int status0 = NormalExitStatus(0); - const int status1 = NormalExitStatus(1); - const int status42 = NormalExitStatus(42); - const testing::ExitedWithCode pred0(0); - const testing::ExitedWithCode pred1(1); - const testing::ExitedWithCode pred42(42); - EXPECT_PRED1(pred0, status0); - EXPECT_PRED1(pred1, status1); - EXPECT_PRED1(pred42, status42); - EXPECT_FALSE(pred0(status1)); - EXPECT_FALSE(pred42(status0)); - EXPECT_FALSE(pred1(status42)); -} - -// Tests the KilledBySignal predicate. -TEST(ExitStatusPredicateTest, KilledBySignal) { - const int status_segv = KilledExitStatus(SIGSEGV); - const int status_kill = KilledExitStatus(SIGKILL); - const testing::KilledBySignal pred_segv(SIGSEGV); - const testing::KilledBySignal pred_kill(SIGKILL); - EXPECT_PRED1(pred_segv, status_segv); - EXPECT_PRED1(pred_kill, status_kill); - EXPECT_FALSE(pred_segv(status_kill)); - EXPECT_FALSE(pred_kill(status_segv)); -} - -# endif // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA - -// Tests that the death test macros expand to code which may or may not -// be followed by operator<<, and that in either case the complete text -// comprises only a single C++ statement. -TEST_F(TestForDeathTest, SingleStatement) { - if (AlwaysFalse()) - // This would fail if executed; this is a compilation test only - ASSERT_DEATH(return, ""); - - if (AlwaysTrue()) - EXPECT_DEATH(_exit(1), ""); - else - // This empty "else" branch is meant to ensure that EXPECT_DEATH - // doesn't expand into an "if" statement without an "else" - ; - - if (AlwaysFalse()) - ASSERT_DEATH(return, "") << "did not die"; - - if (AlwaysFalse()) - ; - else - EXPECT_DEATH(_exit(1), "") << 1 << 2 << 3; -} - -void DieWithEmbeddedNul() { - fprintf(stderr, "Hello%cmy null world.\n", '\0'); - fflush(stderr); - _exit(1); -} - -# if GTEST_USES_PCRE - -// Tests that EXPECT_DEATH and ASSERT_DEATH work when the error -// message has a NUL character in it. -TEST_F(TestForDeathTest, EmbeddedNulInMessage) { - EXPECT_DEATH(DieWithEmbeddedNul(), "my null world"); - ASSERT_DEATH(DieWithEmbeddedNul(), "my null world"); -} - -# endif // GTEST_USES_PCRE - -// Tests that death test macros expand to code which interacts well with switch -// statements. -TEST_F(TestForDeathTest, SwitchStatement) { - // Microsoft compiler usually complains about switch statements without - // case labels. We suppress that warning for this test. - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4065) - - switch (0) - default: - ASSERT_DEATH(_exit(1), "") << "exit in default switch handler"; - - switch (0) - case 0: - EXPECT_DEATH(_exit(1), "") << "exit in switch case"; - - GTEST_DISABLE_MSC_WARNINGS_POP_() -} - -// Tests that a static member function can be used in a "fast" style -// death test. -TEST_F(TestForDeathTest, StaticMemberFunctionFastStyle) { - testing::GTEST_FLAG(death_test_style) = "fast"; - ASSERT_DEATH(StaticMemberFunction(), "death.*StaticMember"); -} - -// Tests that a method of the test fixture can be used in a "fast" -// style death test. -TEST_F(TestForDeathTest, MemberFunctionFastStyle) { - testing::GTEST_FLAG(death_test_style) = "fast"; - should_die_ = true; - EXPECT_DEATH(MemberFunction(), "inside.*MemberFunction"); -} - -void ChangeToRootDir() { posix::ChDir(GTEST_PATH_SEP_); } - -// Tests that death tests work even if the current directory has been -// changed. -TEST_F(TestForDeathTest, FastDeathTestInChangedDir) { - testing::GTEST_FLAG(death_test_style) = "fast"; - - ChangeToRootDir(); - EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), ""); - - ChangeToRootDir(); - ASSERT_DEATH(_exit(1), ""); -} - -# if GTEST_OS_LINUX -void SigprofAction(int, siginfo_t*, void*) { /* no op */ } - -// Sets SIGPROF action and ITIMER_PROF timer (interval: 1ms). -void SetSigprofActionAndTimer() { - struct itimerval timer; - timer.it_interval.tv_sec = 0; - timer.it_interval.tv_usec = 1; - timer.it_value = timer.it_interval; - ASSERT_EQ(0, setitimer(ITIMER_PROF, &timer, NULL)); - struct sigaction signal_action; - memset(&signal_action, 0, sizeof(signal_action)); - sigemptyset(&signal_action.sa_mask); - signal_action.sa_sigaction = SigprofAction; - signal_action.sa_flags = SA_RESTART | SA_SIGINFO; - ASSERT_EQ(0, sigaction(SIGPROF, &signal_action, NULL)); -} - -// Disables ITIMER_PROF timer and ignores SIGPROF signal. -void DisableSigprofActionAndTimer(struct sigaction* old_signal_action) { - struct itimerval timer; - timer.it_interval.tv_sec = 0; - timer.it_interval.tv_usec = 0; - timer.it_value = timer.it_interval; - ASSERT_EQ(0, setitimer(ITIMER_PROF, &timer, NULL)); - struct sigaction signal_action; - memset(&signal_action, 0, sizeof(signal_action)); - sigemptyset(&signal_action.sa_mask); - signal_action.sa_handler = SIG_IGN; - ASSERT_EQ(0, sigaction(SIGPROF, &signal_action, old_signal_action)); -} - -// Tests that death tests work when SIGPROF handler and timer are set. -TEST_F(TestForDeathTest, FastSigprofActionSet) { - testing::GTEST_FLAG(death_test_style) = "fast"; - SetSigprofActionAndTimer(); - EXPECT_DEATH(_exit(1), ""); - struct sigaction old_signal_action; - DisableSigprofActionAndTimer(&old_signal_action); - EXPECT_TRUE(old_signal_action.sa_sigaction == SigprofAction); -} - -TEST_F(TestForDeathTest, ThreadSafeSigprofActionSet) { - testing::GTEST_FLAG(death_test_style) = "threadsafe"; - SetSigprofActionAndTimer(); - EXPECT_DEATH(_exit(1), ""); - struct sigaction old_signal_action; - DisableSigprofActionAndTimer(&old_signal_action); - EXPECT_TRUE(old_signal_action.sa_sigaction == SigprofAction); -} -# endif // GTEST_OS_LINUX - -// Repeats a representative sample of death tests in the "threadsafe" style: - -TEST_F(TestForDeathTest, StaticMemberFunctionThreadsafeStyle) { - testing::GTEST_FLAG(death_test_style) = "threadsafe"; - ASSERT_DEATH(StaticMemberFunction(), "death.*StaticMember"); -} - -TEST_F(TestForDeathTest, MemberFunctionThreadsafeStyle) { - testing::GTEST_FLAG(death_test_style) = "threadsafe"; - should_die_ = true; - EXPECT_DEATH(MemberFunction(), "inside.*MemberFunction"); -} - -TEST_F(TestForDeathTest, ThreadsafeDeathTestInLoop) { - testing::GTEST_FLAG(death_test_style) = "threadsafe"; - - for (int i = 0; i < 3; ++i) - EXPECT_EXIT(_exit(i), testing::ExitedWithCode(i), "") << ": i = " << i; -} - -TEST_F(TestForDeathTest, ThreadsafeDeathTestInChangedDir) { - testing::GTEST_FLAG(death_test_style) = "threadsafe"; - - ChangeToRootDir(); - EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), ""); - - ChangeToRootDir(); - ASSERT_DEATH(_exit(1), ""); -} - -TEST_F(TestForDeathTest, MixedStyles) { - testing::GTEST_FLAG(death_test_style) = "threadsafe"; - EXPECT_DEATH(_exit(1), ""); - testing::GTEST_FLAG(death_test_style) = "fast"; - EXPECT_DEATH(_exit(1), ""); -} - -# if GTEST_HAS_CLONE && GTEST_HAS_PTHREAD - -namespace { - -bool pthread_flag; - -void SetPthreadFlag() { - pthread_flag = true; -} - -} // namespace - -TEST_F(TestForDeathTest, DoesNotExecuteAtforkHooks) { - if (!testing::GTEST_FLAG(death_test_use_fork)) { - testing::GTEST_FLAG(death_test_style) = "threadsafe"; - pthread_flag = false; - ASSERT_EQ(0, pthread_atfork(&SetPthreadFlag, NULL, NULL)); - ASSERT_DEATH(_exit(1), ""); - ASSERT_FALSE(pthread_flag); - } -} - -# endif // GTEST_HAS_CLONE && GTEST_HAS_PTHREAD - -// Tests that a method of another class can be used in a death test. -TEST_F(TestForDeathTest, MethodOfAnotherClass) { - const MayDie x(true); - ASSERT_DEATH(x.MemberFunction(), "MayDie\\:\\:MemberFunction"); -} - -// Tests that a global function can be used in a death test. -TEST_F(TestForDeathTest, GlobalFunction) { - EXPECT_DEATH(GlobalFunction(), "GlobalFunction"); -} - -// Tests that any value convertible to an RE works as a second -// argument to EXPECT_DEATH. -TEST_F(TestForDeathTest, AcceptsAnythingConvertibleToRE) { - static const char regex_c_str[] = "GlobalFunction"; - EXPECT_DEATH(GlobalFunction(), regex_c_str); - - const testing::internal::RE regex(regex_c_str); - EXPECT_DEATH(GlobalFunction(), regex); - -# if GTEST_HAS_GLOBAL_STRING - - const ::string regex_str(regex_c_str); - EXPECT_DEATH(GlobalFunction(), regex_str); - -# endif // GTEST_HAS_GLOBAL_STRING - -# if !GTEST_USES_PCRE - - const ::std::string regex_std_str(regex_c_str); - EXPECT_DEATH(GlobalFunction(), regex_std_str); - -# endif // !GTEST_USES_PCRE -} - -// Tests that a non-void function can be used in a death test. -TEST_F(TestForDeathTest, NonVoidFunction) { - ASSERT_DEATH(NonVoidFunction(), "NonVoidFunction"); -} - -// Tests that functions that take parameter(s) can be used in a death test. -TEST_F(TestForDeathTest, FunctionWithParameter) { - EXPECT_DEATH(DieIf(true), "DieIf\\(\\)"); - EXPECT_DEATH(DieIfLessThan(2, 3), "DieIfLessThan"); -} - -// Tests that ASSERT_DEATH can be used outside a TEST, TEST_F, or test fixture. -TEST_F(TestForDeathTest, OutsideFixture) { - DeathTestSubroutine(); -} - -// Tests that death tests can be done inside a loop. -TEST_F(TestForDeathTest, InsideLoop) { - for (int i = 0; i < 5; i++) { - EXPECT_DEATH(DieIfLessThan(-1, i), "DieIfLessThan") << "where i == " << i; - } -} - -// Tests that a compound statement can be used in a death test. -TEST_F(TestForDeathTest, CompoundStatement) { - EXPECT_DEATH({ // NOLINT - const int x = 2; - const int y = x + 1; - DieIfLessThan(x, y); - }, - "DieIfLessThan"); -} - -// Tests that code that doesn't die causes a death test to fail. -TEST_F(TestForDeathTest, DoesNotDie) { - EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(DieIf(false), "DieIf"), - "failed to die"); -} - -// Tests that a death test fails when the error message isn't expected. -TEST_F(TestForDeathTest, ErrorMessageMismatch) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_DEATH(DieIf(true), "DieIfLessThan") << "End of death test message."; - }, "died but not with expected error"); -} - -// On exit, *aborted will be true iff the EXPECT_DEATH() statement -// aborted the function. -void ExpectDeathTestHelper(bool* aborted) { - *aborted = true; - EXPECT_DEATH(DieIf(false), "DieIf"); // This assertion should fail. - *aborted = false; -} - -// Tests that EXPECT_DEATH doesn't abort the test on failure. -TEST_F(TestForDeathTest, EXPECT_DEATH) { - bool aborted = true; - EXPECT_NONFATAL_FAILURE(ExpectDeathTestHelper(&aborted), - "failed to die"); - EXPECT_FALSE(aborted); -} - -// Tests that ASSERT_DEATH does abort the test on failure. -TEST_F(TestForDeathTest, ASSERT_DEATH) { - static bool aborted; - EXPECT_FATAL_FAILURE({ // NOLINT - aborted = true; - ASSERT_DEATH(DieIf(false), "DieIf"); // This assertion should fail. - aborted = false; - }, "failed to die"); - EXPECT_TRUE(aborted); -} - -// Tests that EXPECT_DEATH evaluates the arguments exactly once. -TEST_F(TestForDeathTest, SingleEvaluation) { - int x = 3; - EXPECT_DEATH(DieIf((++x) == 4), "DieIf"); - - const char* regex = "DieIf"; - const char* regex_save = regex; - EXPECT_DEATH(DieIfLessThan(3, 4), regex++); - EXPECT_EQ(regex_save + 1, regex); -} - -// Tests that run-away death tests are reported as failures. -TEST_F(TestForDeathTest, RunawayIsFailure) { - EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(static_cast(0), "Foo"), - "failed to die."); -} - -// Tests that death tests report executing 'return' in the statement as -// failure. -TEST_F(TestForDeathTest, ReturnIsFailure) { - EXPECT_FATAL_FAILURE(ASSERT_DEATH(return, "Bar"), - "illegal return in test statement."); -} - -// Tests that EXPECT_DEBUG_DEATH works as expected, that is, you can stream a -// message to it, and in debug mode it: -// 1. Asserts on death. -// 2. Has no side effect. -// -// And in opt mode, it: -// 1. Has side effects but does not assert. -TEST_F(TestForDeathTest, TestExpectDebugDeath) { - int sideeffect = 0; - - // Put the regex in a local variable to make sure we don't get an "unused" - // warning in opt mode. - const char* regex = "death.*DieInDebugElse12"; - - EXPECT_DEBUG_DEATH(DieInDebugElse12(&sideeffect), regex) - << "Must accept a streamed message"; - -# ifdef NDEBUG - - // Checks that the assignment occurs in opt mode (sideeffect). - EXPECT_EQ(12, sideeffect); - -# else - - // Checks that the assignment does not occur in dbg mode (no sideeffect). - EXPECT_EQ(0, sideeffect); - -# endif -} - -// Tests that ASSERT_DEBUG_DEATH works as expected, that is, you can stream a -// message to it, and in debug mode it: -// 1. Asserts on death. -// 2. Has no side effect. -// -// And in opt mode, it: -// 1. Has side effects but does not assert. -TEST_F(TestForDeathTest, TestAssertDebugDeath) { - int sideeffect = 0; - - ASSERT_DEBUG_DEATH(DieInDebugElse12(&sideeffect), "death.*DieInDebugElse12") - << "Must accept a streamed message"; - -# ifdef NDEBUG - - // Checks that the assignment occurs in opt mode (sideeffect). - EXPECT_EQ(12, sideeffect); - -# else - - // Checks that the assignment does not occur in dbg mode (no sideeffect). - EXPECT_EQ(0, sideeffect); - -# endif -} - -# ifndef NDEBUG - -void ExpectDebugDeathHelper(bool* aborted) { - *aborted = true; - EXPECT_DEBUG_DEATH(return, "") << "This is expected to fail."; - *aborted = false; -} - -# if GTEST_OS_WINDOWS -TEST(PopUpDeathTest, DoesNotShowPopUpOnAbort) { - printf("This test should be considered failing if it shows " - "any pop-up dialogs.\n"); - fflush(stdout); - - EXPECT_DEATH({ - testing::GTEST_FLAG(catch_exceptions) = false; - abort(); - }, ""); -} -# endif // GTEST_OS_WINDOWS - -// Tests that EXPECT_DEBUG_DEATH in debug mode does not abort -// the function. -TEST_F(TestForDeathTest, ExpectDebugDeathDoesNotAbort) { - bool aborted = true; - EXPECT_NONFATAL_FAILURE(ExpectDebugDeathHelper(&aborted), ""); - EXPECT_FALSE(aborted); -} - -void AssertDebugDeathHelper(bool* aborted) { - *aborted = true; - GTEST_LOG_(INFO) << "Before ASSERT_DEBUG_DEATH"; - ASSERT_DEBUG_DEATH(GTEST_LOG_(INFO) << "In ASSERT_DEBUG_DEATH"; return, "") - << "This is expected to fail."; - GTEST_LOG_(INFO) << "After ASSERT_DEBUG_DEATH"; - *aborted = false; -} - -// Tests that ASSERT_DEBUG_DEATH in debug mode aborts the function on -// failure. -TEST_F(TestForDeathTest, AssertDebugDeathAborts) { - static bool aborted; - aborted = false; - EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), ""); - EXPECT_TRUE(aborted); -} - -TEST_F(TestForDeathTest, AssertDebugDeathAborts2) { - static bool aborted; - aborted = false; - EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), ""); - EXPECT_TRUE(aborted); -} - -TEST_F(TestForDeathTest, AssertDebugDeathAborts3) { - static bool aborted; - aborted = false; - EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), ""); - EXPECT_TRUE(aborted); -} - -TEST_F(TestForDeathTest, AssertDebugDeathAborts4) { - static bool aborted; - aborted = false; - EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), ""); - EXPECT_TRUE(aborted); -} - -TEST_F(TestForDeathTest, AssertDebugDeathAborts5) { - static bool aborted; - aborted = false; - EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), ""); - EXPECT_TRUE(aborted); -} - -TEST_F(TestForDeathTest, AssertDebugDeathAborts6) { - static bool aborted; - aborted = false; - EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), ""); - EXPECT_TRUE(aborted); -} - -TEST_F(TestForDeathTest, AssertDebugDeathAborts7) { - static bool aborted; - aborted = false; - EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), ""); - EXPECT_TRUE(aborted); -} - -TEST_F(TestForDeathTest, AssertDebugDeathAborts8) { - static bool aborted; - aborted = false; - EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), ""); - EXPECT_TRUE(aborted); -} - -TEST_F(TestForDeathTest, AssertDebugDeathAborts9) { - static bool aborted; - aborted = false; - EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), ""); - EXPECT_TRUE(aborted); -} - -TEST_F(TestForDeathTest, AssertDebugDeathAborts10) { - static bool aborted; - aborted = false; - EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), ""); - EXPECT_TRUE(aborted); -} - -# endif // _NDEBUG - -// Tests the *_EXIT family of macros, using a variety of predicates. -static void TestExitMacros() { - EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), ""); - ASSERT_EXIT(_exit(42), testing::ExitedWithCode(42), ""); - -# if GTEST_OS_WINDOWS - - // Of all signals effects on the process exit code, only those of SIGABRT - // are documented on Windows. - // See http://msdn.microsoft.com/en-us/library/dwwzkt4c(VS.71).aspx. - EXPECT_EXIT(raise(SIGABRT), testing::ExitedWithCode(3), "") << "b_ar"; - -# elif !GTEST_OS_FUCHSIA - - // Fuchsia has no unix signals. - EXPECT_EXIT(raise(SIGKILL), testing::KilledBySignal(SIGKILL), "") << "foo"; - ASSERT_EXIT(raise(SIGUSR2), testing::KilledBySignal(SIGUSR2), "") << "bar"; - - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_EXIT(_exit(0), testing::KilledBySignal(SIGSEGV), "") - << "This failure is expected, too."; - }, "This failure is expected, too."); - -# endif // GTEST_OS_WINDOWS - - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_EXIT(raise(SIGSEGV), testing::ExitedWithCode(0), "") - << "This failure is expected."; - }, "This failure is expected."); -} - -TEST_F(TestForDeathTest, ExitMacros) { - TestExitMacros(); -} - -TEST_F(TestForDeathTest, ExitMacrosUsingFork) { - testing::GTEST_FLAG(death_test_use_fork) = true; - TestExitMacros(); -} - -TEST_F(TestForDeathTest, InvalidStyle) { - testing::GTEST_FLAG(death_test_style) = "rococo"; - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_DEATH(_exit(0), "") << "This failure is expected."; - }, "This failure is expected."); -} - -TEST_F(TestForDeathTest, DeathTestFailedOutput) { - testing::GTEST_FLAG(death_test_style) = "fast"; - EXPECT_NONFATAL_FAILURE( - EXPECT_DEATH(DieWithMessage("death\n"), - "expected message"), - "Actual msg:\n" - "[ DEATH ] death\n"); -} - -TEST_F(TestForDeathTest, DeathTestUnexpectedReturnOutput) { - testing::GTEST_FLAG(death_test_style) = "fast"; - EXPECT_NONFATAL_FAILURE( - EXPECT_DEATH({ - fprintf(stderr, "returning\n"); - fflush(stderr); - return; - }, ""), - " Result: illegal return in test statement.\n" - " Error msg:\n" - "[ DEATH ] returning\n"); -} - -TEST_F(TestForDeathTest, DeathTestBadExitCodeOutput) { - testing::GTEST_FLAG(death_test_style) = "fast"; - EXPECT_NONFATAL_FAILURE( - EXPECT_EXIT(DieWithMessage("exiting with rc 1\n"), - testing::ExitedWithCode(3), - "expected message"), - " Result: died but not with expected exit code:\n" - " Exited with exit status 1\n" - "Actual msg:\n" - "[ DEATH ] exiting with rc 1\n"); -} - -TEST_F(TestForDeathTest, DeathTestMultiLineMatchFail) { - testing::GTEST_FLAG(death_test_style) = "fast"; - EXPECT_NONFATAL_FAILURE( - EXPECT_DEATH(DieWithMessage("line 1\nline 2\nline 3\n"), - "line 1\nxyz\nline 3\n"), - "Actual msg:\n" - "[ DEATH ] line 1\n" - "[ DEATH ] line 2\n" - "[ DEATH ] line 3\n"); -} - -TEST_F(TestForDeathTest, DeathTestMultiLineMatchPass) { - testing::GTEST_FLAG(death_test_style) = "fast"; - EXPECT_DEATH(DieWithMessage("line 1\nline 2\nline 3\n"), - "line 1\nline 2\nline 3\n"); -} - -// A DeathTestFactory that returns MockDeathTests. -class MockDeathTestFactory : public DeathTestFactory { - public: - MockDeathTestFactory(); - virtual bool Create(const char* statement, - const ::testing::internal::RE* regex, - const char* file, int line, DeathTest** test); - - // Sets the parameters for subsequent calls to Create. - void SetParameters(bool create, DeathTest::TestRole role, - int status, bool passed); - - // Accessors. - int AssumeRoleCalls() const { return assume_role_calls_; } - int WaitCalls() const { return wait_calls_; } - size_t PassedCalls() const { return passed_args_.size(); } - bool PassedArgument(int n) const { return passed_args_[n]; } - size_t AbortCalls() const { return abort_args_.size(); } - DeathTest::AbortReason AbortArgument(int n) const { - return abort_args_[n]; - } - bool TestDeleted() const { return test_deleted_; } - - private: - friend class MockDeathTest; - // If true, Create will return a MockDeathTest; otherwise it returns - // NULL. - bool create_; - // The value a MockDeathTest will return from its AssumeRole method. - DeathTest::TestRole role_; - // The value a MockDeathTest will return from its Wait method. - int status_; - // The value a MockDeathTest will return from its Passed method. - bool passed_; - - // Number of times AssumeRole was called. - int assume_role_calls_; - // Number of times Wait was called. - int wait_calls_; - // The arguments to the calls to Passed since the last call to - // SetParameters. - std::vector passed_args_; - // The arguments to the calls to Abort since the last call to - // SetParameters. - std::vector abort_args_; - // True if the last MockDeathTest returned by Create has been - // deleted. - bool test_deleted_; -}; - - -// A DeathTest implementation useful in testing. It returns values set -// at its creation from its various inherited DeathTest methods, and -// reports calls to those methods to its parent MockDeathTestFactory -// object. -class MockDeathTest : public DeathTest { - public: - MockDeathTest(MockDeathTestFactory *parent, - TestRole role, int status, bool passed) : - parent_(parent), role_(role), status_(status), passed_(passed) { - } - virtual ~MockDeathTest() { - parent_->test_deleted_ = true; - } - virtual TestRole AssumeRole() { - ++parent_->assume_role_calls_; - return role_; - } - virtual int Wait() { - ++parent_->wait_calls_; - return status_; - } - virtual bool Passed(bool exit_status_ok) { - parent_->passed_args_.push_back(exit_status_ok); - return passed_; - } - virtual void Abort(AbortReason reason) { - parent_->abort_args_.push_back(reason); - } - - private: - MockDeathTestFactory* const parent_; - const TestRole role_; - const int status_; - const bool passed_; -}; - - -// MockDeathTestFactory constructor. -MockDeathTestFactory::MockDeathTestFactory() - : create_(true), - role_(DeathTest::OVERSEE_TEST), - status_(0), - passed_(true), - assume_role_calls_(0), - wait_calls_(0), - passed_args_(), - abort_args_() { -} - - -// Sets the parameters for subsequent calls to Create. -void MockDeathTestFactory::SetParameters(bool create, - DeathTest::TestRole role, - int status, bool passed) { - create_ = create; - role_ = role; - status_ = status; - passed_ = passed; - - assume_role_calls_ = 0; - wait_calls_ = 0; - passed_args_.clear(); - abort_args_.clear(); -} - - -// Sets test to NULL (if create_ is false) or to the address of a new -// MockDeathTest object with parameters taken from the last call -// to SetParameters (if create_ is true). Always returns true. -bool MockDeathTestFactory::Create(const char* /*statement*/, - const ::testing::internal::RE* /*regex*/, - const char* /*file*/, - int /*line*/, - DeathTest** test) { - test_deleted_ = false; - if (create_) { - *test = new MockDeathTest(this, role_, status_, passed_); - } else { - *test = NULL; - } - return true; -} - -// A test fixture for testing the logic of the GTEST_DEATH_TEST_ macro. -// It installs a MockDeathTestFactory that is used for the duration -// of the test case. -class MacroLogicDeathTest : public testing::Test { - protected: - static testing::internal::ReplaceDeathTestFactory* replacer_; - static MockDeathTestFactory* factory_; - - static void SetUpTestCase() { - factory_ = new MockDeathTestFactory; - replacer_ = new testing::internal::ReplaceDeathTestFactory(factory_); - } - - static void TearDownTestCase() { - delete replacer_; - replacer_ = NULL; - delete factory_; - factory_ = NULL; - } - - // Runs a death test that breaks the rules by returning. Such a death - // test cannot be run directly from a test routine that uses a - // MockDeathTest, or the remainder of the routine will not be executed. - static void RunReturningDeathTest(bool* flag) { - ASSERT_DEATH({ // NOLINT - *flag = true; - return; - }, ""); - } -}; - -testing::internal::ReplaceDeathTestFactory* MacroLogicDeathTest::replacer_ - = NULL; -MockDeathTestFactory* MacroLogicDeathTest::factory_ = NULL; - - -// Test that nothing happens when the factory doesn't return a DeathTest: -TEST_F(MacroLogicDeathTest, NothingHappens) { - bool flag = false; - factory_->SetParameters(false, DeathTest::OVERSEE_TEST, 0, true); - EXPECT_DEATH(flag = true, ""); - EXPECT_FALSE(flag); - EXPECT_EQ(0, factory_->AssumeRoleCalls()); - EXPECT_EQ(0, factory_->WaitCalls()); - EXPECT_EQ(0U, factory_->PassedCalls()); - EXPECT_EQ(0U, factory_->AbortCalls()); - EXPECT_FALSE(factory_->TestDeleted()); -} - -// Test that the parent process doesn't run the death test code, -// and that the Passed method returns false when the (simulated) -// child process exits with status 0: -TEST_F(MacroLogicDeathTest, ChildExitsSuccessfully) { - bool flag = false; - factory_->SetParameters(true, DeathTest::OVERSEE_TEST, 0, true); - EXPECT_DEATH(flag = true, ""); - EXPECT_FALSE(flag); - EXPECT_EQ(1, factory_->AssumeRoleCalls()); - EXPECT_EQ(1, factory_->WaitCalls()); - ASSERT_EQ(1U, factory_->PassedCalls()); - EXPECT_FALSE(factory_->PassedArgument(0)); - EXPECT_EQ(0U, factory_->AbortCalls()); - EXPECT_TRUE(factory_->TestDeleted()); -} - -// Tests that the Passed method was given the argument "true" when -// the (simulated) child process exits with status 1: -TEST_F(MacroLogicDeathTest, ChildExitsUnsuccessfully) { - bool flag = false; - factory_->SetParameters(true, DeathTest::OVERSEE_TEST, 1, true); - EXPECT_DEATH(flag = true, ""); - EXPECT_FALSE(flag); - EXPECT_EQ(1, factory_->AssumeRoleCalls()); - EXPECT_EQ(1, factory_->WaitCalls()); - ASSERT_EQ(1U, factory_->PassedCalls()); - EXPECT_TRUE(factory_->PassedArgument(0)); - EXPECT_EQ(0U, factory_->AbortCalls()); - EXPECT_TRUE(factory_->TestDeleted()); -} - -// Tests that the (simulated) child process executes the death test -// code, and is aborted with the correct AbortReason if it -// executes a return statement. -TEST_F(MacroLogicDeathTest, ChildPerformsReturn) { - bool flag = false; - factory_->SetParameters(true, DeathTest::EXECUTE_TEST, 0, true); - RunReturningDeathTest(&flag); - EXPECT_TRUE(flag); - EXPECT_EQ(1, factory_->AssumeRoleCalls()); - EXPECT_EQ(0, factory_->WaitCalls()); - EXPECT_EQ(0U, factory_->PassedCalls()); - EXPECT_EQ(1U, factory_->AbortCalls()); - EXPECT_EQ(DeathTest::TEST_ENCOUNTERED_RETURN_STATEMENT, - factory_->AbortArgument(0)); - EXPECT_TRUE(factory_->TestDeleted()); -} - -// Tests that the (simulated) child process is aborted with the -// correct AbortReason if it does not die. -TEST_F(MacroLogicDeathTest, ChildDoesNotDie) { - bool flag = false; - factory_->SetParameters(true, DeathTest::EXECUTE_TEST, 0, true); - EXPECT_DEATH(flag = true, ""); - EXPECT_TRUE(flag); - EXPECT_EQ(1, factory_->AssumeRoleCalls()); - EXPECT_EQ(0, factory_->WaitCalls()); - EXPECT_EQ(0U, factory_->PassedCalls()); - // This time there are two calls to Abort: one since the test didn't - // die, and another from the ReturnSentinel when it's destroyed. The - // sentinel normally isn't destroyed if a test doesn't die, since - // _exit(2) is called in that case by ForkingDeathTest, but not by - // our MockDeathTest. - ASSERT_EQ(2U, factory_->AbortCalls()); - EXPECT_EQ(DeathTest::TEST_DID_NOT_DIE, - factory_->AbortArgument(0)); - EXPECT_EQ(DeathTest::TEST_ENCOUNTERED_RETURN_STATEMENT, - factory_->AbortArgument(1)); - EXPECT_TRUE(factory_->TestDeleted()); -} - -// Tests that a successful death test does not register a successful -// test part. -TEST(SuccessRegistrationDeathTest, NoSuccessPart) { - EXPECT_DEATH(_exit(1), ""); - EXPECT_EQ(0, GetUnitTestImpl()->current_test_result()->total_part_count()); -} - -TEST(StreamingAssertionsDeathTest, DeathTest) { - EXPECT_DEATH(_exit(1), "") << "unexpected failure"; - ASSERT_DEATH(_exit(1), "") << "unexpected failure"; - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_DEATH(_exit(0), "") << "expected failure"; - }, "expected failure"); - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_DEATH(_exit(0), "") << "expected failure"; - }, "expected failure"); -} - -// Tests that GetLastErrnoDescription returns an empty string when the -// last error is 0 and non-empty string when it is non-zero. -TEST(GetLastErrnoDescription, GetLastErrnoDescriptionWorks) { - errno = ENOENT; - EXPECT_STRNE("", GetLastErrnoDescription().c_str()); - errno = 0; - EXPECT_STREQ("", GetLastErrnoDescription().c_str()); -} - -# if GTEST_OS_WINDOWS -TEST(AutoHandleTest, AutoHandleWorks) { - HANDLE handle = ::CreateEvent(NULL, FALSE, FALSE, NULL); - ASSERT_NE(INVALID_HANDLE_VALUE, handle); - - // Tests that the AutoHandle is correctly initialized with a handle. - testing::internal::AutoHandle auto_handle(handle); - EXPECT_EQ(handle, auto_handle.Get()); - - // Tests that Reset assigns INVALID_HANDLE_VALUE. - // Note that this cannot verify whether the original handle is closed. - auto_handle.Reset(); - EXPECT_EQ(INVALID_HANDLE_VALUE, auto_handle.Get()); - - // Tests that Reset assigns the new handle. - // Note that this cannot verify whether the original handle is closed. - handle = ::CreateEvent(NULL, FALSE, FALSE, NULL); - ASSERT_NE(INVALID_HANDLE_VALUE, handle); - auto_handle.Reset(handle); - EXPECT_EQ(handle, auto_handle.Get()); - - // Tests that AutoHandle contains INVALID_HANDLE_VALUE by default. - testing::internal::AutoHandle auto_handle2; - EXPECT_EQ(INVALID_HANDLE_VALUE, auto_handle2.Get()); -} -# endif // GTEST_OS_WINDOWS - -# if GTEST_OS_WINDOWS -typedef unsigned __int64 BiggestParsable; -typedef signed __int64 BiggestSignedParsable; -# else -typedef unsigned long long BiggestParsable; -typedef signed long long BiggestSignedParsable; -# endif // GTEST_OS_WINDOWS - -// We cannot use std::numeric_limits::max() as it clashes with the -// max() macro defined by . -const BiggestParsable kBiggestParsableMax = ULLONG_MAX; -const BiggestSignedParsable kBiggestSignedParsableMax = LLONG_MAX; - -TEST(ParseNaturalNumberTest, RejectsInvalidFormat) { - BiggestParsable result = 0; - - // Rejects non-numbers. - EXPECT_FALSE(ParseNaturalNumber("non-number string", &result)); - - // Rejects numbers with whitespace prefix. - EXPECT_FALSE(ParseNaturalNumber(" 123", &result)); - - // Rejects negative numbers. - EXPECT_FALSE(ParseNaturalNumber("-123", &result)); - - // Rejects numbers starting with a plus sign. - EXPECT_FALSE(ParseNaturalNumber("+123", &result)); - errno = 0; -} - -TEST(ParseNaturalNumberTest, RejectsOverflownNumbers) { - BiggestParsable result = 0; - - EXPECT_FALSE(ParseNaturalNumber("99999999999999999999999", &result)); - - signed char char_result = 0; - EXPECT_FALSE(ParseNaturalNumber("200", &char_result)); - errno = 0; -} - -TEST(ParseNaturalNumberTest, AcceptsValidNumbers) { - BiggestParsable result = 0; - - result = 0; - ASSERT_TRUE(ParseNaturalNumber("123", &result)); - EXPECT_EQ(123U, result); - - // Check 0 as an edge case. - result = 1; - ASSERT_TRUE(ParseNaturalNumber("0", &result)); - EXPECT_EQ(0U, result); - - result = 1; - ASSERT_TRUE(ParseNaturalNumber("00000", &result)); - EXPECT_EQ(0U, result); -} - -TEST(ParseNaturalNumberTest, AcceptsTypeLimits) { - Message msg; - msg << kBiggestParsableMax; - - BiggestParsable result = 0; - EXPECT_TRUE(ParseNaturalNumber(msg.GetString(), &result)); - EXPECT_EQ(kBiggestParsableMax, result); - - Message msg2; - msg2 << kBiggestSignedParsableMax; - - BiggestSignedParsable signed_result = 0; - EXPECT_TRUE(ParseNaturalNumber(msg2.GetString(), &signed_result)); - EXPECT_EQ(kBiggestSignedParsableMax, signed_result); - - Message msg3; - msg3 << INT_MAX; - - int int_result = 0; - EXPECT_TRUE(ParseNaturalNumber(msg3.GetString(), &int_result)); - EXPECT_EQ(INT_MAX, int_result); - - Message msg4; - msg4 << UINT_MAX; - - unsigned int uint_result = 0; - EXPECT_TRUE(ParseNaturalNumber(msg4.GetString(), &uint_result)); - EXPECT_EQ(UINT_MAX, uint_result); -} - -TEST(ParseNaturalNumberTest, WorksForShorterIntegers) { - short short_result = 0; - ASSERT_TRUE(ParseNaturalNumber("123", &short_result)); - EXPECT_EQ(123, short_result); - - signed char char_result = 0; - ASSERT_TRUE(ParseNaturalNumber("123", &char_result)); - EXPECT_EQ(123, char_result); -} - -# if GTEST_OS_WINDOWS -TEST(EnvironmentTest, HandleFitsIntoSizeT) { - // TODO(vladl@google.com): Remove this test after this condition is verified - // in a static assertion in gtest-death-test.cc in the function - // GetStatusFileDescriptor. - ASSERT_TRUE(sizeof(HANDLE) <= sizeof(size_t)); -} -# endif // GTEST_OS_WINDOWS - -// Tests that EXPECT_DEATH_IF_SUPPORTED/ASSERT_DEATH_IF_SUPPORTED trigger -// failures when death tests are available on the system. -TEST(ConditionalDeathMacrosDeathTest, ExpectsDeathWhenDeathTestsAvailable) { - EXPECT_DEATH_IF_SUPPORTED(DieInside("CondDeathTestExpectMacro"), - "death inside CondDeathTestExpectMacro"); - ASSERT_DEATH_IF_SUPPORTED(DieInside("CondDeathTestAssertMacro"), - "death inside CondDeathTestAssertMacro"); - - // Empty statement will not crash, which must trigger a failure. - EXPECT_NONFATAL_FAILURE(EXPECT_DEATH_IF_SUPPORTED(;, ""), ""); - EXPECT_FATAL_FAILURE(ASSERT_DEATH_IF_SUPPORTED(;, ""), ""); -} - -TEST(InDeathTestChildDeathTest, ReportsDeathTestCorrectlyInFastStyle) { - testing::GTEST_FLAG(death_test_style) = "fast"; - EXPECT_FALSE(InDeathTestChild()); - EXPECT_DEATH({ - fprintf(stderr, InDeathTestChild() ? "Inside" : "Outside"); - fflush(stderr); - _exit(1); - }, "Inside"); -} - -TEST(InDeathTestChildDeathTest, ReportsDeathTestCorrectlyInThreadSafeStyle) { - testing::GTEST_FLAG(death_test_style) = "threadsafe"; - EXPECT_FALSE(InDeathTestChild()); - EXPECT_DEATH({ - fprintf(stderr, InDeathTestChild() ? "Inside" : "Outside"); - fflush(stderr); - _exit(1); - }, "Inside"); -} - -#else // !GTEST_HAS_DEATH_TEST follows - -using testing::internal::CaptureStderr; -using testing::internal::GetCapturedStderr; - -// Tests that EXPECT_DEATH_IF_SUPPORTED/ASSERT_DEATH_IF_SUPPORTED are still -// defined but do not trigger failures when death tests are not available on -// the system. -TEST(ConditionalDeathMacrosTest, WarnsWhenDeathTestsNotAvailable) { - // Empty statement will not crash, but that should not trigger a failure - // when death tests are not supported. - CaptureStderr(); - EXPECT_DEATH_IF_SUPPORTED(;, ""); - std::string output = GetCapturedStderr(); - ASSERT_TRUE(NULL != strstr(output.c_str(), - "Death tests are not supported on this platform")); - ASSERT_TRUE(NULL != strstr(output.c_str(), ";")); - - // The streamed message should not be printed as there is no test failure. - CaptureStderr(); - EXPECT_DEATH_IF_SUPPORTED(;, "") << "streamed message"; - output = GetCapturedStderr(); - ASSERT_TRUE(NULL == strstr(output.c_str(), "streamed message")); - - CaptureStderr(); - ASSERT_DEATH_IF_SUPPORTED(;, ""); // NOLINT - output = GetCapturedStderr(); - ASSERT_TRUE(NULL != strstr(output.c_str(), - "Death tests are not supported on this platform")); - ASSERT_TRUE(NULL != strstr(output.c_str(), ";")); - - CaptureStderr(); - ASSERT_DEATH_IF_SUPPORTED(;, "") << "streamed message"; // NOLINT - output = GetCapturedStderr(); - ASSERT_TRUE(NULL == strstr(output.c_str(), "streamed message")); -} - -void FuncWithAssert(int* n) { - ASSERT_DEATH_IF_SUPPORTED(return;, ""); - (*n)++; -} - -// Tests that ASSERT_DEATH_IF_SUPPORTED does not return from the current -// function (as ASSERT_DEATH does) if death tests are not supported. -TEST(ConditionalDeathMacrosTest, AssertDeatDoesNotReturnhIfUnsupported) { - int n = 0; - FuncWithAssert(&n); - EXPECT_EQ(1, n); -} - -#endif // !GTEST_HAS_DEATH_TEST - -// Tests that the death test macros expand to code which may or may not -// be followed by operator<<, and that in either case the complete text -// comprises only a single C++ statement. -// -// The syntax should work whether death tests are available or not. -TEST(ConditionalDeathMacrosSyntaxDeathTest, SingleStatement) { - if (AlwaysFalse()) - // This would fail if executed; this is a compilation test only - ASSERT_DEATH_IF_SUPPORTED(return, ""); - - if (AlwaysTrue()) - EXPECT_DEATH_IF_SUPPORTED(_exit(1), ""); - else - // This empty "else" branch is meant to ensure that EXPECT_DEATH - // doesn't expand into an "if" statement without an "else" - ; // NOLINT - - if (AlwaysFalse()) - ASSERT_DEATH_IF_SUPPORTED(return, "") << "did not die"; - - if (AlwaysFalse()) - ; // NOLINT - else - EXPECT_DEATH_IF_SUPPORTED(_exit(1), "") << 1 << 2 << 3; -} - -// Tests that conditional death test macros expand to code which interacts -// well with switch statements. -TEST(ConditionalDeathMacrosSyntaxDeathTest, SwitchStatement) { - // Microsoft compiler usually complains about switch statements without - // case labels. We suppress that warning for this test. - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4065) - - switch (0) - default: - ASSERT_DEATH_IF_SUPPORTED(_exit(1), "") - << "exit in default switch handler"; - - switch (0) - case 0: - EXPECT_DEATH_IF_SUPPORTED(_exit(1), "") << "exit in switch case"; - - GTEST_DISABLE_MSC_WARNINGS_POP_() -} - -// Tests that a test case whose name ends with "DeathTest" works fine -// on Windows. -TEST(NotADeathTest, Test) { - SUCCEED(); -} diff --git a/test/gtest-1.8.0/test/gtest-filepath_test.cc b/test/gtest-1.8.0/test/gtest-filepath_test.cc deleted file mode 100644 index 29cea3d1e9..0000000000 --- a/test/gtest-1.8.0/test/gtest-filepath_test.cc +++ /dev/null @@ -1,652 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// -// Google Test filepath utilities -// -// This file tests classes and functions used internally by -// Google Test. They are subject to change without notice. -// -// This file is #included from gtest-internal.h. -// Do not #include this file anywhere else! - -#include "gtest/internal/gtest-filepath.h" -#include "gtest/gtest.h" -#include "src/gtest-internal-inl.h" - -#if GTEST_OS_WINDOWS_MOBILE -# include // NOLINT -#elif GTEST_OS_WINDOWS -# include // NOLINT -#endif // GTEST_OS_WINDOWS_MOBILE - -namespace testing { -namespace internal { -namespace { - -#if GTEST_OS_WINDOWS_MOBILE -// TODO(wan@google.com): Move these to the POSIX adapter section in -// gtest-port.h. - -// Windows CE doesn't have the remove C function. -int remove(const char* path) { - LPCWSTR wpath = String::AnsiToUtf16(path); - int ret = DeleteFile(wpath) ? 0 : -1; - delete [] wpath; - return ret; -} -// Windows CE doesn't have the _rmdir C function. -int _rmdir(const char* path) { - FilePath filepath(path); - LPCWSTR wpath = String::AnsiToUtf16( - filepath.RemoveTrailingPathSeparator().c_str()); - int ret = RemoveDirectory(wpath) ? 0 : -1; - delete [] wpath; - return ret; -} - -#else - -TEST(GetCurrentDirTest, ReturnsCurrentDir) { - const FilePath original_dir = FilePath::GetCurrentDir(); - EXPECT_FALSE(original_dir.IsEmpty()); - - posix::ChDir(GTEST_PATH_SEP_); - const FilePath cwd = FilePath::GetCurrentDir(); - posix::ChDir(original_dir.c_str()); - -# if GTEST_OS_WINDOWS - - // Skips the ":". - const char* const cwd_without_drive = strchr(cwd.c_str(), ':'); - ASSERT_TRUE(cwd_without_drive != NULL); - EXPECT_STREQ(GTEST_PATH_SEP_, cwd_without_drive + 1); - -# else - - EXPECT_EQ(GTEST_PATH_SEP_, cwd.string()); - -# endif -} - -#endif // GTEST_OS_WINDOWS_MOBILE - -TEST(IsEmptyTest, ReturnsTrueForEmptyPath) { - EXPECT_TRUE(FilePath("").IsEmpty()); -} - -TEST(IsEmptyTest, ReturnsFalseForNonEmptyPath) { - EXPECT_FALSE(FilePath("a").IsEmpty()); - EXPECT_FALSE(FilePath(".").IsEmpty()); - EXPECT_FALSE(FilePath("a/b").IsEmpty()); - EXPECT_FALSE(FilePath("a\\b\\").IsEmpty()); -} - -// RemoveDirectoryName "" -> "" -TEST(RemoveDirectoryNameTest, WhenEmptyName) { - EXPECT_EQ("", FilePath("").RemoveDirectoryName().string()); -} - -// RemoveDirectoryName "afile" -> "afile" -TEST(RemoveDirectoryNameTest, ButNoDirectory) { - EXPECT_EQ("afile", - FilePath("afile").RemoveDirectoryName().string()); -} - -// RemoveDirectoryName "/afile" -> "afile" -TEST(RemoveDirectoryNameTest, RootFileShouldGiveFileName) { - EXPECT_EQ("afile", - FilePath(GTEST_PATH_SEP_ "afile").RemoveDirectoryName().string()); -} - -// RemoveDirectoryName "adir/" -> "" -TEST(RemoveDirectoryNameTest, WhereThereIsNoFileName) { - EXPECT_EQ("", - FilePath("adir" GTEST_PATH_SEP_).RemoveDirectoryName().string()); -} - -// RemoveDirectoryName "adir/afile" -> "afile" -TEST(RemoveDirectoryNameTest, ShouldGiveFileName) { - EXPECT_EQ("afile", - FilePath("adir" GTEST_PATH_SEP_ "afile").RemoveDirectoryName().string()); -} - -// RemoveDirectoryName "adir/subdir/afile" -> "afile" -TEST(RemoveDirectoryNameTest, ShouldAlsoGiveFileName) { - EXPECT_EQ("afile", - FilePath("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_ "afile") - .RemoveDirectoryName().string()); -} - -#if GTEST_HAS_ALT_PATH_SEP_ - -// Tests that RemoveDirectoryName() works with the alternate separator -// on Windows. - -// RemoveDirectoryName("/afile") -> "afile" -TEST(RemoveDirectoryNameTest, RootFileShouldGiveFileNameForAlternateSeparator) { - EXPECT_EQ("afile", FilePath("/afile").RemoveDirectoryName().string()); -} - -// RemoveDirectoryName("adir/") -> "" -TEST(RemoveDirectoryNameTest, WhereThereIsNoFileNameForAlternateSeparator) { - EXPECT_EQ("", FilePath("adir/").RemoveDirectoryName().string()); -} - -// RemoveDirectoryName("adir/afile") -> "afile" -TEST(RemoveDirectoryNameTest, ShouldGiveFileNameForAlternateSeparator) { - EXPECT_EQ("afile", FilePath("adir/afile").RemoveDirectoryName().string()); -} - -// RemoveDirectoryName("adir/subdir/afile") -> "afile" -TEST(RemoveDirectoryNameTest, ShouldAlsoGiveFileNameForAlternateSeparator) { - EXPECT_EQ("afile", - FilePath("adir/subdir/afile").RemoveDirectoryName().string()); -} - -#endif - -// RemoveFileName "" -> "./" -TEST(RemoveFileNameTest, EmptyName) { -#if GTEST_OS_WINDOWS_MOBILE - // On Windows CE, we use the root as the current directory. - EXPECT_EQ(GTEST_PATH_SEP_, FilePath("").RemoveFileName().string()); -#else - EXPECT_EQ("." GTEST_PATH_SEP_, FilePath("").RemoveFileName().string()); -#endif -} - -// RemoveFileName "adir/" -> "adir/" -TEST(RemoveFileNameTest, ButNoFile) { - EXPECT_EQ("adir" GTEST_PATH_SEP_, - FilePath("adir" GTEST_PATH_SEP_).RemoveFileName().string()); -} - -// RemoveFileName "adir/afile" -> "adir/" -TEST(RemoveFileNameTest, GivesDirName) { - EXPECT_EQ("adir" GTEST_PATH_SEP_, - FilePath("adir" GTEST_PATH_SEP_ "afile").RemoveFileName().string()); -} - -// RemoveFileName "adir/subdir/afile" -> "adir/subdir/" -TEST(RemoveFileNameTest, GivesDirAndSubDirName) { - EXPECT_EQ("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_, - FilePath("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_ "afile") - .RemoveFileName().string()); -} - -// RemoveFileName "/afile" -> "/" -TEST(RemoveFileNameTest, GivesRootDir) { - EXPECT_EQ(GTEST_PATH_SEP_, - FilePath(GTEST_PATH_SEP_ "afile").RemoveFileName().string()); -} - -#if GTEST_HAS_ALT_PATH_SEP_ - -// Tests that RemoveFileName() works with the alternate separator on -// Windows. - -// RemoveFileName("adir/") -> "adir/" -TEST(RemoveFileNameTest, ButNoFileForAlternateSeparator) { - EXPECT_EQ("adir" GTEST_PATH_SEP_, - FilePath("adir/").RemoveFileName().string()); -} - -// RemoveFileName("adir/afile") -> "adir/" -TEST(RemoveFileNameTest, GivesDirNameForAlternateSeparator) { - EXPECT_EQ("adir" GTEST_PATH_SEP_, - FilePath("adir/afile").RemoveFileName().string()); -} - -// RemoveFileName("adir/subdir/afile") -> "adir/subdir/" -TEST(RemoveFileNameTest, GivesDirAndSubDirNameForAlternateSeparator) { - EXPECT_EQ("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_, - FilePath("adir/subdir/afile").RemoveFileName().string()); -} - -// RemoveFileName("/afile") -> "\" -TEST(RemoveFileNameTest, GivesRootDirForAlternateSeparator) { - EXPECT_EQ(GTEST_PATH_SEP_, FilePath("/afile").RemoveFileName().string()); -} - -#endif - -TEST(MakeFileNameTest, GenerateWhenNumberIsZero) { - FilePath actual = FilePath::MakeFileName(FilePath("foo"), FilePath("bar"), - 0, "xml"); - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.string()); -} - -TEST(MakeFileNameTest, GenerateFileNameNumberGtZero) { - FilePath actual = FilePath::MakeFileName(FilePath("foo"), FilePath("bar"), - 12, "xml"); - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar_12.xml", actual.string()); -} - -TEST(MakeFileNameTest, GenerateFileNameWithSlashNumberIsZero) { - FilePath actual = FilePath::MakeFileName(FilePath("foo" GTEST_PATH_SEP_), - FilePath("bar"), 0, "xml"); - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.string()); -} - -TEST(MakeFileNameTest, GenerateFileNameWithSlashNumberGtZero) { - FilePath actual = FilePath::MakeFileName(FilePath("foo" GTEST_PATH_SEP_), - FilePath("bar"), 12, "xml"); - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar_12.xml", actual.string()); -} - -TEST(MakeFileNameTest, GenerateWhenNumberIsZeroAndDirIsEmpty) { - FilePath actual = FilePath::MakeFileName(FilePath(""), FilePath("bar"), - 0, "xml"); - EXPECT_EQ("bar.xml", actual.string()); -} - -TEST(MakeFileNameTest, GenerateWhenNumberIsNotZeroAndDirIsEmpty) { - FilePath actual = FilePath::MakeFileName(FilePath(""), FilePath("bar"), - 14, "xml"); - EXPECT_EQ("bar_14.xml", actual.string()); -} - -TEST(ConcatPathsTest, WorksWhenDirDoesNotEndWithPathSep) { - FilePath actual = FilePath::ConcatPaths(FilePath("foo"), - FilePath("bar.xml")); - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.string()); -} - -TEST(ConcatPathsTest, WorksWhenPath1EndsWithPathSep) { - FilePath actual = FilePath::ConcatPaths(FilePath("foo" GTEST_PATH_SEP_), - FilePath("bar.xml")); - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.string()); -} - -TEST(ConcatPathsTest, Path1BeingEmpty) { - FilePath actual = FilePath::ConcatPaths(FilePath(""), - FilePath("bar.xml")); - EXPECT_EQ("bar.xml", actual.string()); -} - -TEST(ConcatPathsTest, Path2BeingEmpty) { - FilePath actual = FilePath::ConcatPaths(FilePath("foo"), FilePath("")); - EXPECT_EQ("foo" GTEST_PATH_SEP_, actual.string()); -} - -TEST(ConcatPathsTest, BothPathBeingEmpty) { - FilePath actual = FilePath::ConcatPaths(FilePath(""), - FilePath("")); - EXPECT_EQ("", actual.string()); -} - -TEST(ConcatPathsTest, Path1ContainsPathSep) { - FilePath actual = FilePath::ConcatPaths(FilePath("foo" GTEST_PATH_SEP_ "bar"), - FilePath("foobar.xml")); - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_ "foobar.xml", - actual.string()); -} - -TEST(ConcatPathsTest, Path2ContainsPathSep) { - FilePath actual = FilePath::ConcatPaths( - FilePath("foo" GTEST_PATH_SEP_), - FilePath("bar" GTEST_PATH_SEP_ "bar.xml")); - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_ "bar.xml", - actual.string()); -} - -TEST(ConcatPathsTest, Path2EndsWithPathSep) { - FilePath actual = FilePath::ConcatPaths(FilePath("foo"), - FilePath("bar" GTEST_PATH_SEP_)); - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_, actual.string()); -} - -// RemoveTrailingPathSeparator "" -> "" -TEST(RemoveTrailingPathSeparatorTest, EmptyString) { - EXPECT_EQ("", FilePath("").RemoveTrailingPathSeparator().string()); -} - -// RemoveTrailingPathSeparator "foo" -> "foo" -TEST(RemoveTrailingPathSeparatorTest, FileNoSlashString) { - EXPECT_EQ("foo", FilePath("foo").RemoveTrailingPathSeparator().string()); -} - -// RemoveTrailingPathSeparator "foo/" -> "foo" -TEST(RemoveTrailingPathSeparatorTest, ShouldRemoveTrailingSeparator) { - EXPECT_EQ("foo", - FilePath("foo" GTEST_PATH_SEP_).RemoveTrailingPathSeparator().string()); -#if GTEST_HAS_ALT_PATH_SEP_ - EXPECT_EQ("foo", FilePath("foo/").RemoveTrailingPathSeparator().string()); -#endif -} - -// RemoveTrailingPathSeparator "foo/bar/" -> "foo/bar/" -TEST(RemoveTrailingPathSeparatorTest, ShouldRemoveLastSeparator) { - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar", - FilePath("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_) - .RemoveTrailingPathSeparator().string()); -} - -// RemoveTrailingPathSeparator "foo/bar" -> "foo/bar" -TEST(RemoveTrailingPathSeparatorTest, ShouldReturnUnmodified) { - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar", - FilePath("foo" GTEST_PATH_SEP_ "bar") - .RemoveTrailingPathSeparator().string()); -} - -TEST(DirectoryTest, RootDirectoryExists) { -#if GTEST_OS_WINDOWS // We are on Windows. - char current_drive[_MAX_PATH]; // NOLINT - current_drive[0] = static_cast(_getdrive() + 'A' - 1); - current_drive[1] = ':'; - current_drive[2] = '\\'; - current_drive[3] = '\0'; - EXPECT_TRUE(FilePath(current_drive).DirectoryExists()); -#else - EXPECT_TRUE(FilePath("/").DirectoryExists()); -#endif // GTEST_OS_WINDOWS -} - -#if GTEST_OS_WINDOWS -TEST(DirectoryTest, RootOfWrongDriveDoesNotExists) { - const int saved_drive_ = _getdrive(); - // Find a drive that doesn't exist. Start with 'Z' to avoid common ones. - for (char drive = 'Z'; drive >= 'A'; drive--) - if (_chdrive(drive - 'A' + 1) == -1) { - char non_drive[_MAX_PATH]; // NOLINT - non_drive[0] = drive; - non_drive[1] = ':'; - non_drive[2] = '\\'; - non_drive[3] = '\0'; - EXPECT_FALSE(FilePath(non_drive).DirectoryExists()); - break; - } - _chdrive(saved_drive_); -} -#endif // GTEST_OS_WINDOWS - -#if !GTEST_OS_WINDOWS_MOBILE -// Windows CE _does_ consider an empty directory to exist. -TEST(DirectoryTest, EmptyPathDirectoryDoesNotExist) { - EXPECT_FALSE(FilePath("").DirectoryExists()); -} -#endif // !GTEST_OS_WINDOWS_MOBILE - -TEST(DirectoryTest, CurrentDirectoryExists) { -#if GTEST_OS_WINDOWS // We are on Windows. -# ifndef _WIN32_CE // Windows CE doesn't have a current directory. - - EXPECT_TRUE(FilePath(".").DirectoryExists()); - EXPECT_TRUE(FilePath(".\\").DirectoryExists()); - -# endif // _WIN32_CE -#else - EXPECT_TRUE(FilePath(".").DirectoryExists()); - EXPECT_TRUE(FilePath("./").DirectoryExists()); -#endif // GTEST_OS_WINDOWS -} - -// "foo/bar" == foo//bar" == "foo///bar" -TEST(NormalizeTest, MultipleConsecutiveSepaparatorsInMidstring) { - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar", - FilePath("foo" GTEST_PATH_SEP_ "bar").string()); - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar", - FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string()); - EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar", - FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_ - GTEST_PATH_SEP_ "bar").string()); -} - -// "/bar" == //bar" == "///bar" -TEST(NormalizeTest, MultipleConsecutiveSepaparatorsAtStringStart) { - EXPECT_EQ(GTEST_PATH_SEP_ "bar", - FilePath(GTEST_PATH_SEP_ "bar").string()); - EXPECT_EQ(GTEST_PATH_SEP_ "bar", - FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string()); - EXPECT_EQ(GTEST_PATH_SEP_ "bar", - FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string()); -} - -// "foo/" == foo//" == "foo///" -TEST(NormalizeTest, MultipleConsecutiveSepaparatorsAtStringEnd) { - EXPECT_EQ("foo" GTEST_PATH_SEP_, - FilePath("foo" GTEST_PATH_SEP_).string()); - EXPECT_EQ("foo" GTEST_PATH_SEP_, - FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_).string()); - EXPECT_EQ("foo" GTEST_PATH_SEP_, - FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_ GTEST_PATH_SEP_).string()); -} - -#if GTEST_HAS_ALT_PATH_SEP_ - -// Tests that separators at the end of the string are normalized -// regardless of their combination (e.g. "foo\" =="foo/\" == -// "foo\\/"). -TEST(NormalizeTest, MixAlternateSeparatorAtStringEnd) { - EXPECT_EQ("foo" GTEST_PATH_SEP_, - FilePath("foo/").string()); - EXPECT_EQ("foo" GTEST_PATH_SEP_, - FilePath("foo" GTEST_PATH_SEP_ "/").string()); - EXPECT_EQ("foo" GTEST_PATH_SEP_, - FilePath("foo//" GTEST_PATH_SEP_).string()); -} - -#endif - -TEST(AssignmentOperatorTest, DefaultAssignedToNonDefault) { - FilePath default_path; - FilePath non_default_path("path"); - non_default_path = default_path; - EXPECT_EQ("", non_default_path.string()); - EXPECT_EQ("", default_path.string()); // RHS var is unchanged. -} - -TEST(AssignmentOperatorTest, NonDefaultAssignedToDefault) { - FilePath non_default_path("path"); - FilePath default_path; - default_path = non_default_path; - EXPECT_EQ("path", default_path.string()); - EXPECT_EQ("path", non_default_path.string()); // RHS var is unchanged. -} - -TEST(AssignmentOperatorTest, ConstAssignedToNonConst) { - const FilePath const_default_path("const_path"); - FilePath non_default_path("path"); - non_default_path = const_default_path; - EXPECT_EQ("const_path", non_default_path.string()); -} - -class DirectoryCreationTest : public Test { - protected: - virtual void SetUp() { - testdata_path_.Set(FilePath( - TempDir() + GetCurrentExecutableName().string() + - "_directory_creation" GTEST_PATH_SEP_ "test" GTEST_PATH_SEP_)); - testdata_file_.Set(testdata_path_.RemoveTrailingPathSeparator()); - - unique_file0_.Set(FilePath::MakeFileName(testdata_path_, FilePath("unique"), - 0, "txt")); - unique_file1_.Set(FilePath::MakeFileName(testdata_path_, FilePath("unique"), - 1, "txt")); - - remove(testdata_file_.c_str()); - remove(unique_file0_.c_str()); - remove(unique_file1_.c_str()); - posix::RmDir(testdata_path_.c_str()); - } - - virtual void TearDown() { - remove(testdata_file_.c_str()); - remove(unique_file0_.c_str()); - remove(unique_file1_.c_str()); - posix::RmDir(testdata_path_.c_str()); - } - - void CreateTextFile(const char* filename) { - FILE* f = posix::FOpen(filename, "w"); - fprintf(f, "text\n"); - fclose(f); - } - - // Strings representing a directory and a file, with identical paths - // except for the trailing separator character that distinquishes - // a directory named 'test' from a file named 'test'. Example names: - FilePath testdata_path_; // "/tmp/directory_creation/test/" - FilePath testdata_file_; // "/tmp/directory_creation/test" - FilePath unique_file0_; // "/tmp/directory_creation/test/unique.txt" - FilePath unique_file1_; // "/tmp/directory_creation/test/unique_1.txt" -}; - -TEST_F(DirectoryCreationTest, CreateDirectoriesRecursively) { - EXPECT_FALSE(testdata_path_.DirectoryExists()) << testdata_path_.string(); - EXPECT_TRUE(testdata_path_.CreateDirectoriesRecursively()); - EXPECT_TRUE(testdata_path_.DirectoryExists()); -} - -TEST_F(DirectoryCreationTest, CreateDirectoriesForAlreadyExistingPath) { - EXPECT_FALSE(testdata_path_.DirectoryExists()) << testdata_path_.string(); - EXPECT_TRUE(testdata_path_.CreateDirectoriesRecursively()); - // Call 'create' again... should still succeed. - EXPECT_TRUE(testdata_path_.CreateDirectoriesRecursively()); -} - -TEST_F(DirectoryCreationTest, CreateDirectoriesAndUniqueFilename) { - FilePath file_path(FilePath::GenerateUniqueFileName(testdata_path_, - FilePath("unique"), "txt")); - EXPECT_EQ(unique_file0_.string(), file_path.string()); - EXPECT_FALSE(file_path.FileOrDirectoryExists()); // file not there - - testdata_path_.CreateDirectoriesRecursively(); - EXPECT_FALSE(file_path.FileOrDirectoryExists()); // file still not there - CreateTextFile(file_path.c_str()); - EXPECT_TRUE(file_path.FileOrDirectoryExists()); - - FilePath file_path2(FilePath::GenerateUniqueFileName(testdata_path_, - FilePath("unique"), "txt")); - EXPECT_EQ(unique_file1_.string(), file_path2.string()); - EXPECT_FALSE(file_path2.FileOrDirectoryExists()); // file not there - CreateTextFile(file_path2.c_str()); - EXPECT_TRUE(file_path2.FileOrDirectoryExists()); -} - -TEST_F(DirectoryCreationTest, CreateDirectoriesFail) { - // force a failure by putting a file where we will try to create a directory. - CreateTextFile(testdata_file_.c_str()); - EXPECT_TRUE(testdata_file_.FileOrDirectoryExists()); - EXPECT_FALSE(testdata_file_.DirectoryExists()); - EXPECT_FALSE(testdata_file_.CreateDirectoriesRecursively()); -} - -TEST(NoDirectoryCreationTest, CreateNoDirectoriesForDefaultXmlFile) { - const FilePath test_detail_xml("test_detail.xml"); - EXPECT_FALSE(test_detail_xml.CreateDirectoriesRecursively()); -} - -TEST(FilePathTest, DefaultConstructor) { - FilePath fp; - EXPECT_EQ("", fp.string()); -} - -TEST(FilePathTest, CharAndCopyConstructors) { - const FilePath fp("spicy"); - EXPECT_EQ("spicy", fp.string()); - - const FilePath fp_copy(fp); - EXPECT_EQ("spicy", fp_copy.string()); -} - -TEST(FilePathTest, StringConstructor) { - const FilePath fp(std::string("cider")); - EXPECT_EQ("cider", fp.string()); -} - -TEST(FilePathTest, Set) { - const FilePath apple("apple"); - FilePath mac("mac"); - mac.Set(apple); // Implement Set() since overloading operator= is forbidden. - EXPECT_EQ("apple", mac.string()); - EXPECT_EQ("apple", apple.string()); -} - -TEST(FilePathTest, ToString) { - const FilePath file("drink"); - EXPECT_EQ("drink", file.string()); -} - -TEST(FilePathTest, RemoveExtension) { - EXPECT_EQ("app", FilePath("app.cc").RemoveExtension("cc").string()); - EXPECT_EQ("app", FilePath("app.exe").RemoveExtension("exe").string()); - EXPECT_EQ("APP", FilePath("APP.EXE").RemoveExtension("exe").string()); -} - -TEST(FilePathTest, RemoveExtensionWhenThereIsNoExtension) { - EXPECT_EQ("app", FilePath("app").RemoveExtension("exe").string()); -} - -TEST(FilePathTest, IsDirectory) { - EXPECT_FALSE(FilePath("cola").IsDirectory()); - EXPECT_TRUE(FilePath("koala" GTEST_PATH_SEP_).IsDirectory()); -#if GTEST_HAS_ALT_PATH_SEP_ - EXPECT_TRUE(FilePath("koala/").IsDirectory()); -#endif -} - -TEST(FilePathTest, IsAbsolutePath) { - EXPECT_FALSE(FilePath("is" GTEST_PATH_SEP_ "relative").IsAbsolutePath()); - EXPECT_FALSE(FilePath("").IsAbsolutePath()); -#if GTEST_OS_WINDOWS - EXPECT_TRUE(FilePath("c:\\" GTEST_PATH_SEP_ "is_not" - GTEST_PATH_SEP_ "relative").IsAbsolutePath()); - EXPECT_FALSE(FilePath("c:foo" GTEST_PATH_SEP_ "bar").IsAbsolutePath()); - EXPECT_TRUE(FilePath("c:/" GTEST_PATH_SEP_ "is_not" - GTEST_PATH_SEP_ "relative").IsAbsolutePath()); -#else - EXPECT_TRUE(FilePath(GTEST_PATH_SEP_ "is_not" GTEST_PATH_SEP_ "relative") - .IsAbsolutePath()); -#endif // GTEST_OS_WINDOWS -} - -TEST(FilePathTest, IsRootDirectory) { -#if GTEST_OS_WINDOWS - EXPECT_TRUE(FilePath("a:\\").IsRootDirectory()); - EXPECT_TRUE(FilePath("Z:/").IsRootDirectory()); - EXPECT_TRUE(FilePath("e://").IsRootDirectory()); - EXPECT_FALSE(FilePath("").IsRootDirectory()); - EXPECT_FALSE(FilePath("b:").IsRootDirectory()); - EXPECT_FALSE(FilePath("b:a").IsRootDirectory()); - EXPECT_FALSE(FilePath("8:/").IsRootDirectory()); - EXPECT_FALSE(FilePath("c|/").IsRootDirectory()); -#else - EXPECT_TRUE(FilePath("/").IsRootDirectory()); - EXPECT_TRUE(FilePath("//").IsRootDirectory()); - EXPECT_FALSE(FilePath("").IsRootDirectory()); - EXPECT_FALSE(FilePath("\\").IsRootDirectory()); - EXPECT_FALSE(FilePath("/x").IsRootDirectory()); -#endif -} - -} // namespace -} // namespace internal -} // namespace testing diff --git a/test/gtest-1.8.0/test/gtest-linked_ptr_test.cc b/test/gtest-1.8.0/test/gtest-linked_ptr_test.cc deleted file mode 100644 index 6fcf5124a8..0000000000 --- a/test/gtest-1.8.0/test/gtest-linked_ptr_test.cc +++ /dev/null @@ -1,154 +0,0 @@ -// Copyright 2003, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: Dan Egnor (egnor@google.com) -// Ported to Windows: Vadim Berman (vadimb@google.com) - -#include "gtest/internal/gtest-linked_ptr.h" - -#include -#include "gtest/gtest.h" - -namespace { - -using testing::Message; -using testing::internal::linked_ptr; - -int num; -Message* history = NULL; - -// Class which tracks allocation/deallocation -class A { - public: - A(): mynum(num++) { *history << "A" << mynum << " ctor\n"; } - virtual ~A() { *history << "A" << mynum << " dtor\n"; } - virtual void Use() { *history << "A" << mynum << " use\n"; } - protected: - int mynum; -}; - -// Subclass -class B : public A { - public: - B() { *history << "B" << mynum << " ctor\n"; } - ~B() { *history << "B" << mynum << " dtor\n"; } - virtual void Use() { *history << "B" << mynum << " use\n"; } -}; - -class LinkedPtrTest : public testing::Test { - public: - LinkedPtrTest() { - num = 0; - history = new Message; - } - - virtual ~LinkedPtrTest() { - delete history; - history = NULL; - } -}; - -TEST_F(LinkedPtrTest, GeneralTest) { - { - linked_ptr a0, a1, a2; - // Use explicit function call notation here to suppress self-assign warning. - a0.operator=(a0); - a1 = a2; - ASSERT_EQ(a0.get(), static_cast(NULL)); - ASSERT_EQ(a1.get(), static_cast(NULL)); - ASSERT_EQ(a2.get(), static_cast(NULL)); - ASSERT_TRUE(a0 == NULL); - ASSERT_TRUE(a1 == NULL); - ASSERT_TRUE(a2 == NULL); - - { - linked_ptr a3(new A); - a0 = a3; - ASSERT_TRUE(a0 == a3); - ASSERT_TRUE(a0 != NULL); - ASSERT_TRUE(a0.get() == a3); - ASSERT_TRUE(a0 == a3.get()); - linked_ptr a4(a0); - a1 = a4; - linked_ptr a5(new A); - ASSERT_TRUE(a5.get() != a3); - ASSERT_TRUE(a5 != a3.get()); - a2 = a5; - linked_ptr b0(new B); - linked_ptr a6(b0); - ASSERT_TRUE(b0 == a6); - ASSERT_TRUE(a6 == b0); - ASSERT_TRUE(b0 != NULL); - a5 = b0; - a5 = b0; - a3->Use(); - a4->Use(); - a5->Use(); - a6->Use(); - b0->Use(); - (*b0).Use(); - b0.get()->Use(); - } - - a0->Use(); - a1->Use(); - a2->Use(); - - a1 = a2; - a2.reset(new A); - a0.reset(); - - linked_ptr a7; - } - - ASSERT_STREQ( - "A0 ctor\n" - "A1 ctor\n" - "A2 ctor\n" - "B2 ctor\n" - "A0 use\n" - "A0 use\n" - "B2 use\n" - "B2 use\n" - "B2 use\n" - "B2 use\n" - "B2 use\n" - "B2 dtor\n" - "A2 dtor\n" - "A0 use\n" - "A0 use\n" - "A1 use\n" - "A3 ctor\n" - "A0 dtor\n" - "A3 dtor\n" - "A1 dtor\n", - history->GetString().c_str()); -} - -} // Unnamed namespace diff --git a/test/gtest-1.8.0/test/gtest-listener_test.cc b/test/gtest-1.8.0/test/gtest-listener_test.cc deleted file mode 100644 index 639529c585..0000000000 --- a/test/gtest-1.8.0/test/gtest-listener_test.cc +++ /dev/null @@ -1,311 +0,0 @@ -// Copyright 2009 Google Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vladl@google.com (Vlad Losev) -// -// The Google C++ Testing and Mocking Framework (Google Test) -// -// This file verifies Google Test event listeners receive events at the -// right times. - -#include "gtest/gtest.h" -#include - -using ::testing::AddGlobalTestEnvironment; -using ::testing::Environment; -using ::testing::InitGoogleTest; -using ::testing::Test; -using ::testing::TestCase; -using ::testing::TestEventListener; -using ::testing::TestInfo; -using ::testing::TestPartResult; -using ::testing::UnitTest; - -// Used by tests to register their events. -std::vector* g_events = NULL; - -namespace testing { -namespace internal { - -class EventRecordingListener : public TestEventListener { - public: - explicit EventRecordingListener(const char* name) : name_(name) {} - - protected: - virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) { - g_events->push_back(GetFullMethodName("OnTestProgramStart")); - } - - virtual void OnTestIterationStart(const UnitTest& /*unit_test*/, - int iteration) { - Message message; - message << GetFullMethodName("OnTestIterationStart") - << "(" << iteration << ")"; - g_events->push_back(message.GetString()); - } - - virtual void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) { - g_events->push_back(GetFullMethodName("OnEnvironmentsSetUpStart")); - } - - virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) { - g_events->push_back(GetFullMethodName("OnEnvironmentsSetUpEnd")); - } - - virtual void OnTestCaseStart(const TestCase& /*test_case*/) { - g_events->push_back(GetFullMethodName("OnTestCaseStart")); - } - - virtual void OnTestStart(const TestInfo& /*test_info*/) { - g_events->push_back(GetFullMethodName("OnTestStart")); - } - - virtual void OnTestPartResult(const TestPartResult& /*test_part_result*/) { - g_events->push_back(GetFullMethodName("OnTestPartResult")); - } - - virtual void OnTestEnd(const TestInfo& /*test_info*/) { - g_events->push_back(GetFullMethodName("OnTestEnd")); - } - - virtual void OnTestCaseEnd(const TestCase& /*test_case*/) { - g_events->push_back(GetFullMethodName("OnTestCaseEnd")); - } - - virtual void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) { - g_events->push_back(GetFullMethodName("OnEnvironmentsTearDownStart")); - } - - virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) { - g_events->push_back(GetFullMethodName("OnEnvironmentsTearDownEnd")); - } - - virtual void OnTestIterationEnd(const UnitTest& /*unit_test*/, - int iteration) { - Message message; - message << GetFullMethodName("OnTestIterationEnd") - << "(" << iteration << ")"; - g_events->push_back(message.GetString()); - } - - virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) { - g_events->push_back(GetFullMethodName("OnTestProgramEnd")); - } - - private: - std::string GetFullMethodName(const char* name) { - return name_ + "." + name; - } - - std::string name_; -}; - -class EnvironmentInvocationCatcher : public Environment { - protected: - virtual void SetUp() { - g_events->push_back("Environment::SetUp"); - } - - virtual void TearDown() { - g_events->push_back("Environment::TearDown"); - } -}; - -class ListenerTest : public Test { - protected: - static void SetUpTestCase() { - g_events->push_back("ListenerTest::SetUpTestCase"); - } - - static void TearDownTestCase() { - g_events->push_back("ListenerTest::TearDownTestCase"); - } - - virtual void SetUp() { - g_events->push_back("ListenerTest::SetUp"); - } - - virtual void TearDown() { - g_events->push_back("ListenerTest::TearDown"); - } -}; - -TEST_F(ListenerTest, DoesFoo) { - // Test execution order within a test case is not guaranteed so we are not - // recording the test name. - g_events->push_back("ListenerTest::* Test Body"); - SUCCEED(); // Triggers OnTestPartResult. -} - -TEST_F(ListenerTest, DoesBar) { - g_events->push_back("ListenerTest::* Test Body"); - SUCCEED(); // Triggers OnTestPartResult. -} - -} // namespace internal - -} // namespace testing - -using ::testing::internal::EnvironmentInvocationCatcher; -using ::testing::internal::EventRecordingListener; - -void VerifyResults(const std::vector& data, - const char* const* expected_data, - size_t expected_data_size) { - const size_t actual_size = data.size(); - // If the following assertion fails, a new entry will be appended to - // data. Hence we save data.size() first. - EXPECT_EQ(expected_data_size, actual_size); - - // Compares the common prefix. - const size_t shorter_size = expected_data_size <= actual_size ? - expected_data_size : actual_size; - size_t i = 0; - for (; i < shorter_size; ++i) { - ASSERT_STREQ(expected_data[i], data[i].c_str()) - << "at position " << i; - } - - // Prints extra elements in the actual data. - for (; i < actual_size; ++i) { - printf(" Actual event #%lu: %s\n", - static_cast(i), data[i].c_str()); - } -} - -int main(int argc, char **argv) { - std::vector events; - g_events = &events; - InitGoogleTest(&argc, argv); - - UnitTest::GetInstance()->listeners().Append( - new EventRecordingListener("1st")); - UnitTest::GetInstance()->listeners().Append( - new EventRecordingListener("2nd")); - - AddGlobalTestEnvironment(new EnvironmentInvocationCatcher); - - GTEST_CHECK_(events.size() == 0) - << "AddGlobalTestEnvironment should not generate any events itself."; - - ::testing::GTEST_FLAG(repeat) = 2; - int ret_val = RUN_ALL_TESTS(); - - const char* const expected_events[] = { - "1st.OnTestProgramStart", - "2nd.OnTestProgramStart", - "1st.OnTestIterationStart(0)", - "2nd.OnTestIterationStart(0)", - "1st.OnEnvironmentsSetUpStart", - "2nd.OnEnvironmentsSetUpStart", - "Environment::SetUp", - "2nd.OnEnvironmentsSetUpEnd", - "1st.OnEnvironmentsSetUpEnd", - "1st.OnTestCaseStart", - "2nd.OnTestCaseStart", - "ListenerTest::SetUpTestCase", - "1st.OnTestStart", - "2nd.OnTestStart", - "ListenerTest::SetUp", - "ListenerTest::* Test Body", - "1st.OnTestPartResult", - "2nd.OnTestPartResult", - "ListenerTest::TearDown", - "2nd.OnTestEnd", - "1st.OnTestEnd", - "1st.OnTestStart", - "2nd.OnTestStart", - "ListenerTest::SetUp", - "ListenerTest::* Test Body", - "1st.OnTestPartResult", - "2nd.OnTestPartResult", - "ListenerTest::TearDown", - "2nd.OnTestEnd", - "1st.OnTestEnd", - "ListenerTest::TearDownTestCase", - "2nd.OnTestCaseEnd", - "1st.OnTestCaseEnd", - "1st.OnEnvironmentsTearDownStart", - "2nd.OnEnvironmentsTearDownStart", - "Environment::TearDown", - "2nd.OnEnvironmentsTearDownEnd", - "1st.OnEnvironmentsTearDownEnd", - "2nd.OnTestIterationEnd(0)", - "1st.OnTestIterationEnd(0)", - "1st.OnTestIterationStart(1)", - "2nd.OnTestIterationStart(1)", - "1st.OnEnvironmentsSetUpStart", - "2nd.OnEnvironmentsSetUpStart", - "Environment::SetUp", - "2nd.OnEnvironmentsSetUpEnd", - "1st.OnEnvironmentsSetUpEnd", - "1st.OnTestCaseStart", - "2nd.OnTestCaseStart", - "ListenerTest::SetUpTestCase", - "1st.OnTestStart", - "2nd.OnTestStart", - "ListenerTest::SetUp", - "ListenerTest::* Test Body", - "1st.OnTestPartResult", - "2nd.OnTestPartResult", - "ListenerTest::TearDown", - "2nd.OnTestEnd", - "1st.OnTestEnd", - "1st.OnTestStart", - "2nd.OnTestStart", - "ListenerTest::SetUp", - "ListenerTest::* Test Body", - "1st.OnTestPartResult", - "2nd.OnTestPartResult", - "ListenerTest::TearDown", - "2nd.OnTestEnd", - "1st.OnTestEnd", - "ListenerTest::TearDownTestCase", - "2nd.OnTestCaseEnd", - "1st.OnTestCaseEnd", - "1st.OnEnvironmentsTearDownStart", - "2nd.OnEnvironmentsTearDownStart", - "Environment::TearDown", - "2nd.OnEnvironmentsTearDownEnd", - "1st.OnEnvironmentsTearDownEnd", - "2nd.OnTestIterationEnd(1)", - "1st.OnTestIterationEnd(1)", - "2nd.OnTestProgramEnd", - "1st.OnTestProgramEnd" - }; - VerifyResults(events, - expected_events, - sizeof(expected_events)/sizeof(expected_events[0])); - - // We need to check manually for ad hoc test failures that happen after - // RUN_ALL_TESTS finishes. - if (UnitTest::GetInstance()->Failed()) - ret_val = 1; - - return ret_val; -} diff --git a/test/gtest-1.8.0/test/gtest-message_test.cc b/test/gtest-1.8.0/test/gtest-message_test.cc deleted file mode 100644 index 175238ef4e..0000000000 --- a/test/gtest-1.8.0/test/gtest-message_test.cc +++ /dev/null @@ -1,159 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// Tests for the Message class. - -#include "gtest/gtest-message.h" - -#include "gtest/gtest.h" - -namespace { - -using ::testing::Message; - -// Tests the testing::Message class - -// Tests the default constructor. -TEST(MessageTest, DefaultConstructor) { - const Message msg; - EXPECT_EQ("", msg.GetString()); -} - -// Tests the copy constructor. -TEST(MessageTest, CopyConstructor) { - const Message msg1("Hello"); - const Message msg2(msg1); - EXPECT_EQ("Hello", msg2.GetString()); -} - -// Tests constructing a Message from a C-string. -TEST(MessageTest, ConstructsFromCString) { - Message msg("Hello"); - EXPECT_EQ("Hello", msg.GetString()); -} - -// Tests streaming a float. -TEST(MessageTest, StreamsFloat) { - const std::string s = (Message() << 1.23456F << " " << 2.34567F).GetString(); - // Both numbers should be printed with enough precision. - EXPECT_PRED_FORMAT2(testing::IsSubstring, "1.234560", s.c_str()); - EXPECT_PRED_FORMAT2(testing::IsSubstring, " 2.345669", s.c_str()); -} - -// Tests streaming a double. -TEST(MessageTest, StreamsDouble) { - const std::string s = (Message() << 1260570880.4555497 << " " - << 1260572265.1954534).GetString(); - // Both numbers should be printed with enough precision. - EXPECT_PRED_FORMAT2(testing::IsSubstring, "1260570880.45", s.c_str()); - EXPECT_PRED_FORMAT2(testing::IsSubstring, " 1260572265.19", s.c_str()); -} - -// Tests streaming a non-char pointer. -TEST(MessageTest, StreamsPointer) { - int n = 0; - int* p = &n; - EXPECT_NE("(null)", (Message() << p).GetString()); -} - -// Tests streaming a NULL non-char pointer. -TEST(MessageTest, StreamsNullPointer) { - int* p = NULL; - EXPECT_EQ("(null)", (Message() << p).GetString()); -} - -// Tests streaming a C string. -TEST(MessageTest, StreamsCString) { - EXPECT_EQ("Foo", (Message() << "Foo").GetString()); -} - -// Tests streaming a NULL C string. -TEST(MessageTest, StreamsNullCString) { - char* p = NULL; - EXPECT_EQ("(null)", (Message() << p).GetString()); -} - -// Tests streaming std::string. -TEST(MessageTest, StreamsString) { - const ::std::string str("Hello"); - EXPECT_EQ("Hello", (Message() << str).GetString()); -} - -// Tests that we can output strings containing embedded NULs. -TEST(MessageTest, StreamsStringWithEmbeddedNUL) { - const char char_array_with_nul[] = - "Here's a NUL\0 and some more string"; - const ::std::string string_with_nul(char_array_with_nul, - sizeof(char_array_with_nul) - 1); - EXPECT_EQ("Here's a NUL\\0 and some more string", - (Message() << string_with_nul).GetString()); -} - -// Tests streaming a NUL char. -TEST(MessageTest, StreamsNULChar) { - EXPECT_EQ("\\0", (Message() << '\0').GetString()); -} - -// Tests streaming int. -TEST(MessageTest, StreamsInt) { - EXPECT_EQ("123", (Message() << 123).GetString()); -} - -// Tests that basic IO manipulators (endl, ends, and flush) can be -// streamed to Message. -TEST(MessageTest, StreamsBasicIoManip) { - EXPECT_EQ("Line 1.\nA NUL char \\0 in line 2.", - (Message() << "Line 1." << std::endl - << "A NUL char " << std::ends << std::flush - << " in line 2.").GetString()); -} - -// Tests Message::GetString() -TEST(MessageTest, GetString) { - Message msg; - msg << 1 << " lamb"; - EXPECT_EQ("1 lamb", msg.GetString()); -} - -// Tests streaming a Message object to an ostream. -TEST(MessageTest, StreamsToOStream) { - Message msg("Hello"); - ::std::stringstream ss; - ss << msg; - EXPECT_EQ("Hello", testing::internal::StringStreamToString(&ss)); -} - -// Tests that a Message object doesn't take up too much stack space. -TEST(MessageTest, DoesNotTakeUpMuchStackSpace) { - EXPECT_LE(sizeof(Message), 16U); -} - -} // namespace diff --git a/test/gtest-1.8.0/test/gtest-options_test.cc b/test/gtest-1.8.0/test/gtest-options_test.cc deleted file mode 100644 index 10cb1df72b..0000000000 --- a/test/gtest-1.8.0/test/gtest-options_test.cc +++ /dev/null @@ -1,213 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// -// Google Test UnitTestOptions tests -// -// This file tests classes and functions used internally by -// Google Test. They are subject to change without notice. -// -// This file is #included from gtest.cc, to avoid changing build or -// make-files on Windows and other platforms. Do not #include this file -// anywhere else! - -#include "gtest/gtest.h" - -#if GTEST_OS_WINDOWS_MOBILE -# include -#elif GTEST_OS_WINDOWS -# include -#endif // GTEST_OS_WINDOWS_MOBILE - -#include "src/gtest-internal-inl.h" - -namespace testing { -namespace internal { -namespace { - -// Turns the given relative path into an absolute path. -FilePath GetAbsolutePathOf(const FilePath& relative_path) { - return FilePath::ConcatPaths(FilePath::GetCurrentDir(), relative_path); -} - -// Testing UnitTestOptions::GetOutputFormat/GetOutputFile. - -TEST(XmlOutputTest, GetOutputFormatDefault) { - GTEST_FLAG(output) = ""; - EXPECT_STREQ("", UnitTestOptions::GetOutputFormat().c_str()); -} - -TEST(XmlOutputTest, GetOutputFormat) { - GTEST_FLAG(output) = "xml:filename"; - EXPECT_STREQ("xml", UnitTestOptions::GetOutputFormat().c_str()); -} - -TEST(XmlOutputTest, GetOutputFileDefault) { - GTEST_FLAG(output) = ""; - EXPECT_EQ(GetAbsolutePathOf(FilePath("test_detail.xml")).string(), - UnitTestOptions::GetAbsolutePathToOutputFile()); -} - -TEST(XmlOutputTest, GetOutputFileSingleFile) { - GTEST_FLAG(output) = "xml:filename.abc"; - EXPECT_EQ(GetAbsolutePathOf(FilePath("filename.abc")).string(), - UnitTestOptions::GetAbsolutePathToOutputFile()); -} - -TEST(XmlOutputTest, GetOutputFileFromDirectoryPath) { - GTEST_FLAG(output) = "xml:path" GTEST_PATH_SEP_; - const std::string expected_output_file = - GetAbsolutePathOf( - FilePath(std::string("path") + GTEST_PATH_SEP_ + - GetCurrentExecutableName().string() + ".xml")).string(); - const std::string& output_file = - UnitTestOptions::GetAbsolutePathToOutputFile(); -#if GTEST_OS_WINDOWS - EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str()); -#else - EXPECT_EQ(expected_output_file, output_file.c_str()); -#endif -} - -TEST(OutputFileHelpersTest, GetCurrentExecutableName) { - const std::string exe_str = GetCurrentExecutableName().string(); -#if GTEST_OS_WINDOWS - const bool success = - _strcmpi("gtest-options_test", exe_str.c_str()) == 0 || - _strcmpi("gtest-options-ex_test", exe_str.c_str()) == 0 || - _strcmpi("gtest_all_test", exe_str.c_str()) == 0 || - _strcmpi("gtest_dll_test", exe_str.c_str()) == 0; -#elif GTEST_OS_FUCHSIA - const bool success = exe_str == "app"; -#else - // TODO(wan@google.com): remove the hard-coded "lt-" prefix when - // Chandler Carruth's libtool replacement is ready. - const bool success = - exe_str == "gtest-options_test" || - exe_str == "gtest_all_test" || - exe_str == "lt-gtest_all_test" || - exe_str == "gtest_dll_test"; -#endif // GTEST_OS_WINDOWS - if (!success) - FAIL() << "GetCurrentExecutableName() returns " << exe_str; -} - -#if !GTEST_OS_FUCHSIA - -class XmlOutputChangeDirTest : public Test { - protected: - virtual void SetUp() { - original_working_dir_ = FilePath::GetCurrentDir(); - posix::ChDir(".."); - // This will make the test fail if run from the root directory. - EXPECT_NE(original_working_dir_.string(), - FilePath::GetCurrentDir().string()); - } - - virtual void TearDown() { - posix::ChDir(original_working_dir_.string().c_str()); - } - - FilePath original_working_dir_; -}; - -TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithDefault) { - GTEST_FLAG(output) = ""; - EXPECT_EQ(FilePath::ConcatPaths(original_working_dir_, - FilePath("test_detail.xml")).string(), - UnitTestOptions::GetAbsolutePathToOutputFile()); -} - -TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithDefaultXML) { - GTEST_FLAG(output) = "xml"; - EXPECT_EQ(FilePath::ConcatPaths(original_working_dir_, - FilePath("test_detail.xml")).string(), - UnitTestOptions::GetAbsolutePathToOutputFile()); -} - -TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithRelativeFile) { - GTEST_FLAG(output) = "xml:filename.abc"; - EXPECT_EQ(FilePath::ConcatPaths(original_working_dir_, - FilePath("filename.abc")).string(), - UnitTestOptions::GetAbsolutePathToOutputFile()); -} - -TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithRelativePath) { - GTEST_FLAG(output) = "xml:path" GTEST_PATH_SEP_; - const std::string expected_output_file = - FilePath::ConcatPaths( - original_working_dir_, - FilePath(std::string("path") + GTEST_PATH_SEP_ + - GetCurrentExecutableName().string() + ".xml")).string(); - const std::string& output_file = - UnitTestOptions::GetAbsolutePathToOutputFile(); -#if GTEST_OS_WINDOWS - EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str()); -#else - EXPECT_EQ(expected_output_file, output_file.c_str()); -#endif -} - -TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithAbsoluteFile) { -#if GTEST_OS_WINDOWS - GTEST_FLAG(output) = "xml:c:\\tmp\\filename.abc"; - EXPECT_EQ(FilePath("c:\\tmp\\filename.abc").string(), - UnitTestOptions::GetAbsolutePathToOutputFile()); -#else - GTEST_FLAG(output) ="xml:/tmp/filename.abc"; - EXPECT_EQ(FilePath("/tmp/filename.abc").string(), - UnitTestOptions::GetAbsolutePathToOutputFile()); -#endif -} - -TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithAbsolutePath) { -#if GTEST_OS_WINDOWS - const std::string path = "c:\\tmp\\"; -#else - const std::string path = "/tmp/"; -#endif - - GTEST_FLAG(output) = "xml:" + path; - const std::string expected_output_file = - path + GetCurrentExecutableName().string() + ".xml"; - const std::string& output_file = - UnitTestOptions::GetAbsolutePathToOutputFile(); - -#if GTEST_OS_WINDOWS - EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str()); -#else - EXPECT_EQ(expected_output_file, output_file.c_str()); -#endif -} - -#endif // !GTEST_OS_FUCHSIA - -} // namespace -} // namespace internal -} // namespace testing diff --git a/test/gtest-1.8.0/test/gtest-param-test2_test.cc b/test/gtest-1.8.0/test/gtest-param-test2_test.cc deleted file mode 100644 index c3b2d189d4..0000000000 --- a/test/gtest-1.8.0/test/gtest-param-test2_test.cc +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vladl@google.com (Vlad Losev) -// -// Tests for Google Test itself. This verifies that the basic constructs of -// Google Test work. - -#include "gtest/gtest.h" -#include "gtest-param-test_test.h" - -using ::testing::Values; -using ::testing::internal::ParamGenerator; - -// Tests that generators defined in a different translation unit -// are functional. The test using extern_gen is defined -// in gtest-param-test_test.cc. -ParamGenerator extern_gen = Values(33); - -// Tests that a parameterized test case can be defined in one translation unit -// and instantiated in another. The test is defined in gtest-param-test_test.cc -// and ExternalInstantiationTest fixture class is defined in -// gtest-param-test_test.h. -INSTANTIATE_TEST_CASE_P(MultiplesOf33, - ExternalInstantiationTest, - Values(33, 66)); - -// Tests that a parameterized test case can be instantiated -// in multiple translation units. Another instantiation is defined -// in gtest-param-test_test.cc and InstantiationInMultipleTranslaionUnitsTest -// fixture is defined in gtest-param-test_test.h -INSTANTIATE_TEST_CASE_P(Sequence2, - InstantiationInMultipleTranslaionUnitsTest, - Values(42*3, 42*4, 42*5)); - diff --git a/test/gtest-1.8.0/test/gtest-param-test_test.cc b/test/gtest-1.8.0/test/gtest-param-test_test.cc deleted file mode 100644 index adc4d1b526..0000000000 --- a/test/gtest-1.8.0/test/gtest-param-test_test.cc +++ /dev/null @@ -1,1110 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vladl@google.com (Vlad Losev) -// -// Tests for Google Test itself. This file verifies that the parameter -// generators objects produce correct parameter sequences and that -// Google Test runtime instantiates correct tests from those sequences. - -#include "gtest/gtest.h" - -# include -# include -# include -# include -# include -# include - -# include "src/gtest-internal-inl.h" // for UnitTestOptions -# include "test/gtest-param-test_test.h" - -using ::std::vector; -using ::std::sort; - -using ::testing::AddGlobalTestEnvironment; -using ::testing::Bool; -using ::testing::Message; -using ::testing::Range; -using ::testing::TestWithParam; -using ::testing::Values; -using ::testing::ValuesIn; - -# if GTEST_HAS_COMBINE -using ::testing::Combine; -using ::testing::get; -using ::testing::make_tuple; -using ::testing::tuple; -# endif // GTEST_HAS_COMBINE - -using ::testing::internal::ParamGenerator; -using ::testing::internal::UnitTestOptions; - -// Prints a value to a string. -// -// TODO(wan@google.com): remove PrintValue() when we move matchers and -// EXPECT_THAT() from Google Mock to Google Test. At that time, we -// can write EXPECT_THAT(x, Eq(y)) to compare two tuples x and y, as -// EXPECT_THAT() and the matchers know how to print tuples. -template -::std::string PrintValue(const T& value) { - ::std::stringstream stream; - stream << value; - return stream.str(); -} - -# if GTEST_HAS_COMBINE - -// These overloads allow printing tuples in our tests. We cannot -// define an operator<< for tuples, as that definition needs to be in -// the std namespace in order to be picked up by Google Test via -// Argument-Dependent Lookup, yet defining anything in the std -// namespace in non-STL code is undefined behavior. - -template -::std::string PrintValue(const tuple& value) { - ::std::stringstream stream; - stream << "(" << get<0>(value) << ", " << get<1>(value) << ")"; - return stream.str(); -} - -template -::std::string PrintValue(const tuple& value) { - ::std::stringstream stream; - stream << "(" << get<0>(value) << ", " << get<1>(value) - << ", "<< get<2>(value) << ")"; - return stream.str(); -} - -template -::std::string PrintValue( - const tuple& value) { - ::std::stringstream stream; - stream << "(" << get<0>(value) << ", " << get<1>(value) - << ", "<< get<2>(value) << ", " << get<3>(value) - << ", "<< get<4>(value) << ", " << get<5>(value) - << ", "<< get<6>(value) << ", " << get<7>(value) - << ", "<< get<8>(value) << ", " << get<9>(value) << ")"; - return stream.str(); -} - -# endif // GTEST_HAS_COMBINE - -// Verifies that a sequence generated by the generator and accessed -// via the iterator object matches the expected one using Google Test -// assertions. -template -void VerifyGenerator(const ParamGenerator& generator, - const T (&expected_values)[N]) { - typename ParamGenerator::iterator it = generator.begin(); - for (size_t i = 0; i < N; ++i) { - ASSERT_FALSE(it == generator.end()) - << "At element " << i << " when accessing via an iterator " - << "created with the copy constructor.\n"; - // We cannot use EXPECT_EQ() here as the values may be tuples, - // which don't support <<. - EXPECT_TRUE(expected_values[i] == *it) - << "where i is " << i - << ", expected_values[i] is " << PrintValue(expected_values[i]) - << ", *it is " << PrintValue(*it) - << ", and 'it' is an iterator created with the copy constructor.\n"; - ++it; - } - EXPECT_TRUE(it == generator.end()) - << "At the presumed end of sequence when accessing via an iterator " - << "created with the copy constructor.\n"; - - // Test the iterator assignment. The following lines verify that - // the sequence accessed via an iterator initialized via the - // assignment operator (as opposed to a copy constructor) matches - // just the same. - it = generator.begin(); - for (size_t i = 0; i < N; ++i) { - ASSERT_FALSE(it == generator.end()) - << "At element " << i << " when accessing via an iterator " - << "created with the assignment operator.\n"; - EXPECT_TRUE(expected_values[i] == *it) - << "where i is " << i - << ", expected_values[i] is " << PrintValue(expected_values[i]) - << ", *it is " << PrintValue(*it) - << ", and 'it' is an iterator created with the copy constructor.\n"; - ++it; - } - EXPECT_TRUE(it == generator.end()) - << "At the presumed end of sequence when accessing via an iterator " - << "created with the assignment operator.\n"; -} - -template -void VerifyGeneratorIsEmpty(const ParamGenerator& generator) { - typename ParamGenerator::iterator it = generator.begin(); - EXPECT_TRUE(it == generator.end()); - - it = generator.begin(); - EXPECT_TRUE(it == generator.end()); -} - -// Generator tests. They test that each of the provided generator functions -// generates an expected sequence of values. The general test pattern -// instantiates a generator using one of the generator functions, -// checks the sequence produced by the generator using its iterator API, -// and then resets the iterator back to the beginning of the sequence -// and checks the sequence again. - -// Tests that iterators produced by generator functions conform to the -// ForwardIterator concept. -TEST(IteratorTest, ParamIteratorConformsToForwardIteratorConcept) { - const ParamGenerator gen = Range(0, 10); - ParamGenerator::iterator it = gen.begin(); - - // Verifies that iterator initialization works as expected. - ParamGenerator::iterator it2 = it; - EXPECT_TRUE(*it == *it2) << "Initialized iterators must point to the " - << "element same as its source points to"; - - // Verifies that iterator assignment works as expected. - ++it; - EXPECT_FALSE(*it == *it2); - it2 = it; - EXPECT_TRUE(*it == *it2) << "Assigned iterators must point to the " - << "element same as its source points to"; - - // Verifies that prefix operator++() returns *this. - EXPECT_EQ(&it, &(++it)) << "Result of the prefix operator++ must be " - << "refer to the original object"; - - // Verifies that the result of the postfix operator++ points to the value - // pointed to by the original iterator. - int original_value = *it; // Have to compute it outside of macro call to be - // unaffected by the parameter evaluation order. - EXPECT_EQ(original_value, *(it++)); - - // Verifies that prefix and postfix operator++() advance an iterator - // all the same. - it2 = it; - ++it; - ++it2; - EXPECT_TRUE(*it == *it2); -} - -// Tests that Range() generates the expected sequence. -TEST(RangeTest, IntRangeWithDefaultStep) { - const ParamGenerator gen = Range(0, 3); - const int expected_values[] = {0, 1, 2}; - VerifyGenerator(gen, expected_values); -} - -// Edge case. Tests that Range() generates the single element sequence -// as expected when provided with range limits that are equal. -TEST(RangeTest, IntRangeSingleValue) { - const ParamGenerator gen = Range(0, 1); - const int expected_values[] = {0}; - VerifyGenerator(gen, expected_values); -} - -// Edge case. Tests that Range() with generates empty sequence when -// supplied with an empty range. -TEST(RangeTest, IntRangeEmpty) { - const ParamGenerator gen = Range(0, 0); - VerifyGeneratorIsEmpty(gen); -} - -// Tests that Range() with custom step (greater then one) generates -// the expected sequence. -TEST(RangeTest, IntRangeWithCustomStep) { - const ParamGenerator gen = Range(0, 9, 3); - const int expected_values[] = {0, 3, 6}; - VerifyGenerator(gen, expected_values); -} - -// Tests that Range() with custom step (greater then one) generates -// the expected sequence when the last element does not fall on the -// upper range limit. Sequences generated by Range() must not have -// elements beyond the range limits. -TEST(RangeTest, IntRangeWithCustomStepOverUpperBound) { - const ParamGenerator gen = Range(0, 4, 3); - const int expected_values[] = {0, 3}; - VerifyGenerator(gen, expected_values); -} - -// Verifies that Range works with user-defined types that define -// copy constructor, operator=(), operator+(), and operator<(). -class DogAdder { - public: - explicit DogAdder(const char* a_value) : value_(a_value) {} - DogAdder(const DogAdder& other) : value_(other.value_.c_str()) {} - - DogAdder operator=(const DogAdder& other) { - if (this != &other) - value_ = other.value_; - return *this; - } - DogAdder operator+(const DogAdder& other) const { - Message msg; - msg << value_.c_str() << other.value_.c_str(); - return DogAdder(msg.GetString().c_str()); - } - bool operator<(const DogAdder& other) const { - return value_ < other.value_; - } - const std::string& value() const { return value_; } - - private: - std::string value_; -}; - -TEST(RangeTest, WorksWithACustomType) { - const ParamGenerator gen = - Range(DogAdder("cat"), DogAdder("catdogdog"), DogAdder("dog")); - ParamGenerator::iterator it = gen.begin(); - - ASSERT_FALSE(it == gen.end()); - EXPECT_STREQ("cat", it->value().c_str()); - - ASSERT_FALSE(++it == gen.end()); - EXPECT_STREQ("catdog", it->value().c_str()); - - EXPECT_TRUE(++it == gen.end()); -} - -class IntWrapper { - public: - explicit IntWrapper(int a_value) : value_(a_value) {} - IntWrapper(const IntWrapper& other) : value_(other.value_) {} - - IntWrapper operator=(const IntWrapper& other) { - value_ = other.value_; - return *this; - } - // operator+() adds a different type. - IntWrapper operator+(int other) const { return IntWrapper(value_ + other); } - bool operator<(const IntWrapper& other) const { - return value_ < other.value_; - } - int value() const { return value_; } - - private: - int value_; -}; - -TEST(RangeTest, WorksWithACustomTypeWithDifferentIncrementType) { - const ParamGenerator gen = Range(IntWrapper(0), IntWrapper(2)); - ParamGenerator::iterator it = gen.begin(); - - ASSERT_FALSE(it == gen.end()); - EXPECT_EQ(0, it->value()); - - ASSERT_FALSE(++it == gen.end()); - EXPECT_EQ(1, it->value()); - - EXPECT_TRUE(++it == gen.end()); -} - -// Tests that ValuesIn() with an array parameter generates -// the expected sequence. -TEST(ValuesInTest, ValuesInArray) { - int array[] = {3, 5, 8}; - const ParamGenerator gen = ValuesIn(array); - VerifyGenerator(gen, array); -} - -// Tests that ValuesIn() with a const array parameter generates -// the expected sequence. -TEST(ValuesInTest, ValuesInConstArray) { - const int array[] = {3, 5, 8}; - const ParamGenerator gen = ValuesIn(array); - VerifyGenerator(gen, array); -} - -// Edge case. Tests that ValuesIn() with an array parameter containing a -// single element generates the single element sequence. -TEST(ValuesInTest, ValuesInSingleElementArray) { - int array[] = {42}; - const ParamGenerator gen = ValuesIn(array); - VerifyGenerator(gen, array); -} - -// Tests that ValuesIn() generates the expected sequence for an STL -// container (vector). -TEST(ValuesInTest, ValuesInVector) { - typedef ::std::vector ContainerType; - ContainerType values; - values.push_back(3); - values.push_back(5); - values.push_back(8); - const ParamGenerator gen = ValuesIn(values); - - const int expected_values[] = {3, 5, 8}; - VerifyGenerator(gen, expected_values); -} - -// Tests that ValuesIn() generates the expected sequence. -TEST(ValuesInTest, ValuesInIteratorRange) { - typedef ::std::vector ContainerType; - ContainerType values; - values.push_back(3); - values.push_back(5); - values.push_back(8); - const ParamGenerator gen = ValuesIn(values.begin(), values.end()); - - const int expected_values[] = {3, 5, 8}; - VerifyGenerator(gen, expected_values); -} - -// Edge case. Tests that ValuesIn() provided with an iterator range specifying a -// single value generates a single-element sequence. -TEST(ValuesInTest, ValuesInSingleElementIteratorRange) { - typedef ::std::vector ContainerType; - ContainerType values; - values.push_back(42); - const ParamGenerator gen = ValuesIn(values.begin(), values.end()); - - const int expected_values[] = {42}; - VerifyGenerator(gen, expected_values); -} - -// Edge case. Tests that ValuesIn() provided with an empty iterator range -// generates an empty sequence. -TEST(ValuesInTest, ValuesInEmptyIteratorRange) { - typedef ::std::vector ContainerType; - ContainerType values; - const ParamGenerator gen = ValuesIn(values.begin(), values.end()); - - VerifyGeneratorIsEmpty(gen); -} - -// Tests that the Values() generates the expected sequence. -TEST(ValuesTest, ValuesWorks) { - const ParamGenerator gen = Values(3, 5, 8); - - const int expected_values[] = {3, 5, 8}; - VerifyGenerator(gen, expected_values); -} - -// Tests that Values() generates the expected sequences from elements of -// different types convertible to ParamGenerator's parameter type. -TEST(ValuesTest, ValuesWorksForValuesOfCompatibleTypes) { - const ParamGenerator gen = Values(3, 5.0f, 8.0); - - const double expected_values[] = {3.0, 5.0, 8.0}; - VerifyGenerator(gen, expected_values); -} - -TEST(ValuesTest, ValuesWorksForMaxLengthList) { - const ParamGenerator gen = Values( - 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, - 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, - 210, 220, 230, 240, 250, 260, 270, 280, 290, 300, - 310, 320, 330, 340, 350, 360, 370, 380, 390, 400, - 410, 420, 430, 440, 450, 460, 470, 480, 490, 500); - - const int expected_values[] = { - 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, - 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, - 210, 220, 230, 240, 250, 260, 270, 280, 290, 300, - 310, 320, 330, 340, 350, 360, 370, 380, 390, 400, - 410, 420, 430, 440, 450, 460, 470, 480, 490, 500}; - VerifyGenerator(gen, expected_values); -} - -// Edge case test. Tests that single-parameter Values() generates the sequence -// with the single value. -TEST(ValuesTest, ValuesWithSingleParameter) { - const ParamGenerator gen = Values(42); - - const int expected_values[] = {42}; - VerifyGenerator(gen, expected_values); -} - -// Tests that Bool() generates sequence (false, true). -TEST(BoolTest, BoolWorks) { - const ParamGenerator gen = Bool(); - - const bool expected_values[] = {false, true}; - VerifyGenerator(gen, expected_values); -} - -# if GTEST_HAS_COMBINE - -// Tests that Combine() with two parameters generates the expected sequence. -TEST(CombineTest, CombineWithTwoParameters) { - const char* foo = "foo"; - const char* bar = "bar"; - const ParamGenerator > gen = - Combine(Values(foo, bar), Values(3, 4)); - - tuple expected_values[] = { - make_tuple(foo, 3), make_tuple(foo, 4), - make_tuple(bar, 3), make_tuple(bar, 4)}; - VerifyGenerator(gen, expected_values); -} - -// Tests that Combine() with three parameters generates the expected sequence. -TEST(CombineTest, CombineWithThreeParameters) { - const ParamGenerator > gen = Combine(Values(0, 1), - Values(3, 4), - Values(5, 6)); - tuple expected_values[] = { - make_tuple(0, 3, 5), make_tuple(0, 3, 6), - make_tuple(0, 4, 5), make_tuple(0, 4, 6), - make_tuple(1, 3, 5), make_tuple(1, 3, 6), - make_tuple(1, 4, 5), make_tuple(1, 4, 6)}; - VerifyGenerator(gen, expected_values); -} - -// Tests that the Combine() with the first parameter generating a single value -// sequence generates a sequence with the number of elements equal to the -// number of elements in the sequence generated by the second parameter. -TEST(CombineTest, CombineWithFirstParameterSingleValue) { - const ParamGenerator > gen = Combine(Values(42), - Values(0, 1)); - - tuple expected_values[] = {make_tuple(42, 0), make_tuple(42, 1)}; - VerifyGenerator(gen, expected_values); -} - -// Tests that the Combine() with the second parameter generating a single value -// sequence generates a sequence with the number of elements equal to the -// number of elements in the sequence generated by the first parameter. -TEST(CombineTest, CombineWithSecondParameterSingleValue) { - const ParamGenerator > gen = Combine(Values(0, 1), - Values(42)); - - tuple expected_values[] = {make_tuple(0, 42), make_tuple(1, 42)}; - VerifyGenerator(gen, expected_values); -} - -// Tests that when the first parameter produces an empty sequence, -// Combine() produces an empty sequence, too. -TEST(CombineTest, CombineWithFirstParameterEmptyRange) { - const ParamGenerator > gen = Combine(Range(0, 0), - Values(0, 1)); - VerifyGeneratorIsEmpty(gen); -} - -// Tests that when the second parameter produces an empty sequence, -// Combine() produces an empty sequence, too. -TEST(CombineTest, CombineWithSecondParameterEmptyRange) { - const ParamGenerator > gen = Combine(Values(0, 1), - Range(1, 1)); - VerifyGeneratorIsEmpty(gen); -} - -// Edge case. Tests that combine works with the maximum number -// of parameters supported by Google Test (currently 10). -TEST(CombineTest, CombineWithMaxNumberOfParameters) { - const char* foo = "foo"; - const char* bar = "bar"; - const ParamGenerator > gen = Combine(Values(foo, bar), - Values(1), Values(2), - Values(3), Values(4), - Values(5), Values(6), - Values(7), Values(8), - Values(9)); - - tuple - expected_values[] = {make_tuple(foo, 1, 2, 3, 4, 5, 6, 7, 8, 9), - make_tuple(bar, 1, 2, 3, 4, 5, 6, 7, 8, 9)}; - VerifyGenerator(gen, expected_values); -} - -#if GTEST_LANG_CXX11 - -class NonDefaultConstructAssignString { - public: - NonDefaultConstructAssignString(const std::string& s) : str_(s) {} - - const std::string& str() const { return str_; } - - private: - std::string str_; - - // Not default constructible - NonDefaultConstructAssignString(); - // Not assignable - void operator=(const NonDefaultConstructAssignString&); -}; - -TEST(CombineTest, NonDefaultConstructAssign) { - const ParamGenerator > gen = - Combine(Values(0, 1), Values(NonDefaultConstructAssignString("A"), - NonDefaultConstructAssignString("B"))); - - ParamGenerator >::iterator it = - gen.begin(); - - EXPECT_EQ(0, std::get<0>(*it)); - EXPECT_EQ("A", std::get<1>(*it).str()); - ++it; - - EXPECT_EQ(0, std::get<0>(*it)); - EXPECT_EQ("B", std::get<1>(*it).str()); - ++it; - - EXPECT_EQ(1, std::get<0>(*it)); - EXPECT_EQ("A", std::get<1>(*it).str()); - ++it; - - EXPECT_EQ(1, std::get<0>(*it)); - EXPECT_EQ("B", std::get<1>(*it).str()); - ++it; - - EXPECT_TRUE(it == gen.end()); -} - -#endif // GTEST_LANG_CXX11 -# endif // GTEST_HAS_COMBINE - -// Tests that an generator produces correct sequence after being -// assigned from another generator. -TEST(ParamGeneratorTest, AssignmentWorks) { - ParamGenerator gen = Values(1, 2); - const ParamGenerator gen2 = Values(3, 4); - gen = gen2; - - const int expected_values[] = {3, 4}; - VerifyGenerator(gen, expected_values); -} - -// This test verifies that the tests are expanded and run as specified: -// one test per element from the sequence produced by the generator -// specified in INSTANTIATE_TEST_CASE_P. It also verifies that the test's -// fixture constructor, SetUp(), and TearDown() have run and have been -// supplied with the correct parameters. - -// The use of environment object allows detection of the case where no test -// case functionality is run at all. In this case TestCaseTearDown will not -// be able to detect missing tests, naturally. -template -class TestGenerationEnvironment : public ::testing::Environment { - public: - static TestGenerationEnvironment* Instance() { - static TestGenerationEnvironment* instance = new TestGenerationEnvironment; - return instance; - } - - void FixtureConstructorExecuted() { fixture_constructor_count_++; } - void SetUpExecuted() { set_up_count_++; } - void TearDownExecuted() { tear_down_count_++; } - void TestBodyExecuted() { test_body_count_++; } - - virtual void TearDown() { - // If all MultipleTestGenerationTest tests have been de-selected - // by the filter flag, the following checks make no sense. - bool perform_check = false; - - for (int i = 0; i < kExpectedCalls; ++i) { - Message msg; - msg << "TestsExpandedAndRun/" << i; - if (UnitTestOptions::FilterMatchesTest( - "TestExpansionModule/MultipleTestGenerationTest", - msg.GetString().c_str())) { - perform_check = true; - } - } - if (perform_check) { - EXPECT_EQ(kExpectedCalls, fixture_constructor_count_) - << "Fixture constructor of ParamTestGenerationTest test case " - << "has not been run as expected."; - EXPECT_EQ(kExpectedCalls, set_up_count_) - << "Fixture SetUp method of ParamTestGenerationTest test case " - << "has not been run as expected."; - EXPECT_EQ(kExpectedCalls, tear_down_count_) - << "Fixture TearDown method of ParamTestGenerationTest test case " - << "has not been run as expected."; - EXPECT_EQ(kExpectedCalls, test_body_count_) - << "Test in ParamTestGenerationTest test case " - << "has not been run as expected."; - } - } - - private: - TestGenerationEnvironment() : fixture_constructor_count_(0), set_up_count_(0), - tear_down_count_(0), test_body_count_(0) {} - - int fixture_constructor_count_; - int set_up_count_; - int tear_down_count_; - int test_body_count_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(TestGenerationEnvironment); -}; - -const int test_generation_params[] = {36, 42, 72}; - -class TestGenerationTest : public TestWithParam { - public: - enum { - PARAMETER_COUNT = - sizeof(test_generation_params)/sizeof(test_generation_params[0]) - }; - - typedef TestGenerationEnvironment Environment; - - TestGenerationTest() { - Environment::Instance()->FixtureConstructorExecuted(); - current_parameter_ = GetParam(); - } - virtual void SetUp() { - Environment::Instance()->SetUpExecuted(); - EXPECT_EQ(current_parameter_, GetParam()); - } - virtual void TearDown() { - Environment::Instance()->TearDownExecuted(); - EXPECT_EQ(current_parameter_, GetParam()); - } - - static void SetUpTestCase() { - bool all_tests_in_test_case_selected = true; - - for (int i = 0; i < PARAMETER_COUNT; ++i) { - Message test_name; - test_name << "TestsExpandedAndRun/" << i; - if ( !UnitTestOptions::FilterMatchesTest( - "TestExpansionModule/MultipleTestGenerationTest", - test_name.GetString())) { - all_tests_in_test_case_selected = false; - } - } - EXPECT_TRUE(all_tests_in_test_case_selected) - << "When running the TestGenerationTest test case all of its tests\n" - << "must be selected by the filter flag for the test case to pass.\n" - << "If not all of them are enabled, we can't reliably conclude\n" - << "that the correct number of tests have been generated."; - - collected_parameters_.clear(); - } - - static void TearDownTestCase() { - vector expected_values(test_generation_params, - test_generation_params + PARAMETER_COUNT); - // Test execution order is not guaranteed by Google Test, - // so the order of values in collected_parameters_ can be - // different and we have to sort to compare. - sort(expected_values.begin(), expected_values.end()); - sort(collected_parameters_.begin(), collected_parameters_.end()); - - EXPECT_TRUE(collected_parameters_ == expected_values); - } - - protected: - int current_parameter_; - static vector collected_parameters_; - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(TestGenerationTest); -}; -vector TestGenerationTest::collected_parameters_; - -TEST_P(TestGenerationTest, TestsExpandedAndRun) { - Environment::Instance()->TestBodyExecuted(); - EXPECT_EQ(current_parameter_, GetParam()); - collected_parameters_.push_back(GetParam()); -} -INSTANTIATE_TEST_CASE_P(TestExpansionModule, TestGenerationTest, - ValuesIn(test_generation_params)); - -// This test verifies that the element sequence (third parameter of -// INSTANTIATE_TEST_CASE_P) is evaluated in InitGoogleTest() and neither at -// the call site of INSTANTIATE_TEST_CASE_P nor in RUN_ALL_TESTS(). For -// that, we declare param_value_ to be a static member of -// GeneratorEvaluationTest and initialize it to 0. We set it to 1 in -// main(), just before invocation of InitGoogleTest(). After calling -// InitGoogleTest(), we set the value to 2. If the sequence is evaluated -// before or after InitGoogleTest, INSTANTIATE_TEST_CASE_P will create a -// test with parameter other than 1, and the test body will fail the -// assertion. -class GeneratorEvaluationTest : public TestWithParam { - public: - static int param_value() { return param_value_; } - static void set_param_value(int param_value) { param_value_ = param_value; } - - private: - static int param_value_; -}; -int GeneratorEvaluationTest::param_value_ = 0; - -TEST_P(GeneratorEvaluationTest, GeneratorsEvaluatedInMain) { - EXPECT_EQ(1, GetParam()); -} -INSTANTIATE_TEST_CASE_P(GenEvalModule, - GeneratorEvaluationTest, - Values(GeneratorEvaluationTest::param_value())); - -// Tests that generators defined in a different translation unit are -// functional. Generator extern_gen is defined in gtest-param-test_test2.cc. -extern ParamGenerator extern_gen; -class ExternalGeneratorTest : public TestWithParam {}; -TEST_P(ExternalGeneratorTest, ExternalGenerator) { - // Sequence produced by extern_gen contains only a single value - // which we verify here. - EXPECT_EQ(GetParam(), 33); -} -INSTANTIATE_TEST_CASE_P(ExternalGeneratorModule, - ExternalGeneratorTest, - extern_gen); - -// Tests that a parameterized test case can be defined in one translation -// unit and instantiated in another. This test will be instantiated in -// gtest-param-test_test2.cc. ExternalInstantiationTest fixture class is -// defined in gtest-param-test_test.h. -TEST_P(ExternalInstantiationTest, IsMultipleOf33) { - EXPECT_EQ(0, GetParam() % 33); -} - -// Tests that a parameterized test case can be instantiated with multiple -// generators. -class MultipleInstantiationTest : public TestWithParam {}; -TEST_P(MultipleInstantiationTest, AllowsMultipleInstances) { -} -INSTANTIATE_TEST_CASE_P(Sequence1, MultipleInstantiationTest, Values(1, 2)); -INSTANTIATE_TEST_CASE_P(Sequence2, MultipleInstantiationTest, Range(3, 5)); - -// Tests that a parameterized test case can be instantiated -// in multiple translation units. This test will be instantiated -// here and in gtest-param-test_test2.cc. -// InstantiationInMultipleTranslationUnitsTest fixture class -// is defined in gtest-param-test_test.h. -TEST_P(InstantiationInMultipleTranslaionUnitsTest, IsMultipleOf42) { - EXPECT_EQ(0, GetParam() % 42); -} -INSTANTIATE_TEST_CASE_P(Sequence1, - InstantiationInMultipleTranslaionUnitsTest, - Values(42, 42*2)); - -// Tests that each iteration of parameterized test runs in a separate test -// object. -class SeparateInstanceTest : public TestWithParam { - public: - SeparateInstanceTest() : count_(0) {} - - static void TearDownTestCase() { - EXPECT_GE(global_count_, 2) - << "If some (but not all) SeparateInstanceTest tests have been " - << "filtered out this test will fail. Make sure that all " - << "GeneratorEvaluationTest are selected or de-selected together " - << "by the test filter."; - } - - protected: - int count_; - static int global_count_; -}; -int SeparateInstanceTest::global_count_ = 0; - -TEST_P(SeparateInstanceTest, TestsRunInSeparateInstances) { - EXPECT_EQ(0, count_++); - global_count_++; -} -INSTANTIATE_TEST_CASE_P(FourElemSequence, SeparateInstanceTest, Range(1, 4)); - -// Tests that all instantiations of a test have named appropriately. Test -// defined with TEST_P(TestCaseName, TestName) and instantiated with -// INSTANTIATE_TEST_CASE_P(SequenceName, TestCaseName, generator) must be named -// SequenceName/TestCaseName.TestName/i, where i is the 0-based index of the -// sequence element used to instantiate the test. -class NamingTest : public TestWithParam {}; - -TEST_P(NamingTest, TestsReportCorrectNamesAndParameters) { - const ::testing::TestInfo* const test_info = - ::testing::UnitTest::GetInstance()->current_test_info(); - - EXPECT_STREQ("ZeroToFiveSequence/NamingTest", test_info->test_case_name()); - - Message index_stream; - index_stream << "TestsReportCorrectNamesAndParameters/" << GetParam(); - EXPECT_STREQ(index_stream.GetString().c_str(), test_info->name()); - - EXPECT_EQ(::testing::PrintToString(GetParam()), test_info->value_param()); -} - -INSTANTIATE_TEST_CASE_P(ZeroToFiveSequence, NamingTest, Range(0, 5)); - -// Tests that macros in test names are expanded correctly. -class MacroNamingTest : public TestWithParam {}; - -#define PREFIX_WITH_FOO(test_name) Foo##test_name -#define PREFIX_WITH_MACRO(test_name) Macro##test_name - -TEST_P(PREFIX_WITH_MACRO(NamingTest), PREFIX_WITH_FOO(SomeTestName)) { - const ::testing::TestInfo* const test_info = - ::testing::UnitTest::GetInstance()->current_test_info(); - - EXPECT_STREQ("FortyTwo/MacroNamingTest", test_info->test_case_name()); - EXPECT_STREQ("FooSomeTestName", test_info->name()); -} - -INSTANTIATE_TEST_CASE_P(FortyTwo, MacroNamingTest, Values(42)); - -// Tests the same thing for non-parametrized tests. -class MacroNamingTestNonParametrized : public ::testing::Test {}; - -TEST_F(PREFIX_WITH_MACRO(NamingTestNonParametrized), - PREFIX_WITH_FOO(SomeTestName)) { - const ::testing::TestInfo* const test_info = - ::testing::UnitTest::GetInstance()->current_test_info(); - - EXPECT_STREQ("MacroNamingTestNonParametrized", test_info->test_case_name()); - EXPECT_STREQ("FooSomeTestName", test_info->name()); -} - -// Tests that user supplied custom parameter names are working correctly. -// Runs the test with a builtin helper method which uses PrintToString, -// as well as a custom function and custom functor to ensure all possible -// uses work correctly. -class CustomFunctorNamingTest : public TestWithParam {}; -TEST_P(CustomFunctorNamingTest, CustomTestNames) {} - -struct CustomParamNameFunctor { - std::string operator()(const ::testing::TestParamInfo& inf) { - return inf.param; - } -}; - -INSTANTIATE_TEST_CASE_P(CustomParamNameFunctor, - CustomFunctorNamingTest, - Values(std::string("FunctorName")), - CustomParamNameFunctor()); - -INSTANTIATE_TEST_CASE_P(AllAllowedCharacters, - CustomFunctorNamingTest, - Values("abcdefghijklmnopqrstuvwxyz", - "ABCDEFGHIJKLMNOPQRSTUVWXYZ", - "01234567890_"), - CustomParamNameFunctor()); - -inline std::string CustomParamNameFunction( - const ::testing::TestParamInfo& inf) { - return inf.param; -} - -class CustomFunctionNamingTest : public TestWithParam {}; -TEST_P(CustomFunctionNamingTest, CustomTestNames) {} - -INSTANTIATE_TEST_CASE_P(CustomParamNameFunction, - CustomFunctionNamingTest, - Values(std::string("FunctionName")), - CustomParamNameFunction); - -#if GTEST_LANG_CXX11 - -// Test custom naming with a lambda - -class CustomLambdaNamingTest : public TestWithParam {}; -TEST_P(CustomLambdaNamingTest, CustomTestNames) {} - -INSTANTIATE_TEST_CASE_P(CustomParamNameLambda, CustomLambdaNamingTest, - Values(std::string("LambdaName")), - [](const ::testing::TestParamInfo& inf) { - return inf.param; - }); - -#endif // GTEST_LANG_CXX11 - -TEST(CustomNamingTest, CheckNameRegistry) { - ::testing::UnitTest* unit_test = ::testing::UnitTest::GetInstance(); - std::set test_names; - for (int case_num = 0; - case_num < unit_test->total_test_case_count(); - ++case_num) { - const ::testing::TestCase* test_case = unit_test->GetTestCase(case_num); - for (int test_num = 0; - test_num < test_case->total_test_count(); - ++test_num) { - const ::testing::TestInfo* test_info = test_case->GetTestInfo(test_num); - test_names.insert(std::string(test_info->name())); - } - } - EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctorName")); - EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctionName")); -#if GTEST_LANG_CXX11 - EXPECT_EQ(1u, test_names.count("CustomTestNames/LambdaName")); -#endif // GTEST_LANG_CXX11 -} - -// Test a numeric name to ensure PrintToStringParamName works correctly. - -class CustomIntegerNamingTest : public TestWithParam {}; - -TEST_P(CustomIntegerNamingTest, TestsReportCorrectNames) { - const ::testing::TestInfo* const test_info = - ::testing::UnitTest::GetInstance()->current_test_info(); - Message test_name_stream; - test_name_stream << "TestsReportCorrectNames/" << GetParam(); - EXPECT_STREQ(test_name_stream.GetString().c_str(), test_info->name()); -} - -INSTANTIATE_TEST_CASE_P(PrintToString, - CustomIntegerNamingTest, - Range(0, 5), - ::testing::PrintToStringParamName()); - -// Test a custom struct with PrintToString. - -struct CustomStruct { - explicit CustomStruct(int value) : x(value) {} - int x; -}; - -std::ostream& operator<<(std::ostream& stream, const CustomStruct& val) { - stream << val.x; - return stream; -} - -class CustomStructNamingTest : public TestWithParam {}; - -TEST_P(CustomStructNamingTest, TestsReportCorrectNames) { - const ::testing::TestInfo* const test_info = - ::testing::UnitTest::GetInstance()->current_test_info(); - Message test_name_stream; - test_name_stream << "TestsReportCorrectNames/" << GetParam(); - EXPECT_STREQ(test_name_stream.GetString().c_str(), test_info->name()); -} - -INSTANTIATE_TEST_CASE_P(PrintToString, - CustomStructNamingTest, - Values(CustomStruct(0), CustomStruct(1)), - ::testing::PrintToStringParamName()); - -// Test that using a stateful parameter naming function works as expected. - -struct StatefulNamingFunctor { - StatefulNamingFunctor() : sum(0) {} - std::string operator()(const ::testing::TestParamInfo& info) { - int value = info.param + sum; - sum += info.param; - return ::testing::PrintToString(value); - } - int sum; -}; - -class StatefulNamingTest : public ::testing::TestWithParam { - protected: - StatefulNamingTest() : sum_(0) {} - int sum_; -}; - -TEST_P(StatefulNamingTest, TestsReportCorrectNames) { - const ::testing::TestInfo* const test_info = - ::testing::UnitTest::GetInstance()->current_test_info(); - sum_ += GetParam(); - Message test_name_stream; - test_name_stream << "TestsReportCorrectNames/" << sum_; - EXPECT_STREQ(test_name_stream.GetString().c_str(), test_info->name()); -} - -INSTANTIATE_TEST_CASE_P(StatefulNamingFunctor, - StatefulNamingTest, - Range(0, 5), - StatefulNamingFunctor()); - -// Class that cannot be streamed into an ostream. It needs to be copyable -// (and, in case of MSVC, also assignable) in order to be a test parameter -// type. Its default copy constructor and assignment operator do exactly -// what we need. -class Unstreamable { - public: - explicit Unstreamable(int value) : value_(value) {} - - private: - int value_; -}; - -class CommentTest : public TestWithParam {}; - -TEST_P(CommentTest, TestsCorrectlyReportUnstreamableParams) { - const ::testing::TestInfo* const test_info = - ::testing::UnitTest::GetInstance()->current_test_info(); - - EXPECT_EQ(::testing::PrintToString(GetParam()), test_info->value_param()); -} - -INSTANTIATE_TEST_CASE_P(InstantiationWithComments, - CommentTest, - Values(Unstreamable(1))); - -// Verify that we can create a hierarchy of test fixtures, where the base -// class fixture is not parameterized and the derived class is. In this case -// ParameterizedDerivedTest inherits from NonParameterizedBaseTest. We -// perform simple tests on both. -class NonParameterizedBaseTest : public ::testing::Test { - public: - NonParameterizedBaseTest() : n_(17) { } - protected: - int n_; -}; - -class ParameterizedDerivedTest : public NonParameterizedBaseTest, - public ::testing::WithParamInterface { - protected: - ParameterizedDerivedTest() : count_(0) { } - int count_; - static int global_count_; -}; - -int ParameterizedDerivedTest::global_count_ = 0; - -TEST_F(NonParameterizedBaseTest, FixtureIsInitialized) { - EXPECT_EQ(17, n_); -} - -TEST_P(ParameterizedDerivedTest, SeesSequence) { - EXPECT_EQ(17, n_); - EXPECT_EQ(0, count_++); - EXPECT_EQ(GetParam(), global_count_++); -} - -class ParameterizedDeathTest : public ::testing::TestWithParam { }; - -TEST_F(ParameterizedDeathTest, GetParamDiesFromTestF) { - EXPECT_DEATH_IF_SUPPORTED(GetParam(), - ".* value-parameterized test .*"); -} - -INSTANTIATE_TEST_CASE_P(RangeZeroToFive, ParameterizedDerivedTest, Range(0, 5)); - - -int main(int argc, char **argv) { - // Used in TestGenerationTest test case. - AddGlobalTestEnvironment(TestGenerationTest::Environment::Instance()); - // Used in GeneratorEvaluationTest test case. Tests that the updated value - // will be picked up for instantiating tests in GeneratorEvaluationTest. - GeneratorEvaluationTest::set_param_value(1); - - ::testing::InitGoogleTest(&argc, argv); - - // Used in GeneratorEvaluationTest test case. Tests that value updated - // here will NOT be used for instantiating tests in - // GeneratorEvaluationTest. - GeneratorEvaluationTest::set_param_value(2); - - return RUN_ALL_TESTS(); -} diff --git a/test/gtest-1.8.0/test/gtest-param-test_test.h b/test/gtest-1.8.0/test/gtest-param-test_test.h deleted file mode 100644 index ea1e884f7c..0000000000 --- a/test/gtest-1.8.0/test/gtest-param-test_test.h +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: vladl@google.com (Vlad Losev) -// -// The Google C++ Testing and Mocking Framework (Google Test) -// -// This header file provides classes and functions used internally -// for testing Google Test itself. - -#ifndef GTEST_TEST_GTEST_PARAM_TEST_TEST_H_ -#define GTEST_TEST_GTEST_PARAM_TEST_TEST_H_ - -#include "gtest/gtest.h" - -// Test fixture for testing definition and instantiation of a test -// in separate translation units. -class ExternalInstantiationTest : public ::testing::TestWithParam { -}; - -// Test fixture for testing instantiation of a test in multiple -// translation units. -class InstantiationInMultipleTranslaionUnitsTest - : public ::testing::TestWithParam { -}; - -#endif // GTEST_TEST_GTEST_PARAM_TEST_TEST_H_ diff --git a/test/gtest-1.8.0/test/gtest-port_test.cc b/test/gtest-1.8.0/test/gtest-port_test.cc deleted file mode 100644 index 3801e5ee3c..0000000000 --- a/test/gtest-1.8.0/test/gtest-port_test.cc +++ /dev/null @@ -1,1303 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: vladl@google.com (Vlad Losev), wan@google.com (Zhanyong Wan) -// -// This file tests the internal cross-platform support utilities. - -#include "gtest/internal/gtest-port.h" - -#include - -#if GTEST_OS_MAC -# include -#endif // GTEST_OS_MAC - -#include -#include // For std::pair and std::make_pair. -#include - -#include "gtest/gtest.h" -#include "gtest/gtest-spi.h" -#include "src/gtest-internal-inl.h" - -using std::make_pair; -using std::pair; - -namespace testing { -namespace internal { - -TEST(IsXDigitTest, WorksForNarrowAscii) { - EXPECT_TRUE(IsXDigit('0')); - EXPECT_TRUE(IsXDigit('9')); - EXPECT_TRUE(IsXDigit('A')); - EXPECT_TRUE(IsXDigit('F')); - EXPECT_TRUE(IsXDigit('a')); - EXPECT_TRUE(IsXDigit('f')); - - EXPECT_FALSE(IsXDigit('-')); - EXPECT_FALSE(IsXDigit('g')); - EXPECT_FALSE(IsXDigit('G')); -} - -TEST(IsXDigitTest, ReturnsFalseForNarrowNonAscii) { - EXPECT_FALSE(IsXDigit(static_cast('\x80'))); - EXPECT_FALSE(IsXDigit(static_cast('0' | '\x80'))); -} - -TEST(IsXDigitTest, WorksForWideAscii) { - EXPECT_TRUE(IsXDigit(L'0')); - EXPECT_TRUE(IsXDigit(L'9')); - EXPECT_TRUE(IsXDigit(L'A')); - EXPECT_TRUE(IsXDigit(L'F')); - EXPECT_TRUE(IsXDigit(L'a')); - EXPECT_TRUE(IsXDigit(L'f')); - - EXPECT_FALSE(IsXDigit(L'-')); - EXPECT_FALSE(IsXDigit(L'g')); - EXPECT_FALSE(IsXDigit(L'G')); -} - -TEST(IsXDigitTest, ReturnsFalseForWideNonAscii) { - EXPECT_FALSE(IsXDigit(static_cast(0x80))); - EXPECT_FALSE(IsXDigit(static_cast(L'0' | 0x80))); - EXPECT_FALSE(IsXDigit(static_cast(L'0' | 0x100))); -} - -class Base { - public: - // Copy constructor and assignment operator do exactly what we need, so we - // use them. - Base() : member_(0) {} - explicit Base(int n) : member_(n) {} - virtual ~Base() {} - int member() { return member_; } - - private: - int member_; -}; - -class Derived : public Base { - public: - explicit Derived(int n) : Base(n) {} -}; - -TEST(ImplicitCastTest, ConvertsPointers) { - Derived derived(0); - EXPECT_TRUE(&derived == ::testing::internal::ImplicitCast_(&derived)); -} - -TEST(ImplicitCastTest, CanUseInheritance) { - Derived derived(1); - Base base = ::testing::internal::ImplicitCast_(derived); - EXPECT_EQ(derived.member(), base.member()); -} - -class Castable { - public: - explicit Castable(bool* converted) : converted_(converted) {} - operator Base() { - *converted_ = true; - return Base(); - } - - private: - bool* converted_; -}; - -TEST(ImplicitCastTest, CanUseNonConstCastOperator) { - bool converted = false; - Castable castable(&converted); - Base base = ::testing::internal::ImplicitCast_(castable); - EXPECT_TRUE(converted); -} - -class ConstCastable { - public: - explicit ConstCastable(bool* converted) : converted_(converted) {} - operator Base() const { - *converted_ = true; - return Base(); - } - - private: - bool* converted_; -}; - -TEST(ImplicitCastTest, CanUseConstCastOperatorOnConstValues) { - bool converted = false; - const ConstCastable const_castable(&converted); - Base base = ::testing::internal::ImplicitCast_(const_castable); - EXPECT_TRUE(converted); -} - -class ConstAndNonConstCastable { - public: - ConstAndNonConstCastable(bool* converted, bool* const_converted) - : converted_(converted), const_converted_(const_converted) {} - operator Base() { - *converted_ = true; - return Base(); - } - operator Base() const { - *const_converted_ = true; - return Base(); - } - - private: - bool* converted_; - bool* const_converted_; -}; - -TEST(ImplicitCastTest, CanSelectBetweenConstAndNonConstCasrAppropriately) { - bool converted = false; - bool const_converted = false; - ConstAndNonConstCastable castable(&converted, &const_converted); - Base base = ::testing::internal::ImplicitCast_(castable); - EXPECT_TRUE(converted); - EXPECT_FALSE(const_converted); - - converted = false; - const_converted = false; - const ConstAndNonConstCastable const_castable(&converted, &const_converted); - base = ::testing::internal::ImplicitCast_(const_castable); - EXPECT_FALSE(converted); - EXPECT_TRUE(const_converted); -} - -class To { - public: - To(bool* converted) { *converted = true; } // NOLINT -}; - -TEST(ImplicitCastTest, CanUseImplicitConstructor) { - bool converted = false; - To to = ::testing::internal::ImplicitCast_(&converted); - (void)to; - EXPECT_TRUE(converted); -} - -TEST(IteratorTraitsTest, WorksForSTLContainerIterators) { - StaticAssertTypeEq::const_iterator>::value_type>(); - StaticAssertTypeEq::iterator>::value_type>(); -} - -TEST(IteratorTraitsTest, WorksForPointerToNonConst) { - StaticAssertTypeEq::value_type>(); - StaticAssertTypeEq::value_type>(); -} - -TEST(IteratorTraitsTest, WorksForPointerToConst) { - StaticAssertTypeEq::value_type>(); - StaticAssertTypeEq::value_type>(); -} - -// Tests that the element_type typedef is available in scoped_ptr and refers -// to the parameter type. -TEST(ScopedPtrTest, DefinesElementType) { - StaticAssertTypeEq::element_type>(); -} - -// TODO(vladl@google.com): Implement THE REST of scoped_ptr tests. - -TEST(GtestCheckSyntaxTest, BehavesLikeASingleStatement) { - if (AlwaysFalse()) - GTEST_CHECK_(false) << "This should never be executed; " - "It's a compilation test only."; - - if (AlwaysTrue()) - GTEST_CHECK_(true); - else - ; // NOLINT - - if (AlwaysFalse()) - ; // NOLINT - else - GTEST_CHECK_(true) << ""; -} - -TEST(GtestCheckSyntaxTest, WorksWithSwitch) { - switch (0) { - case 1: - break; - default: - GTEST_CHECK_(true); - } - - switch (0) - case 0: - GTEST_CHECK_(true) << "Check failed in switch case"; -} - -// Verifies behavior of FormatFileLocation. -TEST(FormatFileLocationTest, FormatsFileLocation) { - EXPECT_PRED_FORMAT2(IsSubstring, "foo.cc", FormatFileLocation("foo.cc", 42)); - EXPECT_PRED_FORMAT2(IsSubstring, "42", FormatFileLocation("foo.cc", 42)); -} - -TEST(FormatFileLocationTest, FormatsUnknownFile) { - EXPECT_PRED_FORMAT2( - IsSubstring, "unknown file", FormatFileLocation(NULL, 42)); - EXPECT_PRED_FORMAT2(IsSubstring, "42", FormatFileLocation(NULL, 42)); -} - -TEST(FormatFileLocationTest, FormatsUknownLine) { - EXPECT_EQ("foo.cc:", FormatFileLocation("foo.cc", -1)); -} - -TEST(FormatFileLocationTest, FormatsUknownFileAndLine) { - EXPECT_EQ("unknown file:", FormatFileLocation(NULL, -1)); -} - -// Verifies behavior of FormatCompilerIndependentFileLocation. -TEST(FormatCompilerIndependentFileLocationTest, FormatsFileLocation) { - EXPECT_EQ("foo.cc:42", FormatCompilerIndependentFileLocation("foo.cc", 42)); -} - -TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownFile) { - EXPECT_EQ("unknown file:42", - FormatCompilerIndependentFileLocation(NULL, 42)); -} - -TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownLine) { - EXPECT_EQ("foo.cc", FormatCompilerIndependentFileLocation("foo.cc", -1)); -} - -TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownFileAndLine) { - EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1)); -} - -#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA -void* ThreadFunc(void* data) { - internal::Mutex* mutex = static_cast(data); - mutex->Lock(); - mutex->Unlock(); - return NULL; -} - -TEST(GetThreadCountTest, ReturnsCorrectValue) { - const size_t starting_count = GetThreadCount(); - pthread_t thread_id; - - internal::Mutex mutex; - { - internal::MutexLock lock(&mutex); - pthread_attr_t attr; - ASSERT_EQ(0, pthread_attr_init(&attr)); - ASSERT_EQ(0, pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE)); - - const int status = pthread_create(&thread_id, &attr, &ThreadFunc, &mutex); - ASSERT_EQ(0, pthread_attr_destroy(&attr)); - ASSERT_EQ(0, status); - EXPECT_EQ(starting_count + 1, GetThreadCount()); - } - - void* dummy; - ASSERT_EQ(0, pthread_join(thread_id, &dummy)); - - // The OS may not immediately report the updated thread count after - // joining a thread, causing flakiness in this test. To counter that, we - // wait for up to .5 seconds for the OS to report the correct value. - for (int i = 0; i < 5; ++i) { - if (GetThreadCount() == starting_count) - break; - - SleepMilliseconds(100); - } - - EXPECT_EQ(starting_count, GetThreadCount()); -} -#else -TEST(GetThreadCountTest, ReturnsZeroWhenUnableToCountThreads) { - EXPECT_EQ(0U, GetThreadCount()); -} -#endif // GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA - -TEST(GtestCheckDeathTest, DiesWithCorrectOutputOnFailure) { - const bool a_false_condition = false; - const char regex[] = -#ifdef _MSC_VER - "gtest-port_test\\.cc\\(\\d+\\):" -#elif GTEST_USES_POSIX_RE - "gtest-port_test\\.cc:[0-9]+" -#else - "gtest-port_test\\.cc:\\d+" -#endif // _MSC_VER - ".*a_false_condition.*Extra info.*"; - - EXPECT_DEATH_IF_SUPPORTED(GTEST_CHECK_(a_false_condition) << "Extra info", - regex); -} - -#if GTEST_HAS_DEATH_TEST - -TEST(GtestCheckDeathTest, LivesSilentlyOnSuccess) { - EXPECT_EXIT({ - GTEST_CHECK_(true) << "Extra info"; - ::std::cerr << "Success\n"; - exit(0); }, - ::testing::ExitedWithCode(0), "Success"); -} - -#endif // GTEST_HAS_DEATH_TEST - -// Verifies that Google Test choose regular expression engine appropriate to -// the platform. The test will produce compiler errors in case of failure. -// For simplicity, we only cover the most important platforms here. -TEST(RegexEngineSelectionTest, SelectsCorrectRegexEngine) { -#if !GTEST_USES_PCRE -# if GTEST_HAS_POSIX_RE - - EXPECT_TRUE(GTEST_USES_POSIX_RE); - -# else - - EXPECT_TRUE(GTEST_USES_SIMPLE_RE); - -# endif -#endif // !GTEST_USES_PCRE -} - -#if GTEST_USES_POSIX_RE - -# if GTEST_HAS_TYPED_TEST - -template -class RETest : public ::testing::Test {}; - -// Defines StringTypes as the list of all string types that class RE -// supports. -typedef testing::Types< - ::std::string, -# if GTEST_HAS_GLOBAL_STRING - ::string, -# endif // GTEST_HAS_GLOBAL_STRING - const char*> StringTypes; - -TYPED_TEST_CASE(RETest, StringTypes); - -// Tests RE's implicit constructors. -TYPED_TEST(RETest, ImplicitConstructorWorks) { - const RE empty(TypeParam("")); - EXPECT_STREQ("", empty.pattern()); - - const RE simple(TypeParam("hello")); - EXPECT_STREQ("hello", simple.pattern()); - - const RE normal(TypeParam(".*(\\w+)")); - EXPECT_STREQ(".*(\\w+)", normal.pattern()); -} - -// Tests that RE's constructors reject invalid regular expressions. -TYPED_TEST(RETest, RejectsInvalidRegex) { - EXPECT_NONFATAL_FAILURE({ - const RE invalid(TypeParam("?")); - }, "\"?\" is not a valid POSIX Extended regular expression."); -} - -// Tests RE::FullMatch(). -TYPED_TEST(RETest, FullMatchWorks) { - const RE empty(TypeParam("")); - EXPECT_TRUE(RE::FullMatch(TypeParam(""), empty)); - EXPECT_FALSE(RE::FullMatch(TypeParam("a"), empty)); - - const RE re(TypeParam("a.*z")); - EXPECT_TRUE(RE::FullMatch(TypeParam("az"), re)); - EXPECT_TRUE(RE::FullMatch(TypeParam("axyz"), re)); - EXPECT_FALSE(RE::FullMatch(TypeParam("baz"), re)); - EXPECT_FALSE(RE::FullMatch(TypeParam("azy"), re)); -} - -// Tests RE::PartialMatch(). -TYPED_TEST(RETest, PartialMatchWorks) { - const RE empty(TypeParam("")); - EXPECT_TRUE(RE::PartialMatch(TypeParam(""), empty)); - EXPECT_TRUE(RE::PartialMatch(TypeParam("a"), empty)); - - const RE re(TypeParam("a.*z")); - EXPECT_TRUE(RE::PartialMatch(TypeParam("az"), re)); - EXPECT_TRUE(RE::PartialMatch(TypeParam("axyz"), re)); - EXPECT_TRUE(RE::PartialMatch(TypeParam("baz"), re)); - EXPECT_TRUE(RE::PartialMatch(TypeParam("azy"), re)); - EXPECT_FALSE(RE::PartialMatch(TypeParam("zza"), re)); -} - -# endif // GTEST_HAS_TYPED_TEST - -#elif GTEST_USES_SIMPLE_RE - -TEST(IsInSetTest, NulCharIsNotInAnySet) { - EXPECT_FALSE(IsInSet('\0', "")); - EXPECT_FALSE(IsInSet('\0', "\0")); - EXPECT_FALSE(IsInSet('\0', "a")); -} - -TEST(IsInSetTest, WorksForNonNulChars) { - EXPECT_FALSE(IsInSet('a', "Ab")); - EXPECT_FALSE(IsInSet('c', "")); - - EXPECT_TRUE(IsInSet('b', "bcd")); - EXPECT_TRUE(IsInSet('b', "ab")); -} - -TEST(IsAsciiDigitTest, IsFalseForNonDigit) { - EXPECT_FALSE(IsAsciiDigit('\0')); - EXPECT_FALSE(IsAsciiDigit(' ')); - EXPECT_FALSE(IsAsciiDigit('+')); - EXPECT_FALSE(IsAsciiDigit('-')); - EXPECT_FALSE(IsAsciiDigit('.')); - EXPECT_FALSE(IsAsciiDigit('a')); -} - -TEST(IsAsciiDigitTest, IsTrueForDigit) { - EXPECT_TRUE(IsAsciiDigit('0')); - EXPECT_TRUE(IsAsciiDigit('1')); - EXPECT_TRUE(IsAsciiDigit('5')); - EXPECT_TRUE(IsAsciiDigit('9')); -} - -TEST(IsAsciiPunctTest, IsFalseForNonPunct) { - EXPECT_FALSE(IsAsciiPunct('\0')); - EXPECT_FALSE(IsAsciiPunct(' ')); - EXPECT_FALSE(IsAsciiPunct('\n')); - EXPECT_FALSE(IsAsciiPunct('a')); - EXPECT_FALSE(IsAsciiPunct('0')); -} - -TEST(IsAsciiPunctTest, IsTrueForPunct) { - for (const char* p = "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~"; *p; p++) { - EXPECT_PRED1(IsAsciiPunct, *p); - } -} - -TEST(IsRepeatTest, IsFalseForNonRepeatChar) { - EXPECT_FALSE(IsRepeat('\0')); - EXPECT_FALSE(IsRepeat(' ')); - EXPECT_FALSE(IsRepeat('a')); - EXPECT_FALSE(IsRepeat('1')); - EXPECT_FALSE(IsRepeat('-')); -} - -TEST(IsRepeatTest, IsTrueForRepeatChar) { - EXPECT_TRUE(IsRepeat('?')); - EXPECT_TRUE(IsRepeat('*')); - EXPECT_TRUE(IsRepeat('+')); -} - -TEST(IsAsciiWhiteSpaceTest, IsFalseForNonWhiteSpace) { - EXPECT_FALSE(IsAsciiWhiteSpace('\0')); - EXPECT_FALSE(IsAsciiWhiteSpace('a')); - EXPECT_FALSE(IsAsciiWhiteSpace('1')); - EXPECT_FALSE(IsAsciiWhiteSpace('+')); - EXPECT_FALSE(IsAsciiWhiteSpace('_')); -} - -TEST(IsAsciiWhiteSpaceTest, IsTrueForWhiteSpace) { - EXPECT_TRUE(IsAsciiWhiteSpace(' ')); - EXPECT_TRUE(IsAsciiWhiteSpace('\n')); - EXPECT_TRUE(IsAsciiWhiteSpace('\r')); - EXPECT_TRUE(IsAsciiWhiteSpace('\t')); - EXPECT_TRUE(IsAsciiWhiteSpace('\v')); - EXPECT_TRUE(IsAsciiWhiteSpace('\f')); -} - -TEST(IsAsciiWordCharTest, IsFalseForNonWordChar) { - EXPECT_FALSE(IsAsciiWordChar('\0')); - EXPECT_FALSE(IsAsciiWordChar('+')); - EXPECT_FALSE(IsAsciiWordChar('.')); - EXPECT_FALSE(IsAsciiWordChar(' ')); - EXPECT_FALSE(IsAsciiWordChar('\n')); -} - -TEST(IsAsciiWordCharTest, IsTrueForLetter) { - EXPECT_TRUE(IsAsciiWordChar('a')); - EXPECT_TRUE(IsAsciiWordChar('b')); - EXPECT_TRUE(IsAsciiWordChar('A')); - EXPECT_TRUE(IsAsciiWordChar('Z')); -} - -TEST(IsAsciiWordCharTest, IsTrueForDigit) { - EXPECT_TRUE(IsAsciiWordChar('0')); - EXPECT_TRUE(IsAsciiWordChar('1')); - EXPECT_TRUE(IsAsciiWordChar('7')); - EXPECT_TRUE(IsAsciiWordChar('9')); -} - -TEST(IsAsciiWordCharTest, IsTrueForUnderscore) { - EXPECT_TRUE(IsAsciiWordChar('_')); -} - -TEST(IsValidEscapeTest, IsFalseForNonPrintable) { - EXPECT_FALSE(IsValidEscape('\0')); - EXPECT_FALSE(IsValidEscape('\007')); -} - -TEST(IsValidEscapeTest, IsFalseForDigit) { - EXPECT_FALSE(IsValidEscape('0')); - EXPECT_FALSE(IsValidEscape('9')); -} - -TEST(IsValidEscapeTest, IsFalseForWhiteSpace) { - EXPECT_FALSE(IsValidEscape(' ')); - EXPECT_FALSE(IsValidEscape('\n')); -} - -TEST(IsValidEscapeTest, IsFalseForSomeLetter) { - EXPECT_FALSE(IsValidEscape('a')); - EXPECT_FALSE(IsValidEscape('Z')); -} - -TEST(IsValidEscapeTest, IsTrueForPunct) { - EXPECT_TRUE(IsValidEscape('.')); - EXPECT_TRUE(IsValidEscape('-')); - EXPECT_TRUE(IsValidEscape('^')); - EXPECT_TRUE(IsValidEscape('$')); - EXPECT_TRUE(IsValidEscape('(')); - EXPECT_TRUE(IsValidEscape(']')); - EXPECT_TRUE(IsValidEscape('{')); - EXPECT_TRUE(IsValidEscape('|')); -} - -TEST(IsValidEscapeTest, IsTrueForSomeLetter) { - EXPECT_TRUE(IsValidEscape('d')); - EXPECT_TRUE(IsValidEscape('D')); - EXPECT_TRUE(IsValidEscape('s')); - EXPECT_TRUE(IsValidEscape('S')); - EXPECT_TRUE(IsValidEscape('w')); - EXPECT_TRUE(IsValidEscape('W')); -} - -TEST(AtomMatchesCharTest, EscapedPunct) { - EXPECT_FALSE(AtomMatchesChar(true, '\\', '\0')); - EXPECT_FALSE(AtomMatchesChar(true, '\\', ' ')); - EXPECT_FALSE(AtomMatchesChar(true, '_', '.')); - EXPECT_FALSE(AtomMatchesChar(true, '.', 'a')); - - EXPECT_TRUE(AtomMatchesChar(true, '\\', '\\')); - EXPECT_TRUE(AtomMatchesChar(true, '_', '_')); - EXPECT_TRUE(AtomMatchesChar(true, '+', '+')); - EXPECT_TRUE(AtomMatchesChar(true, '.', '.')); -} - -TEST(AtomMatchesCharTest, Escaped_d) { - EXPECT_FALSE(AtomMatchesChar(true, 'd', '\0')); - EXPECT_FALSE(AtomMatchesChar(true, 'd', 'a')); - EXPECT_FALSE(AtomMatchesChar(true, 'd', '.')); - - EXPECT_TRUE(AtomMatchesChar(true, 'd', '0')); - EXPECT_TRUE(AtomMatchesChar(true, 'd', '9')); -} - -TEST(AtomMatchesCharTest, Escaped_D) { - EXPECT_FALSE(AtomMatchesChar(true, 'D', '0')); - EXPECT_FALSE(AtomMatchesChar(true, 'D', '9')); - - EXPECT_TRUE(AtomMatchesChar(true, 'D', '\0')); - EXPECT_TRUE(AtomMatchesChar(true, 'D', 'a')); - EXPECT_TRUE(AtomMatchesChar(true, 'D', '-')); -} - -TEST(AtomMatchesCharTest, Escaped_s) { - EXPECT_FALSE(AtomMatchesChar(true, 's', '\0')); - EXPECT_FALSE(AtomMatchesChar(true, 's', 'a')); - EXPECT_FALSE(AtomMatchesChar(true, 's', '.')); - EXPECT_FALSE(AtomMatchesChar(true, 's', '9')); - - EXPECT_TRUE(AtomMatchesChar(true, 's', ' ')); - EXPECT_TRUE(AtomMatchesChar(true, 's', '\n')); - EXPECT_TRUE(AtomMatchesChar(true, 's', '\t')); -} - -TEST(AtomMatchesCharTest, Escaped_S) { - EXPECT_FALSE(AtomMatchesChar(true, 'S', ' ')); - EXPECT_FALSE(AtomMatchesChar(true, 'S', '\r')); - - EXPECT_TRUE(AtomMatchesChar(true, 'S', '\0')); - EXPECT_TRUE(AtomMatchesChar(true, 'S', 'a')); - EXPECT_TRUE(AtomMatchesChar(true, 'S', '9')); -} - -TEST(AtomMatchesCharTest, Escaped_w) { - EXPECT_FALSE(AtomMatchesChar(true, 'w', '\0')); - EXPECT_FALSE(AtomMatchesChar(true, 'w', '+')); - EXPECT_FALSE(AtomMatchesChar(true, 'w', ' ')); - EXPECT_FALSE(AtomMatchesChar(true, 'w', '\n')); - - EXPECT_TRUE(AtomMatchesChar(true, 'w', '0')); - EXPECT_TRUE(AtomMatchesChar(true, 'w', 'b')); - EXPECT_TRUE(AtomMatchesChar(true, 'w', 'C')); - EXPECT_TRUE(AtomMatchesChar(true, 'w', '_')); -} - -TEST(AtomMatchesCharTest, Escaped_W) { - EXPECT_FALSE(AtomMatchesChar(true, 'W', 'A')); - EXPECT_FALSE(AtomMatchesChar(true, 'W', 'b')); - EXPECT_FALSE(AtomMatchesChar(true, 'W', '9')); - EXPECT_FALSE(AtomMatchesChar(true, 'W', '_')); - - EXPECT_TRUE(AtomMatchesChar(true, 'W', '\0')); - EXPECT_TRUE(AtomMatchesChar(true, 'W', '*')); - EXPECT_TRUE(AtomMatchesChar(true, 'W', '\n')); -} - -TEST(AtomMatchesCharTest, EscapedWhiteSpace) { - EXPECT_FALSE(AtomMatchesChar(true, 'f', '\0')); - EXPECT_FALSE(AtomMatchesChar(true, 'f', '\n')); - EXPECT_FALSE(AtomMatchesChar(true, 'n', '\0')); - EXPECT_FALSE(AtomMatchesChar(true, 'n', '\r')); - EXPECT_FALSE(AtomMatchesChar(true, 'r', '\0')); - EXPECT_FALSE(AtomMatchesChar(true, 'r', 'a')); - EXPECT_FALSE(AtomMatchesChar(true, 't', '\0')); - EXPECT_FALSE(AtomMatchesChar(true, 't', 't')); - EXPECT_FALSE(AtomMatchesChar(true, 'v', '\0')); - EXPECT_FALSE(AtomMatchesChar(true, 'v', '\f')); - - EXPECT_TRUE(AtomMatchesChar(true, 'f', '\f')); - EXPECT_TRUE(AtomMatchesChar(true, 'n', '\n')); - EXPECT_TRUE(AtomMatchesChar(true, 'r', '\r')); - EXPECT_TRUE(AtomMatchesChar(true, 't', '\t')); - EXPECT_TRUE(AtomMatchesChar(true, 'v', '\v')); -} - -TEST(AtomMatchesCharTest, UnescapedDot) { - EXPECT_FALSE(AtomMatchesChar(false, '.', '\n')); - - EXPECT_TRUE(AtomMatchesChar(false, '.', '\0')); - EXPECT_TRUE(AtomMatchesChar(false, '.', '.')); - EXPECT_TRUE(AtomMatchesChar(false, '.', 'a')); - EXPECT_TRUE(AtomMatchesChar(false, '.', ' ')); -} - -TEST(AtomMatchesCharTest, UnescapedChar) { - EXPECT_FALSE(AtomMatchesChar(false, 'a', '\0')); - EXPECT_FALSE(AtomMatchesChar(false, 'a', 'b')); - EXPECT_FALSE(AtomMatchesChar(false, '$', 'a')); - - EXPECT_TRUE(AtomMatchesChar(false, '$', '$')); - EXPECT_TRUE(AtomMatchesChar(false, '5', '5')); - EXPECT_TRUE(AtomMatchesChar(false, 'Z', 'Z')); -} - -TEST(ValidateRegexTest, GeneratesFailureAndReturnsFalseForInvalid) { - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex(NULL)), - "NULL is not a valid simple regular expression"); - EXPECT_NONFATAL_FAILURE( - ASSERT_FALSE(ValidateRegex("a\\")), - "Syntax error at index 1 in simple regular expression \"a\\\": "); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("a\\")), - "'\\' cannot appear at the end"); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("\\n\\")), - "'\\' cannot appear at the end"); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("\\s\\hb")), - "invalid escape sequence \"\\h\""); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("^^")), - "'^' can only appear at the beginning"); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex(".*^b")), - "'^' can only appear at the beginning"); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("$$")), - "'$' can only appear at the end"); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("^$a")), - "'$' can only appear at the end"); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("a(b")), - "'(' is unsupported"); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("ab)")), - "')' is unsupported"); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("[ab")), - "'[' is unsupported"); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("a{2")), - "'{' is unsupported"); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("?")), - "'?' can only follow a repeatable token"); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("^*")), - "'*' can only follow a repeatable token"); - EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("5*+")), - "'+' can only follow a repeatable token"); -} - -TEST(ValidateRegexTest, ReturnsTrueForValid) { - EXPECT_TRUE(ValidateRegex("")); - EXPECT_TRUE(ValidateRegex("a")); - EXPECT_TRUE(ValidateRegex(".*")); - EXPECT_TRUE(ValidateRegex("^a_+")); - EXPECT_TRUE(ValidateRegex("^a\\t\\&?")); - EXPECT_TRUE(ValidateRegex("09*$")); - EXPECT_TRUE(ValidateRegex("^Z$")); - EXPECT_TRUE(ValidateRegex("a\\^Z\\$\\(\\)\\|\\[\\]\\{\\}")); -} - -TEST(MatchRepetitionAndRegexAtHeadTest, WorksForZeroOrOne) { - EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "a", "ba")); - // Repeating more than once. - EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "b", "aab")); - - // Repeating zero times. - EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "b", "ba")); - // Repeating once. - EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "b", "ab")); - EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '#', '?', ".", "##")); -} - -TEST(MatchRepetitionAndRegexAtHeadTest, WorksForZeroOrMany) { - EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, '.', '*', "a$", "baab")); - - // Repeating zero times. - EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '.', '*', "b", "bc")); - // Repeating once. - EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '.', '*', "b", "abc")); - // Repeating more than once. - EXPECT_TRUE(MatchRepetitionAndRegexAtHead(true, 'w', '*', "-", "ab_1-g")); -} - -TEST(MatchRepetitionAndRegexAtHeadTest, WorksForOneOrMany) { - EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, '.', '+', "a$", "baab")); - // Repeating zero times. - EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, '.', '+', "b", "bc")); - - // Repeating once. - EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '.', '+', "b", "abc")); - // Repeating more than once. - EXPECT_TRUE(MatchRepetitionAndRegexAtHead(true, 'w', '+', "-", "ab_1-g")); -} - -TEST(MatchRegexAtHeadTest, ReturnsTrueForEmptyRegex) { - EXPECT_TRUE(MatchRegexAtHead("", "")); - EXPECT_TRUE(MatchRegexAtHead("", "ab")); -} - -TEST(MatchRegexAtHeadTest, WorksWhenDollarIsInRegex) { - EXPECT_FALSE(MatchRegexAtHead("$", "a")); - - EXPECT_TRUE(MatchRegexAtHead("$", "")); - EXPECT_TRUE(MatchRegexAtHead("a$", "a")); -} - -TEST(MatchRegexAtHeadTest, WorksWhenRegexStartsWithEscapeSequence) { - EXPECT_FALSE(MatchRegexAtHead("\\w", "+")); - EXPECT_FALSE(MatchRegexAtHead("\\W", "ab")); - - EXPECT_TRUE(MatchRegexAtHead("\\sa", "\nab")); - EXPECT_TRUE(MatchRegexAtHead("\\d", "1a")); -} - -TEST(MatchRegexAtHeadTest, WorksWhenRegexStartsWithRepetition) { - EXPECT_FALSE(MatchRegexAtHead(".+a", "abc")); - EXPECT_FALSE(MatchRegexAtHead("a?b", "aab")); - - EXPECT_TRUE(MatchRegexAtHead(".*a", "bc12-ab")); - EXPECT_TRUE(MatchRegexAtHead("a?b", "b")); - EXPECT_TRUE(MatchRegexAtHead("a?b", "ab")); -} - -TEST(MatchRegexAtHeadTest, - WorksWhenRegexStartsWithRepetionOfEscapeSequence) { - EXPECT_FALSE(MatchRegexAtHead("\\.+a", "abc")); - EXPECT_FALSE(MatchRegexAtHead("\\s?b", " b")); - - EXPECT_TRUE(MatchRegexAtHead("\\(*a", "((((ab")); - EXPECT_TRUE(MatchRegexAtHead("\\^?b", "^b")); - EXPECT_TRUE(MatchRegexAtHead("\\\\?b", "b")); - EXPECT_TRUE(MatchRegexAtHead("\\\\?b", "\\b")); -} - -TEST(MatchRegexAtHeadTest, MatchesSequentially) { - EXPECT_FALSE(MatchRegexAtHead("ab.*c", "acabc")); - - EXPECT_TRUE(MatchRegexAtHead("ab.*c", "ab-fsc")); -} - -TEST(MatchRegexAnywhereTest, ReturnsFalseWhenStringIsNull) { - EXPECT_FALSE(MatchRegexAnywhere("", NULL)); -} - -TEST(MatchRegexAnywhereTest, WorksWhenRegexStartsWithCaret) { - EXPECT_FALSE(MatchRegexAnywhere("^a", "ba")); - EXPECT_FALSE(MatchRegexAnywhere("^$", "a")); - - EXPECT_TRUE(MatchRegexAnywhere("^a", "ab")); - EXPECT_TRUE(MatchRegexAnywhere("^", "ab")); - EXPECT_TRUE(MatchRegexAnywhere("^$", "")); -} - -TEST(MatchRegexAnywhereTest, ReturnsFalseWhenNoMatch) { - EXPECT_FALSE(MatchRegexAnywhere("a", "bcde123")); - EXPECT_FALSE(MatchRegexAnywhere("a.+a", "--aa88888888")); -} - -TEST(MatchRegexAnywhereTest, ReturnsTrueWhenMatchingPrefix) { - EXPECT_TRUE(MatchRegexAnywhere("\\w+", "ab1_ - 5")); - EXPECT_TRUE(MatchRegexAnywhere(".*=", "=")); - EXPECT_TRUE(MatchRegexAnywhere("x.*ab?.*bc", "xaaabc")); -} - -TEST(MatchRegexAnywhereTest, ReturnsTrueWhenMatchingNonPrefix) { - EXPECT_TRUE(MatchRegexAnywhere("\\w+", "$$$ ab1_ - 5")); - EXPECT_TRUE(MatchRegexAnywhere("\\.+=", "= ...=")); -} - -// Tests RE's implicit constructors. -TEST(RETest, ImplicitConstructorWorks) { - const RE empty(""); - EXPECT_STREQ("", empty.pattern()); - - const RE simple("hello"); - EXPECT_STREQ("hello", simple.pattern()); -} - -// Tests that RE's constructors reject invalid regular expressions. -TEST(RETest, RejectsInvalidRegex) { - EXPECT_NONFATAL_FAILURE({ - const RE normal(NULL); - }, "NULL is not a valid simple regular expression"); - - EXPECT_NONFATAL_FAILURE({ - const RE normal(".*(\\w+"); - }, "'(' is unsupported"); - - EXPECT_NONFATAL_FAILURE({ - const RE invalid("^?"); - }, "'?' can only follow a repeatable token"); -} - -// Tests RE::FullMatch(). -TEST(RETest, FullMatchWorks) { - const RE empty(""); - EXPECT_TRUE(RE::FullMatch("", empty)); - EXPECT_FALSE(RE::FullMatch("a", empty)); - - const RE re1("a"); - EXPECT_TRUE(RE::FullMatch("a", re1)); - - const RE re("a.*z"); - EXPECT_TRUE(RE::FullMatch("az", re)); - EXPECT_TRUE(RE::FullMatch("axyz", re)); - EXPECT_FALSE(RE::FullMatch("baz", re)); - EXPECT_FALSE(RE::FullMatch("azy", re)); -} - -// Tests RE::PartialMatch(). -TEST(RETest, PartialMatchWorks) { - const RE empty(""); - EXPECT_TRUE(RE::PartialMatch("", empty)); - EXPECT_TRUE(RE::PartialMatch("a", empty)); - - const RE re("a.*z"); - EXPECT_TRUE(RE::PartialMatch("az", re)); - EXPECT_TRUE(RE::PartialMatch("axyz", re)); - EXPECT_TRUE(RE::PartialMatch("baz", re)); - EXPECT_TRUE(RE::PartialMatch("azy", re)); - EXPECT_FALSE(RE::PartialMatch("zza", re)); -} - -#endif // GTEST_USES_POSIX_RE - -#if !GTEST_OS_WINDOWS_MOBILE - -TEST(CaptureTest, CapturesStdout) { - CaptureStdout(); - fprintf(stdout, "abc"); - EXPECT_STREQ("abc", GetCapturedStdout().c_str()); - - CaptureStdout(); - fprintf(stdout, "def%cghi", '\0'); - EXPECT_EQ(::std::string("def\0ghi", 7), ::std::string(GetCapturedStdout())); -} - -TEST(CaptureTest, CapturesStderr) { - CaptureStderr(); - fprintf(stderr, "jkl"); - EXPECT_STREQ("jkl", GetCapturedStderr().c_str()); - - CaptureStderr(); - fprintf(stderr, "jkl%cmno", '\0'); - EXPECT_EQ(::std::string("jkl\0mno", 7), ::std::string(GetCapturedStderr())); -} - -// Tests that stdout and stderr capture don't interfere with each other. -TEST(CaptureTest, CapturesStdoutAndStderr) { - CaptureStdout(); - CaptureStderr(); - fprintf(stdout, "pqr"); - fprintf(stderr, "stu"); - EXPECT_STREQ("pqr", GetCapturedStdout().c_str()); - EXPECT_STREQ("stu", GetCapturedStderr().c_str()); -} - -TEST(CaptureDeathTest, CannotReenterStdoutCapture) { - CaptureStdout(); - EXPECT_DEATH_IF_SUPPORTED(CaptureStdout(), - "Only one stdout capturer can exist at a time"); - GetCapturedStdout(); - - // We cannot test stderr capturing using death tests as they use it - // themselves. -} - -#endif // !GTEST_OS_WINDOWS_MOBILE - -TEST(ThreadLocalTest, DefaultConstructorInitializesToDefaultValues) { - ThreadLocal t1; - EXPECT_EQ(0, t1.get()); - - ThreadLocal t2; - EXPECT_TRUE(t2.get() == NULL); -} - -TEST(ThreadLocalTest, SingleParamConstructorInitializesToParam) { - ThreadLocal t1(123); - EXPECT_EQ(123, t1.get()); - - int i = 0; - ThreadLocal t2(&i); - EXPECT_EQ(&i, t2.get()); -} - -class NoDefaultContructor { - public: - explicit NoDefaultContructor(const char*) {} - NoDefaultContructor(const NoDefaultContructor&) {} -}; - -TEST(ThreadLocalTest, ValueDefaultContructorIsNotRequiredForParamVersion) { - ThreadLocal bar(NoDefaultContructor("foo")); - bar.pointer(); -} - -TEST(ThreadLocalTest, GetAndPointerReturnSameValue) { - ThreadLocal thread_local_string; - - EXPECT_EQ(thread_local_string.pointer(), &(thread_local_string.get())); - - // Verifies the condition still holds after calling set. - thread_local_string.set("foo"); - EXPECT_EQ(thread_local_string.pointer(), &(thread_local_string.get())); -} - -TEST(ThreadLocalTest, PointerAndConstPointerReturnSameValue) { - ThreadLocal thread_local_string; - const ThreadLocal& const_thread_local_string = - thread_local_string; - - EXPECT_EQ(thread_local_string.pointer(), const_thread_local_string.pointer()); - - thread_local_string.set("foo"); - EXPECT_EQ(thread_local_string.pointer(), const_thread_local_string.pointer()); -} - -#if GTEST_IS_THREADSAFE - -void AddTwo(int* param) { *param += 2; } - -TEST(ThreadWithParamTest, ConstructorExecutesThreadFunc) { - int i = 40; - ThreadWithParam thread(&AddTwo, &i, NULL); - thread.Join(); - EXPECT_EQ(42, i); -} - -TEST(MutexDeathTest, AssertHeldShouldAssertWhenNotLocked) { - // AssertHeld() is flaky only in the presence of multiple threads accessing - // the lock. In this case, the test is robust. - EXPECT_DEATH_IF_SUPPORTED({ - Mutex m; - { MutexLock lock(&m); } - m.AssertHeld(); - }, - "thread .*hold"); -} - -TEST(MutexTest, AssertHeldShouldNotAssertWhenLocked) { - Mutex m; - MutexLock lock(&m); - m.AssertHeld(); -} - -class AtomicCounterWithMutex { - public: - explicit AtomicCounterWithMutex(Mutex* mutex) : - value_(0), mutex_(mutex), random_(42) {} - - void Increment() { - MutexLock lock(mutex_); - int temp = value_; - { - // We need to put up a memory barrier to prevent reads and writes to - // value_ rearranged with the call to SleepMilliseconds when observed - // from other threads. -#if GTEST_HAS_PTHREAD - // On POSIX, locking a mutex puts up a memory barrier. We cannot use - // Mutex and MutexLock here or rely on their memory barrier - // functionality as we are testing them here. - pthread_mutex_t memory_barrier_mutex; - GTEST_CHECK_POSIX_SUCCESS_( - pthread_mutex_init(&memory_barrier_mutex, NULL)); - GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&memory_barrier_mutex)); - - SleepMilliseconds(random_.Generate(30)); - - GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&memory_barrier_mutex)); - GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&memory_barrier_mutex)); -#elif GTEST_OS_WINDOWS - // On Windows, performing an interlocked access puts up a memory barrier. - volatile LONG dummy = 0; - ::InterlockedIncrement(&dummy); - SleepMilliseconds(random_.Generate(30)); - ::InterlockedIncrement(&dummy); -#else -# error "Memory barrier not implemented on this platform." -#endif // GTEST_HAS_PTHREAD - } - value_ = temp + 1; - } - int value() const { return value_; } - - private: - volatile int value_; - Mutex* const mutex_; // Protects value_. - Random random_; -}; - -void CountingThreadFunc(pair param) { - for (int i = 0; i < param.second; ++i) - param.first->Increment(); -} - -// Tests that the mutex only lets one thread at a time to lock it. -TEST(MutexTest, OnlyOneThreadCanLockAtATime) { - Mutex mutex; - AtomicCounterWithMutex locked_counter(&mutex); - - typedef ThreadWithParam > ThreadType; - const int kCycleCount = 20; - const int kThreadCount = 7; - scoped_ptr counting_threads[kThreadCount]; - Notification threads_can_start; - // Creates and runs kThreadCount threads that increment locked_counter - // kCycleCount times each. - for (int i = 0; i < kThreadCount; ++i) { - counting_threads[i].reset(new ThreadType(&CountingThreadFunc, - make_pair(&locked_counter, - kCycleCount), - &threads_can_start)); - } - threads_can_start.Notify(); - for (int i = 0; i < kThreadCount; ++i) - counting_threads[i]->Join(); - - // If the mutex lets more than one thread to increment the counter at a - // time, they are likely to encounter a race condition and have some - // increments overwritten, resulting in the lower then expected counter - // value. - EXPECT_EQ(kCycleCount * kThreadCount, locked_counter.value()); -} - -template -void RunFromThread(void (func)(T), T param) { - ThreadWithParam thread(func, param, NULL); - thread.Join(); -} - -void RetrieveThreadLocalValue( - pair*, std::string*> param) { - *param.second = param.first->get(); -} - -TEST(ThreadLocalTest, ParameterizedConstructorSetsDefault) { - ThreadLocal thread_local_string("foo"); - EXPECT_STREQ("foo", thread_local_string.get().c_str()); - - thread_local_string.set("bar"); - EXPECT_STREQ("bar", thread_local_string.get().c_str()); - - std::string result; - RunFromThread(&RetrieveThreadLocalValue, - make_pair(&thread_local_string, &result)); - EXPECT_STREQ("foo", result.c_str()); -} - -// Keeps track of whether of destructors being called on instances of -// DestructorTracker. On Windows, waits for the destructor call reports. -class DestructorCall { - public: - DestructorCall() { - invoked_ = false; -#if GTEST_OS_WINDOWS - wait_event_.Reset(::CreateEvent(NULL, TRUE, FALSE, NULL)); - GTEST_CHECK_(wait_event_.Get() != NULL); -#endif - } - - bool CheckDestroyed() const { -#if GTEST_OS_WINDOWS - if (::WaitForSingleObject(wait_event_.Get(), 1000) != WAIT_OBJECT_0) - return false; -#endif - return invoked_; - } - - void ReportDestroyed() { - invoked_ = true; -#if GTEST_OS_WINDOWS - ::SetEvent(wait_event_.Get()); -#endif - } - - static std::vector& List() { return *list_; } - - static void ResetList() { - for (size_t i = 0; i < list_->size(); ++i) { - delete list_->at(i); - } - list_->clear(); - } - - private: - bool invoked_; -#if GTEST_OS_WINDOWS - AutoHandle wait_event_; -#endif - static std::vector* const list_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(DestructorCall); -}; - -std::vector* const DestructorCall::list_ = - new std::vector; - -// DestructorTracker keeps track of whether its instances have been -// destroyed. -class DestructorTracker { - public: - DestructorTracker() : index_(GetNewIndex()) {} - DestructorTracker(const DestructorTracker& /* rhs */) - : index_(GetNewIndex()) {} - ~DestructorTracker() { - // We never access DestructorCall::List() concurrently, so we don't need - // to protect this access with a mutex. - DestructorCall::List()[index_]->ReportDestroyed(); - } - - private: - static size_t GetNewIndex() { - DestructorCall::List().push_back(new DestructorCall); - return DestructorCall::List().size() - 1; - } - const size_t index_; - - GTEST_DISALLOW_ASSIGN_(DestructorTracker); -}; - -typedef ThreadLocal* ThreadParam; - -void CallThreadLocalGet(ThreadParam thread_local_param) { - thread_local_param->get(); -} - -// Tests that when a ThreadLocal object dies in a thread, it destroys -// the managed object for that thread. -TEST(ThreadLocalTest, DestroysManagedObjectForOwnThreadWhenDying) { - DestructorCall::ResetList(); - - { - ThreadLocal thread_local_tracker; - ASSERT_EQ(0U, DestructorCall::List().size()); - - // This creates another DestructorTracker object for the main thread. - thread_local_tracker.get(); - ASSERT_EQ(1U, DestructorCall::List().size()); - ASSERT_FALSE(DestructorCall::List()[0]->CheckDestroyed()); - } - - // Now thread_local_tracker has died. - ASSERT_EQ(1U, DestructorCall::List().size()); - EXPECT_TRUE(DestructorCall::List()[0]->CheckDestroyed()); - - DestructorCall::ResetList(); -} - -// Tests that when a thread exits, the thread-local object for that -// thread is destroyed. -TEST(ThreadLocalTest, DestroysManagedObjectAtThreadExit) { - DestructorCall::ResetList(); - - { - ThreadLocal thread_local_tracker; - ASSERT_EQ(0U, DestructorCall::List().size()); - - // This creates another DestructorTracker object in the new thread. - ThreadWithParam thread( - &CallThreadLocalGet, &thread_local_tracker, NULL); - thread.Join(); - - // The thread has exited, and we should have a DestroyedTracker - // instance created for it. But it may not have been destroyed yet. - ASSERT_EQ(1U, DestructorCall::List().size()); - } - - // The thread has exited and thread_local_tracker has died. - ASSERT_EQ(1U, DestructorCall::List().size()); - EXPECT_TRUE(DestructorCall::List()[0]->CheckDestroyed()); - - DestructorCall::ResetList(); -} - -TEST(ThreadLocalTest, ThreadLocalMutationsAffectOnlyCurrentThread) { - ThreadLocal thread_local_string; - thread_local_string.set("Foo"); - EXPECT_STREQ("Foo", thread_local_string.get().c_str()); - - std::string result; - RunFromThread(&RetrieveThreadLocalValue, - make_pair(&thread_local_string, &result)); - EXPECT_TRUE(result.empty()); -} - -#endif // GTEST_IS_THREADSAFE - -#if GTEST_OS_WINDOWS -TEST(WindowsTypesTest, HANDLEIsVoidStar) { - StaticAssertTypeEq(); -} - -#if GTEST_OS_WINDOWS_MINGW && !defined(__MINGW64_VERSION_MAJOR) -TEST(WindowsTypesTest, _CRITICAL_SECTIONIs_CRITICAL_SECTION) { - StaticAssertTypeEq(); -} -#else -TEST(WindowsTypesTest, CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION) { - StaticAssertTypeEq(); -} -#endif - -#endif // GTEST_OS_WINDOWS - -} // namespace internal -} // namespace testing diff --git a/test/gtest-1.8.0/test/gtest-printers_test.cc b/test/gtest-1.8.0/test/gtest-printers_test.cc deleted file mode 100644 index a373851d27..0000000000 --- a/test/gtest-1.8.0/test/gtest-printers_test.cc +++ /dev/null @@ -1,1731 +0,0 @@ -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Test - The Google C++ Testing and Mocking Framework -// -// This file tests the universal value printer. - -#include "gtest/gtest-printers.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "gtest/gtest.h" - -#if GTEST_HAS_UNORDERED_MAP_ -# include // NOLINT -#endif // GTEST_HAS_UNORDERED_MAP_ - -#if GTEST_HAS_UNORDERED_SET_ -# include // NOLINT -#endif // GTEST_HAS_UNORDERED_SET_ - -#if GTEST_HAS_STD_FORWARD_LIST_ -# include // NOLINT -#endif // GTEST_HAS_STD_FORWARD_LIST_ - -// Some user-defined types for testing the universal value printer. - -// An anonymous enum type. -enum AnonymousEnum { - kAE1 = -1, - kAE2 = 1 -}; - -// An enum without a user-defined printer. -enum EnumWithoutPrinter { - kEWP1 = -2, - kEWP2 = 42 -}; - -// An enum with a << operator. -enum EnumWithStreaming { - kEWS1 = 10 -}; - -std::ostream& operator<<(std::ostream& os, EnumWithStreaming e) { - return os << (e == kEWS1 ? "kEWS1" : "invalid"); -} - -// An enum with a PrintTo() function. -enum EnumWithPrintTo { - kEWPT1 = 1 -}; - -void PrintTo(EnumWithPrintTo e, std::ostream* os) { - *os << (e == kEWPT1 ? "kEWPT1" : "invalid"); -} - -// A class implicitly convertible to BiggestInt. -class BiggestIntConvertible { - public: - operator ::testing::internal::BiggestInt() const { return 42; } -}; - -// A user-defined unprintable class template in the global namespace. -template -class UnprintableTemplateInGlobal { - public: - UnprintableTemplateInGlobal() : value_() {} - private: - T value_; -}; - -// A user-defined streamable type in the global namespace. -class StreamableInGlobal { - public: - virtual ~StreamableInGlobal() {} -}; - -inline void operator<<(::std::ostream& os, const StreamableInGlobal& /* x */) { - os << "StreamableInGlobal"; -} - -void operator<<(::std::ostream& os, const StreamableInGlobal* /* x */) { - os << "StreamableInGlobal*"; -} - -namespace foo { - -// A user-defined unprintable type in a user namespace. -class UnprintableInFoo { - public: - UnprintableInFoo() : z_(0) { memcpy(xy_, "\xEF\x12\x0\x0\x34\xAB\x0\x0", 8); } - double z() const { return z_; } - private: - char xy_[8]; - double z_; -}; - -// A user-defined printable type in a user-chosen namespace. -struct PrintableViaPrintTo { - PrintableViaPrintTo() : value() {} - int value; -}; - -void PrintTo(const PrintableViaPrintTo& x, ::std::ostream* os) { - *os << "PrintableViaPrintTo: " << x.value; -} - -// A type with a user-defined << for printing its pointer. -struct PointerPrintable { -}; - -::std::ostream& operator<<(::std::ostream& os, - const PointerPrintable* /* x */) { - return os << "PointerPrintable*"; -} - -// A user-defined printable class template in a user-chosen namespace. -template -class PrintableViaPrintToTemplate { - public: - explicit PrintableViaPrintToTemplate(const T& a_value) : value_(a_value) {} - - const T& value() const { return value_; } - private: - T value_; -}; - -template -void PrintTo(const PrintableViaPrintToTemplate& x, ::std::ostream* os) { - *os << "PrintableViaPrintToTemplate: " << x.value(); -} - -// A user-defined streamable class template in a user namespace. -template -class StreamableTemplateInFoo { - public: - StreamableTemplateInFoo() : value_() {} - - const T& value() const { return value_; } - private: - T value_; -}; - -template -inline ::std::ostream& operator<<(::std::ostream& os, - const StreamableTemplateInFoo& x) { - return os << "StreamableTemplateInFoo: " << x.value(); -} - -// A user-defined streamable but recursivly-defined container type in -// a user namespace, it mimics therefore std::filesystem::path or -// boost::filesystem::path. -class PathLike { - public: - struct iterator { - typedef PathLike value_type; - }; - - PathLike() {} - - iterator begin() const { return iterator(); } - iterator end() const { return iterator(); } - - friend ::std::ostream& operator<<(::std::ostream& os, const PathLike&) { - return os << "Streamable-PathLike"; - } -}; - -} // namespace foo - -namespace testing { -namespace gtest_printers_test { - -using ::std::deque; -using ::std::list; -using ::std::make_pair; -using ::std::map; -using ::std::multimap; -using ::std::multiset; -using ::std::pair; -using ::std::set; -using ::std::vector; -using ::testing::PrintToString; -using ::testing::internal::FormatForComparisonFailureMessage; -using ::testing::internal::ImplicitCast_; -using ::testing::internal::NativeArray; -using ::testing::internal::RE; -using ::testing::internal::RelationToSourceReference; -using ::testing::internal::Strings; -using ::testing::internal::UniversalPrint; -using ::testing::internal::UniversalPrinter; -using ::testing::internal::UniversalTersePrint; -#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_ -using ::testing::internal::UniversalTersePrintTupleFieldsToStrings; -#endif - -// Prints a value to a string using the universal value printer. This -// is a helper for testing UniversalPrinter::Print() for various types. -template -std::string Print(const T& value) { - ::std::stringstream ss; - UniversalPrinter::Print(value, &ss); - return ss.str(); -} - -// Prints a value passed by reference to a string, using the universal -// value printer. This is a helper for testing -// UniversalPrinter::Print() for various types. -template -std::string PrintByRef(const T& value) { - ::std::stringstream ss; - UniversalPrinter::Print(value, &ss); - return ss.str(); -} - -// Tests printing various enum types. - -TEST(PrintEnumTest, AnonymousEnum) { - EXPECT_EQ("-1", Print(kAE1)); - EXPECT_EQ("1", Print(kAE2)); -} - -TEST(PrintEnumTest, EnumWithoutPrinter) { - EXPECT_EQ("-2", Print(kEWP1)); - EXPECT_EQ("42", Print(kEWP2)); -} - -TEST(PrintEnumTest, EnumWithStreaming) { - EXPECT_EQ("kEWS1", Print(kEWS1)); - EXPECT_EQ("invalid", Print(static_cast(0))); -} - -TEST(PrintEnumTest, EnumWithPrintTo) { - EXPECT_EQ("kEWPT1", Print(kEWPT1)); - EXPECT_EQ("invalid", Print(static_cast(0))); -} - -// Tests printing a class implicitly convertible to BiggestInt. - -TEST(PrintClassTest, BiggestIntConvertible) { - EXPECT_EQ("42", Print(BiggestIntConvertible())); -} - -// Tests printing various char types. - -// char. -TEST(PrintCharTest, PlainChar) { - EXPECT_EQ("'\\0'", Print('\0')); - EXPECT_EQ("'\\'' (39, 0x27)", Print('\'')); - EXPECT_EQ("'\"' (34, 0x22)", Print('"')); - EXPECT_EQ("'?' (63, 0x3F)", Print('?')); - EXPECT_EQ("'\\\\' (92, 0x5C)", Print('\\')); - EXPECT_EQ("'\\a' (7)", Print('\a')); - EXPECT_EQ("'\\b' (8)", Print('\b')); - EXPECT_EQ("'\\f' (12, 0xC)", Print('\f')); - EXPECT_EQ("'\\n' (10, 0xA)", Print('\n')); - EXPECT_EQ("'\\r' (13, 0xD)", Print('\r')); - EXPECT_EQ("'\\t' (9)", Print('\t')); - EXPECT_EQ("'\\v' (11, 0xB)", Print('\v')); - EXPECT_EQ("'\\x7F' (127)", Print('\x7F')); - EXPECT_EQ("'\\xFF' (255)", Print('\xFF')); - EXPECT_EQ("' ' (32, 0x20)", Print(' ')); - EXPECT_EQ("'a' (97, 0x61)", Print('a')); -} - -// signed char. -TEST(PrintCharTest, SignedChar) { - EXPECT_EQ("'\\0'", Print(static_cast('\0'))); - EXPECT_EQ("'\\xCE' (-50)", - Print(static_cast(-50))); -} - -// unsigned char. -TEST(PrintCharTest, UnsignedChar) { - EXPECT_EQ("'\\0'", Print(static_cast('\0'))); - EXPECT_EQ("'b' (98, 0x62)", - Print(static_cast('b'))); -} - -// Tests printing other simple, built-in types. - -// bool. -TEST(PrintBuiltInTypeTest, Bool) { - EXPECT_EQ("false", Print(false)); - EXPECT_EQ("true", Print(true)); -} - -// wchar_t. -TEST(PrintBuiltInTypeTest, Wchar_t) { - EXPECT_EQ("L'\\0'", Print(L'\0')); - EXPECT_EQ("L'\\'' (39, 0x27)", Print(L'\'')); - EXPECT_EQ("L'\"' (34, 0x22)", Print(L'"')); - EXPECT_EQ("L'?' (63, 0x3F)", Print(L'?')); - EXPECT_EQ("L'\\\\' (92, 0x5C)", Print(L'\\')); - EXPECT_EQ("L'\\a' (7)", Print(L'\a')); - EXPECT_EQ("L'\\b' (8)", Print(L'\b')); - EXPECT_EQ("L'\\f' (12, 0xC)", Print(L'\f')); - EXPECT_EQ("L'\\n' (10, 0xA)", Print(L'\n')); - EXPECT_EQ("L'\\r' (13, 0xD)", Print(L'\r')); - EXPECT_EQ("L'\\t' (9)", Print(L'\t')); - EXPECT_EQ("L'\\v' (11, 0xB)", Print(L'\v')); - EXPECT_EQ("L'\\x7F' (127)", Print(L'\x7F')); - EXPECT_EQ("L'\\xFF' (255)", Print(L'\xFF')); - EXPECT_EQ("L' ' (32, 0x20)", Print(L' ')); - EXPECT_EQ("L'a' (97, 0x61)", Print(L'a')); - EXPECT_EQ("L'\\x576' (1398)", Print(static_cast(0x576))); - EXPECT_EQ("L'\\xC74D' (51021)", Print(static_cast(0xC74D))); -} - -// Test that Int64 provides more storage than wchar_t. -TEST(PrintTypeSizeTest, Wchar_t) { - EXPECT_LT(sizeof(wchar_t), sizeof(testing::internal::Int64)); -} - -// Various integer types. -TEST(PrintBuiltInTypeTest, Integer) { - EXPECT_EQ("'\\xFF' (255)", Print(static_cast(255))); // uint8 - EXPECT_EQ("'\\x80' (-128)", Print(static_cast(-128))); // int8 - EXPECT_EQ("65535", Print(USHRT_MAX)); // uint16 - EXPECT_EQ("-32768", Print(SHRT_MIN)); // int16 - EXPECT_EQ("4294967295", Print(UINT_MAX)); // uint32 - EXPECT_EQ("-2147483648", Print(INT_MIN)); // int32 - EXPECT_EQ("18446744073709551615", - Print(static_cast(-1))); // uint64 - EXPECT_EQ("-9223372036854775808", - Print(static_cast(1) << 63)); // int64 -} - -// Size types. -TEST(PrintBuiltInTypeTest, Size_t) { - EXPECT_EQ("1", Print(sizeof('a'))); // size_t. -#if !GTEST_OS_WINDOWS - // Windows has no ssize_t type. - EXPECT_EQ("-2", Print(static_cast(-2))); // ssize_t. -#endif // !GTEST_OS_WINDOWS -} - -// Floating-points. -TEST(PrintBuiltInTypeTest, FloatingPoints) { - EXPECT_EQ("1.5", Print(1.5f)); // float - EXPECT_EQ("-2.5", Print(-2.5)); // double -} - -// Since ::std::stringstream::operator<<(const void *) formats the pointer -// output differently with different compilers, we have to create the expected -// output first and use it as our expectation. -static std::string PrintPointer(const void* p) { - ::std::stringstream expected_result_stream; - expected_result_stream << p; - return expected_result_stream.str(); -} - -// Tests printing C strings. - -// const char*. -TEST(PrintCStringTest, Const) { - const char* p = "World"; - EXPECT_EQ(PrintPointer(p) + " pointing to \"World\"", Print(p)); -} - -// char*. -TEST(PrintCStringTest, NonConst) { - char p[] = "Hi"; - EXPECT_EQ(PrintPointer(p) + " pointing to \"Hi\"", - Print(static_cast(p))); -} - -// NULL C string. -TEST(PrintCStringTest, Null) { - const char* p = NULL; - EXPECT_EQ("NULL", Print(p)); -} - -// Tests that C strings are escaped properly. -TEST(PrintCStringTest, EscapesProperly) { - const char* p = "'\"?\\\a\b\f\n\r\t\v\x7F\xFF a"; - EXPECT_EQ(PrintPointer(p) + " pointing to \"'\\\"?\\\\\\a\\b\\f" - "\\n\\r\\t\\v\\x7F\\xFF a\"", - Print(p)); -} - -// MSVC compiler can be configured to define whar_t as a typedef -// of unsigned short. Defining an overload for const wchar_t* in that case -// would cause pointers to unsigned shorts be printed as wide strings, -// possibly accessing more memory than intended and causing invalid -// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when -// wchar_t is implemented as a native type. -#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED) - -// const wchar_t*. -TEST(PrintWideCStringTest, Const) { - const wchar_t* p = L"World"; - EXPECT_EQ(PrintPointer(p) + " pointing to L\"World\"", Print(p)); -} - -// wchar_t*. -TEST(PrintWideCStringTest, NonConst) { - wchar_t p[] = L"Hi"; - EXPECT_EQ(PrintPointer(p) + " pointing to L\"Hi\"", - Print(static_cast(p))); -} - -// NULL wide C string. -TEST(PrintWideCStringTest, Null) { - const wchar_t* p = NULL; - EXPECT_EQ("NULL", Print(p)); -} - -// Tests that wide C strings are escaped properly. -TEST(PrintWideCStringTest, EscapesProperly) { - const wchar_t s[] = {'\'', '"', '?', '\\', '\a', '\b', '\f', '\n', '\r', - '\t', '\v', 0xD3, 0x576, 0x8D3, 0xC74D, ' ', 'a', '\0'}; - EXPECT_EQ(PrintPointer(s) + " pointing to L\"'\\\"?\\\\\\a\\b\\f" - "\\n\\r\\t\\v\\xD3\\x576\\x8D3\\xC74D a\"", - Print(static_cast(s))); -} -#endif // native wchar_t - -// Tests printing pointers to other char types. - -// signed char*. -TEST(PrintCharPointerTest, SignedChar) { - signed char* p = reinterpret_cast(0x1234); - EXPECT_EQ(PrintPointer(p), Print(p)); - p = NULL; - EXPECT_EQ("NULL", Print(p)); -} - -// const signed char*. -TEST(PrintCharPointerTest, ConstSignedChar) { - signed char* p = reinterpret_cast(0x1234); - EXPECT_EQ(PrintPointer(p), Print(p)); - p = NULL; - EXPECT_EQ("NULL", Print(p)); -} - -// unsigned char*. -TEST(PrintCharPointerTest, UnsignedChar) { - unsigned char* p = reinterpret_cast(0x1234); - EXPECT_EQ(PrintPointer(p), Print(p)); - p = NULL; - EXPECT_EQ("NULL", Print(p)); -} - -// const unsigned char*. -TEST(PrintCharPointerTest, ConstUnsignedChar) { - const unsigned char* p = reinterpret_cast(0x1234); - EXPECT_EQ(PrintPointer(p), Print(p)); - p = NULL; - EXPECT_EQ("NULL", Print(p)); -} - -// Tests printing pointers to simple, built-in types. - -// bool*. -TEST(PrintPointerToBuiltInTypeTest, Bool) { - bool* p = reinterpret_cast(0xABCD); - EXPECT_EQ(PrintPointer(p), Print(p)); - p = NULL; - EXPECT_EQ("NULL", Print(p)); -} - -// void*. -TEST(PrintPointerToBuiltInTypeTest, Void) { - void* p = reinterpret_cast(0xABCD); - EXPECT_EQ(PrintPointer(p), Print(p)); - p = NULL; - EXPECT_EQ("NULL", Print(p)); -} - -// const void*. -TEST(PrintPointerToBuiltInTypeTest, ConstVoid) { - const void* p = reinterpret_cast(0xABCD); - EXPECT_EQ(PrintPointer(p), Print(p)); - p = NULL; - EXPECT_EQ("NULL", Print(p)); -} - -// Tests printing pointers to pointers. -TEST(PrintPointerToPointerTest, IntPointerPointer) { - int** p = reinterpret_cast(0xABCD); - EXPECT_EQ(PrintPointer(p), Print(p)); - p = NULL; - EXPECT_EQ("NULL", Print(p)); -} - -// Tests printing (non-member) function pointers. - -void MyFunction(int /* n */) {} - -TEST(PrintPointerTest, NonMemberFunctionPointer) { - // We cannot directly cast &MyFunction to const void* because the - // standard disallows casting between pointers to functions and - // pointers to objects, and some compilers (e.g. GCC 3.4) enforce - // this limitation. - EXPECT_EQ( - PrintPointer(reinterpret_cast( - reinterpret_cast(&MyFunction))), - Print(&MyFunction)); - int (*p)(bool) = NULL; // NOLINT - EXPECT_EQ("NULL", Print(p)); -} - -// An assertion predicate determining whether a one string is a prefix for -// another. -template -AssertionResult HasPrefix(const StringType& str, const StringType& prefix) { - if (str.find(prefix, 0) == 0) - return AssertionSuccess(); - - const bool is_wide_string = sizeof(prefix[0]) > 1; - const char* const begin_string_quote = is_wide_string ? "L\"" : "\""; - return AssertionFailure() - << begin_string_quote << prefix << "\" is not a prefix of " - << begin_string_quote << str << "\"\n"; -} - -// Tests printing member variable pointers. Although they are called -// pointers, they don't point to a location in the address space. -// Their representation is implementation-defined. Thus they will be -// printed as raw bytes. - -struct Foo { - public: - virtual ~Foo() {} - int MyMethod(char x) { return x + 1; } - virtual char MyVirtualMethod(int /* n */) { return 'a'; } - - int value; -}; - -TEST(PrintPointerTest, MemberVariablePointer) { - EXPECT_TRUE(HasPrefix(Print(&Foo::value), - Print(sizeof(&Foo::value)) + "-byte object ")); - int (Foo::*p) = NULL; // NOLINT - EXPECT_TRUE(HasPrefix(Print(p), - Print(sizeof(p)) + "-byte object ")); -} - -// Tests printing member function pointers. Although they are called -// pointers, they don't point to a location in the address space. -// Their representation is implementation-defined. Thus they will be -// printed as raw bytes. -TEST(PrintPointerTest, MemberFunctionPointer) { - EXPECT_TRUE(HasPrefix(Print(&Foo::MyMethod), - Print(sizeof(&Foo::MyMethod)) + "-byte object ")); - EXPECT_TRUE( - HasPrefix(Print(&Foo::MyVirtualMethod), - Print(sizeof((&Foo::MyVirtualMethod))) + "-byte object ")); - int (Foo::*p)(char) = NULL; // NOLINT - EXPECT_TRUE(HasPrefix(Print(p), - Print(sizeof(p)) + "-byte object ")); -} - -// Tests printing C arrays. - -// The difference between this and Print() is that it ensures that the -// argument is a reference to an array. -template -std::string PrintArrayHelper(T (&a)[N]) { - return Print(a); -} - -// One-dimensional array. -TEST(PrintArrayTest, OneDimensionalArray) { - int a[5] = { 1, 2, 3, 4, 5 }; - EXPECT_EQ("{ 1, 2, 3, 4, 5 }", PrintArrayHelper(a)); -} - -// Two-dimensional array. -TEST(PrintArrayTest, TwoDimensionalArray) { - int a[2][5] = { - { 1, 2, 3, 4, 5 }, - { 6, 7, 8, 9, 0 } - }; - EXPECT_EQ("{ { 1, 2, 3, 4, 5 }, { 6, 7, 8, 9, 0 } }", PrintArrayHelper(a)); -} - -// Array of const elements. -TEST(PrintArrayTest, ConstArray) { - const bool a[1] = { false }; - EXPECT_EQ("{ false }", PrintArrayHelper(a)); -} - -// char array without terminating NUL. -TEST(PrintArrayTest, CharArrayWithNoTerminatingNul) { - // Array a contains '\0' in the middle and doesn't end with '\0'. - char a[] = { 'H', '\0', 'i' }; - EXPECT_EQ("\"H\\0i\" (no terminating NUL)", PrintArrayHelper(a)); -} - -// const char array with terminating NUL. -TEST(PrintArrayTest, ConstCharArrayWithTerminatingNul) { - const char a[] = "\0Hi"; - EXPECT_EQ("\"\\0Hi\"", PrintArrayHelper(a)); -} - -// const wchar_t array without terminating NUL. -TEST(PrintArrayTest, WCharArrayWithNoTerminatingNul) { - // Array a contains '\0' in the middle and doesn't end with '\0'. - const wchar_t a[] = { L'H', L'\0', L'i' }; - EXPECT_EQ("L\"H\\0i\" (no terminating NUL)", PrintArrayHelper(a)); -} - -// wchar_t array with terminating NUL. -TEST(PrintArrayTest, WConstCharArrayWithTerminatingNul) { - const wchar_t a[] = L"\0Hi"; - EXPECT_EQ("L\"\\0Hi\"", PrintArrayHelper(a)); -} - -// Array of objects. -TEST(PrintArrayTest, ObjectArray) { - std::string a[3] = {"Hi", "Hello", "Ni hao"}; - EXPECT_EQ("{ \"Hi\", \"Hello\", \"Ni hao\" }", PrintArrayHelper(a)); -} - -// Array with many elements. -TEST(PrintArrayTest, BigArray) { - int a[100] = { 1, 2, 3 }; - EXPECT_EQ("{ 1, 2, 3, 0, 0, 0, 0, 0, ..., 0, 0, 0, 0, 0, 0, 0, 0 }", - PrintArrayHelper(a)); -} - -// Tests printing ::string and ::std::string. - -#if GTEST_HAS_GLOBAL_STRING -// ::string. -TEST(PrintStringTest, StringInGlobalNamespace) { - const char s[] = "'\"?\\\a\b\f\n\0\r\t\v\x7F\xFF a"; - const ::string str(s, sizeof(s)); - EXPECT_EQ("\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v\\x7F\\xFF a\\0\"", - Print(str)); -} -#endif // GTEST_HAS_GLOBAL_STRING - -// ::std::string. -TEST(PrintStringTest, StringInStdNamespace) { - const char s[] = "'\"?\\\a\b\f\n\0\r\t\v\x7F\xFF a"; - const ::std::string str(s, sizeof(s)); - EXPECT_EQ("\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v\\x7F\\xFF a\\0\"", - Print(str)); -} - -TEST(PrintStringTest, StringAmbiguousHex) { - // "\x6BANANA" is ambiguous, it can be interpreted as starting with either of: - // '\x6', '\x6B', or '\x6BA'. - - // a hex escaping sequence following by a decimal digit - EXPECT_EQ("\"0\\x12\" \"3\"", Print(::std::string("0\x12" "3"))); - // a hex escaping sequence following by a hex digit (lower-case) - EXPECT_EQ("\"mm\\x6\" \"bananas\"", Print(::std::string("mm\x6" "bananas"))); - // a hex escaping sequence following by a hex digit (upper-case) - EXPECT_EQ("\"NOM\\x6\" \"BANANA\"", Print(::std::string("NOM\x6" "BANANA"))); - // a hex escaping sequence following by a non-xdigit - EXPECT_EQ("\"!\\x5-!\"", Print(::std::string("!\x5-!"))); -} - -// Tests printing ::wstring and ::std::wstring. - -#if GTEST_HAS_GLOBAL_WSTRING -// ::wstring. -TEST(PrintWideStringTest, StringInGlobalNamespace) { - const wchar_t s[] = L"'\"?\\\a\b\f\n\0\r\t\v\xD3\x576\x8D3\xC74D a"; - const ::wstring str(s, sizeof(s)/sizeof(wchar_t)); - EXPECT_EQ("L\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v" - "\\xD3\\x576\\x8D3\\xC74D a\\0\"", - Print(str)); -} -#endif // GTEST_HAS_GLOBAL_WSTRING - -#if GTEST_HAS_STD_WSTRING -// ::std::wstring. -TEST(PrintWideStringTest, StringInStdNamespace) { - const wchar_t s[] = L"'\"?\\\a\b\f\n\0\r\t\v\xD3\x576\x8D3\xC74D a"; - const ::std::wstring str(s, sizeof(s)/sizeof(wchar_t)); - EXPECT_EQ("L\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v" - "\\xD3\\x576\\x8D3\\xC74D a\\0\"", - Print(str)); -} - -TEST(PrintWideStringTest, StringAmbiguousHex) { - // same for wide strings. - EXPECT_EQ("L\"0\\x12\" L\"3\"", Print(::std::wstring(L"0\x12" L"3"))); - EXPECT_EQ("L\"mm\\x6\" L\"bananas\"", - Print(::std::wstring(L"mm\x6" L"bananas"))); - EXPECT_EQ("L\"NOM\\x6\" L\"BANANA\"", - Print(::std::wstring(L"NOM\x6" L"BANANA"))); - EXPECT_EQ("L\"!\\x5-!\"", Print(::std::wstring(L"!\x5-!"))); -} -#endif // GTEST_HAS_STD_WSTRING - -// Tests printing types that support generic streaming (i.e. streaming -// to std::basic_ostream for any valid Char and -// CharTraits types). - -// Tests printing a non-template type that supports generic streaming. - -class AllowsGenericStreaming {}; - -template -std::basic_ostream& operator<<( - std::basic_ostream& os, - const AllowsGenericStreaming& /* a */) { - return os << "AllowsGenericStreaming"; -} - -TEST(PrintTypeWithGenericStreamingTest, NonTemplateType) { - AllowsGenericStreaming a; - EXPECT_EQ("AllowsGenericStreaming", Print(a)); -} - -// Tests printing a template type that supports generic streaming. - -template -class AllowsGenericStreamingTemplate {}; - -template -std::basic_ostream& operator<<( - std::basic_ostream& os, - const AllowsGenericStreamingTemplate& /* a */) { - return os << "AllowsGenericStreamingTemplate"; -} - -TEST(PrintTypeWithGenericStreamingTest, TemplateType) { - AllowsGenericStreamingTemplate a; - EXPECT_EQ("AllowsGenericStreamingTemplate", Print(a)); -} - -// Tests printing a type that supports generic streaming and can be -// implicitly converted to another printable type. - -template -class AllowsGenericStreamingAndImplicitConversionTemplate { - public: - operator bool() const { return false; } -}; - -template -std::basic_ostream& operator<<( - std::basic_ostream& os, - const AllowsGenericStreamingAndImplicitConversionTemplate& /* a */) { - return os << "AllowsGenericStreamingAndImplicitConversionTemplate"; -} - -TEST(PrintTypeWithGenericStreamingTest, TypeImplicitlyConvertible) { - AllowsGenericStreamingAndImplicitConversionTemplate a; - EXPECT_EQ("AllowsGenericStreamingAndImplicitConversionTemplate", Print(a)); -} - -#if GTEST_HAS_ABSL - -// Tests printing ::absl::string_view. - -TEST(PrintStringViewTest, SimpleStringView) { - const ::absl::string_view sp = "Hello"; - EXPECT_EQ("\"Hello\"", Print(sp)); -} - -TEST(PrintStringViewTest, UnprintableCharacters) { - const char str[] = "NUL (\0) and \r\t"; - const ::absl::string_view sp(str, sizeof(str) - 1); - EXPECT_EQ("\"NUL (\\0) and \\r\\t\"", Print(sp)); -} - -#endif // GTEST_HAS_ABSL - -// Tests printing STL containers. - -TEST(PrintStlContainerTest, EmptyDeque) { - deque empty; - EXPECT_EQ("{}", Print(empty)); -} - -TEST(PrintStlContainerTest, NonEmptyDeque) { - deque non_empty; - non_empty.push_back(1); - non_empty.push_back(3); - EXPECT_EQ("{ 1, 3 }", Print(non_empty)); -} - -#if GTEST_HAS_UNORDERED_MAP_ - -TEST(PrintStlContainerTest, OneElementHashMap) { - ::std::unordered_map map1; - map1[1] = 'a'; - EXPECT_EQ("{ (1, 'a' (97, 0x61)) }", Print(map1)); -} - -TEST(PrintStlContainerTest, HashMultiMap) { - ::std::unordered_multimap map1; - map1.insert(make_pair(5, true)); - map1.insert(make_pair(5, false)); - - // Elements of hash_multimap can be printed in any order. - const std::string result = Print(map1); - EXPECT_TRUE(result == "{ (5, true), (5, false) }" || - result == "{ (5, false), (5, true) }") - << " where Print(map1) returns \"" << result << "\"."; -} - -#endif // GTEST_HAS_UNORDERED_MAP_ - -#if GTEST_HAS_UNORDERED_SET_ - -TEST(PrintStlContainerTest, HashSet) { - ::std::unordered_set set1; - set1.insert(1); - EXPECT_EQ("{ 1 }", Print(set1)); -} - -TEST(PrintStlContainerTest, HashMultiSet) { - const int kSize = 5; - int a[kSize] = { 1, 1, 2, 5, 1 }; - ::std::unordered_multiset set1(a, a + kSize); - - // Elements of hash_multiset can be printed in any order. - const std::string result = Print(set1); - const std::string expected_pattern = "{ d, d, d, d, d }"; // d means a digit. - - // Verifies the result matches the expected pattern; also extracts - // the numbers in the result. - ASSERT_EQ(expected_pattern.length(), result.length()); - std::vector numbers; - for (size_t i = 0; i != result.length(); i++) { - if (expected_pattern[i] == 'd') { - ASSERT_NE(isdigit(static_cast(result[i])), 0); - numbers.push_back(result[i] - '0'); - } else { - EXPECT_EQ(expected_pattern[i], result[i]) << " where result is " - << result; - } - } - - // Makes sure the result contains the right numbers. - std::sort(numbers.begin(), numbers.end()); - std::sort(a, a + kSize); - EXPECT_TRUE(std::equal(a, a + kSize, numbers.begin())); -} - -#endif // GTEST_HAS_UNORDERED_SET_ - -TEST(PrintStlContainerTest, List) { - const std::string a[] = {"hello", "world"}; - const list strings(a, a + 2); - EXPECT_EQ("{ \"hello\", \"world\" }", Print(strings)); -} - -TEST(PrintStlContainerTest, Map) { - map map1; - map1[1] = true; - map1[5] = false; - map1[3] = true; - EXPECT_EQ("{ (1, true), (3, true), (5, false) }", Print(map1)); -} - -TEST(PrintStlContainerTest, MultiMap) { - multimap map1; - // The make_pair template function would deduce the type as - // pair here, and since the key part in a multimap has to - // be constant, without a templated ctor in the pair class (as in - // libCstd on Solaris), make_pair call would fail to compile as no - // implicit conversion is found. Thus explicit typename is used - // here instead. - map1.insert(pair(true, 0)); - map1.insert(pair(true, 1)); - map1.insert(pair(false, 2)); - EXPECT_EQ("{ (false, 2), (true, 0), (true, 1) }", Print(map1)); -} - -TEST(PrintStlContainerTest, Set) { - const unsigned int a[] = { 3, 0, 5 }; - set set1(a, a + 3); - EXPECT_EQ("{ 0, 3, 5 }", Print(set1)); -} - -TEST(PrintStlContainerTest, MultiSet) { - const int a[] = { 1, 1, 2, 5, 1 }; - multiset set1(a, a + 5); - EXPECT_EQ("{ 1, 1, 1, 2, 5 }", Print(set1)); -} - -#if GTEST_HAS_STD_FORWARD_LIST_ -// is available on Linux in the google3 mode, but not on -// Windows or Mac OS X. - -TEST(PrintStlContainerTest, SinglyLinkedList) { - int a[] = { 9, 2, 8 }; - const std::forward_list ints(a, a + 3); - EXPECT_EQ("{ 9, 2, 8 }", Print(ints)); -} -#endif // GTEST_HAS_STD_FORWARD_LIST_ - -TEST(PrintStlContainerTest, Pair) { - pair p(true, 5); - EXPECT_EQ("(true, 5)", Print(p)); -} - -TEST(PrintStlContainerTest, Vector) { - vector v; - v.push_back(1); - v.push_back(2); - EXPECT_EQ("{ 1, 2 }", Print(v)); -} - -TEST(PrintStlContainerTest, LongSequence) { - const int a[100] = { 1, 2, 3 }; - const vector v(a, a + 100); - EXPECT_EQ("{ 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, " - "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ... }", Print(v)); -} - -TEST(PrintStlContainerTest, NestedContainer) { - const int a1[] = { 1, 2 }; - const int a2[] = { 3, 4, 5 }; - const list l1(a1, a1 + 2); - const list l2(a2, a2 + 3); - - vector > v; - v.push_back(l1); - v.push_back(l2); - EXPECT_EQ("{ { 1, 2 }, { 3, 4, 5 } }", Print(v)); -} - -TEST(PrintStlContainerTest, OneDimensionalNativeArray) { - const int a[3] = { 1, 2, 3 }; - NativeArray b(a, 3, RelationToSourceReference()); - EXPECT_EQ("{ 1, 2, 3 }", Print(b)); -} - -TEST(PrintStlContainerTest, TwoDimensionalNativeArray) { - const int a[2][3] = { { 1, 2, 3 }, { 4, 5, 6 } }; - NativeArray b(a, 2, RelationToSourceReference()); - EXPECT_EQ("{ { 1, 2, 3 }, { 4, 5, 6 } }", Print(b)); -} - -// Tests that a class named iterator isn't treated as a container. - -struct iterator { - char x; -}; - -TEST(PrintStlContainerTest, Iterator) { - iterator it = {}; - EXPECT_EQ("1-byte object <00>", Print(it)); -} - -// Tests that a class named const_iterator isn't treated as a container. - -struct const_iterator { - char x; -}; - -TEST(PrintStlContainerTest, ConstIterator) { - const_iterator it = {}; - EXPECT_EQ("1-byte object <00>", Print(it)); -} - -#if GTEST_HAS_TR1_TUPLE -// Tests printing ::std::tr1::tuples. - -// Tuples of various arities. -TEST(PrintTr1TupleTest, VariousSizes) { - ::std::tr1::tuple<> t0; - EXPECT_EQ("()", Print(t0)); - - ::std::tr1::tuple t1(5); - EXPECT_EQ("(5)", Print(t1)); - - ::std::tr1::tuple t2('a', true); - EXPECT_EQ("('a' (97, 0x61), true)", Print(t2)); - - ::std::tr1::tuple t3(false, 2, 3); - EXPECT_EQ("(false, 2, 3)", Print(t3)); - - ::std::tr1::tuple t4(false, 2, 3, 4); - EXPECT_EQ("(false, 2, 3, 4)", Print(t4)); - - ::std::tr1::tuple t5(false, 2, 3, 4, true); - EXPECT_EQ("(false, 2, 3, 4, true)", Print(t5)); - - ::std::tr1::tuple t6(false, 2, 3, 4, true, 6); - EXPECT_EQ("(false, 2, 3, 4, true, 6)", Print(t6)); - - ::std::tr1::tuple t7( - false, 2, 3, 4, true, 6, 7); - EXPECT_EQ("(false, 2, 3, 4, true, 6, 7)", Print(t7)); - - ::std::tr1::tuple t8( - false, 2, 3, 4, true, 6, 7, true); - EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true)", Print(t8)); - - ::std::tr1::tuple t9( - false, 2, 3, 4, true, 6, 7, true, 9); - EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true, 9)", Print(t9)); - - const char* const str = "8"; - // VC++ 2010's implementation of tuple of C++0x is deficient, requiring - // an explicit type cast of NULL to be used. - ::std::tr1::tuple - t10(false, 'a', static_cast(3), 4, 5, 1.5F, -2.5, str, // NOLINT - ImplicitCast_(NULL), "10"); - EXPECT_EQ("(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, " + PrintPointer(str) + - " pointing to \"8\", NULL, \"10\")", - Print(t10)); -} - -// Nested tuples. -TEST(PrintTr1TupleTest, NestedTuple) { - ::std::tr1::tuple< ::std::tr1::tuple, char> nested( - ::std::tr1::make_tuple(5, true), 'a'); - EXPECT_EQ("((5, true), 'a' (97, 0x61))", Print(nested)); -} - -#endif // GTEST_HAS_TR1_TUPLE - -#if GTEST_HAS_STD_TUPLE_ -// Tests printing ::std::tuples. - -// Tuples of various arities. -TEST(PrintStdTupleTest, VariousSizes) { - ::std::tuple<> t0; - EXPECT_EQ("()", Print(t0)); - - ::std::tuple t1(5); - EXPECT_EQ("(5)", Print(t1)); - - ::std::tuple t2('a', true); - EXPECT_EQ("('a' (97, 0x61), true)", Print(t2)); - - ::std::tuple t3(false, 2, 3); - EXPECT_EQ("(false, 2, 3)", Print(t3)); - - ::std::tuple t4(false, 2, 3, 4); - EXPECT_EQ("(false, 2, 3, 4)", Print(t4)); - - ::std::tuple t5(false, 2, 3, 4, true); - EXPECT_EQ("(false, 2, 3, 4, true)", Print(t5)); - - ::std::tuple t6(false, 2, 3, 4, true, 6); - EXPECT_EQ("(false, 2, 3, 4, true, 6)", Print(t6)); - - ::std::tuple t7( - false, 2, 3, 4, true, 6, 7); - EXPECT_EQ("(false, 2, 3, 4, true, 6, 7)", Print(t7)); - - ::std::tuple t8( - false, 2, 3, 4, true, 6, 7, true); - EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true)", Print(t8)); - - ::std::tuple t9( - false, 2, 3, 4, true, 6, 7, true, 9); - EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true, 9)", Print(t9)); - - const char* const str = "8"; - // VC++ 2010's implementation of tuple of C++0x is deficient, requiring - // an explicit type cast of NULL to be used. - ::std::tuple - t10(false, 'a', static_cast(3), 4, 5, 1.5F, -2.5, str, // NOLINT - ImplicitCast_(NULL), "10"); - EXPECT_EQ("(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, " + PrintPointer(str) + - " pointing to \"8\", NULL, \"10\")", - Print(t10)); -} - -// Nested tuples. -TEST(PrintStdTupleTest, NestedTuple) { - ::std::tuple< ::std::tuple, char> nested( - ::std::make_tuple(5, true), 'a'); - EXPECT_EQ("((5, true), 'a' (97, 0x61))", Print(nested)); -} - -#endif // GTEST_LANG_CXX11 - -// Tests printing user-defined unprintable types. - -// Unprintable types in the global namespace. -TEST(PrintUnprintableTypeTest, InGlobalNamespace) { - EXPECT_EQ("1-byte object <00>", - Print(UnprintableTemplateInGlobal())); -} - -// Unprintable types in a user namespace. -TEST(PrintUnprintableTypeTest, InUserNamespace) { - EXPECT_EQ("16-byte object ", - Print(::foo::UnprintableInFoo())); -} - -// Unprintable types are that too big to be printed completely. - -struct Big { - Big() { memset(array, 0, sizeof(array)); } - char array[257]; -}; - -TEST(PrintUnpritableTypeTest, BigObject) { - EXPECT_EQ("257-byte object <00-00 00-00 00-00 00-00 00-00 00-00 " - "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 " - "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 " - "00-00 00-00 00-00 00-00 00-00 00-00 ... 00-00 00-00 00-00 " - "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 " - "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 " - "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00>", - Print(Big())); -} - -// Tests printing user-defined streamable types. - -// Streamable types in the global namespace. -TEST(PrintStreamableTypeTest, InGlobalNamespace) { - StreamableInGlobal x; - EXPECT_EQ("StreamableInGlobal", Print(x)); - EXPECT_EQ("StreamableInGlobal*", Print(&x)); -} - -// Printable template types in a user namespace. -TEST(PrintStreamableTypeTest, TemplateTypeInUserNamespace) { - EXPECT_EQ("StreamableTemplateInFoo: 0", - Print(::foo::StreamableTemplateInFoo())); -} - -// Tests printing a user-defined recursive container type that has a << -// operator. -TEST(PrintStreamableTypeTest, PathLikeInUserNamespace) { - ::foo::PathLike x; - EXPECT_EQ("Streamable-PathLike", Print(x)); - const ::foo::PathLike cx; - EXPECT_EQ("Streamable-PathLike", Print(cx)); -} - -// Tests printing user-defined types that have a PrintTo() function. -TEST(PrintPrintableTypeTest, InUserNamespace) { - EXPECT_EQ("PrintableViaPrintTo: 0", - Print(::foo::PrintableViaPrintTo())); -} - -// Tests printing a pointer to a user-defined type that has a << -// operator for its pointer. -TEST(PrintPrintableTypeTest, PointerInUserNamespace) { - ::foo::PointerPrintable x; - EXPECT_EQ("PointerPrintable*", Print(&x)); -} - -// Tests printing user-defined class template that have a PrintTo() function. -TEST(PrintPrintableTypeTest, TemplateInUserNamespace) { - EXPECT_EQ("PrintableViaPrintToTemplate: 5", - Print(::foo::PrintableViaPrintToTemplate(5))); -} - -// Tests that the universal printer prints both the address and the -// value of a reference. -TEST(PrintReferenceTest, PrintsAddressAndValue) { - int n = 5; - EXPECT_EQ("@" + PrintPointer(&n) + " 5", PrintByRef(n)); - - int a[2][3] = { - { 0, 1, 2 }, - { 3, 4, 5 } - }; - EXPECT_EQ("@" + PrintPointer(a) + " { { 0, 1, 2 }, { 3, 4, 5 } }", - PrintByRef(a)); - - const ::foo::UnprintableInFoo x; - EXPECT_EQ("@" + PrintPointer(&x) + " 16-byte object " - "", - PrintByRef(x)); -} - -// Tests that the universal printer prints a function pointer passed by -// reference. -TEST(PrintReferenceTest, HandlesFunctionPointer) { - void (*fp)(int n) = &MyFunction; - const std::string fp_pointer_string = - PrintPointer(reinterpret_cast(&fp)); - // We cannot directly cast &MyFunction to const void* because the - // standard disallows casting between pointers to functions and - // pointers to objects, and some compilers (e.g. GCC 3.4) enforce - // this limitation. - const std::string fp_string = PrintPointer(reinterpret_cast( - reinterpret_cast(fp))); - EXPECT_EQ("@" + fp_pointer_string + " " + fp_string, - PrintByRef(fp)); -} - -// Tests that the universal printer prints a member function pointer -// passed by reference. -TEST(PrintReferenceTest, HandlesMemberFunctionPointer) { - int (Foo::*p)(char ch) = &Foo::MyMethod; - EXPECT_TRUE(HasPrefix( - PrintByRef(p), - "@" + PrintPointer(reinterpret_cast(&p)) + " " + - Print(sizeof(p)) + "-byte object ")); - - char (Foo::*p2)(int n) = &Foo::MyVirtualMethod; - EXPECT_TRUE(HasPrefix( - PrintByRef(p2), - "@" + PrintPointer(reinterpret_cast(&p2)) + " " + - Print(sizeof(p2)) + "-byte object ")); -} - -// Tests that the universal printer prints a member variable pointer -// passed by reference. -TEST(PrintReferenceTest, HandlesMemberVariablePointer) { - int (Foo::*p) = &Foo::value; // NOLINT - EXPECT_TRUE(HasPrefix( - PrintByRef(p), - "@" + PrintPointer(&p) + " " + Print(sizeof(p)) + "-byte object ")); -} - -// Tests that FormatForComparisonFailureMessage(), which is used to print -// an operand in a comparison assertion (e.g. ASSERT_EQ) when the assertion -// fails, formats the operand in the desired way. - -// scalar -TEST(FormatForComparisonFailureMessageTest, WorksForScalar) { - EXPECT_STREQ("123", - FormatForComparisonFailureMessage(123, 124).c_str()); -} - -// non-char pointer -TEST(FormatForComparisonFailureMessageTest, WorksForNonCharPointer) { - int n = 0; - EXPECT_EQ(PrintPointer(&n), - FormatForComparisonFailureMessage(&n, &n).c_str()); -} - -// non-char array -TEST(FormatForComparisonFailureMessageTest, FormatsNonCharArrayAsPointer) { - // In expression 'array == x', 'array' is compared by pointer. - // Therefore we want to print an array operand as a pointer. - int n[] = { 1, 2, 3 }; - EXPECT_EQ(PrintPointer(n), - FormatForComparisonFailureMessage(n, n).c_str()); -} - -// Tests formatting a char pointer when it's compared with another pointer. -// In this case we want to print it as a raw pointer, as the comparison is by -// pointer. - -// char pointer vs pointer -TEST(FormatForComparisonFailureMessageTest, WorksForCharPointerVsPointer) { - // In expression 'p == x', where 'p' and 'x' are (const or not) char - // pointers, the operands are compared by pointer. Therefore we - // want to print 'p' as a pointer instead of a C string (we don't - // even know if it's supposed to point to a valid C string). - - // const char* - const char* s = "hello"; - EXPECT_EQ(PrintPointer(s), - FormatForComparisonFailureMessage(s, s).c_str()); - - // char* - char ch = 'a'; - EXPECT_EQ(PrintPointer(&ch), - FormatForComparisonFailureMessage(&ch, &ch).c_str()); -} - -// wchar_t pointer vs pointer -TEST(FormatForComparisonFailureMessageTest, WorksForWCharPointerVsPointer) { - // In expression 'p == x', where 'p' and 'x' are (const or not) char - // pointers, the operands are compared by pointer. Therefore we - // want to print 'p' as a pointer instead of a wide C string (we don't - // even know if it's supposed to point to a valid wide C string). - - // const wchar_t* - const wchar_t* s = L"hello"; - EXPECT_EQ(PrintPointer(s), - FormatForComparisonFailureMessage(s, s).c_str()); - - // wchar_t* - wchar_t ch = L'a'; - EXPECT_EQ(PrintPointer(&ch), - FormatForComparisonFailureMessage(&ch, &ch).c_str()); -} - -// Tests formatting a char pointer when it's compared to a string object. -// In this case we want to print the char pointer as a C string. - -#if GTEST_HAS_GLOBAL_STRING -// char pointer vs ::string -TEST(FormatForComparisonFailureMessageTest, WorksForCharPointerVsString) { - const char* s = "hello \"world"; - EXPECT_STREQ("\"hello \\\"world\"", // The string content should be escaped. - FormatForComparisonFailureMessage(s, ::string()).c_str()); - - // char* - char str[] = "hi\1"; - char* p = str; - EXPECT_STREQ("\"hi\\x1\"", // The string content should be escaped. - FormatForComparisonFailureMessage(p, ::string()).c_str()); -} -#endif - -// char pointer vs std::string -TEST(FormatForComparisonFailureMessageTest, WorksForCharPointerVsStdString) { - const char* s = "hello \"world"; - EXPECT_STREQ("\"hello \\\"world\"", // The string content should be escaped. - FormatForComparisonFailureMessage(s, ::std::string()).c_str()); - - // char* - char str[] = "hi\1"; - char* p = str; - EXPECT_STREQ("\"hi\\x1\"", // The string content should be escaped. - FormatForComparisonFailureMessage(p, ::std::string()).c_str()); -} - -#if GTEST_HAS_GLOBAL_WSTRING -// wchar_t pointer vs ::wstring -TEST(FormatForComparisonFailureMessageTest, WorksForWCharPointerVsWString) { - const wchar_t* s = L"hi \"world"; - EXPECT_STREQ("L\"hi \\\"world\"", // The string content should be escaped. - FormatForComparisonFailureMessage(s, ::wstring()).c_str()); - - // wchar_t* - wchar_t str[] = L"hi\1"; - wchar_t* p = str; - EXPECT_STREQ("L\"hi\\x1\"", // The string content should be escaped. - FormatForComparisonFailureMessage(p, ::wstring()).c_str()); -} -#endif - -#if GTEST_HAS_STD_WSTRING -// wchar_t pointer vs std::wstring -TEST(FormatForComparisonFailureMessageTest, WorksForWCharPointerVsStdWString) { - const wchar_t* s = L"hi \"world"; - EXPECT_STREQ("L\"hi \\\"world\"", // The string content should be escaped. - FormatForComparisonFailureMessage(s, ::std::wstring()).c_str()); - - // wchar_t* - wchar_t str[] = L"hi\1"; - wchar_t* p = str; - EXPECT_STREQ("L\"hi\\x1\"", // The string content should be escaped. - FormatForComparisonFailureMessage(p, ::std::wstring()).c_str()); -} -#endif - -// Tests formatting a char array when it's compared with a pointer or array. -// In this case we want to print the array as a row pointer, as the comparison -// is by pointer. - -// char array vs pointer -TEST(FormatForComparisonFailureMessageTest, WorksForCharArrayVsPointer) { - char str[] = "hi \"world\""; - char* p = NULL; - EXPECT_EQ(PrintPointer(str), - FormatForComparisonFailureMessage(str, p).c_str()); -} - -// char array vs char array -TEST(FormatForComparisonFailureMessageTest, WorksForCharArrayVsCharArray) { - const char str[] = "hi \"world\""; - EXPECT_EQ(PrintPointer(str), - FormatForComparisonFailureMessage(str, str).c_str()); -} - -// wchar_t array vs pointer -TEST(FormatForComparisonFailureMessageTest, WorksForWCharArrayVsPointer) { - wchar_t str[] = L"hi \"world\""; - wchar_t* p = NULL; - EXPECT_EQ(PrintPointer(str), - FormatForComparisonFailureMessage(str, p).c_str()); -} - -// wchar_t array vs wchar_t array -TEST(FormatForComparisonFailureMessageTest, WorksForWCharArrayVsWCharArray) { - const wchar_t str[] = L"hi \"world\""; - EXPECT_EQ(PrintPointer(str), - FormatForComparisonFailureMessage(str, str).c_str()); -} - -// Tests formatting a char array when it's compared with a string object. -// In this case we want to print the array as a C string. - -#if GTEST_HAS_GLOBAL_STRING -// char array vs string -TEST(FormatForComparisonFailureMessageTest, WorksForCharArrayVsString) { - const char str[] = "hi \"w\0rld\""; - EXPECT_STREQ("\"hi \\\"w\"", // The content should be escaped. - // Embedded NUL terminates the string. - FormatForComparisonFailureMessage(str, ::string()).c_str()); -} -#endif - -// char array vs std::string -TEST(FormatForComparisonFailureMessageTest, WorksForCharArrayVsStdString) { - const char str[] = "hi \"world\""; - EXPECT_STREQ("\"hi \\\"world\\\"\"", // The content should be escaped. - FormatForComparisonFailureMessage(str, ::std::string()).c_str()); -} - -#if GTEST_HAS_GLOBAL_WSTRING -// wchar_t array vs wstring -TEST(FormatForComparisonFailureMessageTest, WorksForWCharArrayVsWString) { - const wchar_t str[] = L"hi \"world\""; - EXPECT_STREQ("L\"hi \\\"world\\\"\"", // The content should be escaped. - FormatForComparisonFailureMessage(str, ::wstring()).c_str()); -} -#endif - -#if GTEST_HAS_STD_WSTRING -// wchar_t array vs std::wstring -TEST(FormatForComparisonFailureMessageTest, WorksForWCharArrayVsStdWString) { - const wchar_t str[] = L"hi \"w\0rld\""; - EXPECT_STREQ( - "L\"hi \\\"w\"", // The content should be escaped. - // Embedded NUL terminates the string. - FormatForComparisonFailureMessage(str, ::std::wstring()).c_str()); -} -#endif - -// Useful for testing PrintToString(). We cannot use EXPECT_EQ() -// there as its implementation uses PrintToString(). The caller must -// ensure that 'value' has no side effect. -#define EXPECT_PRINT_TO_STRING_(value, expected_string) \ - EXPECT_TRUE(PrintToString(value) == (expected_string)) \ - << " where " #value " prints as " << (PrintToString(value)) - -TEST(PrintToStringTest, WorksForScalar) { - EXPECT_PRINT_TO_STRING_(123, "123"); -} - -TEST(PrintToStringTest, WorksForPointerToConstChar) { - const char* p = "hello"; - EXPECT_PRINT_TO_STRING_(p, "\"hello\""); -} - -TEST(PrintToStringTest, WorksForPointerToNonConstChar) { - char s[] = "hello"; - char* p = s; - EXPECT_PRINT_TO_STRING_(p, "\"hello\""); -} - -TEST(PrintToStringTest, EscapesForPointerToConstChar) { - const char* p = "hello\n"; - EXPECT_PRINT_TO_STRING_(p, "\"hello\\n\""); -} - -TEST(PrintToStringTest, EscapesForPointerToNonConstChar) { - char s[] = "hello\1"; - char* p = s; - EXPECT_PRINT_TO_STRING_(p, "\"hello\\x1\""); -} - -TEST(PrintToStringTest, WorksForArray) { - int n[3] = { 1, 2, 3 }; - EXPECT_PRINT_TO_STRING_(n, "{ 1, 2, 3 }"); -} - -TEST(PrintToStringTest, WorksForCharArray) { - char s[] = "hello"; - EXPECT_PRINT_TO_STRING_(s, "\"hello\""); -} - -TEST(PrintToStringTest, WorksForCharArrayWithEmbeddedNul) { - const char str_with_nul[] = "hello\0 world"; - EXPECT_PRINT_TO_STRING_(str_with_nul, "\"hello\\0 world\""); - - char mutable_str_with_nul[] = "hello\0 world"; - EXPECT_PRINT_TO_STRING_(mutable_str_with_nul, "\"hello\\0 world\""); -} - - TEST(PrintToStringTest, ContainsNonLatin) { - // Sanity test with valid UTF-8. Prints both in hex and as text. - std::string non_ascii_str = ::std::string("오전 4:30"); - EXPECT_PRINT_TO_STRING_(non_ascii_str, - "\"\\xEC\\x98\\xA4\\xEC\\xA0\\x84 4:30\"\n" - " As Text: \"오전 4:30\""); - non_ascii_str = ::std::string("From ä — ẑ"); - EXPECT_PRINT_TO_STRING_(non_ascii_str, - "\"From \\xC3\\xA4 \\xE2\\x80\\x94 \\xE1\\xBA\\x91\"" - "\n As Text: \"From ä — ẑ\""); -} - -TEST(IsValidUTF8Test, IllFormedUTF8) { - // The following test strings are ill-formed UTF-8 and are printed - // as hex only (or ASCII, in case of ASCII bytes) because IsValidUTF8() is - // expected to fail, thus output does not contain "As Text:". - - static const char *const kTestdata[][2] = { - // 2-byte lead byte followed by a single-byte character. - {"\xC3\x74", "\"\\xC3t\""}, - // Valid 2-byte character followed by an orphan trail byte. - {"\xC3\x84\xA4", "\"\\xC3\\x84\\xA4\""}, - // Lead byte without trail byte. - {"abc\xC3", "\"abc\\xC3\""}, - // 3-byte lead byte, single-byte character, orphan trail byte. - {"x\xE2\x70\x94", "\"x\\xE2p\\x94\""}, - // Truncated 3-byte character. - {"\xE2\x80", "\"\\xE2\\x80\""}, - // Truncated 3-byte character followed by valid 2-byte char. - {"\xE2\x80\xC3\x84", "\"\\xE2\\x80\\xC3\\x84\""}, - // Truncated 3-byte character followed by a single-byte character. - {"\xE2\x80\x7A", "\"\\xE2\\x80z\""}, - // 3-byte lead byte followed by valid 3-byte character. - {"\xE2\xE2\x80\x94", "\"\\xE2\\xE2\\x80\\x94\""}, - // 4-byte lead byte followed by valid 3-byte character. - {"\xF0\xE2\x80\x94", "\"\\xF0\\xE2\\x80\\x94\""}, - // Truncated 4-byte character. - {"\xF0\xE2\x80", "\"\\xF0\\xE2\\x80\""}, - // Invalid UTF-8 byte sequences embedded in other chars. - {"abc\xE2\x80\x94\xC3\x74xyc", "\"abc\\xE2\\x80\\x94\\xC3txyc\""}, - {"abc\xC3\x84\xE2\x80\xC3\x84xyz", - "\"abc\\xC3\\x84\\xE2\\x80\\xC3\\x84xyz\""}, - // Non-shortest UTF-8 byte sequences are also ill-formed. - // The classics: xC0, xC1 lead byte. - {"\xC0\x80", "\"\\xC0\\x80\""}, - {"\xC1\x81", "\"\\xC1\\x81\""}, - // Non-shortest sequences. - {"\xE0\x80\x80", "\"\\xE0\\x80\\x80\""}, - {"\xf0\x80\x80\x80", "\"\\xF0\\x80\\x80\\x80\""}, - // Last valid code point before surrogate range, should be printed as text, - // too. - {"\xED\x9F\xBF", "\"\\xED\\x9F\\xBF\"\n As Text: \"퟿\""}, - // Start of surrogate lead. Surrogates are not printed as text. - {"\xED\xA0\x80", "\"\\xED\\xA0\\x80\""}, - // Last non-private surrogate lead. - {"\xED\xAD\xBF", "\"\\xED\\xAD\\xBF\""}, - // First private-use surrogate lead. - {"\xED\xAE\x80", "\"\\xED\\xAE\\x80\""}, - // Last private-use surrogate lead. - {"\xED\xAF\xBF", "\"\\xED\\xAF\\xBF\""}, - // Mid-point of surrogate trail. - {"\xED\xB3\xBF", "\"\\xED\\xB3\\xBF\""}, - // First valid code point after surrogate range, should be printed as text, - // too. - {"\xEE\x80\x80", "\"\\xEE\\x80\\x80\"\n As Text: \"\""} - }; - - for (int i = 0; i < int(sizeof(kTestdata)/sizeof(kTestdata[0])); ++i) { - EXPECT_PRINT_TO_STRING_(kTestdata[i][0], kTestdata[i][1]); - } -} - -#undef EXPECT_PRINT_TO_STRING_ - -TEST(UniversalTersePrintTest, WorksForNonReference) { - ::std::stringstream ss; - UniversalTersePrint(123, &ss); - EXPECT_EQ("123", ss.str()); -} - -TEST(UniversalTersePrintTest, WorksForReference) { - const int& n = 123; - ::std::stringstream ss; - UniversalTersePrint(n, &ss); - EXPECT_EQ("123", ss.str()); -} - -TEST(UniversalTersePrintTest, WorksForCString) { - const char* s1 = "abc"; - ::std::stringstream ss1; - UniversalTersePrint(s1, &ss1); - EXPECT_EQ("\"abc\"", ss1.str()); - - char* s2 = const_cast(s1); - ::std::stringstream ss2; - UniversalTersePrint(s2, &ss2); - EXPECT_EQ("\"abc\"", ss2.str()); - - const char* s3 = NULL; - ::std::stringstream ss3; - UniversalTersePrint(s3, &ss3); - EXPECT_EQ("NULL", ss3.str()); -} - -TEST(UniversalPrintTest, WorksForNonReference) { - ::std::stringstream ss; - UniversalPrint(123, &ss); - EXPECT_EQ("123", ss.str()); -} - -TEST(UniversalPrintTest, WorksForReference) { - const int& n = 123; - ::std::stringstream ss; - UniversalPrint(n, &ss); - EXPECT_EQ("123", ss.str()); -} - -TEST(UniversalPrintTest, WorksForCString) { - const char* s1 = "abc"; - ::std::stringstream ss1; - UniversalPrint(s1, &ss1); - EXPECT_EQ(PrintPointer(s1) + " pointing to \"abc\"", std::string(ss1.str())); - - char* s2 = const_cast(s1); - ::std::stringstream ss2; - UniversalPrint(s2, &ss2); - EXPECT_EQ(PrintPointer(s2) + " pointing to \"abc\"", std::string(ss2.str())); - - const char* s3 = NULL; - ::std::stringstream ss3; - UniversalPrint(s3, &ss3); - EXPECT_EQ("NULL", ss3.str()); -} - -TEST(UniversalPrintTest, WorksForCharArray) { - const char str[] = "\"Line\0 1\"\nLine 2"; - ::std::stringstream ss1; - UniversalPrint(str, &ss1); - EXPECT_EQ("\"\\\"Line\\0 1\\\"\\nLine 2\"", ss1.str()); - - const char mutable_str[] = "\"Line\0 1\"\nLine 2"; - ::std::stringstream ss2; - UniversalPrint(mutable_str, &ss2); - EXPECT_EQ("\"\\\"Line\\0 1\\\"\\nLine 2\"", ss2.str()); -} - -#if GTEST_HAS_TR1_TUPLE - -TEST(UniversalTersePrintTupleFieldsToStringsTestWithTr1, PrintsEmptyTuple) { - Strings result = UniversalTersePrintTupleFieldsToStrings( - ::std::tr1::make_tuple()); - EXPECT_EQ(0u, result.size()); -} - -TEST(UniversalTersePrintTupleFieldsToStringsTestWithTr1, PrintsOneTuple) { - Strings result = UniversalTersePrintTupleFieldsToStrings( - ::std::tr1::make_tuple(1)); - ASSERT_EQ(1u, result.size()); - EXPECT_EQ("1", result[0]); -} - -TEST(UniversalTersePrintTupleFieldsToStringsTestWithTr1, PrintsTwoTuple) { - Strings result = UniversalTersePrintTupleFieldsToStrings( - ::std::tr1::make_tuple(1, 'a')); - ASSERT_EQ(2u, result.size()); - EXPECT_EQ("1", result[0]); - EXPECT_EQ("'a' (97, 0x61)", result[1]); -} - -TEST(UniversalTersePrintTupleFieldsToStringsTestWithTr1, PrintsTersely) { - const int n = 1; - Strings result = UniversalTersePrintTupleFieldsToStrings( - ::std::tr1::tuple(n, "a")); - ASSERT_EQ(2u, result.size()); - EXPECT_EQ("1", result[0]); - EXPECT_EQ("\"a\"", result[1]); -} - -#endif // GTEST_HAS_TR1_TUPLE - -#if GTEST_HAS_STD_TUPLE_ - -TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsEmptyTuple) { - Strings result = UniversalTersePrintTupleFieldsToStrings(::std::make_tuple()); - EXPECT_EQ(0u, result.size()); -} - -TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsOneTuple) { - Strings result = UniversalTersePrintTupleFieldsToStrings( - ::std::make_tuple(1)); - ASSERT_EQ(1u, result.size()); - EXPECT_EQ("1", result[0]); -} - -TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsTwoTuple) { - Strings result = UniversalTersePrintTupleFieldsToStrings( - ::std::make_tuple(1, 'a')); - ASSERT_EQ(2u, result.size()); - EXPECT_EQ("1", result[0]); - EXPECT_EQ("'a' (97, 0x61)", result[1]); -} - -TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsTersely) { - const int n = 1; - Strings result = UniversalTersePrintTupleFieldsToStrings( - ::std::tuple(n, "a")); - ASSERT_EQ(2u, result.size()); - EXPECT_EQ("1", result[0]); - EXPECT_EQ("\"a\"", result[1]); -} - -#endif // GTEST_HAS_STD_TUPLE_ - -#if GTEST_HAS_ABSL - -TEST(PrintOptionalTest, Basic) { - absl::optional value; - EXPECT_EQ("(nullopt)", PrintToString(value)); - value = {7}; - EXPECT_EQ("(7)", PrintToString(value)); - EXPECT_EQ("(1.1)", PrintToString(absl::optional{1.1})); - EXPECT_EQ("(\"A\")", PrintToString(absl::optional{"A"})); -} -#endif // GTEST_HAS_ABSL - -} // namespace gtest_printers_test -} // namespace testing diff --git a/test/gtest-1.8.0/test/gtest-test-part_test.cc b/test/gtest-1.8.0/test/gtest-test-part_test.cc deleted file mode 100644 index ca8ba933ae..0000000000 --- a/test/gtest-1.8.0/test/gtest-test-part_test.cc +++ /dev/null @@ -1,208 +0,0 @@ -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: mheule@google.com (Markus Heule) -// - -#include "gtest/gtest-test-part.h" - -#include "gtest/gtest.h" - -using testing::Message; -using testing::Test; -using testing::TestPartResult; -using testing::TestPartResultArray; - -namespace { - -// Tests the TestPartResult class. - -// The test fixture for testing TestPartResult. -class TestPartResultTest : public Test { - protected: - TestPartResultTest() - : r1_(TestPartResult::kSuccess, "foo/bar.cc", 10, "Success!"), - r2_(TestPartResult::kNonFatalFailure, "foo/bar.cc", -1, "Failure!"), - r3_(TestPartResult::kFatalFailure, NULL, -1, "Failure!") {} - - TestPartResult r1_, r2_, r3_; -}; - - -TEST_F(TestPartResultTest, ConstructorWorks) { - Message message; - message << "something is terribly wrong"; - message << static_cast(testing::internal::kStackTraceMarker); - message << "some unimportant stack trace"; - - const TestPartResult result(TestPartResult::kNonFatalFailure, - "some_file.cc", - 42, - message.GetString().c_str()); - - EXPECT_EQ(TestPartResult::kNonFatalFailure, result.type()); - EXPECT_STREQ("some_file.cc", result.file_name()); - EXPECT_EQ(42, result.line_number()); - EXPECT_STREQ(message.GetString().c_str(), result.message()); - EXPECT_STREQ("something is terribly wrong", result.summary()); -} - -TEST_F(TestPartResultTest, ResultAccessorsWork) { - const TestPartResult success(TestPartResult::kSuccess, - "file.cc", - 42, - "message"); - EXPECT_TRUE(success.passed()); - EXPECT_FALSE(success.failed()); - EXPECT_FALSE(success.nonfatally_failed()); - EXPECT_FALSE(success.fatally_failed()); - - const TestPartResult nonfatal_failure(TestPartResult::kNonFatalFailure, - "file.cc", - 42, - "message"); - EXPECT_FALSE(nonfatal_failure.passed()); - EXPECT_TRUE(nonfatal_failure.failed()); - EXPECT_TRUE(nonfatal_failure.nonfatally_failed()); - EXPECT_FALSE(nonfatal_failure.fatally_failed()); - - const TestPartResult fatal_failure(TestPartResult::kFatalFailure, - "file.cc", - 42, - "message"); - EXPECT_FALSE(fatal_failure.passed()); - EXPECT_TRUE(fatal_failure.failed()); - EXPECT_FALSE(fatal_failure.nonfatally_failed()); - EXPECT_TRUE(fatal_failure.fatally_failed()); -} - -// Tests TestPartResult::type(). -TEST_F(TestPartResultTest, type) { - EXPECT_EQ(TestPartResult::kSuccess, r1_.type()); - EXPECT_EQ(TestPartResult::kNonFatalFailure, r2_.type()); - EXPECT_EQ(TestPartResult::kFatalFailure, r3_.type()); -} - -// Tests TestPartResult::file_name(). -TEST_F(TestPartResultTest, file_name) { - EXPECT_STREQ("foo/bar.cc", r1_.file_name()); - EXPECT_STREQ(NULL, r3_.file_name()); -} - -// Tests TestPartResult::line_number(). -TEST_F(TestPartResultTest, line_number) { - EXPECT_EQ(10, r1_.line_number()); - EXPECT_EQ(-1, r2_.line_number()); -} - -// Tests TestPartResult::message(). -TEST_F(TestPartResultTest, message) { - EXPECT_STREQ("Success!", r1_.message()); -} - -// Tests TestPartResult::passed(). -TEST_F(TestPartResultTest, Passed) { - EXPECT_TRUE(r1_.passed()); - EXPECT_FALSE(r2_.passed()); - EXPECT_FALSE(r3_.passed()); -} - -// Tests TestPartResult::failed(). -TEST_F(TestPartResultTest, Failed) { - EXPECT_FALSE(r1_.failed()); - EXPECT_TRUE(r2_.failed()); - EXPECT_TRUE(r3_.failed()); -} - -// Tests TestPartResult::fatally_failed(). -TEST_F(TestPartResultTest, FatallyFailed) { - EXPECT_FALSE(r1_.fatally_failed()); - EXPECT_FALSE(r2_.fatally_failed()); - EXPECT_TRUE(r3_.fatally_failed()); -} - -// Tests TestPartResult::nonfatally_failed(). -TEST_F(TestPartResultTest, NonfatallyFailed) { - EXPECT_FALSE(r1_.nonfatally_failed()); - EXPECT_TRUE(r2_.nonfatally_failed()); - EXPECT_FALSE(r3_.nonfatally_failed()); -} - -// Tests the TestPartResultArray class. - -class TestPartResultArrayTest : public Test { - protected: - TestPartResultArrayTest() - : r1_(TestPartResult::kNonFatalFailure, "foo/bar.cc", -1, "Failure 1"), - r2_(TestPartResult::kFatalFailure, "foo/bar.cc", -1, "Failure 2") {} - - const TestPartResult r1_, r2_; -}; - -// Tests that TestPartResultArray initially has size 0. -TEST_F(TestPartResultArrayTest, InitialSizeIsZero) { - TestPartResultArray results; - EXPECT_EQ(0, results.size()); -} - -// Tests that TestPartResultArray contains the given TestPartResult -// after one Append() operation. -TEST_F(TestPartResultArrayTest, ContainsGivenResultAfterAppend) { - TestPartResultArray results; - results.Append(r1_); - EXPECT_EQ(1, results.size()); - EXPECT_STREQ("Failure 1", results.GetTestPartResult(0).message()); -} - -// Tests that TestPartResultArray contains the given TestPartResults -// after two Append() operations. -TEST_F(TestPartResultArrayTest, ContainsGivenResultsAfterTwoAppends) { - TestPartResultArray results; - results.Append(r1_); - results.Append(r2_); - EXPECT_EQ(2, results.size()); - EXPECT_STREQ("Failure 1", results.GetTestPartResult(0).message()); - EXPECT_STREQ("Failure 2", results.GetTestPartResult(1).message()); -} - -typedef TestPartResultArrayTest TestPartResultArrayDeathTest; - -// Tests that the program dies when GetTestPartResult() is called with -// an invalid index. -TEST_F(TestPartResultArrayDeathTest, DiesWhenIndexIsOutOfBound) { - TestPartResultArray results; - results.Append(r1_); - - EXPECT_DEATH_IF_SUPPORTED(results.GetTestPartResult(-1), ""); - EXPECT_DEATH_IF_SUPPORTED(results.GetTestPartResult(1), ""); -} - -// TODO(mheule@google.com): Add a test for the class HasNewFatalFailureHelper. - -} // namespace diff --git a/test/gtest-1.8.0/test/gtest-tuple_test.cc b/test/gtest-1.8.0/test/gtest-tuple_test.cc deleted file mode 100644 index bfaa3e0ac4..0000000000 --- a/test/gtest-1.8.0/test/gtest-tuple_test.cc +++ /dev/null @@ -1,320 +0,0 @@ -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -#include "gtest/internal/gtest-tuple.h" -#include -#include "gtest/gtest.h" - -namespace { - -using ::std::tr1::get; -using ::std::tr1::make_tuple; -using ::std::tr1::tuple; -using ::std::tr1::tuple_element; -using ::std::tr1::tuple_size; -using ::testing::StaticAssertTypeEq; - -// Tests that tuple_element >::type returns TK. -TEST(tuple_element_Test, ReturnsElementType) { - StaticAssertTypeEq >::type>(); - StaticAssertTypeEq >::type>(); - StaticAssertTypeEq >::type>(); -} - -// Tests that tuple_size::value gives the number of fields in tuple -// type T. -TEST(tuple_size_Test, ReturnsNumberOfFields) { - EXPECT_EQ(0, +tuple_size >::value); - EXPECT_EQ(1, +tuple_size >::value); - EXPECT_EQ(1, +tuple_size >::value); - EXPECT_EQ(1, +(tuple_size > >::value)); - EXPECT_EQ(2, +(tuple_size >::value)); - EXPECT_EQ(3, +(tuple_size >::value)); -} - -// Tests comparing a tuple with itself. -TEST(ComparisonTest, ComparesWithSelf) { - const tuple a(5, 'a', false); - - EXPECT_TRUE(a == a); - EXPECT_FALSE(a != a); -} - -// Tests comparing two tuples with the same value. -TEST(ComparisonTest, ComparesEqualTuples) { - const tuple a(5, true), b(5, true); - - EXPECT_TRUE(a == b); - EXPECT_FALSE(a != b); -} - -// Tests comparing two different tuples that have no reference fields. -TEST(ComparisonTest, ComparesUnequalTuplesWithoutReferenceFields) { - typedef tuple FooTuple; - - const FooTuple a(0, 'x'); - const FooTuple b(1, 'a'); - - EXPECT_TRUE(a != b); - EXPECT_FALSE(a == b); - - const FooTuple c(1, 'b'); - - EXPECT_TRUE(b != c); - EXPECT_FALSE(b == c); -} - -// Tests comparing two different tuples that have reference fields. -TEST(ComparisonTest, ComparesUnequalTuplesWithReferenceFields) { - typedef tuple FooTuple; - - int i = 5; - const char ch = 'a'; - const FooTuple a(i, ch); - - int j = 6; - const FooTuple b(j, ch); - - EXPECT_TRUE(a != b); - EXPECT_FALSE(a == b); - - j = 5; - const char ch2 = 'b'; - const FooTuple c(j, ch2); - - EXPECT_TRUE(b != c); - EXPECT_FALSE(b == c); -} - -// Tests that a tuple field with a reference type is an alias of the -// variable it's supposed to reference. -TEST(ReferenceFieldTest, IsAliasOfReferencedVariable) { - int n = 0; - tuple t(true, n); - - n = 1; - EXPECT_EQ(n, get<1>(t)) - << "Changing a underlying variable should update the reference field."; - - // Makes sure that the implementation doesn't do anything funny with - // the & operator for the return type of get<>(). - EXPECT_EQ(&n, &(get<1>(t))) - << "The address of a reference field should equal the address of " - << "the underlying variable."; - - get<1>(t) = 2; - EXPECT_EQ(2, n) - << "Changing a reference field should update the underlying variable."; -} - -// Tests that tuple's default constructor default initializes each field. -// This test needs to compile without generating warnings. -TEST(TupleConstructorTest, DefaultConstructorDefaultInitializesEachField) { - // The TR1 report requires that tuple's default constructor default - // initializes each field, even if it's a primitive type. If the - // implementation forgets to do this, this test will catch it by - // generating warnings about using uninitialized variables (assuming - // a decent compiler). - - tuple<> empty; - - tuple a1, b1; - b1 = a1; - EXPECT_EQ(0, get<0>(b1)); - - tuple a2, b2; - b2 = a2; - EXPECT_EQ(0, get<0>(b2)); - EXPECT_EQ(0.0, get<1>(b2)); - - tuple a3, b3; - b3 = a3; - EXPECT_EQ(0.0, get<0>(b3)); - EXPECT_EQ('\0', get<1>(b3)); - EXPECT_TRUE(get<2>(b3) == NULL); - - tuple a10, b10; - b10 = a10; - EXPECT_EQ(0, get<0>(b10)); - EXPECT_EQ(0, get<1>(b10)); - EXPECT_EQ(0, get<2>(b10)); - EXPECT_EQ(0, get<3>(b10)); - EXPECT_EQ(0, get<4>(b10)); - EXPECT_EQ(0, get<5>(b10)); - EXPECT_EQ(0, get<6>(b10)); - EXPECT_EQ(0, get<7>(b10)); - EXPECT_EQ(0, get<8>(b10)); - EXPECT_EQ(0, get<9>(b10)); -} - -// Tests constructing a tuple from its fields. -TEST(TupleConstructorTest, ConstructsFromFields) { - int n = 1; - // Reference field. - tuple a(n); - EXPECT_EQ(&n, &(get<0>(a))); - - // Non-reference fields. - tuple b(5, 'a'); - EXPECT_EQ(5, get<0>(b)); - EXPECT_EQ('a', get<1>(b)); - - // Const reference field. - const int m = 2; - tuple c(true, m); - EXPECT_TRUE(get<0>(c)); - EXPECT_EQ(&m, &(get<1>(c))); -} - -// Tests tuple's copy constructor. -TEST(TupleConstructorTest, CopyConstructor) { - tuple a(0.0, true); - tuple b(a); - - EXPECT_DOUBLE_EQ(0.0, get<0>(b)); - EXPECT_TRUE(get<1>(b)); -} - -// Tests constructing a tuple from another tuple that has a compatible -// but different type. -TEST(TupleConstructorTest, ConstructsFromDifferentTupleType) { - tuple a(0, 1, 'a'); - tuple b(a); - - EXPECT_DOUBLE_EQ(0.0, get<0>(b)); - EXPECT_EQ(1, get<1>(b)); - EXPECT_EQ('a', get<2>(b)); -} - -// Tests constructing a 2-tuple from an std::pair. -TEST(TupleConstructorTest, ConstructsFromPair) { - ::std::pair a(1, 'a'); - tuple b(a); - tuple c(a); -} - -// Tests assigning a tuple to another tuple with the same type. -TEST(TupleAssignmentTest, AssignsToSameTupleType) { - const tuple a(5, 7L); - tuple b; - b = a; - EXPECT_EQ(5, get<0>(b)); - EXPECT_EQ(7L, get<1>(b)); -} - -// Tests assigning a tuple to another tuple with a different but -// compatible type. -TEST(TupleAssignmentTest, AssignsToDifferentTupleType) { - const tuple a(1, 7L, true); - tuple b; - b = a; - EXPECT_EQ(1L, get<0>(b)); - EXPECT_EQ(7, get<1>(b)); - EXPECT_TRUE(get<2>(b)); -} - -// Tests assigning an std::pair to a 2-tuple. -TEST(TupleAssignmentTest, AssignsFromPair) { - const ::std::pair a(5, true); - tuple b; - b = a; - EXPECT_EQ(5, get<0>(b)); - EXPECT_TRUE(get<1>(b)); - - tuple c; - c = a; - EXPECT_EQ(5L, get<0>(c)); - EXPECT_TRUE(get<1>(c)); -} - -// A fixture for testing big tuples. -class BigTupleTest : public testing::Test { - protected: - typedef tuple BigTuple; - - BigTupleTest() : - a_(1, 0, 0, 0, 0, 0, 0, 0, 0, 2), - b_(1, 0, 0, 0, 0, 0, 0, 0, 0, 3) {} - - BigTuple a_, b_; -}; - -// Tests constructing big tuples. -TEST_F(BigTupleTest, Construction) { - BigTuple a; - BigTuple b(b_); -} - -// Tests that get(t) returns the N-th (0-based) field of tuple t. -TEST_F(BigTupleTest, get) { - EXPECT_EQ(1, get<0>(a_)); - EXPECT_EQ(2, get<9>(a_)); - - // Tests that get() works on a const tuple too. - const BigTuple a(a_); - EXPECT_EQ(1, get<0>(a)); - EXPECT_EQ(2, get<9>(a)); -} - -// Tests comparing big tuples. -TEST_F(BigTupleTest, Comparisons) { - EXPECT_TRUE(a_ == a_); - EXPECT_FALSE(a_ != a_); - - EXPECT_TRUE(a_ != b_); - EXPECT_FALSE(a_ == b_); -} - -TEST(MakeTupleTest, WorksForScalarTypes) { - tuple a; - a = make_tuple(true, 5); - EXPECT_TRUE(get<0>(a)); - EXPECT_EQ(5, get<1>(a)); - - tuple b; - b = make_tuple('a', 'b', 5); - EXPECT_EQ('a', get<0>(b)); - EXPECT_EQ('b', get<1>(b)); - EXPECT_EQ(5, get<2>(b)); -} - -TEST(MakeTupleTest, WorksForPointers) { - int a[] = { 1, 2, 3, 4 }; - const char* const str = "hi"; - int* const p = a; - - tuple t; - t = make_tuple(str, p); - EXPECT_EQ(str, get<0>(t)); - EXPECT_EQ(p, get<1>(t)); -} - -} // namespace diff --git a/test/gtest-1.8.0/test/gtest-typed-test2_test.cc b/test/gtest-1.8.0/test/gtest-typed-test2_test.cc deleted file mode 100644 index ad77c65c37..0000000000 --- a/test/gtest-1.8.0/test/gtest-typed-test2_test.cc +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -#include - -#include "gtest-typed-test_test.h" -#include "gtest/gtest.h" - -#if GTEST_HAS_TYPED_TEST_P - -// Tests that the same type-parameterized test case can be -// instantiated in different translation units linked together. -// (ContainerTest is also instantiated in gtest-typed-test_test.cc.) -INSTANTIATE_TYPED_TEST_CASE_P(Vector, ContainerTest, - testing::Types >); - -#endif // GTEST_HAS_TYPED_TEST_P diff --git a/test/gtest-1.8.0/test/gtest-typed-test_test.cc b/test/gtest-1.8.0/test/gtest-typed-test_test.cc deleted file mode 100644 index 5e1b7b271e..0000000000 --- a/test/gtest-1.8.0/test/gtest-typed-test_test.cc +++ /dev/null @@ -1,380 +0,0 @@ -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -#include "gtest-typed-test_test.h" - -#include -#include - -#include "gtest/gtest.h" - -using testing::Test; - -// Used for testing that SetUpTestCase()/TearDownTestCase(), fixture -// ctor/dtor, and SetUp()/TearDown() work correctly in typed tests and -// type-parameterized test. -template -class CommonTest : public Test { - // For some technical reason, SetUpTestCase() and TearDownTestCase() - // must be public. - public: - static void SetUpTestCase() { - shared_ = new T(5); - } - - static void TearDownTestCase() { - delete shared_; - shared_ = NULL; - } - - // This 'protected:' is optional. There's no harm in making all - // members of this fixture class template public. - protected: - // We used to use std::list here, but switched to std::vector since - // MSVC's doesn't compile cleanly with /W4. - typedef std::vector Vector; - typedef std::set IntSet; - - CommonTest() : value_(1) {} - - virtual ~CommonTest() { EXPECT_EQ(3, value_); } - - virtual void SetUp() { - EXPECT_EQ(1, value_); - value_++; - } - - virtual void TearDown() { - EXPECT_EQ(2, value_); - value_++; - } - - T value_; - static T* shared_; -}; - -template -T* CommonTest::shared_ = NULL; - -// This #ifdef block tests typed tests. -#if GTEST_HAS_TYPED_TEST - -using testing::Types; - -// Tests that SetUpTestCase()/TearDownTestCase(), fixture ctor/dtor, -// and SetUp()/TearDown() work correctly in typed tests - -typedef Types TwoTypes; -TYPED_TEST_CASE(CommonTest, TwoTypes); - -TYPED_TEST(CommonTest, ValuesAreCorrect) { - // Static members of the fixture class template can be visited via - // the TestFixture:: prefix. - EXPECT_EQ(5, *TestFixture::shared_); - - // Typedefs in the fixture class template can be visited via the - // "typename TestFixture::" prefix. - typename TestFixture::Vector empty; - EXPECT_EQ(0U, empty.size()); - - typename TestFixture::IntSet empty2; - EXPECT_EQ(0U, empty2.size()); - - // Non-static members of the fixture class must be visited via - // 'this', as required by C++ for class templates. - EXPECT_EQ(2, this->value_); -} - -// The second test makes sure shared_ is not deleted after the first -// test. -TYPED_TEST(CommonTest, ValuesAreStillCorrect) { - // Static members of the fixture class template can also be visited - // via 'this'. - ASSERT_TRUE(this->shared_ != NULL); - EXPECT_EQ(5, *this->shared_); - - // TypeParam can be used to refer to the type parameter. - EXPECT_EQ(static_cast(2), this->value_); -} - -// Tests that multiple TYPED_TEST_CASE's can be defined in the same -// translation unit. - -template -class TypedTest1 : public Test { -}; - -// Verifies that the second argument of TYPED_TEST_CASE can be a -// single type. -TYPED_TEST_CASE(TypedTest1, int); -TYPED_TEST(TypedTest1, A) {} - -template -class TypedTest2 : public Test { -}; - -// Verifies that the second argument of TYPED_TEST_CASE can be a -// Types<...> type list. -TYPED_TEST_CASE(TypedTest2, Types); - -// This also verifies that tests from different typed test cases can -// share the same name. -TYPED_TEST(TypedTest2, A) {} - -// Tests that a typed test case can be defined in a namespace. - -namespace library1 { - -template -class NumericTest : public Test { -}; - -typedef Types NumericTypes; -TYPED_TEST_CASE(NumericTest, NumericTypes); - -TYPED_TEST(NumericTest, DefaultIsZero) { - EXPECT_EQ(0, TypeParam()); -} - -} // namespace library1 - -#endif // GTEST_HAS_TYPED_TEST - -// This #ifdef block tests type-parameterized tests. -#if GTEST_HAS_TYPED_TEST_P - -using testing::Types; -using testing::internal::TypedTestCasePState; - -// Tests TypedTestCasePState. - -class TypedTestCasePStateTest : public Test { - protected: - virtual void SetUp() { - state_.AddTestName("foo.cc", 0, "FooTest", "A"); - state_.AddTestName("foo.cc", 0, "FooTest", "B"); - state_.AddTestName("foo.cc", 0, "FooTest", "C"); - } - - TypedTestCasePState state_; -}; - -TEST_F(TypedTestCasePStateTest, SucceedsForMatchingList) { - const char* tests = "A, B, C"; - EXPECT_EQ(tests, - state_.VerifyRegisteredTestNames("foo.cc", 1, tests)); -} - -// Makes sure that the order of the tests and spaces around the names -// don't matter. -TEST_F(TypedTestCasePStateTest, IgnoresOrderAndSpaces) { - const char* tests = "A,C, B"; - EXPECT_EQ(tests, - state_.VerifyRegisteredTestNames("foo.cc", 1, tests)); -} - -typedef TypedTestCasePStateTest TypedTestCasePStateDeathTest; - -TEST_F(TypedTestCasePStateDeathTest, DetectsDuplicates) { - EXPECT_DEATH_IF_SUPPORTED( - state_.VerifyRegisteredTestNames("foo.cc", 1, "A, B, A, C"), - "foo\\.cc.1.?: Test A is listed more than once\\."); -} - -TEST_F(TypedTestCasePStateDeathTest, DetectsExtraTest) { - EXPECT_DEATH_IF_SUPPORTED( - state_.VerifyRegisteredTestNames("foo.cc", 1, "A, B, C, D"), - "foo\\.cc.1.?: No test named D can be found in this test case\\."); -} - -TEST_F(TypedTestCasePStateDeathTest, DetectsMissedTest) { - EXPECT_DEATH_IF_SUPPORTED( - state_.VerifyRegisteredTestNames("foo.cc", 1, "A, C"), - "foo\\.cc.1.?: You forgot to list test B\\."); -} - -// Tests that defining a test for a parameterized test case generates -// a run-time error if the test case has been registered. -TEST_F(TypedTestCasePStateDeathTest, DetectsTestAfterRegistration) { - state_.VerifyRegisteredTestNames("foo.cc", 1, "A, B, C"); - EXPECT_DEATH_IF_SUPPORTED( - state_.AddTestName("foo.cc", 2, "FooTest", "D"), - "foo\\.cc.2.?: Test D must be defined before REGISTER_TYPED_TEST_CASE_P" - "\\(FooTest, \\.\\.\\.\\)\\."); -} - -// Tests that SetUpTestCase()/TearDownTestCase(), fixture ctor/dtor, -// and SetUp()/TearDown() work correctly in type-parameterized tests. - -template -class DerivedTest : public CommonTest { -}; - -TYPED_TEST_CASE_P(DerivedTest); - -TYPED_TEST_P(DerivedTest, ValuesAreCorrect) { - // Static members of the fixture class template can be visited via - // the TestFixture:: prefix. - EXPECT_EQ(5, *TestFixture::shared_); - - // Non-static members of the fixture class must be visited via - // 'this', as required by C++ for class templates. - EXPECT_EQ(2, this->value_); -} - -// The second test makes sure shared_ is not deleted after the first -// test. -TYPED_TEST_P(DerivedTest, ValuesAreStillCorrect) { - // Static members of the fixture class template can also be visited - // via 'this'. - ASSERT_TRUE(this->shared_ != NULL); - EXPECT_EQ(5, *this->shared_); - EXPECT_EQ(2, this->value_); -} - -REGISTER_TYPED_TEST_CASE_P(DerivedTest, - ValuesAreCorrect, ValuesAreStillCorrect); - -typedef Types MyTwoTypes; -INSTANTIATE_TYPED_TEST_CASE_P(My, DerivedTest, MyTwoTypes); - -// Tests that multiple TYPED_TEST_CASE_P's can be defined in the same -// translation unit. - -template -class TypedTestP1 : public Test { -}; - -TYPED_TEST_CASE_P(TypedTestP1); - -// For testing that the code between TYPED_TEST_CASE_P() and -// TYPED_TEST_P() is not enclosed in a namespace. -typedef int IntAfterTypedTestCaseP; - -TYPED_TEST_P(TypedTestP1, A) {} -TYPED_TEST_P(TypedTestP1, B) {} - -// For testing that the code between TYPED_TEST_P() and -// REGISTER_TYPED_TEST_CASE_P() is not enclosed in a namespace. -typedef int IntBeforeRegisterTypedTestCaseP; - -REGISTER_TYPED_TEST_CASE_P(TypedTestP1, A, B); - -template -class TypedTestP2 : public Test { -}; - -TYPED_TEST_CASE_P(TypedTestP2); - -// This also verifies that tests from different type-parameterized -// test cases can share the same name. -TYPED_TEST_P(TypedTestP2, A) {} - -REGISTER_TYPED_TEST_CASE_P(TypedTestP2, A); - -// Verifies that the code between TYPED_TEST_CASE_P() and -// REGISTER_TYPED_TEST_CASE_P() is not enclosed in a namespace. -IntAfterTypedTestCaseP after = 0; -IntBeforeRegisterTypedTestCaseP before = 0; - -// Verifies that the last argument of INSTANTIATE_TYPED_TEST_CASE_P() -// can be either a single type or a Types<...> type list. -INSTANTIATE_TYPED_TEST_CASE_P(Int, TypedTestP1, int); -INSTANTIATE_TYPED_TEST_CASE_P(Int, TypedTestP2, Types); - -// Tests that the same type-parameterized test case can be -// instantiated more than once in the same translation unit. -INSTANTIATE_TYPED_TEST_CASE_P(Double, TypedTestP2, Types); - -// Tests that the same type-parameterized test case can be -// instantiated in different translation units linked together. -// (ContainerTest is also instantiated in gtest-typed-test_test.cc.) -typedef Types, std::set > MyContainers; -INSTANTIATE_TYPED_TEST_CASE_P(My, ContainerTest, MyContainers); - -// Tests that a type-parameterized test case can be defined and -// instantiated in a namespace. - -namespace library2 { - -template -class NumericTest : public Test { -}; - -TYPED_TEST_CASE_P(NumericTest); - -TYPED_TEST_P(NumericTest, DefaultIsZero) { - EXPECT_EQ(0, TypeParam()); -} - -TYPED_TEST_P(NumericTest, ZeroIsLessThanOne) { - EXPECT_LT(TypeParam(0), TypeParam(1)); -} - -REGISTER_TYPED_TEST_CASE_P(NumericTest, - DefaultIsZero, ZeroIsLessThanOne); -typedef Types NumericTypes; -INSTANTIATE_TYPED_TEST_CASE_P(My, NumericTest, NumericTypes); - -static const char* GetTestName() { - return testing::UnitTest::GetInstance()->current_test_info()->name(); -} -// Test the stripping of space from test names -template class TrimmedTest : public Test { }; -TYPED_TEST_CASE_P(TrimmedTest); -TYPED_TEST_P(TrimmedTest, Test1) { EXPECT_STREQ("Test1", GetTestName()); } -TYPED_TEST_P(TrimmedTest, Test2) { EXPECT_STREQ("Test2", GetTestName()); } -TYPED_TEST_P(TrimmedTest, Test3) { EXPECT_STREQ("Test3", GetTestName()); } -TYPED_TEST_P(TrimmedTest, Test4) { EXPECT_STREQ("Test4", GetTestName()); } -TYPED_TEST_P(TrimmedTest, Test5) { EXPECT_STREQ("Test5", GetTestName()); } -REGISTER_TYPED_TEST_CASE_P( - TrimmedTest, - Test1, Test2,Test3 , Test4 ,Test5 ); // NOLINT -template struct MyPair {}; -// Be sure to try a type with a comma in its name just in case it matters. -typedef Types > TrimTypes; -INSTANTIATE_TYPED_TEST_CASE_P(My, TrimmedTest, TrimTypes); - -} // namespace library2 - -#endif // GTEST_HAS_TYPED_TEST_P - -#if !defined(GTEST_HAS_TYPED_TEST) && !defined(GTEST_HAS_TYPED_TEST_P) - -// Google Test may not support type-parameterized tests with some -// compilers. If we use conditional compilation to compile out all -// code referring to the gtest_main library, MSVC linker will not link -// that library at all and consequently complain about missing entry -// point defined in that library (fatal error LNK1561: entry point -// must be defined). This dummy test keeps gtest_main linked in. -TEST(DummyTest, TypedTestsAreNotSupportedOnThisPlatform) {} - -#endif // #if !defined(GTEST_HAS_TYPED_TEST) && !defined(GTEST_HAS_TYPED_TEST_P) diff --git a/test/gtest-1.8.0/test/gtest-typed-test_test.h b/test/gtest-1.8.0/test/gtest-typed-test_test.h deleted file mode 100644 index 41d75704cf..0000000000 --- a/test/gtest-1.8.0/test/gtest-typed-test_test.h +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -#ifndef GTEST_TEST_GTEST_TYPED_TEST_TEST_H_ -#define GTEST_TEST_GTEST_TYPED_TEST_TEST_H_ - -#include "gtest/gtest.h" - -#if GTEST_HAS_TYPED_TEST_P - -using testing::Test; - -// For testing that the same type-parameterized test case can be -// instantiated in different translation units linked together. -// ContainerTest will be instantiated in both gtest-typed-test_test.cc -// and gtest-typed-test2_test.cc. - -template -class ContainerTest : public Test { -}; - -TYPED_TEST_CASE_P(ContainerTest); - -TYPED_TEST_P(ContainerTest, CanBeDefaultConstructed) { - TypeParam container; -} - -TYPED_TEST_P(ContainerTest, InitialSizeIsZero) { - TypeParam container; - EXPECT_EQ(0U, container.size()); -} - -REGISTER_TYPED_TEST_CASE_P(ContainerTest, - CanBeDefaultConstructed, InitialSizeIsZero); - -#endif // GTEST_HAS_TYPED_TEST_P - -#endif // GTEST_TEST_GTEST_TYPED_TEST_TEST_H_ diff --git a/test/gtest-1.8.0/test/gtest-unittest-api_test.cc b/test/gtest-1.8.0/test/gtest-unittest-api_test.cc deleted file mode 100644 index 1ebd431ec2..0000000000 --- a/test/gtest-1.8.0/test/gtest-unittest-api_test.cc +++ /dev/null @@ -1,341 +0,0 @@ -// Copyright 2009 Google Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vladl@google.com (Vlad Losev) -// -// The Google C++ Testing and Mocking Framework (Google Test) -// -// This file contains tests verifying correctness of data provided via -// UnitTest's public methods. - -#include "gtest/gtest.h" - -#include // For strcmp. -#include - -using ::testing::InitGoogleTest; - -namespace testing { -namespace internal { - -template -struct LessByName { - bool operator()(const T* a, const T* b) { - return strcmp(a->name(), b->name()) < 0; - } -}; - -class UnitTestHelper { - public: - // Returns the array of pointers to all test cases sorted by the test case - // name. The caller is responsible for deleting the array. - static TestCase const** GetSortedTestCases() { - UnitTest& unit_test = *UnitTest::GetInstance(); - TestCase const** const test_cases = - new const TestCase*[unit_test.total_test_case_count()]; - - for (int i = 0; i < unit_test.total_test_case_count(); ++i) - test_cases[i] = unit_test.GetTestCase(i); - - std::sort(test_cases, - test_cases + unit_test.total_test_case_count(), - LessByName()); - return test_cases; - } - - // Returns the test case by its name. The caller doesn't own the returned - // pointer. - static const TestCase* FindTestCase(const char* name) { - UnitTest& unit_test = *UnitTest::GetInstance(); - for (int i = 0; i < unit_test.total_test_case_count(); ++i) { - const TestCase* test_case = unit_test.GetTestCase(i); - if (0 == strcmp(test_case->name(), name)) - return test_case; - } - return NULL; - } - - // Returns the array of pointers to all tests in a particular test case - // sorted by the test name. The caller is responsible for deleting the - // array. - static TestInfo const** GetSortedTests(const TestCase* test_case) { - TestInfo const** const tests = - new const TestInfo*[test_case->total_test_count()]; - - for (int i = 0; i < test_case->total_test_count(); ++i) - tests[i] = test_case->GetTestInfo(i); - - std::sort(tests, tests + test_case->total_test_count(), - LessByName()); - return tests; - } -}; - -#if GTEST_HAS_TYPED_TEST -template class TestCaseWithCommentTest : public Test {}; -TYPED_TEST_CASE(TestCaseWithCommentTest, Types); -TYPED_TEST(TestCaseWithCommentTest, Dummy) {} - -const int kTypedTestCases = 1; -const int kTypedTests = 1; -#else -const int kTypedTestCases = 0; -const int kTypedTests = 0; -#endif // GTEST_HAS_TYPED_TEST - -// We can only test the accessors that do not change value while tests run. -// Since tests can be run in any order, the values the accessors that track -// test execution (such as failed_test_count) can not be predicted. -TEST(ApiTest, UnitTestImmutableAccessorsWork) { - UnitTest* unit_test = UnitTest::GetInstance(); - - ASSERT_EQ(2 + kTypedTestCases, unit_test->total_test_case_count()); - EXPECT_EQ(1 + kTypedTestCases, unit_test->test_case_to_run_count()); - EXPECT_EQ(2, unit_test->disabled_test_count()); - EXPECT_EQ(5 + kTypedTests, unit_test->total_test_count()); - EXPECT_EQ(3 + kTypedTests, unit_test->test_to_run_count()); - - const TestCase** const test_cases = UnitTestHelper::GetSortedTestCases(); - - EXPECT_STREQ("ApiTest", test_cases[0]->name()); - EXPECT_STREQ("DISABLED_Test", test_cases[1]->name()); -#if GTEST_HAS_TYPED_TEST - EXPECT_STREQ("TestCaseWithCommentTest/0", test_cases[2]->name()); -#endif // GTEST_HAS_TYPED_TEST - - delete[] test_cases; - - // The following lines initiate actions to verify certain methods in - // FinalSuccessChecker::TearDown. - - // Records a test property to verify TestResult::GetTestProperty(). - RecordProperty("key", "value"); -} - -AssertionResult IsNull(const char* str) { - if (str != NULL) { - return testing::AssertionFailure() << "argument is " << str; - } - return AssertionSuccess(); -} - -TEST(ApiTest, TestCaseImmutableAccessorsWork) { - const TestCase* test_case = UnitTestHelper::FindTestCase("ApiTest"); - ASSERT_TRUE(test_case != NULL); - - EXPECT_STREQ("ApiTest", test_case->name()); - EXPECT_TRUE(IsNull(test_case->type_param())); - EXPECT_TRUE(test_case->should_run()); - EXPECT_EQ(1, test_case->disabled_test_count()); - EXPECT_EQ(3, test_case->test_to_run_count()); - ASSERT_EQ(4, test_case->total_test_count()); - - const TestInfo** tests = UnitTestHelper::GetSortedTests(test_case); - - EXPECT_STREQ("DISABLED_Dummy1", tests[0]->name()); - EXPECT_STREQ("ApiTest", tests[0]->test_case_name()); - EXPECT_TRUE(IsNull(tests[0]->value_param())); - EXPECT_TRUE(IsNull(tests[0]->type_param())); - EXPECT_FALSE(tests[0]->should_run()); - - EXPECT_STREQ("TestCaseDisabledAccessorsWork", tests[1]->name()); - EXPECT_STREQ("ApiTest", tests[1]->test_case_name()); - EXPECT_TRUE(IsNull(tests[1]->value_param())); - EXPECT_TRUE(IsNull(tests[1]->type_param())); - EXPECT_TRUE(tests[1]->should_run()); - - EXPECT_STREQ("TestCaseImmutableAccessorsWork", tests[2]->name()); - EXPECT_STREQ("ApiTest", tests[2]->test_case_name()); - EXPECT_TRUE(IsNull(tests[2]->value_param())); - EXPECT_TRUE(IsNull(tests[2]->type_param())); - EXPECT_TRUE(tests[2]->should_run()); - - EXPECT_STREQ("UnitTestImmutableAccessorsWork", tests[3]->name()); - EXPECT_STREQ("ApiTest", tests[3]->test_case_name()); - EXPECT_TRUE(IsNull(tests[3]->value_param())); - EXPECT_TRUE(IsNull(tests[3]->type_param())); - EXPECT_TRUE(tests[3]->should_run()); - - delete[] tests; - tests = NULL; - -#if GTEST_HAS_TYPED_TEST - test_case = UnitTestHelper::FindTestCase("TestCaseWithCommentTest/0"); - ASSERT_TRUE(test_case != NULL); - - EXPECT_STREQ("TestCaseWithCommentTest/0", test_case->name()); - EXPECT_STREQ(GetTypeName().c_str(), test_case->type_param()); - EXPECT_TRUE(test_case->should_run()); - EXPECT_EQ(0, test_case->disabled_test_count()); - EXPECT_EQ(1, test_case->test_to_run_count()); - ASSERT_EQ(1, test_case->total_test_count()); - - tests = UnitTestHelper::GetSortedTests(test_case); - - EXPECT_STREQ("Dummy", tests[0]->name()); - EXPECT_STREQ("TestCaseWithCommentTest/0", tests[0]->test_case_name()); - EXPECT_TRUE(IsNull(tests[0]->value_param())); - EXPECT_STREQ(GetTypeName().c_str(), tests[0]->type_param()); - EXPECT_TRUE(tests[0]->should_run()); - - delete[] tests; -#endif // GTEST_HAS_TYPED_TEST -} - -TEST(ApiTest, TestCaseDisabledAccessorsWork) { - const TestCase* test_case = UnitTestHelper::FindTestCase("DISABLED_Test"); - ASSERT_TRUE(test_case != NULL); - - EXPECT_STREQ("DISABLED_Test", test_case->name()); - EXPECT_TRUE(IsNull(test_case->type_param())); - EXPECT_FALSE(test_case->should_run()); - EXPECT_EQ(1, test_case->disabled_test_count()); - EXPECT_EQ(0, test_case->test_to_run_count()); - ASSERT_EQ(1, test_case->total_test_count()); - - const TestInfo* const test_info = test_case->GetTestInfo(0); - EXPECT_STREQ("Dummy2", test_info->name()); - EXPECT_STREQ("DISABLED_Test", test_info->test_case_name()); - EXPECT_TRUE(IsNull(test_info->value_param())); - EXPECT_TRUE(IsNull(test_info->type_param())); - EXPECT_FALSE(test_info->should_run()); -} - -// These two tests are here to provide support for testing -// test_case_to_run_count, disabled_test_count, and test_to_run_count. -TEST(ApiTest, DISABLED_Dummy1) {} -TEST(DISABLED_Test, Dummy2) {} - -class FinalSuccessChecker : public Environment { - protected: - virtual void TearDown() { - UnitTest* unit_test = UnitTest::GetInstance(); - - EXPECT_EQ(1 + kTypedTestCases, unit_test->successful_test_case_count()); - EXPECT_EQ(3 + kTypedTests, unit_test->successful_test_count()); - EXPECT_EQ(0, unit_test->failed_test_case_count()); - EXPECT_EQ(0, unit_test->failed_test_count()); - EXPECT_TRUE(unit_test->Passed()); - EXPECT_FALSE(unit_test->Failed()); - ASSERT_EQ(2 + kTypedTestCases, unit_test->total_test_case_count()); - - const TestCase** const test_cases = UnitTestHelper::GetSortedTestCases(); - - EXPECT_STREQ("ApiTest", test_cases[0]->name()); - EXPECT_TRUE(IsNull(test_cases[0]->type_param())); - EXPECT_TRUE(test_cases[0]->should_run()); - EXPECT_EQ(1, test_cases[0]->disabled_test_count()); - ASSERT_EQ(4, test_cases[0]->total_test_count()); - EXPECT_EQ(3, test_cases[0]->successful_test_count()); - EXPECT_EQ(0, test_cases[0]->failed_test_count()); - EXPECT_TRUE(test_cases[0]->Passed()); - EXPECT_FALSE(test_cases[0]->Failed()); - - EXPECT_STREQ("DISABLED_Test", test_cases[1]->name()); - EXPECT_TRUE(IsNull(test_cases[1]->type_param())); - EXPECT_FALSE(test_cases[1]->should_run()); - EXPECT_EQ(1, test_cases[1]->disabled_test_count()); - ASSERT_EQ(1, test_cases[1]->total_test_count()); - EXPECT_EQ(0, test_cases[1]->successful_test_count()); - EXPECT_EQ(0, test_cases[1]->failed_test_count()); - -#if GTEST_HAS_TYPED_TEST - EXPECT_STREQ("TestCaseWithCommentTest/0", test_cases[2]->name()); - EXPECT_STREQ(GetTypeName().c_str(), test_cases[2]->type_param()); - EXPECT_TRUE(test_cases[2]->should_run()); - EXPECT_EQ(0, test_cases[2]->disabled_test_count()); - ASSERT_EQ(1, test_cases[2]->total_test_count()); - EXPECT_EQ(1, test_cases[2]->successful_test_count()); - EXPECT_EQ(0, test_cases[2]->failed_test_count()); - EXPECT_TRUE(test_cases[2]->Passed()); - EXPECT_FALSE(test_cases[2]->Failed()); -#endif // GTEST_HAS_TYPED_TEST - - const TestCase* test_case = UnitTestHelper::FindTestCase("ApiTest"); - const TestInfo** tests = UnitTestHelper::GetSortedTests(test_case); - EXPECT_STREQ("DISABLED_Dummy1", tests[0]->name()); - EXPECT_STREQ("ApiTest", tests[0]->test_case_name()); - EXPECT_FALSE(tests[0]->should_run()); - - EXPECT_STREQ("TestCaseDisabledAccessorsWork", tests[1]->name()); - EXPECT_STREQ("ApiTest", tests[1]->test_case_name()); - EXPECT_TRUE(IsNull(tests[1]->value_param())); - EXPECT_TRUE(IsNull(tests[1]->type_param())); - EXPECT_TRUE(tests[1]->should_run()); - EXPECT_TRUE(tests[1]->result()->Passed()); - EXPECT_EQ(0, tests[1]->result()->test_property_count()); - - EXPECT_STREQ("TestCaseImmutableAccessorsWork", tests[2]->name()); - EXPECT_STREQ("ApiTest", tests[2]->test_case_name()); - EXPECT_TRUE(IsNull(tests[2]->value_param())); - EXPECT_TRUE(IsNull(tests[2]->type_param())); - EXPECT_TRUE(tests[2]->should_run()); - EXPECT_TRUE(tests[2]->result()->Passed()); - EXPECT_EQ(0, tests[2]->result()->test_property_count()); - - EXPECT_STREQ("UnitTestImmutableAccessorsWork", tests[3]->name()); - EXPECT_STREQ("ApiTest", tests[3]->test_case_name()); - EXPECT_TRUE(IsNull(tests[3]->value_param())); - EXPECT_TRUE(IsNull(tests[3]->type_param())); - EXPECT_TRUE(tests[3]->should_run()); - EXPECT_TRUE(tests[3]->result()->Passed()); - EXPECT_EQ(1, tests[3]->result()->test_property_count()); - const TestProperty& property = tests[3]->result()->GetTestProperty(0); - EXPECT_STREQ("key", property.key()); - EXPECT_STREQ("value", property.value()); - - delete[] tests; - -#if GTEST_HAS_TYPED_TEST - test_case = UnitTestHelper::FindTestCase("TestCaseWithCommentTest/0"); - tests = UnitTestHelper::GetSortedTests(test_case); - - EXPECT_STREQ("Dummy", tests[0]->name()); - EXPECT_STREQ("TestCaseWithCommentTest/0", tests[0]->test_case_name()); - EXPECT_TRUE(IsNull(tests[0]->value_param())); - EXPECT_STREQ(GetTypeName().c_str(), tests[0]->type_param()); - EXPECT_TRUE(tests[0]->should_run()); - EXPECT_TRUE(tests[0]->result()->Passed()); - EXPECT_EQ(0, tests[0]->result()->test_property_count()); - - delete[] tests; -#endif // GTEST_HAS_TYPED_TEST - delete[] test_cases; - } -}; - -} // namespace internal -} // namespace testing - -int main(int argc, char **argv) { - InitGoogleTest(&argc, argv); - - AddGlobalTestEnvironment(new testing::internal::FinalSuccessChecker()); - - return RUN_ALL_TESTS(); -} diff --git a/test/gtest-1.8.0/test/gtest_all_test.cc b/test/gtest-1.8.0/test/gtest_all_test.cc deleted file mode 100644 index e6c1b01851..0000000000 --- a/test/gtest-1.8.0/test/gtest_all_test.cc +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2009, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// Tests for Google C++ Testing and Mocking Framework (Google Test) -// -// Sometimes it's desirable to build most of Google Test's own tests -// by compiling a single file. This file serves this purpose. -#include "gtest-filepath_test.cc" -#include "gtest-linked_ptr_test.cc" -#include "gtest-message_test.cc" -#include "gtest-options_test.cc" -#include "gtest-port_test.cc" -#include "gtest_pred_impl_unittest.cc" -#include "gtest_prod_test.cc" -#include "gtest-test-part_test.cc" -#include "gtest-typed-test_test.cc" -#include "gtest-typed-test2_test.cc" -#include "gtest_unittest.cc" -#include "production.cc" diff --git a/test/gtest-1.8.0/test/gtest_assert_by_exception_test.cc b/test/gtest-1.8.0/test/gtest_assert_by_exception_test.cc deleted file mode 100644 index 2f0e34af4e..0000000000 --- a/test/gtest-1.8.0/test/gtest_assert_by_exception_test.cc +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright 2009, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Tests Google Test's assert-by-exception mode with exceptions enabled. - -#include "gtest/gtest.h" - -#include -#include -#include -#include - -class ThrowListener : public testing::EmptyTestEventListener { - void OnTestPartResult(const testing::TestPartResult& result) override { - if (result.type() == testing::TestPartResult::kFatalFailure) { - throw testing::AssertionException(result); - } - } -}; - -// Prints the given failure message and exits the program with -// non-zero. We use this instead of a Google Test assertion to -// indicate a failure, as the latter is been tested and cannot be -// relied on. -void Fail(const char* msg) { - printf("FAILURE: %s\n", msg); - fflush(stdout); - exit(1); -} - -static void AssertFalse() { - ASSERT_EQ(2, 3) << "Expected failure"; -} - -// Tests that an assertion failure throws a subclass of -// std::runtime_error. -TEST(Test, Test) { - // A successful assertion shouldn't throw. - try { - EXPECT_EQ(3, 3); - } catch(...) { - Fail("A successful assertion wrongfully threw."); - } - - // A successful assertion shouldn't throw. - try { - EXPECT_EQ(3, 4); - } catch(...) { - Fail("A failed non-fatal assertion wrongfully threw."); - } - - // A failed assertion should throw. - try { - AssertFalse(); - } catch(const testing::AssertionException& e) { - if (strstr(e.what(), "Expected failure") != NULL) - throw; - - printf("%s", - "A failed assertion did throw an exception of the right type, " - "but the message is incorrect. Instead of containing \"Expected " - "failure\", it is:\n"); - Fail(e.what()); - } catch(...) { - Fail("A failed assertion threw the wrong type of exception."); - } - Fail("A failed assertion should've thrown but didn't."); -} - -int kTestForContinuingTest = 0; - -TEST(Test, Test2) { - // FIXME(sokolov): how to force Test2 to be after Test? - kTestForContinuingTest = 1; -} - -int main(int argc, char** argv) { - testing::InitGoogleTest(&argc, argv); - testing::UnitTest::GetInstance()->listeners().Append(new ThrowListener); - - int result = RUN_ALL_TESTS(); - if (result == 0) { - printf("RUN_ALL_TESTS returned %d\n", result); - Fail("Expected failure instead."); - } - - if (kTestForContinuingTest == 0) { - Fail("Should have continued with other tests, but did not."); - } - return 0; -} diff --git a/test/gtest-1.8.0/test/gtest_break_on_failure_unittest.py b/test/gtest-1.8.0/test/gtest_break_on_failure_unittest.py deleted file mode 100644 index 16e19dbc39..0000000000 --- a/test/gtest-1.8.0/test/gtest_break_on_failure_unittest.py +++ /dev/null @@ -1,210 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2006, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Unit test for Google Test's break-on-failure mode. - -A user can ask Google Test to seg-fault when an assertion fails, using -either the GTEST_BREAK_ON_FAILURE environment variable or the ---gtest_break_on_failure flag. This script tests such functionality -by invoking gtest_break_on_failure_unittest_ (a program written with -Google Test) with different environments and command line flags. -""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import os -import gtest_test_utils - -# Constants. - -IS_WINDOWS = os.name == 'nt' - -# The environment variable for enabling/disabling the break-on-failure mode. -BREAK_ON_FAILURE_ENV_VAR = 'GTEST_BREAK_ON_FAILURE' - -# The command line flag for enabling/disabling the break-on-failure mode. -BREAK_ON_FAILURE_FLAG = 'gtest_break_on_failure' - -# The environment variable for enabling/disabling the throw-on-failure mode. -THROW_ON_FAILURE_ENV_VAR = 'GTEST_THROW_ON_FAILURE' - -# The environment variable for enabling/disabling the catch-exceptions mode. -CATCH_EXCEPTIONS_ENV_VAR = 'GTEST_CATCH_EXCEPTIONS' - -# Path to the gtest_break_on_failure_unittest_ program. -EXE_PATH = gtest_test_utils.GetTestExecutablePath( - 'gtest_break_on_failure_unittest_') - - -environ = gtest_test_utils.environ -SetEnvVar = gtest_test_utils.SetEnvVar - -# Tests in this file run a Google-Test-based test program and expect it -# to terminate prematurely. Therefore they are incompatible with -# the premature-exit-file protocol by design. Unset the -# premature-exit filepath to prevent Google Test from creating -# the file. -SetEnvVar(gtest_test_utils.PREMATURE_EXIT_FILE_ENV_VAR, None) - - -def Run(command): - """Runs a command; returns 1 if it was killed by a signal, or 0 otherwise.""" - - p = gtest_test_utils.Subprocess(command, env=environ) - if p.terminated_by_signal: - return 1 - else: - return 0 - - -# The tests. - - -class GTestBreakOnFailureUnitTest(gtest_test_utils.TestCase): - """Tests using the GTEST_BREAK_ON_FAILURE environment variable or - the --gtest_break_on_failure flag to turn assertion failures into - segmentation faults. - """ - - def RunAndVerify(self, env_var_value, flag_value, expect_seg_fault): - """Runs gtest_break_on_failure_unittest_ and verifies that it does - (or does not) have a seg-fault. - - Args: - env_var_value: value of the GTEST_BREAK_ON_FAILURE environment - variable; None if the variable should be unset. - flag_value: value of the --gtest_break_on_failure flag; - None if the flag should not be present. - expect_seg_fault: 1 if the program is expected to generate a seg-fault; - 0 otherwise. - """ - - SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, env_var_value) - - if env_var_value is None: - env_var_value_msg = ' is not set' - else: - env_var_value_msg = '=' + env_var_value - - if flag_value is None: - flag = '' - elif flag_value == '0': - flag = '--%s=0' % BREAK_ON_FAILURE_FLAG - else: - flag = '--%s' % BREAK_ON_FAILURE_FLAG - - command = [EXE_PATH] - if flag: - command.append(flag) - - if expect_seg_fault: - should_or_not = 'should' - else: - should_or_not = 'should not' - - has_seg_fault = Run(command) - - SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, None) - - msg = ('when %s%s, an assertion failure in "%s" %s cause a seg-fault.' % - (BREAK_ON_FAILURE_ENV_VAR, env_var_value_msg, ' '.join(command), - should_or_not)) - self.assert_(has_seg_fault == expect_seg_fault, msg) - - def testDefaultBehavior(self): - """Tests the behavior of the default mode.""" - - self.RunAndVerify(env_var_value=None, - flag_value=None, - expect_seg_fault=0) - - def testEnvVar(self): - """Tests using the GTEST_BREAK_ON_FAILURE environment variable.""" - - self.RunAndVerify(env_var_value='0', - flag_value=None, - expect_seg_fault=0) - self.RunAndVerify(env_var_value='1', - flag_value=None, - expect_seg_fault=1) - - def testFlag(self): - """Tests using the --gtest_break_on_failure flag.""" - - self.RunAndVerify(env_var_value=None, - flag_value='0', - expect_seg_fault=0) - self.RunAndVerify(env_var_value=None, - flag_value='1', - expect_seg_fault=1) - - def testFlagOverridesEnvVar(self): - """Tests that the flag overrides the environment variable.""" - - self.RunAndVerify(env_var_value='0', - flag_value='0', - expect_seg_fault=0) - self.RunAndVerify(env_var_value='0', - flag_value='1', - expect_seg_fault=1) - self.RunAndVerify(env_var_value='1', - flag_value='0', - expect_seg_fault=0) - self.RunAndVerify(env_var_value='1', - flag_value='1', - expect_seg_fault=1) - - def testBreakOnFailureOverridesThrowOnFailure(self): - """Tests that gtest_break_on_failure overrides gtest_throw_on_failure.""" - - SetEnvVar(THROW_ON_FAILURE_ENV_VAR, '1') - try: - self.RunAndVerify(env_var_value=None, - flag_value='1', - expect_seg_fault=1) - finally: - SetEnvVar(THROW_ON_FAILURE_ENV_VAR, None) - - if IS_WINDOWS: - def testCatchExceptionsDoesNotInterfere(self): - """Tests that gtest_catch_exceptions doesn't interfere.""" - - SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, '1') - try: - self.RunAndVerify(env_var_value='1', - flag_value='1', - expect_seg_fault=1) - finally: - SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, None) - - -if __name__ == '__main__': - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_break_on_failure_unittest_.cc b/test/gtest-1.8.0/test/gtest_break_on_failure_unittest_.cc deleted file mode 100644 index 1231ec2804..0000000000 --- a/test/gtest-1.8.0/test/gtest_break_on_failure_unittest_.cc +++ /dev/null @@ -1,87 +0,0 @@ -// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Unit test for Google Test's break-on-failure mode. -// -// A user can ask Google Test to seg-fault when an assertion fails, using -// either the GTEST_BREAK_ON_FAILURE environment variable or the -// --gtest_break_on_failure flag. This file is used for testing such -// functionality. -// -// This program will be invoked from a Python unit test. It is -// expected to fail. Don't run it directly. - -#include "gtest/gtest.h" - -#if GTEST_OS_WINDOWS -# include -# include -#endif - -namespace { - -// A test that's expected to fail. -TEST(Foo, Bar) { - EXPECT_EQ(2, 3); -} - -#if GTEST_HAS_SEH && !GTEST_OS_WINDOWS_MOBILE -// On Windows Mobile global exception handlers are not supported. -LONG WINAPI ExitWithExceptionCode( - struct _EXCEPTION_POINTERS* exception_pointers) { - exit(exception_pointers->ExceptionRecord->ExceptionCode); -} -#endif - -} // namespace - -int main(int argc, char **argv) { -#if GTEST_OS_WINDOWS - // Suppresses display of the Windows error dialog upon encountering - // a general protection fault (segment violation). - SetErrorMode(SEM_NOGPFAULTERRORBOX | SEM_FAILCRITICALERRORS); - -# if GTEST_HAS_SEH && !GTEST_OS_WINDOWS_MOBILE - - // The default unhandled exception filter does not always exit - // with the exception code as exit code - for example it exits with - // 0 for EXCEPTION_ACCESS_VIOLATION and 1 for EXCEPTION_BREAKPOINT - // if the application is compiled in debug mode. Thus we use our own - // filter which always exits with the exception code for unhandled - // exceptions. - SetUnhandledExceptionFilter(ExitWithExceptionCode); - -# endif -#endif // GTEST_OS_WINDOWS - testing::InitGoogleTest(&argc, argv); - - return RUN_ALL_TESTS(); -} diff --git a/test/gtest-1.8.0/test/gtest_catch_exceptions_test.py b/test/gtest-1.8.0/test/gtest_catch_exceptions_test.py deleted file mode 100644 index 760f914f8a..0000000000 --- a/test/gtest-1.8.0/test/gtest_catch_exceptions_test.py +++ /dev/null @@ -1,235 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2010 Google Inc. All Rights Reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Tests Google Test's exception catching behavior. - -This script invokes gtest_catch_exceptions_test_ and -gtest_catch_exceptions_ex_test_ (programs written with -Google Test) and verifies their output. -""" - -__author__ = 'vladl@google.com (Vlad Losev)' - -import gtest_test_utils - -# Constants. -FLAG_PREFIX = '--gtest_' -LIST_TESTS_FLAG = FLAG_PREFIX + 'list_tests' -NO_CATCH_EXCEPTIONS_FLAG = FLAG_PREFIX + 'catch_exceptions=0' -FILTER_FLAG = FLAG_PREFIX + 'filter' - -# Path to the gtest_catch_exceptions_ex_test_ binary, compiled with -# exceptions enabled. -EX_EXE_PATH = gtest_test_utils.GetTestExecutablePath( - 'gtest_catch_exceptions_ex_test_') - -# Path to the gtest_catch_exceptions_test_ binary, compiled with -# exceptions disabled. -EXE_PATH = gtest_test_utils.GetTestExecutablePath( - 'gtest_catch_exceptions_no_ex_test_') - -environ = gtest_test_utils.environ -SetEnvVar = gtest_test_utils.SetEnvVar - -# Tests in this file run a Google-Test-based test program and expect it -# to terminate prematurely. Therefore they are incompatible with -# the premature-exit-file protocol by design. Unset the -# premature-exit filepath to prevent Google Test from creating -# the file. -SetEnvVar(gtest_test_utils.PREMATURE_EXIT_FILE_ENV_VAR, None) - -TEST_LIST = gtest_test_utils.Subprocess( - [EXE_PATH, LIST_TESTS_FLAG], env=environ).output - -SUPPORTS_SEH_EXCEPTIONS = 'ThrowsSehException' in TEST_LIST - -if SUPPORTS_SEH_EXCEPTIONS: - BINARY_OUTPUT = gtest_test_utils.Subprocess([EXE_PATH], env=environ).output - -EX_BINARY_OUTPUT = gtest_test_utils.Subprocess( - [EX_EXE_PATH], env=environ).output - - -# The tests. -if SUPPORTS_SEH_EXCEPTIONS: - # pylint:disable-msg=C6302 - class CatchSehExceptionsTest(gtest_test_utils.TestCase): - """Tests exception-catching behavior.""" - - - def TestSehExceptions(self, test_output): - self.assert_('SEH exception with code 0x2a thrown ' - 'in the test fixture\'s constructor' - in test_output) - self.assert_('SEH exception with code 0x2a thrown ' - 'in the test fixture\'s destructor' - in test_output) - self.assert_('SEH exception with code 0x2a thrown in SetUpTestCase()' - in test_output) - self.assert_('SEH exception with code 0x2a thrown in TearDownTestCase()' - in test_output) - self.assert_('SEH exception with code 0x2a thrown in SetUp()' - in test_output) - self.assert_('SEH exception with code 0x2a thrown in TearDown()' - in test_output) - self.assert_('SEH exception with code 0x2a thrown in the test body' - in test_output) - - def testCatchesSehExceptionsWithCxxExceptionsEnabled(self): - self.TestSehExceptions(EX_BINARY_OUTPUT) - - def testCatchesSehExceptionsWithCxxExceptionsDisabled(self): - self.TestSehExceptions(BINARY_OUTPUT) - - -class CatchCxxExceptionsTest(gtest_test_utils.TestCase): - """Tests C++ exception-catching behavior. - - Tests in this test case verify that: - * C++ exceptions are caught and logged as C++ (not SEH) exceptions - * Exception thrown affect the remainder of the test work flow in the - expected manner. - """ - - def testCatchesCxxExceptionsInFixtureConstructor(self): - self.assert_('C++ exception with description ' - '"Standard C++ exception" thrown ' - 'in the test fixture\'s constructor' - in EX_BINARY_OUTPUT) - self.assert_('unexpected' not in EX_BINARY_OUTPUT, - 'This failure belongs in this test only if ' - '"CxxExceptionInConstructorTest" (no quotes) ' - 'appears on the same line as words "called unexpectedly"') - - if ('CxxExceptionInDestructorTest.ThrowsExceptionInDestructor' in - EX_BINARY_OUTPUT): - - def testCatchesCxxExceptionsInFixtureDestructor(self): - self.assert_('C++ exception with description ' - '"Standard C++ exception" thrown ' - 'in the test fixture\'s destructor' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInDestructorTest::TearDownTestCase() ' - 'called as expected.' - in EX_BINARY_OUTPUT) - - def testCatchesCxxExceptionsInSetUpTestCase(self): - self.assert_('C++ exception with description "Standard C++ exception"' - ' thrown in SetUpTestCase()' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInConstructorTest::TearDownTestCase() ' - 'called as expected.' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInSetUpTestCaseTest constructor ' - 'called as expected.' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInSetUpTestCaseTest destructor ' - 'called as expected.' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInSetUpTestCaseTest::SetUp() ' - 'called as expected.' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInSetUpTestCaseTest::TearDown() ' - 'called as expected.' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInSetUpTestCaseTest test body ' - 'called as expected.' - in EX_BINARY_OUTPUT) - - def testCatchesCxxExceptionsInTearDownTestCase(self): - self.assert_('C++ exception with description "Standard C++ exception"' - ' thrown in TearDownTestCase()' - in EX_BINARY_OUTPUT) - - def testCatchesCxxExceptionsInSetUp(self): - self.assert_('C++ exception with description "Standard C++ exception"' - ' thrown in SetUp()' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInSetUpTest::TearDownTestCase() ' - 'called as expected.' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInSetUpTest destructor ' - 'called as expected.' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInSetUpTest::TearDown() ' - 'called as expected.' - in EX_BINARY_OUTPUT) - self.assert_('unexpected' not in EX_BINARY_OUTPUT, - 'This failure belongs in this test only if ' - '"CxxExceptionInSetUpTest" (no quotes) ' - 'appears on the same line as words "called unexpectedly"') - - def testCatchesCxxExceptionsInTearDown(self): - self.assert_('C++ exception with description "Standard C++ exception"' - ' thrown in TearDown()' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInTearDownTest::TearDownTestCase() ' - 'called as expected.' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInTearDownTest destructor ' - 'called as expected.' - in EX_BINARY_OUTPUT) - - def testCatchesCxxExceptionsInTestBody(self): - self.assert_('C++ exception with description "Standard C++ exception"' - ' thrown in the test body' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInTestBodyTest::TearDownTestCase() ' - 'called as expected.' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInTestBodyTest destructor ' - 'called as expected.' - in EX_BINARY_OUTPUT) - self.assert_('CxxExceptionInTestBodyTest::TearDown() ' - 'called as expected.' - in EX_BINARY_OUTPUT) - - def testCatchesNonStdCxxExceptions(self): - self.assert_('Unknown C++ exception thrown in the test body' - in EX_BINARY_OUTPUT) - - def testUnhandledCxxExceptionsAbortTheProgram(self): - # Filters out SEH exception tests on Windows. Unhandled SEH exceptions - # cause tests to show pop-up windows there. - FITLER_OUT_SEH_TESTS_FLAG = FILTER_FLAG + '=-*Seh*' - # By default, Google Test doesn't catch the exceptions. - uncaught_exceptions_ex_binary_output = gtest_test_utils.Subprocess( - [EX_EXE_PATH, - NO_CATCH_EXCEPTIONS_FLAG, - FITLER_OUT_SEH_TESTS_FLAG], - env=environ).output - - self.assert_('Unhandled C++ exception terminating the program' - in uncaught_exceptions_ex_binary_output) - self.assert_('unexpected' not in uncaught_exceptions_ex_binary_output) - - -if __name__ == '__main__': - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_catch_exceptions_test_.cc b/test/gtest-1.8.0/test/gtest_catch_exceptions_test_.cc deleted file mode 100644 index c6d953c04a..0000000000 --- a/test/gtest-1.8.0/test/gtest_catch_exceptions_test_.cc +++ /dev/null @@ -1,311 +0,0 @@ -// Copyright 2010, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vladl@google.com (Vlad Losev) -// -// Tests for Google Test itself. Tests in this file throw C++ or SEH -// exceptions, and the output is verified by gtest_catch_exceptions_test.py. - -#include "gtest/gtest.h" - -#include // NOLINT -#include // For exit(). - -#if GTEST_HAS_SEH -# include -#endif - -#if GTEST_HAS_EXCEPTIONS -# include // For set_terminate(). -# include -#endif - -using testing::Test; - -#if GTEST_HAS_SEH - -class SehExceptionInConstructorTest : public Test { - public: - SehExceptionInConstructorTest() { RaiseException(42, 0, 0, NULL); } -}; - -TEST_F(SehExceptionInConstructorTest, ThrowsExceptionInConstructor) {} - -class SehExceptionInDestructorTest : public Test { - public: - ~SehExceptionInDestructorTest() { RaiseException(42, 0, 0, NULL); } -}; - -TEST_F(SehExceptionInDestructorTest, ThrowsExceptionInDestructor) {} - -class SehExceptionInSetUpTestCaseTest : public Test { - public: - static void SetUpTestCase() { RaiseException(42, 0, 0, NULL); } -}; - -TEST_F(SehExceptionInSetUpTestCaseTest, ThrowsExceptionInSetUpTestCase) {} - -class SehExceptionInTearDownTestCaseTest : public Test { - public: - static void TearDownTestCase() { RaiseException(42, 0, 0, NULL); } -}; - -TEST_F(SehExceptionInTearDownTestCaseTest, ThrowsExceptionInTearDownTestCase) {} - -class SehExceptionInSetUpTest : public Test { - protected: - virtual void SetUp() { RaiseException(42, 0, 0, NULL); } -}; - -TEST_F(SehExceptionInSetUpTest, ThrowsExceptionInSetUp) {} - -class SehExceptionInTearDownTest : public Test { - protected: - virtual void TearDown() { RaiseException(42, 0, 0, NULL); } -}; - -TEST_F(SehExceptionInTearDownTest, ThrowsExceptionInTearDown) {} - -TEST(SehExceptionTest, ThrowsSehException) { - RaiseException(42, 0, 0, NULL); -} - -#endif // GTEST_HAS_SEH - -#if GTEST_HAS_EXCEPTIONS - -class CxxExceptionInConstructorTest : public Test { - public: - CxxExceptionInConstructorTest() { - // Without this macro VC++ complains about unreachable code at the end of - // the constructor. - GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_( - throw std::runtime_error("Standard C++ exception")); - } - - static void TearDownTestCase() { - printf("%s", - "CxxExceptionInConstructorTest::TearDownTestCase() " - "called as expected.\n"); - } - - protected: - ~CxxExceptionInConstructorTest() { - ADD_FAILURE() << "CxxExceptionInConstructorTest destructor " - << "called unexpectedly."; - } - - virtual void SetUp() { - ADD_FAILURE() << "CxxExceptionInConstructorTest::SetUp() " - << "called unexpectedly."; - } - - virtual void TearDown() { - ADD_FAILURE() << "CxxExceptionInConstructorTest::TearDown() " - << "called unexpectedly."; - } -}; - -TEST_F(CxxExceptionInConstructorTest, ThrowsExceptionInConstructor) { - ADD_FAILURE() << "CxxExceptionInConstructorTest test body " - << "called unexpectedly."; -} - -// Exceptions in destructors are not supported in C++11. -#if !GTEST_LANG_CXX11 -class CxxExceptionInDestructorTest : public Test { - public: - static void TearDownTestCase() { - printf("%s", - "CxxExceptionInDestructorTest::TearDownTestCase() " - "called as expected.\n"); - } - - protected: - ~CxxExceptionInDestructorTest() { - GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_( - throw std::runtime_error("Standard C++ exception")); - } -}; - -TEST_F(CxxExceptionInDestructorTest, ThrowsExceptionInDestructor) {} -#endif // C++11 mode - -class CxxExceptionInSetUpTestCaseTest : public Test { - public: - CxxExceptionInSetUpTestCaseTest() { - printf("%s", - "CxxExceptionInSetUpTestCaseTest constructor " - "called as expected.\n"); - } - - static void SetUpTestCase() { - throw std::runtime_error("Standard C++ exception"); - } - - static void TearDownTestCase() { - printf("%s", - "CxxExceptionInSetUpTestCaseTest::TearDownTestCase() " - "called as expected.\n"); - } - - protected: - ~CxxExceptionInSetUpTestCaseTest() { - printf("%s", - "CxxExceptionInSetUpTestCaseTest destructor " - "called as expected.\n"); - } - - virtual void SetUp() { - printf("%s", - "CxxExceptionInSetUpTestCaseTest::SetUp() " - "called as expected.\n"); - } - - virtual void TearDown() { - printf("%s", - "CxxExceptionInSetUpTestCaseTest::TearDown() " - "called as expected.\n"); - } -}; - -TEST_F(CxxExceptionInSetUpTestCaseTest, ThrowsExceptionInSetUpTestCase) { - printf("%s", - "CxxExceptionInSetUpTestCaseTest test body " - "called as expected.\n"); -} - -class CxxExceptionInTearDownTestCaseTest : public Test { - public: - static void TearDownTestCase() { - throw std::runtime_error("Standard C++ exception"); - } -}; - -TEST_F(CxxExceptionInTearDownTestCaseTest, ThrowsExceptionInTearDownTestCase) {} - -class CxxExceptionInSetUpTest : public Test { - public: - static void TearDownTestCase() { - printf("%s", - "CxxExceptionInSetUpTest::TearDownTestCase() " - "called as expected.\n"); - } - - protected: - ~CxxExceptionInSetUpTest() { - printf("%s", - "CxxExceptionInSetUpTest destructor " - "called as expected.\n"); - } - - virtual void SetUp() { throw std::runtime_error("Standard C++ exception"); } - - virtual void TearDown() { - printf("%s", - "CxxExceptionInSetUpTest::TearDown() " - "called as expected.\n"); - } -}; - -TEST_F(CxxExceptionInSetUpTest, ThrowsExceptionInSetUp) { - ADD_FAILURE() << "CxxExceptionInSetUpTest test body " - << "called unexpectedly."; -} - -class CxxExceptionInTearDownTest : public Test { - public: - static void TearDownTestCase() { - printf("%s", - "CxxExceptionInTearDownTest::TearDownTestCase() " - "called as expected.\n"); - } - - protected: - ~CxxExceptionInTearDownTest() { - printf("%s", - "CxxExceptionInTearDownTest destructor " - "called as expected.\n"); - } - - virtual void TearDown() { - throw std::runtime_error("Standard C++ exception"); - } -}; - -TEST_F(CxxExceptionInTearDownTest, ThrowsExceptionInTearDown) {} - -class CxxExceptionInTestBodyTest : public Test { - public: - static void TearDownTestCase() { - printf("%s", - "CxxExceptionInTestBodyTest::TearDownTestCase() " - "called as expected.\n"); - } - - protected: - ~CxxExceptionInTestBodyTest() { - printf("%s", - "CxxExceptionInTestBodyTest destructor " - "called as expected.\n"); - } - - virtual void TearDown() { - printf("%s", - "CxxExceptionInTestBodyTest::TearDown() " - "called as expected.\n"); - } -}; - -TEST_F(CxxExceptionInTestBodyTest, ThrowsStdCxxException) { - throw std::runtime_error("Standard C++ exception"); -} - -TEST(CxxExceptionTest, ThrowsNonStdCxxException) { - throw "C-string"; -} - -// This terminate handler aborts the program using exit() rather than abort(). -// This avoids showing pop-ups on Windows systems and core dumps on Unix-like -// ones. -void TerminateHandler() { - fprintf(stderr, "%s\n", "Unhandled C++ exception terminating the program."); - fflush(NULL); - exit(3); -} - -#endif // GTEST_HAS_EXCEPTIONS - -int main(int argc, char** argv) { -#if GTEST_HAS_EXCEPTIONS - std::set_terminate(&TerminateHandler); -#endif - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/test/gtest-1.8.0/test/gtest_color_test.py b/test/gtest-1.8.0/test/gtest_color_test.py deleted file mode 100644 index 49b8ed2d02..0000000000 --- a/test/gtest-1.8.0/test/gtest_color_test.py +++ /dev/null @@ -1,129 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Verifies that Google Test correctly determines whether to use colors.""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import os -import gtest_test_utils - -IS_WINDOWS = os.name == 'nt' - -COLOR_ENV_VAR = 'GTEST_COLOR' -COLOR_FLAG = 'gtest_color' -COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_color_test_') - - -def SetEnvVar(env_var, value): - """Sets the env variable to 'value'; unsets it when 'value' is None.""" - - if value is not None: - os.environ[env_var] = value - elif env_var in os.environ: - del os.environ[env_var] - - -def UsesColor(term, color_env_var, color_flag): - """Runs gtest_color_test_ and returns its exit code.""" - - SetEnvVar('TERM', term) - SetEnvVar(COLOR_ENV_VAR, color_env_var) - - if color_flag is None: - args = [] - else: - args = ['--%s=%s' % (COLOR_FLAG, color_flag)] - p = gtest_test_utils.Subprocess([COMMAND] + args) - return not p.exited or p.exit_code - - -class GTestColorTest(gtest_test_utils.TestCase): - def testNoEnvVarNoFlag(self): - """Tests the case when there's neither GTEST_COLOR nor --gtest_color.""" - - if not IS_WINDOWS: - self.assert_(not UsesColor('dumb', None, None)) - self.assert_(not UsesColor('emacs', None, None)) - self.assert_(not UsesColor('xterm-mono', None, None)) - self.assert_(not UsesColor('unknown', None, None)) - self.assert_(not UsesColor(None, None, None)) - self.assert_(UsesColor('linux', None, None)) - self.assert_(UsesColor('cygwin', None, None)) - self.assert_(UsesColor('xterm', None, None)) - self.assert_(UsesColor('xterm-color', None, None)) - self.assert_(UsesColor('xterm-256color', None, None)) - - def testFlagOnly(self): - """Tests the case when there's --gtest_color but not GTEST_COLOR.""" - - self.assert_(not UsesColor('dumb', None, 'no')) - self.assert_(not UsesColor('xterm-color', None, 'no')) - if not IS_WINDOWS: - self.assert_(not UsesColor('emacs', None, 'auto')) - self.assert_(UsesColor('xterm', None, 'auto')) - self.assert_(UsesColor('dumb', None, 'yes')) - self.assert_(UsesColor('xterm', None, 'yes')) - - def testEnvVarOnly(self): - """Tests the case when there's GTEST_COLOR but not --gtest_color.""" - - self.assert_(not UsesColor('dumb', 'no', None)) - self.assert_(not UsesColor('xterm-color', 'no', None)) - if not IS_WINDOWS: - self.assert_(not UsesColor('dumb', 'auto', None)) - self.assert_(UsesColor('xterm-color', 'auto', None)) - self.assert_(UsesColor('dumb', 'yes', None)) - self.assert_(UsesColor('xterm-color', 'yes', None)) - - def testEnvVarAndFlag(self): - """Tests the case when there are both GTEST_COLOR and --gtest_color.""" - - self.assert_(not UsesColor('xterm-color', 'no', 'no')) - self.assert_(UsesColor('dumb', 'no', 'yes')) - self.assert_(UsesColor('xterm-color', 'no', 'auto')) - - def testAliasesOfYesAndNo(self): - """Tests using aliases in specifying --gtest_color.""" - - self.assert_(UsesColor('dumb', None, 'true')) - self.assert_(UsesColor('dumb', None, 'YES')) - self.assert_(UsesColor('dumb', None, 'T')) - self.assert_(UsesColor('dumb', None, '1')) - - self.assert_(not UsesColor('xterm', None, 'f')) - self.assert_(not UsesColor('xterm', None, 'false')) - self.assert_(not UsesColor('xterm', None, '0')) - self.assert_(not UsesColor('xterm', None, 'unknown')) - - -if __name__ == '__main__': - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_color_test_.cc b/test/gtest-1.8.0/test/gtest_color_test_.cc deleted file mode 100644 index f9a21e2d56..0000000000 --- a/test/gtest-1.8.0/test/gtest_color_test_.cc +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// A helper program for testing how Google Test determines whether to use -// colors in the output. It prints "YES" and returns 1 if Google Test -// decides to use colors, and prints "NO" and returns 0 otherwise. - -#include - -#include "gtest/gtest.h" -#include "src/gtest-internal-inl.h" - -using testing::internal::ShouldUseColor; - -// The purpose of this is to ensure that the UnitTest singleton is -// created before main() is entered, and thus that ShouldUseColor() -// works the same way as in a real Google-Test-based test. We don't actual -// run the TEST itself. -TEST(GTestColorTest, Dummy) { -} - -int main(int argc, char** argv) { - testing::InitGoogleTest(&argc, argv); - - if (ShouldUseColor(true)) { - // Google Test decides to use colors in the output (assuming it - // goes to a TTY). - printf("YES\n"); - return 1; - } else { - // Google Test decides not to use colors in the output. - printf("NO\n"); - return 0; - } -} diff --git a/test/gtest-1.8.0/test/gtest_env_var_test.py b/test/gtest-1.8.0/test/gtest_env_var_test.py deleted file mode 100644 index beb2a8b00b..0000000000 --- a/test/gtest-1.8.0/test/gtest_env_var_test.py +++ /dev/null @@ -1,119 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Verifies that Google Test correctly parses environment variables.""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import os -import gtest_test_utils - - -IS_WINDOWS = os.name == 'nt' -IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux' - -COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_env_var_test_') - -environ = os.environ.copy() - - -def AssertEq(expected, actual): - if expected != actual: - print 'Expected: %s' % (expected,) - print ' Actual: %s' % (actual,) - raise AssertionError - - -def SetEnvVar(env_var, value): - """Sets the env variable to 'value'; unsets it when 'value' is None.""" - - if value is not None: - environ[env_var] = value - elif env_var in environ: - del environ[env_var] - - -def GetFlag(flag): - """Runs gtest_env_var_test_ and returns its output.""" - - args = [COMMAND] - if flag is not None: - args += [flag] - return gtest_test_utils.Subprocess(args, env=environ).output - - -def TestFlag(flag, test_val, default_val): - """Verifies that the given flag is affected by the corresponding env var.""" - - env_var = 'GTEST_' + flag.upper() - SetEnvVar(env_var, test_val) - AssertEq(test_val, GetFlag(flag)) - SetEnvVar(env_var, None) - AssertEq(default_val, GetFlag(flag)) - - -class GTestEnvVarTest(gtest_test_utils.TestCase): - - def testEnvVarAffectsFlag(self): - """Tests that environment variable should affect the corresponding flag.""" - - TestFlag('break_on_failure', '1', '0') - TestFlag('color', 'yes', 'auto') - TestFlag('filter', 'FooTest.Bar', '*') - SetEnvVar('XML_OUTPUT_FILE', None) # For 'output' test - TestFlag('output', 'xml:tmp/foo.xml', '') - TestFlag('print_time', '0', '1') - TestFlag('repeat', '999', '1') - TestFlag('throw_on_failure', '1', '0') - TestFlag('death_test_style', 'threadsafe', 'fast') - TestFlag('catch_exceptions', '0', '1') - - if IS_LINUX: - TestFlag('death_test_use_fork', '1', '0') - TestFlag('stack_trace_depth', '0', '100') - - - def testXmlOutputFile(self): - """Tests that $XML_OUTPUT_FILE affects the output flag.""" - - SetEnvVar('GTEST_OUTPUT', None) - SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml') - AssertEq('xml:tmp/bar.xml', GetFlag('output')) - - def testXmlOutputFileOverride(self): - """Tests that $XML_OUTPUT_FILE is overridden by $GTEST_OUTPUT.""" - - SetEnvVar('GTEST_OUTPUT', 'xml:tmp/foo.xml') - SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml') - AssertEq('xml:tmp/foo.xml', GetFlag('output')) - -if __name__ == '__main__': - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_env_var_test_.cc b/test/gtest-1.8.0/test/gtest_env_var_test_.cc deleted file mode 100644 index 9b668dc07d..0000000000 --- a/test/gtest-1.8.0/test/gtest_env_var_test_.cc +++ /dev/null @@ -1,124 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// A helper program for testing that Google Test parses the environment -// variables correctly. - -#include "gtest/gtest.h" - -#include - -#include "src/gtest-internal-inl.h" - -using ::std::cout; - -namespace testing { - -// The purpose of this is to make the test more realistic by ensuring -// that the UnitTest singleton is created before main() is entered. -// We don't actual run the TEST itself. -TEST(GTestEnvVarTest, Dummy) { -} - -void PrintFlag(const char* flag) { - if (strcmp(flag, "break_on_failure") == 0) { - cout << GTEST_FLAG(break_on_failure); - return; - } - - if (strcmp(flag, "catch_exceptions") == 0) { - cout << GTEST_FLAG(catch_exceptions); - return; - } - - if (strcmp(flag, "color") == 0) { - cout << GTEST_FLAG(color); - return; - } - - if (strcmp(flag, "death_test_style") == 0) { - cout << GTEST_FLAG(death_test_style); - return; - } - - if (strcmp(flag, "death_test_use_fork") == 0) { - cout << GTEST_FLAG(death_test_use_fork); - return; - } - - if (strcmp(flag, "filter") == 0) { - cout << GTEST_FLAG(filter); - return; - } - - if (strcmp(flag, "output") == 0) { - cout << GTEST_FLAG(output); - return; - } - - if (strcmp(flag, "print_time") == 0) { - cout << GTEST_FLAG(print_time); - return; - } - - if (strcmp(flag, "repeat") == 0) { - cout << GTEST_FLAG(repeat); - return; - } - - if (strcmp(flag, "stack_trace_depth") == 0) { - cout << GTEST_FLAG(stack_trace_depth); - return; - } - - if (strcmp(flag, "throw_on_failure") == 0) { - cout << GTEST_FLAG(throw_on_failure); - return; - } - - cout << "Invalid flag name " << flag - << ". Valid names are break_on_failure, color, filter, etc.\n"; - exit(1); -} - -} // namespace testing - -int main(int argc, char** argv) { - testing::InitGoogleTest(&argc, argv); - - if (argc != 2) { - cout << "Usage: gtest_env_var_test_ NAME_OF_FLAG\n"; - return 1; - } - - testing::PrintFlag(argv[1]); - return 0; -} diff --git a/test/gtest-1.8.0/test/gtest_environment_test.cc b/test/gtest-1.8.0/test/gtest_environment_test.cc deleted file mode 100644 index 1d6dc12b2d..0000000000 --- a/test/gtest-1.8.0/test/gtest_environment_test.cc +++ /dev/null @@ -1,189 +0,0 @@ -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// Tests using global test environments. - -#include -#include -#include "gtest/gtest.h" -#include "src/gtest-internal-inl.h" - -namespace testing { -GTEST_DECLARE_string_(filter); -} - -namespace { - -enum FailureType { - NO_FAILURE, NON_FATAL_FAILURE, FATAL_FAILURE -}; - -// For testing using global test environments. -class MyEnvironment : public testing::Environment { - public: - MyEnvironment() { Reset(); } - - // Depending on the value of failure_in_set_up_, SetUp() will - // generate a non-fatal failure, generate a fatal failure, or - // succeed. - virtual void SetUp() { - set_up_was_run_ = true; - - switch (failure_in_set_up_) { - case NON_FATAL_FAILURE: - ADD_FAILURE() << "Expected non-fatal failure in global set-up."; - break; - case FATAL_FAILURE: - FAIL() << "Expected fatal failure in global set-up."; - break; - default: - break; - } - } - - // Generates a non-fatal failure. - virtual void TearDown() { - tear_down_was_run_ = true; - ADD_FAILURE() << "Expected non-fatal failure in global tear-down."; - } - - // Resets the state of the environment s.t. it can be reused. - void Reset() { - failure_in_set_up_ = NO_FAILURE; - set_up_was_run_ = false; - tear_down_was_run_ = false; - } - - // We call this function to set the type of failure SetUp() should - // generate. - void set_failure_in_set_up(FailureType type) { - failure_in_set_up_ = type; - } - - // Was SetUp() run? - bool set_up_was_run() const { return set_up_was_run_; } - - // Was TearDown() run? - bool tear_down_was_run() const { return tear_down_was_run_; } - - private: - FailureType failure_in_set_up_; - bool set_up_was_run_; - bool tear_down_was_run_; -}; - -// Was the TEST run? -bool test_was_run; - -// The sole purpose of this TEST is to enable us to check whether it -// was run. -TEST(FooTest, Bar) { - test_was_run = true; -} - -// Prints the message and aborts the program if condition is false. -void Check(bool condition, const char* msg) { - if (!condition) { - printf("FAILED: %s\n", msg); - testing::internal::posix::Abort(); - } -} - -// Runs the tests. Return true iff successful. -// -// The 'failure' parameter specifies the type of failure that should -// be generated by the global set-up. -int RunAllTests(MyEnvironment* env, FailureType failure) { - env->Reset(); - env->set_failure_in_set_up(failure); - test_was_run = false; - testing::internal::GetUnitTestImpl()->ClearAdHocTestResult(); - return RUN_ALL_TESTS(); -} - -} // namespace - -int main(int argc, char **argv) { - testing::InitGoogleTest(&argc, argv); - - // Registers a global test environment, and verifies that the - // registration function returns its argument. - MyEnvironment* const env = new MyEnvironment; - Check(testing::AddGlobalTestEnvironment(env) == env, - "AddGlobalTestEnvironment() should return its argument."); - - // Verifies that RUN_ALL_TESTS() runs the tests when the global - // set-up is successful. - Check(RunAllTests(env, NO_FAILURE) != 0, - "RUN_ALL_TESTS() should return non-zero, as the global tear-down " - "should generate a failure."); - Check(test_was_run, - "The tests should run, as the global set-up should generate no " - "failure"); - Check(env->tear_down_was_run(), - "The global tear-down should run, as the global set-up was run."); - - // Verifies that RUN_ALL_TESTS() runs the tests when the global - // set-up generates no fatal failure. - Check(RunAllTests(env, NON_FATAL_FAILURE) != 0, - "RUN_ALL_TESTS() should return non-zero, as both the global set-up " - "and the global tear-down should generate a non-fatal failure."); - Check(test_was_run, - "The tests should run, as the global set-up should generate no " - "fatal failure."); - Check(env->tear_down_was_run(), - "The global tear-down should run, as the global set-up was run."); - - // Verifies that RUN_ALL_TESTS() runs no test when the global set-up - // generates a fatal failure. - Check(RunAllTests(env, FATAL_FAILURE) != 0, - "RUN_ALL_TESTS() should return non-zero, as the global set-up " - "should generate a fatal failure."); - Check(!test_was_run, - "The tests should not run, as the global set-up should generate " - "a fatal failure."); - Check(env->tear_down_was_run(), - "The global tear-down should run, as the global set-up was run."); - - // Verifies that RUN_ALL_TESTS() doesn't do global set-up or - // tear-down when there is no test to run. - testing::GTEST_FLAG(filter) = "-*"; - Check(RunAllTests(env, NO_FAILURE) == 0, - "RUN_ALL_TESTS() should return zero, as there is no test to run."); - Check(!env->set_up_was_run(), - "The global set-up should not run, as there is no test to run."); - Check(!env->tear_down_was_run(), - "The global tear-down should not run, " - "as the global set-up was not run."); - - printf("PASS\n"); - return 0; -} diff --git a/test/gtest-1.8.0/test/gtest_filter_unittest.py b/test/gtest-1.8.0/test/gtest_filter_unittest.py deleted file mode 100644 index 92cc77c851..0000000000 --- a/test/gtest-1.8.0/test/gtest_filter_unittest.py +++ /dev/null @@ -1,638 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2005 Google Inc. All Rights Reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Unit test for Google Test test filters. - -A user can specify which test(s) in a Google Test program to run via either -the GTEST_FILTER environment variable or the --gtest_filter flag. -This script tests such functionality by invoking -gtest_filter_unittest_ (a program written with Google Test) with different -environments and command line flags. - -Note that test sharding may also influence which tests are filtered. Therefore, -we test that here also. -""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import os -import re -import sets -import sys -import gtest_test_utils - -# Constants. - -# Checks if this platform can pass empty environment variables to child -# processes. We set an env variable to an empty string and invoke a python -# script in a subprocess to print whether the variable is STILL in -# os.environ. We then use 'eval' to parse the child's output so that an -# exception is thrown if the input is anything other than 'True' nor 'False'. -CAN_PASS_EMPTY_ENV = False -if sys.executable: - os.environ['EMPTY_VAR'] = '' - child = gtest_test_utils.Subprocess( - [sys.executable, '-c', 'import os; print \'EMPTY_VAR\' in os.environ']) - CAN_PASS_EMPTY_ENV = eval(child.output) - - -# Check if this platform can unset environment variables in child processes. -# We set an env variable to a non-empty string, unset it, and invoke -# a python script in a subprocess to print whether the variable -# is NO LONGER in os.environ. -# We use 'eval' to parse the child's output so that an exception -# is thrown if the input is neither 'True' nor 'False'. -CAN_UNSET_ENV = False -if sys.executable: - os.environ['UNSET_VAR'] = 'X' - del os.environ['UNSET_VAR'] - child = gtest_test_utils.Subprocess( - [sys.executable, '-c', 'import os; print \'UNSET_VAR\' not in os.environ' - ]) - CAN_UNSET_ENV = eval(child.output) - - -# Checks if we should test with an empty filter. This doesn't -# make sense on platforms that cannot pass empty env variables (Win32) -# and on platforms that cannot unset variables (since we cannot tell -# the difference between "" and NULL -- Borland and Solaris < 5.10) -CAN_TEST_EMPTY_FILTER = (CAN_PASS_EMPTY_ENV and CAN_UNSET_ENV) - - -# The environment variable for specifying the test filters. -FILTER_ENV_VAR = 'GTEST_FILTER' - -# The environment variables for test sharding. -TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS' -SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX' -SHARD_STATUS_FILE_ENV_VAR = 'GTEST_SHARD_STATUS_FILE' - -# The command line flag for specifying the test filters. -FILTER_FLAG = 'gtest_filter' - -# The command line flag for including disabled tests. -ALSO_RUN_DISABLED_TESTS_FLAG = 'gtest_also_run_disabled_tests' - -# Command to run the gtest_filter_unittest_ program. -COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_filter_unittest_') - -# Regex for determining whether parameterized tests are enabled in the binary. -PARAM_TEST_REGEX = re.compile(r'/ParamTest') - -# Regex for parsing test case names from Google Test's output. -TEST_CASE_REGEX = re.compile(r'^\[\-+\] \d+ tests? from (\w+(/\w+)?)') - -# Regex for parsing test names from Google Test's output. -TEST_REGEX = re.compile(r'^\[\s*RUN\s*\].*\.(\w+(/\w+)?)') - -# The command line flag to tell Google Test to output the list of tests it -# will run. -LIST_TESTS_FLAG = '--gtest_list_tests' - -# Indicates whether Google Test supports death tests. -SUPPORTS_DEATH_TESTS = 'HasDeathTest' in gtest_test_utils.Subprocess( - [COMMAND, LIST_TESTS_FLAG]).output - -# Full names of all tests in gtest_filter_unittests_. -PARAM_TESTS = [ - 'SeqP/ParamTest.TestX/0', - 'SeqP/ParamTest.TestX/1', - 'SeqP/ParamTest.TestY/0', - 'SeqP/ParamTest.TestY/1', - 'SeqQ/ParamTest.TestX/0', - 'SeqQ/ParamTest.TestX/1', - 'SeqQ/ParamTest.TestY/0', - 'SeqQ/ParamTest.TestY/1', - ] - -DISABLED_TESTS = [ - 'BarTest.DISABLED_TestFour', - 'BarTest.DISABLED_TestFive', - 'BazTest.DISABLED_TestC', - 'DISABLED_FoobarTest.Test1', - 'DISABLED_FoobarTest.DISABLED_Test2', - 'DISABLED_FoobarbazTest.TestA', - ] - -if SUPPORTS_DEATH_TESTS: - DEATH_TESTS = [ - 'HasDeathTest.Test1', - 'HasDeathTest.Test2', - ] -else: - DEATH_TESTS = [] - -# All the non-disabled tests. -ACTIVE_TESTS = [ - 'FooTest.Abc', - 'FooTest.Xyz', - - 'BarTest.TestOne', - 'BarTest.TestTwo', - 'BarTest.TestThree', - - 'BazTest.TestOne', - 'BazTest.TestA', - 'BazTest.TestB', - ] + DEATH_TESTS + PARAM_TESTS - -param_tests_present = None - -# Utilities. - -environ = os.environ.copy() - - -def SetEnvVar(env_var, value): - """Sets the env variable to 'value'; unsets it when 'value' is None.""" - - if value is not None: - environ[env_var] = value - elif env_var in environ: - del environ[env_var] - - -def RunAndReturnOutput(args = None): - """Runs the test program and returns its output.""" - - return gtest_test_utils.Subprocess([COMMAND] + (args or []), - env=environ).output - - -def RunAndExtractTestList(args = None): - """Runs the test program and returns its exit code and a list of tests run.""" - - p = gtest_test_utils.Subprocess([COMMAND] + (args or []), env=environ) - tests_run = [] - test_case = '' - test = '' - for line in p.output.split('\n'): - match = TEST_CASE_REGEX.match(line) - if match is not None: - test_case = match.group(1) - else: - match = TEST_REGEX.match(line) - if match is not None: - test = match.group(1) - tests_run.append(test_case + '.' + test) - return (tests_run, p.exit_code) - - -def InvokeWithModifiedEnv(extra_env, function, *args, **kwargs): - """Runs the given function and arguments in a modified environment.""" - try: - original_env = environ.copy() - environ.update(extra_env) - return function(*args, **kwargs) - finally: - environ.clear() - environ.update(original_env) - - -def RunWithSharding(total_shards, shard_index, command): - """Runs a test program shard and returns exit code and a list of tests run.""" - - extra_env = {SHARD_INDEX_ENV_VAR: str(shard_index), - TOTAL_SHARDS_ENV_VAR: str(total_shards)} - return InvokeWithModifiedEnv(extra_env, RunAndExtractTestList, command) - -# The unit test. - - -class GTestFilterUnitTest(gtest_test_utils.TestCase): - """Tests the env variable or the command line flag to filter tests.""" - - # Utilities. - - def AssertSetEqual(self, lhs, rhs): - """Asserts that two sets are equal.""" - - for elem in lhs: - self.assert_(elem in rhs, '%s in %s' % (elem, rhs)) - - for elem in rhs: - self.assert_(elem in lhs, '%s in %s' % (elem, lhs)) - - def AssertPartitionIsValid(self, set_var, list_of_sets): - """Asserts that list_of_sets is a valid partition of set_var.""" - - full_partition = [] - for slice_var in list_of_sets: - full_partition.extend(slice_var) - self.assertEqual(len(set_var), len(full_partition)) - self.assertEqual(sets.Set(set_var), sets.Set(full_partition)) - - def AdjustForParameterizedTests(self, tests_to_run): - """Adjust tests_to_run in case value parameterized tests are disabled.""" - - global param_tests_present - if not param_tests_present: - return list(sets.Set(tests_to_run) - sets.Set(PARAM_TESTS)) - else: - return tests_to_run - - def RunAndVerify(self, gtest_filter, tests_to_run): - """Checks that the binary runs correct set of tests for a given filter.""" - - tests_to_run = self.AdjustForParameterizedTests(tests_to_run) - - # First, tests using the environment variable. - - # Windows removes empty variables from the environment when passing it - # to a new process. This means it is impossible to pass an empty filter - # into a process using the environment variable. However, we can still - # test the case when the variable is not supplied (i.e., gtest_filter is - # None). - # pylint: disable-msg=C6403 - if CAN_TEST_EMPTY_FILTER or gtest_filter != '': - SetEnvVar(FILTER_ENV_VAR, gtest_filter) - tests_run = RunAndExtractTestList()[0] - SetEnvVar(FILTER_ENV_VAR, None) - self.AssertSetEqual(tests_run, tests_to_run) - # pylint: enable-msg=C6403 - - # Next, tests using the command line flag. - - if gtest_filter is None: - args = [] - else: - args = ['--%s=%s' % (FILTER_FLAG, gtest_filter)] - - tests_run = RunAndExtractTestList(args)[0] - self.AssertSetEqual(tests_run, tests_to_run) - - def RunAndVerifyWithSharding(self, gtest_filter, total_shards, tests_to_run, - args=None, check_exit_0=False): - """Checks that binary runs correct tests for the given filter and shard. - - Runs all shards of gtest_filter_unittest_ with the given filter, and - verifies that the right set of tests were run. The union of tests run - on each shard should be identical to tests_to_run, without duplicates. - If check_exit_0, . - - Args: - gtest_filter: A filter to apply to the tests. - total_shards: A total number of shards to split test run into. - tests_to_run: A set of tests expected to run. - args : Arguments to pass to the to the test binary. - check_exit_0: When set to a true value, make sure that all shards - return 0. - """ - - tests_to_run = self.AdjustForParameterizedTests(tests_to_run) - - # Windows removes empty variables from the environment when passing it - # to a new process. This means it is impossible to pass an empty filter - # into a process using the environment variable. However, we can still - # test the case when the variable is not supplied (i.e., gtest_filter is - # None). - # pylint: disable-msg=C6403 - if CAN_TEST_EMPTY_FILTER or gtest_filter != '': - SetEnvVar(FILTER_ENV_VAR, gtest_filter) - partition = [] - for i in range(0, total_shards): - (tests_run, exit_code) = RunWithSharding(total_shards, i, args) - if check_exit_0: - self.assertEqual(0, exit_code) - partition.append(tests_run) - - self.AssertPartitionIsValid(tests_to_run, partition) - SetEnvVar(FILTER_ENV_VAR, None) - # pylint: enable-msg=C6403 - - def RunAndVerifyAllowingDisabled(self, gtest_filter, tests_to_run): - """Checks that the binary runs correct set of tests for the given filter. - - Runs gtest_filter_unittest_ with the given filter, and enables - disabled tests. Verifies that the right set of tests were run. - - Args: - gtest_filter: A filter to apply to the tests. - tests_to_run: A set of tests expected to run. - """ - - tests_to_run = self.AdjustForParameterizedTests(tests_to_run) - - # Construct the command line. - args = ['--%s' % ALSO_RUN_DISABLED_TESTS_FLAG] - if gtest_filter is not None: - args.append('--%s=%s' % (FILTER_FLAG, gtest_filter)) - - tests_run = RunAndExtractTestList(args)[0] - self.AssertSetEqual(tests_run, tests_to_run) - - def setUp(self): - """Sets up test case. - - Determines whether value-parameterized tests are enabled in the binary and - sets the flags accordingly. - """ - - global param_tests_present - if param_tests_present is None: - param_tests_present = PARAM_TEST_REGEX.search( - RunAndReturnOutput()) is not None - - def testDefaultBehavior(self): - """Tests the behavior of not specifying the filter.""" - - self.RunAndVerify(None, ACTIVE_TESTS) - - def testDefaultBehaviorWithShards(self): - """Tests the behavior without the filter, with sharding enabled.""" - - self.RunAndVerifyWithSharding(None, 1, ACTIVE_TESTS) - self.RunAndVerifyWithSharding(None, 2, ACTIVE_TESTS) - self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) - 1, ACTIVE_TESTS) - self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS), ACTIVE_TESTS) - self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) + 1, ACTIVE_TESTS) - - def testEmptyFilter(self): - """Tests an empty filter.""" - - self.RunAndVerify('', []) - self.RunAndVerifyWithSharding('', 1, []) - self.RunAndVerifyWithSharding('', 2, []) - - def testBadFilter(self): - """Tests a filter that matches nothing.""" - - self.RunAndVerify('BadFilter', []) - self.RunAndVerifyAllowingDisabled('BadFilter', []) - - def testFullName(self): - """Tests filtering by full name.""" - - self.RunAndVerify('FooTest.Xyz', ['FooTest.Xyz']) - self.RunAndVerifyAllowingDisabled('FooTest.Xyz', ['FooTest.Xyz']) - self.RunAndVerifyWithSharding('FooTest.Xyz', 5, ['FooTest.Xyz']) - - def testUniversalFilters(self): - """Tests filters that match everything.""" - - self.RunAndVerify('*', ACTIVE_TESTS) - self.RunAndVerify('*.*', ACTIVE_TESTS) - self.RunAndVerifyWithSharding('*.*', len(ACTIVE_TESTS) - 3, ACTIVE_TESTS) - self.RunAndVerifyAllowingDisabled('*', ACTIVE_TESTS + DISABLED_TESTS) - self.RunAndVerifyAllowingDisabled('*.*', ACTIVE_TESTS + DISABLED_TESTS) - - def testFilterByTestCase(self): - """Tests filtering by test case name.""" - - self.RunAndVerify('FooTest.*', ['FooTest.Abc', 'FooTest.Xyz']) - - BAZ_TESTS = ['BazTest.TestOne', 'BazTest.TestA', 'BazTest.TestB'] - self.RunAndVerify('BazTest.*', BAZ_TESTS) - self.RunAndVerifyAllowingDisabled('BazTest.*', - BAZ_TESTS + ['BazTest.DISABLED_TestC']) - - def testFilterByTest(self): - """Tests filtering by test name.""" - - self.RunAndVerify('*.TestOne', ['BarTest.TestOne', 'BazTest.TestOne']) - - def testFilterDisabledTests(self): - """Select only the disabled tests to run.""" - - self.RunAndVerify('DISABLED_FoobarTest.Test1', []) - self.RunAndVerifyAllowingDisabled('DISABLED_FoobarTest.Test1', - ['DISABLED_FoobarTest.Test1']) - - self.RunAndVerify('*DISABLED_*', []) - self.RunAndVerifyAllowingDisabled('*DISABLED_*', DISABLED_TESTS) - - self.RunAndVerify('*.DISABLED_*', []) - self.RunAndVerifyAllowingDisabled('*.DISABLED_*', [ - 'BarTest.DISABLED_TestFour', - 'BarTest.DISABLED_TestFive', - 'BazTest.DISABLED_TestC', - 'DISABLED_FoobarTest.DISABLED_Test2', - ]) - - self.RunAndVerify('DISABLED_*', []) - self.RunAndVerifyAllowingDisabled('DISABLED_*', [ - 'DISABLED_FoobarTest.Test1', - 'DISABLED_FoobarTest.DISABLED_Test2', - 'DISABLED_FoobarbazTest.TestA', - ]) - - def testWildcardInTestCaseName(self): - """Tests using wildcard in the test case name.""" - - self.RunAndVerify('*a*.*', [ - 'BarTest.TestOne', - 'BarTest.TestTwo', - 'BarTest.TestThree', - - 'BazTest.TestOne', - 'BazTest.TestA', - 'BazTest.TestB', ] + DEATH_TESTS + PARAM_TESTS) - - def testWildcardInTestName(self): - """Tests using wildcard in the test name.""" - - self.RunAndVerify('*.*A*', ['FooTest.Abc', 'BazTest.TestA']) - - def testFilterWithoutDot(self): - """Tests a filter that has no '.' in it.""" - - self.RunAndVerify('*z*', [ - 'FooTest.Xyz', - - 'BazTest.TestOne', - 'BazTest.TestA', - 'BazTest.TestB', - ]) - - def testTwoPatterns(self): - """Tests filters that consist of two patterns.""" - - self.RunAndVerify('Foo*.*:*A*', [ - 'FooTest.Abc', - 'FooTest.Xyz', - - 'BazTest.TestA', - ]) - - # An empty pattern + a non-empty one - self.RunAndVerify(':*A*', ['FooTest.Abc', 'BazTest.TestA']) - - def testThreePatterns(self): - """Tests filters that consist of three patterns.""" - - self.RunAndVerify('*oo*:*A*:*One', [ - 'FooTest.Abc', - 'FooTest.Xyz', - - 'BarTest.TestOne', - - 'BazTest.TestOne', - 'BazTest.TestA', - ]) - - # The 2nd pattern is empty. - self.RunAndVerify('*oo*::*One', [ - 'FooTest.Abc', - 'FooTest.Xyz', - - 'BarTest.TestOne', - - 'BazTest.TestOne', - ]) - - # The last 2 patterns are empty. - self.RunAndVerify('*oo*::', [ - 'FooTest.Abc', - 'FooTest.Xyz', - ]) - - def testNegativeFilters(self): - self.RunAndVerify('*-BazTest.TestOne', [ - 'FooTest.Abc', - 'FooTest.Xyz', - - 'BarTest.TestOne', - 'BarTest.TestTwo', - 'BarTest.TestThree', - - 'BazTest.TestA', - 'BazTest.TestB', - ] + DEATH_TESTS + PARAM_TESTS) - - self.RunAndVerify('*-FooTest.Abc:BazTest.*', [ - 'FooTest.Xyz', - - 'BarTest.TestOne', - 'BarTest.TestTwo', - 'BarTest.TestThree', - ] + DEATH_TESTS + PARAM_TESTS) - - self.RunAndVerify('BarTest.*-BarTest.TestOne', [ - 'BarTest.TestTwo', - 'BarTest.TestThree', - ]) - - # Tests without leading '*'. - self.RunAndVerify('-FooTest.Abc:FooTest.Xyz:BazTest.*', [ - 'BarTest.TestOne', - 'BarTest.TestTwo', - 'BarTest.TestThree', - ] + DEATH_TESTS + PARAM_TESTS) - - # Value parameterized tests. - self.RunAndVerify('*/*', PARAM_TESTS) - - # Value parameterized tests filtering by the sequence name. - self.RunAndVerify('SeqP/*', [ - 'SeqP/ParamTest.TestX/0', - 'SeqP/ParamTest.TestX/1', - 'SeqP/ParamTest.TestY/0', - 'SeqP/ParamTest.TestY/1', - ]) - - # Value parameterized tests filtering by the test name. - self.RunAndVerify('*/0', [ - 'SeqP/ParamTest.TestX/0', - 'SeqP/ParamTest.TestY/0', - 'SeqQ/ParamTest.TestX/0', - 'SeqQ/ParamTest.TestY/0', - ]) - - def testFlagOverridesEnvVar(self): - """Tests that the filter flag overrides the filtering env. variable.""" - - SetEnvVar(FILTER_ENV_VAR, 'Foo*') - args = ['--%s=%s' % (FILTER_FLAG, '*One')] - tests_run = RunAndExtractTestList(args)[0] - SetEnvVar(FILTER_ENV_VAR, None) - - self.AssertSetEqual(tests_run, ['BarTest.TestOne', 'BazTest.TestOne']) - - def testShardStatusFileIsCreated(self): - """Tests that the shard file is created if specified in the environment.""" - - shard_status_file = os.path.join(gtest_test_utils.GetTempDir(), - 'shard_status_file') - self.assert_(not os.path.exists(shard_status_file)) - - extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file} - try: - InvokeWithModifiedEnv(extra_env, RunAndReturnOutput) - finally: - self.assert_(os.path.exists(shard_status_file)) - os.remove(shard_status_file) - - def testShardStatusFileIsCreatedWithListTests(self): - """Tests that the shard file is created with the "list_tests" flag.""" - - shard_status_file = os.path.join(gtest_test_utils.GetTempDir(), - 'shard_status_file2') - self.assert_(not os.path.exists(shard_status_file)) - - extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file} - try: - output = InvokeWithModifiedEnv(extra_env, - RunAndReturnOutput, - [LIST_TESTS_FLAG]) - finally: - # This assertion ensures that Google Test enumerated the tests as - # opposed to running them. - self.assert_('[==========]' not in output, - 'Unexpected output during test enumeration.\n' - 'Please ensure that LIST_TESTS_FLAG is assigned the\n' - 'correct flag value for listing Google Test tests.') - - self.assert_(os.path.exists(shard_status_file)) - os.remove(shard_status_file) - - if SUPPORTS_DEATH_TESTS: - def testShardingWorksWithDeathTests(self): - """Tests integration with death tests and sharding.""" - - gtest_filter = 'HasDeathTest.*:SeqP/*' - expected_tests = [ - 'HasDeathTest.Test1', - 'HasDeathTest.Test2', - - 'SeqP/ParamTest.TestX/0', - 'SeqP/ParamTest.TestX/1', - 'SeqP/ParamTest.TestY/0', - 'SeqP/ParamTest.TestY/1', - ] - - for flag in ['--gtest_death_test_style=threadsafe', - '--gtest_death_test_style=fast']: - self.RunAndVerifyWithSharding(gtest_filter, 3, expected_tests, - check_exit_0=True, args=[flag]) - self.RunAndVerifyWithSharding(gtest_filter, 5, expected_tests, - check_exit_0=True, args=[flag]) - -if __name__ == '__main__': - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_filter_unittest_.cc b/test/gtest-1.8.0/test/gtest_filter_unittest_.cc deleted file mode 100644 index e74a7a386e..0000000000 --- a/test/gtest-1.8.0/test/gtest_filter_unittest_.cc +++ /dev/null @@ -1,138 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Unit test for Google Test test filters. -// -// A user can specify which test(s) in a Google Test program to run via -// either the GTEST_FILTER environment variable or the --gtest_filter -// flag. This is used for testing such functionality. -// -// The program will be invoked from a Python unit test. Don't run it -// directly. - -#include "gtest/gtest.h" - -namespace { - -// Test case FooTest. - -class FooTest : public testing::Test { -}; - -TEST_F(FooTest, Abc) { -} - -TEST_F(FooTest, Xyz) { - FAIL() << "Expected failure."; -} - -// Test case BarTest. - -TEST(BarTest, TestOne) { -} - -TEST(BarTest, TestTwo) { -} - -TEST(BarTest, TestThree) { -} - -TEST(BarTest, DISABLED_TestFour) { - FAIL() << "Expected failure."; -} - -TEST(BarTest, DISABLED_TestFive) { - FAIL() << "Expected failure."; -} - -// Test case BazTest. - -TEST(BazTest, TestOne) { - FAIL() << "Expected failure."; -} - -TEST(BazTest, TestA) { -} - -TEST(BazTest, TestB) { -} - -TEST(BazTest, DISABLED_TestC) { - FAIL() << "Expected failure."; -} - -// Test case HasDeathTest - -TEST(HasDeathTest, Test1) { - EXPECT_DEATH_IF_SUPPORTED(exit(1), ".*"); -} - -// We need at least two death tests to make sure that the all death tests -// aren't on the first shard. -TEST(HasDeathTest, Test2) { - EXPECT_DEATH_IF_SUPPORTED(exit(1), ".*"); -} - -// Test case FoobarTest - -TEST(DISABLED_FoobarTest, Test1) { - FAIL() << "Expected failure."; -} - -TEST(DISABLED_FoobarTest, DISABLED_Test2) { - FAIL() << "Expected failure."; -} - -// Test case FoobarbazTest - -TEST(DISABLED_FoobarbazTest, TestA) { - FAIL() << "Expected failure."; -} - -class ParamTest : public testing::TestWithParam { -}; - -TEST_P(ParamTest, TestX) { -} - -TEST_P(ParamTest, TestY) { -} - -INSTANTIATE_TEST_CASE_P(SeqP, ParamTest, testing::Values(1, 2)); -INSTANTIATE_TEST_CASE_P(SeqQ, ParamTest, testing::Values(5, 6)); - -} // namespace - -int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - - return RUN_ALL_TESTS(); -} diff --git a/test/gtest-1.8.0/test/gtest_help_test.py b/test/gtest-1.8.0/test/gtest_help_test.py deleted file mode 100644 index 79ffbe4e9b..0000000000 --- a/test/gtest-1.8.0/test/gtest_help_test.py +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2009, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Tests the --help flag of Google C++ Testing and Mocking Framework. - -SYNOPSIS - gtest_help_test.py --build_dir=BUILD/DIR - # where BUILD/DIR contains the built gtest_help_test_ file. - gtest_help_test.py -""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import os -import re -import gtest_test_utils - - -IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux' -IS_WINDOWS = os.name == 'nt' - -PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_help_test_') -FLAG_PREFIX = '--gtest_' -DEATH_TEST_STYLE_FLAG = FLAG_PREFIX + 'death_test_style' -STREAM_RESULT_TO_FLAG = FLAG_PREFIX + 'stream_result_to' -UNKNOWN_FLAG = FLAG_PREFIX + 'unknown_flag_for_testing' -LIST_TESTS_FLAG = FLAG_PREFIX + 'list_tests' -INCORRECT_FLAG_VARIANTS = [re.sub('^--', '-', LIST_TESTS_FLAG), - re.sub('^--', '/', LIST_TESTS_FLAG), - re.sub('_', '-', LIST_TESTS_FLAG)] -INTERNAL_FLAG_FOR_TESTING = FLAG_PREFIX + 'internal_flag_for_testing' - -SUPPORTS_DEATH_TESTS = "DeathTest" in gtest_test_utils.Subprocess( - [PROGRAM_PATH, LIST_TESTS_FLAG]).output - -# The help message must match this regex. -HELP_REGEX = re.compile( - FLAG_PREFIX + r'list_tests.*' + - FLAG_PREFIX + r'filter=.*' + - FLAG_PREFIX + r'also_run_disabled_tests.*' + - FLAG_PREFIX + r'repeat=.*' + - FLAG_PREFIX + r'shuffle.*' + - FLAG_PREFIX + r'random_seed=.*' + - FLAG_PREFIX + r'color=.*' + - FLAG_PREFIX + r'print_time.*' + - FLAG_PREFIX + r'output=.*' + - FLAG_PREFIX + r'break_on_failure.*' + - FLAG_PREFIX + r'throw_on_failure.*' + - FLAG_PREFIX + r'catch_exceptions=0.*', - re.DOTALL) - - -def RunWithFlag(flag): - """Runs gtest_help_test_ with the given flag. - - Returns: - the exit code and the text output as a tuple. - Args: - flag: the command-line flag to pass to gtest_help_test_, or None. - """ - - if flag is None: - command = [PROGRAM_PATH] - else: - command = [PROGRAM_PATH, flag] - child = gtest_test_utils.Subprocess(command) - return child.exit_code, child.output - - -class GTestHelpTest(gtest_test_utils.TestCase): - """Tests the --help flag and its equivalent forms.""" - - def TestHelpFlag(self, flag): - """Verifies correct behavior when help flag is specified. - - The right message must be printed and the tests must - skipped when the given flag is specified. - - Args: - flag: A flag to pass to the binary or None. - """ - - exit_code, output = RunWithFlag(flag) - self.assertEquals(0, exit_code) - self.assert_(HELP_REGEX.search(output), output) - - if IS_LINUX: - self.assert_(STREAM_RESULT_TO_FLAG in output, output) - else: - self.assert_(STREAM_RESULT_TO_FLAG not in output, output) - - if SUPPORTS_DEATH_TESTS and not IS_WINDOWS: - self.assert_(DEATH_TEST_STYLE_FLAG in output, output) - else: - self.assert_(DEATH_TEST_STYLE_FLAG not in output, output) - - def TestNonHelpFlag(self, flag): - """Verifies correct behavior when no help flag is specified. - - Verifies that when no help flag is specified, the tests are run - and the help message is not printed. - - Args: - flag: A flag to pass to the binary or None. - """ - - exit_code, output = RunWithFlag(flag) - self.assert_(exit_code != 0) - self.assert_(not HELP_REGEX.search(output), output) - - def testPrintsHelpWithFullFlag(self): - self.TestHelpFlag('--help') - - def testPrintsHelpWithShortFlag(self): - self.TestHelpFlag('-h') - - def testPrintsHelpWithQuestionFlag(self): - self.TestHelpFlag('-?') - - def testPrintsHelpWithWindowsStyleQuestionFlag(self): - self.TestHelpFlag('/?') - - def testPrintsHelpWithUnrecognizedGoogleTestFlag(self): - self.TestHelpFlag(UNKNOWN_FLAG) - - def testPrintsHelpWithIncorrectFlagStyle(self): - for incorrect_flag in INCORRECT_FLAG_VARIANTS: - self.TestHelpFlag(incorrect_flag) - - def testRunsTestsWithoutHelpFlag(self): - """Verifies that when no help flag is specified, the tests are run - and the help message is not printed.""" - - self.TestNonHelpFlag(None) - - def testRunsTestsWithGtestInternalFlag(self): - """Verifies that the tests are run and no help message is printed when - a flag starting with Google Test prefix and 'internal_' is supplied.""" - - self.TestNonHelpFlag(INTERNAL_FLAG_FOR_TESTING) - - -if __name__ == '__main__': - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_help_test_.cc b/test/gtest-1.8.0/test/gtest_help_test_.cc deleted file mode 100644 index 31f78c2441..0000000000 --- a/test/gtest-1.8.0/test/gtest_help_test_.cc +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2009, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// This program is meant to be run by gtest_help_test.py. Do not run -// it directly. - -#include "gtest/gtest.h" - -// When a help flag is specified, this program should skip the tests -// and exit with 0; otherwise the following test will be executed, -// causing this program to exit with a non-zero code. -TEST(HelpFlagTest, ShouldNotBeRun) { - ASSERT_TRUE(false) << "Tests shouldn't be run when --help is specified."; -} - -#if GTEST_HAS_DEATH_TEST -TEST(DeathTest, UsedByPythonScriptToDetectSupportForDeathTestsInThisBinary) {} -#endif diff --git a/test/gtest-1.8.0/test/gtest_json_outfiles_test.py b/test/gtest-1.8.0/test/gtest_json_outfiles_test.py deleted file mode 100644 index 46010d8990..0000000000 --- a/test/gtest-1.8.0/test/gtest_json_outfiles_test.py +++ /dev/null @@ -1,162 +0,0 @@ -#!/usr/bin/env python -# Copyright 2018, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Unit test for the gtest_json_output module.""" - -import json -import os -import gtest_json_test_utils -import gtest_test_utils - -GTEST_OUTPUT_SUBDIR = 'json_outfiles' -GTEST_OUTPUT_1_TEST = 'gtest_xml_outfile1_test_' -GTEST_OUTPUT_2_TEST = 'gtest_xml_outfile2_test_' - -EXPECTED_1 = { - u'tests': 1, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'timestamp': u'*', - u'name': u'AllTests', - u'testsuites': [{ - u'name': u'PropertyOne', - u'tests': 1, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'testsuite': [{ - u'name': u'TestSomeProperties', - u'status': u'RUN', - u'time': u'*', - u'classname': u'PropertyOne', - u'SetUpProp': u'1', - u'TestSomeProperty': u'1', - u'TearDownProp': u'1', - }], - }], -} - -EXPECTED_2 = { - u'tests': 1, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'timestamp': u'*', - u'name': u'AllTests', - u'testsuites': [{ - u'name': u'PropertyTwo', - u'tests': 1, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'testsuite': [{ - u'name': u'TestSomeProperties', - u'status': u'RUN', - u'time': u'*', - u'classname': u'PropertyTwo', - u'SetUpProp': u'2', - u'TestSomeProperty': u'2', - u'TearDownProp': u'2', - }], - }], -} - - -class GTestJsonOutFilesTest(gtest_test_utils.TestCase): - """Unit test for Google Test's JSON output functionality.""" - - def setUp(self): - # We want the trailing '/' that the last "" provides in os.path.join, for - # telling Google Test to create an output directory instead of a single file - # for xml output. - self.output_dir_ = os.path.join(gtest_test_utils.GetTempDir(), - GTEST_OUTPUT_SUBDIR, '') - self.DeleteFilesAndDir() - - def tearDown(self): - self.DeleteFilesAndDir() - - def DeleteFilesAndDir(self): - try: - os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_1_TEST + '.json')) - except os.error: - pass - try: - os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_2_TEST + '.json')) - except os.error: - pass - try: - os.rmdir(self.output_dir_) - except os.error: - pass - - def testOutfile1(self): - self._TestOutFile(GTEST_OUTPUT_1_TEST, EXPECTED_1) - - def testOutfile2(self): - self._TestOutFile(GTEST_OUTPUT_2_TEST, EXPECTED_2) - - def _TestOutFile(self, test_name, expected): - gtest_prog_path = gtest_test_utils.GetTestExecutablePath(test_name) - command = [gtest_prog_path, '--gtest_output=json:%s' % self.output_dir_] - p = gtest_test_utils.Subprocess(command, - working_dir=gtest_test_utils.GetTempDir()) - self.assert_(p.exited) - self.assertEquals(0, p.exit_code) - - # TODO(wan@google.com): libtool causes the built test binary to be - # named lt-gtest_xml_outfiles_test_ instead of - # gtest_xml_outfiles_test_. To account for this possibility, we - # allow both names in the following code. We should remove this - # hack when Chandler Carruth's libtool replacement tool is ready. - output_file_name1 = test_name + '.json' - output_file1 = os.path.join(self.output_dir_, output_file_name1) - output_file_name2 = 'lt-' + output_file_name1 - output_file2 = os.path.join(self.output_dir_, output_file_name2) - self.assert_(os.path.isfile(output_file1) or os.path.isfile(output_file2), - output_file1) - - if os.path.isfile(output_file1): - with open(output_file1) as f: - actual = json.load(f) - else: - with open(output_file2) as f: - actual = json.load(f) - self.assertEqual(expected, gtest_json_test_utils.normalize(actual)) - - -if __name__ == '__main__': - os.environ['GTEST_STACK_TRACE_DEPTH'] = '0' - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_json_output_unittest.py b/test/gtest-1.8.0/test/gtest_json_output_unittest.py deleted file mode 100644 index 12047c4fee..0000000000 --- a/test/gtest-1.8.0/test/gtest_json_output_unittest.py +++ /dev/null @@ -1,611 +0,0 @@ -#!/usr/bin/env python -# Copyright 2018, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Unit test for the gtest_json_output module.""" - -import datetime -import errno -import json -import os -import re -import sys - -import gtest_json_test_utils -import gtest_test_utils - -GTEST_FILTER_FLAG = '--gtest_filter' -GTEST_LIST_TESTS_FLAG = '--gtest_list_tests' -GTEST_OUTPUT_FLAG = '--gtest_output' -GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.json' -GTEST_PROGRAM_NAME = 'gtest_xml_output_unittest_' - -SUPPORTS_STACK_TRACES = False - -if SUPPORTS_STACK_TRACES: - STACK_TRACE_TEMPLATE = '\nStack trace:\n*' -else: - STACK_TRACE_TEMPLATE = '' - -EXPECTED_NON_EMPTY = { - u'tests': 23, - u'failures': 4, - u'disabled': 2, - u'errors': 0, - u'timestamp': u'*', - u'time': u'*', - u'ad_hoc_property': u'42', - u'name': u'AllTests', - u'testsuites': [ - { - u'name': u'SuccessfulTest', - u'tests': 1, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'testsuite': [ - { - u'name': u'Succeeds', - u'status': u'RUN', - u'time': u'*', - u'classname': u'SuccessfulTest' - } - ] - }, - { - u'name': u'FailedTest', - u'tests': 1, - u'failures': 1, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'testsuite': [ - { - u'name': u'Fails', - u'status': u'RUN', - u'time': u'*', - u'classname': u'FailedTest', - u'failures': [ - { - u'failure': - u'gtest_xml_output_unittest_.cc:*\n' - u'Expected equality of these values:\n' - u' 1\n 2' + STACK_TRACE_TEMPLATE, - u'type': u'' - } - ] - } - ] - }, - { - u'name': u'DisabledTest', - u'tests': 1, - u'failures': 0, - u'disabled': 1, - u'errors': 0, - u'time': u'*', - u'testsuite': [ - { - u'name': u'DISABLED_test_not_run', - u'status': u'NOTRUN', - u'time': u'*', - u'classname': u'DisabledTest' - } - ] - }, - { - u'name': u'MixedResultTest', - u'tests': 3, - u'failures': 1, - u'disabled': 1, - u'errors': 0, - u'time': u'*', - u'testsuite': [ - { - u'name': u'Succeeds', - u'status': u'RUN', - u'time': u'*', - u'classname': u'MixedResultTest' - }, - { - u'name': u'Fails', - u'status': u'RUN', - u'time': u'*', - u'classname': u'MixedResultTest', - u'failures': [ - { - u'failure': - u'gtest_xml_output_unittest_.cc:*\n' - u'Expected equality of these values:\n' - u' 1\n 2' + STACK_TRACE_TEMPLATE, - u'type': u'' - }, - { - u'failure': - u'gtest_xml_output_unittest_.cc:*\n' - u'Expected equality of these values:\n' - u' 2\n 3' + STACK_TRACE_TEMPLATE, - u'type': u'' - } - ] - }, - { - u'name': u'DISABLED_test', - u'status': u'NOTRUN', - u'time': u'*', - u'classname': u'MixedResultTest' - } - ] - }, - { - u'name': u'XmlQuotingTest', - u'tests': 1, - u'failures': 1, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'testsuite': [ - { - u'name': u'OutputsCData', - u'status': u'RUN', - u'time': u'*', - u'classname': u'XmlQuotingTest', - u'failures': [ - { - u'failure': - u'gtest_xml_output_unittest_.cc:*\n' - u'Failed\nXML output: ' - u'' + - STACK_TRACE_TEMPLATE, - u'type': u'' - } - ] - } - ] - }, - { - u'name': u'InvalidCharactersTest', - u'tests': 1, - u'failures': 1, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'testsuite': [ - { - u'name': u'InvalidCharactersInMessage', - u'status': u'RUN', - u'time': u'*', - u'classname': u'InvalidCharactersTest', - u'failures': [ - { - u'failure': - u'gtest_xml_output_unittest_.cc:*\n' - u'Failed\nInvalid characters in brackets' - u' [\x01\x02]' + STACK_TRACE_TEMPLATE, - u'type': u'' - } - ] - } - ] - }, - { - u'name': u'PropertyRecordingTest', - u'tests': 4, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'SetUpTestCase': u'yes', - u'TearDownTestCase': u'aye', - u'testsuite': [ - { - u'name': u'OneProperty', - u'status': u'RUN', - u'time': u'*', - u'classname': u'PropertyRecordingTest', - u'key_1': u'1' - }, - { - u'name': u'IntValuedProperty', - u'status': u'RUN', - u'time': u'*', - u'classname': u'PropertyRecordingTest', - u'key_int': u'1' - }, - { - u'name': u'ThreeProperties', - u'status': u'RUN', - u'time': u'*', - u'classname': u'PropertyRecordingTest', - u'key_1': u'1', - u'key_2': u'2', - u'key_3': u'3' - }, - { - u'name': u'TwoValuesForOneKeyUsesLastValue', - u'status': u'RUN', - u'time': u'*', - u'classname': u'PropertyRecordingTest', - u'key_1': u'2' - } - ] - }, - { - u'name': u'NoFixtureTest', - u'tests': 3, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'testsuite': [ - { - u'name': u'RecordProperty', - u'status': u'RUN', - u'time': u'*', - u'classname': u'NoFixtureTest', - u'key': u'1' - }, - { - u'name': u'ExternalUtilityThatCallsRecordIntValuedProperty', - u'status': u'RUN', - u'time': u'*', - u'classname': u'NoFixtureTest', - u'key_for_utility_int': u'1' - }, - { - u'name': - u'ExternalUtilityThatCallsRecordStringValuedProperty', - u'status': u'RUN', - u'time': u'*', - u'classname': u'NoFixtureTest', - u'key_for_utility_string': u'1' - } - ] - }, - { - u'name': u'TypedTest/0', - u'tests': 1, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'testsuite': [ - { - u'name': u'HasTypeParamAttribute', - u'type_param': u'int', - u'status': u'RUN', - u'time': u'*', - u'classname': u'TypedTest/0' - } - ] - }, - { - u'name': u'TypedTest/1', - u'tests': 1, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'testsuite': [ - { - u'name': u'HasTypeParamAttribute', - u'type_param': u'long', - u'status': u'RUN', - u'time': u'*', - u'classname': u'TypedTest/1' - } - ] - }, - { - u'name': u'Single/TypeParameterizedTestCase/0', - u'tests': 1, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'testsuite': [ - { - u'name': u'HasTypeParamAttribute', - u'type_param': u'int', - u'status': u'RUN', - u'time': u'*', - u'classname': u'Single/TypeParameterizedTestCase/0' - } - ] - }, - { - u'name': u'Single/TypeParameterizedTestCase/1', - u'tests': 1, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'testsuite': [ - { - u'name': u'HasTypeParamAttribute', - u'type_param': u'long', - u'status': u'RUN', - u'time': u'*', - u'classname': u'Single/TypeParameterizedTestCase/1' - } - ] - }, - { - u'name': u'Single/ValueParamTest', - u'tests': 4, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'testsuite': [ - { - u'name': u'HasValueParamAttribute/0', - u'value_param': u'33', - u'status': u'RUN', - u'time': u'*', - u'classname': u'Single/ValueParamTest' - }, - { - u'name': u'HasValueParamAttribute/1', - u'value_param': u'42', - u'status': u'RUN', - u'time': u'*', - u'classname': u'Single/ValueParamTest' - }, - { - u'name': u'AnotherTestThatHasValueParamAttribute/0', - u'value_param': u'33', - u'status': u'RUN', - u'time': u'*', - u'classname': u'Single/ValueParamTest' - }, - { - u'name': u'AnotherTestThatHasValueParamAttribute/1', - u'value_param': u'42', - u'status': u'RUN', - u'time': u'*', - u'classname': u'Single/ValueParamTest' - } - ] - } - ] -} - -EXPECTED_FILTERED = { - u'tests': 1, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'timestamp': u'*', - u'name': u'AllTests', - u'ad_hoc_property': u'42', - u'testsuites': [{ - u'name': u'SuccessfulTest', - u'tests': 1, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'testsuite': [{ - u'name': u'Succeeds', - u'status': u'RUN', - u'time': u'*', - u'classname': u'SuccessfulTest', - }] - }], -} - -EXPECTED_EMPTY = { - u'tests': 0, - u'failures': 0, - u'disabled': 0, - u'errors': 0, - u'time': u'*', - u'timestamp': u'*', - u'name': u'AllTests', - u'testsuites': [], -} - -GTEST_PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath(GTEST_PROGRAM_NAME) - -SUPPORTS_TYPED_TESTS = 'TypedTest' in gtest_test_utils.Subprocess( - [GTEST_PROGRAM_PATH, GTEST_LIST_TESTS_FLAG], capture_stderr=False).output - - -class GTestJsonOutputUnitTest(gtest_test_utils.TestCase): - """Unit test for Google Test's JSON output functionality. - """ - - # This test currently breaks on platforms that do not support typed and - # type-parameterized tests, so we don't run it under them. - if SUPPORTS_TYPED_TESTS: - - def testNonEmptyJsonOutput(self): - """Verifies JSON output for a Google Test binary with non-empty output. - - Runs a test program that generates a non-empty JSON output, and - tests that the JSON output is expected. - """ - self._TestJsonOutput(GTEST_PROGRAM_NAME, EXPECTED_NON_EMPTY, 1) - - def testEmptyJsonOutput(self): - """Verifies JSON output for a Google Test binary without actual tests. - - Runs a test program that generates an empty JSON output, and - tests that the JSON output is expected. - """ - - self._TestJsonOutput('gtest_no_test_unittest', EXPECTED_EMPTY, 0) - - def testTimestampValue(self): - """Checks whether the timestamp attribute in the JSON output is valid. - - Runs a test program that generates an empty JSON output, and checks if - the timestamp attribute in the testsuites tag is valid. - """ - actual = self._GetJsonOutput('gtest_no_test_unittest', [], 0) - date_time_str = actual['timestamp'] - # datetime.strptime() is only available in Python 2.5+ so we have to - # parse the expected datetime manually. - match = re.match(r'(\d+)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)', date_time_str) - self.assertTrue( - re.match, - 'JSON datettime string %s has incorrect format' % date_time_str) - date_time_from_json = datetime.datetime( - year=int(match.group(1)), month=int(match.group(2)), - day=int(match.group(3)), hour=int(match.group(4)), - minute=int(match.group(5)), second=int(match.group(6))) - - time_delta = abs(datetime.datetime.now() - date_time_from_json) - # timestamp value should be near the current local time - self.assertTrue(time_delta < datetime.timedelta(seconds=600), - 'time_delta is %s' % time_delta) - - def testDefaultOutputFile(self): - """Verifies the default output file name. - - Confirms that Google Test produces an JSON output file with the expected - default name if no name is explicitly specified. - """ - output_file = os.path.join(gtest_test_utils.GetTempDir(), - GTEST_DEFAULT_OUTPUT_FILE) - gtest_prog_path = gtest_test_utils.GetTestExecutablePath( - 'gtest_no_test_unittest') - try: - os.remove(output_file) - except OSError: - e = sys.exc_info()[1] - if e.errno != errno.ENOENT: - raise - - p = gtest_test_utils.Subprocess( - [gtest_prog_path, '%s=json' % GTEST_OUTPUT_FLAG], - working_dir=gtest_test_utils.GetTempDir()) - self.assert_(p.exited) - self.assertEquals(0, p.exit_code) - self.assert_(os.path.isfile(output_file)) - - def testSuppressedJsonOutput(self): - """Verifies that no JSON output is generated. - - Tests that no JSON file is generated if the default JSON listener is - shut down before RUN_ALL_TESTS is invoked. - """ - - json_path = os.path.join(gtest_test_utils.GetTempDir(), - GTEST_PROGRAM_NAME + 'out.json') - if os.path.isfile(json_path): - os.remove(json_path) - - command = [GTEST_PROGRAM_PATH, - '%s=json:%s' % (GTEST_OUTPUT_FLAG, json_path), - '--shut_down_xml'] - p = gtest_test_utils.Subprocess(command) - if p.terminated_by_signal: - # p.signal is available only if p.terminated_by_signal is True. - self.assertFalse( - p.terminated_by_signal, - '%s was killed by signal %d' % (GTEST_PROGRAM_NAME, p.signal)) - else: - self.assert_(p.exited) - self.assertEquals(1, p.exit_code, - "'%s' exited with code %s, which doesn't match " - 'the expected exit code %s.' - % (command, p.exit_code, 1)) - - self.assert_(not os.path.isfile(json_path)) - - def testFilteredTestJsonOutput(self): - """Verifies JSON output when a filter is applied. - - Runs a test program that executes only some tests and verifies that - non-selected tests do not show up in the JSON output. - """ - - self._TestJsonOutput(GTEST_PROGRAM_NAME, EXPECTED_FILTERED, 0, - extra_args=['%s=SuccessfulTest.*' % GTEST_FILTER_FLAG]) - - def _GetJsonOutput(self, gtest_prog_name, extra_args, expected_exit_code): - """Returns the JSON output generated by running the program gtest_prog_name. - - Furthermore, the program's exit code must be expected_exit_code. - - Args: - gtest_prog_name: Google Test binary name. - extra_args: extra arguments to binary invocation. - expected_exit_code: program's exit code. - """ - json_path = os.path.join(gtest_test_utils.GetTempDir(), - gtest_prog_name + 'out.json') - gtest_prog_path = gtest_test_utils.GetTestExecutablePath(gtest_prog_name) - - command = ( - [gtest_prog_path, '%s=json:%s' % (GTEST_OUTPUT_FLAG, json_path)] + - extra_args - ) - p = gtest_test_utils.Subprocess(command) - if p.terminated_by_signal: - self.assert_(False, - '%s was killed by signal %d' % (gtest_prog_name, p.signal)) - else: - self.assert_(p.exited) - self.assertEquals(expected_exit_code, p.exit_code, - "'%s' exited with code %s, which doesn't match " - 'the expected exit code %s.' - % (command, p.exit_code, expected_exit_code)) - with open(json_path) as f: - actual = json.load(f) - return actual - - def _TestJsonOutput(self, gtest_prog_name, expected, - expected_exit_code, extra_args=None): - """Checks the JSON output generated by the Google Test binary. - - Asserts that the JSON document generated by running the program - gtest_prog_name matches expected_json, a string containing another - JSON document. Furthermore, the program's exit code must be - expected_exit_code. - - Args: - gtest_prog_name: Google Test binary name. - expected: expected output. - expected_exit_code: program's exit code. - extra_args: extra arguments to binary invocation. - """ - - actual = self._GetJsonOutput(gtest_prog_name, extra_args or [], - expected_exit_code) - self.assertEqual(expected, gtest_json_test_utils.normalize(actual)) - - -if __name__ == '__main__': - os.environ['GTEST_STACK_TRACE_DEPTH'] = '1' - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_json_test_utils.py b/test/gtest-1.8.0/test/gtest_json_test_utils.py deleted file mode 100644 index 62bbfc288f..0000000000 --- a/test/gtest-1.8.0/test/gtest_json_test_utils.py +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2018, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Unit test utilities for gtest_json_output.""" - -import re - - -def normalize(obj): - """Normalize output object. - - Args: - obj: Google Test's JSON output object to normalize. - - Returns: - Normalized output without any references to transient information that may - change from run to run. - """ - def _normalize(key, value): - if key == 'time': - return re.sub(r'^\d+(\.\d+)?s$', '*', value) - elif key == 'timestamp': - return re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ$', '*', value) - elif key == 'failure': - value = re.sub(r'^.*[/\\](.*:)\d+\n', '\\1*\n', value) - return re.sub(r'Stack trace:\n(.|\n)*', 'Stack trace:\n*', value) - else: - return normalize(value) - if isinstance(obj, dict): - return {k: _normalize(k, v) for k, v in obj.items()} - if isinstance(obj, list): - return [normalize(x) for x in obj] - else: - return obj diff --git a/test/gtest-1.8.0/test/gtest_list_tests_unittest.py b/test/gtest-1.8.0/test/gtest_list_tests_unittest.py deleted file mode 100644 index ebf1a3c915..0000000000 --- a/test/gtest-1.8.0/test/gtest_list_tests_unittest.py +++ /dev/null @@ -1,207 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2006, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Unit test for Google Test's --gtest_list_tests flag. - -A user can ask Google Test to list all tests by specifying the ---gtest_list_tests flag. This script tests such functionality -by invoking gtest_list_tests_unittest_ (a program written with -Google Test) the command line flags. -""" - -__author__ = 'phanna@google.com (Patrick Hanna)' - -import re -import gtest_test_utils - -# Constants. - -# The command line flag for enabling/disabling listing all tests. -LIST_TESTS_FLAG = 'gtest_list_tests' - -# Path to the gtest_list_tests_unittest_ program. -EXE_PATH = gtest_test_utils.GetTestExecutablePath('gtest_list_tests_unittest_') - -# The expected output when running gtest_list_tests_unittest_ with -# --gtest_list_tests -EXPECTED_OUTPUT_NO_FILTER_RE = re.compile(r"""FooDeathTest\. - Test1 -Foo\. - Bar1 - Bar2 - DISABLED_Bar3 -Abc\. - Xyz - Def -FooBar\. - Baz -FooTest\. - Test1 - DISABLED_Test2 - Test3 -TypedTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. - TestA - TestB -TypedTest/1\. # TypeParam = int\s*\*( __ptr64)? - TestA - TestB -TypedTest/2\. # TypeParam = .*MyArray - TestA - TestB -My/TypeParamTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. - TestA - TestB -My/TypeParamTest/1\. # TypeParam = int\s*\*( __ptr64)? - TestA - TestB -My/TypeParamTest/2\. # TypeParam = .*MyArray - TestA - TestB -MyInstantiation/ValueParamTest\. - TestA/0 # GetParam\(\) = one line - TestA/1 # GetParam\(\) = two\\nlines - TestA/2 # GetParam\(\) = a very\\nlo{241}\.\.\. - TestB/0 # GetParam\(\) = one line - TestB/1 # GetParam\(\) = two\\nlines - TestB/2 # GetParam\(\) = a very\\nlo{241}\.\.\. -""") - -# The expected output when running gtest_list_tests_unittest_ with -# --gtest_list_tests and --gtest_filter=Foo*. -EXPECTED_OUTPUT_FILTER_FOO_RE = re.compile(r"""FooDeathTest\. - Test1 -Foo\. - Bar1 - Bar2 - DISABLED_Bar3 -FooBar\. - Baz -FooTest\. - Test1 - DISABLED_Test2 - Test3 -""") - -# Utilities. - - -def Run(args): - """Runs gtest_list_tests_unittest_ and returns the list of tests printed.""" - - return gtest_test_utils.Subprocess([EXE_PATH] + args, - capture_stderr=False).output - - -# The unit test. - - -class GTestListTestsUnitTest(gtest_test_utils.TestCase): - """Tests using the --gtest_list_tests flag to list all tests.""" - - def RunAndVerify(self, flag_value, expected_output_re, other_flag): - """Runs gtest_list_tests_unittest_ and verifies that it prints - the correct tests. - - Args: - flag_value: value of the --gtest_list_tests flag; - None if the flag should not be present. - expected_output_re: regular expression that matches the expected - output after running command; - other_flag: a different flag to be passed to command - along with gtest_list_tests; - None if the flag should not be present. - """ - - if flag_value is None: - flag = '' - flag_expression = 'not set' - elif flag_value == '0': - flag = '--%s=0' % LIST_TESTS_FLAG - flag_expression = '0' - else: - flag = '--%s' % LIST_TESTS_FLAG - flag_expression = '1' - - args = [flag] - - if other_flag is not None: - args += [other_flag] - - output = Run(args) - - if expected_output_re: - self.assert_( - expected_output_re.match(output), - ('when %s is %s, the output of "%s" is "%s",\n' - 'which does not match regex "%s"' % - (LIST_TESTS_FLAG, flag_expression, ' '.join(args), output, - expected_output_re.pattern))) - else: - self.assert_( - not EXPECTED_OUTPUT_NO_FILTER_RE.match(output), - ('when %s is %s, the output of "%s" is "%s"'% - (LIST_TESTS_FLAG, flag_expression, ' '.join(args), output))) - - def testDefaultBehavior(self): - """Tests the behavior of the default mode.""" - - self.RunAndVerify(flag_value=None, - expected_output_re=None, - other_flag=None) - - def testFlag(self): - """Tests using the --gtest_list_tests flag.""" - - self.RunAndVerify(flag_value='0', - expected_output_re=None, - other_flag=None) - self.RunAndVerify(flag_value='1', - expected_output_re=EXPECTED_OUTPUT_NO_FILTER_RE, - other_flag=None) - - def testOverrideNonFilterFlags(self): - """Tests that --gtest_list_tests overrides the non-filter flags.""" - - self.RunAndVerify(flag_value='1', - expected_output_re=EXPECTED_OUTPUT_NO_FILTER_RE, - other_flag='--gtest_break_on_failure') - - def testWithFilterFlags(self): - """Tests that --gtest_list_tests takes into account the - --gtest_filter flag.""" - - self.RunAndVerify(flag_value='1', - expected_output_re=EXPECTED_OUTPUT_FILTER_FOO_RE, - other_flag='--gtest_filter=Foo*') - - -if __name__ == '__main__': - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_list_tests_unittest_.cc b/test/gtest-1.8.0/test/gtest_list_tests_unittest_.cc deleted file mode 100644 index 907c176ba9..0000000000 --- a/test/gtest-1.8.0/test/gtest_list_tests_unittest_.cc +++ /dev/null @@ -1,157 +0,0 @@ -// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: phanna@google.com (Patrick Hanna) - -// Unit test for Google Test's --gtest_list_tests flag. -// -// A user can ask Google Test to list all tests that will run -// so that when using a filter, a user will know what -// tests to look for. The tests will not be run after listing. -// -// This program will be invoked from a Python unit test. -// Don't run it directly. - -#include "gtest/gtest.h" - -// Several different test cases and tests that will be listed. -TEST(Foo, Bar1) { -} - -TEST(Foo, Bar2) { -} - -TEST(Foo, DISABLED_Bar3) { -} - -TEST(Abc, Xyz) { -} - -TEST(Abc, Def) { -} - -TEST(FooBar, Baz) { -} - -class FooTest : public testing::Test { -}; - -TEST_F(FooTest, Test1) { -} - -TEST_F(FooTest, DISABLED_Test2) { -} - -TEST_F(FooTest, Test3) { -} - -TEST(FooDeathTest, Test1) { -} - -// A group of value-parameterized tests. - -class MyType { - public: - explicit MyType(const std::string& a_value) : value_(a_value) {} - - const std::string& value() const { return value_; } - - private: - std::string value_; -}; - -// Teaches Google Test how to print a MyType. -void PrintTo(const MyType& x, std::ostream* os) { - *os << x.value(); -} - -class ValueParamTest : public testing::TestWithParam { -}; - -TEST_P(ValueParamTest, TestA) { -} - -TEST_P(ValueParamTest, TestB) { -} - -INSTANTIATE_TEST_CASE_P( - MyInstantiation, ValueParamTest, - testing::Values(MyType("one line"), - MyType("two\nlines"), - MyType("a very\nloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong line"))); // NOLINT - -// A group of typed tests. - -// A deliberately long type name for testing the line-truncating -// behavior when printing a type parameter. -class VeryLoooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooogName { // NOLINT -}; - -template -class TypedTest : public testing::Test { -}; - -template -class MyArray { -}; - -typedef testing::Types > MyTypes; - -TYPED_TEST_CASE(TypedTest, MyTypes); - -TYPED_TEST(TypedTest, TestA) { -} - -TYPED_TEST(TypedTest, TestB) { -} - -// A group of type-parameterized tests. - -template -class TypeParamTest : public testing::Test { -}; - -TYPED_TEST_CASE_P(TypeParamTest); - -TYPED_TEST_P(TypeParamTest, TestA) { -} - -TYPED_TEST_P(TypeParamTest, TestB) { -} - -REGISTER_TYPED_TEST_CASE_P(TypeParamTest, TestA, TestB); - -INSTANTIATE_TYPED_TEST_CASE_P(My, TypeParamTest, MyTypes); - -int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - - return RUN_ALL_TESTS(); -} diff --git a/test/gtest-1.8.0/test/gtest_main_unittest.cc b/test/gtest-1.8.0/test/gtest_main_unittest.cc deleted file mode 100644 index c979fce60d..0000000000 --- a/test/gtest-1.8.0/test/gtest_main_unittest.cc +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -#include "gtest/gtest.h" - -// Tests that we don't have to define main() when we link to -// gtest_main instead of gtest. - -namespace { - -TEST(GTestMainTest, ShouldSucceed) { -} - -} // namespace - -// We are using the main() function defined in gtest_main.cc, so we -// don't define it here. diff --git a/test/gtest-1.8.0/test/gtest_no_test_unittest.cc b/test/gtest-1.8.0/test/gtest_no_test_unittest.cc deleted file mode 100644 index 292599af8d..0000000000 --- a/test/gtest-1.8.0/test/gtest_no_test_unittest.cc +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Tests that a Google Test program that has no test defined can run -// successfully. -// -// Author: wan@google.com (Zhanyong Wan) - -#include "gtest/gtest.h" - -int main(int argc, char **argv) { - testing::InitGoogleTest(&argc, argv); - - // An ad-hoc assertion outside of all tests. - // - // This serves three purposes: - // - // 1. It verifies that an ad-hoc assertion can be executed even if - // no test is defined. - // 2. It verifies that a failed ad-hoc assertion causes the test - // program to fail. - // 3. We had a bug where the XML output won't be generated if an - // assertion is executed before RUN_ALL_TESTS() is called, even - // though --gtest_output=xml is specified. This makes sure the - // bug is fixed and doesn't regress. - EXPECT_EQ(1, 2); - - // The above EXPECT_EQ() should cause RUN_ALL_TESTS() to return non-zero. - return RUN_ALL_TESTS() ? 0 : 1; -} diff --git a/test/gtest-1.8.0/test/gtest_output_test.py b/test/gtest-1.8.0/test/gtest_output_test.py deleted file mode 100644 index f83d3be679..0000000000 --- a/test/gtest-1.8.0/test/gtest_output_test.py +++ /dev/null @@ -1,344 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Tests the text output of Google C++ Testing and Mocking Framework. - - -SYNOPSIS - gtest_output_test.py --build_dir=BUILD/DIR --gengolden - # where BUILD/DIR contains the built gtest_output_test_ file. - gtest_output_test.py --gengolden - gtest_output_test.py -""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import difflib -import os -import re -import sys -import gtest_test_utils - - -# The flag for generating the golden file -GENGOLDEN_FLAG = '--gengolden' -CATCH_EXCEPTIONS_ENV_VAR_NAME = 'GTEST_CATCH_EXCEPTIONS' - -IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux' -IS_WINDOWS = os.name == 'nt' - -# TODO(vladl@google.com): remove the _lin suffix. -GOLDEN_NAME = 'gtest_output_test_golden_lin.txt' - -PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_output_test_') - -# At least one command we exercise must not have the -# 'internal_skip_environment_and_ad_hoc_tests' argument. -COMMAND_LIST_TESTS = ({}, [PROGRAM_PATH, '--gtest_list_tests']) -COMMAND_WITH_COLOR = ({}, [PROGRAM_PATH, '--gtest_color=yes']) -COMMAND_WITH_TIME = ({}, [PROGRAM_PATH, - '--gtest_print_time', - 'internal_skip_environment_and_ad_hoc_tests', - '--gtest_filter=FatalFailureTest.*:LoggingTest.*']) -COMMAND_WITH_DISABLED = ( - {}, [PROGRAM_PATH, - '--gtest_also_run_disabled_tests', - 'internal_skip_environment_and_ad_hoc_tests', - '--gtest_filter=*DISABLED_*']) -COMMAND_WITH_SHARDING = ( - {'GTEST_SHARD_INDEX': '1', 'GTEST_TOTAL_SHARDS': '2'}, - [PROGRAM_PATH, - 'internal_skip_environment_and_ad_hoc_tests', - '--gtest_filter=PassingTest.*']) - -GOLDEN_PATH = os.path.join(gtest_test_utils.GetSourceDir(), GOLDEN_NAME) - - -def ToUnixLineEnding(s): - """Changes all Windows/Mac line endings in s to UNIX line endings.""" - - return s.replace('\r\n', '\n').replace('\r', '\n') - - -def RemoveLocations(test_output): - """Removes all file location info from a Google Test program's output. - - Args: - test_output: the output of a Google Test program. - - Returns: - output with all file location info (in the form of - 'DIRECTORY/FILE_NAME:LINE_NUMBER: 'or - 'DIRECTORY\\FILE_NAME(LINE_NUMBER): ') replaced by - 'FILE_NAME:#: '. - """ - - return re.sub(r'.*[/\\]((gtest_output_test_|gtest).cc)(\:\d+|\(\d+\))\: ', - r'\1:#: ', test_output) - - -def RemoveStackTraceDetails(output): - """Removes all stack traces from a Google Test program's output.""" - - # *? means "find the shortest string that matches". - return re.sub(r'Stack trace:(.|\n)*?\n\n', - 'Stack trace: (omitted)\n\n', output) - - -def RemoveStackTraces(output): - """Removes all traces of stack traces from a Google Test program's output.""" - - # *? means "find the shortest string that matches". - return re.sub(r'Stack trace:(.|\n)*?\n\n', '', output) - - -def RemoveTime(output): - """Removes all time information from a Google Test program's output.""" - - return re.sub(r'\(\d+ ms', '(? ms', output) - - -def RemoveTypeInfoDetails(test_output): - """Removes compiler-specific type info from Google Test program's output. - - Args: - test_output: the output of a Google Test program. - - Returns: - output with type information normalized to canonical form. - """ - - # some compilers output the name of type 'unsigned int' as 'unsigned' - return re.sub(r'unsigned int', 'unsigned', test_output) - - -def NormalizeToCurrentPlatform(test_output): - """Normalizes platform specific output details for easier comparison.""" - - if IS_WINDOWS: - # Removes the color information that is not present on Windows. - test_output = re.sub('\x1b\\[(0;3\d)?m', '', test_output) - # Changes failure message headers into the Windows format. - test_output = re.sub(r': Failure\n', r': error: ', test_output) - # Changes file(line_number) to file:line_number. - test_output = re.sub(r'((\w|\.)+)\((\d+)\):', r'\1:\3:', test_output) - - return test_output - - -def RemoveTestCounts(output): - """Removes test counts from a Google Test program's output.""" - - output = re.sub(r'\d+ tests?, listed below', - '? tests, listed below', output) - output = re.sub(r'\d+ FAILED TESTS', - '? FAILED TESTS', output) - output = re.sub(r'\d+ tests? from \d+ test cases?', - '? tests from ? test cases', output) - output = re.sub(r'\d+ tests? from ([a-zA-Z_])', - r'? tests from \1', output) - return re.sub(r'\d+ tests?\.', '? tests.', output) - - -def RemoveMatchingTests(test_output, pattern): - """Removes output of specified tests from a Google Test program's output. - - This function strips not only the beginning and the end of a test but also - all output in between. - - Args: - test_output: A string containing the test output. - pattern: A regex string that matches names of test cases or - tests to remove. - - Returns: - Contents of test_output with tests whose names match pattern removed. - """ - - test_output = re.sub( - r'.*\[ RUN \] .*%s(.|\n)*?\[( FAILED | OK )\] .*%s.*\n' % ( - pattern, pattern), - '', - test_output) - return re.sub(r'.*%s.*\n' % pattern, '', test_output) - - -def NormalizeOutput(output): - """Normalizes output (the output of gtest_output_test_.exe).""" - - output = ToUnixLineEnding(output) - output = RemoveLocations(output) - output = RemoveStackTraceDetails(output) - output = RemoveTime(output) - return output - - -def GetShellCommandOutput(env_cmd): - """Runs a command in a sub-process, and returns its output in a string. - - Args: - env_cmd: The shell command. A 2-tuple where element 0 is a dict of extra - environment variables to set, and element 1 is a string with - the command and any flags. - - Returns: - A string with the command's combined standard and diagnostic output. - """ - - # Spawns cmd in a sub-process, and gets its standard I/O file objects. - # Set and save the environment properly. - environ = os.environ.copy() - environ.update(env_cmd[0]) - p = gtest_test_utils.Subprocess(env_cmd[1], env=environ) - - return p.output - - -def GetCommandOutput(env_cmd): - """Runs a command and returns its output with all file location - info stripped off. - - Args: - env_cmd: The shell command. A 2-tuple where element 0 is a dict of extra - environment variables to set, and element 1 is a string with - the command and any flags. - """ - - # Disables exception pop-ups on Windows. - environ, cmdline = env_cmd - environ = dict(environ) # Ensures we are modifying a copy. - environ[CATCH_EXCEPTIONS_ENV_VAR_NAME] = '1' - return NormalizeOutput(GetShellCommandOutput((environ, cmdline))) - - -def GetOutputOfAllCommands(): - """Returns concatenated output from several representative commands.""" - - return (GetCommandOutput(COMMAND_WITH_COLOR) + - GetCommandOutput(COMMAND_WITH_TIME) + - GetCommandOutput(COMMAND_WITH_DISABLED) + - GetCommandOutput(COMMAND_WITH_SHARDING)) - - -test_list = GetShellCommandOutput(COMMAND_LIST_TESTS) -SUPPORTS_DEATH_TESTS = 'DeathTest' in test_list -SUPPORTS_TYPED_TESTS = 'TypedTest' in test_list -SUPPORTS_THREADS = 'ExpectFailureWithThreadsTest' in test_list -SUPPORTS_STACK_TRACES = IS_LINUX - -CAN_GENERATE_GOLDEN_FILE = (SUPPORTS_DEATH_TESTS and - SUPPORTS_TYPED_TESTS and - SUPPORTS_THREADS and - SUPPORTS_STACK_TRACES and - not IS_WINDOWS) - -class GTestOutputTest(gtest_test_utils.TestCase): - def RemoveUnsupportedTests(self, test_output): - if not SUPPORTS_DEATH_TESTS: - test_output = RemoveMatchingTests(test_output, 'DeathTest') - if not SUPPORTS_TYPED_TESTS: - test_output = RemoveMatchingTests(test_output, 'TypedTest') - test_output = RemoveMatchingTests(test_output, 'TypedDeathTest') - test_output = RemoveMatchingTests(test_output, 'TypeParamDeathTest') - if not SUPPORTS_THREADS: - test_output = RemoveMatchingTests(test_output, - 'ExpectFailureWithThreadsTest') - test_output = RemoveMatchingTests(test_output, - 'ScopedFakeTestPartResultReporterTest') - test_output = RemoveMatchingTests(test_output, - 'WorksConcurrently') - if not SUPPORTS_STACK_TRACES: - test_output = RemoveStackTraces(test_output) - - return test_output - - def testOutput(self): - output = GetOutputOfAllCommands() - - golden_file = open(GOLDEN_PATH, 'rb') - # A mis-configured source control system can cause \r appear in EOL - # sequences when we read the golden file irrespective of an operating - # system used. Therefore, we need to strip those \r's from newlines - # unconditionally. - golden = ToUnixLineEnding(golden_file.read()) - golden_file.close() - - # We want the test to pass regardless of certain features being - # supported or not. - - # We still have to remove type name specifics in all cases. - normalized_actual = RemoveTypeInfoDetails(output) - normalized_golden = RemoveTypeInfoDetails(golden) - - if CAN_GENERATE_GOLDEN_FILE: - self.assertEqual(normalized_golden, normalized_actual, - '\n'.join(difflib.unified_diff( - normalized_golden.split('\n'), - normalized_actual.split('\n'), - 'golden', 'actual'))) - else: - normalized_actual = NormalizeToCurrentPlatform( - RemoveTestCounts(normalized_actual)) - normalized_golden = NormalizeToCurrentPlatform( - RemoveTestCounts(self.RemoveUnsupportedTests(normalized_golden))) - - # This code is very handy when debugging golden file differences: - if os.getenv('DEBUG_GTEST_OUTPUT_TEST'): - open(os.path.join( - gtest_test_utils.GetSourceDir(), - '_gtest_output_test_normalized_actual.txt'), 'wb').write( - normalized_actual) - open(os.path.join( - gtest_test_utils.GetSourceDir(), - '_gtest_output_test_normalized_golden.txt'), 'wb').write( - normalized_golden) - - self.assertEqual(normalized_golden, normalized_actual) - - -if __name__ == '__main__': - if sys.argv[1:] == [GENGOLDEN_FLAG]: - if CAN_GENERATE_GOLDEN_FILE: - output = GetOutputOfAllCommands() - golden_file = open(GOLDEN_PATH, 'wb') - golden_file.write(output) - golden_file.close() - else: - message = ( - """Unable to write a golden file when compiled in an environment -that does not support all the required features (death tests, -typed tests, stack traces, and multiple threads). -Please build this test and generate the golden file using Blaze on Linux.""") - - sys.stderr.write(message) - sys.exit(1) - else: - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_output_test_.cc b/test/gtest-1.8.0/test/gtest_output_test_.cc deleted file mode 100644 index 9ae9dc6035..0000000000 --- a/test/gtest-1.8.0/test/gtest_output_test_.cc +++ /dev/null @@ -1,1067 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The purpose of this file is to generate Google Test output under -// various conditions. The output will then be verified by -// gtest_output_test.py to ensure that Google Test generates the -// desired messages. Therefore, most tests in this file are MEANT TO -// FAIL. -// -// Author: wan@google.com (Zhanyong Wan) - -#include "gtest/gtest-spi.h" -#include "gtest/gtest.h" -#include "src/gtest-internal-inl.h" - -#include - -#if GTEST_IS_THREADSAFE -using testing::ScopedFakeTestPartResultReporter; -using testing::TestPartResultArray; - -using testing::internal::Notification; -using testing::internal::ThreadWithParam; -#endif - -namespace posix = ::testing::internal::posix; - -// Tests catching fatal failures. - -// A subroutine used by the following test. -void TestEq1(int x) { - ASSERT_EQ(1, x); -} - -// This function calls a test subroutine, catches the fatal failure it -// generates, and then returns early. -void TryTestSubroutine() { - // Calls a subrountine that yields a fatal failure. - TestEq1(2); - - // Catches the fatal failure and aborts the test. - // - // The testing::Test:: prefix is necessary when calling - // HasFatalFailure() outside of a TEST, TEST_F, or test fixture. - if (testing::Test::HasFatalFailure()) return; - - // If we get here, something is wrong. - FAIL() << "This should never be reached."; -} - -TEST(PassingTest, PassingTest1) { -} - -TEST(PassingTest, PassingTest2) { -} - -// Tests that parameters of failing parameterized tests are printed in the -// failing test summary. -class FailingParamTest : public testing::TestWithParam {}; - -TEST_P(FailingParamTest, Fails) { - EXPECT_EQ(1, GetParam()); -} - -// This generates a test which will fail. Google Test is expected to print -// its parameter when it outputs the list of all failed tests. -INSTANTIATE_TEST_CASE_P(PrintingFailingParams, - FailingParamTest, - testing::Values(2)); - -static const char kGoldenString[] = "\"Line\0 1\"\nLine 2"; - -TEST(NonfatalFailureTest, EscapesStringOperands) { - std::string actual = "actual \"string\""; - EXPECT_EQ(kGoldenString, actual); - - const char* golden = kGoldenString; - EXPECT_EQ(golden, actual); -} - -TEST(NonfatalFailureTest, DiffForLongStrings) { - std::string golden_str(kGoldenString, sizeof(kGoldenString) - 1); - EXPECT_EQ(golden_str, "Line 2"); -} - -// Tests catching a fatal failure in a subroutine. -TEST(FatalFailureTest, FatalFailureInSubroutine) { - printf("(expecting a failure that x should be 1)\n"); - - TryTestSubroutine(); -} - -// Tests catching a fatal failure in a nested subroutine. -TEST(FatalFailureTest, FatalFailureInNestedSubroutine) { - printf("(expecting a failure that x should be 1)\n"); - - // Calls a subrountine that yields a fatal failure. - TryTestSubroutine(); - - // Catches the fatal failure and aborts the test. - // - // When calling HasFatalFailure() inside a TEST, TEST_F, or test - // fixture, the testing::Test:: prefix is not needed. - if (HasFatalFailure()) return; - - // If we get here, something is wrong. - FAIL() << "This should never be reached."; -} - -// Tests HasFatalFailure() after a failed EXPECT check. -TEST(FatalFailureTest, NonfatalFailureInSubroutine) { - printf("(expecting a failure on false)\n"); - EXPECT_TRUE(false); // Generates a nonfatal failure - ASSERT_FALSE(HasFatalFailure()); // This should succeed. -} - -// Tests interleaving user logging and Google Test assertions. -TEST(LoggingTest, InterleavingLoggingAndAssertions) { - static const int a[4] = { - 3, 9, 2, 6 - }; - - printf("(expecting 2 failures on (3) >= (a[i]))\n"); - for (int i = 0; i < static_cast(sizeof(a)/sizeof(*a)); i++) { - printf("i == %d\n", i); - EXPECT_GE(3, a[i]); - } -} - -// Tests the SCOPED_TRACE macro. - -// A helper function for testing SCOPED_TRACE. -void SubWithoutTrace(int n) { - EXPECT_EQ(1, n); - ASSERT_EQ(2, n); -} - -// Another helper function for testing SCOPED_TRACE. -void SubWithTrace(int n) { - SCOPED_TRACE(testing::Message() << "n = " << n); - - SubWithoutTrace(n); -} - -TEST(SCOPED_TRACETest, AcceptedValues) { - SCOPED_TRACE("literal string"); - SCOPED_TRACE(std::string("std::string")); - SCOPED_TRACE(1337); // streamable type - const char* null_value = NULL; - SCOPED_TRACE(null_value); - - ADD_FAILURE() << "Just checking that all these values work fine."; -} - -// Tests that SCOPED_TRACE() obeys lexical scopes. -TEST(SCOPED_TRACETest, ObeysScopes) { - printf("(expected to fail)\n"); - - // There should be no trace before SCOPED_TRACE() is invoked. - ADD_FAILURE() << "This failure is expected, and shouldn't have a trace."; - - { - SCOPED_TRACE("Expected trace"); - // After SCOPED_TRACE(), a failure in the current scope should contain - // the trace. - ADD_FAILURE() << "This failure is expected, and should have a trace."; - } - - // Once the control leaves the scope of the SCOPED_TRACE(), there - // should be no trace again. - ADD_FAILURE() << "This failure is expected, and shouldn't have a trace."; -} - -// Tests that SCOPED_TRACE works inside a loop. -TEST(SCOPED_TRACETest, WorksInLoop) { - printf("(expected to fail)\n"); - - for (int i = 1; i <= 2; i++) { - SCOPED_TRACE(testing::Message() << "i = " << i); - - SubWithoutTrace(i); - } -} - -// Tests that SCOPED_TRACE works in a subroutine. -TEST(SCOPED_TRACETest, WorksInSubroutine) { - printf("(expected to fail)\n"); - - SubWithTrace(1); - SubWithTrace(2); -} - -// Tests that SCOPED_TRACE can be nested. -TEST(SCOPED_TRACETest, CanBeNested) { - printf("(expected to fail)\n"); - - SCOPED_TRACE(""); // A trace without a message. - - SubWithTrace(2); -} - -// Tests that multiple SCOPED_TRACEs can be used in the same scope. -TEST(SCOPED_TRACETest, CanBeRepeated) { - printf("(expected to fail)\n"); - - SCOPED_TRACE("A"); - ADD_FAILURE() - << "This failure is expected, and should contain trace point A."; - - SCOPED_TRACE("B"); - ADD_FAILURE() - << "This failure is expected, and should contain trace point A and B."; - - { - SCOPED_TRACE("C"); - ADD_FAILURE() << "This failure is expected, and should " - << "contain trace point A, B, and C."; - } - - SCOPED_TRACE("D"); - ADD_FAILURE() << "This failure is expected, and should " - << "contain trace point A, B, and D."; -} - -#if GTEST_IS_THREADSAFE -// Tests that SCOPED_TRACE()s can be used concurrently from multiple -// threads. Namely, an assertion should be affected by -// SCOPED_TRACE()s in its own thread only. - -// Here's the sequence of actions that happen in the test: -// -// Thread A (main) | Thread B (spawned) -// ===============================|================================ -// spawns thread B | -// -------------------------------+-------------------------------- -// waits for n1 | SCOPED_TRACE("Trace B"); -// | generates failure #1 -// | notifies n1 -// -------------------------------+-------------------------------- -// SCOPED_TRACE("Trace A"); | waits for n2 -// generates failure #2 | -// notifies n2 | -// -------------------------------|-------------------------------- -// waits for n3 | generates failure #3 -// | trace B dies -// | generates failure #4 -// | notifies n3 -// -------------------------------|-------------------------------- -// generates failure #5 | finishes -// trace A dies | -// generates failure #6 | -// -------------------------------|-------------------------------- -// waits for thread B to finish | - -struct CheckPoints { - Notification n1; - Notification n2; - Notification n3; -}; - -static void ThreadWithScopedTrace(CheckPoints* check_points) { - { - SCOPED_TRACE("Trace B"); - ADD_FAILURE() - << "Expected failure #1 (in thread B, only trace B alive)."; - check_points->n1.Notify(); - check_points->n2.WaitForNotification(); - - ADD_FAILURE() - << "Expected failure #3 (in thread B, trace A & B both alive)."; - } // Trace B dies here. - ADD_FAILURE() - << "Expected failure #4 (in thread B, only trace A alive)."; - check_points->n3.Notify(); -} - -TEST(SCOPED_TRACETest, WorksConcurrently) { - printf("(expecting 6 failures)\n"); - - CheckPoints check_points; - ThreadWithParam thread(&ThreadWithScopedTrace, - &check_points, - NULL); - check_points.n1.WaitForNotification(); - - { - SCOPED_TRACE("Trace A"); - ADD_FAILURE() - << "Expected failure #2 (in thread A, trace A & B both alive)."; - check_points.n2.Notify(); - check_points.n3.WaitForNotification(); - - ADD_FAILURE() - << "Expected failure #5 (in thread A, only trace A alive)."; - } // Trace A dies here. - ADD_FAILURE() - << "Expected failure #6 (in thread A, no trace alive)."; - thread.Join(); -} -#endif // GTEST_IS_THREADSAFE - -// Tests basic functionality of the ScopedTrace utility (most of its features -// are already tested in SCOPED_TRACETest). -TEST(ScopedTraceTest, WithExplicitFileAndLine) { - testing::ScopedTrace trace("explicit_file.cc", 123, "expected trace message"); - ADD_FAILURE() << "Check that the trace is attached to a particular location."; -} - -TEST(DisabledTestsWarningTest, - DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning) { - // This test body is intentionally empty. Its sole purpose is for - // verifying that the --gtest_also_run_disabled_tests flag - // suppresses the "YOU HAVE 12 DISABLED TESTS" warning at the end of - // the test output. -} - -// Tests using assertions outside of TEST and TEST_F. -// -// This function creates two failures intentionally. -void AdHocTest() { - printf("The non-test part of the code is expected to have 2 failures.\n\n"); - EXPECT_TRUE(false); - EXPECT_EQ(2, 3); -} - -// Runs all TESTs, all TEST_Fs, and the ad hoc test. -int RunAllTests() { - AdHocTest(); - return RUN_ALL_TESTS(); -} - -// Tests non-fatal failures in the fixture constructor. -class NonFatalFailureInFixtureConstructorTest : public testing::Test { - protected: - NonFatalFailureInFixtureConstructorTest() { - printf("(expecting 5 failures)\n"); - ADD_FAILURE() << "Expected failure #1, in the test fixture c'tor."; - } - - ~NonFatalFailureInFixtureConstructorTest() { - ADD_FAILURE() << "Expected failure #5, in the test fixture d'tor."; - } - - virtual void SetUp() { - ADD_FAILURE() << "Expected failure #2, in SetUp()."; - } - - virtual void TearDown() { - ADD_FAILURE() << "Expected failure #4, in TearDown."; - } -}; - -TEST_F(NonFatalFailureInFixtureConstructorTest, FailureInConstructor) { - ADD_FAILURE() << "Expected failure #3, in the test body."; -} - -// Tests fatal failures in the fixture constructor. -class FatalFailureInFixtureConstructorTest : public testing::Test { - protected: - FatalFailureInFixtureConstructorTest() { - printf("(expecting 2 failures)\n"); - Init(); - } - - ~FatalFailureInFixtureConstructorTest() { - ADD_FAILURE() << "Expected failure #2, in the test fixture d'tor."; - } - - virtual void SetUp() { - ADD_FAILURE() << "UNEXPECTED failure in SetUp(). " - << "We should never get here, as the test fixture c'tor " - << "had a fatal failure."; - } - - virtual void TearDown() { - ADD_FAILURE() << "UNEXPECTED failure in TearDown(). " - << "We should never get here, as the test fixture c'tor " - << "had a fatal failure."; - } - - private: - void Init() { - FAIL() << "Expected failure #1, in the test fixture c'tor."; - } -}; - -TEST_F(FatalFailureInFixtureConstructorTest, FailureInConstructor) { - ADD_FAILURE() << "UNEXPECTED failure in the test body. " - << "We should never get here, as the test fixture c'tor " - << "had a fatal failure."; -} - -// Tests non-fatal failures in SetUp(). -class NonFatalFailureInSetUpTest : public testing::Test { - protected: - virtual ~NonFatalFailureInSetUpTest() { - Deinit(); - } - - virtual void SetUp() { - printf("(expecting 4 failures)\n"); - ADD_FAILURE() << "Expected failure #1, in SetUp()."; - } - - virtual void TearDown() { - FAIL() << "Expected failure #3, in TearDown()."; - } - private: - void Deinit() { - FAIL() << "Expected failure #4, in the test fixture d'tor."; - } -}; - -TEST_F(NonFatalFailureInSetUpTest, FailureInSetUp) { - FAIL() << "Expected failure #2, in the test function."; -} - -// Tests fatal failures in SetUp(). -class FatalFailureInSetUpTest : public testing::Test { - protected: - virtual ~FatalFailureInSetUpTest() { - Deinit(); - } - - virtual void SetUp() { - printf("(expecting 3 failures)\n"); - FAIL() << "Expected failure #1, in SetUp()."; - } - - virtual void TearDown() { - FAIL() << "Expected failure #2, in TearDown()."; - } - private: - void Deinit() { - FAIL() << "Expected failure #3, in the test fixture d'tor."; - } -}; - -TEST_F(FatalFailureInSetUpTest, FailureInSetUp) { - FAIL() << "UNEXPECTED failure in the test function. " - << "We should never get here, as SetUp() failed."; -} - -TEST(AddFailureAtTest, MessageContainsSpecifiedFileAndLineNumber) { - ADD_FAILURE_AT("foo.cc", 42) << "Expected failure in foo.cc"; -} - -#if GTEST_IS_THREADSAFE - -// A unary function that may die. -void DieIf(bool should_die) { - GTEST_CHECK_(!should_die) << " - death inside DieIf()."; -} - -// Tests running death tests in a multi-threaded context. - -// Used for coordination between the main and the spawn thread. -struct SpawnThreadNotifications { - SpawnThreadNotifications() {} - - Notification spawn_thread_started; - Notification spawn_thread_ok_to_terminate; - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(SpawnThreadNotifications); -}; - -// The function to be executed in the thread spawn by the -// MultipleThreads test (below). -static void ThreadRoutine(SpawnThreadNotifications* notifications) { - // Signals the main thread that this thread has started. - notifications->spawn_thread_started.Notify(); - - // Waits for permission to finish from the main thread. - notifications->spawn_thread_ok_to_terminate.WaitForNotification(); -} - -// This is a death-test test, but it's not named with a DeathTest -// suffix. It starts threads which might interfere with later -// death tests, so it must run after all other death tests. -class DeathTestAndMultiThreadsTest : public testing::Test { - protected: - // Starts a thread and waits for it to begin. - virtual void SetUp() { - thread_.reset(new ThreadWithParam( - &ThreadRoutine, ¬ifications_, NULL)); - notifications_.spawn_thread_started.WaitForNotification(); - } - // Tells the thread to finish, and reaps it. - // Depending on the version of the thread library in use, - // a manager thread might still be left running that will interfere - // with later death tests. This is unfortunate, but this class - // cleans up after itself as best it can. - virtual void TearDown() { - notifications_.spawn_thread_ok_to_terminate.Notify(); - } - - private: - SpawnThreadNotifications notifications_; - testing::internal::scoped_ptr > - thread_; -}; - -#endif // GTEST_IS_THREADSAFE - -// The MixedUpTestCaseTest test case verifies that Google Test will fail a -// test if it uses a different fixture class than what other tests in -// the same test case use. It deliberately contains two fixture -// classes with the same name but defined in different namespaces. - -// The MixedUpTestCaseWithSameTestNameTest test case verifies that -// when the user defines two tests with the same test case name AND -// same test name (but in different namespaces), the second test will -// fail. - -namespace foo { - -class MixedUpTestCaseTest : public testing::Test { -}; - -TEST_F(MixedUpTestCaseTest, FirstTestFromNamespaceFoo) {} -TEST_F(MixedUpTestCaseTest, SecondTestFromNamespaceFoo) {} - -class MixedUpTestCaseWithSameTestNameTest : public testing::Test { -}; - -TEST_F(MixedUpTestCaseWithSameTestNameTest, - TheSecondTestWithThisNameShouldFail) {} - -} // namespace foo - -namespace bar { - -class MixedUpTestCaseTest : public testing::Test { -}; - -// The following two tests are expected to fail. We rely on the -// golden file to check that Google Test generates the right error message. -TEST_F(MixedUpTestCaseTest, ThisShouldFail) {} -TEST_F(MixedUpTestCaseTest, ThisShouldFailToo) {} - -class MixedUpTestCaseWithSameTestNameTest : public testing::Test { -}; - -// Expected to fail. We rely on the golden file to check that Google Test -// generates the right error message. -TEST_F(MixedUpTestCaseWithSameTestNameTest, - TheSecondTestWithThisNameShouldFail) {} - -} // namespace bar - -// The following two test cases verify that Google Test catches the user -// error of mixing TEST and TEST_F in the same test case. The first -// test case checks the scenario where TEST_F appears before TEST, and -// the second one checks where TEST appears before TEST_F. - -class TEST_F_before_TEST_in_same_test_case : public testing::Test { -}; - -TEST_F(TEST_F_before_TEST_in_same_test_case, DefinedUsingTEST_F) {} - -// Expected to fail. We rely on the golden file to check that Google Test -// generates the right error message. -TEST(TEST_F_before_TEST_in_same_test_case, DefinedUsingTESTAndShouldFail) {} - -class TEST_before_TEST_F_in_same_test_case : public testing::Test { -}; - -TEST(TEST_before_TEST_F_in_same_test_case, DefinedUsingTEST) {} - -// Expected to fail. We rely on the golden file to check that Google Test -// generates the right error message. -TEST_F(TEST_before_TEST_F_in_same_test_case, DefinedUsingTEST_FAndShouldFail) { -} - -// Used for testing EXPECT_NONFATAL_FAILURE() and EXPECT_FATAL_FAILURE(). -int global_integer = 0; - -// Tests that EXPECT_NONFATAL_FAILURE() can reference global variables. -TEST(ExpectNonfatalFailureTest, CanReferenceGlobalVariables) { - global_integer = 0; - EXPECT_NONFATAL_FAILURE({ - EXPECT_EQ(1, global_integer) << "Expected non-fatal failure."; - }, "Expected non-fatal failure."); -} - -// Tests that EXPECT_NONFATAL_FAILURE() can reference local variables -// (static or not). -TEST(ExpectNonfatalFailureTest, CanReferenceLocalVariables) { - int m = 0; - static int n; - n = 1; - EXPECT_NONFATAL_FAILURE({ - EXPECT_EQ(m, n) << "Expected non-fatal failure."; - }, "Expected non-fatal failure."); -} - -// Tests that EXPECT_NONFATAL_FAILURE() succeeds when there is exactly -// one non-fatal failure and no fatal failure. -TEST(ExpectNonfatalFailureTest, SucceedsWhenThereIsOneNonfatalFailure) { - EXPECT_NONFATAL_FAILURE({ - ADD_FAILURE() << "Expected non-fatal failure."; - }, "Expected non-fatal failure."); -} - -// Tests that EXPECT_NONFATAL_FAILURE() fails when there is no -// non-fatal failure. -TEST(ExpectNonfatalFailureTest, FailsWhenThereIsNoNonfatalFailure) { - printf("(expecting a failure)\n"); - EXPECT_NONFATAL_FAILURE({ - }, ""); -} - -// Tests that EXPECT_NONFATAL_FAILURE() fails when there are two -// non-fatal failures. -TEST(ExpectNonfatalFailureTest, FailsWhenThereAreTwoNonfatalFailures) { - printf("(expecting a failure)\n"); - EXPECT_NONFATAL_FAILURE({ - ADD_FAILURE() << "Expected non-fatal failure 1."; - ADD_FAILURE() << "Expected non-fatal failure 2."; - }, ""); -} - -// Tests that EXPECT_NONFATAL_FAILURE() fails when there is one fatal -// failure. -TEST(ExpectNonfatalFailureTest, FailsWhenThereIsOneFatalFailure) { - printf("(expecting a failure)\n"); - EXPECT_NONFATAL_FAILURE({ - FAIL() << "Expected fatal failure."; - }, ""); -} - -// Tests that EXPECT_NONFATAL_FAILURE() fails when the statement being -// tested returns. -TEST(ExpectNonfatalFailureTest, FailsWhenStatementReturns) { - printf("(expecting a failure)\n"); - EXPECT_NONFATAL_FAILURE({ - return; - }, ""); -} - -#if GTEST_HAS_EXCEPTIONS - -// Tests that EXPECT_NONFATAL_FAILURE() fails when the statement being -// tested throws. -TEST(ExpectNonfatalFailureTest, FailsWhenStatementThrows) { - printf("(expecting a failure)\n"); - try { - EXPECT_NONFATAL_FAILURE({ - throw 0; - }, ""); - } catch(int) { // NOLINT - } -} - -#endif // GTEST_HAS_EXCEPTIONS - -// Tests that EXPECT_FATAL_FAILURE() can reference global variables. -TEST(ExpectFatalFailureTest, CanReferenceGlobalVariables) { - global_integer = 0; - EXPECT_FATAL_FAILURE({ - ASSERT_EQ(1, global_integer) << "Expected fatal failure."; - }, "Expected fatal failure."); -} - -// Tests that EXPECT_FATAL_FAILURE() can reference local static -// variables. -TEST(ExpectFatalFailureTest, CanReferenceLocalStaticVariables) { - static int n; - n = 1; - EXPECT_FATAL_FAILURE({ - ASSERT_EQ(0, n) << "Expected fatal failure."; - }, "Expected fatal failure."); -} - -// Tests that EXPECT_FATAL_FAILURE() succeeds when there is exactly -// one fatal failure and no non-fatal failure. -TEST(ExpectFatalFailureTest, SucceedsWhenThereIsOneFatalFailure) { - EXPECT_FATAL_FAILURE({ - FAIL() << "Expected fatal failure."; - }, "Expected fatal failure."); -} - -// Tests that EXPECT_FATAL_FAILURE() fails when there is no fatal -// failure. -TEST(ExpectFatalFailureTest, FailsWhenThereIsNoFatalFailure) { - printf("(expecting a failure)\n"); - EXPECT_FATAL_FAILURE({ - }, ""); -} - -// A helper for generating a fatal failure. -void FatalFailure() { - FAIL() << "Expected fatal failure."; -} - -// Tests that EXPECT_FATAL_FAILURE() fails when there are two -// fatal failures. -TEST(ExpectFatalFailureTest, FailsWhenThereAreTwoFatalFailures) { - printf("(expecting a failure)\n"); - EXPECT_FATAL_FAILURE({ - FatalFailure(); - FatalFailure(); - }, ""); -} - -// Tests that EXPECT_FATAL_FAILURE() fails when there is one non-fatal -// failure. -TEST(ExpectFatalFailureTest, FailsWhenThereIsOneNonfatalFailure) { - printf("(expecting a failure)\n"); - EXPECT_FATAL_FAILURE({ - ADD_FAILURE() << "Expected non-fatal failure."; - }, ""); -} - -// Tests that EXPECT_FATAL_FAILURE() fails when the statement being -// tested returns. -TEST(ExpectFatalFailureTest, FailsWhenStatementReturns) { - printf("(expecting a failure)\n"); - EXPECT_FATAL_FAILURE({ - return; - }, ""); -} - -#if GTEST_HAS_EXCEPTIONS - -// Tests that EXPECT_FATAL_FAILURE() fails when the statement being -// tested throws. -TEST(ExpectFatalFailureTest, FailsWhenStatementThrows) { - printf("(expecting a failure)\n"); - try { - EXPECT_FATAL_FAILURE({ - throw 0; - }, ""); - } catch(int) { // NOLINT - } -} - -#endif // GTEST_HAS_EXCEPTIONS - -// This #ifdef block tests the output of value-parameterized tests. - -std::string ParamNameFunc(const testing::TestParamInfo& info) { - return info.param; -} - -class ParamTest : public testing::TestWithParam { -}; - -TEST_P(ParamTest, Success) { - EXPECT_EQ("a", GetParam()); -} - -TEST_P(ParamTest, Failure) { - EXPECT_EQ("b", GetParam()) << "Expected failure"; -} - -INSTANTIATE_TEST_CASE_P(PrintingStrings, - ParamTest, - testing::Values(std::string("a")), - ParamNameFunc); - -// This #ifdef block tests the output of typed tests. -#if GTEST_HAS_TYPED_TEST - -template -class TypedTest : public testing::Test { -}; - -TYPED_TEST_CASE(TypedTest, testing::Types); - -TYPED_TEST(TypedTest, Success) { - EXPECT_EQ(0, TypeParam()); -} - -TYPED_TEST(TypedTest, Failure) { - EXPECT_EQ(1, TypeParam()) << "Expected failure"; -} - -#endif // GTEST_HAS_TYPED_TEST - -// This #ifdef block tests the output of type-parameterized tests. -#if GTEST_HAS_TYPED_TEST_P - -template -class TypedTestP : public testing::Test { -}; - -TYPED_TEST_CASE_P(TypedTestP); - -TYPED_TEST_P(TypedTestP, Success) { - EXPECT_EQ(0U, TypeParam()); -} - -TYPED_TEST_P(TypedTestP, Failure) { - EXPECT_EQ(1U, TypeParam()) << "Expected failure"; -} - -REGISTER_TYPED_TEST_CASE_P(TypedTestP, Success, Failure); - -typedef testing::Types UnsignedTypes; -INSTANTIATE_TYPED_TEST_CASE_P(Unsigned, TypedTestP, UnsignedTypes); - -#endif // GTEST_HAS_TYPED_TEST_P - -#if GTEST_HAS_DEATH_TEST - -// We rely on the golden file to verify that tests whose test case -// name ends with DeathTest are run first. - -TEST(ADeathTest, ShouldRunFirst) { -} - -# if GTEST_HAS_TYPED_TEST - -// We rely on the golden file to verify that typed tests whose test -// case name ends with DeathTest are run first. - -template -class ATypedDeathTest : public testing::Test { -}; - -typedef testing::Types NumericTypes; -TYPED_TEST_CASE(ATypedDeathTest, NumericTypes); - -TYPED_TEST(ATypedDeathTest, ShouldRunFirst) { -} - -# endif // GTEST_HAS_TYPED_TEST - -# if GTEST_HAS_TYPED_TEST_P - - -// We rely on the golden file to verify that type-parameterized tests -// whose test case name ends with DeathTest are run first. - -template -class ATypeParamDeathTest : public testing::Test { -}; - -TYPED_TEST_CASE_P(ATypeParamDeathTest); - -TYPED_TEST_P(ATypeParamDeathTest, ShouldRunFirst) { -} - -REGISTER_TYPED_TEST_CASE_P(ATypeParamDeathTest, ShouldRunFirst); - -INSTANTIATE_TYPED_TEST_CASE_P(My, ATypeParamDeathTest, NumericTypes); - -# endif // GTEST_HAS_TYPED_TEST_P - -#endif // GTEST_HAS_DEATH_TEST - -// Tests various failure conditions of -// EXPECT_{,NON}FATAL_FAILURE{,_ON_ALL_THREADS}. -class ExpectFailureTest : public testing::Test { - public: // Must be public and not protected due to a bug in g++ 3.4.2. - enum FailureMode { - FATAL_FAILURE, - NONFATAL_FAILURE - }; - static void AddFailure(FailureMode failure) { - if (failure == FATAL_FAILURE) { - FAIL() << "Expected fatal failure."; - } else { - ADD_FAILURE() << "Expected non-fatal failure."; - } - } -}; - -TEST_F(ExpectFailureTest, ExpectFatalFailure) { - // Expected fatal failure, but succeeds. - printf("(expecting 1 failure)\n"); - EXPECT_FATAL_FAILURE(SUCCEED(), "Expected fatal failure."); - // Expected fatal failure, but got a non-fatal failure. - printf("(expecting 1 failure)\n"); - EXPECT_FATAL_FAILURE(AddFailure(NONFATAL_FAILURE), "Expected non-fatal " - "failure."); - // Wrong message. - printf("(expecting 1 failure)\n"); - EXPECT_FATAL_FAILURE(AddFailure(FATAL_FAILURE), "Some other fatal failure " - "expected."); -} - -TEST_F(ExpectFailureTest, ExpectNonFatalFailure) { - // Expected non-fatal failure, but succeeds. - printf("(expecting 1 failure)\n"); - EXPECT_NONFATAL_FAILURE(SUCCEED(), "Expected non-fatal failure."); - // Expected non-fatal failure, but got a fatal failure. - printf("(expecting 1 failure)\n"); - EXPECT_NONFATAL_FAILURE(AddFailure(FATAL_FAILURE), "Expected fatal failure."); - // Wrong message. - printf("(expecting 1 failure)\n"); - EXPECT_NONFATAL_FAILURE(AddFailure(NONFATAL_FAILURE), "Some other non-fatal " - "failure."); -} - -#if GTEST_IS_THREADSAFE - -class ExpectFailureWithThreadsTest : public ExpectFailureTest { - protected: - static void AddFailureInOtherThread(FailureMode failure) { - ThreadWithParam thread(&AddFailure, failure, NULL); - thread.Join(); - } -}; - -TEST_F(ExpectFailureWithThreadsTest, ExpectFatalFailure) { - // We only intercept the current thread. - printf("(expecting 2 failures)\n"); - EXPECT_FATAL_FAILURE(AddFailureInOtherThread(FATAL_FAILURE), - "Expected fatal failure."); -} - -TEST_F(ExpectFailureWithThreadsTest, ExpectNonFatalFailure) { - // We only intercept the current thread. - printf("(expecting 2 failures)\n"); - EXPECT_NONFATAL_FAILURE(AddFailureInOtherThread(NONFATAL_FAILURE), - "Expected non-fatal failure."); -} - -typedef ExpectFailureWithThreadsTest ScopedFakeTestPartResultReporterTest; - -// Tests that the ScopedFakeTestPartResultReporter only catches failures from -// the current thread if it is instantiated with INTERCEPT_ONLY_CURRENT_THREAD. -TEST_F(ScopedFakeTestPartResultReporterTest, InterceptOnlyCurrentThread) { - printf("(expecting 2 failures)\n"); - TestPartResultArray results; - { - ScopedFakeTestPartResultReporter reporter( - ScopedFakeTestPartResultReporter::INTERCEPT_ONLY_CURRENT_THREAD, - &results); - AddFailureInOtherThread(FATAL_FAILURE); - AddFailureInOtherThread(NONFATAL_FAILURE); - } - // The two failures should not have been intercepted. - EXPECT_EQ(0, results.size()) << "This shouldn't fail."; -} - -#endif // GTEST_IS_THREADSAFE - -TEST_F(ExpectFailureTest, ExpectFatalFailureOnAllThreads) { - // Expected fatal failure, but succeeds. - printf("(expecting 1 failure)\n"); - EXPECT_FATAL_FAILURE_ON_ALL_THREADS(SUCCEED(), "Expected fatal failure."); - // Expected fatal failure, but got a non-fatal failure. - printf("(expecting 1 failure)\n"); - EXPECT_FATAL_FAILURE_ON_ALL_THREADS(AddFailure(NONFATAL_FAILURE), - "Expected non-fatal failure."); - // Wrong message. - printf("(expecting 1 failure)\n"); - EXPECT_FATAL_FAILURE_ON_ALL_THREADS(AddFailure(FATAL_FAILURE), - "Some other fatal failure expected."); -} - -TEST_F(ExpectFailureTest, ExpectNonFatalFailureOnAllThreads) { - // Expected non-fatal failure, but succeeds. - printf("(expecting 1 failure)\n"); - EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(SUCCEED(), "Expected non-fatal " - "failure."); - // Expected non-fatal failure, but got a fatal failure. - printf("(expecting 1 failure)\n"); - EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(AddFailure(FATAL_FAILURE), - "Expected fatal failure."); - // Wrong message. - printf("(expecting 1 failure)\n"); - EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(AddFailure(NONFATAL_FAILURE), - "Some other non-fatal failure."); -} - - -// Two test environments for testing testing::AddGlobalTestEnvironment(). - -class FooEnvironment : public testing::Environment { - public: - virtual void SetUp() { - printf("%s", "FooEnvironment::SetUp() called.\n"); - } - - virtual void TearDown() { - printf("%s", "FooEnvironment::TearDown() called.\n"); - FAIL() << "Expected fatal failure."; - } -}; - -class BarEnvironment : public testing::Environment { - public: - virtual void SetUp() { - printf("%s", "BarEnvironment::SetUp() called.\n"); - } - - virtual void TearDown() { - printf("%s", "BarEnvironment::TearDown() called.\n"); - ADD_FAILURE() << "Expected non-fatal failure."; - } -}; - -// The main function. -// -// The idea is to use Google Test to run all the tests we have defined (some -// of them are intended to fail), and then compare the test results -// with the "golden" file. -int main(int argc, char **argv) { - testing::GTEST_FLAG(print_time) = false; - - // We just run the tests, knowing some of them are intended to fail. - // We will use a separate Python script to compare the output of - // this program with the golden file. - - // It's hard to test InitGoogleTest() directly, as it has many - // global side effects. The following line serves as a sanity test - // for it. - testing::InitGoogleTest(&argc, argv); - bool internal_skip_environment_and_ad_hoc_tests = - std::count(argv, argv + argc, - std::string("internal_skip_environment_and_ad_hoc_tests")) > 0; - -#if GTEST_HAS_DEATH_TEST - if (testing::internal::GTEST_FLAG(internal_run_death_test) != "") { - // Skip the usual output capturing if we're running as the child - // process of an threadsafe-style death test. -# if GTEST_OS_WINDOWS - posix::FReopen("nul:", "w", stdout); -# else - posix::FReopen("/dev/null", "w", stdout); -# endif // GTEST_OS_WINDOWS - return RUN_ALL_TESTS(); - } -#endif // GTEST_HAS_DEATH_TEST - - if (internal_skip_environment_and_ad_hoc_tests) - return RUN_ALL_TESTS(); - - // Registers two global test environments. - // The golden file verifies that they are set up in the order they - // are registered, and torn down in the reverse order. - testing::AddGlobalTestEnvironment(new FooEnvironment); - testing::AddGlobalTestEnvironment(new BarEnvironment); - - return RunAllTests(); -} diff --git a/test/gtest-1.8.0/test/gtest_output_test_golden_lin.txt b/test/gtest-1.8.0/test/gtest_output_test_golden_lin.txt deleted file mode 100644 index cbcb720bae..0000000000 --- a/test/gtest-1.8.0/test/gtest_output_test_golden_lin.txt +++ /dev/null @@ -1,781 +0,0 @@ -The non-test part of the code is expected to have 2 failures. - -gtest_output_test_.cc:#: Failure -Value of: false - Actual: false -Expected: true -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 2 - 3 -[==========] Running 68 tests from 30 test cases. -[----------] Global test environment set-up. -FooEnvironment::SetUp() called. -BarEnvironment::SetUp() called. -[----------] 1 test from ADeathTest -[ RUN ] ADeathTest.ShouldRunFirst -[ OK ] ADeathTest.ShouldRunFirst -[----------] 1 test from ATypedDeathTest/0, where TypeParam = int -[ RUN ] ATypedDeathTest/0.ShouldRunFirst -[ OK ] ATypedDeathTest/0.ShouldRunFirst -[----------] 1 test from ATypedDeathTest/1, where TypeParam = double -[ RUN ] ATypedDeathTest/1.ShouldRunFirst -[ OK ] ATypedDeathTest/1.ShouldRunFirst -[----------] 1 test from My/ATypeParamDeathTest/0, where TypeParam = int -[ RUN ] My/ATypeParamDeathTest/0.ShouldRunFirst -[ OK ] My/ATypeParamDeathTest/0.ShouldRunFirst -[----------] 1 test from My/ATypeParamDeathTest/1, where TypeParam = double -[ RUN ] My/ATypeParamDeathTest/1.ShouldRunFirst -[ OK ] My/ATypeParamDeathTest/1.ShouldRunFirst -[----------] 2 tests from PassingTest -[ RUN ] PassingTest.PassingTest1 -[ OK ] PassingTest.PassingTest1 -[ RUN ] PassingTest.PassingTest2 -[ OK ] PassingTest.PassingTest2 -[----------] 2 tests from NonfatalFailureTest -[ RUN ] NonfatalFailureTest.EscapesStringOperands -gtest_output_test_.cc:#: Failure -Expected equality of these values: - kGoldenString - Which is: "\"Line" - actual - Which is: "actual \"string\"" -gtest_output_test_.cc:#: Failure -Expected equality of these values: - golden - Which is: "\"Line" - actual - Which is: "actual \"string\"" -[ FAILED ] NonfatalFailureTest.EscapesStringOperands -[ RUN ] NonfatalFailureTest.DiffForLongStrings -gtest_output_test_.cc:#: Failure -Expected equality of these values: - golden_str - Which is: "\"Line\0 1\"\nLine 2" - "Line 2" -With diff: -@@ -1,2 @@ --\"Line\0 1\" - Line 2 - -[ FAILED ] NonfatalFailureTest.DiffForLongStrings -[----------] 3 tests from FatalFailureTest -[ RUN ] FatalFailureTest.FatalFailureInSubroutine -(expecting a failure that x should be 1) -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 1 - x - Which is: 2 -[ FAILED ] FatalFailureTest.FatalFailureInSubroutine -[ RUN ] FatalFailureTest.FatalFailureInNestedSubroutine -(expecting a failure that x should be 1) -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 1 - x - Which is: 2 -[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine -[ RUN ] FatalFailureTest.NonfatalFailureInSubroutine -(expecting a failure on false) -gtest_output_test_.cc:#: Failure -Value of: false - Actual: false -Expected: true -[ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine -[----------] 1 test from LoggingTest -[ RUN ] LoggingTest.InterleavingLoggingAndAssertions -(expecting 2 failures on (3) >= (a[i])) -i == 0 -i == 1 -gtest_output_test_.cc:#: Failure -Expected: (3) >= (a[i]), actual: 3 vs 9 -i == 2 -i == 3 -gtest_output_test_.cc:#: Failure -Expected: (3) >= (a[i]), actual: 3 vs 6 -[ FAILED ] LoggingTest.InterleavingLoggingAndAssertions -[----------] 7 tests from SCOPED_TRACETest -[ RUN ] SCOPED_TRACETest.AcceptedValues -gtest_output_test_.cc:#: Failure -Failed -Just checking that all these values work fine. -Google Test trace: -gtest_output_test_.cc:#: (null) -gtest_output_test_.cc:#: 1337 -gtest_output_test_.cc:#: std::string -gtest_output_test_.cc:#: literal string -[ FAILED ] SCOPED_TRACETest.AcceptedValues -[ RUN ] SCOPED_TRACETest.ObeysScopes -(expected to fail) -gtest_output_test_.cc:#: Failure -Failed -This failure is expected, and shouldn't have a trace. -gtest_output_test_.cc:#: Failure -Failed -This failure is expected, and should have a trace. -Google Test trace: -gtest_output_test_.cc:#: Expected trace -gtest_output_test_.cc:#: Failure -Failed -This failure is expected, and shouldn't have a trace. -[ FAILED ] SCOPED_TRACETest.ObeysScopes -[ RUN ] SCOPED_TRACETest.WorksInLoop -(expected to fail) -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 2 - n - Which is: 1 -Google Test trace: -gtest_output_test_.cc:#: i = 1 -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 1 - n - Which is: 2 -Google Test trace: -gtest_output_test_.cc:#: i = 2 -[ FAILED ] SCOPED_TRACETest.WorksInLoop -[ RUN ] SCOPED_TRACETest.WorksInSubroutine -(expected to fail) -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 2 - n - Which is: 1 -Google Test trace: -gtest_output_test_.cc:#: n = 1 -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 1 - n - Which is: 2 -Google Test trace: -gtest_output_test_.cc:#: n = 2 -[ FAILED ] SCOPED_TRACETest.WorksInSubroutine -[ RUN ] SCOPED_TRACETest.CanBeNested -(expected to fail) -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 1 - n - Which is: 2 -Google Test trace: -gtest_output_test_.cc:#: n = 2 -gtest_output_test_.cc:#: -[ FAILED ] SCOPED_TRACETest.CanBeNested -[ RUN ] SCOPED_TRACETest.CanBeRepeated -(expected to fail) -gtest_output_test_.cc:#: Failure -Failed -This failure is expected, and should contain trace point A. -Google Test trace: -gtest_output_test_.cc:#: A -gtest_output_test_.cc:#: Failure -Failed -This failure is expected, and should contain trace point A and B. -Google Test trace: -gtest_output_test_.cc:#: B -gtest_output_test_.cc:#: A -gtest_output_test_.cc:#: Failure -Failed -This failure is expected, and should contain trace point A, B, and C. -Google Test trace: -gtest_output_test_.cc:#: C -gtest_output_test_.cc:#: B -gtest_output_test_.cc:#: A -gtest_output_test_.cc:#: Failure -Failed -This failure is expected, and should contain trace point A, B, and D. -Google Test trace: -gtest_output_test_.cc:#: D -gtest_output_test_.cc:#: B -gtest_output_test_.cc:#: A -[ FAILED ] SCOPED_TRACETest.CanBeRepeated -[ RUN ] SCOPED_TRACETest.WorksConcurrently -(expecting 6 failures) -gtest_output_test_.cc:#: Failure -Failed -Expected failure #1 (in thread B, only trace B alive). -Google Test trace: -gtest_output_test_.cc:#: Trace B -gtest_output_test_.cc:#: Failure -Failed -Expected failure #2 (in thread A, trace A & B both alive). -Google Test trace: -gtest_output_test_.cc:#: Trace A -gtest_output_test_.cc:#: Failure -Failed -Expected failure #3 (in thread B, trace A & B both alive). -Google Test trace: -gtest_output_test_.cc:#: Trace B -gtest_output_test_.cc:#: Failure -Failed -Expected failure #4 (in thread B, only trace A alive). -gtest_output_test_.cc:#: Failure -Failed -Expected failure #5 (in thread A, only trace A alive). -Google Test trace: -gtest_output_test_.cc:#: Trace A -gtest_output_test_.cc:#: Failure -Failed -Expected failure #6 (in thread A, no trace alive). -[ FAILED ] SCOPED_TRACETest.WorksConcurrently -[----------] 1 test from ScopedTraceTest -[ RUN ] ScopedTraceTest.WithExplicitFileAndLine -gtest_output_test_.cc:#: Failure -Failed -Check that the trace is attached to a particular location. -Google Test trace: -explicit_file.cc:123: expected trace message -[ FAILED ] ScopedTraceTest.WithExplicitFileAndLine -[----------] 1 test from NonFatalFailureInFixtureConstructorTest -[ RUN ] NonFatalFailureInFixtureConstructorTest.FailureInConstructor -(expecting 5 failures) -gtest_output_test_.cc:#: Failure -Failed -Expected failure #1, in the test fixture c'tor. -gtest_output_test_.cc:#: Failure -Failed -Expected failure #2, in SetUp(). -gtest_output_test_.cc:#: Failure -Failed -Expected failure #3, in the test body. -gtest_output_test_.cc:#: Failure -Failed -Expected failure #4, in TearDown. -gtest_output_test_.cc:#: Failure -Failed -Expected failure #5, in the test fixture d'tor. -[ FAILED ] NonFatalFailureInFixtureConstructorTest.FailureInConstructor -[----------] 1 test from FatalFailureInFixtureConstructorTest -[ RUN ] FatalFailureInFixtureConstructorTest.FailureInConstructor -(expecting 2 failures) -gtest_output_test_.cc:#: Failure -Failed -Expected failure #1, in the test fixture c'tor. -gtest_output_test_.cc:#: Failure -Failed -Expected failure #2, in the test fixture d'tor. -[ FAILED ] FatalFailureInFixtureConstructorTest.FailureInConstructor -[----------] 1 test from NonFatalFailureInSetUpTest -[ RUN ] NonFatalFailureInSetUpTest.FailureInSetUp -(expecting 4 failures) -gtest_output_test_.cc:#: Failure -Failed -Expected failure #1, in SetUp(). -gtest_output_test_.cc:#: Failure -Failed -Expected failure #2, in the test function. -gtest_output_test_.cc:#: Failure -Failed -Expected failure #3, in TearDown(). -gtest_output_test_.cc:#: Failure -Failed -Expected failure #4, in the test fixture d'tor. -[ FAILED ] NonFatalFailureInSetUpTest.FailureInSetUp -[----------] 1 test from FatalFailureInSetUpTest -[ RUN ] FatalFailureInSetUpTest.FailureInSetUp -(expecting 3 failures) -gtest_output_test_.cc:#: Failure -Failed -Expected failure #1, in SetUp(). -gtest_output_test_.cc:#: Failure -Failed -Expected failure #2, in TearDown(). -gtest_output_test_.cc:#: Failure -Failed -Expected failure #3, in the test fixture d'tor. -[ FAILED ] FatalFailureInSetUpTest.FailureInSetUp -[----------] 1 test from AddFailureAtTest -[ RUN ] AddFailureAtTest.MessageContainsSpecifiedFileAndLineNumber -foo.cc:42: Failure -Failed -Expected failure in foo.cc -[ FAILED ] AddFailureAtTest.MessageContainsSpecifiedFileAndLineNumber -[----------] 4 tests from MixedUpTestCaseTest -[ RUN ] MixedUpTestCaseTest.FirstTestFromNamespaceFoo -[ OK ] MixedUpTestCaseTest.FirstTestFromNamespaceFoo -[ RUN ] MixedUpTestCaseTest.SecondTestFromNamespaceFoo -[ OK ] MixedUpTestCaseTest.SecondTestFromNamespaceFoo -[ RUN ] MixedUpTestCaseTest.ThisShouldFail -gtest.cc:#: Failure -Failed -All tests in the same test case must use the same test fixture -class. However, in test case MixedUpTestCaseTest, -you defined test FirstTestFromNamespaceFoo and test ThisShouldFail -using two different test fixture classes. This can happen if -the two classes are from different namespaces or translation -units and have the same name. You should probably rename one -of the classes to put the tests into different test cases. -[ FAILED ] MixedUpTestCaseTest.ThisShouldFail -[ RUN ] MixedUpTestCaseTest.ThisShouldFailToo -gtest.cc:#: Failure -Failed -All tests in the same test case must use the same test fixture -class. However, in test case MixedUpTestCaseTest, -you defined test FirstTestFromNamespaceFoo and test ThisShouldFailToo -using two different test fixture classes. This can happen if -the two classes are from different namespaces or translation -units and have the same name. You should probably rename one -of the classes to put the tests into different test cases. -[ FAILED ] MixedUpTestCaseTest.ThisShouldFailToo -[----------] 2 tests from MixedUpTestCaseWithSameTestNameTest -[ RUN ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail -[ OK ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail -[ RUN ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail -gtest.cc:#: Failure -Failed -All tests in the same test case must use the same test fixture -class. However, in test case MixedUpTestCaseWithSameTestNameTest, -you defined test TheSecondTestWithThisNameShouldFail and test TheSecondTestWithThisNameShouldFail -using two different test fixture classes. This can happen if -the two classes are from different namespaces or translation -units and have the same name. You should probably rename one -of the classes to put the tests into different test cases. -[ FAILED ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail -[----------] 2 tests from TEST_F_before_TEST_in_same_test_case -[ RUN ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTEST_F -[ OK ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTEST_F -[ RUN ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail -gtest.cc:#: Failure -Failed -All tests in the same test case must use the same test fixture -class, so mixing TEST_F and TEST in the same test case is -illegal. In test case TEST_F_before_TEST_in_same_test_case, -test DefinedUsingTEST_F is defined using TEST_F but -test DefinedUsingTESTAndShouldFail is defined using TEST. You probably -want to change the TEST to TEST_F or move it to another test -case. -[ FAILED ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail -[----------] 2 tests from TEST_before_TEST_F_in_same_test_case -[ RUN ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST -[ OK ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST -[ RUN ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail -gtest.cc:#: Failure -Failed -All tests in the same test case must use the same test fixture -class, so mixing TEST_F and TEST in the same test case is -illegal. In test case TEST_before_TEST_F_in_same_test_case, -test DefinedUsingTEST_FAndShouldFail is defined using TEST_F but -test DefinedUsingTEST is defined using TEST. You probably -want to change the TEST to TEST_F or move it to another test -case. -[ FAILED ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail -[----------] 8 tests from ExpectNonfatalFailureTest -[ RUN ] ExpectNonfatalFailureTest.CanReferenceGlobalVariables -[ OK ] ExpectNonfatalFailureTest.CanReferenceGlobalVariables -[ RUN ] ExpectNonfatalFailureTest.CanReferenceLocalVariables -[ OK ] ExpectNonfatalFailureTest.CanReferenceLocalVariables -[ RUN ] ExpectNonfatalFailureTest.SucceedsWhenThereIsOneNonfatalFailure -[ OK ] ExpectNonfatalFailureTest.SucceedsWhenThereIsOneNonfatalFailure -[ RUN ] ExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure -(expecting a failure) -gtest.cc:#: Failure -Expected: 1 non-fatal failure - Actual: 0 failures -[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure -[ RUN ] ExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures -(expecting a failure) -gtest.cc:#: Failure -Expected: 1 non-fatal failure - Actual: 2 failures -gtest_output_test_.cc:#: Non-fatal failure: -Failed -Expected non-fatal failure 1. - -gtest_output_test_.cc:#: Non-fatal failure: -Failed -Expected non-fatal failure 2. - -[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures -[ RUN ] ExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure -(expecting a failure) -gtest.cc:#: Failure -Expected: 1 non-fatal failure - Actual: -gtest_output_test_.cc:#: Fatal failure: -Failed -Expected fatal failure. - -[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure -[ RUN ] ExpectNonfatalFailureTest.FailsWhenStatementReturns -(expecting a failure) -gtest.cc:#: Failure -Expected: 1 non-fatal failure - Actual: 0 failures -[ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementReturns -[ RUN ] ExpectNonfatalFailureTest.FailsWhenStatementThrows -(expecting a failure) -gtest.cc:#: Failure -Expected: 1 non-fatal failure - Actual: 0 failures -[ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementThrows -[----------] 8 tests from ExpectFatalFailureTest -[ RUN ] ExpectFatalFailureTest.CanReferenceGlobalVariables -[ OK ] ExpectFatalFailureTest.CanReferenceGlobalVariables -[ RUN ] ExpectFatalFailureTest.CanReferenceLocalStaticVariables -[ OK ] ExpectFatalFailureTest.CanReferenceLocalStaticVariables -[ RUN ] ExpectFatalFailureTest.SucceedsWhenThereIsOneFatalFailure -[ OK ] ExpectFatalFailureTest.SucceedsWhenThereIsOneFatalFailure -[ RUN ] ExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure -(expecting a failure) -gtest.cc:#: Failure -Expected: 1 fatal failure - Actual: 0 failures -[ FAILED ] ExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure -[ RUN ] ExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures -(expecting a failure) -gtest.cc:#: Failure -Expected: 1 fatal failure - Actual: 2 failures -gtest_output_test_.cc:#: Fatal failure: -Failed -Expected fatal failure. - -gtest_output_test_.cc:#: Fatal failure: -Failed -Expected fatal failure. - -[ FAILED ] ExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures -[ RUN ] ExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure -(expecting a failure) -gtest.cc:#: Failure -Expected: 1 fatal failure - Actual: -gtest_output_test_.cc:#: Non-fatal failure: -Failed -Expected non-fatal failure. - -[ FAILED ] ExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure -[ RUN ] ExpectFatalFailureTest.FailsWhenStatementReturns -(expecting a failure) -gtest.cc:#: Failure -Expected: 1 fatal failure - Actual: 0 failures -[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementReturns -[ RUN ] ExpectFatalFailureTest.FailsWhenStatementThrows -(expecting a failure) -gtest.cc:#: Failure -Expected: 1 fatal failure - Actual: 0 failures -[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementThrows -[----------] 2 tests from TypedTest/0, where TypeParam = int -[ RUN ] TypedTest/0.Success -[ OK ] TypedTest/0.Success -[ RUN ] TypedTest/0.Failure -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 1 - TypeParam() - Which is: 0 -Expected failure -[ FAILED ] TypedTest/0.Failure, where TypeParam = int -[----------] 2 tests from Unsigned/TypedTestP/0, where TypeParam = unsigned char -[ RUN ] Unsigned/TypedTestP/0.Success -[ OK ] Unsigned/TypedTestP/0.Success -[ RUN ] Unsigned/TypedTestP/0.Failure -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 1U - Which is: 1 - TypeParam() - Which is: '\0' -Expected failure -[ FAILED ] Unsigned/TypedTestP/0.Failure, where TypeParam = unsigned char -[----------] 2 tests from Unsigned/TypedTestP/1, where TypeParam = unsigned -[ RUN ] Unsigned/TypedTestP/1.Success -[ OK ] Unsigned/TypedTestP/1.Success -[ RUN ] Unsigned/TypedTestP/1.Failure -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 1U - Which is: 1 - TypeParam() - Which is: 0 -Expected failure -[ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned -[----------] 4 tests from ExpectFailureTest -[ RUN ] ExpectFailureTest.ExpectFatalFailure -(expecting 1 failure) -gtest.cc:#: Failure -Expected: 1 fatal failure - Actual: -gtest_output_test_.cc:#: Success: -Succeeded - -(expecting 1 failure) -gtest.cc:#: Failure -Expected: 1 fatal failure - Actual: -gtest_output_test_.cc:#: Non-fatal failure: -Failed -Expected non-fatal failure. - -(expecting 1 failure) -gtest.cc:#: Failure -Expected: 1 fatal failure containing "Some other fatal failure expected." - Actual: -gtest_output_test_.cc:#: Fatal failure: -Failed -Expected fatal failure. - -[ FAILED ] ExpectFailureTest.ExpectFatalFailure -[ RUN ] ExpectFailureTest.ExpectNonFatalFailure -(expecting 1 failure) -gtest.cc:#: Failure -Expected: 1 non-fatal failure - Actual: -gtest_output_test_.cc:#: Success: -Succeeded - -(expecting 1 failure) -gtest.cc:#: Failure -Expected: 1 non-fatal failure - Actual: -gtest_output_test_.cc:#: Fatal failure: -Failed -Expected fatal failure. - -(expecting 1 failure) -gtest.cc:#: Failure -Expected: 1 non-fatal failure containing "Some other non-fatal failure." - Actual: -gtest_output_test_.cc:#: Non-fatal failure: -Failed -Expected non-fatal failure. - -[ FAILED ] ExpectFailureTest.ExpectNonFatalFailure -[ RUN ] ExpectFailureTest.ExpectFatalFailureOnAllThreads -(expecting 1 failure) -gtest.cc:#: Failure -Expected: 1 fatal failure - Actual: -gtest_output_test_.cc:#: Success: -Succeeded - -(expecting 1 failure) -gtest.cc:#: Failure -Expected: 1 fatal failure - Actual: -gtest_output_test_.cc:#: Non-fatal failure: -Failed -Expected non-fatal failure. - -(expecting 1 failure) -gtest.cc:#: Failure -Expected: 1 fatal failure containing "Some other fatal failure expected." - Actual: -gtest_output_test_.cc:#: Fatal failure: -Failed -Expected fatal failure. - -[ FAILED ] ExpectFailureTest.ExpectFatalFailureOnAllThreads -[ RUN ] ExpectFailureTest.ExpectNonFatalFailureOnAllThreads -(expecting 1 failure) -gtest.cc:#: Failure -Expected: 1 non-fatal failure - Actual: -gtest_output_test_.cc:#: Success: -Succeeded - -(expecting 1 failure) -gtest.cc:#: Failure -Expected: 1 non-fatal failure - Actual: -gtest_output_test_.cc:#: Fatal failure: -Failed -Expected fatal failure. - -(expecting 1 failure) -gtest.cc:#: Failure -Expected: 1 non-fatal failure containing "Some other non-fatal failure." - Actual: -gtest_output_test_.cc:#: Non-fatal failure: -Failed -Expected non-fatal failure. - -[ FAILED ] ExpectFailureTest.ExpectNonFatalFailureOnAllThreads -[----------] 2 tests from ExpectFailureWithThreadsTest -[ RUN ] ExpectFailureWithThreadsTest.ExpectFatalFailure -(expecting 2 failures) -gtest_output_test_.cc:#: Failure -Failed -Expected fatal failure. -gtest.cc:#: Failure -Expected: 1 fatal failure - Actual: 0 failures -[ FAILED ] ExpectFailureWithThreadsTest.ExpectFatalFailure -[ RUN ] ExpectFailureWithThreadsTest.ExpectNonFatalFailure -(expecting 2 failures) -gtest_output_test_.cc:#: Failure -Failed -Expected non-fatal failure. -gtest.cc:#: Failure -Expected: 1 non-fatal failure - Actual: 0 failures -[ FAILED ] ExpectFailureWithThreadsTest.ExpectNonFatalFailure -[----------] 1 test from ScopedFakeTestPartResultReporterTest -[ RUN ] ScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread -(expecting 2 failures) -gtest_output_test_.cc:#: Failure -Failed -Expected fatal failure. -gtest_output_test_.cc:#: Failure -Failed -Expected non-fatal failure. -[ FAILED ] ScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread -[----------] 1 test from PrintingFailingParams/FailingParamTest -[ RUN ] PrintingFailingParams/FailingParamTest.Fails/0 -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 1 - GetParam() - Which is: 2 -[ FAILED ] PrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2 -[----------] 2 tests from PrintingStrings/ParamTest -[ RUN ] PrintingStrings/ParamTest.Success/a -[ OK ] PrintingStrings/ParamTest.Success/a -[ RUN ] PrintingStrings/ParamTest.Failure/a -gtest_output_test_.cc:#: Failure -Expected equality of these values: - "b" - GetParam() - Which is: "a" -Expected failure -[ FAILED ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a" -[----------] Global test environment tear-down -BarEnvironment::TearDown() called. -gtest_output_test_.cc:#: Failure -Failed -Expected non-fatal failure. -FooEnvironment::TearDown() called. -gtest_output_test_.cc:#: Failure -Failed -Expected fatal failure. -[==========] 68 tests from 30 test cases ran. -[ PASSED ] 22 tests. -[ FAILED ] 46 tests, listed below: -[ FAILED ] NonfatalFailureTest.EscapesStringOperands -[ FAILED ] NonfatalFailureTest.DiffForLongStrings -[ FAILED ] FatalFailureTest.FatalFailureInSubroutine -[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine -[ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine -[ FAILED ] LoggingTest.InterleavingLoggingAndAssertions -[ FAILED ] SCOPED_TRACETest.AcceptedValues -[ FAILED ] SCOPED_TRACETest.ObeysScopes -[ FAILED ] SCOPED_TRACETest.WorksInLoop -[ FAILED ] SCOPED_TRACETest.WorksInSubroutine -[ FAILED ] SCOPED_TRACETest.CanBeNested -[ FAILED ] SCOPED_TRACETest.CanBeRepeated -[ FAILED ] SCOPED_TRACETest.WorksConcurrently -[ FAILED ] ScopedTraceTest.WithExplicitFileAndLine -[ FAILED ] NonFatalFailureInFixtureConstructorTest.FailureInConstructor -[ FAILED ] FatalFailureInFixtureConstructorTest.FailureInConstructor -[ FAILED ] NonFatalFailureInSetUpTest.FailureInSetUp -[ FAILED ] FatalFailureInSetUpTest.FailureInSetUp -[ FAILED ] AddFailureAtTest.MessageContainsSpecifiedFileAndLineNumber -[ FAILED ] MixedUpTestCaseTest.ThisShouldFail -[ FAILED ] MixedUpTestCaseTest.ThisShouldFailToo -[ FAILED ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail -[ FAILED ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail -[ FAILED ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail -[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure -[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures -[ FAILED ] ExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure -[ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementReturns -[ FAILED ] ExpectNonfatalFailureTest.FailsWhenStatementThrows -[ FAILED ] ExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure -[ FAILED ] ExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures -[ FAILED ] ExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure -[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementReturns -[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementThrows -[ FAILED ] TypedTest/0.Failure, where TypeParam = int -[ FAILED ] Unsigned/TypedTestP/0.Failure, where TypeParam = unsigned char -[ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned -[ FAILED ] ExpectFailureTest.ExpectFatalFailure -[ FAILED ] ExpectFailureTest.ExpectNonFatalFailure -[ FAILED ] ExpectFailureTest.ExpectFatalFailureOnAllThreads -[ FAILED ] ExpectFailureTest.ExpectNonFatalFailureOnAllThreads -[ FAILED ] ExpectFailureWithThreadsTest.ExpectFatalFailure -[ FAILED ] ExpectFailureWithThreadsTest.ExpectNonFatalFailure -[ FAILED ] ScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread -[ FAILED ] PrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2 -[ FAILED ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a" - -46 FAILED TESTS - YOU HAVE 1 DISABLED TEST - -Note: Google Test filter = FatalFailureTest.*:LoggingTest.* -[==========] Running 4 tests from 2 test cases. -[----------] Global test environment set-up. -[----------] 3 tests from FatalFailureTest -[ RUN ] FatalFailureTest.FatalFailureInSubroutine -(expecting a failure that x should be 1) -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 1 - x - Which is: 2 -[ FAILED ] FatalFailureTest.FatalFailureInSubroutine (? ms) -[ RUN ] FatalFailureTest.FatalFailureInNestedSubroutine -(expecting a failure that x should be 1) -gtest_output_test_.cc:#: Failure -Expected equality of these values: - 1 - x - Which is: 2 -[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine (? ms) -[ RUN ] FatalFailureTest.NonfatalFailureInSubroutine -(expecting a failure on false) -gtest_output_test_.cc:#: Failure -Value of: false - Actual: false -Expected: true -[ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine (? ms) -[----------] 3 tests from FatalFailureTest (? ms total) - -[----------] 1 test from LoggingTest -[ RUN ] LoggingTest.InterleavingLoggingAndAssertions -(expecting 2 failures on (3) >= (a[i])) -i == 0 -i == 1 -gtest_output_test_.cc:#: Failure -Expected: (3) >= (a[i]), actual: 3 vs 9 -i == 2 -i == 3 -gtest_output_test_.cc:#: Failure -Expected: (3) >= (a[i]), actual: 3 vs 6 -[ FAILED ] LoggingTest.InterleavingLoggingAndAssertions (? ms) -[----------] 1 test from LoggingTest (? ms total) - -[----------] Global test environment tear-down -[==========] 4 tests from 2 test cases ran. (? ms total) -[ PASSED ] 0 tests. -[ FAILED ] 4 tests, listed below: -[ FAILED ] FatalFailureTest.FatalFailureInSubroutine -[ FAILED ] FatalFailureTest.FatalFailureInNestedSubroutine -[ FAILED ] FatalFailureTest.NonfatalFailureInSubroutine -[ FAILED ] LoggingTest.InterleavingLoggingAndAssertions - - 4 FAILED TESTS -Note: Google Test filter = *DISABLED_* -[==========] Running 1 test from 1 test case. -[----------] Global test environment set-up. -[----------] 1 test from DisabledTestsWarningTest -[ RUN ] DisabledTestsWarningTest.DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning -[ OK ] DisabledTestsWarningTest.DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning -[----------] Global test environment tear-down -[==========] 1 test from 1 test case ran. -[ PASSED ] 1 test. -Note: Google Test filter = PassingTest.* -Note: This is test shard 2 of 2. -[==========] Running 1 test from 1 test case. -[----------] Global test environment set-up. -[----------] 1 test from PassingTest -[ RUN ] PassingTest.PassingTest2 -[ OK ] PassingTest.PassingTest2 -[----------] Global test environment tear-down -[==========] 1 test from 1 test case ran. -[ PASSED ] 1 test. diff --git a/test/gtest-1.8.0/test/gtest_pred_impl_unittest.cc b/test/gtest-1.8.0/test/gtest_pred_impl_unittest.cc deleted file mode 100644 index b466c150ae..0000000000 --- a/test/gtest-1.8.0/test/gtest_pred_impl_unittest.cc +++ /dev/null @@ -1,2427 +0,0 @@ -// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// This file is AUTOMATICALLY GENERATED on 01/02/2018 by command -// 'gen_gtest_pred_impl.py 5'. DO NOT EDIT BY HAND! - -// Regression test for gtest_pred_impl.h -// -// This file is generated by a script and quite long. If you intend to -// learn how Google Test works by reading its unit tests, read -// gtest_unittest.cc instead. -// -// This is intended as a regression test for the Google Test predicate -// assertions. We compile it as part of the gtest_unittest target -// only to keep the implementation tidy and compact, as it is quite -// involved to set up the stage for testing Google Test using Google -// Test itself. -// -// Currently, gtest_unittest takes ~11 seconds to run in the testing -// daemon. In the future, if it grows too large and needs much more -// time to finish, we should consider separating this file into a -// stand-alone regression test. - -#include - -#include "gtest/gtest.h" -#include "gtest/gtest-spi.h" - -// A user-defined data type. -struct Bool { - explicit Bool(int val) : value(val != 0) {} - - bool operator>(int n) const { return value > Bool(n).value; } - - Bool operator+(const Bool& rhs) const { return Bool(value + rhs.value); } - - bool operator==(const Bool& rhs) const { return value == rhs.value; } - - bool value; -}; - -// Enables Bool to be used in assertions. -std::ostream& operator<<(std::ostream& os, const Bool& x) { - return os << (x.value ? "true" : "false"); -} - -// Sample functions/functors for testing unary predicate assertions. - -// A unary predicate function. -template -bool PredFunction1(T1 v1) { - return v1 > 0; -} - -// The following two functions are needed to circumvent a bug in -// gcc 2.95.3, which sometimes has problem with the above template -// function. -bool PredFunction1Int(int v1) { - return v1 > 0; -} -bool PredFunction1Bool(Bool v1) { - return v1 > 0; -} - -// A unary predicate functor. -struct PredFunctor1 { - template - bool operator()(const T1& v1) { - return v1 > 0; - } -}; - -// A unary predicate-formatter function. -template -testing::AssertionResult PredFormatFunction1(const char* e1, - const T1& v1) { - if (PredFunction1(v1)) - return testing::AssertionSuccess(); - - return testing::AssertionFailure() - << e1 - << " is expected to be positive, but evaluates to " - << v1 << "."; -} - -// A unary predicate-formatter functor. -struct PredFormatFunctor1 { - template - testing::AssertionResult operator()(const char* e1, - const T1& v1) const { - return PredFormatFunction1(e1, v1); - } -}; - -// Tests for {EXPECT|ASSERT}_PRED_FORMAT1. - -class Predicate1Test : public testing::Test { - protected: - virtual void SetUp() { - expected_to_finish_ = true; - finished_ = false; - n1_ = 0; - } - - virtual void TearDown() { - // Verifies that each of the predicate's arguments was evaluated - // exactly once. - EXPECT_EQ(1, n1_) << - "The predicate assertion didn't evaluate argument 2 " - "exactly once."; - - // Verifies that the control flow in the test function is expected. - if (expected_to_finish_ && !finished_) { - FAIL() << "The predicate assertion unexpactedly aborted the test."; - } else if (!expected_to_finish_ && finished_) { - FAIL() << "The failed predicate assertion didn't abort the test " - "as expected."; - } - } - - // true iff the test function is expected to run to finish. - static bool expected_to_finish_; - - // true iff the test function did run to finish. - static bool finished_; - - static int n1_; -}; - -bool Predicate1Test::expected_to_finish_; -bool Predicate1Test::finished_; -int Predicate1Test::n1_; - -typedef Predicate1Test EXPECT_PRED_FORMAT1Test; -typedef Predicate1Test ASSERT_PRED_FORMAT1Test; -typedef Predicate1Test EXPECT_PRED1Test; -typedef Predicate1Test ASSERT_PRED1Test; - -// Tests a successful EXPECT_PRED1 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED1Test, FunctionOnBuiltInTypeSuccess) { - EXPECT_PRED1(PredFunction1Int, - ++n1_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED1 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED1Test, FunctionOnUserTypeSuccess) { - EXPECT_PRED1(PredFunction1Bool, - Bool(++n1_)); - finished_ = true; -} - -// Tests a successful EXPECT_PRED1 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED1Test, FunctorOnBuiltInTypeSuccess) { - EXPECT_PRED1(PredFunctor1(), - ++n1_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED1 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED1Test, FunctorOnUserTypeSuccess) { - EXPECT_PRED1(PredFunctor1(), - Bool(++n1_)); - finished_ = true; -} - -// Tests a failed EXPECT_PRED1 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED1Test, FunctionOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED1(PredFunction1Int, - n1_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED1 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED1Test, FunctionOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED1(PredFunction1Bool, - Bool(n1_++)); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED1 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED1Test, FunctorOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED1(PredFunctor1(), - n1_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED1 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED1Test, FunctorOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED1(PredFunctor1(), - Bool(n1_++)); - finished_ = true; - }, ""); -} - -// Tests a successful ASSERT_PRED1 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED1Test, FunctionOnBuiltInTypeSuccess) { - ASSERT_PRED1(PredFunction1Int, - ++n1_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED1 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED1Test, FunctionOnUserTypeSuccess) { - ASSERT_PRED1(PredFunction1Bool, - Bool(++n1_)); - finished_ = true; -} - -// Tests a successful ASSERT_PRED1 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED1Test, FunctorOnBuiltInTypeSuccess) { - ASSERT_PRED1(PredFunctor1(), - ++n1_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED1 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED1Test, FunctorOnUserTypeSuccess) { - ASSERT_PRED1(PredFunctor1(), - Bool(++n1_)); - finished_ = true; -} - -// Tests a failed ASSERT_PRED1 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED1Test, FunctionOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED1(PredFunction1Int, - n1_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED1 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED1Test, FunctionOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED1(PredFunction1Bool, - Bool(n1_++)); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED1 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED1Test, FunctorOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED1(PredFunctor1(), - n1_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED1 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED1Test, FunctorOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED1(PredFunctor1(), - Bool(n1_++)); - finished_ = true; - }, ""); -} - -// Tests a successful EXPECT_PRED_FORMAT1 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT1Test, FunctionOnBuiltInTypeSuccess) { - EXPECT_PRED_FORMAT1(PredFormatFunction1, - ++n1_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT1 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT1Test, FunctionOnUserTypeSuccess) { - EXPECT_PRED_FORMAT1(PredFormatFunction1, - Bool(++n1_)); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT1 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT1Test, FunctorOnBuiltInTypeSuccess) { - EXPECT_PRED_FORMAT1(PredFormatFunctor1(), - ++n1_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT1 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT1Test, FunctorOnUserTypeSuccess) { - EXPECT_PRED_FORMAT1(PredFormatFunctor1(), - Bool(++n1_)); - finished_ = true; -} - -// Tests a failed EXPECT_PRED_FORMAT1 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT1Test, FunctionOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT1(PredFormatFunction1, - n1_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT1 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT1Test, FunctionOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT1(PredFormatFunction1, - Bool(n1_++)); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT1 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT1Test, FunctorOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT1(PredFormatFunctor1(), - n1_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT1 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT1Test, FunctorOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT1(PredFormatFunctor1(), - Bool(n1_++)); - finished_ = true; - }, ""); -} - -// Tests a successful ASSERT_PRED_FORMAT1 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT1Test, FunctionOnBuiltInTypeSuccess) { - ASSERT_PRED_FORMAT1(PredFormatFunction1, - ++n1_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT1 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT1Test, FunctionOnUserTypeSuccess) { - ASSERT_PRED_FORMAT1(PredFormatFunction1, - Bool(++n1_)); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT1 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT1Test, FunctorOnBuiltInTypeSuccess) { - ASSERT_PRED_FORMAT1(PredFormatFunctor1(), - ++n1_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT1 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT1Test, FunctorOnUserTypeSuccess) { - ASSERT_PRED_FORMAT1(PredFormatFunctor1(), - Bool(++n1_)); - finished_ = true; -} - -// Tests a failed ASSERT_PRED_FORMAT1 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT1Test, FunctionOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT1(PredFormatFunction1, - n1_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT1 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT1Test, FunctionOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT1(PredFormatFunction1, - Bool(n1_++)); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT1 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT1Test, FunctorOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT1(PredFormatFunctor1(), - n1_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT1 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT1Test, FunctorOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT1(PredFormatFunctor1(), - Bool(n1_++)); - finished_ = true; - }, ""); -} -// Sample functions/functors for testing binary predicate assertions. - -// A binary predicate function. -template -bool PredFunction2(T1 v1, T2 v2) { - return v1 + v2 > 0; -} - -// The following two functions are needed to circumvent a bug in -// gcc 2.95.3, which sometimes has problem with the above template -// function. -bool PredFunction2Int(int v1, int v2) { - return v1 + v2 > 0; -} -bool PredFunction2Bool(Bool v1, Bool v2) { - return v1 + v2 > 0; -} - -// A binary predicate functor. -struct PredFunctor2 { - template - bool operator()(const T1& v1, - const T2& v2) { - return v1 + v2 > 0; - } -}; - -// A binary predicate-formatter function. -template -testing::AssertionResult PredFormatFunction2(const char* e1, - const char* e2, - const T1& v1, - const T2& v2) { - if (PredFunction2(v1, v2)) - return testing::AssertionSuccess(); - - return testing::AssertionFailure() - << e1 << " + " << e2 - << " is expected to be positive, but evaluates to " - << v1 + v2 << "."; -} - -// A binary predicate-formatter functor. -struct PredFormatFunctor2 { - template - testing::AssertionResult operator()(const char* e1, - const char* e2, - const T1& v1, - const T2& v2) const { - return PredFormatFunction2(e1, e2, v1, v2); - } -}; - -// Tests for {EXPECT|ASSERT}_PRED_FORMAT2. - -class Predicate2Test : public testing::Test { - protected: - virtual void SetUp() { - expected_to_finish_ = true; - finished_ = false; - n1_ = n2_ = 0; - } - - virtual void TearDown() { - // Verifies that each of the predicate's arguments was evaluated - // exactly once. - EXPECT_EQ(1, n1_) << - "The predicate assertion didn't evaluate argument 2 " - "exactly once."; - EXPECT_EQ(1, n2_) << - "The predicate assertion didn't evaluate argument 3 " - "exactly once."; - - // Verifies that the control flow in the test function is expected. - if (expected_to_finish_ && !finished_) { - FAIL() << "The predicate assertion unexpactedly aborted the test."; - } else if (!expected_to_finish_ && finished_) { - FAIL() << "The failed predicate assertion didn't abort the test " - "as expected."; - } - } - - // true iff the test function is expected to run to finish. - static bool expected_to_finish_; - - // true iff the test function did run to finish. - static bool finished_; - - static int n1_; - static int n2_; -}; - -bool Predicate2Test::expected_to_finish_; -bool Predicate2Test::finished_; -int Predicate2Test::n1_; -int Predicate2Test::n2_; - -typedef Predicate2Test EXPECT_PRED_FORMAT2Test; -typedef Predicate2Test ASSERT_PRED_FORMAT2Test; -typedef Predicate2Test EXPECT_PRED2Test; -typedef Predicate2Test ASSERT_PRED2Test; - -// Tests a successful EXPECT_PRED2 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED2Test, FunctionOnBuiltInTypeSuccess) { - EXPECT_PRED2(PredFunction2Int, - ++n1_, - ++n2_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED2 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED2Test, FunctionOnUserTypeSuccess) { - EXPECT_PRED2(PredFunction2Bool, - Bool(++n1_), - Bool(++n2_)); - finished_ = true; -} - -// Tests a successful EXPECT_PRED2 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED2Test, FunctorOnBuiltInTypeSuccess) { - EXPECT_PRED2(PredFunctor2(), - ++n1_, - ++n2_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED2 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED2Test, FunctorOnUserTypeSuccess) { - EXPECT_PRED2(PredFunctor2(), - Bool(++n1_), - Bool(++n2_)); - finished_ = true; -} - -// Tests a failed EXPECT_PRED2 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED2Test, FunctionOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED2(PredFunction2Int, - n1_++, - n2_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED2 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED2Test, FunctionOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED2(PredFunction2Bool, - Bool(n1_++), - Bool(n2_++)); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED2 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED2Test, FunctorOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED2(PredFunctor2(), - n1_++, - n2_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED2 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED2Test, FunctorOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED2(PredFunctor2(), - Bool(n1_++), - Bool(n2_++)); - finished_ = true; - }, ""); -} - -// Tests a successful ASSERT_PRED2 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED2Test, FunctionOnBuiltInTypeSuccess) { - ASSERT_PRED2(PredFunction2Int, - ++n1_, - ++n2_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED2 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED2Test, FunctionOnUserTypeSuccess) { - ASSERT_PRED2(PredFunction2Bool, - Bool(++n1_), - Bool(++n2_)); - finished_ = true; -} - -// Tests a successful ASSERT_PRED2 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED2Test, FunctorOnBuiltInTypeSuccess) { - ASSERT_PRED2(PredFunctor2(), - ++n1_, - ++n2_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED2 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED2Test, FunctorOnUserTypeSuccess) { - ASSERT_PRED2(PredFunctor2(), - Bool(++n1_), - Bool(++n2_)); - finished_ = true; -} - -// Tests a failed ASSERT_PRED2 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED2Test, FunctionOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED2(PredFunction2Int, - n1_++, - n2_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED2 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED2Test, FunctionOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED2(PredFunction2Bool, - Bool(n1_++), - Bool(n2_++)); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED2 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED2Test, FunctorOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED2(PredFunctor2(), - n1_++, - n2_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED2 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED2Test, FunctorOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED2(PredFunctor2(), - Bool(n1_++), - Bool(n2_++)); - finished_ = true; - }, ""); -} - -// Tests a successful EXPECT_PRED_FORMAT2 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT2Test, FunctionOnBuiltInTypeSuccess) { - EXPECT_PRED_FORMAT2(PredFormatFunction2, - ++n1_, - ++n2_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT2 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT2Test, FunctionOnUserTypeSuccess) { - EXPECT_PRED_FORMAT2(PredFormatFunction2, - Bool(++n1_), - Bool(++n2_)); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT2 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT2Test, FunctorOnBuiltInTypeSuccess) { - EXPECT_PRED_FORMAT2(PredFormatFunctor2(), - ++n1_, - ++n2_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT2 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT2Test, FunctorOnUserTypeSuccess) { - EXPECT_PRED_FORMAT2(PredFormatFunctor2(), - Bool(++n1_), - Bool(++n2_)); - finished_ = true; -} - -// Tests a failed EXPECT_PRED_FORMAT2 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT2Test, FunctionOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT2(PredFormatFunction2, - n1_++, - n2_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT2 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT2Test, FunctionOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT2(PredFormatFunction2, - Bool(n1_++), - Bool(n2_++)); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT2 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT2Test, FunctorOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT2(PredFormatFunctor2(), - n1_++, - n2_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT2 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT2Test, FunctorOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT2(PredFormatFunctor2(), - Bool(n1_++), - Bool(n2_++)); - finished_ = true; - }, ""); -} - -// Tests a successful ASSERT_PRED_FORMAT2 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT2Test, FunctionOnBuiltInTypeSuccess) { - ASSERT_PRED_FORMAT2(PredFormatFunction2, - ++n1_, - ++n2_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT2 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT2Test, FunctionOnUserTypeSuccess) { - ASSERT_PRED_FORMAT2(PredFormatFunction2, - Bool(++n1_), - Bool(++n2_)); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT2 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT2Test, FunctorOnBuiltInTypeSuccess) { - ASSERT_PRED_FORMAT2(PredFormatFunctor2(), - ++n1_, - ++n2_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT2 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT2Test, FunctorOnUserTypeSuccess) { - ASSERT_PRED_FORMAT2(PredFormatFunctor2(), - Bool(++n1_), - Bool(++n2_)); - finished_ = true; -} - -// Tests a failed ASSERT_PRED_FORMAT2 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT2Test, FunctionOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT2(PredFormatFunction2, - n1_++, - n2_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT2 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT2Test, FunctionOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT2(PredFormatFunction2, - Bool(n1_++), - Bool(n2_++)); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT2 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT2Test, FunctorOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT2(PredFormatFunctor2(), - n1_++, - n2_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT2 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT2Test, FunctorOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT2(PredFormatFunctor2(), - Bool(n1_++), - Bool(n2_++)); - finished_ = true; - }, ""); -} -// Sample functions/functors for testing ternary predicate assertions. - -// A ternary predicate function. -template -bool PredFunction3(T1 v1, T2 v2, T3 v3) { - return v1 + v2 + v3 > 0; -} - -// The following two functions are needed to circumvent a bug in -// gcc 2.95.3, which sometimes has problem with the above template -// function. -bool PredFunction3Int(int v1, int v2, int v3) { - return v1 + v2 + v3 > 0; -} -bool PredFunction3Bool(Bool v1, Bool v2, Bool v3) { - return v1 + v2 + v3 > 0; -} - -// A ternary predicate functor. -struct PredFunctor3 { - template - bool operator()(const T1& v1, - const T2& v2, - const T3& v3) { - return v1 + v2 + v3 > 0; - } -}; - -// A ternary predicate-formatter function. -template -testing::AssertionResult PredFormatFunction3(const char* e1, - const char* e2, - const char* e3, - const T1& v1, - const T2& v2, - const T3& v3) { - if (PredFunction3(v1, v2, v3)) - return testing::AssertionSuccess(); - - return testing::AssertionFailure() - << e1 << " + " << e2 << " + " << e3 - << " is expected to be positive, but evaluates to " - << v1 + v2 + v3 << "."; -} - -// A ternary predicate-formatter functor. -struct PredFormatFunctor3 { - template - testing::AssertionResult operator()(const char* e1, - const char* e2, - const char* e3, - const T1& v1, - const T2& v2, - const T3& v3) const { - return PredFormatFunction3(e1, e2, e3, v1, v2, v3); - } -}; - -// Tests for {EXPECT|ASSERT}_PRED_FORMAT3. - -class Predicate3Test : public testing::Test { - protected: - virtual void SetUp() { - expected_to_finish_ = true; - finished_ = false; - n1_ = n2_ = n3_ = 0; - } - - virtual void TearDown() { - // Verifies that each of the predicate's arguments was evaluated - // exactly once. - EXPECT_EQ(1, n1_) << - "The predicate assertion didn't evaluate argument 2 " - "exactly once."; - EXPECT_EQ(1, n2_) << - "The predicate assertion didn't evaluate argument 3 " - "exactly once."; - EXPECT_EQ(1, n3_) << - "The predicate assertion didn't evaluate argument 4 " - "exactly once."; - - // Verifies that the control flow in the test function is expected. - if (expected_to_finish_ && !finished_) { - FAIL() << "The predicate assertion unexpactedly aborted the test."; - } else if (!expected_to_finish_ && finished_) { - FAIL() << "The failed predicate assertion didn't abort the test " - "as expected."; - } - } - - // true iff the test function is expected to run to finish. - static bool expected_to_finish_; - - // true iff the test function did run to finish. - static bool finished_; - - static int n1_; - static int n2_; - static int n3_; -}; - -bool Predicate3Test::expected_to_finish_; -bool Predicate3Test::finished_; -int Predicate3Test::n1_; -int Predicate3Test::n2_; -int Predicate3Test::n3_; - -typedef Predicate3Test EXPECT_PRED_FORMAT3Test; -typedef Predicate3Test ASSERT_PRED_FORMAT3Test; -typedef Predicate3Test EXPECT_PRED3Test; -typedef Predicate3Test ASSERT_PRED3Test; - -// Tests a successful EXPECT_PRED3 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED3Test, FunctionOnBuiltInTypeSuccess) { - EXPECT_PRED3(PredFunction3Int, - ++n1_, - ++n2_, - ++n3_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED3 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED3Test, FunctionOnUserTypeSuccess) { - EXPECT_PRED3(PredFunction3Bool, - Bool(++n1_), - Bool(++n2_), - Bool(++n3_)); - finished_ = true; -} - -// Tests a successful EXPECT_PRED3 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED3Test, FunctorOnBuiltInTypeSuccess) { - EXPECT_PRED3(PredFunctor3(), - ++n1_, - ++n2_, - ++n3_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED3 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED3Test, FunctorOnUserTypeSuccess) { - EXPECT_PRED3(PredFunctor3(), - Bool(++n1_), - Bool(++n2_), - Bool(++n3_)); - finished_ = true; -} - -// Tests a failed EXPECT_PRED3 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED3Test, FunctionOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED3(PredFunction3Int, - n1_++, - n2_++, - n3_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED3 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED3Test, FunctionOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED3(PredFunction3Bool, - Bool(n1_++), - Bool(n2_++), - Bool(n3_++)); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED3 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED3Test, FunctorOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED3(PredFunctor3(), - n1_++, - n2_++, - n3_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED3 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED3Test, FunctorOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED3(PredFunctor3(), - Bool(n1_++), - Bool(n2_++), - Bool(n3_++)); - finished_ = true; - }, ""); -} - -// Tests a successful ASSERT_PRED3 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED3Test, FunctionOnBuiltInTypeSuccess) { - ASSERT_PRED3(PredFunction3Int, - ++n1_, - ++n2_, - ++n3_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED3 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED3Test, FunctionOnUserTypeSuccess) { - ASSERT_PRED3(PredFunction3Bool, - Bool(++n1_), - Bool(++n2_), - Bool(++n3_)); - finished_ = true; -} - -// Tests a successful ASSERT_PRED3 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED3Test, FunctorOnBuiltInTypeSuccess) { - ASSERT_PRED3(PredFunctor3(), - ++n1_, - ++n2_, - ++n3_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED3 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED3Test, FunctorOnUserTypeSuccess) { - ASSERT_PRED3(PredFunctor3(), - Bool(++n1_), - Bool(++n2_), - Bool(++n3_)); - finished_ = true; -} - -// Tests a failed ASSERT_PRED3 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED3Test, FunctionOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED3(PredFunction3Int, - n1_++, - n2_++, - n3_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED3 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED3Test, FunctionOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED3(PredFunction3Bool, - Bool(n1_++), - Bool(n2_++), - Bool(n3_++)); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED3 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED3Test, FunctorOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED3(PredFunctor3(), - n1_++, - n2_++, - n3_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED3 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED3Test, FunctorOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED3(PredFunctor3(), - Bool(n1_++), - Bool(n2_++), - Bool(n3_++)); - finished_ = true; - }, ""); -} - -// Tests a successful EXPECT_PRED_FORMAT3 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT3Test, FunctionOnBuiltInTypeSuccess) { - EXPECT_PRED_FORMAT3(PredFormatFunction3, - ++n1_, - ++n2_, - ++n3_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT3 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT3Test, FunctionOnUserTypeSuccess) { - EXPECT_PRED_FORMAT3(PredFormatFunction3, - Bool(++n1_), - Bool(++n2_), - Bool(++n3_)); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT3 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT3Test, FunctorOnBuiltInTypeSuccess) { - EXPECT_PRED_FORMAT3(PredFormatFunctor3(), - ++n1_, - ++n2_, - ++n3_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT3 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT3Test, FunctorOnUserTypeSuccess) { - EXPECT_PRED_FORMAT3(PredFormatFunctor3(), - Bool(++n1_), - Bool(++n2_), - Bool(++n3_)); - finished_ = true; -} - -// Tests a failed EXPECT_PRED_FORMAT3 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT3Test, FunctionOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT3(PredFormatFunction3, - n1_++, - n2_++, - n3_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT3 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT3Test, FunctionOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT3(PredFormatFunction3, - Bool(n1_++), - Bool(n2_++), - Bool(n3_++)); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT3 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT3Test, FunctorOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT3(PredFormatFunctor3(), - n1_++, - n2_++, - n3_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT3 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT3Test, FunctorOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT3(PredFormatFunctor3(), - Bool(n1_++), - Bool(n2_++), - Bool(n3_++)); - finished_ = true; - }, ""); -} - -// Tests a successful ASSERT_PRED_FORMAT3 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT3Test, FunctionOnBuiltInTypeSuccess) { - ASSERT_PRED_FORMAT3(PredFormatFunction3, - ++n1_, - ++n2_, - ++n3_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT3 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT3Test, FunctionOnUserTypeSuccess) { - ASSERT_PRED_FORMAT3(PredFormatFunction3, - Bool(++n1_), - Bool(++n2_), - Bool(++n3_)); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT3 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT3Test, FunctorOnBuiltInTypeSuccess) { - ASSERT_PRED_FORMAT3(PredFormatFunctor3(), - ++n1_, - ++n2_, - ++n3_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT3 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT3Test, FunctorOnUserTypeSuccess) { - ASSERT_PRED_FORMAT3(PredFormatFunctor3(), - Bool(++n1_), - Bool(++n2_), - Bool(++n3_)); - finished_ = true; -} - -// Tests a failed ASSERT_PRED_FORMAT3 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT3Test, FunctionOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT3(PredFormatFunction3, - n1_++, - n2_++, - n3_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT3 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT3Test, FunctionOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT3(PredFormatFunction3, - Bool(n1_++), - Bool(n2_++), - Bool(n3_++)); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT3 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT3Test, FunctorOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT3(PredFormatFunctor3(), - n1_++, - n2_++, - n3_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT3 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT3Test, FunctorOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT3(PredFormatFunctor3(), - Bool(n1_++), - Bool(n2_++), - Bool(n3_++)); - finished_ = true; - }, ""); -} -// Sample functions/functors for testing 4-ary predicate assertions. - -// A 4-ary predicate function. -template -bool PredFunction4(T1 v1, T2 v2, T3 v3, T4 v4) { - return v1 + v2 + v3 + v4 > 0; -} - -// The following two functions are needed to circumvent a bug in -// gcc 2.95.3, which sometimes has problem with the above template -// function. -bool PredFunction4Int(int v1, int v2, int v3, int v4) { - return v1 + v2 + v3 + v4 > 0; -} -bool PredFunction4Bool(Bool v1, Bool v2, Bool v3, Bool v4) { - return v1 + v2 + v3 + v4 > 0; -} - -// A 4-ary predicate functor. -struct PredFunctor4 { - template - bool operator()(const T1& v1, - const T2& v2, - const T3& v3, - const T4& v4) { - return v1 + v2 + v3 + v4 > 0; - } -}; - -// A 4-ary predicate-formatter function. -template -testing::AssertionResult PredFormatFunction4(const char* e1, - const char* e2, - const char* e3, - const char* e4, - const T1& v1, - const T2& v2, - const T3& v3, - const T4& v4) { - if (PredFunction4(v1, v2, v3, v4)) - return testing::AssertionSuccess(); - - return testing::AssertionFailure() - << e1 << " + " << e2 << " + " << e3 << " + " << e4 - << " is expected to be positive, but evaluates to " - << v1 + v2 + v3 + v4 << "."; -} - -// A 4-ary predicate-formatter functor. -struct PredFormatFunctor4 { - template - testing::AssertionResult operator()(const char* e1, - const char* e2, - const char* e3, - const char* e4, - const T1& v1, - const T2& v2, - const T3& v3, - const T4& v4) const { - return PredFormatFunction4(e1, e2, e3, e4, v1, v2, v3, v4); - } -}; - -// Tests for {EXPECT|ASSERT}_PRED_FORMAT4. - -class Predicate4Test : public testing::Test { - protected: - virtual void SetUp() { - expected_to_finish_ = true; - finished_ = false; - n1_ = n2_ = n3_ = n4_ = 0; - } - - virtual void TearDown() { - // Verifies that each of the predicate's arguments was evaluated - // exactly once. - EXPECT_EQ(1, n1_) << - "The predicate assertion didn't evaluate argument 2 " - "exactly once."; - EXPECT_EQ(1, n2_) << - "The predicate assertion didn't evaluate argument 3 " - "exactly once."; - EXPECT_EQ(1, n3_) << - "The predicate assertion didn't evaluate argument 4 " - "exactly once."; - EXPECT_EQ(1, n4_) << - "The predicate assertion didn't evaluate argument 5 " - "exactly once."; - - // Verifies that the control flow in the test function is expected. - if (expected_to_finish_ && !finished_) { - FAIL() << "The predicate assertion unexpactedly aborted the test."; - } else if (!expected_to_finish_ && finished_) { - FAIL() << "The failed predicate assertion didn't abort the test " - "as expected."; - } - } - - // true iff the test function is expected to run to finish. - static bool expected_to_finish_; - - // true iff the test function did run to finish. - static bool finished_; - - static int n1_; - static int n2_; - static int n3_; - static int n4_; -}; - -bool Predicate4Test::expected_to_finish_; -bool Predicate4Test::finished_; -int Predicate4Test::n1_; -int Predicate4Test::n2_; -int Predicate4Test::n3_; -int Predicate4Test::n4_; - -typedef Predicate4Test EXPECT_PRED_FORMAT4Test; -typedef Predicate4Test ASSERT_PRED_FORMAT4Test; -typedef Predicate4Test EXPECT_PRED4Test; -typedef Predicate4Test ASSERT_PRED4Test; - -// Tests a successful EXPECT_PRED4 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED4Test, FunctionOnBuiltInTypeSuccess) { - EXPECT_PRED4(PredFunction4Int, - ++n1_, - ++n2_, - ++n3_, - ++n4_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED4 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED4Test, FunctionOnUserTypeSuccess) { - EXPECT_PRED4(PredFunction4Bool, - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_)); - finished_ = true; -} - -// Tests a successful EXPECT_PRED4 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED4Test, FunctorOnBuiltInTypeSuccess) { - EXPECT_PRED4(PredFunctor4(), - ++n1_, - ++n2_, - ++n3_, - ++n4_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED4 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED4Test, FunctorOnUserTypeSuccess) { - EXPECT_PRED4(PredFunctor4(), - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_)); - finished_ = true; -} - -// Tests a failed EXPECT_PRED4 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED4Test, FunctionOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED4(PredFunction4Int, - n1_++, - n2_++, - n3_++, - n4_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED4 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED4Test, FunctionOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED4(PredFunction4Bool, - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++)); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED4 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED4Test, FunctorOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED4(PredFunctor4(), - n1_++, - n2_++, - n3_++, - n4_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED4 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED4Test, FunctorOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED4(PredFunctor4(), - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++)); - finished_ = true; - }, ""); -} - -// Tests a successful ASSERT_PRED4 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED4Test, FunctionOnBuiltInTypeSuccess) { - ASSERT_PRED4(PredFunction4Int, - ++n1_, - ++n2_, - ++n3_, - ++n4_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED4 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED4Test, FunctionOnUserTypeSuccess) { - ASSERT_PRED4(PredFunction4Bool, - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_)); - finished_ = true; -} - -// Tests a successful ASSERT_PRED4 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED4Test, FunctorOnBuiltInTypeSuccess) { - ASSERT_PRED4(PredFunctor4(), - ++n1_, - ++n2_, - ++n3_, - ++n4_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED4 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED4Test, FunctorOnUserTypeSuccess) { - ASSERT_PRED4(PredFunctor4(), - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_)); - finished_ = true; -} - -// Tests a failed ASSERT_PRED4 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED4Test, FunctionOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED4(PredFunction4Int, - n1_++, - n2_++, - n3_++, - n4_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED4 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED4Test, FunctionOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED4(PredFunction4Bool, - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++)); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED4 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED4Test, FunctorOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED4(PredFunctor4(), - n1_++, - n2_++, - n3_++, - n4_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED4 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED4Test, FunctorOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED4(PredFunctor4(), - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++)); - finished_ = true; - }, ""); -} - -// Tests a successful EXPECT_PRED_FORMAT4 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT4Test, FunctionOnBuiltInTypeSuccess) { - EXPECT_PRED_FORMAT4(PredFormatFunction4, - ++n1_, - ++n2_, - ++n3_, - ++n4_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT4 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT4Test, FunctionOnUserTypeSuccess) { - EXPECT_PRED_FORMAT4(PredFormatFunction4, - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_)); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT4 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT4Test, FunctorOnBuiltInTypeSuccess) { - EXPECT_PRED_FORMAT4(PredFormatFunctor4(), - ++n1_, - ++n2_, - ++n3_, - ++n4_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT4 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT4Test, FunctorOnUserTypeSuccess) { - EXPECT_PRED_FORMAT4(PredFormatFunctor4(), - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_)); - finished_ = true; -} - -// Tests a failed EXPECT_PRED_FORMAT4 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT4Test, FunctionOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT4(PredFormatFunction4, - n1_++, - n2_++, - n3_++, - n4_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT4 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT4Test, FunctionOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT4(PredFormatFunction4, - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++)); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT4 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT4Test, FunctorOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT4(PredFormatFunctor4(), - n1_++, - n2_++, - n3_++, - n4_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT4 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT4Test, FunctorOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT4(PredFormatFunctor4(), - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++)); - finished_ = true; - }, ""); -} - -// Tests a successful ASSERT_PRED_FORMAT4 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT4Test, FunctionOnBuiltInTypeSuccess) { - ASSERT_PRED_FORMAT4(PredFormatFunction4, - ++n1_, - ++n2_, - ++n3_, - ++n4_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT4 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT4Test, FunctionOnUserTypeSuccess) { - ASSERT_PRED_FORMAT4(PredFormatFunction4, - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_)); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT4 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT4Test, FunctorOnBuiltInTypeSuccess) { - ASSERT_PRED_FORMAT4(PredFormatFunctor4(), - ++n1_, - ++n2_, - ++n3_, - ++n4_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT4 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT4Test, FunctorOnUserTypeSuccess) { - ASSERT_PRED_FORMAT4(PredFormatFunctor4(), - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_)); - finished_ = true; -} - -// Tests a failed ASSERT_PRED_FORMAT4 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT4Test, FunctionOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT4(PredFormatFunction4, - n1_++, - n2_++, - n3_++, - n4_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT4 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT4Test, FunctionOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT4(PredFormatFunction4, - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++)); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT4 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT4Test, FunctorOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT4(PredFormatFunctor4(), - n1_++, - n2_++, - n3_++, - n4_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT4 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT4Test, FunctorOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT4(PredFormatFunctor4(), - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++)); - finished_ = true; - }, ""); -} -// Sample functions/functors for testing 5-ary predicate assertions. - -// A 5-ary predicate function. -template -bool PredFunction5(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5) { - return v1 + v2 + v3 + v4 + v5 > 0; -} - -// The following two functions are needed to circumvent a bug in -// gcc 2.95.3, which sometimes has problem with the above template -// function. -bool PredFunction5Int(int v1, int v2, int v3, int v4, int v5) { - return v1 + v2 + v3 + v4 + v5 > 0; -} -bool PredFunction5Bool(Bool v1, Bool v2, Bool v3, Bool v4, Bool v5) { - return v1 + v2 + v3 + v4 + v5 > 0; -} - -// A 5-ary predicate functor. -struct PredFunctor5 { - template - bool operator()(const T1& v1, - const T2& v2, - const T3& v3, - const T4& v4, - const T5& v5) { - return v1 + v2 + v3 + v4 + v5 > 0; - } -}; - -// A 5-ary predicate-formatter function. -template -testing::AssertionResult PredFormatFunction5(const char* e1, - const char* e2, - const char* e3, - const char* e4, - const char* e5, - const T1& v1, - const T2& v2, - const T3& v3, - const T4& v4, - const T5& v5) { - if (PredFunction5(v1, v2, v3, v4, v5)) - return testing::AssertionSuccess(); - - return testing::AssertionFailure() - << e1 << " + " << e2 << " + " << e3 << " + " << e4 << " + " << e5 - << " is expected to be positive, but evaluates to " - << v1 + v2 + v3 + v4 + v5 << "."; -} - -// A 5-ary predicate-formatter functor. -struct PredFormatFunctor5 { - template - testing::AssertionResult operator()(const char* e1, - const char* e2, - const char* e3, - const char* e4, - const char* e5, - const T1& v1, - const T2& v2, - const T3& v3, - const T4& v4, - const T5& v5) const { - return PredFormatFunction5(e1, e2, e3, e4, e5, v1, v2, v3, v4, v5); - } -}; - -// Tests for {EXPECT|ASSERT}_PRED_FORMAT5. - -class Predicate5Test : public testing::Test { - protected: - virtual void SetUp() { - expected_to_finish_ = true; - finished_ = false; - n1_ = n2_ = n3_ = n4_ = n5_ = 0; - } - - virtual void TearDown() { - // Verifies that each of the predicate's arguments was evaluated - // exactly once. - EXPECT_EQ(1, n1_) << - "The predicate assertion didn't evaluate argument 2 " - "exactly once."; - EXPECT_EQ(1, n2_) << - "The predicate assertion didn't evaluate argument 3 " - "exactly once."; - EXPECT_EQ(1, n3_) << - "The predicate assertion didn't evaluate argument 4 " - "exactly once."; - EXPECT_EQ(1, n4_) << - "The predicate assertion didn't evaluate argument 5 " - "exactly once."; - EXPECT_EQ(1, n5_) << - "The predicate assertion didn't evaluate argument 6 " - "exactly once."; - - // Verifies that the control flow in the test function is expected. - if (expected_to_finish_ && !finished_) { - FAIL() << "The predicate assertion unexpactedly aborted the test."; - } else if (!expected_to_finish_ && finished_) { - FAIL() << "The failed predicate assertion didn't abort the test " - "as expected."; - } - } - - // true iff the test function is expected to run to finish. - static bool expected_to_finish_; - - // true iff the test function did run to finish. - static bool finished_; - - static int n1_; - static int n2_; - static int n3_; - static int n4_; - static int n5_; -}; - -bool Predicate5Test::expected_to_finish_; -bool Predicate5Test::finished_; -int Predicate5Test::n1_; -int Predicate5Test::n2_; -int Predicate5Test::n3_; -int Predicate5Test::n4_; -int Predicate5Test::n5_; - -typedef Predicate5Test EXPECT_PRED_FORMAT5Test; -typedef Predicate5Test ASSERT_PRED_FORMAT5Test; -typedef Predicate5Test EXPECT_PRED5Test; -typedef Predicate5Test ASSERT_PRED5Test; - -// Tests a successful EXPECT_PRED5 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED5Test, FunctionOnBuiltInTypeSuccess) { - EXPECT_PRED5(PredFunction5Int, - ++n1_, - ++n2_, - ++n3_, - ++n4_, - ++n5_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED5 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED5Test, FunctionOnUserTypeSuccess) { - EXPECT_PRED5(PredFunction5Bool, - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_), - Bool(++n5_)); - finished_ = true; -} - -// Tests a successful EXPECT_PRED5 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED5Test, FunctorOnBuiltInTypeSuccess) { - EXPECT_PRED5(PredFunctor5(), - ++n1_, - ++n2_, - ++n3_, - ++n4_, - ++n5_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED5 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED5Test, FunctorOnUserTypeSuccess) { - EXPECT_PRED5(PredFunctor5(), - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_), - Bool(++n5_)); - finished_ = true; -} - -// Tests a failed EXPECT_PRED5 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED5Test, FunctionOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED5(PredFunction5Int, - n1_++, - n2_++, - n3_++, - n4_++, - n5_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED5 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED5Test, FunctionOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED5(PredFunction5Bool, - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++), - Bool(n5_++)); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED5 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED5Test, FunctorOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED5(PredFunctor5(), - n1_++, - n2_++, - n3_++, - n4_++, - n5_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED5 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED5Test, FunctorOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED5(PredFunctor5(), - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++), - Bool(n5_++)); - finished_ = true; - }, ""); -} - -// Tests a successful ASSERT_PRED5 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED5Test, FunctionOnBuiltInTypeSuccess) { - ASSERT_PRED5(PredFunction5Int, - ++n1_, - ++n2_, - ++n3_, - ++n4_, - ++n5_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED5 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED5Test, FunctionOnUserTypeSuccess) { - ASSERT_PRED5(PredFunction5Bool, - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_), - Bool(++n5_)); - finished_ = true; -} - -// Tests a successful ASSERT_PRED5 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED5Test, FunctorOnBuiltInTypeSuccess) { - ASSERT_PRED5(PredFunctor5(), - ++n1_, - ++n2_, - ++n3_, - ++n4_, - ++n5_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED5 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED5Test, FunctorOnUserTypeSuccess) { - ASSERT_PRED5(PredFunctor5(), - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_), - Bool(++n5_)); - finished_ = true; -} - -// Tests a failed ASSERT_PRED5 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED5Test, FunctionOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED5(PredFunction5Int, - n1_++, - n2_++, - n3_++, - n4_++, - n5_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED5 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED5Test, FunctionOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED5(PredFunction5Bool, - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++), - Bool(n5_++)); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED5 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED5Test, FunctorOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED5(PredFunctor5(), - n1_++, - n2_++, - n3_++, - n4_++, - n5_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED5 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED5Test, FunctorOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED5(PredFunctor5(), - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++), - Bool(n5_++)); - finished_ = true; - }, ""); -} - -// Tests a successful EXPECT_PRED_FORMAT5 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT5Test, FunctionOnBuiltInTypeSuccess) { - EXPECT_PRED_FORMAT5(PredFormatFunction5, - ++n1_, - ++n2_, - ++n3_, - ++n4_, - ++n5_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT5 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT5Test, FunctionOnUserTypeSuccess) { - EXPECT_PRED_FORMAT5(PredFormatFunction5, - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_), - Bool(++n5_)); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT5 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT5Test, FunctorOnBuiltInTypeSuccess) { - EXPECT_PRED_FORMAT5(PredFormatFunctor5(), - ++n1_, - ++n2_, - ++n3_, - ++n4_, - ++n5_); - finished_ = true; -} - -// Tests a successful EXPECT_PRED_FORMAT5 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT5Test, FunctorOnUserTypeSuccess) { - EXPECT_PRED_FORMAT5(PredFormatFunctor5(), - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_), - Bool(++n5_)); - finished_ = true; -} - -// Tests a failed EXPECT_PRED_FORMAT5 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT5Test, FunctionOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT5(PredFormatFunction5, - n1_++, - n2_++, - n3_++, - n4_++, - n5_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT5 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT5Test, FunctionOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT5(PredFormatFunction5, - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++), - Bool(n5_++)); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT5 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(EXPECT_PRED_FORMAT5Test, FunctorOnBuiltInTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT5(PredFormatFunctor5(), - n1_++, - n2_++, - n3_++, - n4_++, - n5_++); - finished_ = true; - }, ""); -} - -// Tests a failed EXPECT_PRED_FORMAT5 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(EXPECT_PRED_FORMAT5Test, FunctorOnUserTypeFailure) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT5(PredFormatFunctor5(), - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++), - Bool(n5_++)); - finished_ = true; - }, ""); -} - -// Tests a successful ASSERT_PRED_FORMAT5 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT5Test, FunctionOnBuiltInTypeSuccess) { - ASSERT_PRED_FORMAT5(PredFormatFunction5, - ++n1_, - ++n2_, - ++n3_, - ++n4_, - ++n5_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT5 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT5Test, FunctionOnUserTypeSuccess) { - ASSERT_PRED_FORMAT5(PredFormatFunction5, - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_), - Bool(++n5_)); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT5 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT5Test, FunctorOnBuiltInTypeSuccess) { - ASSERT_PRED_FORMAT5(PredFormatFunctor5(), - ++n1_, - ++n2_, - ++n3_, - ++n4_, - ++n5_); - finished_ = true; -} - -// Tests a successful ASSERT_PRED_FORMAT5 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT5Test, FunctorOnUserTypeSuccess) { - ASSERT_PRED_FORMAT5(PredFormatFunctor5(), - Bool(++n1_), - Bool(++n2_), - Bool(++n3_), - Bool(++n4_), - Bool(++n5_)); - finished_ = true; -} - -// Tests a failed ASSERT_PRED_FORMAT5 where the -// predicate-formatter is a function on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT5Test, FunctionOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT5(PredFormatFunction5, - n1_++, - n2_++, - n3_++, - n4_++, - n5_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT5 where the -// predicate-formatter is a function on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT5Test, FunctionOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT5(PredFormatFunction5, - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++), - Bool(n5_++)); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT5 where the -// predicate-formatter is a functor on a built-in type (int). -TEST_F(ASSERT_PRED_FORMAT5Test, FunctorOnBuiltInTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT5(PredFormatFunctor5(), - n1_++, - n2_++, - n3_++, - n4_++, - n5_++); - finished_ = true; - }, ""); -} - -// Tests a failed ASSERT_PRED_FORMAT5 where the -// predicate-formatter is a functor on a user-defined type (Bool). -TEST_F(ASSERT_PRED_FORMAT5Test, FunctorOnUserTypeFailure) { - expected_to_finish_ = false; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT5(PredFormatFunctor5(), - Bool(n1_++), - Bool(n2_++), - Bool(n3_++), - Bool(n4_++), - Bool(n5_++)); - finished_ = true; - }, ""); -} diff --git a/test/gtest-1.8.0/test/gtest_premature_exit_test.cc b/test/gtest-1.8.0/test/gtest_premature_exit_test.cc deleted file mode 100644 index 3b4dc7d43f..0000000000 --- a/test/gtest-1.8.0/test/gtest_premature_exit_test.cc +++ /dev/null @@ -1,127 +0,0 @@ -// Copyright 2013, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// Tests that Google Test manipulates the premature-exit-detection -// file correctly. - -#include - -#include "gtest/gtest.h" - -using ::testing::InitGoogleTest; -using ::testing::Test; -using ::testing::internal::posix::GetEnv; -using ::testing::internal::posix::Stat; -using ::testing::internal::posix::StatStruct; - -namespace { - -class PrematureExitTest : public Test { - public: - // Returns true iff the given file exists. - static bool FileExists(const char* filepath) { - StatStruct stat; - return Stat(filepath, &stat) == 0; - } - - protected: - PrematureExitTest() { - premature_exit_file_path_ = GetEnv("TEST_PREMATURE_EXIT_FILE"); - - // Normalize NULL to "" for ease of handling. - if (premature_exit_file_path_ == NULL) { - premature_exit_file_path_ = ""; - } - } - - // Returns true iff the premature-exit file exists. - bool PrematureExitFileExists() const { - return FileExists(premature_exit_file_path_); - } - - const char* premature_exit_file_path_; -}; - -typedef PrematureExitTest PrematureExitDeathTest; - -// Tests that: -// - the premature-exit file exists during the execution of a -// death test (EXPECT_DEATH*), and -// - a death test doesn't interfere with the main test process's -// handling of the premature-exit file. -TEST_F(PrematureExitDeathTest, FileExistsDuringExecutionOfDeathTest) { - if (*premature_exit_file_path_ == '\0') { - return; - } - - EXPECT_DEATH_IF_SUPPORTED({ - // If the file exists, crash the process such that the main test - // process will catch the (expected) crash and report a success; - // otherwise don't crash, which will cause the main test process - // to report that the death test has failed. - if (PrematureExitFileExists()) { - exit(1); - } - }, ""); -} - -// Tests that the premature-exit file exists during the execution of a -// normal (non-death) test. -TEST_F(PrematureExitTest, PrematureExitFileExistsDuringTestExecution) { - if (*premature_exit_file_path_ == '\0') { - return; - } - - EXPECT_TRUE(PrematureExitFileExists()) - << " file " << premature_exit_file_path_ - << " should exist during test execution, but doesn't."; -} - -} // namespace - -int main(int argc, char **argv) { - InitGoogleTest(&argc, argv); - const int exit_code = RUN_ALL_TESTS(); - - // Test that the premature-exit file is deleted upon return from - // RUN_ALL_TESTS(). - const char* const filepath = GetEnv("TEST_PREMATURE_EXIT_FILE"); - if (filepath != NULL && *filepath != '\0') { - if (PrematureExitTest::FileExists(filepath)) { - printf( - "File %s shouldn't exist after the test program finishes, but does.", - filepath); - return 1; - } - } - - return exit_code; -} diff --git a/test/gtest-1.8.0/test/gtest_prod_test.cc b/test/gtest-1.8.0/test/gtest_prod_test.cc deleted file mode 100644 index dfb99986ec..0000000000 --- a/test/gtest-1.8.0/test/gtest_prod_test.cc +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// Unit test for gtest/gtest_prod.h. - -#include "production.h" -#include "gtest/gtest.h" - -// Tests that private members can be accessed from a TEST declared as -// a friend of the class. -TEST(PrivateCodeTest, CanAccessPrivateMembers) { - PrivateCode a; - EXPECT_EQ(0, a.x_); - - a.set_x(1); - EXPECT_EQ(1, a.x_); -} - -typedef testing::Test PrivateCodeFixtureTest; - -// Tests that private members can be accessed from a TEST_F declared -// as a friend of the class. -TEST_F(PrivateCodeFixtureTest, CanAccessPrivateMembers) { - PrivateCode a; - EXPECT_EQ(0, a.x_); - - a.set_x(2); - EXPECT_EQ(2, a.x_); -} diff --git a/test/gtest-1.8.0/test/gtest_repeat_test.cc b/test/gtest-1.8.0/test/gtest_repeat_test.cc deleted file mode 100644 index 3171604302..0000000000 --- a/test/gtest-1.8.0/test/gtest_repeat_test.cc +++ /dev/null @@ -1,236 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Tests the --gtest_repeat=number flag. - -#include -#include -#include "gtest/gtest.h" -#include "src/gtest-internal-inl.h" - -namespace testing { - -GTEST_DECLARE_string_(death_test_style); -GTEST_DECLARE_string_(filter); -GTEST_DECLARE_int32_(repeat); - -} // namespace testing - -using testing::GTEST_FLAG(death_test_style); -using testing::GTEST_FLAG(filter); -using testing::GTEST_FLAG(repeat); - -namespace { - -// We need this when we are testing Google Test itself and therefore -// cannot use Google Test assertions. -#define GTEST_CHECK_INT_EQ_(expected, actual) \ - do {\ - const int expected_val = (expected);\ - const int actual_val = (actual);\ - if (::testing::internal::IsTrue(expected_val != actual_val)) {\ - ::std::cout << "Value of: " #actual "\n"\ - << " Actual: " << actual_val << "\n"\ - << "Expected: " #expected "\n"\ - << "Which is: " << expected_val << "\n";\ - ::testing::internal::posix::Abort();\ - }\ - } while (::testing::internal::AlwaysFalse()) - - -// Used for verifying that global environment set-up and tear-down are -// inside the --gtest_repeat loop. - -int g_environment_set_up_count = 0; -int g_environment_tear_down_count = 0; - -class MyEnvironment : public testing::Environment { - public: - MyEnvironment() {} - virtual void SetUp() { g_environment_set_up_count++; } - virtual void TearDown() { g_environment_tear_down_count++; } -}; - -// A test that should fail. - -int g_should_fail_count = 0; - -TEST(FooTest, ShouldFail) { - g_should_fail_count++; - EXPECT_EQ(0, 1) << "Expected failure."; -} - -// A test that should pass. - -int g_should_pass_count = 0; - -TEST(FooTest, ShouldPass) { - g_should_pass_count++; -} - -// A test that contains a thread-safe death test and a fast death -// test. It should pass. - -int g_death_test_count = 0; - -TEST(BarDeathTest, ThreadSafeAndFast) { - g_death_test_count++; - - GTEST_FLAG(death_test_style) = "threadsafe"; - EXPECT_DEATH_IF_SUPPORTED(::testing::internal::posix::Abort(), ""); - - GTEST_FLAG(death_test_style) = "fast"; - EXPECT_DEATH_IF_SUPPORTED(::testing::internal::posix::Abort(), ""); -} - -int g_param_test_count = 0; - -const int kNumberOfParamTests = 10; - -class MyParamTest : public testing::TestWithParam {}; - -TEST_P(MyParamTest, ShouldPass) { - // TODO(vladl@google.com): Make parameter value checking robust - // WRT order of tests. - GTEST_CHECK_INT_EQ_(g_param_test_count % kNumberOfParamTests, GetParam()); - g_param_test_count++; -} -INSTANTIATE_TEST_CASE_P(MyParamSequence, - MyParamTest, - testing::Range(0, kNumberOfParamTests)); - -// Resets the count for each test. -void ResetCounts() { - g_environment_set_up_count = 0; - g_environment_tear_down_count = 0; - g_should_fail_count = 0; - g_should_pass_count = 0; - g_death_test_count = 0; - g_param_test_count = 0; -} - -// Checks that the count for each test is expected. -void CheckCounts(int expected) { - GTEST_CHECK_INT_EQ_(expected, g_environment_set_up_count); - GTEST_CHECK_INT_EQ_(expected, g_environment_tear_down_count); - GTEST_CHECK_INT_EQ_(expected, g_should_fail_count); - GTEST_CHECK_INT_EQ_(expected, g_should_pass_count); - GTEST_CHECK_INT_EQ_(expected, g_death_test_count); - GTEST_CHECK_INT_EQ_(expected * kNumberOfParamTests, g_param_test_count); -} - -// Tests the behavior of Google Test when --gtest_repeat is not specified. -void TestRepeatUnspecified() { - ResetCounts(); - GTEST_CHECK_INT_EQ_(1, RUN_ALL_TESTS()); - CheckCounts(1); -} - -// Tests the behavior of Google Test when --gtest_repeat has the given value. -void TestRepeat(int repeat) { - GTEST_FLAG(repeat) = repeat; - - ResetCounts(); - GTEST_CHECK_INT_EQ_(repeat > 0 ? 1 : 0, RUN_ALL_TESTS()); - CheckCounts(repeat); -} - -// Tests using --gtest_repeat when --gtest_filter specifies an empty -// set of tests. -void TestRepeatWithEmptyFilter(int repeat) { - GTEST_FLAG(repeat) = repeat; - GTEST_FLAG(filter) = "None"; - - ResetCounts(); - GTEST_CHECK_INT_EQ_(0, RUN_ALL_TESTS()); - CheckCounts(0); -} - -// Tests using --gtest_repeat when --gtest_filter specifies a set of -// successful tests. -void TestRepeatWithFilterForSuccessfulTests(int repeat) { - GTEST_FLAG(repeat) = repeat; - GTEST_FLAG(filter) = "*-*ShouldFail"; - - ResetCounts(); - GTEST_CHECK_INT_EQ_(0, RUN_ALL_TESTS()); - GTEST_CHECK_INT_EQ_(repeat, g_environment_set_up_count); - GTEST_CHECK_INT_EQ_(repeat, g_environment_tear_down_count); - GTEST_CHECK_INT_EQ_(0, g_should_fail_count); - GTEST_CHECK_INT_EQ_(repeat, g_should_pass_count); - GTEST_CHECK_INT_EQ_(repeat, g_death_test_count); - GTEST_CHECK_INT_EQ_(repeat * kNumberOfParamTests, g_param_test_count); -} - -// Tests using --gtest_repeat when --gtest_filter specifies a set of -// failed tests. -void TestRepeatWithFilterForFailedTests(int repeat) { - GTEST_FLAG(repeat) = repeat; - GTEST_FLAG(filter) = "*ShouldFail"; - - ResetCounts(); - GTEST_CHECK_INT_EQ_(1, RUN_ALL_TESTS()); - GTEST_CHECK_INT_EQ_(repeat, g_environment_set_up_count); - GTEST_CHECK_INT_EQ_(repeat, g_environment_tear_down_count); - GTEST_CHECK_INT_EQ_(repeat, g_should_fail_count); - GTEST_CHECK_INT_EQ_(0, g_should_pass_count); - GTEST_CHECK_INT_EQ_(0, g_death_test_count); - GTEST_CHECK_INT_EQ_(0, g_param_test_count); -} - -} // namespace - -int main(int argc, char **argv) { - testing::InitGoogleTest(&argc, argv); - - testing::AddGlobalTestEnvironment(new MyEnvironment); - - TestRepeatUnspecified(); - TestRepeat(0); - TestRepeat(1); - TestRepeat(5); - - TestRepeatWithEmptyFilter(2); - TestRepeatWithEmptyFilter(3); - - TestRepeatWithFilterForSuccessfulTests(3); - - TestRepeatWithFilterForFailedTests(4); - - // It would be nice to verify that the tests indeed loop forever - // when GTEST_FLAG(repeat) is negative, but this test will be quite - // complicated to write. Since this flag is for interactive - // debugging only and doesn't affect the normal test result, such a - // test would be an overkill. - - printf("PASS\n"); - return 0; -} diff --git a/test/gtest-1.8.0/test/gtest_shuffle_test.py b/test/gtest-1.8.0/test/gtest_shuffle_test.py deleted file mode 100644 index 30d0303d19..0000000000 --- a/test/gtest-1.8.0/test/gtest_shuffle_test.py +++ /dev/null @@ -1,325 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2009 Google Inc. All Rights Reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Verifies that test shuffling works.""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import os -import gtest_test_utils - -# Command to run the gtest_shuffle_test_ program. -COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_shuffle_test_') - -# The environment variables for test sharding. -TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS' -SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX' - -TEST_FILTER = 'A*.A:A*.B:C*' - -ALL_TESTS = [] -ACTIVE_TESTS = [] -FILTERED_TESTS = [] -SHARDED_TESTS = [] - -SHUFFLED_ALL_TESTS = [] -SHUFFLED_ACTIVE_TESTS = [] -SHUFFLED_FILTERED_TESTS = [] -SHUFFLED_SHARDED_TESTS = [] - - -def AlsoRunDisabledTestsFlag(): - return '--gtest_also_run_disabled_tests' - - -def FilterFlag(test_filter): - return '--gtest_filter=%s' % (test_filter,) - - -def RepeatFlag(n): - return '--gtest_repeat=%s' % (n,) - - -def ShuffleFlag(): - return '--gtest_shuffle' - - -def RandomSeedFlag(n): - return '--gtest_random_seed=%s' % (n,) - - -def RunAndReturnOutput(extra_env, args): - """Runs the test program and returns its output.""" - - environ_copy = os.environ.copy() - environ_copy.update(extra_env) - - return gtest_test_utils.Subprocess([COMMAND] + args, env=environ_copy).output - - -def GetTestsForAllIterations(extra_env, args): - """Runs the test program and returns a list of test lists. - - Args: - extra_env: a map from environment variables to their values - args: command line flags to pass to gtest_shuffle_test_ - - Returns: - A list where the i-th element is the list of tests run in the i-th - test iteration. - """ - - test_iterations = [] - for line in RunAndReturnOutput(extra_env, args).split('\n'): - if line.startswith('----'): - tests = [] - test_iterations.append(tests) - elif line.strip(): - tests.append(line.strip()) # 'TestCaseName.TestName' - - return test_iterations - - -def GetTestCases(tests): - """Returns a list of test cases in the given full test names. - - Args: - tests: a list of full test names - - Returns: - A list of test cases from 'tests', in their original order. - Consecutive duplicates are removed. - """ - - test_cases = [] - for test in tests: - test_case = test.split('.')[0] - if not test_case in test_cases: - test_cases.append(test_case) - - return test_cases - - -def CalculateTestLists(): - """Calculates the list of tests run under different flags.""" - - if not ALL_TESTS: - ALL_TESTS.extend( - GetTestsForAllIterations({}, [AlsoRunDisabledTestsFlag()])[0]) - - if not ACTIVE_TESTS: - ACTIVE_TESTS.extend(GetTestsForAllIterations({}, [])[0]) - - if not FILTERED_TESTS: - FILTERED_TESTS.extend( - GetTestsForAllIterations({}, [FilterFlag(TEST_FILTER)])[0]) - - if not SHARDED_TESTS: - SHARDED_TESTS.extend( - GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3', - SHARD_INDEX_ENV_VAR: '1'}, - [])[0]) - - if not SHUFFLED_ALL_TESTS: - SHUFFLED_ALL_TESTS.extend(GetTestsForAllIterations( - {}, [AlsoRunDisabledTestsFlag(), ShuffleFlag(), RandomSeedFlag(1)])[0]) - - if not SHUFFLED_ACTIVE_TESTS: - SHUFFLED_ACTIVE_TESTS.extend(GetTestsForAllIterations( - {}, [ShuffleFlag(), RandomSeedFlag(1)])[0]) - - if not SHUFFLED_FILTERED_TESTS: - SHUFFLED_FILTERED_TESTS.extend(GetTestsForAllIterations( - {}, [ShuffleFlag(), RandomSeedFlag(1), FilterFlag(TEST_FILTER)])[0]) - - if not SHUFFLED_SHARDED_TESTS: - SHUFFLED_SHARDED_TESTS.extend( - GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3', - SHARD_INDEX_ENV_VAR: '1'}, - [ShuffleFlag(), RandomSeedFlag(1)])[0]) - - -class GTestShuffleUnitTest(gtest_test_utils.TestCase): - """Tests test shuffling.""" - - def setUp(self): - CalculateTestLists() - - def testShufflePreservesNumberOfTests(self): - self.assertEqual(len(ALL_TESTS), len(SHUFFLED_ALL_TESTS)) - self.assertEqual(len(ACTIVE_TESTS), len(SHUFFLED_ACTIVE_TESTS)) - self.assertEqual(len(FILTERED_TESTS), len(SHUFFLED_FILTERED_TESTS)) - self.assertEqual(len(SHARDED_TESTS), len(SHUFFLED_SHARDED_TESTS)) - - def testShuffleChangesTestOrder(self): - self.assert_(SHUFFLED_ALL_TESTS != ALL_TESTS, SHUFFLED_ALL_TESTS) - self.assert_(SHUFFLED_ACTIVE_TESTS != ACTIVE_TESTS, SHUFFLED_ACTIVE_TESTS) - self.assert_(SHUFFLED_FILTERED_TESTS != FILTERED_TESTS, - SHUFFLED_FILTERED_TESTS) - self.assert_(SHUFFLED_SHARDED_TESTS != SHARDED_TESTS, - SHUFFLED_SHARDED_TESTS) - - def testShuffleChangesTestCaseOrder(self): - self.assert_(GetTestCases(SHUFFLED_ALL_TESTS) != GetTestCases(ALL_TESTS), - GetTestCases(SHUFFLED_ALL_TESTS)) - self.assert_( - GetTestCases(SHUFFLED_ACTIVE_TESTS) != GetTestCases(ACTIVE_TESTS), - GetTestCases(SHUFFLED_ACTIVE_TESTS)) - self.assert_( - GetTestCases(SHUFFLED_FILTERED_TESTS) != GetTestCases(FILTERED_TESTS), - GetTestCases(SHUFFLED_FILTERED_TESTS)) - self.assert_( - GetTestCases(SHUFFLED_SHARDED_TESTS) != GetTestCases(SHARDED_TESTS), - GetTestCases(SHUFFLED_SHARDED_TESTS)) - - def testShuffleDoesNotRepeatTest(self): - for test in SHUFFLED_ALL_TESTS: - self.assertEqual(1, SHUFFLED_ALL_TESTS.count(test), - '%s appears more than once' % (test,)) - for test in SHUFFLED_ACTIVE_TESTS: - self.assertEqual(1, SHUFFLED_ACTIVE_TESTS.count(test), - '%s appears more than once' % (test,)) - for test in SHUFFLED_FILTERED_TESTS: - self.assertEqual(1, SHUFFLED_FILTERED_TESTS.count(test), - '%s appears more than once' % (test,)) - for test in SHUFFLED_SHARDED_TESTS: - self.assertEqual(1, SHUFFLED_SHARDED_TESTS.count(test), - '%s appears more than once' % (test,)) - - def testShuffleDoesNotCreateNewTest(self): - for test in SHUFFLED_ALL_TESTS: - self.assert_(test in ALL_TESTS, '%s is an invalid test' % (test,)) - for test in SHUFFLED_ACTIVE_TESTS: - self.assert_(test in ACTIVE_TESTS, '%s is an invalid test' % (test,)) - for test in SHUFFLED_FILTERED_TESTS: - self.assert_(test in FILTERED_TESTS, '%s is an invalid test' % (test,)) - for test in SHUFFLED_SHARDED_TESTS: - self.assert_(test in SHARDED_TESTS, '%s is an invalid test' % (test,)) - - def testShuffleIncludesAllTests(self): - for test in ALL_TESTS: - self.assert_(test in SHUFFLED_ALL_TESTS, '%s is missing' % (test,)) - for test in ACTIVE_TESTS: - self.assert_(test in SHUFFLED_ACTIVE_TESTS, '%s is missing' % (test,)) - for test in FILTERED_TESTS: - self.assert_(test in SHUFFLED_FILTERED_TESTS, '%s is missing' % (test,)) - for test in SHARDED_TESTS: - self.assert_(test in SHUFFLED_SHARDED_TESTS, '%s is missing' % (test,)) - - def testShuffleLeavesDeathTestsAtFront(self): - non_death_test_found = False - for test in SHUFFLED_ACTIVE_TESTS: - if 'DeathTest.' in test: - self.assert_(not non_death_test_found, - '%s appears after a non-death test' % (test,)) - else: - non_death_test_found = True - - def _VerifyTestCasesDoNotInterleave(self, tests): - test_cases = [] - for test in tests: - [test_case, _] = test.split('.') - if test_cases and test_cases[-1] != test_case: - test_cases.append(test_case) - self.assertEqual(1, test_cases.count(test_case), - 'Test case %s is not grouped together in %s' % - (test_case, tests)) - - def testShuffleDoesNotInterleaveTestCases(self): - self._VerifyTestCasesDoNotInterleave(SHUFFLED_ALL_TESTS) - self._VerifyTestCasesDoNotInterleave(SHUFFLED_ACTIVE_TESTS) - self._VerifyTestCasesDoNotInterleave(SHUFFLED_FILTERED_TESTS) - self._VerifyTestCasesDoNotInterleave(SHUFFLED_SHARDED_TESTS) - - def testShuffleRestoresOrderAfterEachIteration(self): - # Get the test lists in all 3 iterations, using random seed 1, 2, - # and 3 respectively. Google Test picks a different seed in each - # iteration, and this test depends on the current implementation - # picking successive numbers. This dependency is not ideal, but - # makes the test much easier to write. - [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = ( - GetTestsForAllIterations( - {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)])) - - # Make sure running the tests with random seed 1 gets the same - # order as in iteration 1 above. - [tests_with_seed1] = GetTestsForAllIterations( - {}, [ShuffleFlag(), RandomSeedFlag(1)]) - self.assertEqual(tests_in_iteration1, tests_with_seed1) - - # Make sure running the tests with random seed 2 gets the same - # order as in iteration 2 above. Success means that Google Test - # correctly restores the test order before re-shuffling at the - # beginning of iteration 2. - [tests_with_seed2] = GetTestsForAllIterations( - {}, [ShuffleFlag(), RandomSeedFlag(2)]) - self.assertEqual(tests_in_iteration2, tests_with_seed2) - - # Make sure running the tests with random seed 3 gets the same - # order as in iteration 3 above. Success means that Google Test - # correctly restores the test order before re-shuffling at the - # beginning of iteration 3. - [tests_with_seed3] = GetTestsForAllIterations( - {}, [ShuffleFlag(), RandomSeedFlag(3)]) - self.assertEqual(tests_in_iteration3, tests_with_seed3) - - def testShuffleGeneratesNewOrderInEachIteration(self): - [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = ( - GetTestsForAllIterations( - {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)])) - - self.assert_(tests_in_iteration1 != tests_in_iteration2, - tests_in_iteration1) - self.assert_(tests_in_iteration1 != tests_in_iteration3, - tests_in_iteration1) - self.assert_(tests_in_iteration2 != tests_in_iteration3, - tests_in_iteration2) - - def testShuffleShardedTestsPreservesPartition(self): - # If we run M tests on N shards, the same M tests should be run in - # total, regardless of the random seeds used by the shards. - [tests1] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3', - SHARD_INDEX_ENV_VAR: '0'}, - [ShuffleFlag(), RandomSeedFlag(1)]) - [tests2] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3', - SHARD_INDEX_ENV_VAR: '1'}, - [ShuffleFlag(), RandomSeedFlag(20)]) - [tests3] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3', - SHARD_INDEX_ENV_VAR: '2'}, - [ShuffleFlag(), RandomSeedFlag(25)]) - sorted_sharded_tests = tests1 + tests2 + tests3 - sorted_sharded_tests.sort() - sorted_active_tests = [] - sorted_active_tests.extend(ACTIVE_TESTS) - sorted_active_tests.sort() - self.assertEqual(sorted_active_tests, sorted_sharded_tests) - -if __name__ == '__main__': - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_shuffle_test_.cc b/test/gtest-1.8.0/test/gtest_shuffle_test_.cc deleted file mode 100644 index 6fb441bd4d..0000000000 --- a/test/gtest-1.8.0/test/gtest_shuffle_test_.cc +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright 2009, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Verifies that test shuffling works. - -#include "gtest/gtest.h" - -namespace { - -using ::testing::EmptyTestEventListener; -using ::testing::InitGoogleTest; -using ::testing::Message; -using ::testing::Test; -using ::testing::TestEventListeners; -using ::testing::TestInfo; -using ::testing::UnitTest; -using ::testing::internal::scoped_ptr; - -// The test methods are empty, as the sole purpose of this program is -// to print the test names before/after shuffling. - -class A : public Test {}; -TEST_F(A, A) {} -TEST_F(A, B) {} - -TEST(ADeathTest, A) {} -TEST(ADeathTest, B) {} -TEST(ADeathTest, C) {} - -TEST(B, A) {} -TEST(B, B) {} -TEST(B, C) {} -TEST(B, DISABLED_D) {} -TEST(B, DISABLED_E) {} - -TEST(BDeathTest, A) {} -TEST(BDeathTest, B) {} - -TEST(C, A) {} -TEST(C, B) {} -TEST(C, C) {} -TEST(C, DISABLED_D) {} - -TEST(CDeathTest, A) {} - -TEST(DISABLED_D, A) {} -TEST(DISABLED_D, DISABLED_B) {} - -// This printer prints the full test names only, starting each test -// iteration with a "----" marker. -class TestNamePrinter : public EmptyTestEventListener { - public: - virtual void OnTestIterationStart(const UnitTest& /* unit_test */, - int /* iteration */) { - printf("----\n"); - } - - virtual void OnTestStart(const TestInfo& test_info) { - printf("%s.%s\n", test_info.test_case_name(), test_info.name()); - } -}; - -} // namespace - -int main(int argc, char **argv) { - InitGoogleTest(&argc, argv); - - // Replaces the default printer with TestNamePrinter, which prints - // the test name only. - TestEventListeners& listeners = UnitTest::GetInstance()->listeners(); - delete listeners.Release(listeners.default_result_printer()); - listeners.Append(new TestNamePrinter); - - return RUN_ALL_TESTS(); -} diff --git a/test/gtest-1.8.0/test/gtest_sole_header_test.cc b/test/gtest-1.8.0/test/gtest_sole_header_test.cc deleted file mode 100644 index ccd091a281..0000000000 --- a/test/gtest-1.8.0/test/gtest_sole_header_test.cc +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: mheule@google.com (Markus Heule) -// -// This test verifies that it's possible to use Google Test by including -// the gtest.h header file alone. - -#include "gtest/gtest.h" - -namespace { - -void Subroutine() { - EXPECT_EQ(42, 42); -} - -TEST(NoFatalFailureTest, ExpectNoFatalFailure) { - EXPECT_NO_FATAL_FAILURE(;); - EXPECT_NO_FATAL_FAILURE(SUCCEED()); - EXPECT_NO_FATAL_FAILURE(Subroutine()); - EXPECT_NO_FATAL_FAILURE({ SUCCEED(); }); -} - -TEST(NoFatalFailureTest, AssertNoFatalFailure) { - ASSERT_NO_FATAL_FAILURE(;); - ASSERT_NO_FATAL_FAILURE(SUCCEED()); - ASSERT_NO_FATAL_FAILURE(Subroutine()); - ASSERT_NO_FATAL_FAILURE({ SUCCEED(); }); -} - -} // namespace diff --git a/test/gtest-1.8.0/test/gtest_stress_test.cc b/test/gtest-1.8.0/test/gtest_stress_test.cc deleted file mode 100644 index cac405f808..0000000000 --- a/test/gtest-1.8.0/test/gtest_stress_test.cc +++ /dev/null @@ -1,250 +0,0 @@ -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Tests that SCOPED_TRACE() and various Google Test assertions can be -// used in a large number of threads concurrently. - -#include "gtest/gtest.h" - -#include - -#include "src/gtest-internal-inl.h" - -#if GTEST_IS_THREADSAFE - -namespace testing { -namespace { - -using internal::Notification; -using internal::TestPropertyKeyIs; -using internal::ThreadWithParam; -using internal::scoped_ptr; - -// In order to run tests in this file, for platforms where Google Test is -// thread safe, implement ThreadWithParam. See the description of its API -// in gtest-port.h, where it is defined for already supported platforms. - -// How many threads to create? -const int kThreadCount = 50; - -std::string IdToKey(int id, const char* suffix) { - Message key; - key << "key_" << id << "_" << suffix; - return key.GetString(); -} - -std::string IdToString(int id) { - Message id_message; - id_message << id; - return id_message.GetString(); -} - -void ExpectKeyAndValueWereRecordedForId( - const std::vector& properties, - int id, const char* suffix) { - TestPropertyKeyIs matches_key(IdToKey(id, suffix).c_str()); - const std::vector::const_iterator property = - std::find_if(properties.begin(), properties.end(), matches_key); - ASSERT_TRUE(property != properties.end()) - << "expecting " << suffix << " value for id " << id; - EXPECT_STREQ(IdToString(id).c_str(), property->value()); -} - -// Calls a large number of Google Test assertions, where exactly one of them -// will fail. -void ManyAsserts(int id) { - GTEST_LOG_(INFO) << "Thread #" << id << " running..."; - - SCOPED_TRACE(Message() << "Thread #" << id); - - for (int i = 0; i < kThreadCount; i++) { - SCOPED_TRACE(Message() << "Iteration #" << i); - - // A bunch of assertions that should succeed. - EXPECT_TRUE(true); - ASSERT_FALSE(false) << "This shouldn't fail."; - EXPECT_STREQ("a", "a"); - ASSERT_LE(5, 6); - EXPECT_EQ(i, i) << "This shouldn't fail."; - - // RecordProperty() should interact safely with other threads as well. - // The shared_key forces property updates. - Test::RecordProperty(IdToKey(id, "string").c_str(), IdToString(id).c_str()); - Test::RecordProperty(IdToKey(id, "int").c_str(), id); - Test::RecordProperty("shared_key", IdToString(id).c_str()); - - // This assertion should fail kThreadCount times per thread. It - // is for testing whether Google Test can handle failed assertions in a - // multi-threaded context. - EXPECT_LT(i, 0) << "This should always fail."; - } -} - -void CheckTestFailureCount(int expected_failures) { - const TestInfo* const info = UnitTest::GetInstance()->current_test_info(); - const TestResult* const result = info->result(); - GTEST_CHECK_(expected_failures == result->total_part_count()) - << "Logged " << result->total_part_count() << " failures " - << " vs. " << expected_failures << " expected"; -} - -// Tests using SCOPED_TRACE() and Google Test assertions in many threads -// concurrently. -TEST(StressTest, CanUseScopedTraceAndAssertionsInManyThreads) { - { - scoped_ptr > threads[kThreadCount]; - Notification threads_can_start; - for (int i = 0; i != kThreadCount; i++) - threads[i].reset(new ThreadWithParam(&ManyAsserts, - i, - &threads_can_start)); - - threads_can_start.Notify(); - - // Blocks until all the threads are done. - for (int i = 0; i != kThreadCount; i++) - threads[i]->Join(); - } - - // Ensures that kThreadCount*kThreadCount failures have been reported. - const TestInfo* const info = UnitTest::GetInstance()->current_test_info(); - const TestResult* const result = info->result(); - - std::vector properties; - // We have no access to the TestResult's list of properties but we can - // copy them one by one. - for (int i = 0; i < result->test_property_count(); ++i) - properties.push_back(result->GetTestProperty(i)); - - EXPECT_EQ(kThreadCount * 2 + 1, result->test_property_count()) - << "String and int values recorded on each thread, " - << "as well as one shared_key"; - for (int i = 0; i < kThreadCount; ++i) { - ExpectKeyAndValueWereRecordedForId(properties, i, "string"); - ExpectKeyAndValueWereRecordedForId(properties, i, "int"); - } - CheckTestFailureCount(kThreadCount*kThreadCount); -} - -void FailingThread(bool is_fatal) { - if (is_fatal) - FAIL() << "Fatal failure in some other thread. " - << "(This failure is expected.)"; - else - ADD_FAILURE() << "Non-fatal failure in some other thread. " - << "(This failure is expected.)"; -} - -void GenerateFatalFailureInAnotherThread(bool is_fatal) { - ThreadWithParam thread(&FailingThread, is_fatal, NULL); - thread.Join(); -} - -TEST(NoFatalFailureTest, ExpectNoFatalFailureIgnoresFailuresInOtherThreads) { - EXPECT_NO_FATAL_FAILURE(GenerateFatalFailureInAnotherThread(true)); - // We should only have one failure (the one from - // GenerateFatalFailureInAnotherThread()), since the EXPECT_NO_FATAL_FAILURE - // should succeed. - CheckTestFailureCount(1); -} - -void AssertNoFatalFailureIgnoresFailuresInOtherThreads() { - ASSERT_NO_FATAL_FAILURE(GenerateFatalFailureInAnotherThread(true)); -} -TEST(NoFatalFailureTest, AssertNoFatalFailureIgnoresFailuresInOtherThreads) { - // Using a subroutine, to make sure, that the test continues. - AssertNoFatalFailureIgnoresFailuresInOtherThreads(); - // We should only have one failure (the one from - // GenerateFatalFailureInAnotherThread()), since the EXPECT_NO_FATAL_FAILURE - // should succeed. - CheckTestFailureCount(1); -} - -TEST(FatalFailureTest, ExpectFatalFailureIgnoresFailuresInOtherThreads) { - // This statement should fail, since the current thread doesn't generate a - // fatal failure, only another one does. - EXPECT_FATAL_FAILURE(GenerateFatalFailureInAnotherThread(true), "expected"); - CheckTestFailureCount(2); -} - -TEST(FatalFailureOnAllThreadsTest, ExpectFatalFailureOnAllThreads) { - // This statement should succeed, because failures in all threads are - // considered. - EXPECT_FATAL_FAILURE_ON_ALL_THREADS( - GenerateFatalFailureInAnotherThread(true), "expected"); - CheckTestFailureCount(0); - // We need to add a failure, because main() checks that there are failures. - // But when only this test is run, we shouldn't have any failures. - ADD_FAILURE() << "This is an expected non-fatal failure."; -} - -TEST(NonFatalFailureTest, ExpectNonFatalFailureIgnoresFailuresInOtherThreads) { - // This statement should fail, since the current thread doesn't generate a - // fatal failure, only another one does. - EXPECT_NONFATAL_FAILURE(GenerateFatalFailureInAnotherThread(false), - "expected"); - CheckTestFailureCount(2); -} - -TEST(NonFatalFailureOnAllThreadsTest, ExpectNonFatalFailureOnAllThreads) { - // This statement should succeed, because failures in all threads are - // considered. - EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS( - GenerateFatalFailureInAnotherThread(false), "expected"); - CheckTestFailureCount(0); - // We need to add a failure, because main() checks that there are failures, - // But when only this test is run, we shouldn't have any failures. - ADD_FAILURE() << "This is an expected non-fatal failure."; -} - -} // namespace -} // namespace testing - -int main(int argc, char **argv) { - testing::InitGoogleTest(&argc, argv); - - const int result = RUN_ALL_TESTS(); // Expected to fail. - GTEST_CHECK_(result == 1) << "RUN_ALL_TESTS() did not fail as expected"; - - printf("\nPASS\n"); - return 0; -} - -#else -TEST(StressTest, - DISABLED_ThreadSafetyTestsAreSkippedWhenGoogleTestIsNotThreadSafe) { -} - -int main(int argc, char **argv) { - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} -#endif // GTEST_IS_THREADSAFE diff --git a/test/gtest-1.8.0/test/gtest_test_utils.py b/test/gtest-1.8.0/test/gtest_test_utils.py deleted file mode 100644 index d7fc0990d3..0000000000 --- a/test/gtest-1.8.0/test/gtest_test_utils.py +++ /dev/null @@ -1,318 +0,0 @@ -# Copyright 2006, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Unit test utilities for Google C++ Testing and Mocking Framework.""" -# Suppresses the 'Import not at the top of the file' lint complaint. -# pylint: disable-msg=C6204 - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import os -import sys - -IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux' -IS_WINDOWS = os.name == 'nt' -IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0] - -import atexit -import shutil -import tempfile -import unittest -_test_module = unittest - -try: - import subprocess - _SUBPROCESS_MODULE_AVAILABLE = True -except: - import popen2 - _SUBPROCESS_MODULE_AVAILABLE = False -# pylint: enable-msg=C6204 - -GTEST_OUTPUT_VAR_NAME = 'GTEST_OUTPUT' - -# The environment variable for specifying the path to the premature-exit file. -PREMATURE_EXIT_FILE_ENV_VAR = 'TEST_PREMATURE_EXIT_FILE' - -environ = os.environ.copy() - - -def SetEnvVar(env_var, value): - """Sets/unsets an environment variable to a given value.""" - - if value is not None: - environ[env_var] = value - elif env_var in environ: - del environ[env_var] - - -# Here we expose a class from a particular module, depending on the -# environment. The comment suppresses the 'Invalid variable name' lint -# complaint. -TestCase = _test_module.TestCase # pylint: disable-msg=C6409 - -# Initially maps a flag to its default value. After -# _ParseAndStripGTestFlags() is called, maps a flag to its actual value. -_flag_map = {'source_dir': os.path.dirname(sys.argv[0]), - 'build_dir': os.path.dirname(sys.argv[0])} -_gtest_flags_are_parsed = False - - -def _ParseAndStripGTestFlags(argv): - """Parses and strips Google Test flags from argv. This is idempotent.""" - - # Suppresses the lint complaint about a global variable since we need it - # here to maintain module-wide state. - global _gtest_flags_are_parsed # pylint: disable-msg=W0603 - if _gtest_flags_are_parsed: - return - - _gtest_flags_are_parsed = True - for flag in _flag_map: - # The environment variable overrides the default value. - if flag.upper() in os.environ: - _flag_map[flag] = os.environ[flag.upper()] - - # The command line flag overrides the environment variable. - i = 1 # Skips the program name. - while i < len(argv): - prefix = '--' + flag + '=' - if argv[i].startswith(prefix): - _flag_map[flag] = argv[i][len(prefix):] - del argv[i] - break - else: - # We don't increment i in case we just found a --gtest_* flag - # and removed it from argv. - i += 1 - - -def GetFlag(flag): - """Returns the value of the given flag.""" - - # In case GetFlag() is called before Main(), we always call - # _ParseAndStripGTestFlags() here to make sure the --gtest_* flags - # are parsed. - _ParseAndStripGTestFlags(sys.argv) - - return _flag_map[flag] - - -def GetSourceDir(): - """Returns the absolute path of the directory where the .py files are.""" - - return os.path.abspath(GetFlag('source_dir')) - - -def GetBuildDir(): - """Returns the absolute path of the directory where the test binaries are.""" - - return os.path.abspath(GetFlag('build_dir')) - - -_temp_dir = None - -def _RemoveTempDir(): - if _temp_dir: - shutil.rmtree(_temp_dir, ignore_errors=True) - -atexit.register(_RemoveTempDir) - - -def GetTempDir(): - global _temp_dir - if not _temp_dir: - _temp_dir = tempfile.mkdtemp() - return _temp_dir - - -def GetTestExecutablePath(executable_name, build_dir=None): - """Returns the absolute path of the test binary given its name. - - The function will print a message and abort the program if the resulting file - doesn't exist. - - Args: - executable_name: name of the test binary that the test script runs. - build_dir: directory where to look for executables, by default - the result of GetBuildDir(). - - Returns: - The absolute path of the test binary. - """ - - path = os.path.abspath(os.path.join(build_dir or GetBuildDir(), - executable_name)) - if (IS_WINDOWS or IS_CYGWIN) and not path.endswith('.exe'): - path += '.exe' - - if not os.path.exists(path): - message = ( - 'Unable to find the test binary "%s". Please make sure to provide\n' - 'a path to the binary via the --build_dir flag or the BUILD_DIR\n' - 'environment variable.' % path) - print >> sys.stderr, message - sys.exit(1) - - return path - - -def GetExitStatus(exit_code): - """Returns the argument to exit(), or -1 if exit() wasn't called. - - Args: - exit_code: the result value of os.system(command). - """ - - if os.name == 'nt': - # On Windows, os.WEXITSTATUS() doesn't work and os.system() returns - # the argument to exit() directly. - return exit_code - else: - # On Unix, os.WEXITSTATUS() must be used to extract the exit status - # from the result of os.system(). - if os.WIFEXITED(exit_code): - return os.WEXITSTATUS(exit_code) - else: - return -1 - - -class Subprocess: - def __init__(self, command, working_dir=None, capture_stderr=True, env=None): - """Changes into a specified directory, if provided, and executes a command. - - Restores the old directory afterwards. - - Args: - command: The command to run, in the form of sys.argv. - working_dir: The directory to change into. - capture_stderr: Determines whether to capture stderr in the output member - or to discard it. - env: Dictionary with environment to pass to the subprocess. - - Returns: - An object that represents outcome of the executed process. It has the - following attributes: - terminated_by_signal True iff the child process has been terminated - by a signal. - signal Sygnal that terminated the child process. - exited True iff the child process exited normally. - exit_code The code with which the child process exited. - output Child process's stdout and stderr output - combined in a string. - """ - - # The subprocess module is the preferrable way of running programs - # since it is available and behaves consistently on all platforms, - # including Windows. But it is only available starting in python 2.4. - # In earlier python versions, we revert to the popen2 module, which is - # available in python 2.0 and later but doesn't provide required - # functionality (Popen4) under Windows. This allows us to support Mac - # OS X 10.4 Tiger, which has python 2.3 installed. - if _SUBPROCESS_MODULE_AVAILABLE: - if capture_stderr: - stderr = subprocess.STDOUT - else: - stderr = subprocess.PIPE - - p = subprocess.Popen(command, - stdout=subprocess.PIPE, stderr=stderr, - cwd=working_dir, universal_newlines=True, env=env) - # communicate returns a tuple with the file object for the child's - # output. - self.output = p.communicate()[0] - self._return_code = p.returncode - else: - old_dir = os.getcwd() - - def _ReplaceEnvDict(dest, src): - # Changes made by os.environ.clear are not inheritable by child - # processes until Python 2.6. To produce inheritable changes we have - # to delete environment items with the del statement. - for key in dest.keys(): - del dest[key] - dest.update(src) - - # When 'env' is not None, backup the environment variables and replace - # them with the passed 'env'. When 'env' is None, we simply use the - # current 'os.environ' for compatibility with the subprocess.Popen - # semantics used above. - if env is not None: - old_environ = os.environ.copy() - _ReplaceEnvDict(os.environ, env) - - try: - if working_dir is not None: - os.chdir(working_dir) - if capture_stderr: - p = popen2.Popen4(command) - else: - p = popen2.Popen3(command) - p.tochild.close() - self.output = p.fromchild.read() - ret_code = p.wait() - finally: - os.chdir(old_dir) - - # Restore the old environment variables - # if they were replaced. - if env is not None: - _ReplaceEnvDict(os.environ, old_environ) - - # Converts ret_code to match the semantics of - # subprocess.Popen.returncode. - if os.WIFSIGNALED(ret_code): - self._return_code = -os.WTERMSIG(ret_code) - else: # os.WIFEXITED(ret_code) should return True here. - self._return_code = os.WEXITSTATUS(ret_code) - - if self._return_code < 0: - self.terminated_by_signal = True - self.exited = False - self.signal = -self._return_code - else: - self.terminated_by_signal = False - self.exited = True - self.exit_code = self._return_code - - -def Main(): - """Runs the unit test.""" - - # We must call _ParseAndStripGTestFlags() before calling - # unittest.main(). Otherwise the latter will be confused by the - # --gtest_* flags. - _ParseAndStripGTestFlags(sys.argv) - # The tested binaries should not be writing XML output files unless the - # script explicitly instructs them to. - # TODO(vladl@google.com): Move this into Subprocess when we implement - # passing environment into it as a parameter. - if GTEST_OUTPUT_VAR_NAME in os.environ: - del os.environ[GTEST_OUTPUT_VAR_NAME] - - _test_module.main() diff --git a/test/gtest-1.8.0/test/gtest_throw_on_failure_ex_test.cc b/test/gtest-1.8.0/test/gtest_throw_on_failure_ex_test.cc deleted file mode 100644 index 8d46c76f16..0000000000 --- a/test/gtest-1.8.0/test/gtest_throw_on_failure_ex_test.cc +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright 2009, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Tests Google Test's throw-on-failure mode with exceptions enabled. - -#include "gtest/gtest.h" - -#include -#include -#include -#include - -// Prints the given failure message and exits the program with -// non-zero. We use this instead of a Google Test assertion to -// indicate a failure, as the latter is been tested and cannot be -// relied on. -void Fail(const char* msg) { - printf("FAILURE: %s\n", msg); - fflush(stdout); - exit(1); -} - -// Tests that an assertion failure throws a subclass of -// std::runtime_error. -void TestFailureThrowsRuntimeError() { - testing::GTEST_FLAG(throw_on_failure) = true; - - // A successful assertion shouldn't throw. - try { - EXPECT_EQ(3, 3); - } catch(...) { - Fail("A successful assertion wrongfully threw."); - } - - // A failed assertion should throw a subclass of std::runtime_error. - try { - EXPECT_EQ(2, 3) << "Expected failure"; - } catch(const std::runtime_error& e) { - if (strstr(e.what(), "Expected failure") != NULL) - return; - - printf("%s", - "A failed assertion did throw an exception of the right type, " - "but the message is incorrect. Instead of containing \"Expected " - "failure\", it is:\n"); - Fail(e.what()); - } catch(...) { - Fail("A failed assertion threw the wrong type of exception."); - } - Fail("A failed assertion should've thrown but didn't."); -} - -int main(int argc, char** argv) { - testing::InitGoogleTest(&argc, argv); - - // We want to ensure that people can use Google Test assertions in - // other testing frameworks, as long as they initialize Google Test - // properly and set the thrown-on-failure mode. Therefore, we don't - // use Google Test's constructs for defining and running tests - // (e.g. TEST and RUN_ALL_TESTS) here. - - TestFailureThrowsRuntimeError(); - return 0; -} diff --git a/test/gtest-1.8.0/test/gtest_throw_on_failure_test.py b/test/gtest-1.8.0/test/gtest_throw_on_failure_test.py deleted file mode 100644 index 5678ffeaf6..0000000000 --- a/test/gtest-1.8.0/test/gtest_throw_on_failure_test.py +++ /dev/null @@ -1,171 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2009, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Tests Google Test's throw-on-failure mode with exceptions disabled. - -This script invokes gtest_throw_on_failure_test_ (a program written with -Google Test) with different environments and command line flags. -""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import os -import gtest_test_utils - - -# Constants. - -# The command line flag for enabling/disabling the throw-on-failure mode. -THROW_ON_FAILURE = 'gtest_throw_on_failure' - -# Path to the gtest_throw_on_failure_test_ program, compiled with -# exceptions disabled. -EXE_PATH = gtest_test_utils.GetTestExecutablePath( - 'gtest_throw_on_failure_test_') - - -# Utilities. - - -def SetEnvVar(env_var, value): - """Sets an environment variable to a given value; unsets it when the - given value is None. - """ - - env_var = env_var.upper() - if value is not None: - os.environ[env_var] = value - elif env_var in os.environ: - del os.environ[env_var] - - -def Run(command): - """Runs a command; returns True/False if its exit code is/isn't 0.""" - - print 'Running "%s". . .' % ' '.join(command) - p = gtest_test_utils.Subprocess(command) - return p.exited and p.exit_code == 0 - - -# The tests. TODO(wan@google.com): refactor the class to share common -# logic with code in gtest_break_on_failure_unittest.py. -class ThrowOnFailureTest(gtest_test_utils.TestCase): - """Tests the throw-on-failure mode.""" - - def RunAndVerify(self, env_var_value, flag_value, should_fail): - """Runs gtest_throw_on_failure_test_ and verifies that it does - (or does not) exit with a non-zero code. - - Args: - env_var_value: value of the GTEST_BREAK_ON_FAILURE environment - variable; None if the variable should be unset. - flag_value: value of the --gtest_break_on_failure flag; - None if the flag should not be present. - should_fail: True iff the program is expected to fail. - """ - - SetEnvVar(THROW_ON_FAILURE, env_var_value) - - if env_var_value is None: - env_var_value_msg = ' is not set' - else: - env_var_value_msg = '=' + env_var_value - - if flag_value is None: - flag = '' - elif flag_value == '0': - flag = '--%s=0' % THROW_ON_FAILURE - else: - flag = '--%s' % THROW_ON_FAILURE - - command = [EXE_PATH] - if flag: - command.append(flag) - - if should_fail: - should_or_not = 'should' - else: - should_or_not = 'should not' - - failed = not Run(command) - - SetEnvVar(THROW_ON_FAILURE, None) - - msg = ('when %s%s, an assertion failure in "%s" %s cause a non-zero ' - 'exit code.' % - (THROW_ON_FAILURE, env_var_value_msg, ' '.join(command), - should_or_not)) - self.assert_(failed == should_fail, msg) - - def testDefaultBehavior(self): - """Tests the behavior of the default mode.""" - - self.RunAndVerify(env_var_value=None, flag_value=None, should_fail=False) - - def testThrowOnFailureEnvVar(self): - """Tests using the GTEST_THROW_ON_FAILURE environment variable.""" - - self.RunAndVerify(env_var_value='0', - flag_value=None, - should_fail=False) - self.RunAndVerify(env_var_value='1', - flag_value=None, - should_fail=True) - - def testThrowOnFailureFlag(self): - """Tests using the --gtest_throw_on_failure flag.""" - - self.RunAndVerify(env_var_value=None, - flag_value='0', - should_fail=False) - self.RunAndVerify(env_var_value=None, - flag_value='1', - should_fail=True) - - def testThrowOnFailureFlagOverridesEnvVar(self): - """Tests that --gtest_throw_on_failure overrides GTEST_THROW_ON_FAILURE.""" - - self.RunAndVerify(env_var_value='0', - flag_value='0', - should_fail=False) - self.RunAndVerify(env_var_value='0', - flag_value='1', - should_fail=True) - self.RunAndVerify(env_var_value='1', - flag_value='0', - should_fail=False) - self.RunAndVerify(env_var_value='1', - flag_value='1', - should_fail=True) - - -if __name__ == '__main__': - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_throw_on_failure_test_.cc b/test/gtest-1.8.0/test/gtest_throw_on_failure_test_.cc deleted file mode 100644 index 2b88fe3d9b..0000000000 --- a/test/gtest-1.8.0/test/gtest_throw_on_failure_test_.cc +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright 2009, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Tests Google Test's throw-on-failure mode with exceptions disabled. -// -// This program must be compiled with exceptions disabled. It will be -// invoked by gtest_throw_on_failure_test.py, and is expected to exit -// with non-zero in the throw-on-failure mode or 0 otherwise. - -#include "gtest/gtest.h" - -#include // for fflush, fprintf, NULL, etc. -#include // for exit -#include // for set_terminate - -// This terminate handler aborts the program using exit() rather than abort(). -// This avoids showing pop-ups on Windows systems and core dumps on Unix-like -// ones. -void TerminateHandler() { - fprintf(stderr, "%s\n", "Unhandled C++ exception terminating the program."); - fflush(NULL); - exit(1); -} - -int main(int argc, char** argv) { -#if GTEST_HAS_EXCEPTIONS - std::set_terminate(&TerminateHandler); -#endif - testing::InitGoogleTest(&argc, argv); - - // We want to ensure that people can use Google Test assertions in - // other testing frameworks, as long as they initialize Google Test - // properly and set the throw-on-failure mode. Therefore, we don't - // use Google Test's constructs for defining and running tests - // (e.g. TEST and RUN_ALL_TESTS) here. - - // In the throw-on-failure mode with exceptions disabled, this - // assertion will cause the program to exit with a non-zero code. - EXPECT_EQ(2, 3); - - // When not in the throw-on-failure mode, the control will reach - // here. - return 0; -} diff --git a/test/gtest-1.8.0/test/gtest_uninitialized_test.py b/test/gtest-1.8.0/test/gtest_uninitialized_test.py deleted file mode 100644 index ae91f2aae8..0000000000 --- a/test/gtest-1.8.0/test/gtest_uninitialized_test.py +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Verifies that Google Test warns the user when not initialized properly.""" - -__author__ = 'wan@google.com (Zhanyong Wan)' - -import gtest_test_utils - -COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_uninitialized_test_') - - -def Assert(condition): - if not condition: - raise AssertionError - - -def AssertEq(expected, actual): - if expected != actual: - print 'Expected: %s' % (expected,) - print ' Actual: %s' % (actual,) - raise AssertionError - - -def TestExitCodeAndOutput(command): - """Runs the given command and verifies its exit code and output.""" - - # Verifies that 'command' exits with code 1. - p = gtest_test_utils.Subprocess(command) - if p.exited and p.exit_code == 0: - Assert('IMPORTANT NOTICE' in p.output); - Assert('InitGoogleTest' in p.output) - - -class GTestUninitializedTest(gtest_test_utils.TestCase): - def testExitCodeAndOutput(self): - TestExitCodeAndOutput(COMMAND) - - -if __name__ == '__main__': - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_uninitialized_test_.cc b/test/gtest-1.8.0/test/gtest_uninitialized_test_.cc deleted file mode 100644 index 2ba0e8b809..0000000000 --- a/test/gtest-1.8.0/test/gtest_uninitialized_test_.cc +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -#include "gtest/gtest.h" - -TEST(DummyTest, Dummy) { - // This test doesn't verify anything. We just need it to create a - // realistic stage for testing the behavior of Google Test when - // RUN_ALL_TESTS() is called without - // testing::InitGoogleTest() being called first. -} - -int main() { - return RUN_ALL_TESTS(); -} diff --git a/test/gtest-1.8.0/test/gtest_unittest.cc b/test/gtest-1.8.0/test/gtest_unittest.cc deleted file mode 100644 index 39b68413a6..0000000000 --- a/test/gtest-1.8.0/test/gtest_unittest.cc +++ /dev/null @@ -1,7797 +0,0 @@ -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// Tests for Google Test itself. This verifies that the basic constructs of -// Google Test work. - -#include "gtest/gtest.h" - -// Verifies that the command line flag variables can be accessed in -// code once "gtest/gtest.h" has been -// #included. Do not move it after other gtest #includes. -TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) { - bool dummy = testing::GTEST_FLAG(also_run_disabled_tests) - || testing::GTEST_FLAG(break_on_failure) - || testing::GTEST_FLAG(catch_exceptions) - || testing::GTEST_FLAG(color) != "unknown" - || testing::GTEST_FLAG(filter) != "unknown" - || testing::GTEST_FLAG(list_tests) - || testing::GTEST_FLAG(output) != "unknown" - || testing::GTEST_FLAG(print_time) - || testing::GTEST_FLAG(random_seed) - || testing::GTEST_FLAG(repeat) > 0 - || testing::GTEST_FLAG(show_internal_stack_frames) - || testing::GTEST_FLAG(shuffle) - || testing::GTEST_FLAG(stack_trace_depth) > 0 - || testing::GTEST_FLAG(stream_result_to) != "unknown" - || testing::GTEST_FLAG(throw_on_failure); - EXPECT_TRUE(dummy || !dummy); // Suppresses warning that dummy is unused. -} - -#include // For INT_MAX. -#include -#include -#include - -#include -#include -#include -#if GTEST_LANG_CXX11 -#include -#endif // GTEST_LANG_CXX11 - -#include "gtest/gtest-spi.h" -#include "src/gtest-internal-inl.h" - -namespace testing { -namespace internal { - -#if GTEST_CAN_STREAM_RESULTS_ - -class StreamingListenerTest : public Test { - public: - class FakeSocketWriter : public StreamingListener::AbstractSocketWriter { - public: - // Sends a string to the socket. - virtual void Send(const std::string& message) { output_ += message; } - - std::string output_; - }; - - StreamingListenerTest() - : fake_sock_writer_(new FakeSocketWriter), - streamer_(fake_sock_writer_), - test_info_obj_("FooTest", "Bar", NULL, NULL, - CodeLocation(__FILE__, __LINE__), 0, NULL) {} - - protected: - std::string* output() { return &(fake_sock_writer_->output_); } - - FakeSocketWriter* const fake_sock_writer_; - StreamingListener streamer_; - UnitTest unit_test_; - TestInfo test_info_obj_; // The name test_info_ was taken by testing::Test. -}; - -TEST_F(StreamingListenerTest, OnTestProgramEnd) { - *output() = ""; - streamer_.OnTestProgramEnd(unit_test_); - EXPECT_EQ("event=TestProgramEnd&passed=1\n", *output()); -} - -TEST_F(StreamingListenerTest, OnTestIterationEnd) { - *output() = ""; - streamer_.OnTestIterationEnd(unit_test_, 42); - EXPECT_EQ("event=TestIterationEnd&passed=1&elapsed_time=0ms\n", *output()); -} - -TEST_F(StreamingListenerTest, OnTestCaseStart) { - *output() = ""; - streamer_.OnTestCaseStart(TestCase("FooTest", "Bar", NULL, NULL)); - EXPECT_EQ("event=TestCaseStart&name=FooTest\n", *output()); -} - -TEST_F(StreamingListenerTest, OnTestCaseEnd) { - *output() = ""; - streamer_.OnTestCaseEnd(TestCase("FooTest", "Bar", NULL, NULL)); - EXPECT_EQ("event=TestCaseEnd&passed=1&elapsed_time=0ms\n", *output()); -} - -TEST_F(StreamingListenerTest, OnTestStart) { - *output() = ""; - streamer_.OnTestStart(test_info_obj_); - EXPECT_EQ("event=TestStart&name=Bar\n", *output()); -} - -TEST_F(StreamingListenerTest, OnTestEnd) { - *output() = ""; - streamer_.OnTestEnd(test_info_obj_); - EXPECT_EQ("event=TestEnd&passed=1&elapsed_time=0ms\n", *output()); -} - -TEST_F(StreamingListenerTest, OnTestPartResult) { - *output() = ""; - streamer_.OnTestPartResult(TestPartResult( - TestPartResult::kFatalFailure, "foo.cc", 42, "failed=\n&%")); - - // Meta characters in the failure message should be properly escaped. - EXPECT_EQ( - "event=TestPartResult&file=foo.cc&line=42&message=failed%3D%0A%26%25\n", - *output()); -} - -#endif // GTEST_CAN_STREAM_RESULTS_ - -// Provides access to otherwise private parts of the TestEventListeners class -// that are needed to test it. -class TestEventListenersAccessor { - public: - static TestEventListener* GetRepeater(TestEventListeners* listeners) { - return listeners->repeater(); - } - - static void SetDefaultResultPrinter(TestEventListeners* listeners, - TestEventListener* listener) { - listeners->SetDefaultResultPrinter(listener); - } - static void SetDefaultXmlGenerator(TestEventListeners* listeners, - TestEventListener* listener) { - listeners->SetDefaultXmlGenerator(listener); - } - - static bool EventForwardingEnabled(const TestEventListeners& listeners) { - return listeners.EventForwardingEnabled(); - } - - static void SuppressEventForwarding(TestEventListeners* listeners) { - listeners->SuppressEventForwarding(); - } -}; - -class UnitTestRecordPropertyTestHelper : public Test { - protected: - UnitTestRecordPropertyTestHelper() {} - - // Forwards to UnitTest::RecordProperty() to bypass access controls. - void UnitTestRecordProperty(const char* key, const std::string& value) { - unit_test_.RecordProperty(key, value); - } - - UnitTest unit_test_; -}; - -} // namespace internal -} // namespace testing - -using testing::AssertionFailure; -using testing::AssertionResult; -using testing::AssertionSuccess; -using testing::DoubleLE; -using testing::EmptyTestEventListener; -using testing::Environment; -using testing::FloatLE; -using testing::GTEST_FLAG(also_run_disabled_tests); -using testing::GTEST_FLAG(break_on_failure); -using testing::GTEST_FLAG(catch_exceptions); -using testing::GTEST_FLAG(color); -using testing::GTEST_FLAG(death_test_use_fork); -using testing::GTEST_FLAG(filter); -using testing::GTEST_FLAG(list_tests); -using testing::GTEST_FLAG(output); -using testing::GTEST_FLAG(print_time); -using testing::GTEST_FLAG(random_seed); -using testing::GTEST_FLAG(repeat); -using testing::GTEST_FLAG(show_internal_stack_frames); -using testing::GTEST_FLAG(shuffle); -using testing::GTEST_FLAG(stack_trace_depth); -using testing::GTEST_FLAG(stream_result_to); -using testing::GTEST_FLAG(throw_on_failure); -using testing::IsNotSubstring; -using testing::IsSubstring; -using testing::Message; -using testing::ScopedFakeTestPartResultReporter; -using testing::StaticAssertTypeEq; -using testing::Test; -using testing::TestCase; -using testing::TestEventListeners; -using testing::TestInfo; -using testing::TestPartResult; -using testing::TestPartResultArray; -using testing::TestProperty; -using testing::TestResult; -using testing::TimeInMillis; -using testing::UnitTest; -using testing::internal::AddReference; -using testing::internal::AlwaysFalse; -using testing::internal::AlwaysTrue; -using testing::internal::AppendUserMessage; -using testing::internal::ArrayAwareFind; -using testing::internal::ArrayEq; -using testing::internal::CodePointToUtf8; -using testing::internal::CompileAssertTypesEqual; -using testing::internal::CopyArray; -using testing::internal::CountIf; -using testing::internal::EqFailure; -using testing::internal::FloatingPoint; -using testing::internal::ForEach; -using testing::internal::FormatEpochTimeInMillisAsIso8601; -using testing::internal::FormatTimeInMillisAsSeconds; -using testing::internal::GTestFlagSaver; -using testing::internal::GetCurrentOsStackTraceExceptTop; -using testing::internal::GetElementOr; -using testing::internal::GetNextRandomSeed; -using testing::internal::GetRandomSeedFromFlag; -using testing::internal::GetTestTypeId; -using testing::internal::GetTimeInMillis; -using testing::internal::GetTypeId; -using testing::internal::GetUnitTestImpl; -using testing::internal::ImplicitlyConvertible; -using testing::internal::Int32; -using testing::internal::Int32FromEnvOrDie; -using testing::internal::IsAProtocolMessage; -using testing::internal::IsContainer; -using testing::internal::IsContainerTest; -using testing::internal::IsNotContainer; -using testing::internal::NativeArray; -using testing::internal::OsStackTraceGetter; -using testing::internal::OsStackTraceGetterInterface; -using testing::internal::ParseInt32Flag; -using testing::internal::RelationToSourceCopy; -using testing::internal::RelationToSourceReference; -using testing::internal::RemoveConst; -using testing::internal::RemoveReference; -using testing::internal::ShouldRunTestOnShard; -using testing::internal::ShouldShard; -using testing::internal::ShouldUseColor; -using testing::internal::Shuffle; -using testing::internal::ShuffleRange; -using testing::internal::SkipPrefix; -using testing::internal::StreamableToString; -using testing::internal::String; -using testing::internal::TestEventListenersAccessor; -using testing::internal::TestResultAccessor; -using testing::internal::UInt32; -using testing::internal::UnitTestImpl; -using testing::internal::WideStringToUtf8; -using testing::internal::edit_distance::CalculateOptimalEdits; -using testing::internal::edit_distance::CreateUnifiedDiff; -using testing::internal::edit_distance::EditType; -using testing::internal::kMaxRandomSeed; -using testing::internal::kTestTypeIdInGoogleTest; -using testing::kMaxStackTraceDepth; - -#if GTEST_HAS_STREAM_REDIRECTION -using testing::internal::CaptureStdout; -using testing::internal::GetCapturedStdout; -#endif - -#if GTEST_IS_THREADSAFE -using testing::internal::ThreadWithParam; -#endif - -class TestingVector : public std::vector { -}; - -::std::ostream& operator<<(::std::ostream& os, - const TestingVector& vector) { - os << "{ "; - for (size_t i = 0; i < vector.size(); i++) { - os << vector[i] << " "; - } - os << "}"; - return os; -} - -// This line tests that we can define tests in an unnamed namespace. -namespace { - -TEST(GetRandomSeedFromFlagTest, HandlesZero) { - const int seed = GetRandomSeedFromFlag(0); - EXPECT_LE(1, seed); - EXPECT_LE(seed, static_cast(kMaxRandomSeed)); -} - -TEST(GetRandomSeedFromFlagTest, PreservesValidSeed) { - EXPECT_EQ(1, GetRandomSeedFromFlag(1)); - EXPECT_EQ(2, GetRandomSeedFromFlag(2)); - EXPECT_EQ(kMaxRandomSeed - 1, GetRandomSeedFromFlag(kMaxRandomSeed - 1)); - EXPECT_EQ(static_cast(kMaxRandomSeed), - GetRandomSeedFromFlag(kMaxRandomSeed)); -} - -TEST(GetRandomSeedFromFlagTest, NormalizesInvalidSeed) { - const int seed1 = GetRandomSeedFromFlag(-1); - EXPECT_LE(1, seed1); - EXPECT_LE(seed1, static_cast(kMaxRandomSeed)); - - const int seed2 = GetRandomSeedFromFlag(kMaxRandomSeed + 1); - EXPECT_LE(1, seed2); - EXPECT_LE(seed2, static_cast(kMaxRandomSeed)); -} - -TEST(GetNextRandomSeedTest, WorksForValidInput) { - EXPECT_EQ(2, GetNextRandomSeed(1)); - EXPECT_EQ(3, GetNextRandomSeed(2)); - EXPECT_EQ(static_cast(kMaxRandomSeed), - GetNextRandomSeed(kMaxRandomSeed - 1)); - EXPECT_EQ(1, GetNextRandomSeed(kMaxRandomSeed)); - - // We deliberately don't test GetNextRandomSeed() with invalid - // inputs, as that requires death tests, which are expensive. This - // is fine as GetNextRandomSeed() is internal and has a - // straightforward definition. -} - -static void ClearCurrentTestPartResults() { - TestResultAccessor::ClearTestPartResults( - GetUnitTestImpl()->current_test_result()); -} - -// Tests GetTypeId. - -TEST(GetTypeIdTest, ReturnsSameValueForSameType) { - EXPECT_EQ(GetTypeId(), GetTypeId()); - EXPECT_EQ(GetTypeId(), GetTypeId()); -} - -class SubClassOfTest : public Test {}; -class AnotherSubClassOfTest : public Test {}; - -TEST(GetTypeIdTest, ReturnsDifferentValuesForDifferentTypes) { - EXPECT_NE(GetTypeId(), GetTypeId()); - EXPECT_NE(GetTypeId(), GetTypeId()); - EXPECT_NE(GetTypeId(), GetTestTypeId()); - EXPECT_NE(GetTypeId(), GetTestTypeId()); - EXPECT_NE(GetTypeId(), GetTestTypeId()); - EXPECT_NE(GetTypeId(), GetTypeId()); -} - -// Verifies that GetTestTypeId() returns the same value, no matter it -// is called from inside Google Test or outside of it. -TEST(GetTestTypeIdTest, ReturnsTheSameValueInsideOrOutsideOfGoogleTest) { - EXPECT_EQ(kTestTypeIdInGoogleTest, GetTestTypeId()); -} - -// Tests CanonicalizeForStdLibVersioning. - -using ::testing::internal::CanonicalizeForStdLibVersioning; - -TEST(CanonicalizeForStdLibVersioning, LeavesUnversionedNamesUnchanged) { - EXPECT_EQ("std::bind", CanonicalizeForStdLibVersioning("std::bind")); - EXPECT_EQ("std::_", CanonicalizeForStdLibVersioning("std::_")); - EXPECT_EQ("std::__foo", CanonicalizeForStdLibVersioning("std::__foo")); - EXPECT_EQ("gtl::__1::x", CanonicalizeForStdLibVersioning("gtl::__1::x")); - EXPECT_EQ("__1::x", CanonicalizeForStdLibVersioning("__1::x")); - EXPECT_EQ("::__1::x", CanonicalizeForStdLibVersioning("::__1::x")); -} - -TEST(CanonicalizeForStdLibVersioning, ElidesDoubleUnderNames) { - EXPECT_EQ("std::bind", CanonicalizeForStdLibVersioning("std::__1::bind")); - EXPECT_EQ("std::_", CanonicalizeForStdLibVersioning("std::__1::_")); - - EXPECT_EQ("std::bind", CanonicalizeForStdLibVersioning("std::__g::bind")); - EXPECT_EQ("std::_", CanonicalizeForStdLibVersioning("std::__g::_")); - - EXPECT_EQ("std::bind", - CanonicalizeForStdLibVersioning("std::__google::bind")); - EXPECT_EQ("std::_", CanonicalizeForStdLibVersioning("std::__google::_")); -} - -// Tests FormatTimeInMillisAsSeconds(). - -TEST(FormatTimeInMillisAsSecondsTest, FormatsZero) { - EXPECT_EQ("0", FormatTimeInMillisAsSeconds(0)); -} - -TEST(FormatTimeInMillisAsSecondsTest, FormatsPositiveNumber) { - EXPECT_EQ("0.003", FormatTimeInMillisAsSeconds(3)); - EXPECT_EQ("0.01", FormatTimeInMillisAsSeconds(10)); - EXPECT_EQ("0.2", FormatTimeInMillisAsSeconds(200)); - EXPECT_EQ("1.2", FormatTimeInMillisAsSeconds(1200)); - EXPECT_EQ("3", FormatTimeInMillisAsSeconds(3000)); -} - -TEST(FormatTimeInMillisAsSecondsTest, FormatsNegativeNumber) { - EXPECT_EQ("-0.003", FormatTimeInMillisAsSeconds(-3)); - EXPECT_EQ("-0.01", FormatTimeInMillisAsSeconds(-10)); - EXPECT_EQ("-0.2", FormatTimeInMillisAsSeconds(-200)); - EXPECT_EQ("-1.2", FormatTimeInMillisAsSeconds(-1200)); - EXPECT_EQ("-3", FormatTimeInMillisAsSeconds(-3000)); -} - -// Tests FormatEpochTimeInMillisAsIso8601(). The correctness of conversion -// for particular dates below was verified in Python using -// datetime.datetime.fromutctimestamp(/1000). - -// FormatEpochTimeInMillisAsIso8601 depends on the current timezone, so we -// have to set up a particular timezone to obtain predictable results. -class FormatEpochTimeInMillisAsIso8601Test : public Test { - public: - // On Cygwin, GCC doesn't allow unqualified integer literals to exceed - // 32 bits, even when 64-bit integer types are available. We have to - // force the constants to have a 64-bit type here. - static const TimeInMillis kMillisPerSec = 1000; - - private: - virtual void SetUp() { - saved_tz_ = NULL; - - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996 /* getenv, strdup: deprecated */) - if (getenv("TZ")) - saved_tz_ = strdup(getenv("TZ")); - GTEST_DISABLE_MSC_WARNINGS_POP_() - - // Set up the time zone for FormatEpochTimeInMillisAsIso8601 to use. We - // cannot use the local time zone because the function's output depends - // on the time zone. - SetTimeZone("UTC+00"); - } - - virtual void TearDown() { - SetTimeZone(saved_tz_); - free(const_cast(saved_tz_)); - saved_tz_ = NULL; - } - - static void SetTimeZone(const char* time_zone) { - // tzset() distinguishes between the TZ variable being present and empty - // and not being present, so we have to consider the case of time_zone - // being NULL. -#if _MSC_VER || GTEST_OS_WINDOWS_MINGW - // ...Unless it's MSVC, whose standard library's _putenv doesn't - // distinguish between an empty and a missing variable. - const std::string env_var = - std::string("TZ=") + (time_zone ? time_zone : ""); - _putenv(env_var.c_str()); - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996 /* deprecated function */) - tzset(); - GTEST_DISABLE_MSC_WARNINGS_POP_() -#else - if (time_zone) { - setenv(("TZ"), time_zone, 1); - } else { - unsetenv("TZ"); - } - tzset(); -#endif - } - - const char* saved_tz_; -}; - -const TimeInMillis FormatEpochTimeInMillisAsIso8601Test::kMillisPerSec; - -TEST_F(FormatEpochTimeInMillisAsIso8601Test, PrintsTwoDigitSegments) { - EXPECT_EQ("2011-10-31T18:52:42", - FormatEpochTimeInMillisAsIso8601(1320087162 * kMillisPerSec)); -} - -TEST_F(FormatEpochTimeInMillisAsIso8601Test, MillisecondsDoNotAffectResult) { - EXPECT_EQ( - "2011-10-31T18:52:42", - FormatEpochTimeInMillisAsIso8601(1320087162 * kMillisPerSec + 234)); -} - -TEST_F(FormatEpochTimeInMillisAsIso8601Test, PrintsLeadingZeroes) { - EXPECT_EQ("2011-09-03T05:07:02", - FormatEpochTimeInMillisAsIso8601(1315026422 * kMillisPerSec)); -} - -TEST_F(FormatEpochTimeInMillisAsIso8601Test, Prints24HourTime) { - EXPECT_EQ("2011-09-28T17:08:22", - FormatEpochTimeInMillisAsIso8601(1317229702 * kMillisPerSec)); -} - -TEST_F(FormatEpochTimeInMillisAsIso8601Test, PrintsEpochStart) { - EXPECT_EQ("1970-01-01T00:00:00", FormatEpochTimeInMillisAsIso8601(0)); -} - -#if GTEST_CAN_COMPARE_NULL - -# ifdef __BORLANDC__ -// Silences warnings: "Condition is always true", "Unreachable code" -# pragma option push -w-ccc -w-rch -# endif - -// Tests that GTEST_IS_NULL_LITERAL_(x) is true when x is a null -// pointer literal. -TEST(NullLiteralTest, IsTrueForNullLiterals) { - EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(NULL)); - EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0)); - EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0U)); - EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0L)); -} - -// Tests that GTEST_IS_NULL_LITERAL_(x) is false when x is not a null -// pointer literal. -TEST(NullLiteralTest, IsFalseForNonNullLiterals) { - EXPECT_FALSE(GTEST_IS_NULL_LITERAL_(1)); - EXPECT_FALSE(GTEST_IS_NULL_LITERAL_(0.0)); - EXPECT_FALSE(GTEST_IS_NULL_LITERAL_('a')); - EXPECT_FALSE(GTEST_IS_NULL_LITERAL_(static_cast(NULL))); -} - -# ifdef __BORLANDC__ -// Restores warnings after previous "#pragma option push" suppressed them. -# pragma option pop -# endif - -#endif // GTEST_CAN_COMPARE_NULL -// -// Tests CodePointToUtf8(). - -// Tests that the NUL character L'\0' is encoded correctly. -TEST(CodePointToUtf8Test, CanEncodeNul) { - EXPECT_EQ("", CodePointToUtf8(L'\0')); -} - -// Tests that ASCII characters are encoded correctly. -TEST(CodePointToUtf8Test, CanEncodeAscii) { - EXPECT_EQ("a", CodePointToUtf8(L'a')); - EXPECT_EQ("Z", CodePointToUtf8(L'Z')); - EXPECT_EQ("&", CodePointToUtf8(L'&')); - EXPECT_EQ("\x7F", CodePointToUtf8(L'\x7F')); -} - -// Tests that Unicode code-points that have 8 to 11 bits are encoded -// as 110xxxxx 10xxxxxx. -TEST(CodePointToUtf8Test, CanEncode8To11Bits) { - // 000 1101 0011 => 110-00011 10-010011 - EXPECT_EQ("\xC3\x93", CodePointToUtf8(L'\xD3')); - - // 101 0111 0110 => 110-10101 10-110110 - // Some compilers (e.g., GCC on MinGW) cannot handle non-ASCII codepoints - // in wide strings and wide chars. In order to accommodate them, we have to - // introduce such character constants as integers. - EXPECT_EQ("\xD5\xB6", - CodePointToUtf8(static_cast(0x576))); -} - -// Tests that Unicode code-points that have 12 to 16 bits are encoded -// as 1110xxxx 10xxxxxx 10xxxxxx. -TEST(CodePointToUtf8Test, CanEncode12To16Bits) { - // 0000 1000 1101 0011 => 1110-0000 10-100011 10-010011 - EXPECT_EQ("\xE0\xA3\x93", - CodePointToUtf8(static_cast(0x8D3))); - - // 1100 0111 0100 1101 => 1110-1100 10-011101 10-001101 - EXPECT_EQ("\xEC\x9D\x8D", - CodePointToUtf8(static_cast(0xC74D))); -} - -#if !GTEST_WIDE_STRING_USES_UTF16_ -// Tests in this group require a wchar_t to hold > 16 bits, and thus -// are skipped on Windows, Cygwin, and Symbian, where a wchar_t is -// 16-bit wide. This code may not compile on those systems. - -// Tests that Unicode code-points that have 17 to 21 bits are encoded -// as 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx. -TEST(CodePointToUtf8Test, CanEncode17To21Bits) { - // 0 0001 0000 1000 1101 0011 => 11110-000 10-010000 10-100011 10-010011 - EXPECT_EQ("\xF0\x90\xA3\x93", CodePointToUtf8(L'\x108D3')); - - // 0 0001 0000 0100 0000 0000 => 11110-000 10-010000 10-010000 10-000000 - EXPECT_EQ("\xF0\x90\x90\x80", CodePointToUtf8(L'\x10400')); - - // 1 0000 1000 0110 0011 0100 => 11110-100 10-001000 10-011000 10-110100 - EXPECT_EQ("\xF4\x88\x98\xB4", CodePointToUtf8(L'\x108634')); -} - -// Tests that encoding an invalid code-point generates the expected result. -TEST(CodePointToUtf8Test, CanEncodeInvalidCodePoint) { - EXPECT_EQ("(Invalid Unicode 0x1234ABCD)", CodePointToUtf8(L'\x1234ABCD')); -} - -#endif // !GTEST_WIDE_STRING_USES_UTF16_ - -// Tests WideStringToUtf8(). - -// Tests that the NUL character L'\0' is encoded correctly. -TEST(WideStringToUtf8Test, CanEncodeNul) { - EXPECT_STREQ("", WideStringToUtf8(L"", 0).c_str()); - EXPECT_STREQ("", WideStringToUtf8(L"", -1).c_str()); -} - -// Tests that ASCII strings are encoded correctly. -TEST(WideStringToUtf8Test, CanEncodeAscii) { - EXPECT_STREQ("a", WideStringToUtf8(L"a", 1).c_str()); - EXPECT_STREQ("ab", WideStringToUtf8(L"ab", 2).c_str()); - EXPECT_STREQ("a", WideStringToUtf8(L"a", -1).c_str()); - EXPECT_STREQ("ab", WideStringToUtf8(L"ab", -1).c_str()); -} - -// Tests that Unicode code-points that have 8 to 11 bits are encoded -// as 110xxxxx 10xxxxxx. -TEST(WideStringToUtf8Test, CanEncode8To11Bits) { - // 000 1101 0011 => 110-00011 10-010011 - EXPECT_STREQ("\xC3\x93", WideStringToUtf8(L"\xD3", 1).c_str()); - EXPECT_STREQ("\xC3\x93", WideStringToUtf8(L"\xD3", -1).c_str()); - - // 101 0111 0110 => 110-10101 10-110110 - const wchar_t s[] = { 0x576, '\0' }; - EXPECT_STREQ("\xD5\xB6", WideStringToUtf8(s, 1).c_str()); - EXPECT_STREQ("\xD5\xB6", WideStringToUtf8(s, -1).c_str()); -} - -// Tests that Unicode code-points that have 12 to 16 bits are encoded -// as 1110xxxx 10xxxxxx 10xxxxxx. -TEST(WideStringToUtf8Test, CanEncode12To16Bits) { - // 0000 1000 1101 0011 => 1110-0000 10-100011 10-010011 - const wchar_t s1[] = { 0x8D3, '\0' }; - EXPECT_STREQ("\xE0\xA3\x93", WideStringToUtf8(s1, 1).c_str()); - EXPECT_STREQ("\xE0\xA3\x93", WideStringToUtf8(s1, -1).c_str()); - - // 1100 0111 0100 1101 => 1110-1100 10-011101 10-001101 - const wchar_t s2[] = { 0xC74D, '\0' }; - EXPECT_STREQ("\xEC\x9D\x8D", WideStringToUtf8(s2, 1).c_str()); - EXPECT_STREQ("\xEC\x9D\x8D", WideStringToUtf8(s2, -1).c_str()); -} - -// Tests that the conversion stops when the function encounters \0 character. -TEST(WideStringToUtf8Test, StopsOnNulCharacter) { - EXPECT_STREQ("ABC", WideStringToUtf8(L"ABC\0XYZ", 100).c_str()); -} - -// Tests that the conversion stops when the function reaches the limit -// specified by the 'length' parameter. -TEST(WideStringToUtf8Test, StopsWhenLengthLimitReached) { - EXPECT_STREQ("ABC", WideStringToUtf8(L"ABCDEF", 3).c_str()); -} - -#if !GTEST_WIDE_STRING_USES_UTF16_ -// Tests that Unicode code-points that have 17 to 21 bits are encoded -// as 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx. This code may not compile -// on the systems using UTF-16 encoding. -TEST(WideStringToUtf8Test, CanEncode17To21Bits) { - // 0 0001 0000 1000 1101 0011 => 11110-000 10-010000 10-100011 10-010011 - EXPECT_STREQ("\xF0\x90\xA3\x93", WideStringToUtf8(L"\x108D3", 1).c_str()); - EXPECT_STREQ("\xF0\x90\xA3\x93", WideStringToUtf8(L"\x108D3", -1).c_str()); - - // 1 0000 1000 0110 0011 0100 => 11110-100 10-001000 10-011000 10-110100 - EXPECT_STREQ("\xF4\x88\x98\xB4", WideStringToUtf8(L"\x108634", 1).c_str()); - EXPECT_STREQ("\xF4\x88\x98\xB4", WideStringToUtf8(L"\x108634", -1).c_str()); -} - -// Tests that encoding an invalid code-point generates the expected result. -TEST(WideStringToUtf8Test, CanEncodeInvalidCodePoint) { - EXPECT_STREQ("(Invalid Unicode 0xABCDFF)", - WideStringToUtf8(L"\xABCDFF", -1).c_str()); -} -#else // !GTEST_WIDE_STRING_USES_UTF16_ -// Tests that surrogate pairs are encoded correctly on the systems using -// UTF-16 encoding in the wide strings. -TEST(WideStringToUtf8Test, CanEncodeValidUtf16SUrrogatePairs) { - const wchar_t s[] = { 0xD801, 0xDC00, '\0' }; - EXPECT_STREQ("\xF0\x90\x90\x80", WideStringToUtf8(s, -1).c_str()); -} - -// Tests that encoding an invalid UTF-16 surrogate pair -// generates the expected result. -TEST(WideStringToUtf8Test, CanEncodeInvalidUtf16SurrogatePair) { - // Leading surrogate is at the end of the string. - const wchar_t s1[] = { 0xD800, '\0' }; - EXPECT_STREQ("\xED\xA0\x80", WideStringToUtf8(s1, -1).c_str()); - // Leading surrogate is not followed by the trailing surrogate. - const wchar_t s2[] = { 0xD800, 'M', '\0' }; - EXPECT_STREQ("\xED\xA0\x80M", WideStringToUtf8(s2, -1).c_str()); - // Trailing surrogate appearas without a leading surrogate. - const wchar_t s3[] = { 0xDC00, 'P', 'Q', 'R', '\0' }; - EXPECT_STREQ("\xED\xB0\x80PQR", WideStringToUtf8(s3, -1).c_str()); -} -#endif // !GTEST_WIDE_STRING_USES_UTF16_ - -// Tests that codepoint concatenation works correctly. -#if !GTEST_WIDE_STRING_USES_UTF16_ -TEST(WideStringToUtf8Test, ConcatenatesCodepointsCorrectly) { - const wchar_t s[] = { 0x108634, 0xC74D, '\n', 0x576, 0x8D3, 0x108634, '\0'}; - EXPECT_STREQ( - "\xF4\x88\x98\xB4" - "\xEC\x9D\x8D" - "\n" - "\xD5\xB6" - "\xE0\xA3\x93" - "\xF4\x88\x98\xB4", - WideStringToUtf8(s, -1).c_str()); -} -#else -TEST(WideStringToUtf8Test, ConcatenatesCodepointsCorrectly) { - const wchar_t s[] = { 0xC74D, '\n', 0x576, 0x8D3, '\0'}; - EXPECT_STREQ( - "\xEC\x9D\x8D" "\n" "\xD5\xB6" "\xE0\xA3\x93", - WideStringToUtf8(s, -1).c_str()); -} -#endif // !GTEST_WIDE_STRING_USES_UTF16_ - -// Tests the Random class. - -TEST(RandomDeathTest, GeneratesCrashesOnInvalidRange) { - testing::internal::Random random(42); - EXPECT_DEATH_IF_SUPPORTED( - random.Generate(0), - "Cannot generate a number in the range \\[0, 0\\)"); - EXPECT_DEATH_IF_SUPPORTED( - random.Generate(testing::internal::Random::kMaxRange + 1), - "Generation of a number in \\[0, 2147483649\\) was requested, " - "but this can only generate numbers in \\[0, 2147483648\\)"); -} - -TEST(RandomTest, GeneratesNumbersWithinRange) { - const UInt32 kRange = 10000; - testing::internal::Random random(12345); - for (int i = 0; i < 10; i++) { - EXPECT_LT(random.Generate(kRange), kRange) << " for iteration " << i; - } - - testing::internal::Random random2(testing::internal::Random::kMaxRange); - for (int i = 0; i < 10; i++) { - EXPECT_LT(random2.Generate(kRange), kRange) << " for iteration " << i; - } -} - -TEST(RandomTest, RepeatsWhenReseeded) { - const int kSeed = 123; - const int kArraySize = 10; - const UInt32 kRange = 10000; - UInt32 values[kArraySize]; - - testing::internal::Random random(kSeed); - for (int i = 0; i < kArraySize; i++) { - values[i] = random.Generate(kRange); - } - - random.Reseed(kSeed); - for (int i = 0; i < kArraySize; i++) { - EXPECT_EQ(values[i], random.Generate(kRange)) << " for iteration " << i; - } -} - -// Tests STL container utilities. - -// Tests CountIf(). - -static bool IsPositive(int n) { return n > 0; } - -TEST(ContainerUtilityTest, CountIf) { - std::vector v; - EXPECT_EQ(0, CountIf(v, IsPositive)); // Works for an empty container. - - v.push_back(-1); - v.push_back(0); - EXPECT_EQ(0, CountIf(v, IsPositive)); // Works when no value satisfies. - - v.push_back(2); - v.push_back(-10); - v.push_back(10); - EXPECT_EQ(2, CountIf(v, IsPositive)); -} - -// Tests ForEach(). - -static int g_sum = 0; -static void Accumulate(int n) { g_sum += n; } - -TEST(ContainerUtilityTest, ForEach) { - std::vector v; - g_sum = 0; - ForEach(v, Accumulate); - EXPECT_EQ(0, g_sum); // Works for an empty container; - - g_sum = 0; - v.push_back(1); - ForEach(v, Accumulate); - EXPECT_EQ(1, g_sum); // Works for a container with one element. - - g_sum = 0; - v.push_back(20); - v.push_back(300); - ForEach(v, Accumulate); - EXPECT_EQ(321, g_sum); -} - -// Tests GetElementOr(). -TEST(ContainerUtilityTest, GetElementOr) { - std::vector a; - EXPECT_EQ('x', GetElementOr(a, 0, 'x')); - - a.push_back('a'); - a.push_back('b'); - EXPECT_EQ('a', GetElementOr(a, 0, 'x')); - EXPECT_EQ('b', GetElementOr(a, 1, 'x')); - EXPECT_EQ('x', GetElementOr(a, -2, 'x')); - EXPECT_EQ('x', GetElementOr(a, 2, 'x')); -} - -TEST(ContainerUtilityDeathTest, ShuffleRange) { - std::vector a; - a.push_back(0); - a.push_back(1); - a.push_back(2); - testing::internal::Random random(1); - - EXPECT_DEATH_IF_SUPPORTED( - ShuffleRange(&random, -1, 1, &a), - "Invalid shuffle range start -1: must be in range \\[0, 3\\]"); - EXPECT_DEATH_IF_SUPPORTED( - ShuffleRange(&random, 4, 4, &a), - "Invalid shuffle range start 4: must be in range \\[0, 3\\]"); - EXPECT_DEATH_IF_SUPPORTED( - ShuffleRange(&random, 3, 2, &a), - "Invalid shuffle range finish 2: must be in range \\[3, 3\\]"); - EXPECT_DEATH_IF_SUPPORTED( - ShuffleRange(&random, 3, 4, &a), - "Invalid shuffle range finish 4: must be in range \\[3, 3\\]"); -} - -class VectorShuffleTest : public Test { - protected: - static const int kVectorSize = 20; - - VectorShuffleTest() : random_(1) { - for (int i = 0; i < kVectorSize; i++) { - vector_.push_back(i); - } - } - - static bool VectorIsCorrupt(const TestingVector& vector) { - if (kVectorSize != static_cast(vector.size())) { - return true; - } - - bool found_in_vector[kVectorSize] = { false }; - for (size_t i = 0; i < vector.size(); i++) { - const int e = vector[i]; - if (e < 0 || e >= kVectorSize || found_in_vector[e]) { - return true; - } - found_in_vector[e] = true; - } - - // Vector size is correct, elements' range is correct, no - // duplicate elements. Therefore no corruption has occurred. - return false; - } - - static bool VectorIsNotCorrupt(const TestingVector& vector) { - return !VectorIsCorrupt(vector); - } - - static bool RangeIsShuffled(const TestingVector& vector, int begin, int end) { - for (int i = begin; i < end; i++) { - if (i != vector[i]) { - return true; - } - } - return false; - } - - static bool RangeIsUnshuffled( - const TestingVector& vector, int begin, int end) { - return !RangeIsShuffled(vector, begin, end); - } - - static bool VectorIsShuffled(const TestingVector& vector) { - return RangeIsShuffled(vector, 0, static_cast(vector.size())); - } - - static bool VectorIsUnshuffled(const TestingVector& vector) { - return !VectorIsShuffled(vector); - } - - testing::internal::Random random_; - TestingVector vector_; -}; // class VectorShuffleTest - -const int VectorShuffleTest::kVectorSize; - -TEST_F(VectorShuffleTest, HandlesEmptyRange) { - // Tests an empty range at the beginning... - ShuffleRange(&random_, 0, 0, &vector_); - ASSERT_PRED1(VectorIsNotCorrupt, vector_); - ASSERT_PRED1(VectorIsUnshuffled, vector_); - - // ...in the middle... - ShuffleRange(&random_, kVectorSize/2, kVectorSize/2, &vector_); - ASSERT_PRED1(VectorIsNotCorrupt, vector_); - ASSERT_PRED1(VectorIsUnshuffled, vector_); - - // ...at the end... - ShuffleRange(&random_, kVectorSize - 1, kVectorSize - 1, &vector_); - ASSERT_PRED1(VectorIsNotCorrupt, vector_); - ASSERT_PRED1(VectorIsUnshuffled, vector_); - - // ...and past the end. - ShuffleRange(&random_, kVectorSize, kVectorSize, &vector_); - ASSERT_PRED1(VectorIsNotCorrupt, vector_); - ASSERT_PRED1(VectorIsUnshuffled, vector_); -} - -TEST_F(VectorShuffleTest, HandlesRangeOfSizeOne) { - // Tests a size one range at the beginning... - ShuffleRange(&random_, 0, 1, &vector_); - ASSERT_PRED1(VectorIsNotCorrupt, vector_); - ASSERT_PRED1(VectorIsUnshuffled, vector_); - - // ...in the middle... - ShuffleRange(&random_, kVectorSize/2, kVectorSize/2 + 1, &vector_); - ASSERT_PRED1(VectorIsNotCorrupt, vector_); - ASSERT_PRED1(VectorIsUnshuffled, vector_); - - // ...and at the end. - ShuffleRange(&random_, kVectorSize - 1, kVectorSize, &vector_); - ASSERT_PRED1(VectorIsNotCorrupt, vector_); - ASSERT_PRED1(VectorIsUnshuffled, vector_); -} - -// Because we use our own random number generator and a fixed seed, -// we can guarantee that the following "random" tests will succeed. - -TEST_F(VectorShuffleTest, ShufflesEntireVector) { - Shuffle(&random_, &vector_); - ASSERT_PRED1(VectorIsNotCorrupt, vector_); - EXPECT_FALSE(VectorIsUnshuffled(vector_)) << vector_; - - // Tests the first and last elements in particular to ensure that - // there are no off-by-one problems in our shuffle algorithm. - EXPECT_NE(0, vector_[0]); - EXPECT_NE(kVectorSize - 1, vector_[kVectorSize - 1]); -} - -TEST_F(VectorShuffleTest, ShufflesStartOfVector) { - const int kRangeSize = kVectorSize/2; - - ShuffleRange(&random_, 0, kRangeSize, &vector_); - - ASSERT_PRED1(VectorIsNotCorrupt, vector_); - EXPECT_PRED3(RangeIsShuffled, vector_, 0, kRangeSize); - EXPECT_PRED3(RangeIsUnshuffled, vector_, kRangeSize, kVectorSize); -} - -TEST_F(VectorShuffleTest, ShufflesEndOfVector) { - const int kRangeSize = kVectorSize / 2; - ShuffleRange(&random_, kRangeSize, kVectorSize, &vector_); - - ASSERT_PRED1(VectorIsNotCorrupt, vector_); - EXPECT_PRED3(RangeIsUnshuffled, vector_, 0, kRangeSize); - EXPECT_PRED3(RangeIsShuffled, vector_, kRangeSize, kVectorSize); -} - -TEST_F(VectorShuffleTest, ShufflesMiddleOfVector) { - int kRangeSize = kVectorSize/3; - ShuffleRange(&random_, kRangeSize, 2*kRangeSize, &vector_); - - ASSERT_PRED1(VectorIsNotCorrupt, vector_); - EXPECT_PRED3(RangeIsUnshuffled, vector_, 0, kRangeSize); - EXPECT_PRED3(RangeIsShuffled, vector_, kRangeSize, 2*kRangeSize); - EXPECT_PRED3(RangeIsUnshuffled, vector_, 2*kRangeSize, kVectorSize); -} - -TEST_F(VectorShuffleTest, ShufflesRepeatably) { - TestingVector vector2; - for (int i = 0; i < kVectorSize; i++) { - vector2.push_back(i); - } - - random_.Reseed(1234); - Shuffle(&random_, &vector_); - random_.Reseed(1234); - Shuffle(&random_, &vector2); - - ASSERT_PRED1(VectorIsNotCorrupt, vector_); - ASSERT_PRED1(VectorIsNotCorrupt, vector2); - - for (int i = 0; i < kVectorSize; i++) { - EXPECT_EQ(vector_[i], vector2[i]) << " where i is " << i; - } -} - -// Tests the size of the AssertHelper class. - -TEST(AssertHelperTest, AssertHelperIsSmall) { - // To avoid breaking clients that use lots of assertions in one - // function, we cannot grow the size of AssertHelper. - EXPECT_LE(sizeof(testing::internal::AssertHelper), sizeof(void*)); -} - -// Tests String::EndsWithCaseInsensitive(). -TEST(StringTest, EndsWithCaseInsensitive) { - EXPECT_TRUE(String::EndsWithCaseInsensitive("foobar", "BAR")); - EXPECT_TRUE(String::EndsWithCaseInsensitive("foobaR", "bar")); - EXPECT_TRUE(String::EndsWithCaseInsensitive("foobar", "")); - EXPECT_TRUE(String::EndsWithCaseInsensitive("", "")); - - EXPECT_FALSE(String::EndsWithCaseInsensitive("Foobar", "foo")); - EXPECT_FALSE(String::EndsWithCaseInsensitive("foobar", "Foo")); - EXPECT_FALSE(String::EndsWithCaseInsensitive("", "foo")); -} - -// C++Builder's preprocessor is buggy; it fails to expand macros that -// appear in macro parameters after wide char literals. Provide an alias -// for NULL as a workaround. -static const wchar_t* const kNull = NULL; - -// Tests String::CaseInsensitiveWideCStringEquals -TEST(StringTest, CaseInsensitiveWideCStringEquals) { - EXPECT_TRUE(String::CaseInsensitiveWideCStringEquals(NULL, NULL)); - EXPECT_FALSE(String::CaseInsensitiveWideCStringEquals(kNull, L"")); - EXPECT_FALSE(String::CaseInsensitiveWideCStringEquals(L"", kNull)); - EXPECT_FALSE(String::CaseInsensitiveWideCStringEquals(kNull, L"foobar")); - EXPECT_FALSE(String::CaseInsensitiveWideCStringEquals(L"foobar", kNull)); - EXPECT_TRUE(String::CaseInsensitiveWideCStringEquals(L"foobar", L"foobar")); - EXPECT_TRUE(String::CaseInsensitiveWideCStringEquals(L"foobar", L"FOOBAR")); - EXPECT_TRUE(String::CaseInsensitiveWideCStringEquals(L"FOOBAR", L"foobar")); -} - -#if GTEST_OS_WINDOWS - -// Tests String::ShowWideCString(). -TEST(StringTest, ShowWideCString) { - EXPECT_STREQ("(null)", - String::ShowWideCString(NULL).c_str()); - EXPECT_STREQ("", String::ShowWideCString(L"").c_str()); - EXPECT_STREQ("foo", String::ShowWideCString(L"foo").c_str()); -} - -# if GTEST_OS_WINDOWS_MOBILE -TEST(StringTest, AnsiAndUtf16Null) { - EXPECT_EQ(NULL, String::AnsiToUtf16(NULL)); - EXPECT_EQ(NULL, String::Utf16ToAnsi(NULL)); -} - -TEST(StringTest, AnsiAndUtf16ConvertBasic) { - const char* ansi = String::Utf16ToAnsi(L"str"); - EXPECT_STREQ("str", ansi); - delete [] ansi; - const WCHAR* utf16 = String::AnsiToUtf16("str"); - EXPECT_EQ(0, wcsncmp(L"str", utf16, 3)); - delete [] utf16; -} - -TEST(StringTest, AnsiAndUtf16ConvertPathChars) { - const char* ansi = String::Utf16ToAnsi(L".:\\ \"*?"); - EXPECT_STREQ(".:\\ \"*?", ansi); - delete [] ansi; - const WCHAR* utf16 = String::AnsiToUtf16(".:\\ \"*?"); - EXPECT_EQ(0, wcsncmp(L".:\\ \"*?", utf16, 3)); - delete [] utf16; -} -# endif // GTEST_OS_WINDOWS_MOBILE - -#endif // GTEST_OS_WINDOWS - -// Tests TestProperty construction. -TEST(TestPropertyTest, StringValue) { - TestProperty property("key", "1"); - EXPECT_STREQ("key", property.key()); - EXPECT_STREQ("1", property.value()); -} - -// Tests TestProperty replacing a value. -TEST(TestPropertyTest, ReplaceStringValue) { - TestProperty property("key", "1"); - EXPECT_STREQ("1", property.value()); - property.SetValue("2"); - EXPECT_STREQ("2", property.value()); -} - -// AddFatalFailure() and AddNonfatalFailure() must be stand-alone -// functions (i.e. their definitions cannot be inlined at the call -// sites), or C++Builder won't compile the code. -static void AddFatalFailure() { - FAIL() << "Expected fatal failure."; -} - -static void AddNonfatalFailure() { - ADD_FAILURE() << "Expected non-fatal failure."; -} - -class ScopedFakeTestPartResultReporterTest : public Test { - public: // Must be public and not protected due to a bug in g++ 3.4.2. - enum FailureMode { - FATAL_FAILURE, - NONFATAL_FAILURE - }; - static void AddFailure(FailureMode failure) { - if (failure == FATAL_FAILURE) { - AddFatalFailure(); - } else { - AddNonfatalFailure(); - } - } -}; - -// Tests that ScopedFakeTestPartResultReporter intercepts test -// failures. -TEST_F(ScopedFakeTestPartResultReporterTest, InterceptsTestFailures) { - TestPartResultArray results; - { - ScopedFakeTestPartResultReporter reporter( - ScopedFakeTestPartResultReporter::INTERCEPT_ONLY_CURRENT_THREAD, - &results); - AddFailure(NONFATAL_FAILURE); - AddFailure(FATAL_FAILURE); - } - - EXPECT_EQ(2, results.size()); - EXPECT_TRUE(results.GetTestPartResult(0).nonfatally_failed()); - EXPECT_TRUE(results.GetTestPartResult(1).fatally_failed()); -} - -TEST_F(ScopedFakeTestPartResultReporterTest, DeprecatedConstructor) { - TestPartResultArray results; - { - // Tests, that the deprecated constructor still works. - ScopedFakeTestPartResultReporter reporter(&results); - AddFailure(NONFATAL_FAILURE); - } - EXPECT_EQ(1, results.size()); -} - -#if GTEST_IS_THREADSAFE - -class ScopedFakeTestPartResultReporterWithThreadsTest - : public ScopedFakeTestPartResultReporterTest { - protected: - static void AddFailureInOtherThread(FailureMode failure) { - ThreadWithParam thread(&AddFailure, failure, NULL); - thread.Join(); - } -}; - -TEST_F(ScopedFakeTestPartResultReporterWithThreadsTest, - InterceptsTestFailuresInAllThreads) { - TestPartResultArray results; - { - ScopedFakeTestPartResultReporter reporter( - ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, &results); - AddFailure(NONFATAL_FAILURE); - AddFailure(FATAL_FAILURE); - AddFailureInOtherThread(NONFATAL_FAILURE); - AddFailureInOtherThread(FATAL_FAILURE); - } - - EXPECT_EQ(4, results.size()); - EXPECT_TRUE(results.GetTestPartResult(0).nonfatally_failed()); - EXPECT_TRUE(results.GetTestPartResult(1).fatally_failed()); - EXPECT_TRUE(results.GetTestPartResult(2).nonfatally_failed()); - EXPECT_TRUE(results.GetTestPartResult(3).fatally_failed()); -} - -#endif // GTEST_IS_THREADSAFE - -// Tests EXPECT_FATAL_FAILURE{,ON_ALL_THREADS}. Makes sure that they -// work even if the failure is generated in a called function rather than -// the current context. - -typedef ScopedFakeTestPartResultReporterTest ExpectFatalFailureTest; - -TEST_F(ExpectFatalFailureTest, CatchesFatalFaliure) { - EXPECT_FATAL_FAILURE(AddFatalFailure(), "Expected fatal failure."); -} - -#if GTEST_HAS_GLOBAL_STRING -TEST_F(ExpectFatalFailureTest, AcceptsStringObject) { - EXPECT_FATAL_FAILURE(AddFatalFailure(), ::string("Expected fatal failure.")); -} -#endif - -TEST_F(ExpectFatalFailureTest, AcceptsStdStringObject) { - EXPECT_FATAL_FAILURE(AddFatalFailure(), - ::std::string("Expected fatal failure.")); -} - -TEST_F(ExpectFatalFailureTest, CatchesFatalFailureOnAllThreads) { - // We have another test below to verify that the macro catches fatal - // failures generated on another thread. - EXPECT_FATAL_FAILURE_ON_ALL_THREADS(AddFatalFailure(), - "Expected fatal failure."); -} - -#ifdef __BORLANDC__ -// Silences warnings: "Condition is always true" -# pragma option push -w-ccc -#endif - -// Tests that EXPECT_FATAL_FAILURE() can be used in a non-void -// function even when the statement in it contains ASSERT_*. - -int NonVoidFunction() { - EXPECT_FATAL_FAILURE(ASSERT_TRUE(false), ""); - EXPECT_FATAL_FAILURE_ON_ALL_THREADS(FAIL(), ""); - return 0; -} - -TEST_F(ExpectFatalFailureTest, CanBeUsedInNonVoidFunction) { - NonVoidFunction(); -} - -// Tests that EXPECT_FATAL_FAILURE(statement, ...) doesn't abort the -// current function even though 'statement' generates a fatal failure. - -void DoesNotAbortHelper(bool* aborted) { - EXPECT_FATAL_FAILURE(ASSERT_TRUE(false), ""); - EXPECT_FATAL_FAILURE_ON_ALL_THREADS(FAIL(), ""); - - *aborted = false; -} - -#ifdef __BORLANDC__ -// Restores warnings after previous "#pragma option push" suppressed them. -# pragma option pop -#endif - -TEST_F(ExpectFatalFailureTest, DoesNotAbort) { - bool aborted = true; - DoesNotAbortHelper(&aborted); - EXPECT_FALSE(aborted); -} - -// Tests that the EXPECT_FATAL_FAILURE{,_ON_ALL_THREADS} accepts a -// statement that contains a macro which expands to code containing an -// unprotected comma. - -static int global_var = 0; -#define GTEST_USE_UNPROTECTED_COMMA_ global_var++, global_var++ - -TEST_F(ExpectFatalFailureTest, AcceptsMacroThatExpandsToUnprotectedComma) { -#ifndef __BORLANDC__ - // ICE's in C++Builder. - EXPECT_FATAL_FAILURE({ - GTEST_USE_UNPROTECTED_COMMA_; - AddFatalFailure(); - }, ""); -#endif - - EXPECT_FATAL_FAILURE_ON_ALL_THREADS({ - GTEST_USE_UNPROTECTED_COMMA_; - AddFatalFailure(); - }, ""); -} - -// Tests EXPECT_NONFATAL_FAILURE{,ON_ALL_THREADS}. - -typedef ScopedFakeTestPartResultReporterTest ExpectNonfatalFailureTest; - -TEST_F(ExpectNonfatalFailureTest, CatchesNonfatalFailure) { - EXPECT_NONFATAL_FAILURE(AddNonfatalFailure(), - "Expected non-fatal failure."); -} - -#if GTEST_HAS_GLOBAL_STRING -TEST_F(ExpectNonfatalFailureTest, AcceptsStringObject) { - EXPECT_NONFATAL_FAILURE(AddNonfatalFailure(), - ::string("Expected non-fatal failure.")); -} -#endif - -TEST_F(ExpectNonfatalFailureTest, AcceptsStdStringObject) { - EXPECT_NONFATAL_FAILURE(AddNonfatalFailure(), - ::std::string("Expected non-fatal failure.")); -} - -TEST_F(ExpectNonfatalFailureTest, CatchesNonfatalFailureOnAllThreads) { - // We have another test below to verify that the macro catches - // non-fatal failures generated on another thread. - EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(AddNonfatalFailure(), - "Expected non-fatal failure."); -} - -// Tests that the EXPECT_NONFATAL_FAILURE{,_ON_ALL_THREADS} accepts a -// statement that contains a macro which expands to code containing an -// unprotected comma. -TEST_F(ExpectNonfatalFailureTest, AcceptsMacroThatExpandsToUnprotectedComma) { - EXPECT_NONFATAL_FAILURE({ - GTEST_USE_UNPROTECTED_COMMA_; - AddNonfatalFailure(); - }, ""); - - EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS({ - GTEST_USE_UNPROTECTED_COMMA_; - AddNonfatalFailure(); - }, ""); -} - -#if GTEST_IS_THREADSAFE - -typedef ScopedFakeTestPartResultReporterWithThreadsTest - ExpectFailureWithThreadsTest; - -TEST_F(ExpectFailureWithThreadsTest, ExpectFatalFailureOnAllThreads) { - EXPECT_FATAL_FAILURE_ON_ALL_THREADS(AddFailureInOtherThread(FATAL_FAILURE), - "Expected fatal failure."); -} - -TEST_F(ExpectFailureWithThreadsTest, ExpectNonFatalFailureOnAllThreads) { - EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS( - AddFailureInOtherThread(NONFATAL_FAILURE), "Expected non-fatal failure."); -} - -#endif // GTEST_IS_THREADSAFE - -// Tests the TestProperty class. - -TEST(TestPropertyTest, ConstructorWorks) { - const TestProperty property("key", "value"); - EXPECT_STREQ("key", property.key()); - EXPECT_STREQ("value", property.value()); -} - -TEST(TestPropertyTest, SetValue) { - TestProperty property("key", "value_1"); - EXPECT_STREQ("key", property.key()); - property.SetValue("value_2"); - EXPECT_STREQ("key", property.key()); - EXPECT_STREQ("value_2", property.value()); -} - -// Tests the TestResult class - -// The test fixture for testing TestResult. -class TestResultTest : public Test { - protected: - typedef std::vector TPRVector; - - // We make use of 2 TestPartResult objects, - TestPartResult * pr1, * pr2; - - // ... and 3 TestResult objects. - TestResult * r0, * r1, * r2; - - virtual void SetUp() { - // pr1 is for success. - pr1 = new TestPartResult(TestPartResult::kSuccess, - "foo/bar.cc", - 10, - "Success!"); - - // pr2 is for fatal failure. - pr2 = new TestPartResult(TestPartResult::kFatalFailure, - "foo/bar.cc", - -1, // This line number means "unknown" - "Failure!"); - - // Creates the TestResult objects. - r0 = new TestResult(); - r1 = new TestResult(); - r2 = new TestResult(); - - // In order to test TestResult, we need to modify its internal - // state, in particular the TestPartResult vector it holds. - // test_part_results() returns a const reference to this vector. - // We cast it to a non-const object s.t. it can be modified (yes, - // this is a hack). - TPRVector* results1 = const_cast( - &TestResultAccessor::test_part_results(*r1)); - TPRVector* results2 = const_cast( - &TestResultAccessor::test_part_results(*r2)); - - // r0 is an empty TestResult. - - // r1 contains a single SUCCESS TestPartResult. - results1->push_back(*pr1); - - // r2 contains a SUCCESS, and a FAILURE. - results2->push_back(*pr1); - results2->push_back(*pr2); - } - - virtual void TearDown() { - delete pr1; - delete pr2; - - delete r0; - delete r1; - delete r2; - } - - // Helper that compares two TestPartResults. - static void CompareTestPartResult(const TestPartResult& expected, - const TestPartResult& actual) { - EXPECT_EQ(expected.type(), actual.type()); - EXPECT_STREQ(expected.file_name(), actual.file_name()); - EXPECT_EQ(expected.line_number(), actual.line_number()); - EXPECT_STREQ(expected.summary(), actual.summary()); - EXPECT_STREQ(expected.message(), actual.message()); - EXPECT_EQ(expected.passed(), actual.passed()); - EXPECT_EQ(expected.failed(), actual.failed()); - EXPECT_EQ(expected.nonfatally_failed(), actual.nonfatally_failed()); - EXPECT_EQ(expected.fatally_failed(), actual.fatally_failed()); - } -}; - -// Tests TestResult::total_part_count(). -TEST_F(TestResultTest, total_part_count) { - ASSERT_EQ(0, r0->total_part_count()); - ASSERT_EQ(1, r1->total_part_count()); - ASSERT_EQ(2, r2->total_part_count()); -} - -// Tests TestResult::Passed(). -TEST_F(TestResultTest, Passed) { - ASSERT_TRUE(r0->Passed()); - ASSERT_TRUE(r1->Passed()); - ASSERT_FALSE(r2->Passed()); -} - -// Tests TestResult::Failed(). -TEST_F(TestResultTest, Failed) { - ASSERT_FALSE(r0->Failed()); - ASSERT_FALSE(r1->Failed()); - ASSERT_TRUE(r2->Failed()); -} - -// Tests TestResult::GetTestPartResult(). - -typedef TestResultTest TestResultDeathTest; - -TEST_F(TestResultDeathTest, GetTestPartResult) { - CompareTestPartResult(*pr1, r2->GetTestPartResult(0)); - CompareTestPartResult(*pr2, r2->GetTestPartResult(1)); - EXPECT_DEATH_IF_SUPPORTED(r2->GetTestPartResult(2), ""); - EXPECT_DEATH_IF_SUPPORTED(r2->GetTestPartResult(-1), ""); -} - -// Tests TestResult has no properties when none are added. -TEST(TestResultPropertyTest, NoPropertiesFoundWhenNoneAreAdded) { - TestResult test_result; - ASSERT_EQ(0, test_result.test_property_count()); -} - -// Tests TestResult has the expected property when added. -TEST(TestResultPropertyTest, OnePropertyFoundWhenAdded) { - TestResult test_result; - TestProperty property("key_1", "1"); - TestResultAccessor::RecordProperty(&test_result, "testcase", property); - ASSERT_EQ(1, test_result.test_property_count()); - const TestProperty& actual_property = test_result.GetTestProperty(0); - EXPECT_STREQ("key_1", actual_property.key()); - EXPECT_STREQ("1", actual_property.value()); -} - -// Tests TestResult has multiple properties when added. -TEST(TestResultPropertyTest, MultiplePropertiesFoundWhenAdded) { - TestResult test_result; - TestProperty property_1("key_1", "1"); - TestProperty property_2("key_2", "2"); - TestResultAccessor::RecordProperty(&test_result, "testcase", property_1); - TestResultAccessor::RecordProperty(&test_result, "testcase", property_2); - ASSERT_EQ(2, test_result.test_property_count()); - const TestProperty& actual_property_1 = test_result.GetTestProperty(0); - EXPECT_STREQ("key_1", actual_property_1.key()); - EXPECT_STREQ("1", actual_property_1.value()); - - const TestProperty& actual_property_2 = test_result.GetTestProperty(1); - EXPECT_STREQ("key_2", actual_property_2.key()); - EXPECT_STREQ("2", actual_property_2.value()); -} - -// Tests TestResult::RecordProperty() overrides values for duplicate keys. -TEST(TestResultPropertyTest, OverridesValuesForDuplicateKeys) { - TestResult test_result; - TestProperty property_1_1("key_1", "1"); - TestProperty property_2_1("key_2", "2"); - TestProperty property_1_2("key_1", "12"); - TestProperty property_2_2("key_2", "22"); - TestResultAccessor::RecordProperty(&test_result, "testcase", property_1_1); - TestResultAccessor::RecordProperty(&test_result, "testcase", property_2_1); - TestResultAccessor::RecordProperty(&test_result, "testcase", property_1_2); - TestResultAccessor::RecordProperty(&test_result, "testcase", property_2_2); - - ASSERT_EQ(2, test_result.test_property_count()); - const TestProperty& actual_property_1 = test_result.GetTestProperty(0); - EXPECT_STREQ("key_1", actual_property_1.key()); - EXPECT_STREQ("12", actual_property_1.value()); - - const TestProperty& actual_property_2 = test_result.GetTestProperty(1); - EXPECT_STREQ("key_2", actual_property_2.key()); - EXPECT_STREQ("22", actual_property_2.value()); -} - -// Tests TestResult::GetTestProperty(). -TEST(TestResultPropertyTest, GetTestProperty) { - TestResult test_result; - TestProperty property_1("key_1", "1"); - TestProperty property_2("key_2", "2"); - TestProperty property_3("key_3", "3"); - TestResultAccessor::RecordProperty(&test_result, "testcase", property_1); - TestResultAccessor::RecordProperty(&test_result, "testcase", property_2); - TestResultAccessor::RecordProperty(&test_result, "testcase", property_3); - - const TestProperty& fetched_property_1 = test_result.GetTestProperty(0); - const TestProperty& fetched_property_2 = test_result.GetTestProperty(1); - const TestProperty& fetched_property_3 = test_result.GetTestProperty(2); - - EXPECT_STREQ("key_1", fetched_property_1.key()); - EXPECT_STREQ("1", fetched_property_1.value()); - - EXPECT_STREQ("key_2", fetched_property_2.key()); - EXPECT_STREQ("2", fetched_property_2.value()); - - EXPECT_STREQ("key_3", fetched_property_3.key()); - EXPECT_STREQ("3", fetched_property_3.value()); - - EXPECT_DEATH_IF_SUPPORTED(test_result.GetTestProperty(3), ""); - EXPECT_DEATH_IF_SUPPORTED(test_result.GetTestProperty(-1), ""); -} - -// Tests the Test class. -// -// It's difficult to test every public method of this class (we are -// already stretching the limit of Google Test by using it to test itself!). -// Fortunately, we don't have to do that, as we are already testing -// the functionalities of the Test class extensively by using Google Test -// alone. -// -// Therefore, this section only contains one test. - -// Tests that GTestFlagSaver works on Windows and Mac. - -class GTestFlagSaverTest : public Test { - protected: - // Saves the Google Test flags such that we can restore them later, and - // then sets them to their default values. This will be called - // before the first test in this test case is run. - static void SetUpTestCase() { - saver_ = new GTestFlagSaver; - - GTEST_FLAG(also_run_disabled_tests) = false; - GTEST_FLAG(break_on_failure) = false; - GTEST_FLAG(catch_exceptions) = false; - GTEST_FLAG(death_test_use_fork) = false; - GTEST_FLAG(color) = "auto"; - GTEST_FLAG(filter) = ""; - GTEST_FLAG(list_tests) = false; - GTEST_FLAG(output) = ""; - GTEST_FLAG(print_time) = true; - GTEST_FLAG(random_seed) = 0; - GTEST_FLAG(repeat) = 1; - GTEST_FLAG(shuffle) = false; - GTEST_FLAG(stack_trace_depth) = kMaxStackTraceDepth; - GTEST_FLAG(stream_result_to) = ""; - GTEST_FLAG(throw_on_failure) = false; - } - - // Restores the Google Test flags that the tests have modified. This will - // be called after the last test in this test case is run. - static void TearDownTestCase() { - delete saver_; - saver_ = NULL; - } - - // Verifies that the Google Test flags have their default values, and then - // modifies each of them. - void VerifyAndModifyFlags() { - EXPECT_FALSE(GTEST_FLAG(also_run_disabled_tests)); - EXPECT_FALSE(GTEST_FLAG(break_on_failure)); - EXPECT_FALSE(GTEST_FLAG(catch_exceptions)); - EXPECT_STREQ("auto", GTEST_FLAG(color).c_str()); - EXPECT_FALSE(GTEST_FLAG(death_test_use_fork)); - EXPECT_STREQ("", GTEST_FLAG(filter).c_str()); - EXPECT_FALSE(GTEST_FLAG(list_tests)); - EXPECT_STREQ("", GTEST_FLAG(output).c_str()); - EXPECT_TRUE(GTEST_FLAG(print_time)); - EXPECT_EQ(0, GTEST_FLAG(random_seed)); - EXPECT_EQ(1, GTEST_FLAG(repeat)); - EXPECT_FALSE(GTEST_FLAG(shuffle)); - EXPECT_EQ(kMaxStackTraceDepth, GTEST_FLAG(stack_trace_depth)); - EXPECT_STREQ("", GTEST_FLAG(stream_result_to).c_str()); - EXPECT_FALSE(GTEST_FLAG(throw_on_failure)); - - GTEST_FLAG(also_run_disabled_tests) = true; - GTEST_FLAG(break_on_failure) = true; - GTEST_FLAG(catch_exceptions) = true; - GTEST_FLAG(color) = "no"; - GTEST_FLAG(death_test_use_fork) = true; - GTEST_FLAG(filter) = "abc"; - GTEST_FLAG(list_tests) = true; - GTEST_FLAG(output) = "xml:foo.xml"; - GTEST_FLAG(print_time) = false; - GTEST_FLAG(random_seed) = 1; - GTEST_FLAG(repeat) = 100; - GTEST_FLAG(shuffle) = true; - GTEST_FLAG(stack_trace_depth) = 1; - GTEST_FLAG(stream_result_to) = "localhost:1234"; - GTEST_FLAG(throw_on_failure) = true; - } - - private: - // For saving Google Test flags during this test case. - static GTestFlagSaver* saver_; -}; - -GTestFlagSaver* GTestFlagSaverTest::saver_ = NULL; - -// Google Test doesn't guarantee the order of tests. The following two -// tests are designed to work regardless of their order. - -// Modifies the Google Test flags in the test body. -TEST_F(GTestFlagSaverTest, ModifyGTestFlags) { - VerifyAndModifyFlags(); -} - -// Verifies that the Google Test flags in the body of the previous test were -// restored to their original values. -TEST_F(GTestFlagSaverTest, VerifyGTestFlags) { - VerifyAndModifyFlags(); -} - -// Sets an environment variable with the given name to the given -// value. If the value argument is "", unsets the environment -// variable. The caller must ensure that both arguments are not NULL. -static void SetEnv(const char* name, const char* value) { -#if GTEST_OS_WINDOWS_MOBILE - // Environment variables are not supported on Windows CE. - return; -#elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9) - // C++Builder's putenv only stores a pointer to its parameter; we have to - // ensure that the string remains valid as long as it might be needed. - // We use an std::map to do so. - static std::map added_env; - - // Because putenv stores a pointer to the string buffer, we can't delete the - // previous string (if present) until after it's replaced. - std::string *prev_env = NULL; - if (added_env.find(name) != added_env.end()) { - prev_env = added_env[name]; - } - added_env[name] = new std::string( - (Message() << name << "=" << value).GetString()); - - // The standard signature of putenv accepts a 'char*' argument. Other - // implementations, like C++Builder's, accept a 'const char*'. - // We cast away the 'const' since that would work for both variants. - putenv(const_cast(added_env[name]->c_str())); - delete prev_env; -#elif GTEST_OS_WINDOWS // If we are on Windows proper. - _putenv((Message() << name << "=" << value).GetString().c_str()); -#else - if (*value == '\0') { - unsetenv(name); - } else { - setenv(name, value, 1); - } -#endif // GTEST_OS_WINDOWS_MOBILE -} - -#if !GTEST_OS_WINDOWS_MOBILE -// Environment variables are not supported on Windows CE. - -using testing::internal::Int32FromGTestEnv; - -// Tests Int32FromGTestEnv(). - -// Tests that Int32FromGTestEnv() returns the default value when the -// environment variable is not set. -TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenVariableIsNotSet) { - SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", ""); - EXPECT_EQ(10, Int32FromGTestEnv("temp", 10)); -} - -# if !defined(GTEST_GET_INT32_FROM_ENV_) - -// Tests that Int32FromGTestEnv() returns the default value when the -// environment variable overflows as an Int32. -TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenValueOverflows) { - printf("(expecting 2 warnings)\n"); - - SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", "12345678987654321"); - EXPECT_EQ(20, Int32FromGTestEnv("temp", 20)); - - SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", "-12345678987654321"); - EXPECT_EQ(30, Int32FromGTestEnv("temp", 30)); -} - -// Tests that Int32FromGTestEnv() returns the default value when the -// environment variable does not represent a valid decimal integer. -TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenValueIsInvalid) { - printf("(expecting 2 warnings)\n"); - - SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", "A1"); - EXPECT_EQ(40, Int32FromGTestEnv("temp", 40)); - - SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", "12X"); - EXPECT_EQ(50, Int32FromGTestEnv("temp", 50)); -} - -# endif // !defined(GTEST_GET_INT32_FROM_ENV_) - -// Tests that Int32FromGTestEnv() parses and returns the value of the -// environment variable when it represents a valid decimal integer in -// the range of an Int32. -TEST(Int32FromGTestEnvTest, ParsesAndReturnsValidValue) { - SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", "123"); - EXPECT_EQ(123, Int32FromGTestEnv("temp", 0)); - - SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", "-321"); - EXPECT_EQ(-321, Int32FromGTestEnv("temp", 0)); -} -#endif // !GTEST_OS_WINDOWS_MOBILE - -// Tests ParseInt32Flag(). - -// Tests that ParseInt32Flag() returns false and doesn't change the -// output value when the flag has wrong format -TEST(ParseInt32FlagTest, ReturnsFalseForInvalidFlag) { - Int32 value = 123; - EXPECT_FALSE(ParseInt32Flag("--a=100", "b", &value)); - EXPECT_EQ(123, value); - - EXPECT_FALSE(ParseInt32Flag("a=100", "a", &value)); - EXPECT_EQ(123, value); -} - -// Tests that ParseInt32Flag() returns false and doesn't change the -// output value when the flag overflows as an Int32. -TEST(ParseInt32FlagTest, ReturnsDefaultWhenValueOverflows) { - printf("(expecting 2 warnings)\n"); - - Int32 value = 123; - EXPECT_FALSE(ParseInt32Flag("--abc=12345678987654321", "abc", &value)); - EXPECT_EQ(123, value); - - EXPECT_FALSE(ParseInt32Flag("--abc=-12345678987654321", "abc", &value)); - EXPECT_EQ(123, value); -} - -// Tests that ParseInt32Flag() returns false and doesn't change the -// output value when the flag does not represent a valid decimal -// integer. -TEST(ParseInt32FlagTest, ReturnsDefaultWhenValueIsInvalid) { - printf("(expecting 2 warnings)\n"); - - Int32 value = 123; - EXPECT_FALSE(ParseInt32Flag("--abc=A1", "abc", &value)); - EXPECT_EQ(123, value); - - EXPECT_FALSE(ParseInt32Flag("--abc=12X", "abc", &value)); - EXPECT_EQ(123, value); -} - -// Tests that ParseInt32Flag() parses the value of the flag and -// returns true when the flag represents a valid decimal integer in -// the range of an Int32. -TEST(ParseInt32FlagTest, ParsesAndReturnsValidValue) { - Int32 value = 123; - EXPECT_TRUE(ParseInt32Flag("--" GTEST_FLAG_PREFIX_ "abc=456", "abc", &value)); - EXPECT_EQ(456, value); - - EXPECT_TRUE(ParseInt32Flag("--" GTEST_FLAG_PREFIX_ "abc=-789", - "abc", &value)); - EXPECT_EQ(-789, value); -} - -// Tests that Int32FromEnvOrDie() parses the value of the var or -// returns the correct default. -// Environment variables are not supported on Windows CE. -#if !GTEST_OS_WINDOWS_MOBILE -TEST(Int32FromEnvOrDieTest, ParsesAndReturnsValidValue) { - EXPECT_EQ(333, Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "UnsetVar", 333)); - SetEnv(GTEST_FLAG_PREFIX_UPPER_ "UnsetVar", "123"); - EXPECT_EQ(123, Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "UnsetVar", 333)); - SetEnv(GTEST_FLAG_PREFIX_UPPER_ "UnsetVar", "-123"); - EXPECT_EQ(-123, Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "UnsetVar", 333)); -} -#endif // !GTEST_OS_WINDOWS_MOBILE - -// Tests that Int32FromEnvOrDie() aborts with an error message -// if the variable is not an Int32. -TEST(Int32FromEnvOrDieDeathTest, AbortsOnFailure) { - SetEnv(GTEST_FLAG_PREFIX_UPPER_ "VAR", "xxx"); - EXPECT_DEATH_IF_SUPPORTED( - Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "VAR", 123), - ".*"); -} - -// Tests that Int32FromEnvOrDie() aborts with an error message -// if the variable cannot be represented by an Int32. -TEST(Int32FromEnvOrDieDeathTest, AbortsOnInt32Overflow) { - SetEnv(GTEST_FLAG_PREFIX_UPPER_ "VAR", "1234567891234567891234"); - EXPECT_DEATH_IF_SUPPORTED( - Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "VAR", 123), - ".*"); -} - -// Tests that ShouldRunTestOnShard() selects all tests -// where there is 1 shard. -TEST(ShouldRunTestOnShardTest, IsPartitionWhenThereIsOneShard) { - EXPECT_TRUE(ShouldRunTestOnShard(1, 0, 0)); - EXPECT_TRUE(ShouldRunTestOnShard(1, 0, 1)); - EXPECT_TRUE(ShouldRunTestOnShard(1, 0, 2)); - EXPECT_TRUE(ShouldRunTestOnShard(1, 0, 3)); - EXPECT_TRUE(ShouldRunTestOnShard(1, 0, 4)); -} - -class ShouldShardTest : public testing::Test { - protected: - virtual void SetUp() { - index_var_ = GTEST_FLAG_PREFIX_UPPER_ "INDEX"; - total_var_ = GTEST_FLAG_PREFIX_UPPER_ "TOTAL"; - } - - virtual void TearDown() { - SetEnv(index_var_, ""); - SetEnv(total_var_, ""); - } - - const char* index_var_; - const char* total_var_; -}; - -// Tests that sharding is disabled if neither of the environment variables -// are set. -TEST_F(ShouldShardTest, ReturnsFalseWhenNeitherEnvVarIsSet) { - SetEnv(index_var_, ""); - SetEnv(total_var_, ""); - - EXPECT_FALSE(ShouldShard(total_var_, index_var_, false)); - EXPECT_FALSE(ShouldShard(total_var_, index_var_, true)); -} - -// Tests that sharding is not enabled if total_shards == 1. -TEST_F(ShouldShardTest, ReturnsFalseWhenTotalShardIsOne) { - SetEnv(index_var_, "0"); - SetEnv(total_var_, "1"); - EXPECT_FALSE(ShouldShard(total_var_, index_var_, false)); - EXPECT_FALSE(ShouldShard(total_var_, index_var_, true)); -} - -// Tests that sharding is enabled if total_shards > 1 and -// we are not in a death test subprocess. -// Environment variables are not supported on Windows CE. -#if !GTEST_OS_WINDOWS_MOBILE -TEST_F(ShouldShardTest, WorksWhenShardEnvVarsAreValid) { - SetEnv(index_var_, "4"); - SetEnv(total_var_, "22"); - EXPECT_TRUE(ShouldShard(total_var_, index_var_, false)); - EXPECT_FALSE(ShouldShard(total_var_, index_var_, true)); - - SetEnv(index_var_, "8"); - SetEnv(total_var_, "9"); - EXPECT_TRUE(ShouldShard(total_var_, index_var_, false)); - EXPECT_FALSE(ShouldShard(total_var_, index_var_, true)); - - SetEnv(index_var_, "0"); - SetEnv(total_var_, "9"); - EXPECT_TRUE(ShouldShard(total_var_, index_var_, false)); - EXPECT_FALSE(ShouldShard(total_var_, index_var_, true)); -} -#endif // !GTEST_OS_WINDOWS_MOBILE - -// Tests that we exit in error if the sharding values are not valid. - -typedef ShouldShardTest ShouldShardDeathTest; - -TEST_F(ShouldShardDeathTest, AbortsWhenShardingEnvVarsAreInvalid) { - SetEnv(index_var_, "4"); - SetEnv(total_var_, "4"); - EXPECT_DEATH_IF_SUPPORTED(ShouldShard(total_var_, index_var_, false), ".*"); - - SetEnv(index_var_, "4"); - SetEnv(total_var_, "-2"); - EXPECT_DEATH_IF_SUPPORTED(ShouldShard(total_var_, index_var_, false), ".*"); - - SetEnv(index_var_, "5"); - SetEnv(total_var_, ""); - EXPECT_DEATH_IF_SUPPORTED(ShouldShard(total_var_, index_var_, false), ".*"); - - SetEnv(index_var_, ""); - SetEnv(total_var_, "5"); - EXPECT_DEATH_IF_SUPPORTED(ShouldShard(total_var_, index_var_, false), ".*"); -} - -// Tests that ShouldRunTestOnShard is a partition when 5 -// shards are used. -TEST(ShouldRunTestOnShardTest, IsPartitionWhenThereAreFiveShards) { - // Choose an arbitrary number of tests and shards. - const int num_tests = 17; - const int num_shards = 5; - - // Check partitioning: each test should be on exactly 1 shard. - for (int test_id = 0; test_id < num_tests; test_id++) { - int prev_selected_shard_index = -1; - for (int shard_index = 0; shard_index < num_shards; shard_index++) { - if (ShouldRunTestOnShard(num_shards, shard_index, test_id)) { - if (prev_selected_shard_index < 0) { - prev_selected_shard_index = shard_index; - } else { - ADD_FAILURE() << "Shard " << prev_selected_shard_index << " and " - << shard_index << " are both selected to run test " << test_id; - } - } - } - } - - // Check balance: This is not required by the sharding protocol, but is a - // desirable property for performance. - for (int shard_index = 0; shard_index < num_shards; shard_index++) { - int num_tests_on_shard = 0; - for (int test_id = 0; test_id < num_tests; test_id++) { - num_tests_on_shard += - ShouldRunTestOnShard(num_shards, shard_index, test_id); - } - EXPECT_GE(num_tests_on_shard, num_tests / num_shards); - } -} - -// For the same reason we are not explicitly testing everything in the -// Test class, there are no separate tests for the following classes -// (except for some trivial cases): -// -// TestCase, UnitTest, UnitTestResultPrinter. -// -// Similarly, there are no separate tests for the following macros: -// -// TEST, TEST_F, RUN_ALL_TESTS - -TEST(UnitTestTest, CanGetOriginalWorkingDir) { - ASSERT_TRUE(UnitTest::GetInstance()->original_working_dir() != NULL); - EXPECT_STRNE(UnitTest::GetInstance()->original_working_dir(), ""); -} - -TEST(UnitTestTest, ReturnsPlausibleTimestamp) { - EXPECT_LT(0, UnitTest::GetInstance()->start_timestamp()); - EXPECT_LE(UnitTest::GetInstance()->start_timestamp(), GetTimeInMillis()); -} - -// When a property using a reserved key is supplied to this function, it -// tests that a non-fatal failure is added, a fatal failure is not added, -// and that the property is not recorded. -void ExpectNonFatalFailureRecordingPropertyWithReservedKey( - const TestResult& test_result, const char* key) { - EXPECT_NONFATAL_FAILURE(Test::RecordProperty(key, "1"), "Reserved key"); - ASSERT_EQ(0, test_result.test_property_count()) << "Property for key '" << key - << "' recorded unexpectedly."; -} - -void ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest( - const char* key) { - const TestInfo* test_info = UnitTest::GetInstance()->current_test_info(); - ASSERT_TRUE(test_info != NULL); - ExpectNonFatalFailureRecordingPropertyWithReservedKey(*test_info->result(), - key); -} - -void ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase( - const char* key) { - const TestCase* test_case = UnitTest::GetInstance()->current_test_case(); - ASSERT_TRUE(test_case != NULL); - ExpectNonFatalFailureRecordingPropertyWithReservedKey( - test_case->ad_hoc_test_result(), key); -} - -void ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase( - const char* key) { - ExpectNonFatalFailureRecordingPropertyWithReservedKey( - UnitTest::GetInstance()->ad_hoc_test_result(), key); -} - -// Tests that property recording functions in UnitTest outside of tests -// functions correcly. Creating a separate instance of UnitTest ensures it -// is in a state similar to the UnitTest's singleton's between tests. -class UnitTestRecordPropertyTest : - public testing::internal::UnitTestRecordPropertyTestHelper { - public: - static void SetUpTestCase() { - ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase( - "disabled"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase( - "errors"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase( - "failures"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase( - "name"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase( - "tests"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase( - "time"); - - Test::RecordProperty("test_case_key_1", "1"); - const TestCase* test_case = UnitTest::GetInstance()->current_test_case(); - ASSERT_TRUE(test_case != NULL); - - ASSERT_EQ(1, test_case->ad_hoc_test_result().test_property_count()); - EXPECT_STREQ("test_case_key_1", - test_case->ad_hoc_test_result().GetTestProperty(0).key()); - EXPECT_STREQ("1", - test_case->ad_hoc_test_result().GetTestProperty(0).value()); - } -}; - -// Tests TestResult has the expected property when added. -TEST_F(UnitTestRecordPropertyTest, OnePropertyFoundWhenAdded) { - UnitTestRecordProperty("key_1", "1"); - - ASSERT_EQ(1, unit_test_.ad_hoc_test_result().test_property_count()); - - EXPECT_STREQ("key_1", - unit_test_.ad_hoc_test_result().GetTestProperty(0).key()); - EXPECT_STREQ("1", - unit_test_.ad_hoc_test_result().GetTestProperty(0).value()); -} - -// Tests TestResult has multiple properties when added. -TEST_F(UnitTestRecordPropertyTest, MultiplePropertiesFoundWhenAdded) { - UnitTestRecordProperty("key_1", "1"); - UnitTestRecordProperty("key_2", "2"); - - ASSERT_EQ(2, unit_test_.ad_hoc_test_result().test_property_count()); - - EXPECT_STREQ("key_1", - unit_test_.ad_hoc_test_result().GetTestProperty(0).key()); - EXPECT_STREQ("1", unit_test_.ad_hoc_test_result().GetTestProperty(0).value()); - - EXPECT_STREQ("key_2", - unit_test_.ad_hoc_test_result().GetTestProperty(1).key()); - EXPECT_STREQ("2", unit_test_.ad_hoc_test_result().GetTestProperty(1).value()); -} - -// Tests TestResult::RecordProperty() overrides values for duplicate keys. -TEST_F(UnitTestRecordPropertyTest, OverridesValuesForDuplicateKeys) { - UnitTestRecordProperty("key_1", "1"); - UnitTestRecordProperty("key_2", "2"); - UnitTestRecordProperty("key_1", "12"); - UnitTestRecordProperty("key_2", "22"); - - ASSERT_EQ(2, unit_test_.ad_hoc_test_result().test_property_count()); - - EXPECT_STREQ("key_1", - unit_test_.ad_hoc_test_result().GetTestProperty(0).key()); - EXPECT_STREQ("12", - unit_test_.ad_hoc_test_result().GetTestProperty(0).value()); - - EXPECT_STREQ("key_2", - unit_test_.ad_hoc_test_result().GetTestProperty(1).key()); - EXPECT_STREQ("22", - unit_test_.ad_hoc_test_result().GetTestProperty(1).value()); -} - -TEST_F(UnitTestRecordPropertyTest, - AddFailureInsideTestsWhenUsingTestCaseReservedKeys) { - ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest( - "name"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest( - "value_param"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest( - "type_param"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest( - "status"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest( - "time"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest( - "classname"); -} - -TEST_F(UnitTestRecordPropertyTest, - AddRecordWithReservedKeysGeneratesCorrectPropertyList) { - EXPECT_NONFATAL_FAILURE( - Test::RecordProperty("name", "1"), - "'classname', 'name', 'status', 'time', 'type_param', and 'value_param'" - " are reserved"); -} - -class UnitTestRecordPropertyTestEnvironment : public Environment { - public: - virtual void TearDown() { - ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase( - "tests"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase( - "failures"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase( - "disabled"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase( - "errors"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase( - "name"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase( - "timestamp"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase( - "time"); - ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase( - "random_seed"); - } -}; - -// This will test property recording outside of any test or test case. -static Environment* record_property_env = - AddGlobalTestEnvironment(new UnitTestRecordPropertyTestEnvironment); - -// This group of tests is for predicate assertions (ASSERT_PRED*, etc) -// of various arities. They do not attempt to be exhaustive. Rather, -// view them as smoke tests that can be easily reviewed and verified. -// A more complete set of tests for predicate assertions can be found -// in gtest_pred_impl_unittest.cc. - -// First, some predicates and predicate-formatters needed by the tests. - -// Returns true iff the argument is an even number. -bool IsEven(int n) { - return (n % 2) == 0; -} - -// A functor that returns true iff the argument is an even number. -struct IsEvenFunctor { - bool operator()(int n) { return IsEven(n); } -}; - -// A predicate-formatter function that asserts the argument is an even -// number. -AssertionResult AssertIsEven(const char* expr, int n) { - if (IsEven(n)) { - return AssertionSuccess(); - } - - Message msg; - msg << expr << " evaluates to " << n << ", which is not even."; - return AssertionFailure(msg); -} - -// A predicate function that returns AssertionResult for use in -// EXPECT/ASSERT_TRUE/FALSE. -AssertionResult ResultIsEven(int n) { - if (IsEven(n)) - return AssertionSuccess() << n << " is even"; - else - return AssertionFailure() << n << " is odd"; -} - -// A predicate function that returns AssertionResult but gives no -// explanation why it succeeds. Needed for testing that -// EXPECT/ASSERT_FALSE handles such functions correctly. -AssertionResult ResultIsEvenNoExplanation(int n) { - if (IsEven(n)) - return AssertionSuccess(); - else - return AssertionFailure() << n << " is odd"; -} - -// A predicate-formatter functor that asserts the argument is an even -// number. -struct AssertIsEvenFunctor { - AssertionResult operator()(const char* expr, int n) { - return AssertIsEven(expr, n); - } -}; - -// Returns true iff the sum of the arguments is an even number. -bool SumIsEven2(int n1, int n2) { - return IsEven(n1 + n2); -} - -// A functor that returns true iff the sum of the arguments is an even -// number. -struct SumIsEven3Functor { - bool operator()(int n1, int n2, int n3) { - return IsEven(n1 + n2 + n3); - } -}; - -// A predicate-formatter function that asserts the sum of the -// arguments is an even number. -AssertionResult AssertSumIsEven4( - const char* e1, const char* e2, const char* e3, const char* e4, - int n1, int n2, int n3, int n4) { - const int sum = n1 + n2 + n3 + n4; - if (IsEven(sum)) { - return AssertionSuccess(); - } - - Message msg; - msg << e1 << " + " << e2 << " + " << e3 << " + " << e4 - << " (" << n1 << " + " << n2 << " + " << n3 << " + " << n4 - << ") evaluates to " << sum << ", which is not even."; - return AssertionFailure(msg); -} - -// A predicate-formatter functor that asserts the sum of the arguments -// is an even number. -struct AssertSumIsEven5Functor { - AssertionResult operator()( - const char* e1, const char* e2, const char* e3, const char* e4, - const char* e5, int n1, int n2, int n3, int n4, int n5) { - const int sum = n1 + n2 + n3 + n4 + n5; - if (IsEven(sum)) { - return AssertionSuccess(); - } - - Message msg; - msg << e1 << " + " << e2 << " + " << e3 << " + " << e4 << " + " << e5 - << " (" - << n1 << " + " << n2 << " + " << n3 << " + " << n4 << " + " << n5 - << ") evaluates to " << sum << ", which is not even."; - return AssertionFailure(msg); - } -}; - - -// Tests unary predicate assertions. - -// Tests unary predicate assertions that don't use a custom formatter. -TEST(Pred1Test, WithoutFormat) { - // Success cases. - EXPECT_PRED1(IsEvenFunctor(), 2) << "This failure is UNEXPECTED!"; - ASSERT_PRED1(IsEven, 4); - - // Failure cases. - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED1(IsEven, 5) << "This failure is expected."; - }, "This failure is expected."); - EXPECT_FATAL_FAILURE(ASSERT_PRED1(IsEvenFunctor(), 5), - "evaluates to false"); -} - -// Tests unary predicate assertions that use a custom formatter. -TEST(Pred1Test, WithFormat) { - // Success cases. - EXPECT_PRED_FORMAT1(AssertIsEven, 2); - ASSERT_PRED_FORMAT1(AssertIsEvenFunctor(), 4) - << "This failure is UNEXPECTED!"; - - // Failure cases. - const int n = 5; - EXPECT_NONFATAL_FAILURE(EXPECT_PRED_FORMAT1(AssertIsEvenFunctor(), n), - "n evaluates to 5, which is not even."); - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT1(AssertIsEven, 5) << "This failure is expected."; - }, "This failure is expected."); -} - -// Tests that unary predicate assertions evaluates their arguments -// exactly once. -TEST(Pred1Test, SingleEvaluationOnFailure) { - // A success case. - static int n = 0; - EXPECT_PRED1(IsEven, n++); - EXPECT_EQ(1, n) << "The argument is not evaluated exactly once."; - - // A failure case. - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT1(AssertIsEvenFunctor(), n++) - << "This failure is expected."; - }, "This failure is expected."); - EXPECT_EQ(2, n) << "The argument is not evaluated exactly once."; -} - - -// Tests predicate assertions whose arity is >= 2. - -// Tests predicate assertions that don't use a custom formatter. -TEST(PredTest, WithoutFormat) { - // Success cases. - ASSERT_PRED2(SumIsEven2, 2, 4) << "This failure is UNEXPECTED!"; - EXPECT_PRED3(SumIsEven3Functor(), 4, 6, 8); - - // Failure cases. - const int n1 = 1; - const int n2 = 2; - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED2(SumIsEven2, n1, n2) << "This failure is expected."; - }, "This failure is expected."); - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED3(SumIsEven3Functor(), 1, 2, 4); - }, "evaluates to false"); -} - -// Tests predicate assertions that use a custom formatter. -TEST(PredTest, WithFormat) { - // Success cases. - ASSERT_PRED_FORMAT4(AssertSumIsEven4, 4, 6, 8, 10) << - "This failure is UNEXPECTED!"; - EXPECT_PRED_FORMAT5(AssertSumIsEven5Functor(), 2, 4, 6, 8, 10); - - // Failure cases. - const int n1 = 1; - const int n2 = 2; - const int n3 = 4; - const int n4 = 6; - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT4(AssertSumIsEven4, n1, n2, n3, n4); - }, "evaluates to 13, which is not even."); - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT5(AssertSumIsEven5Functor(), 1, 2, 4, 6, 8) - << "This failure is expected."; - }, "This failure is expected."); -} - -// Tests that predicate assertions evaluates their arguments -// exactly once. -TEST(PredTest, SingleEvaluationOnFailure) { - // A success case. - int n1 = 0; - int n2 = 0; - EXPECT_PRED2(SumIsEven2, n1++, n2++); - EXPECT_EQ(1, n1) << "Argument 1 is not evaluated exactly once."; - EXPECT_EQ(1, n2) << "Argument 2 is not evaluated exactly once."; - - // Another success case. - n1 = n2 = 0; - int n3 = 0; - int n4 = 0; - int n5 = 0; - ASSERT_PRED_FORMAT5(AssertSumIsEven5Functor(), - n1++, n2++, n3++, n4++, n5++) - << "This failure is UNEXPECTED!"; - EXPECT_EQ(1, n1) << "Argument 1 is not evaluated exactly once."; - EXPECT_EQ(1, n2) << "Argument 2 is not evaluated exactly once."; - EXPECT_EQ(1, n3) << "Argument 3 is not evaluated exactly once."; - EXPECT_EQ(1, n4) << "Argument 4 is not evaluated exactly once."; - EXPECT_EQ(1, n5) << "Argument 5 is not evaluated exactly once."; - - // A failure case. - n1 = n2 = n3 = 0; - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED3(SumIsEven3Functor(), ++n1, n2++, n3++) - << "This failure is expected."; - }, "This failure is expected."); - EXPECT_EQ(1, n1) << "Argument 1 is not evaluated exactly once."; - EXPECT_EQ(1, n2) << "Argument 2 is not evaluated exactly once."; - EXPECT_EQ(1, n3) << "Argument 3 is not evaluated exactly once."; - - // Another failure case. - n1 = n2 = n3 = n4 = 0; - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT4(AssertSumIsEven4, ++n1, n2++, n3++, n4++); - }, "evaluates to 1, which is not even."); - EXPECT_EQ(1, n1) << "Argument 1 is not evaluated exactly once."; - EXPECT_EQ(1, n2) << "Argument 2 is not evaluated exactly once."; - EXPECT_EQ(1, n3) << "Argument 3 is not evaluated exactly once."; - EXPECT_EQ(1, n4) << "Argument 4 is not evaluated exactly once."; -} - - -// Some helper functions for testing using overloaded/template -// functions with ASSERT_PREDn and EXPECT_PREDn. - -bool IsPositive(double x) { - return x > 0; -} - -template -bool IsNegative(T x) { - return x < 0; -} - -template -bool GreaterThan(T1 x1, T2 x2) { - return x1 > x2; -} - -// Tests that overloaded functions can be used in *_PRED* as long as -// their types are explicitly specified. -TEST(PredicateAssertionTest, AcceptsOverloadedFunction) { - // C++Builder requires C-style casts rather than static_cast. - EXPECT_PRED1((bool (*)(int))(IsPositive), 5); // NOLINT - ASSERT_PRED1((bool (*)(double))(IsPositive), 6.0); // NOLINT -} - -// Tests that template functions can be used in *_PRED* as long as -// their types are explicitly specified. -TEST(PredicateAssertionTest, AcceptsTemplateFunction) { - EXPECT_PRED1(IsNegative, -5); - // Makes sure that we can handle templates with more than one - // parameter. - ASSERT_PRED2((GreaterThan), 5, 0); -} - - -// Some helper functions for testing using overloaded/template -// functions with ASSERT_PRED_FORMATn and EXPECT_PRED_FORMATn. - -AssertionResult IsPositiveFormat(const char* /* expr */, int n) { - return n > 0 ? AssertionSuccess() : - AssertionFailure(Message() << "Failure"); -} - -AssertionResult IsPositiveFormat(const char* /* expr */, double x) { - return x > 0 ? AssertionSuccess() : - AssertionFailure(Message() << "Failure"); -} - -template -AssertionResult IsNegativeFormat(const char* /* expr */, T x) { - return x < 0 ? AssertionSuccess() : - AssertionFailure(Message() << "Failure"); -} - -template -AssertionResult EqualsFormat(const char* /* expr1 */, const char* /* expr2 */, - const T1& x1, const T2& x2) { - return x1 == x2 ? AssertionSuccess() : - AssertionFailure(Message() << "Failure"); -} - -// Tests that overloaded functions can be used in *_PRED_FORMAT* -// without explicitly specifying their types. -TEST(PredicateFormatAssertionTest, AcceptsOverloadedFunction) { - EXPECT_PRED_FORMAT1(IsPositiveFormat, 5); - ASSERT_PRED_FORMAT1(IsPositiveFormat, 6.0); -} - -// Tests that template functions can be used in *_PRED_FORMAT* without -// explicitly specifying their types. -TEST(PredicateFormatAssertionTest, AcceptsTemplateFunction) { - EXPECT_PRED_FORMAT1(IsNegativeFormat, -5); - ASSERT_PRED_FORMAT2(EqualsFormat, 3, 3); -} - - -// Tests string assertions. - -// Tests ASSERT_STREQ with non-NULL arguments. -TEST(StringAssertionTest, ASSERT_STREQ) { - const char * const p1 = "good"; - ASSERT_STREQ(p1, p1); - - // Let p2 have the same content as p1, but be at a different address. - const char p2[] = "good"; - ASSERT_STREQ(p1, p2); - - EXPECT_FATAL_FAILURE(ASSERT_STREQ("bad", "good"), - " \"bad\"\n \"good\""); -} - -// Tests ASSERT_STREQ with NULL arguments. -TEST(StringAssertionTest, ASSERT_STREQ_Null) { - ASSERT_STREQ(static_cast(NULL), NULL); - EXPECT_FATAL_FAILURE(ASSERT_STREQ(NULL, "non-null"), - "non-null"); -} - -// Tests ASSERT_STREQ with NULL arguments. -TEST(StringAssertionTest, ASSERT_STREQ_Null2) { - EXPECT_FATAL_FAILURE(ASSERT_STREQ("non-null", NULL), - "non-null"); -} - -// Tests ASSERT_STRNE. -TEST(StringAssertionTest, ASSERT_STRNE) { - ASSERT_STRNE("hi", "Hi"); - ASSERT_STRNE("Hi", NULL); - ASSERT_STRNE(NULL, "Hi"); - ASSERT_STRNE("", NULL); - ASSERT_STRNE(NULL, ""); - ASSERT_STRNE("", "Hi"); - ASSERT_STRNE("Hi", ""); - EXPECT_FATAL_FAILURE(ASSERT_STRNE("Hi", "Hi"), - "\"Hi\" vs \"Hi\""); -} - -// Tests ASSERT_STRCASEEQ. -TEST(StringAssertionTest, ASSERT_STRCASEEQ) { - ASSERT_STRCASEEQ("hi", "Hi"); - ASSERT_STRCASEEQ(static_cast(NULL), NULL); - - ASSERT_STRCASEEQ("", ""); - EXPECT_FATAL_FAILURE(ASSERT_STRCASEEQ("Hi", "hi2"), - "Ignoring case"); -} - -// Tests ASSERT_STRCASENE. -TEST(StringAssertionTest, ASSERT_STRCASENE) { - ASSERT_STRCASENE("hi1", "Hi2"); - ASSERT_STRCASENE("Hi", NULL); - ASSERT_STRCASENE(NULL, "Hi"); - ASSERT_STRCASENE("", NULL); - ASSERT_STRCASENE(NULL, ""); - ASSERT_STRCASENE("", "Hi"); - ASSERT_STRCASENE("Hi", ""); - EXPECT_FATAL_FAILURE(ASSERT_STRCASENE("Hi", "hi"), - "(ignoring case)"); -} - -// Tests *_STREQ on wide strings. -TEST(StringAssertionTest, STREQ_Wide) { - // NULL strings. - ASSERT_STREQ(static_cast(NULL), NULL); - - // Empty strings. - ASSERT_STREQ(L"", L""); - - // Non-null vs NULL. - EXPECT_NONFATAL_FAILURE(EXPECT_STREQ(L"non-null", NULL), - "non-null"); - - // Equal strings. - EXPECT_STREQ(L"Hi", L"Hi"); - - // Unequal strings. - EXPECT_NONFATAL_FAILURE(EXPECT_STREQ(L"abc", L"Abc"), - "Abc"); - - // Strings containing wide characters. - EXPECT_NONFATAL_FAILURE(EXPECT_STREQ(L"abc\x8119", L"abc\x8120"), - "abc"); - - // The streaming variation. - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_STREQ(L"abc\x8119", L"abc\x8121") << "Expected failure"; - }, "Expected failure"); -} - -// Tests *_STRNE on wide strings. -TEST(StringAssertionTest, STRNE_Wide) { - // NULL strings. - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_STRNE(static_cast(NULL), NULL); - }, ""); - - // Empty strings. - EXPECT_NONFATAL_FAILURE(EXPECT_STRNE(L"", L""), - "L\"\""); - - // Non-null vs NULL. - ASSERT_STRNE(L"non-null", NULL); - - // Equal strings. - EXPECT_NONFATAL_FAILURE(EXPECT_STRNE(L"Hi", L"Hi"), - "L\"Hi\""); - - // Unequal strings. - EXPECT_STRNE(L"abc", L"Abc"); - - // Strings containing wide characters. - EXPECT_NONFATAL_FAILURE(EXPECT_STRNE(L"abc\x8119", L"abc\x8119"), - "abc"); - - // The streaming variation. - ASSERT_STRNE(L"abc\x8119", L"abc\x8120") << "This shouldn't happen"; -} - -// Tests for ::testing::IsSubstring(). - -// Tests that IsSubstring() returns the correct result when the input -// argument type is const char*. -TEST(IsSubstringTest, ReturnsCorrectResultForCString) { - EXPECT_FALSE(IsSubstring("", "", NULL, "a")); - EXPECT_FALSE(IsSubstring("", "", "b", NULL)); - EXPECT_FALSE(IsSubstring("", "", "needle", "haystack")); - - EXPECT_TRUE(IsSubstring("", "", static_cast(NULL), NULL)); - EXPECT_TRUE(IsSubstring("", "", "needle", "two needles")); -} - -// Tests that IsSubstring() returns the correct result when the input -// argument type is const wchar_t*. -TEST(IsSubstringTest, ReturnsCorrectResultForWideCString) { - EXPECT_FALSE(IsSubstring("", "", kNull, L"a")); - EXPECT_FALSE(IsSubstring("", "", L"b", kNull)); - EXPECT_FALSE(IsSubstring("", "", L"needle", L"haystack")); - - EXPECT_TRUE(IsSubstring("", "", static_cast(NULL), NULL)); - EXPECT_TRUE(IsSubstring("", "", L"needle", L"two needles")); -} - -// Tests that IsSubstring() generates the correct message when the input -// argument type is const char*. -TEST(IsSubstringTest, GeneratesCorrectMessageForCString) { - EXPECT_STREQ("Value of: needle_expr\n" - " Actual: \"needle\"\n" - "Expected: a substring of haystack_expr\n" - "Which is: \"haystack\"", - IsSubstring("needle_expr", "haystack_expr", - "needle", "haystack").failure_message()); -} - -// Tests that IsSubstring returns the correct result when the input -// argument type is ::std::string. -TEST(IsSubstringTest, ReturnsCorrectResultsForStdString) { - EXPECT_TRUE(IsSubstring("", "", std::string("hello"), "ahellob")); - EXPECT_FALSE(IsSubstring("", "", "hello", std::string("world"))); -} - -#if GTEST_HAS_STD_WSTRING -// Tests that IsSubstring returns the correct result when the input -// argument type is ::std::wstring. -TEST(IsSubstringTest, ReturnsCorrectResultForStdWstring) { - EXPECT_TRUE(IsSubstring("", "", ::std::wstring(L"needle"), L"two needles")); - EXPECT_FALSE(IsSubstring("", "", L"needle", ::std::wstring(L"haystack"))); -} - -// Tests that IsSubstring() generates the correct message when the input -// argument type is ::std::wstring. -TEST(IsSubstringTest, GeneratesCorrectMessageForWstring) { - EXPECT_STREQ("Value of: needle_expr\n" - " Actual: L\"needle\"\n" - "Expected: a substring of haystack_expr\n" - "Which is: L\"haystack\"", - IsSubstring( - "needle_expr", "haystack_expr", - ::std::wstring(L"needle"), L"haystack").failure_message()); -} - -#endif // GTEST_HAS_STD_WSTRING - -// Tests for ::testing::IsNotSubstring(). - -// Tests that IsNotSubstring() returns the correct result when the input -// argument type is const char*. -TEST(IsNotSubstringTest, ReturnsCorrectResultForCString) { - EXPECT_TRUE(IsNotSubstring("", "", "needle", "haystack")); - EXPECT_FALSE(IsNotSubstring("", "", "needle", "two needles")); -} - -// Tests that IsNotSubstring() returns the correct result when the input -// argument type is const wchar_t*. -TEST(IsNotSubstringTest, ReturnsCorrectResultForWideCString) { - EXPECT_TRUE(IsNotSubstring("", "", L"needle", L"haystack")); - EXPECT_FALSE(IsNotSubstring("", "", L"needle", L"two needles")); -} - -// Tests that IsNotSubstring() generates the correct message when the input -// argument type is const wchar_t*. -TEST(IsNotSubstringTest, GeneratesCorrectMessageForWideCString) { - EXPECT_STREQ("Value of: needle_expr\n" - " Actual: L\"needle\"\n" - "Expected: not a substring of haystack_expr\n" - "Which is: L\"two needles\"", - IsNotSubstring( - "needle_expr", "haystack_expr", - L"needle", L"two needles").failure_message()); -} - -// Tests that IsNotSubstring returns the correct result when the input -// argument type is ::std::string. -TEST(IsNotSubstringTest, ReturnsCorrectResultsForStdString) { - EXPECT_FALSE(IsNotSubstring("", "", std::string("hello"), "ahellob")); - EXPECT_TRUE(IsNotSubstring("", "", "hello", std::string("world"))); -} - -// Tests that IsNotSubstring() generates the correct message when the input -// argument type is ::std::string. -TEST(IsNotSubstringTest, GeneratesCorrectMessageForStdString) { - EXPECT_STREQ("Value of: needle_expr\n" - " Actual: \"needle\"\n" - "Expected: not a substring of haystack_expr\n" - "Which is: \"two needles\"", - IsNotSubstring( - "needle_expr", "haystack_expr", - ::std::string("needle"), "two needles").failure_message()); -} - -#if GTEST_HAS_STD_WSTRING - -// Tests that IsNotSubstring returns the correct result when the input -// argument type is ::std::wstring. -TEST(IsNotSubstringTest, ReturnsCorrectResultForStdWstring) { - EXPECT_FALSE( - IsNotSubstring("", "", ::std::wstring(L"needle"), L"two needles")); - EXPECT_TRUE(IsNotSubstring("", "", L"needle", ::std::wstring(L"haystack"))); -} - -#endif // GTEST_HAS_STD_WSTRING - -// Tests floating-point assertions. - -template -class FloatingPointTest : public Test { - protected: - // Pre-calculated numbers to be used by the tests. - struct TestValues { - RawType close_to_positive_zero; - RawType close_to_negative_zero; - RawType further_from_negative_zero; - - RawType close_to_one; - RawType further_from_one; - - RawType infinity; - RawType close_to_infinity; - RawType further_from_infinity; - - RawType nan1; - RawType nan2; - }; - - typedef typename testing::internal::FloatingPoint Floating; - typedef typename Floating::Bits Bits; - - virtual void SetUp() { - const size_t max_ulps = Floating::kMaxUlps; - - // The bits that represent 0.0. - const Bits zero_bits = Floating(0).bits(); - - // Makes some numbers close to 0.0. - values_.close_to_positive_zero = Floating::ReinterpretBits( - zero_bits + max_ulps/2); - values_.close_to_negative_zero = -Floating::ReinterpretBits( - zero_bits + max_ulps - max_ulps/2); - values_.further_from_negative_zero = -Floating::ReinterpretBits( - zero_bits + max_ulps + 1 - max_ulps/2); - - // The bits that represent 1.0. - const Bits one_bits = Floating(1).bits(); - - // Makes some numbers close to 1.0. - values_.close_to_one = Floating::ReinterpretBits(one_bits + max_ulps); - values_.further_from_one = Floating::ReinterpretBits( - one_bits + max_ulps + 1); - - // +infinity. - values_.infinity = Floating::Infinity(); - - // The bits that represent +infinity. - const Bits infinity_bits = Floating(values_.infinity).bits(); - - // Makes some numbers close to infinity. - values_.close_to_infinity = Floating::ReinterpretBits( - infinity_bits - max_ulps); - values_.further_from_infinity = Floating::ReinterpretBits( - infinity_bits - max_ulps - 1); - - // Makes some NAN's. Sets the most significant bit of the fraction so that - // our NaN's are quiet; trying to process a signaling NaN would raise an - // exception if our environment enables floating point exceptions. - values_.nan1 = Floating::ReinterpretBits(Floating::kExponentBitMask - | (static_cast(1) << (Floating::kFractionBitCount - 1)) | 1); - values_.nan2 = Floating::ReinterpretBits(Floating::kExponentBitMask - | (static_cast(1) << (Floating::kFractionBitCount - 1)) | 200); - } - - void TestSize() { - EXPECT_EQ(sizeof(RawType), sizeof(Bits)); - } - - static TestValues values_; -}; - -template -typename FloatingPointTest::TestValues - FloatingPointTest::values_; - -// Instantiates FloatingPointTest for testing *_FLOAT_EQ. -typedef FloatingPointTest FloatTest; - -// Tests that the size of Float::Bits matches the size of float. -TEST_F(FloatTest, Size) { - TestSize(); -} - -// Tests comparing with +0 and -0. -TEST_F(FloatTest, Zeros) { - EXPECT_FLOAT_EQ(0.0, -0.0); - EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(-0.0, 1.0), - "1.0"); - EXPECT_FATAL_FAILURE(ASSERT_FLOAT_EQ(0.0, 1.5), - "1.5"); -} - -// Tests comparing numbers close to 0. -// -// This ensures that *_FLOAT_EQ handles the sign correctly and no -// overflow occurs when comparing numbers whose absolute value is very -// small. -TEST_F(FloatTest, AlmostZeros) { - // In C++Builder, names within local classes (such as used by - // EXPECT_FATAL_FAILURE) cannot be resolved against static members of the - // scoping class. Use a static local alias as a workaround. - // We use the assignment syntax since some compilers, like Sun Studio, - // don't allow initializing references using construction syntax - // (parentheses). - static const FloatTest::TestValues& v = this->values_; - - EXPECT_FLOAT_EQ(0.0, v.close_to_positive_zero); - EXPECT_FLOAT_EQ(-0.0, v.close_to_negative_zero); - EXPECT_FLOAT_EQ(v.close_to_positive_zero, v.close_to_negative_zero); - - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_FLOAT_EQ(v.close_to_positive_zero, - v.further_from_negative_zero); - }, "v.further_from_negative_zero"); -} - -// Tests comparing numbers close to each other. -TEST_F(FloatTest, SmallDiff) { - EXPECT_FLOAT_EQ(1.0, values_.close_to_one); - EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(1.0, values_.further_from_one), - "values_.further_from_one"); -} - -// Tests comparing numbers far apart. -TEST_F(FloatTest, LargeDiff) { - EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(2.5, 3.0), - "3.0"); -} - -// Tests comparing with infinity. -// -// This ensures that no overflow occurs when comparing numbers whose -// absolute value is very large. -TEST_F(FloatTest, Infinity) { - EXPECT_FLOAT_EQ(values_.infinity, values_.close_to_infinity); - EXPECT_FLOAT_EQ(-values_.infinity, -values_.close_to_infinity); -#if !GTEST_OS_SYMBIAN - // Nokia's STLport crashes if we try to output infinity or NaN. - EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(values_.infinity, -values_.infinity), - "-values_.infinity"); - - // This is interesting as the representations of infinity and nan1 - // are only 1 DLP apart. - EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(values_.infinity, values_.nan1), - "values_.nan1"); -#endif // !GTEST_OS_SYMBIAN -} - -// Tests that comparing with NAN always returns false. -TEST_F(FloatTest, NaN) { -#if !GTEST_OS_SYMBIAN -// Nokia's STLport crashes if we try to output infinity or NaN. - - // In C++Builder, names within local classes (such as used by - // EXPECT_FATAL_FAILURE) cannot be resolved against static members of the - // scoping class. Use a static local alias as a workaround. - // We use the assignment syntax since some compilers, like Sun Studio, - // don't allow initializing references using construction syntax - // (parentheses). - static const FloatTest::TestValues& v = this->values_; - - EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(v.nan1, v.nan1), - "v.nan1"); - EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(v.nan1, v.nan2), - "v.nan2"); - EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(1.0, v.nan1), - "v.nan1"); - - EXPECT_FATAL_FAILURE(ASSERT_FLOAT_EQ(v.nan1, v.infinity), - "v.infinity"); -#endif // !GTEST_OS_SYMBIAN -} - -// Tests that *_FLOAT_EQ are reflexive. -TEST_F(FloatTest, Reflexive) { - EXPECT_FLOAT_EQ(0.0, 0.0); - EXPECT_FLOAT_EQ(1.0, 1.0); - ASSERT_FLOAT_EQ(values_.infinity, values_.infinity); -} - -// Tests that *_FLOAT_EQ are commutative. -TEST_F(FloatTest, Commutative) { - // We already tested EXPECT_FLOAT_EQ(1.0, values_.close_to_one). - EXPECT_FLOAT_EQ(values_.close_to_one, 1.0); - - // We already tested EXPECT_FLOAT_EQ(1.0, values_.further_from_one). - EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(values_.further_from_one, 1.0), - "1.0"); -} - -// Tests EXPECT_NEAR. -TEST_F(FloatTest, EXPECT_NEAR) { - EXPECT_NEAR(-1.0f, -1.1f, 0.2f); - EXPECT_NEAR(2.0f, 3.0f, 1.0f); - EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(1.0f,1.5f, 0.25f), // NOLINT - "The difference between 1.0f and 1.5f is 0.5, " - "which exceeds 0.25f"); - // To work around a bug in gcc 2.95.0, there is intentionally no - // space after the first comma in the previous line. -} - -// Tests ASSERT_NEAR. -TEST_F(FloatTest, ASSERT_NEAR) { - ASSERT_NEAR(-1.0f, -1.1f, 0.2f); - ASSERT_NEAR(2.0f, 3.0f, 1.0f); - EXPECT_FATAL_FAILURE(ASSERT_NEAR(1.0f,1.5f, 0.25f), // NOLINT - "The difference between 1.0f and 1.5f is 0.5, " - "which exceeds 0.25f"); - // To work around a bug in gcc 2.95.0, there is intentionally no - // space after the first comma in the previous line. -} - -// Tests the cases where FloatLE() should succeed. -TEST_F(FloatTest, FloatLESucceeds) { - EXPECT_PRED_FORMAT2(FloatLE, 1.0f, 2.0f); // When val1 < val2, - ASSERT_PRED_FORMAT2(FloatLE, 1.0f, 1.0f); // val1 == val2, - - // or when val1 is greater than, but almost equals to, val2. - EXPECT_PRED_FORMAT2(FloatLE, values_.close_to_positive_zero, 0.0f); -} - -// Tests the cases where FloatLE() should fail. -TEST_F(FloatTest, FloatLEFails) { - // When val1 is greater than val2 by a large margin, - EXPECT_NONFATAL_FAILURE(EXPECT_PRED_FORMAT2(FloatLE, 2.0f, 1.0f), - "(2.0f) <= (1.0f)"); - - // or by a small yet non-negligible margin, - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT2(FloatLE, values_.further_from_one, 1.0f); - }, "(values_.further_from_one) <= (1.0f)"); - -#if !GTEST_OS_SYMBIAN && !defined(__BORLANDC__) - // Nokia's STLport crashes if we try to output infinity or NaN. - // C++Builder gives bad results for ordered comparisons involving NaNs - // due to compiler bugs. - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT2(FloatLE, values_.nan1, values_.infinity); - }, "(values_.nan1) <= (values_.infinity)"); - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT2(FloatLE, -values_.infinity, values_.nan1); - }, "(-values_.infinity) <= (values_.nan1)"); - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT2(FloatLE, values_.nan1, values_.nan1); - }, "(values_.nan1) <= (values_.nan1)"); -#endif // !GTEST_OS_SYMBIAN && !defined(__BORLANDC__) -} - -// Instantiates FloatingPointTest for testing *_DOUBLE_EQ. -typedef FloatingPointTest DoubleTest; - -// Tests that the size of Double::Bits matches the size of double. -TEST_F(DoubleTest, Size) { - TestSize(); -} - -// Tests comparing with +0 and -0. -TEST_F(DoubleTest, Zeros) { - EXPECT_DOUBLE_EQ(0.0, -0.0); - EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(-0.0, 1.0), - "1.0"); - EXPECT_FATAL_FAILURE(ASSERT_DOUBLE_EQ(0.0, 1.0), - "1.0"); -} - -// Tests comparing numbers close to 0. -// -// This ensures that *_DOUBLE_EQ handles the sign correctly and no -// overflow occurs when comparing numbers whose absolute value is very -// small. -TEST_F(DoubleTest, AlmostZeros) { - // In C++Builder, names within local classes (such as used by - // EXPECT_FATAL_FAILURE) cannot be resolved against static members of the - // scoping class. Use a static local alias as a workaround. - // We use the assignment syntax since some compilers, like Sun Studio, - // don't allow initializing references using construction syntax - // (parentheses). - static const DoubleTest::TestValues& v = this->values_; - - EXPECT_DOUBLE_EQ(0.0, v.close_to_positive_zero); - EXPECT_DOUBLE_EQ(-0.0, v.close_to_negative_zero); - EXPECT_DOUBLE_EQ(v.close_to_positive_zero, v.close_to_negative_zero); - - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_DOUBLE_EQ(v.close_to_positive_zero, - v.further_from_negative_zero); - }, "v.further_from_negative_zero"); -} - -// Tests comparing numbers close to each other. -TEST_F(DoubleTest, SmallDiff) { - EXPECT_DOUBLE_EQ(1.0, values_.close_to_one); - EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(1.0, values_.further_from_one), - "values_.further_from_one"); -} - -// Tests comparing numbers far apart. -TEST_F(DoubleTest, LargeDiff) { - EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(2.0, 3.0), - "3.0"); -} - -// Tests comparing with infinity. -// -// This ensures that no overflow occurs when comparing numbers whose -// absolute value is very large. -TEST_F(DoubleTest, Infinity) { - EXPECT_DOUBLE_EQ(values_.infinity, values_.close_to_infinity); - EXPECT_DOUBLE_EQ(-values_.infinity, -values_.close_to_infinity); -#if !GTEST_OS_SYMBIAN - // Nokia's STLport crashes if we try to output infinity or NaN. - EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(values_.infinity, -values_.infinity), - "-values_.infinity"); - - // This is interesting as the representations of infinity_ and nan1_ - // are only 1 DLP apart. - EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(values_.infinity, values_.nan1), - "values_.nan1"); -#endif // !GTEST_OS_SYMBIAN -} - -// Tests that comparing with NAN always returns false. -TEST_F(DoubleTest, NaN) { -#if !GTEST_OS_SYMBIAN - // In C++Builder, names within local classes (such as used by - // EXPECT_FATAL_FAILURE) cannot be resolved against static members of the - // scoping class. Use a static local alias as a workaround. - // We use the assignment syntax since some compilers, like Sun Studio, - // don't allow initializing references using construction syntax - // (parentheses). - static const DoubleTest::TestValues& v = this->values_; - - // Nokia's STLport crashes if we try to output infinity or NaN. - EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(v.nan1, v.nan1), - "v.nan1"); - EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(v.nan1, v.nan2), "v.nan2"); - EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(1.0, v.nan1), "v.nan1"); - EXPECT_FATAL_FAILURE(ASSERT_DOUBLE_EQ(v.nan1, v.infinity), - "v.infinity"); -#endif // !GTEST_OS_SYMBIAN -} - -// Tests that *_DOUBLE_EQ are reflexive. -TEST_F(DoubleTest, Reflexive) { - EXPECT_DOUBLE_EQ(0.0, 0.0); - EXPECT_DOUBLE_EQ(1.0, 1.0); -#if !GTEST_OS_SYMBIAN - // Nokia's STLport crashes if we try to output infinity or NaN. - ASSERT_DOUBLE_EQ(values_.infinity, values_.infinity); -#endif // !GTEST_OS_SYMBIAN -} - -// Tests that *_DOUBLE_EQ are commutative. -TEST_F(DoubleTest, Commutative) { - // We already tested EXPECT_DOUBLE_EQ(1.0, values_.close_to_one). - EXPECT_DOUBLE_EQ(values_.close_to_one, 1.0); - - // We already tested EXPECT_DOUBLE_EQ(1.0, values_.further_from_one). - EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(values_.further_from_one, 1.0), - "1.0"); -} - -// Tests EXPECT_NEAR. -TEST_F(DoubleTest, EXPECT_NEAR) { - EXPECT_NEAR(-1.0, -1.1, 0.2); - EXPECT_NEAR(2.0, 3.0, 1.0); - EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(1.0, 1.5, 0.25), // NOLINT - "The difference between 1.0 and 1.5 is 0.5, " - "which exceeds 0.25"); - // To work around a bug in gcc 2.95.0, there is intentionally no - // space after the first comma in the previous statement. -} - -// Tests ASSERT_NEAR. -TEST_F(DoubleTest, ASSERT_NEAR) { - ASSERT_NEAR(-1.0, -1.1, 0.2); - ASSERT_NEAR(2.0, 3.0, 1.0); - EXPECT_FATAL_FAILURE(ASSERT_NEAR(1.0, 1.5, 0.25), // NOLINT - "The difference between 1.0 and 1.5 is 0.5, " - "which exceeds 0.25"); - // To work around a bug in gcc 2.95.0, there is intentionally no - // space after the first comma in the previous statement. -} - -// Tests the cases where DoubleLE() should succeed. -TEST_F(DoubleTest, DoubleLESucceeds) { - EXPECT_PRED_FORMAT2(DoubleLE, 1.0, 2.0); // When val1 < val2, - ASSERT_PRED_FORMAT2(DoubleLE, 1.0, 1.0); // val1 == val2, - - // or when val1 is greater than, but almost equals to, val2. - EXPECT_PRED_FORMAT2(DoubleLE, values_.close_to_positive_zero, 0.0); -} - -// Tests the cases where DoubleLE() should fail. -TEST_F(DoubleTest, DoubleLEFails) { - // When val1 is greater than val2 by a large margin, - EXPECT_NONFATAL_FAILURE(EXPECT_PRED_FORMAT2(DoubleLE, 2.0, 1.0), - "(2.0) <= (1.0)"); - - // or by a small yet non-negligible margin, - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT2(DoubleLE, values_.further_from_one, 1.0); - }, "(values_.further_from_one) <= (1.0)"); - -#if !GTEST_OS_SYMBIAN && !defined(__BORLANDC__) - // Nokia's STLport crashes if we try to output infinity or NaN. - // C++Builder gives bad results for ordered comparisons involving NaNs - // due to compiler bugs. - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT2(DoubleLE, values_.nan1, values_.infinity); - }, "(values_.nan1) <= (values_.infinity)"); - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_PRED_FORMAT2(DoubleLE, -values_.infinity, values_.nan1); - }, " (-values_.infinity) <= (values_.nan1)"); - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_PRED_FORMAT2(DoubleLE, values_.nan1, values_.nan1); - }, "(values_.nan1) <= (values_.nan1)"); -#endif // !GTEST_OS_SYMBIAN && !defined(__BORLANDC__) -} - - -// Verifies that a test or test case whose name starts with DISABLED_ is -// not run. - -// A test whose name starts with DISABLED_. -// Should not run. -TEST(DisabledTest, DISABLED_TestShouldNotRun) { - FAIL() << "Unexpected failure: Disabled test should not be run."; -} - -// A test whose name does not start with DISABLED_. -// Should run. -TEST(DisabledTest, NotDISABLED_TestShouldRun) { - EXPECT_EQ(1, 1); -} - -// A test case whose name starts with DISABLED_. -// Should not run. -TEST(DISABLED_TestCase, TestShouldNotRun) { - FAIL() << "Unexpected failure: Test in disabled test case should not be run."; -} - -// A test case and test whose names start with DISABLED_. -// Should not run. -TEST(DISABLED_TestCase, DISABLED_TestShouldNotRun) { - FAIL() << "Unexpected failure: Test in disabled test case should not be run."; -} - -// Check that when all tests in a test case are disabled, SetUpTestCase() and -// TearDownTestCase() are not called. -class DisabledTestsTest : public Test { - protected: - static void SetUpTestCase() { - FAIL() << "Unexpected failure: All tests disabled in test case. " - "SetUpTestCase() should not be called."; - } - - static void TearDownTestCase() { - FAIL() << "Unexpected failure: All tests disabled in test case. " - "TearDownTestCase() should not be called."; - } -}; - -TEST_F(DisabledTestsTest, DISABLED_TestShouldNotRun_1) { - FAIL() << "Unexpected failure: Disabled test should not be run."; -} - -TEST_F(DisabledTestsTest, DISABLED_TestShouldNotRun_2) { - FAIL() << "Unexpected failure: Disabled test should not be run."; -} - -// Tests that disabled typed tests aren't run. - -#if GTEST_HAS_TYPED_TEST - -template -class TypedTest : public Test { -}; - -typedef testing::Types NumericTypes; -TYPED_TEST_CASE(TypedTest, NumericTypes); - -TYPED_TEST(TypedTest, DISABLED_ShouldNotRun) { - FAIL() << "Unexpected failure: Disabled typed test should not run."; -} - -template -class DISABLED_TypedTest : public Test { -}; - -TYPED_TEST_CASE(DISABLED_TypedTest, NumericTypes); - -TYPED_TEST(DISABLED_TypedTest, ShouldNotRun) { - FAIL() << "Unexpected failure: Disabled typed test should not run."; -} - -#endif // GTEST_HAS_TYPED_TEST - -// Tests that disabled type-parameterized tests aren't run. - -#if GTEST_HAS_TYPED_TEST_P - -template -class TypedTestP : public Test { -}; - -TYPED_TEST_CASE_P(TypedTestP); - -TYPED_TEST_P(TypedTestP, DISABLED_ShouldNotRun) { - FAIL() << "Unexpected failure: " - << "Disabled type-parameterized test should not run."; -} - -REGISTER_TYPED_TEST_CASE_P(TypedTestP, DISABLED_ShouldNotRun); - -INSTANTIATE_TYPED_TEST_CASE_P(My, TypedTestP, NumericTypes); - -template -class DISABLED_TypedTestP : public Test { -}; - -TYPED_TEST_CASE_P(DISABLED_TypedTestP); - -TYPED_TEST_P(DISABLED_TypedTestP, ShouldNotRun) { - FAIL() << "Unexpected failure: " - << "Disabled type-parameterized test should not run."; -} - -REGISTER_TYPED_TEST_CASE_P(DISABLED_TypedTestP, ShouldNotRun); - -INSTANTIATE_TYPED_TEST_CASE_P(My, DISABLED_TypedTestP, NumericTypes); - -#endif // GTEST_HAS_TYPED_TEST_P - -// Tests that assertion macros evaluate their arguments exactly once. - -class SingleEvaluationTest : public Test { - public: // Must be public and not protected due to a bug in g++ 3.4.2. - // This helper function is needed by the FailedASSERT_STREQ test - // below. It's public to work around C++Builder's bug with scoping local - // classes. - static void CompareAndIncrementCharPtrs() { - ASSERT_STREQ(p1_++, p2_++); - } - - // This helper function is needed by the FailedASSERT_NE test below. It's - // public to work around C++Builder's bug with scoping local classes. - static void CompareAndIncrementInts() { - ASSERT_NE(a_++, b_++); - } - - protected: - SingleEvaluationTest() { - p1_ = s1_; - p2_ = s2_; - a_ = 0; - b_ = 0; - } - - static const char* const s1_; - static const char* const s2_; - static const char* p1_; - static const char* p2_; - - static int a_; - static int b_; -}; - -const char* const SingleEvaluationTest::s1_ = "01234"; -const char* const SingleEvaluationTest::s2_ = "abcde"; -const char* SingleEvaluationTest::p1_; -const char* SingleEvaluationTest::p2_; -int SingleEvaluationTest::a_; -int SingleEvaluationTest::b_; - -// Tests that when ASSERT_STREQ fails, it evaluates its arguments -// exactly once. -TEST_F(SingleEvaluationTest, FailedASSERT_STREQ) { - EXPECT_FATAL_FAILURE(SingleEvaluationTest::CompareAndIncrementCharPtrs(), - "p2_++"); - EXPECT_EQ(s1_ + 1, p1_); - EXPECT_EQ(s2_ + 1, p2_); -} - -// Tests that string assertion arguments are evaluated exactly once. -TEST_F(SingleEvaluationTest, ASSERT_STR) { - // successful EXPECT_STRNE - EXPECT_STRNE(p1_++, p2_++); - EXPECT_EQ(s1_ + 1, p1_); - EXPECT_EQ(s2_ + 1, p2_); - - // failed EXPECT_STRCASEEQ - EXPECT_NONFATAL_FAILURE(EXPECT_STRCASEEQ(p1_++, p2_++), - "Ignoring case"); - EXPECT_EQ(s1_ + 2, p1_); - EXPECT_EQ(s2_ + 2, p2_); -} - -// Tests that when ASSERT_NE fails, it evaluates its arguments exactly -// once. -TEST_F(SingleEvaluationTest, FailedASSERT_NE) { - EXPECT_FATAL_FAILURE(SingleEvaluationTest::CompareAndIncrementInts(), - "(a_++) != (b_++)"); - EXPECT_EQ(1, a_); - EXPECT_EQ(1, b_); -} - -// Tests that assertion arguments are evaluated exactly once. -TEST_F(SingleEvaluationTest, OtherCases) { - // successful EXPECT_TRUE - EXPECT_TRUE(0 == a_++); // NOLINT - EXPECT_EQ(1, a_); - - // failed EXPECT_TRUE - EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(-1 == a_++), "-1 == a_++"); - EXPECT_EQ(2, a_); - - // successful EXPECT_GT - EXPECT_GT(a_++, b_++); - EXPECT_EQ(3, a_); - EXPECT_EQ(1, b_); - - // failed EXPECT_LT - EXPECT_NONFATAL_FAILURE(EXPECT_LT(a_++, b_++), "(a_++) < (b_++)"); - EXPECT_EQ(4, a_); - EXPECT_EQ(2, b_); - - // successful ASSERT_TRUE - ASSERT_TRUE(0 < a_++); // NOLINT - EXPECT_EQ(5, a_); - - // successful ASSERT_GT - ASSERT_GT(a_++, b_++); - EXPECT_EQ(6, a_); - EXPECT_EQ(3, b_); -} - -#if GTEST_HAS_EXCEPTIONS - -void ThrowAnInteger() { - throw 1; -} - -// Tests that assertion arguments are evaluated exactly once. -TEST_F(SingleEvaluationTest, ExceptionTests) { - // successful EXPECT_THROW - EXPECT_THROW({ // NOLINT - a_++; - ThrowAnInteger(); - }, int); - EXPECT_EQ(1, a_); - - // failed EXPECT_THROW, throws different - EXPECT_NONFATAL_FAILURE(EXPECT_THROW({ // NOLINT - a_++; - ThrowAnInteger(); - }, bool), "throws a different type"); - EXPECT_EQ(2, a_); - - // failed EXPECT_THROW, throws nothing - EXPECT_NONFATAL_FAILURE(EXPECT_THROW(a_++, bool), "throws nothing"); - EXPECT_EQ(3, a_); - - // successful EXPECT_NO_THROW - EXPECT_NO_THROW(a_++); - EXPECT_EQ(4, a_); - - // failed EXPECT_NO_THROW - EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW({ // NOLINT - a_++; - ThrowAnInteger(); - }), "it throws"); - EXPECT_EQ(5, a_); - - // successful EXPECT_ANY_THROW - EXPECT_ANY_THROW({ // NOLINT - a_++; - ThrowAnInteger(); - }); - EXPECT_EQ(6, a_); - - // failed EXPECT_ANY_THROW - EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(a_++), "it doesn't"); - EXPECT_EQ(7, a_); -} - -#endif // GTEST_HAS_EXCEPTIONS - -// Tests {ASSERT|EXPECT}_NO_FATAL_FAILURE. -class NoFatalFailureTest : public Test { - protected: - void Succeeds() {} - void FailsNonFatal() { - ADD_FAILURE() << "some non-fatal failure"; - } - void Fails() { - FAIL() << "some fatal failure"; - } - - void DoAssertNoFatalFailureOnFails() { - ASSERT_NO_FATAL_FAILURE(Fails()); - ADD_FAILURE() << "should not reach here."; - } - - void DoExpectNoFatalFailureOnFails() { - EXPECT_NO_FATAL_FAILURE(Fails()); - ADD_FAILURE() << "other failure"; - } -}; - -TEST_F(NoFatalFailureTest, NoFailure) { - EXPECT_NO_FATAL_FAILURE(Succeeds()); - ASSERT_NO_FATAL_FAILURE(Succeeds()); -} - -TEST_F(NoFatalFailureTest, NonFatalIsNoFailure) { - EXPECT_NONFATAL_FAILURE( - EXPECT_NO_FATAL_FAILURE(FailsNonFatal()), - "some non-fatal failure"); - EXPECT_NONFATAL_FAILURE( - ASSERT_NO_FATAL_FAILURE(FailsNonFatal()), - "some non-fatal failure"); -} - -TEST_F(NoFatalFailureTest, AssertNoFatalFailureOnFatalFailure) { - TestPartResultArray gtest_failures; - { - ScopedFakeTestPartResultReporter gtest_reporter(>est_failures); - DoAssertNoFatalFailureOnFails(); - } - ASSERT_EQ(2, gtest_failures.size()); - EXPECT_EQ(TestPartResult::kFatalFailure, - gtest_failures.GetTestPartResult(0).type()); - EXPECT_EQ(TestPartResult::kFatalFailure, - gtest_failures.GetTestPartResult(1).type()); - EXPECT_PRED_FORMAT2(testing::IsSubstring, "some fatal failure", - gtest_failures.GetTestPartResult(0).message()); - EXPECT_PRED_FORMAT2(testing::IsSubstring, "it does", - gtest_failures.GetTestPartResult(1).message()); -} - -TEST_F(NoFatalFailureTest, ExpectNoFatalFailureOnFatalFailure) { - TestPartResultArray gtest_failures; - { - ScopedFakeTestPartResultReporter gtest_reporter(>est_failures); - DoExpectNoFatalFailureOnFails(); - } - ASSERT_EQ(3, gtest_failures.size()); - EXPECT_EQ(TestPartResult::kFatalFailure, - gtest_failures.GetTestPartResult(0).type()); - EXPECT_EQ(TestPartResult::kNonFatalFailure, - gtest_failures.GetTestPartResult(1).type()); - EXPECT_EQ(TestPartResult::kNonFatalFailure, - gtest_failures.GetTestPartResult(2).type()); - EXPECT_PRED_FORMAT2(testing::IsSubstring, "some fatal failure", - gtest_failures.GetTestPartResult(0).message()); - EXPECT_PRED_FORMAT2(testing::IsSubstring, "it does", - gtest_failures.GetTestPartResult(1).message()); - EXPECT_PRED_FORMAT2(testing::IsSubstring, "other failure", - gtest_failures.GetTestPartResult(2).message()); -} - -TEST_F(NoFatalFailureTest, MessageIsStreamable) { - TestPartResultArray gtest_failures; - { - ScopedFakeTestPartResultReporter gtest_reporter(>est_failures); - EXPECT_NO_FATAL_FAILURE(FAIL() << "foo") << "my message"; - } - ASSERT_EQ(2, gtest_failures.size()); - EXPECT_EQ(TestPartResult::kNonFatalFailure, - gtest_failures.GetTestPartResult(0).type()); - EXPECT_EQ(TestPartResult::kNonFatalFailure, - gtest_failures.GetTestPartResult(1).type()); - EXPECT_PRED_FORMAT2(testing::IsSubstring, "foo", - gtest_failures.GetTestPartResult(0).message()); - EXPECT_PRED_FORMAT2(testing::IsSubstring, "my message", - gtest_failures.GetTestPartResult(1).message()); -} - -// Tests non-string assertions. - -std::string EditsToString(const std::vector& edits) { - std::string out; - for (size_t i = 0; i < edits.size(); ++i) { - static const char kEdits[] = " +-/"; - out.append(1, kEdits[edits[i]]); - } - return out; -} - -std::vector CharsToIndices(const std::string& str) { - std::vector out; - for (size_t i = 0; i < str.size(); ++i) { - out.push_back(str[i]); - } - return out; -} - -std::vector CharsToLines(const std::string& str) { - std::vector out; - for (size_t i = 0; i < str.size(); ++i) { - out.push_back(str.substr(i, 1)); - } - return out; -} - -TEST(EditDistance, TestCases) { - struct Case { - int line; - const char* left; - const char* right; - const char* expected_edits; - const char* expected_diff; - }; - static const Case kCases[] = { - // No change. - {__LINE__, "A", "A", " ", ""}, - {__LINE__, "ABCDE", "ABCDE", " ", ""}, - // Simple adds. - {__LINE__, "X", "XA", " +", "@@ +1,2 @@\n X\n+A\n"}, - {__LINE__, "X", "XABCD", " ++++", "@@ +1,5 @@\n X\n+A\n+B\n+C\n+D\n"}, - // Simple removes. - {__LINE__, "XA", "X", " -", "@@ -1,2 @@\n X\n-A\n"}, - {__LINE__, "XABCD", "X", " ----", "@@ -1,5 @@\n X\n-A\n-B\n-C\n-D\n"}, - // Simple replaces. - {__LINE__, "A", "a", "/", "@@ -1,1 +1,1 @@\n-A\n+a\n"}, - {__LINE__, "ABCD", "abcd", "////", - "@@ -1,4 +1,4 @@\n-A\n-B\n-C\n-D\n+a\n+b\n+c\n+d\n"}, - // Path finding. - {__LINE__, "ABCDEFGH", "ABXEGH1", " -/ - +", - "@@ -1,8 +1,7 @@\n A\n B\n-C\n-D\n+X\n E\n-F\n G\n H\n+1\n"}, - {__LINE__, "AAAABCCCC", "ABABCDCDC", "- / + / ", - "@@ -1,9 +1,9 @@\n-A\n A\n-A\n+B\n A\n B\n C\n+D\n C\n-C\n+D\n C\n"}, - {__LINE__, "ABCDE", "BCDCD", "- +/", - "@@ -1,5 +1,5 @@\n-A\n B\n C\n D\n-E\n+C\n+D\n"}, - {__LINE__, "ABCDEFGHIJKL", "BCDCDEFGJKLJK", "- ++ -- ++", - "@@ -1,4 +1,5 @@\n-A\n B\n+C\n+D\n C\n D\n" - "@@ -6,7 +7,7 @@\n F\n G\n-H\n-I\n J\n K\n L\n+J\n+K\n"}, - {}}; - for (const Case* c = kCases; c->left; ++c) { - EXPECT_TRUE(c->expected_edits == - EditsToString(CalculateOptimalEdits(CharsToIndices(c->left), - CharsToIndices(c->right)))) - << "Left <" << c->left << "> Right <" << c->right << "> Edits <" - << EditsToString(CalculateOptimalEdits( - CharsToIndices(c->left), CharsToIndices(c->right))) << ">"; - EXPECT_TRUE(c->expected_diff == CreateUnifiedDiff(CharsToLines(c->left), - CharsToLines(c->right))) - << "Left <" << c->left << "> Right <" << c->right << "> Diff <" - << CreateUnifiedDiff(CharsToLines(c->left), CharsToLines(c->right)) - << ">"; - } -} - -// Tests EqFailure(), used for implementing *EQ* assertions. -TEST(AssertionTest, EqFailure) { - const std::string foo_val("5"), bar_val("6"); - const std::string msg1( - EqFailure("foo", "bar", foo_val, bar_val, false) - .failure_message()); - EXPECT_STREQ( - "Expected equality of these values:\n" - " foo\n" - " Which is: 5\n" - " bar\n" - " Which is: 6", - msg1.c_str()); - - const std::string msg2( - EqFailure("foo", "6", foo_val, bar_val, false) - .failure_message()); - EXPECT_STREQ( - "Expected equality of these values:\n" - " foo\n" - " Which is: 5\n" - " 6", - msg2.c_str()); - - const std::string msg3( - EqFailure("5", "bar", foo_val, bar_val, false) - .failure_message()); - EXPECT_STREQ( - "Expected equality of these values:\n" - " 5\n" - " bar\n" - " Which is: 6", - msg3.c_str()); - - const std::string msg4( - EqFailure("5", "6", foo_val, bar_val, false).failure_message()); - EXPECT_STREQ( - "Expected equality of these values:\n" - " 5\n" - " 6", - msg4.c_str()); - - const std::string msg5( - EqFailure("foo", "bar", - std::string("\"x\""), std::string("\"y\""), - true).failure_message()); - EXPECT_STREQ( - "Expected equality of these values:\n" - " foo\n" - " Which is: \"x\"\n" - " bar\n" - " Which is: \"y\"\n" - "Ignoring case", - msg5.c_str()); -} - -TEST(AssertionTest, EqFailureWithDiff) { - const std::string left( - "1\\n2XXX\\n3\\n5\\n6\\n7\\n8\\n9\\n10\\n11\\n12XXX\\n13\\n14\\n15"); - const std::string right( - "1\\n2\\n3\\n4\\n5\\n6\\n7\\n8\\n9\\n11\\n12\\n13\\n14"); - const std::string msg1( - EqFailure("left", "right", left, right, false).failure_message()); - EXPECT_STREQ( - "Expected equality of these values:\n" - " left\n" - " Which is: " - "1\\n2XXX\\n3\\n5\\n6\\n7\\n8\\n9\\n10\\n11\\n12XXX\\n13\\n14\\n15\n" - " right\n" - " Which is: 1\\n2\\n3\\n4\\n5\\n6\\n7\\n8\\n9\\n11\\n12\\n13\\n14\n" - "With diff:\n@@ -1,5 +1,6 @@\n 1\n-2XXX\n+2\n 3\n+4\n 5\n 6\n" - "@@ -7,8 +8,6 @@\n 8\n 9\n-10\n 11\n-12XXX\n+12\n 13\n 14\n-15\n", - msg1.c_str()); -} - -// Tests AppendUserMessage(), used for implementing the *EQ* macros. -TEST(AssertionTest, AppendUserMessage) { - const std::string foo("foo"); - - Message msg; - EXPECT_STREQ("foo", - AppendUserMessage(foo, msg).c_str()); - - msg << "bar"; - EXPECT_STREQ("foo\nbar", - AppendUserMessage(foo, msg).c_str()); -} - -#ifdef __BORLANDC__ -// Silences warnings: "Condition is always true", "Unreachable code" -# pragma option push -w-ccc -w-rch -#endif - -// Tests ASSERT_TRUE. -TEST(AssertionTest, ASSERT_TRUE) { - ASSERT_TRUE(2 > 1); // NOLINT - EXPECT_FATAL_FAILURE(ASSERT_TRUE(2 < 1), - "2 < 1"); -} - -// Tests ASSERT_TRUE(predicate) for predicates returning AssertionResult. -TEST(AssertionTest, AssertTrueWithAssertionResult) { - ASSERT_TRUE(ResultIsEven(2)); -#ifndef __BORLANDC__ - // ICE's in C++Builder. - EXPECT_FATAL_FAILURE(ASSERT_TRUE(ResultIsEven(3)), - "Value of: ResultIsEven(3)\n" - " Actual: false (3 is odd)\n" - "Expected: true"); -#endif - ASSERT_TRUE(ResultIsEvenNoExplanation(2)); - EXPECT_FATAL_FAILURE(ASSERT_TRUE(ResultIsEvenNoExplanation(3)), - "Value of: ResultIsEvenNoExplanation(3)\n" - " Actual: false (3 is odd)\n" - "Expected: true"); -} - -// Tests ASSERT_FALSE. -TEST(AssertionTest, ASSERT_FALSE) { - ASSERT_FALSE(2 < 1); // NOLINT - EXPECT_FATAL_FAILURE(ASSERT_FALSE(2 > 1), - "Value of: 2 > 1\n" - " Actual: true\n" - "Expected: false"); -} - -// Tests ASSERT_FALSE(predicate) for predicates returning AssertionResult. -TEST(AssertionTest, AssertFalseWithAssertionResult) { - ASSERT_FALSE(ResultIsEven(3)); -#ifndef __BORLANDC__ - // ICE's in C++Builder. - EXPECT_FATAL_FAILURE(ASSERT_FALSE(ResultIsEven(2)), - "Value of: ResultIsEven(2)\n" - " Actual: true (2 is even)\n" - "Expected: false"); -#endif - ASSERT_FALSE(ResultIsEvenNoExplanation(3)); - EXPECT_FATAL_FAILURE(ASSERT_FALSE(ResultIsEvenNoExplanation(2)), - "Value of: ResultIsEvenNoExplanation(2)\n" - " Actual: true\n" - "Expected: false"); -} - -#ifdef __BORLANDC__ -// Restores warnings after previous "#pragma option push" suppressed them -# pragma option pop -#endif - -// Tests using ASSERT_EQ on double values. The purpose is to make -// sure that the specialization we did for integer and anonymous enums -// isn't used for double arguments. -TEST(ExpectTest, ASSERT_EQ_Double) { - // A success. - ASSERT_EQ(5.6, 5.6); - - // A failure. - EXPECT_FATAL_FAILURE(ASSERT_EQ(5.1, 5.2), - "5.1"); -} - -// Tests ASSERT_EQ. -TEST(AssertionTest, ASSERT_EQ) { - ASSERT_EQ(5, 2 + 3); - EXPECT_FATAL_FAILURE(ASSERT_EQ(5, 2*3), - "Expected equality of these values:\n" - " 5\n" - " 2*3\n" - " Which is: 6"); -} - -// Tests ASSERT_EQ(NULL, pointer). -#if GTEST_CAN_COMPARE_NULL -TEST(AssertionTest, ASSERT_EQ_NULL) { - // A success. - const char* p = NULL; - // Some older GCC versions may issue a spurious warning in this or the next - // assertion statement. This warning should not be suppressed with - // static_cast since the test verifies the ability to use bare NULL as the - // expected parameter to the macro. - ASSERT_EQ(NULL, p); - - // A failure. - static int n = 0; - EXPECT_FATAL_FAILURE(ASSERT_EQ(NULL, &n), - " &n\n Which is:"); -} -#endif // GTEST_CAN_COMPARE_NULL - -// Tests ASSERT_EQ(0, non_pointer). Since the literal 0 can be -// treated as a null pointer by the compiler, we need to make sure -// that ASSERT_EQ(0, non_pointer) isn't interpreted by Google Test as -// ASSERT_EQ(static_cast(NULL), non_pointer). -TEST(ExpectTest, ASSERT_EQ_0) { - int n = 0; - - // A success. - ASSERT_EQ(0, n); - - // A failure. - EXPECT_FATAL_FAILURE(ASSERT_EQ(0, 5.6), - " 0\n 5.6"); -} - -// Tests ASSERT_NE. -TEST(AssertionTest, ASSERT_NE) { - ASSERT_NE(6, 7); - EXPECT_FATAL_FAILURE(ASSERT_NE('a', 'a'), - "Expected: ('a') != ('a'), " - "actual: 'a' (97, 0x61) vs 'a' (97, 0x61)"); -} - -// Tests ASSERT_LE. -TEST(AssertionTest, ASSERT_LE) { - ASSERT_LE(2, 3); - ASSERT_LE(2, 2); - EXPECT_FATAL_FAILURE(ASSERT_LE(2, 0), - "Expected: (2) <= (0), actual: 2 vs 0"); -} - -// Tests ASSERT_LT. -TEST(AssertionTest, ASSERT_LT) { - ASSERT_LT(2, 3); - EXPECT_FATAL_FAILURE(ASSERT_LT(2, 2), - "Expected: (2) < (2), actual: 2 vs 2"); -} - -// Tests ASSERT_GE. -TEST(AssertionTest, ASSERT_GE) { - ASSERT_GE(2, 1); - ASSERT_GE(2, 2); - EXPECT_FATAL_FAILURE(ASSERT_GE(2, 3), - "Expected: (2) >= (3), actual: 2 vs 3"); -} - -// Tests ASSERT_GT. -TEST(AssertionTest, ASSERT_GT) { - ASSERT_GT(2, 1); - EXPECT_FATAL_FAILURE(ASSERT_GT(2, 2), - "Expected: (2) > (2), actual: 2 vs 2"); -} - -#if GTEST_HAS_EXCEPTIONS - -void ThrowNothing() {} - -// Tests ASSERT_THROW. -TEST(AssertionTest, ASSERT_THROW) { - ASSERT_THROW(ThrowAnInteger(), int); - -# ifndef __BORLANDC__ - - // ICE's in C++Builder 2007 and 2009. - EXPECT_FATAL_FAILURE( - ASSERT_THROW(ThrowAnInteger(), bool), - "Expected: ThrowAnInteger() throws an exception of type bool.\n" - " Actual: it throws a different type."); -# endif - - EXPECT_FATAL_FAILURE( - ASSERT_THROW(ThrowNothing(), bool), - "Expected: ThrowNothing() throws an exception of type bool.\n" - " Actual: it throws nothing."); -} - -// Tests ASSERT_NO_THROW. -TEST(AssertionTest, ASSERT_NO_THROW) { - ASSERT_NO_THROW(ThrowNothing()); - EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()), - "Expected: ThrowAnInteger() doesn't throw an exception." - "\n Actual: it throws."); -} - -// Tests ASSERT_ANY_THROW. -TEST(AssertionTest, ASSERT_ANY_THROW) { - ASSERT_ANY_THROW(ThrowAnInteger()); - EXPECT_FATAL_FAILURE( - ASSERT_ANY_THROW(ThrowNothing()), - "Expected: ThrowNothing() throws an exception.\n" - " Actual: it doesn't."); -} - -#endif // GTEST_HAS_EXCEPTIONS - -// Makes sure we deal with the precedence of <<. This test should -// compile. -TEST(AssertionTest, AssertPrecedence) { - ASSERT_EQ(1 < 2, true); - bool false_value = false; - ASSERT_EQ(true && false_value, false); -} - -// A subroutine used by the following test. -void TestEq1(int x) { - ASSERT_EQ(1, x); -} - -// Tests calling a test subroutine that's not part of a fixture. -TEST(AssertionTest, NonFixtureSubroutine) { - EXPECT_FATAL_FAILURE(TestEq1(2), - " x\n Which is: 2"); -} - -// An uncopyable class. -class Uncopyable { - public: - explicit Uncopyable(int a_value) : value_(a_value) {} - - int value() const { return value_; } - bool operator==(const Uncopyable& rhs) const { - return value() == rhs.value(); - } - private: - // This constructor deliberately has no implementation, as we don't - // want this class to be copyable. - Uncopyable(const Uncopyable&); // NOLINT - - int value_; -}; - -::std::ostream& operator<<(::std::ostream& os, const Uncopyable& value) { - return os << value.value(); -} - - -bool IsPositiveUncopyable(const Uncopyable& x) { - return x.value() > 0; -} - -// A subroutine used by the following test. -void TestAssertNonPositive() { - Uncopyable y(-1); - ASSERT_PRED1(IsPositiveUncopyable, y); -} -// A subroutine used by the following test. -void TestAssertEqualsUncopyable() { - Uncopyable x(5); - Uncopyable y(-1); - ASSERT_EQ(x, y); -} - -// Tests that uncopyable objects can be used in assertions. -TEST(AssertionTest, AssertWorksWithUncopyableObject) { - Uncopyable x(5); - ASSERT_PRED1(IsPositiveUncopyable, x); - ASSERT_EQ(x, x); - EXPECT_FATAL_FAILURE(TestAssertNonPositive(), - "IsPositiveUncopyable(y) evaluates to false, where\ny evaluates to -1"); - EXPECT_FATAL_FAILURE(TestAssertEqualsUncopyable(), - "Expected equality of these values:\n" - " x\n Which is: 5\n y\n Which is: -1"); -} - -// Tests that uncopyable objects can be used in expects. -TEST(AssertionTest, ExpectWorksWithUncopyableObject) { - Uncopyable x(5); - EXPECT_PRED1(IsPositiveUncopyable, x); - Uncopyable y(-1); - EXPECT_NONFATAL_FAILURE(EXPECT_PRED1(IsPositiveUncopyable, y), - "IsPositiveUncopyable(y) evaluates to false, where\ny evaluates to -1"); - EXPECT_EQ(x, x); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(x, y), - "Expected equality of these values:\n" - " x\n Which is: 5\n y\n Which is: -1"); -} - -enum NamedEnum { - kE1 = 0, - kE2 = 1 -}; - -TEST(AssertionTest, NamedEnum) { - EXPECT_EQ(kE1, kE1); - EXPECT_LT(kE1, kE2); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(kE1, kE2), "Which is: 0"); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(kE1, kE2), "Which is: 1"); -} - -// The version of gcc used in XCode 2.2 has a bug and doesn't allow -// anonymous enums in assertions. Therefore the following test is not -// done on Mac. -// Sun Studio and HP aCC also reject this code. -#if !GTEST_OS_MAC && !defined(__SUNPRO_CC) && !defined(__HP_aCC) - -// Tests using assertions with anonymous enums. -enum { - kCaseA = -1, - -# if GTEST_OS_LINUX - - // We want to test the case where the size of the anonymous enum is - // larger than sizeof(int), to make sure our implementation of the - // assertions doesn't truncate the enums. However, MSVC - // (incorrectly) doesn't allow an enum value to exceed the range of - // an int, so this has to be conditionally compiled. - // - // On Linux, kCaseB and kCaseA have the same value when truncated to - // int size. We want to test whether this will confuse the - // assertions. - kCaseB = testing::internal::kMaxBiggestInt, - -# else - - kCaseB = INT_MAX, - -# endif // GTEST_OS_LINUX - - kCaseC = 42 -}; - -TEST(AssertionTest, AnonymousEnum) { -# if GTEST_OS_LINUX - - EXPECT_EQ(static_cast(kCaseA), static_cast(kCaseB)); - -# endif // GTEST_OS_LINUX - - EXPECT_EQ(kCaseA, kCaseA); - EXPECT_NE(kCaseA, kCaseB); - EXPECT_LT(kCaseA, kCaseB); - EXPECT_LE(kCaseA, kCaseB); - EXPECT_GT(kCaseB, kCaseA); - EXPECT_GE(kCaseA, kCaseA); - EXPECT_NONFATAL_FAILURE(EXPECT_GE(kCaseA, kCaseB), - "(kCaseA) >= (kCaseB)"); - EXPECT_NONFATAL_FAILURE(EXPECT_GE(kCaseA, kCaseC), - "-1 vs 42"); - - ASSERT_EQ(kCaseA, kCaseA); - ASSERT_NE(kCaseA, kCaseB); - ASSERT_LT(kCaseA, kCaseB); - ASSERT_LE(kCaseA, kCaseB); - ASSERT_GT(kCaseB, kCaseA); - ASSERT_GE(kCaseA, kCaseA); - -# ifndef __BORLANDC__ - - // ICE's in C++Builder. - EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseB), - " kCaseB\n Which is: "); - EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC), - "\n Which is: 42"); -# endif - - EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC), - "\n Which is: -1"); -} - -#endif // !GTEST_OS_MAC && !defined(__SUNPRO_CC) - -#if GTEST_OS_WINDOWS - -static HRESULT UnexpectedHRESULTFailure() { - return E_UNEXPECTED; -} - -static HRESULT OkHRESULTSuccess() { - return S_OK; -} - -static HRESULT FalseHRESULTSuccess() { - return S_FALSE; -} - -// HRESULT assertion tests test both zero and non-zero -// success codes as well as failure message for each. -// -// Windows CE doesn't support message texts. -TEST(HRESULTAssertionTest, EXPECT_HRESULT_SUCCEEDED) { - EXPECT_HRESULT_SUCCEEDED(S_OK); - EXPECT_HRESULT_SUCCEEDED(S_FALSE); - - EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_SUCCEEDED(UnexpectedHRESULTFailure()), - "Expected: (UnexpectedHRESULTFailure()) succeeds.\n" - " Actual: 0x8000FFFF"); -} - -TEST(HRESULTAssertionTest, ASSERT_HRESULT_SUCCEEDED) { - ASSERT_HRESULT_SUCCEEDED(S_OK); - ASSERT_HRESULT_SUCCEEDED(S_FALSE); - - EXPECT_FATAL_FAILURE(ASSERT_HRESULT_SUCCEEDED(UnexpectedHRESULTFailure()), - "Expected: (UnexpectedHRESULTFailure()) succeeds.\n" - " Actual: 0x8000FFFF"); -} - -TEST(HRESULTAssertionTest, EXPECT_HRESULT_FAILED) { - EXPECT_HRESULT_FAILED(E_UNEXPECTED); - - EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(OkHRESULTSuccess()), - "Expected: (OkHRESULTSuccess()) fails.\n" - " Actual: 0x0"); - EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(FalseHRESULTSuccess()), - "Expected: (FalseHRESULTSuccess()) fails.\n" - " Actual: 0x1"); -} - -TEST(HRESULTAssertionTest, ASSERT_HRESULT_FAILED) { - ASSERT_HRESULT_FAILED(E_UNEXPECTED); - -# ifndef __BORLANDC__ - - // ICE's in C++Builder 2007 and 2009. - EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(OkHRESULTSuccess()), - "Expected: (OkHRESULTSuccess()) fails.\n" - " Actual: 0x0"); -# endif - - EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(FalseHRESULTSuccess()), - "Expected: (FalseHRESULTSuccess()) fails.\n" - " Actual: 0x1"); -} - -// Tests that streaming to the HRESULT macros works. -TEST(HRESULTAssertionTest, Streaming) { - EXPECT_HRESULT_SUCCEEDED(S_OK) << "unexpected failure"; - ASSERT_HRESULT_SUCCEEDED(S_OK) << "unexpected failure"; - EXPECT_HRESULT_FAILED(E_UNEXPECTED) << "unexpected failure"; - ASSERT_HRESULT_FAILED(E_UNEXPECTED) << "unexpected failure"; - - EXPECT_NONFATAL_FAILURE( - EXPECT_HRESULT_SUCCEEDED(E_UNEXPECTED) << "expected failure", - "expected failure"); - -# ifndef __BORLANDC__ - - // ICE's in C++Builder 2007 and 2009. - EXPECT_FATAL_FAILURE( - ASSERT_HRESULT_SUCCEEDED(E_UNEXPECTED) << "expected failure", - "expected failure"); -# endif - - EXPECT_NONFATAL_FAILURE( - EXPECT_HRESULT_FAILED(S_OK) << "expected failure", - "expected failure"); - - EXPECT_FATAL_FAILURE( - ASSERT_HRESULT_FAILED(S_OK) << "expected failure", - "expected failure"); -} - -#endif // GTEST_OS_WINDOWS - -#ifdef __BORLANDC__ -// Silences warnings: "Condition is always true", "Unreachable code" -# pragma option push -w-ccc -w-rch -#endif - -// Tests that the assertion macros behave like single statements. -TEST(AssertionSyntaxTest, BasicAssertionsBehavesLikeSingleStatement) { - if (AlwaysFalse()) - ASSERT_TRUE(false) << "This should never be executed; " - "It's a compilation test only."; - - if (AlwaysTrue()) - EXPECT_FALSE(false); - else - ; // NOLINT - - if (AlwaysFalse()) - ASSERT_LT(1, 3); - - if (AlwaysFalse()) - ; // NOLINT - else - EXPECT_GT(3, 2) << ""; -} - -#if GTEST_HAS_EXCEPTIONS -// Tests that the compiler will not complain about unreachable code in the -// EXPECT_THROW/EXPECT_ANY_THROW/EXPECT_NO_THROW macros. -TEST(ExpectThrowTest, DoesNotGenerateUnreachableCodeWarning) { - int n = 0; - - EXPECT_THROW(throw 1, int); - EXPECT_NONFATAL_FAILURE(EXPECT_THROW(n++, int), ""); - EXPECT_NONFATAL_FAILURE(EXPECT_THROW(throw 1, const char*), ""); - EXPECT_NO_THROW(n++); - EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(throw 1), ""); - EXPECT_ANY_THROW(throw 1); - EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(n++), ""); -} - -TEST(AssertionSyntaxTest, ExceptionAssertionsBehavesLikeSingleStatement) { - if (AlwaysFalse()) - EXPECT_THROW(ThrowNothing(), bool); - - if (AlwaysTrue()) - EXPECT_THROW(ThrowAnInteger(), int); - else - ; // NOLINT - - if (AlwaysFalse()) - EXPECT_NO_THROW(ThrowAnInteger()); - - if (AlwaysTrue()) - EXPECT_NO_THROW(ThrowNothing()); - else - ; // NOLINT - - if (AlwaysFalse()) - EXPECT_ANY_THROW(ThrowNothing()); - - if (AlwaysTrue()) - EXPECT_ANY_THROW(ThrowAnInteger()); - else - ; // NOLINT -} -#endif // GTEST_HAS_EXCEPTIONS - -TEST(AssertionSyntaxTest, NoFatalFailureAssertionsBehavesLikeSingleStatement) { - if (AlwaysFalse()) - EXPECT_NO_FATAL_FAILURE(FAIL()) << "This should never be executed. " - << "It's a compilation test only."; - else - ; // NOLINT - - if (AlwaysFalse()) - ASSERT_NO_FATAL_FAILURE(FAIL()) << ""; - else - ; // NOLINT - - if (AlwaysTrue()) - EXPECT_NO_FATAL_FAILURE(SUCCEED()); - else - ; // NOLINT - - if (AlwaysFalse()) - ; // NOLINT - else - ASSERT_NO_FATAL_FAILURE(SUCCEED()); -} - -// Tests that the assertion macros work well with switch statements. -TEST(AssertionSyntaxTest, WorksWithSwitch) { - switch (0) { - case 1: - break; - default: - ASSERT_TRUE(true); - } - - switch (0) - case 0: - EXPECT_FALSE(false) << "EXPECT_FALSE failed in switch case"; - - // Binary assertions are implemented using a different code path - // than the Boolean assertions. Hence we test them separately. - switch (0) { - case 1: - default: - ASSERT_EQ(1, 1) << "ASSERT_EQ failed in default switch handler"; - } - - switch (0) - case 0: - EXPECT_NE(1, 2); -} - -#if GTEST_HAS_EXCEPTIONS - -void ThrowAString() { - throw "std::string"; -} - -// Test that the exception assertion macros compile and work with const -// type qualifier. -TEST(AssertionSyntaxTest, WorksWithConst) { - ASSERT_THROW(ThrowAString(), const char*); - - EXPECT_THROW(ThrowAString(), const char*); -} - -#endif // GTEST_HAS_EXCEPTIONS - -} // namespace - -namespace testing { - -// Tests that Google Test tracks SUCCEED*. -TEST(SuccessfulAssertionTest, SUCCEED) { - SUCCEED(); - SUCCEED() << "OK"; - EXPECT_EQ(2, GetUnitTestImpl()->current_test_result()->total_part_count()); -} - -// Tests that Google Test doesn't track successful EXPECT_*. -TEST(SuccessfulAssertionTest, EXPECT) { - EXPECT_TRUE(true); - EXPECT_EQ(0, GetUnitTestImpl()->current_test_result()->total_part_count()); -} - -// Tests that Google Test doesn't track successful EXPECT_STR*. -TEST(SuccessfulAssertionTest, EXPECT_STR) { - EXPECT_STREQ("", ""); - EXPECT_EQ(0, GetUnitTestImpl()->current_test_result()->total_part_count()); -} - -// Tests that Google Test doesn't track successful ASSERT_*. -TEST(SuccessfulAssertionTest, ASSERT) { - ASSERT_TRUE(true); - EXPECT_EQ(0, GetUnitTestImpl()->current_test_result()->total_part_count()); -} - -// Tests that Google Test doesn't track successful ASSERT_STR*. -TEST(SuccessfulAssertionTest, ASSERT_STR) { - ASSERT_STREQ("", ""); - EXPECT_EQ(0, GetUnitTestImpl()->current_test_result()->total_part_count()); -} - -} // namespace testing - -namespace { - -// Tests the message streaming variation of assertions. - -TEST(AssertionWithMessageTest, EXPECT) { - EXPECT_EQ(1, 1) << "This should succeed."; - EXPECT_NONFATAL_FAILURE(EXPECT_NE(1, 1) << "Expected failure #1.", - "Expected failure #1"); - EXPECT_LE(1, 2) << "This should succeed."; - EXPECT_NONFATAL_FAILURE(EXPECT_LT(1, 0) << "Expected failure #2.", - "Expected failure #2."); - EXPECT_GE(1, 0) << "This should succeed."; - EXPECT_NONFATAL_FAILURE(EXPECT_GT(1, 2) << "Expected failure #3.", - "Expected failure #3."); - - EXPECT_STREQ("1", "1") << "This should succeed."; - EXPECT_NONFATAL_FAILURE(EXPECT_STRNE("1", "1") << "Expected failure #4.", - "Expected failure #4."); - EXPECT_STRCASEEQ("a", "A") << "This should succeed."; - EXPECT_NONFATAL_FAILURE(EXPECT_STRCASENE("a", "A") << "Expected failure #5.", - "Expected failure #5."); - - EXPECT_FLOAT_EQ(1, 1) << "This should succeed."; - EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(1, 1.2) << "Expected failure #6.", - "Expected failure #6."); - EXPECT_NEAR(1, 1.1, 0.2) << "This should succeed."; -} - -TEST(AssertionWithMessageTest, ASSERT) { - ASSERT_EQ(1, 1) << "This should succeed."; - ASSERT_NE(1, 2) << "This should succeed."; - ASSERT_LE(1, 2) << "This should succeed."; - ASSERT_LT(1, 2) << "This should succeed."; - ASSERT_GE(1, 0) << "This should succeed."; - EXPECT_FATAL_FAILURE(ASSERT_GT(1, 2) << "Expected failure.", - "Expected failure."); -} - -TEST(AssertionWithMessageTest, ASSERT_STR) { - ASSERT_STREQ("1", "1") << "This should succeed."; - ASSERT_STRNE("1", "2") << "This should succeed."; - ASSERT_STRCASEEQ("a", "A") << "This should succeed."; - EXPECT_FATAL_FAILURE(ASSERT_STRCASENE("a", "A") << "Expected failure.", - "Expected failure."); -} - -TEST(AssertionWithMessageTest, ASSERT_FLOATING) { - ASSERT_FLOAT_EQ(1, 1) << "This should succeed."; - ASSERT_DOUBLE_EQ(1, 1) << "This should succeed."; - EXPECT_FATAL_FAILURE(ASSERT_NEAR(1,1.2, 0.1) << "Expect failure.", // NOLINT - "Expect failure."); - // To work around a bug in gcc 2.95.0, there is intentionally no - // space after the first comma in the previous statement. -} - -// Tests using ASSERT_FALSE with a streamed message. -TEST(AssertionWithMessageTest, ASSERT_FALSE) { - ASSERT_FALSE(false) << "This shouldn't fail."; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_FALSE(true) << "Expected failure: " << 2 << " > " << 1 - << " evaluates to " << true; - }, "Expected failure"); -} - -// Tests using FAIL with a streamed message. -TEST(AssertionWithMessageTest, FAIL) { - EXPECT_FATAL_FAILURE(FAIL() << 0, - "0"); -} - -// Tests using SUCCEED with a streamed message. -TEST(AssertionWithMessageTest, SUCCEED) { - SUCCEED() << "Success == " << 1; -} - -// Tests using ASSERT_TRUE with a streamed message. -TEST(AssertionWithMessageTest, ASSERT_TRUE) { - ASSERT_TRUE(true) << "This should succeed."; - ASSERT_TRUE(true) << true; - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_TRUE(false) << static_cast(NULL) - << static_cast(NULL); - }, "(null)(null)"); -} - -#if GTEST_OS_WINDOWS -// Tests using wide strings in assertion messages. -TEST(AssertionWithMessageTest, WideStringMessage) { - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_TRUE(false) << L"This failure is expected.\x8119"; - }, "This failure is expected."); - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_EQ(1, 2) << "This failure is " - << L"expected too.\x8120"; - }, "This failure is expected too."); -} -#endif // GTEST_OS_WINDOWS - -// Tests EXPECT_TRUE. -TEST(ExpectTest, EXPECT_TRUE) { - EXPECT_TRUE(true) << "Intentional success"; - EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(false) << "Intentional failure #1.", - "Intentional failure #1."); - EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(false) << "Intentional failure #2.", - "Intentional failure #2."); - EXPECT_TRUE(2 > 1); // NOLINT - EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(2 < 1), - "Value of: 2 < 1\n" - " Actual: false\n" - "Expected: true"); - EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(2 > 3), - "2 > 3"); -} - -// Tests EXPECT_TRUE(predicate) for predicates returning AssertionResult. -TEST(ExpectTest, ExpectTrueWithAssertionResult) { - EXPECT_TRUE(ResultIsEven(2)); - EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(ResultIsEven(3)), - "Value of: ResultIsEven(3)\n" - " Actual: false (3 is odd)\n" - "Expected: true"); - EXPECT_TRUE(ResultIsEvenNoExplanation(2)); - EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(ResultIsEvenNoExplanation(3)), - "Value of: ResultIsEvenNoExplanation(3)\n" - " Actual: false (3 is odd)\n" - "Expected: true"); -} - -// Tests EXPECT_FALSE with a streamed message. -TEST(ExpectTest, EXPECT_FALSE) { - EXPECT_FALSE(2 < 1); // NOLINT - EXPECT_FALSE(false) << "Intentional success"; - EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(true) << "Intentional failure #1.", - "Intentional failure #1."); - EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(true) << "Intentional failure #2.", - "Intentional failure #2."); - EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(2 > 1), - "Value of: 2 > 1\n" - " Actual: true\n" - "Expected: false"); - EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(2 < 3), - "2 < 3"); -} - -// Tests EXPECT_FALSE(predicate) for predicates returning AssertionResult. -TEST(ExpectTest, ExpectFalseWithAssertionResult) { - EXPECT_FALSE(ResultIsEven(3)); - EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(ResultIsEven(2)), - "Value of: ResultIsEven(2)\n" - " Actual: true (2 is even)\n" - "Expected: false"); - EXPECT_FALSE(ResultIsEvenNoExplanation(3)); - EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(ResultIsEvenNoExplanation(2)), - "Value of: ResultIsEvenNoExplanation(2)\n" - " Actual: true\n" - "Expected: false"); -} - -#ifdef __BORLANDC__ -// Restores warnings after previous "#pragma option push" suppressed them -# pragma option pop -#endif - -// Tests EXPECT_EQ. -TEST(ExpectTest, EXPECT_EQ) { - EXPECT_EQ(5, 2 + 3); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5, 2*3), - "Expected equality of these values:\n" - " 5\n" - " 2*3\n" - " Which is: 6"); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5, 2 - 3), - "2 - 3"); -} - -// Tests using EXPECT_EQ on double values. The purpose is to make -// sure that the specialization we did for integer and anonymous enums -// isn't used for double arguments. -TEST(ExpectTest, EXPECT_EQ_Double) { - // A success. - EXPECT_EQ(5.6, 5.6); - - // A failure. - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5.1, 5.2), - "5.1"); -} - -#if GTEST_CAN_COMPARE_NULL -// Tests EXPECT_EQ(NULL, pointer). -TEST(ExpectTest, EXPECT_EQ_NULL) { - // A success. - const char* p = NULL; - // Some older GCC versions may issue a spurious warning in this or the next - // assertion statement. This warning should not be suppressed with - // static_cast since the test verifies the ability to use bare NULL as the - // expected parameter to the macro. - EXPECT_EQ(NULL, p); - - // A failure. - int n = 0; - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(NULL, &n), - " &n\n Which is:"); -} -#endif // GTEST_CAN_COMPARE_NULL - -// Tests EXPECT_EQ(0, non_pointer). Since the literal 0 can be -// treated as a null pointer by the compiler, we need to make sure -// that EXPECT_EQ(0, non_pointer) isn't interpreted by Google Test as -// EXPECT_EQ(static_cast(NULL), non_pointer). -TEST(ExpectTest, EXPECT_EQ_0) { - int n = 0; - - // A success. - EXPECT_EQ(0, n); - - // A failure. - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(0, 5.6), - " 0\n 5.6"); -} - -// Tests EXPECT_NE. -TEST(ExpectTest, EXPECT_NE) { - EXPECT_NE(6, 7); - - EXPECT_NONFATAL_FAILURE(EXPECT_NE('a', 'a'), - "Expected: ('a') != ('a'), " - "actual: 'a' (97, 0x61) vs 'a' (97, 0x61)"); - EXPECT_NONFATAL_FAILURE(EXPECT_NE(2, 2), - "2"); - char* const p0 = NULL; - EXPECT_NONFATAL_FAILURE(EXPECT_NE(p0, p0), - "p0"); - // Only way to get the Nokia compiler to compile the cast - // is to have a separate void* variable first. Putting - // the two casts on the same line doesn't work, neither does - // a direct C-style to char*. - void* pv1 = (void*)0x1234; // NOLINT - char* const p1 = reinterpret_cast(pv1); - EXPECT_NONFATAL_FAILURE(EXPECT_NE(p1, p1), - "p1"); -} - -// Tests EXPECT_LE. -TEST(ExpectTest, EXPECT_LE) { - EXPECT_LE(2, 3); - EXPECT_LE(2, 2); - EXPECT_NONFATAL_FAILURE(EXPECT_LE(2, 0), - "Expected: (2) <= (0), actual: 2 vs 0"); - EXPECT_NONFATAL_FAILURE(EXPECT_LE(1.1, 0.9), - "(1.1) <= (0.9)"); -} - -// Tests EXPECT_LT. -TEST(ExpectTest, EXPECT_LT) { - EXPECT_LT(2, 3); - EXPECT_NONFATAL_FAILURE(EXPECT_LT(2, 2), - "Expected: (2) < (2), actual: 2 vs 2"); - EXPECT_NONFATAL_FAILURE(EXPECT_LT(2, 1), - "(2) < (1)"); -} - -// Tests EXPECT_GE. -TEST(ExpectTest, EXPECT_GE) { - EXPECT_GE(2, 1); - EXPECT_GE(2, 2); - EXPECT_NONFATAL_FAILURE(EXPECT_GE(2, 3), - "Expected: (2) >= (3), actual: 2 vs 3"); - EXPECT_NONFATAL_FAILURE(EXPECT_GE(0.9, 1.1), - "(0.9) >= (1.1)"); -} - -// Tests EXPECT_GT. -TEST(ExpectTest, EXPECT_GT) { - EXPECT_GT(2, 1); - EXPECT_NONFATAL_FAILURE(EXPECT_GT(2, 2), - "Expected: (2) > (2), actual: 2 vs 2"); - EXPECT_NONFATAL_FAILURE(EXPECT_GT(2, 3), - "(2) > (3)"); -} - -#if GTEST_HAS_EXCEPTIONS - -// Tests EXPECT_THROW. -TEST(ExpectTest, EXPECT_THROW) { - EXPECT_THROW(ThrowAnInteger(), int); - EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool), - "Expected: ThrowAnInteger() throws an exception of " - "type bool.\n Actual: it throws a different type."); - EXPECT_NONFATAL_FAILURE( - EXPECT_THROW(ThrowNothing(), bool), - "Expected: ThrowNothing() throws an exception of type bool.\n" - " Actual: it throws nothing."); -} - -// Tests EXPECT_NO_THROW. -TEST(ExpectTest, EXPECT_NO_THROW) { - EXPECT_NO_THROW(ThrowNothing()); - EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()), - "Expected: ThrowAnInteger() doesn't throw an " - "exception.\n Actual: it throws."); -} - -// Tests EXPECT_ANY_THROW. -TEST(ExpectTest, EXPECT_ANY_THROW) { - EXPECT_ANY_THROW(ThrowAnInteger()); - EXPECT_NONFATAL_FAILURE( - EXPECT_ANY_THROW(ThrowNothing()), - "Expected: ThrowNothing() throws an exception.\n" - " Actual: it doesn't."); -} - -#endif // GTEST_HAS_EXCEPTIONS - -// Make sure we deal with the precedence of <<. -TEST(ExpectTest, ExpectPrecedence) { - EXPECT_EQ(1 < 2, true); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(true, true && false), - " true && false\n Which is: false"); -} - - -// Tests the StreamableToString() function. - -// Tests using StreamableToString() on a scalar. -TEST(StreamableToStringTest, Scalar) { - EXPECT_STREQ("5", StreamableToString(5).c_str()); -} - -// Tests using StreamableToString() on a non-char pointer. -TEST(StreamableToStringTest, Pointer) { - int n = 0; - int* p = &n; - EXPECT_STRNE("(null)", StreamableToString(p).c_str()); -} - -// Tests using StreamableToString() on a NULL non-char pointer. -TEST(StreamableToStringTest, NullPointer) { - int* p = NULL; - EXPECT_STREQ("(null)", StreamableToString(p).c_str()); -} - -// Tests using StreamableToString() on a C string. -TEST(StreamableToStringTest, CString) { - EXPECT_STREQ("Foo", StreamableToString("Foo").c_str()); -} - -// Tests using StreamableToString() on a NULL C string. -TEST(StreamableToStringTest, NullCString) { - char* p = NULL; - EXPECT_STREQ("(null)", StreamableToString(p).c_str()); -} - -// Tests using streamable values as assertion messages. - -// Tests using std::string as an assertion message. -TEST(StreamableTest, string) { - static const std::string str( - "This failure message is a std::string, and is expected."); - EXPECT_FATAL_FAILURE(FAIL() << str, - str.c_str()); -} - -// Tests that we can output strings containing embedded NULs. -// Limited to Linux because we can only do this with std::string's. -TEST(StreamableTest, stringWithEmbeddedNUL) { - static const char char_array_with_nul[] = - "Here's a NUL\0 and some more string"; - static const std::string string_with_nul(char_array_with_nul, - sizeof(char_array_with_nul) - - 1); // drops the trailing NUL - EXPECT_FATAL_FAILURE(FAIL() << string_with_nul, - "Here's a NUL\\0 and some more string"); -} - -// Tests that we can output a NUL char. -TEST(StreamableTest, NULChar) { - EXPECT_FATAL_FAILURE({ // NOLINT - FAIL() << "A NUL" << '\0' << " and some more string"; - }, "A NUL\\0 and some more string"); -} - -// Tests using int as an assertion message. -TEST(StreamableTest, int) { - EXPECT_FATAL_FAILURE(FAIL() << 900913, - "900913"); -} - -// Tests using NULL char pointer as an assertion message. -// -// In MSVC, streaming a NULL char * causes access violation. Google Test -// implemented a workaround (substituting "(null)" for NULL). This -// tests whether the workaround works. -TEST(StreamableTest, NullCharPtr) { - EXPECT_FATAL_FAILURE(FAIL() << static_cast(NULL), - "(null)"); -} - -// Tests that basic IO manipulators (endl, ends, and flush) can be -// streamed to testing::Message. -TEST(StreamableTest, BasicIoManip) { - EXPECT_FATAL_FAILURE({ // NOLINT - FAIL() << "Line 1." << std::endl - << "A NUL char " << std::ends << std::flush << " in line 2."; - }, "Line 1.\nA NUL char \\0 in line 2."); -} - -// Tests the macros that haven't been covered so far. - -void AddFailureHelper(bool* aborted) { - *aborted = true; - ADD_FAILURE() << "Intentional failure."; - *aborted = false; -} - -// Tests ADD_FAILURE. -TEST(MacroTest, ADD_FAILURE) { - bool aborted = true; - EXPECT_NONFATAL_FAILURE(AddFailureHelper(&aborted), - "Intentional failure."); - EXPECT_FALSE(aborted); -} - -// Tests ADD_FAILURE_AT. -TEST(MacroTest, ADD_FAILURE_AT) { - // Verifies that ADD_FAILURE_AT does generate a nonfatal failure and - // the failure message contains the user-streamed part. - EXPECT_NONFATAL_FAILURE(ADD_FAILURE_AT("foo.cc", 42) << "Wrong!", "Wrong!"); - - // Verifies that the user-streamed part is optional. - EXPECT_NONFATAL_FAILURE(ADD_FAILURE_AT("foo.cc", 42), "Failed"); - - // Unfortunately, we cannot verify that the failure message contains - // the right file path and line number the same way, as - // EXPECT_NONFATAL_FAILURE() doesn't get to see the file path and - // line number. Instead, we do that in gtest_output_test_.cc. -} - -// Tests FAIL. -TEST(MacroTest, FAIL) { - EXPECT_FATAL_FAILURE(FAIL(), - "Failed"); - EXPECT_FATAL_FAILURE(FAIL() << "Intentional failure.", - "Intentional failure."); -} - -// Tests SUCCEED -TEST(MacroTest, SUCCEED) { - SUCCEED(); - SUCCEED() << "Explicit success."; -} - -// Tests for EXPECT_EQ() and ASSERT_EQ(). -// -// These tests fail *intentionally*, s.t. the failure messages can be -// generated and tested. -// -// We have different tests for different argument types. - -// Tests using bool values in {EXPECT|ASSERT}_EQ. -TEST(EqAssertionTest, Bool) { - EXPECT_EQ(true, true); - EXPECT_FATAL_FAILURE({ - bool false_value = false; - ASSERT_EQ(false_value, true); - }, " false_value\n Which is: false\n true"); -} - -// Tests using int values in {EXPECT|ASSERT}_EQ. -TEST(EqAssertionTest, Int) { - ASSERT_EQ(32, 32); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(32, 33), - " 32\n 33"); -} - -// Tests using time_t values in {EXPECT|ASSERT}_EQ. -TEST(EqAssertionTest, Time_T) { - EXPECT_EQ(static_cast(0), - static_cast(0)); - EXPECT_FATAL_FAILURE(ASSERT_EQ(static_cast(0), - static_cast(1234)), - "1234"); -} - -// Tests using char values in {EXPECT|ASSERT}_EQ. -TEST(EqAssertionTest, Char) { - ASSERT_EQ('z', 'z'); - const char ch = 'b'; - EXPECT_NONFATAL_FAILURE(EXPECT_EQ('\0', ch), - " ch\n Which is: 'b'"); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ('a', ch), - " ch\n Which is: 'b'"); -} - -// Tests using wchar_t values in {EXPECT|ASSERT}_EQ. -TEST(EqAssertionTest, WideChar) { - EXPECT_EQ(L'b', L'b'); - - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(L'\0', L'x'), - "Expected equality of these values:\n" - " L'\0'\n" - " Which is: L'\0' (0, 0x0)\n" - " L'x'\n" - " Which is: L'x' (120, 0x78)"); - - static wchar_t wchar; - wchar = L'b'; - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(L'a', wchar), - "wchar"); - wchar = 0x8119; - EXPECT_FATAL_FAILURE(ASSERT_EQ(static_cast(0x8120), wchar), - " wchar\n Which is: L'"); -} - -// Tests using ::std::string values in {EXPECT|ASSERT}_EQ. -TEST(EqAssertionTest, StdString) { - // Compares a const char* to an std::string that has identical - // content. - ASSERT_EQ("Test", ::std::string("Test")); - - // Compares two identical std::strings. - static const ::std::string str1("A * in the middle"); - static const ::std::string str2(str1); - EXPECT_EQ(str1, str2); - - // Compares a const char* to an std::string that has different - // content - EXPECT_NONFATAL_FAILURE(EXPECT_EQ("Test", ::std::string("test")), - "\"test\""); - - // Compares an std::string to a char* that has different content. - char* const p1 = const_cast("foo"); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(::std::string("bar"), p1), - "p1"); - - // Compares two std::strings that have different contents, one of - // which having a NUL character in the middle. This should fail. - static ::std::string str3(str1); - str3.at(2) = '\0'; - EXPECT_FATAL_FAILURE(ASSERT_EQ(str1, str3), - " str3\n Which is: \"A \\0 in the middle\""); -} - -#if GTEST_HAS_STD_WSTRING - -// Tests using ::std::wstring values in {EXPECT|ASSERT}_EQ. -TEST(EqAssertionTest, StdWideString) { - // Compares two identical std::wstrings. - const ::std::wstring wstr1(L"A * in the middle"); - const ::std::wstring wstr2(wstr1); - ASSERT_EQ(wstr1, wstr2); - - // Compares an std::wstring to a const wchar_t* that has identical - // content. - const wchar_t kTestX8119[] = { 'T', 'e', 's', 't', 0x8119, '\0' }; - EXPECT_EQ(::std::wstring(kTestX8119), kTestX8119); - - // Compares an std::wstring to a const wchar_t* that has different - // content. - const wchar_t kTestX8120[] = { 'T', 'e', 's', 't', 0x8120, '\0' }; - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_EQ(::std::wstring(kTestX8119), kTestX8120); - }, "kTestX8120"); - - // Compares two std::wstrings that have different contents, one of - // which having a NUL character in the middle. - ::std::wstring wstr3(wstr1); - wstr3.at(2) = L'\0'; - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(wstr1, wstr3), - "wstr3"); - - // Compares a wchar_t* to an std::wstring that has different - // content. - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_EQ(const_cast(L"foo"), ::std::wstring(L"bar")); - }, ""); -} - -#endif // GTEST_HAS_STD_WSTRING - -#if GTEST_HAS_GLOBAL_STRING -// Tests using ::string values in {EXPECT|ASSERT}_EQ. -TEST(EqAssertionTest, GlobalString) { - // Compares a const char* to a ::string that has identical content. - EXPECT_EQ("Test", ::string("Test")); - - // Compares two identical ::strings. - const ::string str1("A * in the middle"); - const ::string str2(str1); - ASSERT_EQ(str1, str2); - - // Compares a ::string to a const char* that has different content. - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(::string("Test"), "test"), - "test"); - - // Compares two ::strings that have different contents, one of which - // having a NUL character in the middle. - ::string str3(str1); - str3.at(2) = '\0'; - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(str1, str3), - "str3"); - - // Compares a ::string to a char* that has different content. - EXPECT_FATAL_FAILURE({ // NOLINT - ASSERT_EQ(::string("bar"), const_cast("foo")); - }, ""); -} - -#endif // GTEST_HAS_GLOBAL_STRING - -#if GTEST_HAS_GLOBAL_WSTRING - -// Tests using ::wstring values in {EXPECT|ASSERT}_EQ. -TEST(EqAssertionTest, GlobalWideString) { - // Compares two identical ::wstrings. - static const ::wstring wstr1(L"A * in the middle"); - static const ::wstring wstr2(wstr1); - EXPECT_EQ(wstr1, wstr2); - - // Compares a const wchar_t* to a ::wstring that has identical content. - const wchar_t kTestX8119[] = { 'T', 'e', 's', 't', 0x8119, '\0' }; - ASSERT_EQ(kTestX8119, ::wstring(kTestX8119)); - - // Compares a const wchar_t* to a ::wstring that has different - // content. - const wchar_t kTestX8120[] = { 'T', 'e', 's', 't', 0x8120, '\0' }; - EXPECT_NONFATAL_FAILURE({ // NOLINT - EXPECT_EQ(kTestX8120, ::wstring(kTestX8119)); - }, "Test\\x8119"); - - // Compares a wchar_t* to a ::wstring that has different content. - wchar_t* const p1 = const_cast(L"foo"); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, ::wstring(L"bar")), - "bar"); - - // Compares two ::wstrings that have different contents, one of which - // having a NUL character in the middle. - static ::wstring wstr3; - wstr3 = wstr1; - wstr3.at(2) = L'\0'; - EXPECT_FATAL_FAILURE(ASSERT_EQ(wstr1, wstr3), - "wstr3"); -} - -#endif // GTEST_HAS_GLOBAL_WSTRING - -// Tests using char pointers in {EXPECT|ASSERT}_EQ. -TEST(EqAssertionTest, CharPointer) { - char* const p0 = NULL; - // Only way to get the Nokia compiler to compile the cast - // is to have a separate void* variable first. Putting - // the two casts on the same line doesn't work, neither does - // a direct C-style to char*. - void* pv1 = (void*)0x1234; // NOLINT - void* pv2 = (void*)0xABC0; // NOLINT - char* const p1 = reinterpret_cast(pv1); - char* const p2 = reinterpret_cast(pv2); - ASSERT_EQ(p1, p1); - - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2), - " p2\n Which is:"); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2), - " p2\n Which is:"); - EXPECT_FATAL_FAILURE(ASSERT_EQ(reinterpret_cast(0x1234), - reinterpret_cast(0xABC0)), - "ABC0"); -} - -// Tests using wchar_t pointers in {EXPECT|ASSERT}_EQ. -TEST(EqAssertionTest, WideCharPointer) { - wchar_t* const p0 = NULL; - // Only way to get the Nokia compiler to compile the cast - // is to have a separate void* variable first. Putting - // the two casts on the same line doesn't work, neither does - // a direct C-style to char*. - void* pv1 = (void*)0x1234; // NOLINT - void* pv2 = (void*)0xABC0; // NOLINT - wchar_t* const p1 = reinterpret_cast(pv1); - wchar_t* const p2 = reinterpret_cast(pv2); - EXPECT_EQ(p0, p0); - - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2), - " p2\n Which is:"); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2), - " p2\n Which is:"); - void* pv3 = (void*)0x1234; // NOLINT - void* pv4 = (void*)0xABC0; // NOLINT - const wchar_t* p3 = reinterpret_cast(pv3); - const wchar_t* p4 = reinterpret_cast(pv4); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p3, p4), - "p4"); -} - -// Tests using other types of pointers in {EXPECT|ASSERT}_EQ. -TEST(EqAssertionTest, OtherPointer) { - ASSERT_EQ(static_cast(NULL), - static_cast(NULL)); - EXPECT_FATAL_FAILURE(ASSERT_EQ(static_cast(NULL), - reinterpret_cast(0x1234)), - "0x1234"); -} - -// A class that supports binary comparison operators but not streaming. -class UnprintableChar { - public: - explicit UnprintableChar(char ch) : char_(ch) {} - - bool operator==(const UnprintableChar& rhs) const { - return char_ == rhs.char_; - } - bool operator!=(const UnprintableChar& rhs) const { - return char_ != rhs.char_; - } - bool operator<(const UnprintableChar& rhs) const { - return char_ < rhs.char_; - } - bool operator<=(const UnprintableChar& rhs) const { - return char_ <= rhs.char_; - } - bool operator>(const UnprintableChar& rhs) const { - return char_ > rhs.char_; - } - bool operator>=(const UnprintableChar& rhs) const { - return char_ >= rhs.char_; - } - - private: - char char_; -}; - -// Tests that ASSERT_EQ() and friends don't require the arguments to -// be printable. -TEST(ComparisonAssertionTest, AcceptsUnprintableArgs) { - const UnprintableChar x('x'), y('y'); - ASSERT_EQ(x, x); - EXPECT_NE(x, y); - ASSERT_LT(x, y); - EXPECT_LE(x, y); - ASSERT_GT(y, x); - EXPECT_GE(x, x); - - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(x, y), "1-byte object <78>"); - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(x, y), "1-byte object <79>"); - EXPECT_NONFATAL_FAILURE(EXPECT_LT(y, y), "1-byte object <79>"); - EXPECT_NONFATAL_FAILURE(EXPECT_GT(x, y), "1-byte object <78>"); - EXPECT_NONFATAL_FAILURE(EXPECT_GT(x, y), "1-byte object <79>"); - - // Code tested by EXPECT_FATAL_FAILURE cannot reference local - // variables, so we have to write UnprintableChar('x') instead of x. -#ifndef __BORLANDC__ - // ICE's in C++Builder. - EXPECT_FATAL_FAILURE(ASSERT_NE(UnprintableChar('x'), UnprintableChar('x')), - "1-byte object <78>"); - EXPECT_FATAL_FAILURE(ASSERT_LE(UnprintableChar('y'), UnprintableChar('x')), - "1-byte object <78>"); -#endif - EXPECT_FATAL_FAILURE(ASSERT_LE(UnprintableChar('y'), UnprintableChar('x')), - "1-byte object <79>"); - EXPECT_FATAL_FAILURE(ASSERT_GE(UnprintableChar('x'), UnprintableChar('y')), - "1-byte object <78>"); - EXPECT_FATAL_FAILURE(ASSERT_GE(UnprintableChar('x'), UnprintableChar('y')), - "1-byte object <79>"); -} - -// Tests the FRIEND_TEST macro. - -// This class has a private member we want to test. We will test it -// both in a TEST and in a TEST_F. -class Foo { - public: - Foo() {} - - private: - int Bar() const { return 1; } - - // Declares the friend tests that can access the private member - // Bar(). - FRIEND_TEST(FRIEND_TEST_Test, TEST); - FRIEND_TEST(FRIEND_TEST_Test2, TEST_F); -}; - -// Tests that the FRIEND_TEST declaration allows a TEST to access a -// class's private members. This should compile. -TEST(FRIEND_TEST_Test, TEST) { - ASSERT_EQ(1, Foo().Bar()); -} - -// The fixture needed to test using FRIEND_TEST with TEST_F. -class FRIEND_TEST_Test2 : public Test { - protected: - Foo foo; -}; - -// Tests that the FRIEND_TEST declaration allows a TEST_F to access a -// class's private members. This should compile. -TEST_F(FRIEND_TEST_Test2, TEST_F) { - ASSERT_EQ(1, foo.Bar()); -} - -// Tests the life cycle of Test objects. - -// The test fixture for testing the life cycle of Test objects. -// -// This class counts the number of live test objects that uses this -// fixture. -class TestLifeCycleTest : public Test { - protected: - // Constructor. Increments the number of test objects that uses - // this fixture. - TestLifeCycleTest() { count_++; } - - // Destructor. Decrements the number of test objects that uses this - // fixture. - ~TestLifeCycleTest() { count_--; } - - // Returns the number of live test objects that uses this fixture. - int count() const { return count_; } - - private: - static int count_; -}; - -int TestLifeCycleTest::count_ = 0; - -// Tests the life cycle of test objects. -TEST_F(TestLifeCycleTest, Test1) { - // There should be only one test object in this test case that's - // currently alive. - ASSERT_EQ(1, count()); -} - -// Tests the life cycle of test objects. -TEST_F(TestLifeCycleTest, Test2) { - // After Test1 is done and Test2 is started, there should still be - // only one live test object, as the object for Test1 should've been - // deleted. - ASSERT_EQ(1, count()); -} - -} // namespace - -// Tests that the copy constructor works when it is NOT optimized away by -// the compiler. -TEST(AssertionResultTest, CopyConstructorWorksWhenNotOptimied) { - // Checks that the copy constructor doesn't try to dereference NULL pointers - // in the source object. - AssertionResult r1 = AssertionSuccess(); - AssertionResult r2 = r1; - // The following line is added to prevent the compiler from optimizing - // away the constructor call. - r1 << "abc"; - - AssertionResult r3 = r1; - EXPECT_EQ(static_cast(r3), static_cast(r1)); - EXPECT_STREQ("abc", r1.message()); -} - -// Tests that AssertionSuccess and AssertionFailure construct -// AssertionResult objects as expected. -TEST(AssertionResultTest, ConstructionWorks) { - AssertionResult r1 = AssertionSuccess(); - EXPECT_TRUE(r1); - EXPECT_STREQ("", r1.message()); - - AssertionResult r2 = AssertionSuccess() << "abc"; - EXPECT_TRUE(r2); - EXPECT_STREQ("abc", r2.message()); - - AssertionResult r3 = AssertionFailure(); - EXPECT_FALSE(r3); - EXPECT_STREQ("", r3.message()); - - AssertionResult r4 = AssertionFailure() << "def"; - EXPECT_FALSE(r4); - EXPECT_STREQ("def", r4.message()); - - AssertionResult r5 = AssertionFailure(Message() << "ghi"); - EXPECT_FALSE(r5); - EXPECT_STREQ("ghi", r5.message()); -} - -// Tests that the negation flips the predicate result but keeps the message. -TEST(AssertionResultTest, NegationWorks) { - AssertionResult r1 = AssertionSuccess() << "abc"; - EXPECT_FALSE(!r1); - EXPECT_STREQ("abc", (!r1).message()); - - AssertionResult r2 = AssertionFailure() << "def"; - EXPECT_TRUE(!r2); - EXPECT_STREQ("def", (!r2).message()); -} - -TEST(AssertionResultTest, StreamingWorks) { - AssertionResult r = AssertionSuccess(); - r << "abc" << 'd' << 0 << true; - EXPECT_STREQ("abcd0true", r.message()); -} - -TEST(AssertionResultTest, CanStreamOstreamManipulators) { - AssertionResult r = AssertionSuccess(); - r << "Data" << std::endl << std::flush << std::ends << "Will be visible"; - EXPECT_STREQ("Data\n\\0Will be visible", r.message()); -} - -// The next test uses explicit conversion operators -- a C++11 feature. -#if GTEST_LANG_CXX11 - -TEST(AssertionResultTest, ConstructibleFromContextuallyConvertibleToBool) { - struct ExplicitlyConvertibleToBool { - explicit operator bool() const { return value; } - bool value; - }; - ExplicitlyConvertibleToBool v1 = {false}; - ExplicitlyConvertibleToBool v2 = {true}; - EXPECT_FALSE(v1); - EXPECT_TRUE(v2); -} - -#endif // GTEST_LANG_CXX11 - -struct ConvertibleToAssertionResult { - operator AssertionResult() const { return AssertionResult(true); } -}; - -TEST(AssertionResultTest, ConstructibleFromImplicitlyConvertible) { - ConvertibleToAssertionResult obj; - EXPECT_TRUE(obj); -} - -// Tests streaming a user type whose definition and operator << are -// both in the global namespace. -class Base { - public: - explicit Base(int an_x) : x_(an_x) {} - int x() const { return x_; } - private: - int x_; -}; -std::ostream& operator<<(std::ostream& os, - const Base& val) { - return os << val.x(); -} -std::ostream& operator<<(std::ostream& os, - const Base* pointer) { - return os << "(" << pointer->x() << ")"; -} - -TEST(MessageTest, CanStreamUserTypeInGlobalNameSpace) { - Message msg; - Base a(1); - - msg << a << &a; // Uses ::operator<<. - EXPECT_STREQ("1(1)", msg.GetString().c_str()); -} - -// Tests streaming a user type whose definition and operator<< are -// both in an unnamed namespace. -namespace { -class MyTypeInUnnamedNameSpace : public Base { - public: - explicit MyTypeInUnnamedNameSpace(int an_x): Base(an_x) {} -}; -std::ostream& operator<<(std::ostream& os, - const MyTypeInUnnamedNameSpace& val) { - return os << val.x(); -} -std::ostream& operator<<(std::ostream& os, - const MyTypeInUnnamedNameSpace* pointer) { - return os << "(" << pointer->x() << ")"; -} -} // namespace - -TEST(MessageTest, CanStreamUserTypeInUnnamedNameSpace) { - Message msg; - MyTypeInUnnamedNameSpace a(1); - - msg << a << &a; // Uses ::operator<<. - EXPECT_STREQ("1(1)", msg.GetString().c_str()); -} - -// Tests streaming a user type whose definition and operator<< are -// both in a user namespace. -namespace namespace1 { -class MyTypeInNameSpace1 : public Base { - public: - explicit MyTypeInNameSpace1(int an_x): Base(an_x) {} -}; -std::ostream& operator<<(std::ostream& os, - const MyTypeInNameSpace1& val) { - return os << val.x(); -} -std::ostream& operator<<(std::ostream& os, - const MyTypeInNameSpace1* pointer) { - return os << "(" << pointer->x() << ")"; -} -} // namespace namespace1 - -TEST(MessageTest, CanStreamUserTypeInUserNameSpace) { - Message msg; - namespace1::MyTypeInNameSpace1 a(1); - - msg << a << &a; // Uses namespace1::operator<<. - EXPECT_STREQ("1(1)", msg.GetString().c_str()); -} - -// Tests streaming a user type whose definition is in a user namespace -// but whose operator<< is in the global namespace. -namespace namespace2 { -class MyTypeInNameSpace2 : public ::Base { - public: - explicit MyTypeInNameSpace2(int an_x): Base(an_x) {} -}; -} // namespace namespace2 -std::ostream& operator<<(std::ostream& os, - const namespace2::MyTypeInNameSpace2& val) { - return os << val.x(); -} -std::ostream& operator<<(std::ostream& os, - const namespace2::MyTypeInNameSpace2* pointer) { - return os << "(" << pointer->x() << ")"; -} - -TEST(MessageTest, CanStreamUserTypeInUserNameSpaceWithStreamOperatorInGlobal) { - Message msg; - namespace2::MyTypeInNameSpace2 a(1); - - msg << a << &a; // Uses ::operator<<. - EXPECT_STREQ("1(1)", msg.GetString().c_str()); -} - -// Tests streaming NULL pointers to testing::Message. -TEST(MessageTest, NullPointers) { - Message msg; - char* const p1 = NULL; - unsigned char* const p2 = NULL; - int* p3 = NULL; - double* p4 = NULL; - bool* p5 = NULL; - Message* p6 = NULL; - - msg << p1 << p2 << p3 << p4 << p5 << p6; - ASSERT_STREQ("(null)(null)(null)(null)(null)(null)", - msg.GetString().c_str()); -} - -// Tests streaming wide strings to testing::Message. -TEST(MessageTest, WideStrings) { - // Streams a NULL of type const wchar_t*. - const wchar_t* const_wstr = NULL; - EXPECT_STREQ("(null)", - (Message() << const_wstr).GetString().c_str()); - - // Streams a NULL of type wchar_t*. - wchar_t* wstr = NULL; - EXPECT_STREQ("(null)", - (Message() << wstr).GetString().c_str()); - - // Streams a non-NULL of type const wchar_t*. - const_wstr = L"abc\x8119"; - EXPECT_STREQ("abc\xe8\x84\x99", - (Message() << const_wstr).GetString().c_str()); - - // Streams a non-NULL of type wchar_t*. - wstr = const_cast(const_wstr); - EXPECT_STREQ("abc\xe8\x84\x99", - (Message() << wstr).GetString().c_str()); -} - - -// This line tests that we can define tests in the testing namespace. -namespace testing { - -// Tests the TestInfo class. - -class TestInfoTest : public Test { - protected: - static const TestInfo* GetTestInfo(const char* test_name) { - const TestCase* const test_case = GetUnitTestImpl()-> - GetTestCase("TestInfoTest", "", NULL, NULL); - - for (int i = 0; i < test_case->total_test_count(); ++i) { - const TestInfo* const test_info = test_case->GetTestInfo(i); - if (strcmp(test_name, test_info->name()) == 0) - return test_info; - } - return NULL; - } - - static const TestResult* GetTestResult( - const TestInfo* test_info) { - return test_info->result(); - } -}; - -// Tests TestInfo::test_case_name() and TestInfo::name(). -TEST_F(TestInfoTest, Names) { - const TestInfo* const test_info = GetTestInfo("Names"); - - ASSERT_STREQ("TestInfoTest", test_info->test_case_name()); - ASSERT_STREQ("Names", test_info->name()); -} - -// Tests TestInfo::result(). -TEST_F(TestInfoTest, result) { - const TestInfo* const test_info = GetTestInfo("result"); - - // Initially, there is no TestPartResult for this test. - ASSERT_EQ(0, GetTestResult(test_info)->total_part_count()); - - // After the previous assertion, there is still none. - ASSERT_EQ(0, GetTestResult(test_info)->total_part_count()); -} - -#define VERIFY_CODE_LOCATION \ - const int expected_line = __LINE__ - 1; \ - const TestInfo* const test_info = GetUnitTestImpl()->current_test_info(); \ - ASSERT_TRUE(test_info); \ - EXPECT_STREQ(__FILE__, test_info->file()); \ - EXPECT_EQ(expected_line, test_info->line()) - -TEST(CodeLocationForTEST, Verify) { - VERIFY_CODE_LOCATION; -} - -class CodeLocationForTESTF : public Test { -}; - -TEST_F(CodeLocationForTESTF, Verify) { - VERIFY_CODE_LOCATION; -} - -class CodeLocationForTESTP : public TestWithParam { -}; - -TEST_P(CodeLocationForTESTP, Verify) { - VERIFY_CODE_LOCATION; -} - -INSTANTIATE_TEST_CASE_P(, CodeLocationForTESTP, Values(0)); - -template -class CodeLocationForTYPEDTEST : public Test { -}; - -TYPED_TEST_CASE(CodeLocationForTYPEDTEST, int); - -TYPED_TEST(CodeLocationForTYPEDTEST, Verify) { - VERIFY_CODE_LOCATION; -} - -template -class CodeLocationForTYPEDTESTP : public Test { -}; - -TYPED_TEST_CASE_P(CodeLocationForTYPEDTESTP); - -TYPED_TEST_P(CodeLocationForTYPEDTESTP, Verify) { - VERIFY_CODE_LOCATION; -} - -REGISTER_TYPED_TEST_CASE_P(CodeLocationForTYPEDTESTP, Verify); - -INSTANTIATE_TYPED_TEST_CASE_P(My, CodeLocationForTYPEDTESTP, int); - -#undef VERIFY_CODE_LOCATION - -// Tests setting up and tearing down a test case. - -class SetUpTestCaseTest : public Test { - protected: - // This will be called once before the first test in this test case - // is run. - static void SetUpTestCase() { - printf("Setting up the test case . . .\n"); - - // Initializes some shared resource. In this simple example, we - // just create a C string. More complex stuff can be done if - // desired. - shared_resource_ = "123"; - - // Increments the number of test cases that have been set up. - counter_++; - - // SetUpTestCase() should be called only once. - EXPECT_EQ(1, counter_); - } - - // This will be called once after the last test in this test case is - // run. - static void TearDownTestCase() { - printf("Tearing down the test case . . .\n"); - - // Decrements the number of test cases that have been set up. - counter_--; - - // TearDownTestCase() should be called only once. - EXPECT_EQ(0, counter_); - - // Cleans up the shared resource. - shared_resource_ = NULL; - } - - // This will be called before each test in this test case. - virtual void SetUp() { - // SetUpTestCase() should be called only once, so counter_ should - // always be 1. - EXPECT_EQ(1, counter_); - } - - // Number of test cases that have been set up. - static int counter_; - - // Some resource to be shared by all tests in this test case. - static const char* shared_resource_; -}; - -int SetUpTestCaseTest::counter_ = 0; -const char* SetUpTestCaseTest::shared_resource_ = NULL; - -// A test that uses the shared resource. -TEST_F(SetUpTestCaseTest, Test1) { - EXPECT_STRNE(NULL, shared_resource_); -} - -// Another test that uses the shared resource. -TEST_F(SetUpTestCaseTest, Test2) { - EXPECT_STREQ("123", shared_resource_); -} - - -// The ParseFlagsTest test case tests ParseGoogleTestFlagsOnly. - -// The Flags struct stores a copy of all Google Test flags. -struct Flags { - // Constructs a Flags struct where each flag has its default value. - Flags() : also_run_disabled_tests(false), - break_on_failure(false), - catch_exceptions(false), - death_test_use_fork(false), - filter(""), - list_tests(false), - output(""), - print_time(true), - random_seed(0), - repeat(1), - shuffle(false), - stack_trace_depth(kMaxStackTraceDepth), - stream_result_to(""), - throw_on_failure(false) {} - - // Factory methods. - - // Creates a Flags struct where the gtest_also_run_disabled_tests flag has - // the given value. - static Flags AlsoRunDisabledTests(bool also_run_disabled_tests) { - Flags flags; - flags.also_run_disabled_tests = also_run_disabled_tests; - return flags; - } - - // Creates a Flags struct where the gtest_break_on_failure flag has - // the given value. - static Flags BreakOnFailure(bool break_on_failure) { - Flags flags; - flags.break_on_failure = break_on_failure; - return flags; - } - - // Creates a Flags struct where the gtest_catch_exceptions flag has - // the given value. - static Flags CatchExceptions(bool catch_exceptions) { - Flags flags; - flags.catch_exceptions = catch_exceptions; - return flags; - } - - // Creates a Flags struct where the gtest_death_test_use_fork flag has - // the given value. - static Flags DeathTestUseFork(bool death_test_use_fork) { - Flags flags; - flags.death_test_use_fork = death_test_use_fork; - return flags; - } - - // Creates a Flags struct where the gtest_filter flag has the given - // value. - static Flags Filter(const char* filter) { - Flags flags; - flags.filter = filter; - return flags; - } - - // Creates a Flags struct where the gtest_list_tests flag has the - // given value. - static Flags ListTests(bool list_tests) { - Flags flags; - flags.list_tests = list_tests; - return flags; - } - - // Creates a Flags struct where the gtest_output flag has the given - // value. - static Flags Output(const char* output) { - Flags flags; - flags.output = output; - return flags; - } - - // Creates a Flags struct where the gtest_print_time flag has the given - // value. - static Flags PrintTime(bool print_time) { - Flags flags; - flags.print_time = print_time; - return flags; - } - - // Creates a Flags struct where the gtest_random_seed flag has the given - // value. - static Flags RandomSeed(Int32 random_seed) { - Flags flags; - flags.random_seed = random_seed; - return flags; - } - - // Creates a Flags struct where the gtest_repeat flag has the given - // value. - static Flags Repeat(Int32 repeat) { - Flags flags; - flags.repeat = repeat; - return flags; - } - - // Creates a Flags struct where the gtest_shuffle flag has the given - // value. - static Flags Shuffle(bool shuffle) { - Flags flags; - flags.shuffle = shuffle; - return flags; - } - - // Creates a Flags struct where the GTEST_FLAG(stack_trace_depth) flag has - // the given value. - static Flags StackTraceDepth(Int32 stack_trace_depth) { - Flags flags; - flags.stack_trace_depth = stack_trace_depth; - return flags; - } - - // Creates a Flags struct where the GTEST_FLAG(stream_result_to) flag has - // the given value. - static Flags StreamResultTo(const char* stream_result_to) { - Flags flags; - flags.stream_result_to = stream_result_to; - return flags; - } - - // Creates a Flags struct where the gtest_throw_on_failure flag has - // the given value. - static Flags ThrowOnFailure(bool throw_on_failure) { - Flags flags; - flags.throw_on_failure = throw_on_failure; - return flags; - } - - // These fields store the flag values. - bool also_run_disabled_tests; - bool break_on_failure; - bool catch_exceptions; - bool death_test_use_fork; - const char* filter; - bool list_tests; - const char* output; - bool print_time; - Int32 random_seed; - Int32 repeat; - bool shuffle; - Int32 stack_trace_depth; - const char* stream_result_to; - bool throw_on_failure; -}; - -// Fixture for testing ParseGoogleTestFlagsOnly(). -class ParseFlagsTest : public Test { - protected: - // Clears the flags before each test. - virtual void SetUp() { - GTEST_FLAG(also_run_disabled_tests) = false; - GTEST_FLAG(break_on_failure) = false; - GTEST_FLAG(catch_exceptions) = false; - GTEST_FLAG(death_test_use_fork) = false; - GTEST_FLAG(filter) = ""; - GTEST_FLAG(list_tests) = false; - GTEST_FLAG(output) = ""; - GTEST_FLAG(print_time) = true; - GTEST_FLAG(random_seed) = 0; - GTEST_FLAG(repeat) = 1; - GTEST_FLAG(shuffle) = false; - GTEST_FLAG(stack_trace_depth) = kMaxStackTraceDepth; - GTEST_FLAG(stream_result_to) = ""; - GTEST_FLAG(throw_on_failure) = false; - } - - // Asserts that two narrow or wide string arrays are equal. - template - static void AssertStringArrayEq(size_t size1, CharType** array1, - size_t size2, CharType** array2) { - ASSERT_EQ(size1, size2) << " Array sizes different."; - - for (size_t i = 0; i != size1; i++) { - ASSERT_STREQ(array1[i], array2[i]) << " where i == " << i; - } - } - - // Verifies that the flag values match the expected values. - static void CheckFlags(const Flags& expected) { - EXPECT_EQ(expected.also_run_disabled_tests, - GTEST_FLAG(also_run_disabled_tests)); - EXPECT_EQ(expected.break_on_failure, GTEST_FLAG(break_on_failure)); - EXPECT_EQ(expected.catch_exceptions, GTEST_FLAG(catch_exceptions)); - EXPECT_EQ(expected.death_test_use_fork, GTEST_FLAG(death_test_use_fork)); - EXPECT_STREQ(expected.filter, GTEST_FLAG(filter).c_str()); - EXPECT_EQ(expected.list_tests, GTEST_FLAG(list_tests)); - EXPECT_STREQ(expected.output, GTEST_FLAG(output).c_str()); - EXPECT_EQ(expected.print_time, GTEST_FLAG(print_time)); - EXPECT_EQ(expected.random_seed, GTEST_FLAG(random_seed)); - EXPECT_EQ(expected.repeat, GTEST_FLAG(repeat)); - EXPECT_EQ(expected.shuffle, GTEST_FLAG(shuffle)); - EXPECT_EQ(expected.stack_trace_depth, GTEST_FLAG(stack_trace_depth)); - EXPECT_STREQ(expected.stream_result_to, - GTEST_FLAG(stream_result_to).c_str()); - EXPECT_EQ(expected.throw_on_failure, GTEST_FLAG(throw_on_failure)); - } - - // Parses a command line (specified by argc1 and argv1), then - // verifies that the flag values are expected and that the - // recognized flags are removed from the command line. - template - static void TestParsingFlags(int argc1, const CharType** argv1, - int argc2, const CharType** argv2, - const Flags& expected, bool should_print_help) { - const bool saved_help_flag = ::testing::internal::g_help_flag; - ::testing::internal::g_help_flag = false; - -# if GTEST_HAS_STREAM_REDIRECTION - CaptureStdout(); -# endif - - // Parses the command line. - internal::ParseGoogleTestFlagsOnly(&argc1, const_cast(argv1)); - -# if GTEST_HAS_STREAM_REDIRECTION - const std::string captured_stdout = GetCapturedStdout(); -# endif - - // Verifies the flag values. - CheckFlags(expected); - - // Verifies that the recognized flags are removed from the command - // line. - AssertStringArrayEq(argc1 + 1, argv1, argc2 + 1, argv2); - - // ParseGoogleTestFlagsOnly should neither set g_help_flag nor print the - // help message for the flags it recognizes. - EXPECT_EQ(should_print_help, ::testing::internal::g_help_flag); - -# if GTEST_HAS_STREAM_REDIRECTION - const char* const expected_help_fragment = - "This program contains tests written using"; - if (should_print_help) { - EXPECT_PRED_FORMAT2(IsSubstring, expected_help_fragment, captured_stdout); - } else { - EXPECT_PRED_FORMAT2(IsNotSubstring, - expected_help_fragment, captured_stdout); - } -# endif // GTEST_HAS_STREAM_REDIRECTION - - ::testing::internal::g_help_flag = saved_help_flag; - } - - // This macro wraps TestParsingFlags s.t. the user doesn't need - // to specify the array sizes. - -# define GTEST_TEST_PARSING_FLAGS_(argv1, argv2, expected, should_print_help) \ - TestParsingFlags(sizeof(argv1)/sizeof(*argv1) - 1, argv1, \ - sizeof(argv2)/sizeof(*argv2) - 1, argv2, \ - expected, should_print_help) -}; - -// Tests parsing an empty command line. -TEST_F(ParseFlagsTest, Empty) { - const char* argv[] = { - NULL - }; - - const char* argv2[] = { - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), false); -} - -// Tests parsing a command line that has no flag. -TEST_F(ParseFlagsTest, NoFlag) { - const char* argv[] = { - "foo.exe", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), false); -} - -// Tests parsing a bad --gtest_filter flag. -TEST_F(ParseFlagsTest, FilterBad) { - const char* argv[] = { - "foo.exe", - "--gtest_filter", - NULL - }; - - const char* argv2[] = { - "foo.exe", - "--gtest_filter", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter(""), true); -} - -// Tests parsing an empty --gtest_filter flag. -TEST_F(ParseFlagsTest, FilterEmpty) { - const char* argv[] = { - "foo.exe", - "--gtest_filter=", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter(""), false); -} - -// Tests parsing a non-empty --gtest_filter flag. -TEST_F(ParseFlagsTest, FilterNonEmpty) { - const char* argv[] = { - "foo.exe", - "--gtest_filter=abc", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter("abc"), false); -} - -// Tests parsing --gtest_break_on_failure. -TEST_F(ParseFlagsTest, BreakOnFailureWithoutValue) { - const char* argv[] = { - "foo.exe", - "--gtest_break_on_failure", - NULL -}; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::BreakOnFailure(true), false); -} - -// Tests parsing --gtest_break_on_failure=0. -TEST_F(ParseFlagsTest, BreakOnFailureFalse_0) { - const char* argv[] = { - "foo.exe", - "--gtest_break_on_failure=0", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::BreakOnFailure(false), false); -} - -// Tests parsing --gtest_break_on_failure=f. -TEST_F(ParseFlagsTest, BreakOnFailureFalse_f) { - const char* argv[] = { - "foo.exe", - "--gtest_break_on_failure=f", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::BreakOnFailure(false), false); -} - -// Tests parsing --gtest_break_on_failure=F. -TEST_F(ParseFlagsTest, BreakOnFailureFalse_F) { - const char* argv[] = { - "foo.exe", - "--gtest_break_on_failure=F", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::BreakOnFailure(false), false); -} - -// Tests parsing a --gtest_break_on_failure flag that has a "true" -// definition. -TEST_F(ParseFlagsTest, BreakOnFailureTrue) { - const char* argv[] = { - "foo.exe", - "--gtest_break_on_failure=1", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::BreakOnFailure(true), false); -} - -// Tests parsing --gtest_catch_exceptions. -TEST_F(ParseFlagsTest, CatchExceptions) { - const char* argv[] = { - "foo.exe", - "--gtest_catch_exceptions", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::CatchExceptions(true), false); -} - -// Tests parsing --gtest_death_test_use_fork. -TEST_F(ParseFlagsTest, DeathTestUseFork) { - const char* argv[] = { - "foo.exe", - "--gtest_death_test_use_fork", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::DeathTestUseFork(true), false); -} - -// Tests having the same flag twice with different values. The -// expected behavior is that the one coming last takes precedence. -TEST_F(ParseFlagsTest, DuplicatedFlags) { - const char* argv[] = { - "foo.exe", - "--gtest_filter=a", - "--gtest_filter=b", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter("b"), false); -} - -// Tests having an unrecognized flag on the command line. -TEST_F(ParseFlagsTest, UnrecognizedFlag) { - const char* argv[] = { - "foo.exe", - "--gtest_break_on_failure", - "bar", // Unrecognized by Google Test. - "--gtest_filter=b", - NULL - }; - - const char* argv2[] = { - "foo.exe", - "bar", - NULL - }; - - Flags flags; - flags.break_on_failure = true; - flags.filter = "b"; - GTEST_TEST_PARSING_FLAGS_(argv, argv2, flags, false); -} - -// Tests having a --gtest_list_tests flag -TEST_F(ParseFlagsTest, ListTestsFlag) { - const char* argv[] = { - "foo.exe", - "--gtest_list_tests", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ListTests(true), false); -} - -// Tests having a --gtest_list_tests flag with a "true" value -TEST_F(ParseFlagsTest, ListTestsTrue) { - const char* argv[] = { - "foo.exe", - "--gtest_list_tests=1", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ListTests(true), false); -} - -// Tests having a --gtest_list_tests flag with a "false" value -TEST_F(ParseFlagsTest, ListTestsFalse) { - const char* argv[] = { - "foo.exe", - "--gtest_list_tests=0", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ListTests(false), false); -} - -// Tests parsing --gtest_list_tests=f. -TEST_F(ParseFlagsTest, ListTestsFalse_f) { - const char* argv[] = { - "foo.exe", - "--gtest_list_tests=f", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ListTests(false), false); -} - -// Tests parsing --gtest_list_tests=F. -TEST_F(ParseFlagsTest, ListTestsFalse_F) { - const char* argv[] = { - "foo.exe", - "--gtest_list_tests=F", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ListTests(false), false); -} - -// Tests parsing --gtest_output (invalid). -TEST_F(ParseFlagsTest, OutputEmpty) { - const char* argv[] = { - "foo.exe", - "--gtest_output", - NULL - }; - - const char* argv2[] = { - "foo.exe", - "--gtest_output", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), true); -} - -// Tests parsing --gtest_output=xml -TEST_F(ParseFlagsTest, OutputXml) { - const char* argv[] = { - "foo.exe", - "--gtest_output=xml", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Output("xml"), false); -} - -// Tests parsing --gtest_output=xml:file -TEST_F(ParseFlagsTest, OutputXmlFile) { - const char* argv[] = { - "foo.exe", - "--gtest_output=xml:file", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Output("xml:file"), false); -} - -// Tests parsing --gtest_output=xml:directory/path/ -TEST_F(ParseFlagsTest, OutputXmlDirectory) { - const char* argv[] = { - "foo.exe", - "--gtest_output=xml:directory/path/", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, - Flags::Output("xml:directory/path/"), false); -} - -// Tests having a --gtest_print_time flag -TEST_F(ParseFlagsTest, PrintTimeFlag) { - const char* argv[] = { - "foo.exe", - "--gtest_print_time", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::PrintTime(true), false); -} - -// Tests having a --gtest_print_time flag with a "true" value -TEST_F(ParseFlagsTest, PrintTimeTrue) { - const char* argv[] = { - "foo.exe", - "--gtest_print_time=1", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::PrintTime(true), false); -} - -// Tests having a --gtest_print_time flag with a "false" value -TEST_F(ParseFlagsTest, PrintTimeFalse) { - const char* argv[] = { - "foo.exe", - "--gtest_print_time=0", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::PrintTime(false), false); -} - -// Tests parsing --gtest_print_time=f. -TEST_F(ParseFlagsTest, PrintTimeFalse_f) { - const char* argv[] = { - "foo.exe", - "--gtest_print_time=f", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::PrintTime(false), false); -} - -// Tests parsing --gtest_print_time=F. -TEST_F(ParseFlagsTest, PrintTimeFalse_F) { - const char* argv[] = { - "foo.exe", - "--gtest_print_time=F", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::PrintTime(false), false); -} - -// Tests parsing --gtest_random_seed=number -TEST_F(ParseFlagsTest, RandomSeed) { - const char* argv[] = { - "foo.exe", - "--gtest_random_seed=1000", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::RandomSeed(1000), false); -} - -// Tests parsing --gtest_repeat=number -TEST_F(ParseFlagsTest, Repeat) { - const char* argv[] = { - "foo.exe", - "--gtest_repeat=1000", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Repeat(1000), false); -} - -// Tests having a --gtest_also_run_disabled_tests flag -TEST_F(ParseFlagsTest, AlsoRunDisabledTestsFlag) { - const char* argv[] = { - "foo.exe", - "--gtest_also_run_disabled_tests", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, - Flags::AlsoRunDisabledTests(true), false); -} - -// Tests having a --gtest_also_run_disabled_tests flag with a "true" value -TEST_F(ParseFlagsTest, AlsoRunDisabledTestsTrue) { - const char* argv[] = { - "foo.exe", - "--gtest_also_run_disabled_tests=1", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, - Flags::AlsoRunDisabledTests(true), false); -} - -// Tests having a --gtest_also_run_disabled_tests flag with a "false" value -TEST_F(ParseFlagsTest, AlsoRunDisabledTestsFalse) { - const char* argv[] = { - "foo.exe", - "--gtest_also_run_disabled_tests=0", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, - Flags::AlsoRunDisabledTests(false), false); -} - -// Tests parsing --gtest_shuffle. -TEST_F(ParseFlagsTest, ShuffleWithoutValue) { - const char* argv[] = { - "foo.exe", - "--gtest_shuffle", - NULL -}; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Shuffle(true), false); -} - -// Tests parsing --gtest_shuffle=0. -TEST_F(ParseFlagsTest, ShuffleFalse_0) { - const char* argv[] = { - "foo.exe", - "--gtest_shuffle=0", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Shuffle(false), false); -} - -// Tests parsing a --gtest_shuffle flag that has a "true" definition. -TEST_F(ParseFlagsTest, ShuffleTrue) { - const char* argv[] = { - "foo.exe", - "--gtest_shuffle=1", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Shuffle(true), false); -} - -// Tests parsing --gtest_stack_trace_depth=number. -TEST_F(ParseFlagsTest, StackTraceDepth) { - const char* argv[] = { - "foo.exe", - "--gtest_stack_trace_depth=5", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::StackTraceDepth(5), false); -} - -TEST_F(ParseFlagsTest, StreamResultTo) { - const char* argv[] = { - "foo.exe", - "--gtest_stream_result_to=localhost:1234", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_( - argv, argv2, Flags::StreamResultTo("localhost:1234"), false); -} - -// Tests parsing --gtest_throw_on_failure. -TEST_F(ParseFlagsTest, ThrowOnFailureWithoutValue) { - const char* argv[] = { - "foo.exe", - "--gtest_throw_on_failure", - NULL -}; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ThrowOnFailure(true), false); -} - -// Tests parsing --gtest_throw_on_failure=0. -TEST_F(ParseFlagsTest, ThrowOnFailureFalse_0) { - const char* argv[] = { - "foo.exe", - "--gtest_throw_on_failure=0", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ThrowOnFailure(false), false); -} - -// Tests parsing a --gtest_throw_on_failure flag that has a "true" -// definition. -TEST_F(ParseFlagsTest, ThrowOnFailureTrue) { - const char* argv[] = { - "foo.exe", - "--gtest_throw_on_failure=1", - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ThrowOnFailure(true), false); -} - -# if GTEST_OS_WINDOWS -// Tests parsing wide strings. -TEST_F(ParseFlagsTest, WideStrings) { - const wchar_t* argv[] = { - L"foo.exe", - L"--gtest_filter=Foo*", - L"--gtest_list_tests=1", - L"--gtest_break_on_failure", - L"--non_gtest_flag", - NULL - }; - - const wchar_t* argv2[] = { - L"foo.exe", - L"--non_gtest_flag", - NULL - }; - - Flags expected_flags; - expected_flags.break_on_failure = true; - expected_flags.filter = "Foo*"; - expected_flags.list_tests = true; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, expected_flags, false); -} -# endif // GTEST_OS_WINDOWS - -#if GTEST_USE_OWN_FLAGFILE_FLAG_ -class FlagfileTest : public ParseFlagsTest { - public: - virtual void SetUp() { - ParseFlagsTest::SetUp(); - - testdata_path_.Set(internal::FilePath( - testing::TempDir() + internal::GetCurrentExecutableName().string() + - "_flagfile_test")); - testing::internal::posix::RmDir(testdata_path_.c_str()); - EXPECT_TRUE(testdata_path_.CreateFolder()); - } - - virtual void TearDown() { - testing::internal::posix::RmDir(testdata_path_.c_str()); - ParseFlagsTest::TearDown(); - } - - internal::FilePath CreateFlagfile(const char* contents) { - internal::FilePath file_path(internal::FilePath::GenerateUniqueFileName( - testdata_path_, internal::FilePath("unique"), "txt")); - FILE* f = testing::internal::posix::FOpen(file_path.c_str(), "w"); - fprintf(f, "%s", contents); - fclose(f); - return file_path; - } - - private: - internal::FilePath testdata_path_; -}; - -// Tests an empty flagfile. -TEST_F(FlagfileTest, Empty) { - internal::FilePath flagfile_path(CreateFlagfile("")); - std::string flagfile_flag = - std::string("--" GTEST_FLAG_PREFIX_ "flagfile=") + flagfile_path.c_str(); - - const char* argv[] = { - "foo.exe", - flagfile_flag.c_str(), - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), false); -} - -// Tests passing a non-empty --gtest_filter flag via --gtest_flagfile. -TEST_F(FlagfileTest, FilterNonEmpty) { - internal::FilePath flagfile_path(CreateFlagfile( - "--" GTEST_FLAG_PREFIX_ "filter=abc")); - std::string flagfile_flag = - std::string("--" GTEST_FLAG_PREFIX_ "flagfile=") + flagfile_path.c_str(); - - const char* argv[] = { - "foo.exe", - flagfile_flag.c_str(), - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter("abc"), false); -} - -// Tests passing several flags via --gtest_flagfile. -TEST_F(FlagfileTest, SeveralFlags) { - internal::FilePath flagfile_path(CreateFlagfile( - "--" GTEST_FLAG_PREFIX_ "filter=abc\n" - "--" GTEST_FLAG_PREFIX_ "break_on_failure\n" - "--" GTEST_FLAG_PREFIX_ "list_tests")); - std::string flagfile_flag = - std::string("--" GTEST_FLAG_PREFIX_ "flagfile=") + flagfile_path.c_str(); - - const char* argv[] = { - "foo.exe", - flagfile_flag.c_str(), - NULL - }; - - const char* argv2[] = { - "foo.exe", - NULL - }; - - Flags expected_flags; - expected_flags.break_on_failure = true; - expected_flags.filter = "abc"; - expected_flags.list_tests = true; - - GTEST_TEST_PARSING_FLAGS_(argv, argv2, expected_flags, false); -} -#endif // GTEST_USE_OWN_FLAGFILE_FLAG_ - -// Tests current_test_info() in UnitTest. -class CurrentTestInfoTest : public Test { - protected: - // Tests that current_test_info() returns NULL before the first test in - // the test case is run. - static void SetUpTestCase() { - // There should be no tests running at this point. - const TestInfo* test_info = - UnitTest::GetInstance()->current_test_info(); - EXPECT_TRUE(test_info == NULL) - << "There should be no tests running at this point."; - } - - // Tests that current_test_info() returns NULL after the last test in - // the test case has run. - static void TearDownTestCase() { - const TestInfo* test_info = - UnitTest::GetInstance()->current_test_info(); - EXPECT_TRUE(test_info == NULL) - << "There should be no tests running at this point."; - } -}; - -// Tests that current_test_info() returns TestInfo for currently running -// test by checking the expected test name against the actual one. -TEST_F(CurrentTestInfoTest, WorksForFirstTestInATestCase) { - const TestInfo* test_info = - UnitTest::GetInstance()->current_test_info(); - ASSERT_TRUE(NULL != test_info) - << "There is a test running so we should have a valid TestInfo."; - EXPECT_STREQ("CurrentTestInfoTest", test_info->test_case_name()) - << "Expected the name of the currently running test case."; - EXPECT_STREQ("WorksForFirstTestInATestCase", test_info->name()) - << "Expected the name of the currently running test."; -} - -// Tests that current_test_info() returns TestInfo for currently running -// test by checking the expected test name against the actual one. We -// use this test to see that the TestInfo object actually changed from -// the previous invocation. -TEST_F(CurrentTestInfoTest, WorksForSecondTestInATestCase) { - const TestInfo* test_info = - UnitTest::GetInstance()->current_test_info(); - ASSERT_TRUE(NULL != test_info) - << "There is a test running so we should have a valid TestInfo."; - EXPECT_STREQ("CurrentTestInfoTest", test_info->test_case_name()) - << "Expected the name of the currently running test case."; - EXPECT_STREQ("WorksForSecondTestInATestCase", test_info->name()) - << "Expected the name of the currently running test."; -} - -} // namespace testing - - -// These two lines test that we can define tests in a namespace that -// has the name "testing" and is nested in another namespace. -namespace my_namespace { -namespace testing { - -// Makes sure that TEST knows to use ::testing::Test instead of -// ::my_namespace::testing::Test. -class Test {}; - -// Makes sure that an assertion knows to use ::testing::Message instead of -// ::my_namespace::testing::Message. -class Message {}; - -// Makes sure that an assertion knows to use -// ::testing::AssertionResult instead of -// ::my_namespace::testing::AssertionResult. -class AssertionResult {}; - -// Tests that an assertion that should succeed works as expected. -TEST(NestedTestingNamespaceTest, Success) { - EXPECT_EQ(1, 1) << "This shouldn't fail."; -} - -// Tests that an assertion that should fail works as expected. -TEST(NestedTestingNamespaceTest, Failure) { - EXPECT_FATAL_FAILURE(FAIL() << "This failure is expected.", - "This failure is expected."); -} - -} // namespace testing -} // namespace my_namespace - -// Tests that one can call superclass SetUp and TearDown methods-- -// that is, that they are not private. -// No tests are based on this fixture; the test "passes" if it compiles -// successfully. -class ProtectedFixtureMethodsTest : public Test { - protected: - virtual void SetUp() { - Test::SetUp(); - } - virtual void TearDown() { - Test::TearDown(); - } -}; - -// StreamingAssertionsTest tests the streaming versions of a representative -// sample of assertions. -TEST(StreamingAssertionsTest, Unconditional) { - SUCCEED() << "expected success"; - EXPECT_NONFATAL_FAILURE(ADD_FAILURE() << "expected failure", - "expected failure"); - EXPECT_FATAL_FAILURE(FAIL() << "expected failure", - "expected failure"); -} - -#ifdef __BORLANDC__ -// Silences warnings: "Condition is always true", "Unreachable code" -# pragma option push -w-ccc -w-rch -#endif - -TEST(StreamingAssertionsTest, Truth) { - EXPECT_TRUE(true) << "unexpected failure"; - ASSERT_TRUE(true) << "unexpected failure"; - EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(false) << "expected failure", - "expected failure"); - EXPECT_FATAL_FAILURE(ASSERT_TRUE(false) << "expected failure", - "expected failure"); -} - -TEST(StreamingAssertionsTest, Truth2) { - EXPECT_FALSE(false) << "unexpected failure"; - ASSERT_FALSE(false) << "unexpected failure"; - EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(true) << "expected failure", - "expected failure"); - EXPECT_FATAL_FAILURE(ASSERT_FALSE(true) << "expected failure", - "expected failure"); -} - -#ifdef __BORLANDC__ -// Restores warnings after previous "#pragma option push" suppressed them -# pragma option pop -#endif - -TEST(StreamingAssertionsTest, IntegerEquals) { - EXPECT_EQ(1, 1) << "unexpected failure"; - ASSERT_EQ(1, 1) << "unexpected failure"; - EXPECT_NONFATAL_FAILURE(EXPECT_EQ(1, 2) << "expected failure", - "expected failure"); - EXPECT_FATAL_FAILURE(ASSERT_EQ(1, 2) << "expected failure", - "expected failure"); -} - -TEST(StreamingAssertionsTest, IntegerLessThan) { - EXPECT_LT(1, 2) << "unexpected failure"; - ASSERT_LT(1, 2) << "unexpected failure"; - EXPECT_NONFATAL_FAILURE(EXPECT_LT(2, 1) << "expected failure", - "expected failure"); - EXPECT_FATAL_FAILURE(ASSERT_LT(2, 1) << "expected failure", - "expected failure"); -} - -TEST(StreamingAssertionsTest, StringsEqual) { - EXPECT_STREQ("foo", "foo") << "unexpected failure"; - ASSERT_STREQ("foo", "foo") << "unexpected failure"; - EXPECT_NONFATAL_FAILURE(EXPECT_STREQ("foo", "bar") << "expected failure", - "expected failure"); - EXPECT_FATAL_FAILURE(ASSERT_STREQ("foo", "bar") << "expected failure", - "expected failure"); -} - -TEST(StreamingAssertionsTest, StringsNotEqual) { - EXPECT_STRNE("foo", "bar") << "unexpected failure"; - ASSERT_STRNE("foo", "bar") << "unexpected failure"; - EXPECT_NONFATAL_FAILURE(EXPECT_STRNE("foo", "foo") << "expected failure", - "expected failure"); - EXPECT_FATAL_FAILURE(ASSERT_STRNE("foo", "foo") << "expected failure", - "expected failure"); -} - -TEST(StreamingAssertionsTest, StringsEqualIgnoringCase) { - EXPECT_STRCASEEQ("foo", "FOO") << "unexpected failure"; - ASSERT_STRCASEEQ("foo", "FOO") << "unexpected failure"; - EXPECT_NONFATAL_FAILURE(EXPECT_STRCASEEQ("foo", "bar") << "expected failure", - "expected failure"); - EXPECT_FATAL_FAILURE(ASSERT_STRCASEEQ("foo", "bar") << "expected failure", - "expected failure"); -} - -TEST(StreamingAssertionsTest, StringNotEqualIgnoringCase) { - EXPECT_STRCASENE("foo", "bar") << "unexpected failure"; - ASSERT_STRCASENE("foo", "bar") << "unexpected failure"; - EXPECT_NONFATAL_FAILURE(EXPECT_STRCASENE("foo", "FOO") << "expected failure", - "expected failure"); - EXPECT_FATAL_FAILURE(ASSERT_STRCASENE("bar", "BAR") << "expected failure", - "expected failure"); -} - -TEST(StreamingAssertionsTest, FloatingPointEquals) { - EXPECT_FLOAT_EQ(1.0, 1.0) << "unexpected failure"; - ASSERT_FLOAT_EQ(1.0, 1.0) << "unexpected failure"; - EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(0.0, 1.0) << "expected failure", - "expected failure"); - EXPECT_FATAL_FAILURE(ASSERT_FLOAT_EQ(0.0, 1.0) << "expected failure", - "expected failure"); -} - -#if GTEST_HAS_EXCEPTIONS - -TEST(StreamingAssertionsTest, Throw) { - EXPECT_THROW(ThrowAnInteger(), int) << "unexpected failure"; - ASSERT_THROW(ThrowAnInteger(), int) << "unexpected failure"; - EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool) << - "expected failure", "expected failure"); - EXPECT_FATAL_FAILURE(ASSERT_THROW(ThrowAnInteger(), bool) << - "expected failure", "expected failure"); -} - -TEST(StreamingAssertionsTest, NoThrow) { - EXPECT_NO_THROW(ThrowNothing()) << "unexpected failure"; - ASSERT_NO_THROW(ThrowNothing()) << "unexpected failure"; - EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()) << - "expected failure", "expected failure"); - EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()) << - "expected failure", "expected failure"); -} - -TEST(StreamingAssertionsTest, AnyThrow) { - EXPECT_ANY_THROW(ThrowAnInteger()) << "unexpected failure"; - ASSERT_ANY_THROW(ThrowAnInteger()) << "unexpected failure"; - EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(ThrowNothing()) << - "expected failure", "expected failure"); - EXPECT_FATAL_FAILURE(ASSERT_ANY_THROW(ThrowNothing()) << - "expected failure", "expected failure"); -} - -#endif // GTEST_HAS_EXCEPTIONS - -// Tests that Google Test correctly decides whether to use colors in the output. - -TEST(ColoredOutputTest, UsesColorsWhenGTestColorFlagIsYes) { - GTEST_FLAG(color) = "yes"; - - SetEnv("TERM", "xterm"); // TERM supports colors. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - EXPECT_TRUE(ShouldUseColor(false)); // Stdout is not a TTY. - - SetEnv("TERM", "dumb"); // TERM doesn't support colors. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - EXPECT_TRUE(ShouldUseColor(false)); // Stdout is not a TTY. -} - -TEST(ColoredOutputTest, UsesColorsWhenGTestColorFlagIsAliasOfYes) { - SetEnv("TERM", "dumb"); // TERM doesn't support colors. - - GTEST_FLAG(color) = "True"; - EXPECT_TRUE(ShouldUseColor(false)); // Stdout is not a TTY. - - GTEST_FLAG(color) = "t"; - EXPECT_TRUE(ShouldUseColor(false)); // Stdout is not a TTY. - - GTEST_FLAG(color) = "1"; - EXPECT_TRUE(ShouldUseColor(false)); // Stdout is not a TTY. -} - -TEST(ColoredOutputTest, UsesNoColorWhenGTestColorFlagIsNo) { - GTEST_FLAG(color) = "no"; - - SetEnv("TERM", "xterm"); // TERM supports colors. - EXPECT_FALSE(ShouldUseColor(true)); // Stdout is a TTY. - EXPECT_FALSE(ShouldUseColor(false)); // Stdout is not a TTY. - - SetEnv("TERM", "dumb"); // TERM doesn't support colors. - EXPECT_FALSE(ShouldUseColor(true)); // Stdout is a TTY. - EXPECT_FALSE(ShouldUseColor(false)); // Stdout is not a TTY. -} - -TEST(ColoredOutputTest, UsesNoColorWhenGTestColorFlagIsInvalid) { - SetEnv("TERM", "xterm"); // TERM supports colors. - - GTEST_FLAG(color) = "F"; - EXPECT_FALSE(ShouldUseColor(true)); // Stdout is a TTY. - - GTEST_FLAG(color) = "0"; - EXPECT_FALSE(ShouldUseColor(true)); // Stdout is a TTY. - - GTEST_FLAG(color) = "unknown"; - EXPECT_FALSE(ShouldUseColor(true)); // Stdout is a TTY. -} - -TEST(ColoredOutputTest, UsesColorsWhenStdoutIsTty) { - GTEST_FLAG(color) = "auto"; - - SetEnv("TERM", "xterm"); // TERM supports colors. - EXPECT_FALSE(ShouldUseColor(false)); // Stdout is not a TTY. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. -} - -TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) { - GTEST_FLAG(color) = "auto"; - -#if GTEST_OS_WINDOWS - // On Windows, we ignore the TERM variable as it's usually not set. - - SetEnv("TERM", "dumb"); - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", ""); - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "xterm"); - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. -#else - // On non-Windows platforms, we rely on TERM to determine if the - // terminal supports colors. - - SetEnv("TERM", "dumb"); // TERM doesn't support colors. - EXPECT_FALSE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "emacs"); // TERM doesn't support colors. - EXPECT_FALSE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "vt100"); // TERM doesn't support colors. - EXPECT_FALSE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "xterm-mono"); // TERM doesn't support colors. - EXPECT_FALSE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "xterm"); // TERM supports colors. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "xterm-color"); // TERM supports colors. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "xterm-256color"); // TERM supports colors. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "screen"); // TERM supports colors. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "screen-256color"); // TERM supports colors. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "tmux"); // TERM supports colors. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "tmux-256color"); // TERM supports colors. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "rxvt-unicode"); // TERM supports colors. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "rxvt-unicode-256color"); // TERM supports colors. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "linux"); // TERM supports colors. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - - SetEnv("TERM", "cygwin"); // TERM supports colors. - EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. -#endif // GTEST_OS_WINDOWS -} - -// Verifies that StaticAssertTypeEq works in a namespace scope. - -static bool dummy1 GTEST_ATTRIBUTE_UNUSED_ = StaticAssertTypeEq(); -static bool dummy2 GTEST_ATTRIBUTE_UNUSED_ = - StaticAssertTypeEq(); - -// Verifies that StaticAssertTypeEq works in a class. - -template -class StaticAssertTypeEqTestHelper { - public: - StaticAssertTypeEqTestHelper() { StaticAssertTypeEq(); } -}; - -TEST(StaticAssertTypeEqTest, WorksInClass) { - StaticAssertTypeEqTestHelper(); -} - -// Verifies that StaticAssertTypeEq works inside a function. - -typedef int IntAlias; - -TEST(StaticAssertTypeEqTest, CompilesForEqualTypes) { - StaticAssertTypeEq(); - StaticAssertTypeEq(); -} - -TEST(HasNonfatalFailureTest, ReturnsFalseWhenThereIsNoFailure) { - EXPECT_FALSE(HasNonfatalFailure()); -} - -static void FailFatally() { FAIL(); } - -TEST(HasNonfatalFailureTest, ReturnsFalseWhenThereIsOnlyFatalFailure) { - FailFatally(); - const bool has_nonfatal_failure = HasNonfatalFailure(); - ClearCurrentTestPartResults(); - EXPECT_FALSE(has_nonfatal_failure); -} - -TEST(HasNonfatalFailureTest, ReturnsTrueWhenThereIsNonfatalFailure) { - ADD_FAILURE(); - const bool has_nonfatal_failure = HasNonfatalFailure(); - ClearCurrentTestPartResults(); - EXPECT_TRUE(has_nonfatal_failure); -} - -TEST(HasNonfatalFailureTest, ReturnsTrueWhenThereAreFatalAndNonfatalFailures) { - FailFatally(); - ADD_FAILURE(); - const bool has_nonfatal_failure = HasNonfatalFailure(); - ClearCurrentTestPartResults(); - EXPECT_TRUE(has_nonfatal_failure); -} - -// A wrapper for calling HasNonfatalFailure outside of a test body. -static bool HasNonfatalFailureHelper() { - return testing::Test::HasNonfatalFailure(); -} - -TEST(HasNonfatalFailureTest, WorksOutsideOfTestBody) { - EXPECT_FALSE(HasNonfatalFailureHelper()); -} - -TEST(HasNonfatalFailureTest, WorksOutsideOfTestBody2) { - ADD_FAILURE(); - const bool has_nonfatal_failure = HasNonfatalFailureHelper(); - ClearCurrentTestPartResults(); - EXPECT_TRUE(has_nonfatal_failure); -} - -TEST(HasFailureTest, ReturnsFalseWhenThereIsNoFailure) { - EXPECT_FALSE(HasFailure()); -} - -TEST(HasFailureTest, ReturnsTrueWhenThereIsFatalFailure) { - FailFatally(); - const bool has_failure = HasFailure(); - ClearCurrentTestPartResults(); - EXPECT_TRUE(has_failure); -} - -TEST(HasFailureTest, ReturnsTrueWhenThereIsNonfatalFailure) { - ADD_FAILURE(); - const bool has_failure = HasFailure(); - ClearCurrentTestPartResults(); - EXPECT_TRUE(has_failure); -} - -TEST(HasFailureTest, ReturnsTrueWhenThereAreFatalAndNonfatalFailures) { - FailFatally(); - ADD_FAILURE(); - const bool has_failure = HasFailure(); - ClearCurrentTestPartResults(); - EXPECT_TRUE(has_failure); -} - -// A wrapper for calling HasFailure outside of a test body. -static bool HasFailureHelper() { return testing::Test::HasFailure(); } - -TEST(HasFailureTest, WorksOutsideOfTestBody) { - EXPECT_FALSE(HasFailureHelper()); -} - -TEST(HasFailureTest, WorksOutsideOfTestBody2) { - ADD_FAILURE(); - const bool has_failure = HasFailureHelper(); - ClearCurrentTestPartResults(); - EXPECT_TRUE(has_failure); -} - -class TestListener : public EmptyTestEventListener { - public: - TestListener() : on_start_counter_(NULL), is_destroyed_(NULL) {} - TestListener(int* on_start_counter, bool* is_destroyed) - : on_start_counter_(on_start_counter), - is_destroyed_(is_destroyed) {} - - virtual ~TestListener() { - if (is_destroyed_) - *is_destroyed_ = true; - } - - protected: - virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) { - if (on_start_counter_ != NULL) - (*on_start_counter_)++; - } - - private: - int* on_start_counter_; - bool* is_destroyed_; -}; - -// Tests the constructor. -TEST(TestEventListenersTest, ConstructionWorks) { - TestEventListeners listeners; - - EXPECT_TRUE(TestEventListenersAccessor::GetRepeater(&listeners) != NULL); - EXPECT_TRUE(listeners.default_result_printer() == NULL); - EXPECT_TRUE(listeners.default_xml_generator() == NULL); -} - -// Tests that the TestEventListeners destructor deletes all the listeners it -// owns. -TEST(TestEventListenersTest, DestructionWorks) { - bool default_result_printer_is_destroyed = false; - bool default_xml_printer_is_destroyed = false; - bool extra_listener_is_destroyed = false; - TestListener* default_result_printer = new TestListener( - NULL, &default_result_printer_is_destroyed); - TestListener* default_xml_printer = new TestListener( - NULL, &default_xml_printer_is_destroyed); - TestListener* extra_listener = new TestListener( - NULL, &extra_listener_is_destroyed); - - { - TestEventListeners listeners; - TestEventListenersAccessor::SetDefaultResultPrinter(&listeners, - default_result_printer); - TestEventListenersAccessor::SetDefaultXmlGenerator(&listeners, - default_xml_printer); - listeners.Append(extra_listener); - } - EXPECT_TRUE(default_result_printer_is_destroyed); - EXPECT_TRUE(default_xml_printer_is_destroyed); - EXPECT_TRUE(extra_listener_is_destroyed); -} - -// Tests that a listener Append'ed to a TestEventListeners list starts -// receiving events. -TEST(TestEventListenersTest, Append) { - int on_start_counter = 0; - bool is_destroyed = false; - TestListener* listener = new TestListener(&on_start_counter, &is_destroyed); - { - TestEventListeners listeners; - listeners.Append(listener); - TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart( - *UnitTest::GetInstance()); - EXPECT_EQ(1, on_start_counter); - } - EXPECT_TRUE(is_destroyed); -} - -// Tests that listeners receive events in the order they were appended to -// the list, except for *End requests, which must be received in the reverse -// order. -class SequenceTestingListener : public EmptyTestEventListener { - public: - SequenceTestingListener(std::vector* vector, const char* id) - : vector_(vector), id_(id) {} - - protected: - virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) { - vector_->push_back(GetEventDescription("OnTestProgramStart")); - } - - virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) { - vector_->push_back(GetEventDescription("OnTestProgramEnd")); - } - - virtual void OnTestIterationStart(const UnitTest& /*unit_test*/, - int /*iteration*/) { - vector_->push_back(GetEventDescription("OnTestIterationStart")); - } - - virtual void OnTestIterationEnd(const UnitTest& /*unit_test*/, - int /*iteration*/) { - vector_->push_back(GetEventDescription("OnTestIterationEnd")); - } - - private: - std::string GetEventDescription(const char* method) { - Message message; - message << id_ << "." << method; - return message.GetString(); - } - - std::vector* vector_; - const char* const id_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(SequenceTestingListener); -}; - -TEST(EventListenerTest, AppendKeepsOrder) { - std::vector vec; - TestEventListeners listeners; - listeners.Append(new SequenceTestingListener(&vec, "1st")); - listeners.Append(new SequenceTestingListener(&vec, "2nd")); - listeners.Append(new SequenceTestingListener(&vec, "3rd")); - - TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart( - *UnitTest::GetInstance()); - ASSERT_EQ(3U, vec.size()); - EXPECT_STREQ("1st.OnTestProgramStart", vec[0].c_str()); - EXPECT_STREQ("2nd.OnTestProgramStart", vec[1].c_str()); - EXPECT_STREQ("3rd.OnTestProgramStart", vec[2].c_str()); - - vec.clear(); - TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramEnd( - *UnitTest::GetInstance()); - ASSERT_EQ(3U, vec.size()); - EXPECT_STREQ("3rd.OnTestProgramEnd", vec[0].c_str()); - EXPECT_STREQ("2nd.OnTestProgramEnd", vec[1].c_str()); - EXPECT_STREQ("1st.OnTestProgramEnd", vec[2].c_str()); - - vec.clear(); - TestEventListenersAccessor::GetRepeater(&listeners)->OnTestIterationStart( - *UnitTest::GetInstance(), 0); - ASSERT_EQ(3U, vec.size()); - EXPECT_STREQ("1st.OnTestIterationStart", vec[0].c_str()); - EXPECT_STREQ("2nd.OnTestIterationStart", vec[1].c_str()); - EXPECT_STREQ("3rd.OnTestIterationStart", vec[2].c_str()); - - vec.clear(); - TestEventListenersAccessor::GetRepeater(&listeners)->OnTestIterationEnd( - *UnitTest::GetInstance(), 0); - ASSERT_EQ(3U, vec.size()); - EXPECT_STREQ("3rd.OnTestIterationEnd", vec[0].c_str()); - EXPECT_STREQ("2nd.OnTestIterationEnd", vec[1].c_str()); - EXPECT_STREQ("1st.OnTestIterationEnd", vec[2].c_str()); -} - -// Tests that a listener removed from a TestEventListeners list stops receiving -// events and is not deleted when the list is destroyed. -TEST(TestEventListenersTest, Release) { - int on_start_counter = 0; - bool is_destroyed = false; - // Although Append passes the ownership of this object to the list, - // the following calls release it, and we need to delete it before the - // test ends. - TestListener* listener = new TestListener(&on_start_counter, &is_destroyed); - { - TestEventListeners listeners; - listeners.Append(listener); - EXPECT_EQ(listener, listeners.Release(listener)); - TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart( - *UnitTest::GetInstance()); - EXPECT_TRUE(listeners.Release(listener) == NULL); - } - EXPECT_EQ(0, on_start_counter); - EXPECT_FALSE(is_destroyed); - delete listener; -} - -// Tests that no events are forwarded when event forwarding is disabled. -TEST(EventListenerTest, SuppressEventForwarding) { - int on_start_counter = 0; - TestListener* listener = new TestListener(&on_start_counter, NULL); - - TestEventListeners listeners; - listeners.Append(listener); - ASSERT_TRUE(TestEventListenersAccessor::EventForwardingEnabled(listeners)); - TestEventListenersAccessor::SuppressEventForwarding(&listeners); - ASSERT_FALSE(TestEventListenersAccessor::EventForwardingEnabled(listeners)); - TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart( - *UnitTest::GetInstance()); - EXPECT_EQ(0, on_start_counter); -} - -// Tests that events generated by Google Test are not forwarded in -// death test subprocesses. -TEST(EventListenerDeathTest, EventsNotForwardedInDeathTestSubprecesses) { - EXPECT_DEATH_IF_SUPPORTED({ - GTEST_CHECK_(TestEventListenersAccessor::EventForwardingEnabled( - *GetUnitTestImpl()->listeners())) << "expected failure";}, - "expected failure"); -} - -// Tests that a listener installed via SetDefaultResultPrinter() starts -// receiving events and is returned via default_result_printer() and that -// the previous default_result_printer is removed from the list and deleted. -TEST(EventListenerTest, default_result_printer) { - int on_start_counter = 0; - bool is_destroyed = false; - TestListener* listener = new TestListener(&on_start_counter, &is_destroyed); - - TestEventListeners listeners; - TestEventListenersAccessor::SetDefaultResultPrinter(&listeners, listener); - - EXPECT_EQ(listener, listeners.default_result_printer()); - - TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart( - *UnitTest::GetInstance()); - - EXPECT_EQ(1, on_start_counter); - - // Replacing default_result_printer with something else should remove it - // from the list and destroy it. - TestEventListenersAccessor::SetDefaultResultPrinter(&listeners, NULL); - - EXPECT_TRUE(listeners.default_result_printer() == NULL); - EXPECT_TRUE(is_destroyed); - - // After broadcasting an event the counter is still the same, indicating - // the listener is not in the list anymore. - TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart( - *UnitTest::GetInstance()); - EXPECT_EQ(1, on_start_counter); -} - -// Tests that the default_result_printer listener stops receiving events -// when removed via Release and that is not owned by the list anymore. -TEST(EventListenerTest, RemovingDefaultResultPrinterWorks) { - int on_start_counter = 0; - bool is_destroyed = false; - // Although Append passes the ownership of this object to the list, - // the following calls release it, and we need to delete it before the - // test ends. - TestListener* listener = new TestListener(&on_start_counter, &is_destroyed); - { - TestEventListeners listeners; - TestEventListenersAccessor::SetDefaultResultPrinter(&listeners, listener); - - EXPECT_EQ(listener, listeners.Release(listener)); - EXPECT_TRUE(listeners.default_result_printer() == NULL); - EXPECT_FALSE(is_destroyed); - - // Broadcasting events now should not affect default_result_printer. - TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart( - *UnitTest::GetInstance()); - EXPECT_EQ(0, on_start_counter); - } - // Destroying the list should not affect the listener now, too. - EXPECT_FALSE(is_destroyed); - delete listener; -} - -// Tests that a listener installed via SetDefaultXmlGenerator() starts -// receiving events and is returned via default_xml_generator() and that -// the previous default_xml_generator is removed from the list and deleted. -TEST(EventListenerTest, default_xml_generator) { - int on_start_counter = 0; - bool is_destroyed = false; - TestListener* listener = new TestListener(&on_start_counter, &is_destroyed); - - TestEventListeners listeners; - TestEventListenersAccessor::SetDefaultXmlGenerator(&listeners, listener); - - EXPECT_EQ(listener, listeners.default_xml_generator()); - - TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart( - *UnitTest::GetInstance()); - - EXPECT_EQ(1, on_start_counter); - - // Replacing default_xml_generator with something else should remove it - // from the list and destroy it. - TestEventListenersAccessor::SetDefaultXmlGenerator(&listeners, NULL); - - EXPECT_TRUE(listeners.default_xml_generator() == NULL); - EXPECT_TRUE(is_destroyed); - - // After broadcasting an event the counter is still the same, indicating - // the listener is not in the list anymore. - TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart( - *UnitTest::GetInstance()); - EXPECT_EQ(1, on_start_counter); -} - -// Tests that the default_xml_generator listener stops receiving events -// when removed via Release and that is not owned by the list anymore. -TEST(EventListenerTest, RemovingDefaultXmlGeneratorWorks) { - int on_start_counter = 0; - bool is_destroyed = false; - // Although Append passes the ownership of this object to the list, - // the following calls release it, and we need to delete it before the - // test ends. - TestListener* listener = new TestListener(&on_start_counter, &is_destroyed); - { - TestEventListeners listeners; - TestEventListenersAccessor::SetDefaultXmlGenerator(&listeners, listener); - - EXPECT_EQ(listener, listeners.Release(listener)); - EXPECT_TRUE(listeners.default_xml_generator() == NULL); - EXPECT_FALSE(is_destroyed); - - // Broadcasting events now should not affect default_xml_generator. - TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart( - *UnitTest::GetInstance()); - EXPECT_EQ(0, on_start_counter); - } - // Destroying the list should not affect the listener now, too. - EXPECT_FALSE(is_destroyed); - delete listener; -} - -// Sanity tests to ensure that the alternative, verbose spellings of -// some of the macros work. We don't test them thoroughly as that -// would be quite involved. Since their implementations are -// straightforward, and they are rarely used, we'll just rely on the -// users to tell us when they are broken. -GTEST_TEST(AlternativeNameTest, Works) { // GTEST_TEST is the same as TEST. - GTEST_SUCCEED() << "OK"; // GTEST_SUCCEED is the same as SUCCEED. - - // GTEST_FAIL is the same as FAIL. - EXPECT_FATAL_FAILURE(GTEST_FAIL() << "An expected failure", - "An expected failure"); - - // GTEST_ASSERT_XY is the same as ASSERT_XY. - - GTEST_ASSERT_EQ(0, 0); - EXPECT_FATAL_FAILURE(GTEST_ASSERT_EQ(0, 1) << "An expected failure", - "An expected failure"); - EXPECT_FATAL_FAILURE(GTEST_ASSERT_EQ(1, 0) << "An expected failure", - "An expected failure"); - - GTEST_ASSERT_NE(0, 1); - GTEST_ASSERT_NE(1, 0); - EXPECT_FATAL_FAILURE(GTEST_ASSERT_NE(0, 0) << "An expected failure", - "An expected failure"); - - GTEST_ASSERT_LE(0, 0); - GTEST_ASSERT_LE(0, 1); - EXPECT_FATAL_FAILURE(GTEST_ASSERT_LE(1, 0) << "An expected failure", - "An expected failure"); - - GTEST_ASSERT_LT(0, 1); - EXPECT_FATAL_FAILURE(GTEST_ASSERT_LT(0, 0) << "An expected failure", - "An expected failure"); - EXPECT_FATAL_FAILURE(GTEST_ASSERT_LT(1, 0) << "An expected failure", - "An expected failure"); - - GTEST_ASSERT_GE(0, 0); - GTEST_ASSERT_GE(1, 0); - EXPECT_FATAL_FAILURE(GTEST_ASSERT_GE(0, 1) << "An expected failure", - "An expected failure"); - - GTEST_ASSERT_GT(1, 0); - EXPECT_FATAL_FAILURE(GTEST_ASSERT_GT(0, 1) << "An expected failure", - "An expected failure"); - EXPECT_FATAL_FAILURE(GTEST_ASSERT_GT(1, 1) << "An expected failure", - "An expected failure"); -} - -// Tests for internal utilities necessary for implementation of the universal -// printing. -// TODO(vladl@google.com): Find a better home for them. - -class ConversionHelperBase {}; -class ConversionHelperDerived : public ConversionHelperBase {}; - -// Tests that IsAProtocolMessage::value is a compile-time constant. -TEST(IsAProtocolMessageTest, ValueIsCompileTimeConstant) { - GTEST_COMPILE_ASSERT_(IsAProtocolMessage::value, - const_true); - GTEST_COMPILE_ASSERT_(!IsAProtocolMessage::value, const_false); -} - -// Tests that IsAProtocolMessage::value is true when T is -// proto2::Message or a sub-class of it. -TEST(IsAProtocolMessageTest, ValueIsTrueWhenTypeIsAProtocolMessage) { - EXPECT_TRUE(IsAProtocolMessage< ::proto2::Message>::value); - EXPECT_TRUE(IsAProtocolMessage::value); -} - -// Tests that IsAProtocolMessage::value is false when T is neither -// ProtocolMessage nor a sub-class of it. -TEST(IsAProtocolMessageTest, ValueIsFalseWhenTypeIsNotAProtocolMessage) { - EXPECT_FALSE(IsAProtocolMessage::value); - EXPECT_FALSE(IsAProtocolMessage::value); -} - -// Tests that CompileAssertTypesEqual compiles when the type arguments are -// equal. -TEST(CompileAssertTypesEqual, CompilesWhenTypesAreEqual) { - CompileAssertTypesEqual(); - CompileAssertTypesEqual(); -} - -// Tests that RemoveReference does not affect non-reference types. -TEST(RemoveReferenceTest, DoesNotAffectNonReferenceType) { - CompileAssertTypesEqual::type>(); - CompileAssertTypesEqual::type>(); -} - -// Tests that RemoveReference removes reference from reference types. -TEST(RemoveReferenceTest, RemovesReference) { - CompileAssertTypesEqual::type>(); - CompileAssertTypesEqual::type>(); -} - -// Tests GTEST_REMOVE_REFERENCE_. - -template -void TestGTestRemoveReference() { - CompileAssertTypesEqual(); -} - -TEST(RemoveReferenceTest, MacroVersion) { - TestGTestRemoveReference(); - TestGTestRemoveReference(); -} - - -// Tests that RemoveConst does not affect non-const types. -TEST(RemoveConstTest, DoesNotAffectNonConstType) { - CompileAssertTypesEqual::type>(); - CompileAssertTypesEqual::type>(); -} - -// Tests that RemoveConst removes const from const types. -TEST(RemoveConstTest, RemovesConst) { - CompileAssertTypesEqual::type>(); - CompileAssertTypesEqual::type>(); - CompileAssertTypesEqual::type>(); -} - -// Tests GTEST_REMOVE_CONST_. - -template -void TestGTestRemoveConst() { - CompileAssertTypesEqual(); -} - -TEST(RemoveConstTest, MacroVersion) { - TestGTestRemoveConst(); - TestGTestRemoveConst(); - TestGTestRemoveConst(); -} - -// Tests GTEST_REMOVE_REFERENCE_AND_CONST_. - -template -void TestGTestRemoveReferenceAndConst() { - CompileAssertTypesEqual(); -} - -TEST(RemoveReferenceToConstTest, Works) { - TestGTestRemoveReferenceAndConst(); - TestGTestRemoveReferenceAndConst(); - TestGTestRemoveReferenceAndConst(); - TestGTestRemoveReferenceAndConst(); - TestGTestRemoveReferenceAndConst(); -} - -// Tests that AddReference does not affect reference types. -TEST(AddReferenceTest, DoesNotAffectReferenceType) { - CompileAssertTypesEqual::type>(); - CompileAssertTypesEqual::type>(); -} - -// Tests that AddReference adds reference to non-reference types. -TEST(AddReferenceTest, AddsReference) { - CompileAssertTypesEqual::type>(); - CompileAssertTypesEqual::type>(); -} - -// Tests GTEST_ADD_REFERENCE_. - -template -void TestGTestAddReference() { - CompileAssertTypesEqual(); -} - -TEST(AddReferenceTest, MacroVersion) { - TestGTestAddReference(); - TestGTestAddReference(); -} - -// Tests GTEST_REFERENCE_TO_CONST_. - -template -void TestGTestReferenceToConst() { - CompileAssertTypesEqual(); -} - -TEST(GTestReferenceToConstTest, Works) { - TestGTestReferenceToConst(); - TestGTestReferenceToConst(); - TestGTestReferenceToConst(); - TestGTestReferenceToConst(); -} - -// Tests that ImplicitlyConvertible::value is a compile-time constant. -TEST(ImplicitlyConvertibleTest, ValueIsCompileTimeConstant) { - GTEST_COMPILE_ASSERT_((ImplicitlyConvertible::value), const_true); - GTEST_COMPILE_ASSERT_((!ImplicitlyConvertible::value), - const_false); -} - -// Tests that ImplicitlyConvertible::value is true when T1 can -// be implicitly converted to T2. -TEST(ImplicitlyConvertibleTest, ValueIsTrueWhenConvertible) { - EXPECT_TRUE((ImplicitlyConvertible::value)); - EXPECT_TRUE((ImplicitlyConvertible::value)); - EXPECT_TRUE((ImplicitlyConvertible::value)); - EXPECT_TRUE((ImplicitlyConvertible::value)); - EXPECT_TRUE((ImplicitlyConvertible::value)); - EXPECT_TRUE((ImplicitlyConvertible::value)); -} - -// Tests that ImplicitlyConvertible::value is false when T1 -// cannot be implicitly converted to T2. -TEST(ImplicitlyConvertibleTest, ValueIsFalseWhenNotConvertible) { - EXPECT_FALSE((ImplicitlyConvertible::value)); - EXPECT_FALSE((ImplicitlyConvertible::value)); - EXPECT_FALSE((ImplicitlyConvertible::value)); - EXPECT_FALSE((ImplicitlyConvertible::value)); -} - -// Tests IsContainerTest. - -class NonContainer {}; - -TEST(IsContainerTestTest, WorksForNonContainer) { - EXPECT_EQ(sizeof(IsNotContainer), sizeof(IsContainerTest(0))); - EXPECT_EQ(sizeof(IsNotContainer), sizeof(IsContainerTest(0))); - EXPECT_EQ(sizeof(IsNotContainer), sizeof(IsContainerTest(0))); -} - -TEST(IsContainerTestTest, WorksForContainer) { - EXPECT_EQ(sizeof(IsContainer), - sizeof(IsContainerTest >(0))); - EXPECT_EQ(sizeof(IsContainer), - sizeof(IsContainerTest >(0))); -} - -#if GTEST_LANG_CXX11 -struct ConstOnlyContainerWithPointerIterator { - using const_iterator = int*; - const_iterator begin() const; - const_iterator end() const; -}; - -struct ConstOnlyContainerWithClassIterator { - struct const_iterator { - const int& operator*() const; - const_iterator& operator++(/* pre-increment */); - }; - const_iterator begin() const; - const_iterator end() const; -}; - -TEST(IsContainerTestTest, ConstOnlyContainer) { - EXPECT_EQ(sizeof(IsContainer), - sizeof(IsContainerTest(0))); - EXPECT_EQ(sizeof(IsContainer), - sizeof(IsContainerTest(0))); -} -#endif // GTEST_LANG_CXX11 - -// Tests IsHashTable. -struct AHashTable { - typedef void hasher; -}; -struct NotReallyAHashTable { - typedef void hasher; - typedef void reverse_iterator; -}; -TEST(IsHashTable, Basic) { - EXPECT_TRUE(testing::internal::IsHashTable::value); - EXPECT_FALSE(testing::internal::IsHashTable::value); -#if GTEST_LANG_CXX11 - EXPECT_FALSE(testing::internal::IsHashTable>::value); - EXPECT_TRUE(testing::internal::IsHashTable>::value); -#endif // GTEST_LANG_CXX11 -#if GTEST_HAS_HASH_SET_ - EXPECT_TRUE(testing::internal::IsHashTable<__gnu_cxx::hash_set>::value); -#endif // GTEST_HAS_HASH_SET_ -} - -// Tests ArrayEq(). - -TEST(ArrayEqTest, WorksForDegeneratedArrays) { - EXPECT_TRUE(ArrayEq(5, 5L)); - EXPECT_FALSE(ArrayEq('a', 0)); -} - -TEST(ArrayEqTest, WorksForOneDimensionalArrays) { - // Note that a and b are distinct but compatible types. - const int a[] = { 0, 1 }; - long b[] = { 0, 1 }; - EXPECT_TRUE(ArrayEq(a, b)); - EXPECT_TRUE(ArrayEq(a, 2, b)); - - b[0] = 2; - EXPECT_FALSE(ArrayEq(a, b)); - EXPECT_FALSE(ArrayEq(a, 1, b)); -} - -TEST(ArrayEqTest, WorksForTwoDimensionalArrays) { - const char a[][3] = { "hi", "lo" }; - const char b[][3] = { "hi", "lo" }; - const char c[][3] = { "hi", "li" }; - - EXPECT_TRUE(ArrayEq(a, b)); - EXPECT_TRUE(ArrayEq(a, 2, b)); - - EXPECT_FALSE(ArrayEq(a, c)); - EXPECT_FALSE(ArrayEq(a, 2, c)); -} - -// Tests ArrayAwareFind(). - -TEST(ArrayAwareFindTest, WorksForOneDimensionalArray) { - const char a[] = "hello"; - EXPECT_EQ(a + 4, ArrayAwareFind(a, a + 5, 'o')); - EXPECT_EQ(a + 5, ArrayAwareFind(a, a + 5, 'x')); -} - -TEST(ArrayAwareFindTest, WorksForTwoDimensionalArray) { - int a[][2] = { { 0, 1 }, { 2, 3 }, { 4, 5 } }; - const int b[2] = { 2, 3 }; - EXPECT_EQ(a + 1, ArrayAwareFind(a, a + 3, b)); - - const int c[2] = { 6, 7 }; - EXPECT_EQ(a + 3, ArrayAwareFind(a, a + 3, c)); -} - -// Tests CopyArray(). - -TEST(CopyArrayTest, WorksForDegeneratedArrays) { - int n = 0; - CopyArray('a', &n); - EXPECT_EQ('a', n); -} - -TEST(CopyArrayTest, WorksForOneDimensionalArrays) { - const char a[3] = "hi"; - int b[3]; -#ifndef __BORLANDC__ // C++Builder cannot compile some array size deductions. - CopyArray(a, &b); - EXPECT_TRUE(ArrayEq(a, b)); -#endif - - int c[3]; - CopyArray(a, 3, c); - EXPECT_TRUE(ArrayEq(a, c)); -} - -TEST(CopyArrayTest, WorksForTwoDimensionalArrays) { - const int a[2][3] = { { 0, 1, 2 }, { 3, 4, 5 } }; - int b[2][3]; -#ifndef __BORLANDC__ // C++Builder cannot compile some array size deductions. - CopyArray(a, &b); - EXPECT_TRUE(ArrayEq(a, b)); -#endif - - int c[2][3]; - CopyArray(a, 2, c); - EXPECT_TRUE(ArrayEq(a, c)); -} - -// Tests NativeArray. - -TEST(NativeArrayTest, ConstructorFromArrayWorks) { - const int a[3] = { 0, 1, 2 }; - NativeArray na(a, 3, RelationToSourceReference()); - EXPECT_EQ(3U, na.size()); - EXPECT_EQ(a, na.begin()); -} - -TEST(NativeArrayTest, CreatesAndDeletesCopyOfArrayWhenAskedTo) { - typedef int Array[2]; - Array* a = new Array[1]; - (*a)[0] = 0; - (*a)[1] = 1; - NativeArray na(*a, 2, RelationToSourceCopy()); - EXPECT_NE(*a, na.begin()); - delete[] a; - EXPECT_EQ(0, na.begin()[0]); - EXPECT_EQ(1, na.begin()[1]); - - // We rely on the heap checker to verify that na deletes the copy of - // array. -} - -TEST(NativeArrayTest, TypeMembersAreCorrect) { - StaticAssertTypeEq::value_type>(); - StaticAssertTypeEq::value_type>(); - - StaticAssertTypeEq::const_iterator>(); - StaticAssertTypeEq::const_iterator>(); -} - -TEST(NativeArrayTest, MethodsWork) { - const int a[3] = { 0, 1, 2 }; - NativeArray na(a, 3, RelationToSourceCopy()); - ASSERT_EQ(3U, na.size()); - EXPECT_EQ(3, na.end() - na.begin()); - - NativeArray::const_iterator it = na.begin(); - EXPECT_EQ(0, *it); - ++it; - EXPECT_EQ(1, *it); - it++; - EXPECT_EQ(2, *it); - ++it; - EXPECT_EQ(na.end(), it); - - EXPECT_TRUE(na == na); - - NativeArray na2(a, 3, RelationToSourceReference()); - EXPECT_TRUE(na == na2); - - const int b1[3] = { 0, 1, 1 }; - const int b2[4] = { 0, 1, 2, 3 }; - EXPECT_FALSE(na == NativeArray(b1, 3, RelationToSourceReference())); - EXPECT_FALSE(na == NativeArray(b2, 4, RelationToSourceCopy())); -} - -TEST(NativeArrayTest, WorksForTwoDimensionalArray) { - const char a[2][3] = { "hi", "lo" }; - NativeArray na(a, 2, RelationToSourceReference()); - ASSERT_EQ(2U, na.size()); - EXPECT_EQ(a, na.begin()); -} - -// Tests SkipPrefix(). - -TEST(SkipPrefixTest, SkipsWhenPrefixMatches) { - const char* const str = "hello"; - - const char* p = str; - EXPECT_TRUE(SkipPrefix("", &p)); - EXPECT_EQ(str, p); - - p = str; - EXPECT_TRUE(SkipPrefix("hell", &p)); - EXPECT_EQ(str + 4, p); -} - -TEST(SkipPrefixTest, DoesNotSkipWhenPrefixDoesNotMatch) { - const char* const str = "world"; - - const char* p = str; - EXPECT_FALSE(SkipPrefix("W", &p)); - EXPECT_EQ(str, p); - - p = str; - EXPECT_FALSE(SkipPrefix("world!", &p)); - EXPECT_EQ(str, p); -} - -// Tests ad_hoc_test_result(). - -class AdHocTestResultTest : public testing::Test { - protected: - static void SetUpTestCase() { - FAIL() << "A failure happened inside SetUpTestCase()."; - } -}; - -TEST_F(AdHocTestResultTest, AdHocTestResultForTestCaseShowsFailure) { - const testing::TestResult& test_result = testing::UnitTest::GetInstance() - ->current_test_case() - ->ad_hoc_test_result(); - EXPECT_TRUE(test_result.Failed()); -} - -TEST_F(AdHocTestResultTest, AdHocTestResultTestForUnitTestDoesNotShowFailure) { - const testing::TestResult& test_result = - testing::UnitTest::GetInstance()->ad_hoc_test_result(); - EXPECT_FALSE(test_result.Failed()); -} diff --git a/test/gtest-1.8.0/test/gtest_xml_outfile1_test_.cc b/test/gtest-1.8.0/test/gtest_xml_outfile1_test_.cc deleted file mode 100644 index e3d1dd1ef9..0000000000 --- a/test/gtest-1.8.0/test/gtest_xml_outfile1_test_.cc +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// -// gtest_xml_outfile1_test_ writes some xml via TestProperty used by -// gtest_xml_outfiles_test.py - -#include "gtest/gtest.h" - -class PropertyOne : public testing::Test { - protected: - virtual void SetUp() { - RecordProperty("SetUpProp", 1); - } - virtual void TearDown() { - RecordProperty("TearDownProp", 1); - } -}; - -TEST_F(PropertyOne, TestSomeProperties) { - RecordProperty("TestSomeProperty", 1); -} diff --git a/test/gtest-1.8.0/test/gtest_xml_outfile2_test_.cc b/test/gtest-1.8.0/test/gtest_xml_outfile2_test_.cc deleted file mode 100644 index 55eb8f394f..0000000000 --- a/test/gtest-1.8.0/test/gtest_xml_outfile2_test_.cc +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// -// gtest_xml_outfile2_test_ writes some xml via TestProperty used by -// gtest_xml_outfiles_test.py - -#include "gtest/gtest.h" - -class PropertyTwo : public testing::Test { - protected: - virtual void SetUp() { - RecordProperty("SetUpProp", 2); - } - virtual void TearDown() { - RecordProperty("TearDownProp", 2); - } -}; - -TEST_F(PropertyTwo, TestSomeProperties) { - RecordProperty("TestSomeProperty", 2); -} diff --git a/test/gtest-1.8.0/test/gtest_xml_outfiles_test.py b/test/gtest-1.8.0/test/gtest_xml_outfiles_test.py deleted file mode 100644 index c7d3413481..0000000000 --- a/test/gtest-1.8.0/test/gtest_xml_outfiles_test.py +++ /dev/null @@ -1,140 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Unit test for the gtest_xml_output module.""" - -import os -from xml.dom import minidom, Node -import gtest_test_utils -import gtest_xml_test_utils - -GTEST_OUTPUT_SUBDIR = "xml_outfiles" -GTEST_OUTPUT_1_TEST = "gtest_xml_outfile1_test_" -GTEST_OUTPUT_2_TEST = "gtest_xml_outfile2_test_" - -EXPECTED_XML_1 = """ - - - - - - - - - - - -""" - -EXPECTED_XML_2 = """ - - - - - - - - - - - -""" - - -class GTestXMLOutFilesTest(gtest_xml_test_utils.GTestXMLTestCase): - """Unit test for Google Test's XML output functionality.""" - - def setUp(self): - # We want the trailing '/' that the last "" provides in os.path.join, for - # telling Google Test to create an output directory instead of a single file - # for xml output. - self.output_dir_ = os.path.join(gtest_test_utils.GetTempDir(), - GTEST_OUTPUT_SUBDIR, "") - self.DeleteFilesAndDir() - - def tearDown(self): - self.DeleteFilesAndDir() - - def DeleteFilesAndDir(self): - try: - os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_1_TEST + ".xml")) - except os.error: - pass - try: - os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_2_TEST + ".xml")) - except os.error: - pass - try: - os.rmdir(self.output_dir_) - except os.error: - pass - - def testOutfile1(self): - self._TestOutFile(GTEST_OUTPUT_1_TEST, EXPECTED_XML_1) - - def testOutfile2(self): - self._TestOutFile(GTEST_OUTPUT_2_TEST, EXPECTED_XML_2) - - def _TestOutFile(self, test_name, expected_xml): - gtest_prog_path = gtest_test_utils.GetTestExecutablePath(test_name) - command = [gtest_prog_path, "--gtest_output=xml:%s" % self.output_dir_] - p = gtest_test_utils.Subprocess(command, - working_dir=gtest_test_utils.GetTempDir()) - self.assert_(p.exited) - self.assertEquals(0, p.exit_code) - - # TODO(wan@google.com): libtool causes the built test binary to be - # named lt-gtest_xml_outfiles_test_ instead of - # gtest_xml_outfiles_test_. To account for this possibility, we - # allow both names in the following code. We should remove this - # hack when Chandler Carruth's libtool replacement tool is ready. - output_file_name1 = test_name + ".xml" - output_file1 = os.path.join(self.output_dir_, output_file_name1) - output_file_name2 = 'lt-' + output_file_name1 - output_file2 = os.path.join(self.output_dir_, output_file_name2) - self.assert_(os.path.isfile(output_file1) or os.path.isfile(output_file2), - output_file1) - - expected = minidom.parseString(expected_xml) - if os.path.isfile(output_file1): - actual = minidom.parse(output_file1) - else: - actual = minidom.parse(output_file2) - self.NormalizeXml(actual.documentElement) - self.AssertEquivalentNodes(expected.documentElement, - actual.documentElement) - expected.unlink() - actual.unlink() - - -if __name__ == "__main__": - os.environ["GTEST_STACK_TRACE_DEPTH"] = "0" - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_xml_output_unittest.py b/test/gtest-1.8.0/test/gtest_xml_output_unittest.py deleted file mode 100644 index 6ffb6e3f71..0000000000 --- a/test/gtest-1.8.0/test/gtest_xml_output_unittest.py +++ /dev/null @@ -1,378 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2006, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Unit test for the gtest_xml_output module""" - -import datetime -import errno -import os -import re -import sys -from xml.dom import minidom, Node - -import gtest_test_utils -import gtest_xml_test_utils - -GTEST_FILTER_FLAG = '--gtest_filter' -GTEST_LIST_TESTS_FLAG = '--gtest_list_tests' -GTEST_OUTPUT_FLAG = '--gtest_output' -GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.xml' -GTEST_PROGRAM_NAME = 'gtest_xml_output_unittest_' - -# The environment variables for test sharding. -TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS' -SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX' -SHARD_STATUS_FILE_ENV_VAR = 'GTEST_SHARD_STATUS_FILE' - -SUPPORTS_STACK_TRACES = False - -if SUPPORTS_STACK_TRACES: - STACK_TRACE_TEMPLATE = '\nStack trace:\n*' -else: - STACK_TRACE_TEMPLATE = '' - -EXPECTED_NON_EMPTY_XML = """ - - - - - - - - - - - - - - - - - - - - ]]>%(stack)s]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -""" % {'stack': STACK_TRACE_TEMPLATE} - -EXPECTED_FILTERED_TEST_XML = """ - - - - -""" - -EXPECTED_SHARDED_TEST_XML = """ - - - - - - - - - - - - - - -""" - -EXPECTED_EMPTY_XML = """ - -""" - -GTEST_PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath(GTEST_PROGRAM_NAME) - -SUPPORTS_TYPED_TESTS = 'TypedTest' in gtest_test_utils.Subprocess( - [GTEST_PROGRAM_PATH, GTEST_LIST_TESTS_FLAG], capture_stderr=False).output - - -class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase): - """ - Unit test for Google Test's XML output functionality. - """ - - # This test currently breaks on platforms that do not support typed and - # type-parameterized tests, so we don't run it under them. - if SUPPORTS_TYPED_TESTS: - def testNonEmptyXmlOutput(self): - """ - Runs a test program that generates a non-empty XML output, and - tests that the XML output is expected. - """ - self._TestXmlOutput(GTEST_PROGRAM_NAME, EXPECTED_NON_EMPTY_XML, 1) - - def testEmptyXmlOutput(self): - """Verifies XML output for a Google Test binary without actual tests. - - Runs a test program that generates an empty XML output, and - tests that the XML output is expected. - """ - - self._TestXmlOutput('gtest_no_test_unittest', EXPECTED_EMPTY_XML, 0) - - def testTimestampValue(self): - """Checks whether the timestamp attribute in the XML output is valid. - - Runs a test program that generates an empty XML output, and checks if - the timestamp attribute in the testsuites tag is valid. - """ - actual = self._GetXmlOutput('gtest_no_test_unittest', [], {}, 0) - date_time_str = actual.documentElement.getAttributeNode('timestamp').value - # datetime.strptime() is only available in Python 2.5+ so we have to - # parse the expected datetime manually. - match = re.match(r'(\d+)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)', date_time_str) - self.assertTrue( - re.match, - 'XML datettime string %s has incorrect format' % date_time_str) - date_time_from_xml = datetime.datetime( - year=int(match.group(1)), month=int(match.group(2)), - day=int(match.group(3)), hour=int(match.group(4)), - minute=int(match.group(5)), second=int(match.group(6))) - - time_delta = abs(datetime.datetime.now() - date_time_from_xml) - # timestamp value should be near the current local time - self.assertTrue(time_delta < datetime.timedelta(seconds=600), - 'time_delta is %s' % time_delta) - actual.unlink() - - def testDefaultOutputFile(self): - """ - Confirms that Google Test produces an XML output file with the expected - default name if no name is explicitly specified. - """ - output_file = os.path.join(gtest_test_utils.GetTempDir(), - GTEST_DEFAULT_OUTPUT_FILE) - gtest_prog_path = gtest_test_utils.GetTestExecutablePath( - 'gtest_no_test_unittest') - try: - os.remove(output_file) - except OSError, e: - if e.errno != errno.ENOENT: - raise - - p = gtest_test_utils.Subprocess( - [gtest_prog_path, '%s=xml' % GTEST_OUTPUT_FLAG], - working_dir=gtest_test_utils.GetTempDir()) - self.assert_(p.exited) - self.assertEquals(0, p.exit_code) - self.assert_(os.path.isfile(output_file)) - - def testSuppressedXmlOutput(self): - """ - Tests that no XML file is generated if the default XML listener is - shut down before RUN_ALL_TESTS is invoked. - """ - - xml_path = os.path.join(gtest_test_utils.GetTempDir(), - GTEST_PROGRAM_NAME + 'out.xml') - if os.path.isfile(xml_path): - os.remove(xml_path) - - command = [GTEST_PROGRAM_PATH, - '%s=xml:%s' % (GTEST_OUTPUT_FLAG, xml_path), - '--shut_down_xml'] - p = gtest_test_utils.Subprocess(command) - if p.terminated_by_signal: - # p.signal is available only if p.terminated_by_signal is True. - self.assertFalse( - p.terminated_by_signal, - '%s was killed by signal %d' % (GTEST_PROGRAM_NAME, p.signal)) - else: - self.assert_(p.exited) - self.assertEquals(1, p.exit_code, - "'%s' exited with code %s, which doesn't match " - 'the expected exit code %s.' - % (command, p.exit_code, 1)) - - self.assert_(not os.path.isfile(xml_path)) - - def testFilteredTestXmlOutput(self): - """Verifies XML output when a filter is applied. - - Runs a test program that executes only some tests and verifies that - non-selected tests do not show up in the XML output. - """ - - self._TestXmlOutput(GTEST_PROGRAM_NAME, EXPECTED_FILTERED_TEST_XML, 0, - extra_args=['%s=SuccessfulTest.*' % GTEST_FILTER_FLAG]) - - def testShardedTestXmlOutput(self): - """Verifies XML output when run using multiple shards. - - Runs a test program that executes only one shard and verifies that tests - from other shards do not show up in the XML output. - """ - - self._TestXmlOutput( - GTEST_PROGRAM_NAME, - EXPECTED_SHARDED_TEST_XML, - 0, - extra_env={SHARD_INDEX_ENV_VAR: '0', - TOTAL_SHARDS_ENV_VAR: '10'}) - - def _GetXmlOutput(self, gtest_prog_name, extra_args, extra_env, - expected_exit_code): - """ - Returns the xml output generated by running the program gtest_prog_name. - Furthermore, the program's exit code must be expected_exit_code. - """ - xml_path = os.path.join(gtest_test_utils.GetTempDir(), - gtest_prog_name + 'out.xml') - gtest_prog_path = gtest_test_utils.GetTestExecutablePath(gtest_prog_name) - - command = ([gtest_prog_path, '%s=xml:%s' % (GTEST_OUTPUT_FLAG, xml_path)] + - extra_args) - environ_copy = os.environ.copy() - if extra_env: - environ_copy.update(extra_env) - p = gtest_test_utils.Subprocess(command, env=environ_copy) - - if p.terminated_by_signal: - self.assert_(False, - '%s was killed by signal %d' % (gtest_prog_name, p.signal)) - else: - self.assert_(p.exited) - self.assertEquals(expected_exit_code, p.exit_code, - "'%s' exited with code %s, which doesn't match " - 'the expected exit code %s.' - % (command, p.exit_code, expected_exit_code)) - actual = minidom.parse(xml_path) - return actual - - def _TestXmlOutput(self, gtest_prog_name, expected_xml, - expected_exit_code, extra_args=None, extra_env=None): - """ - Asserts that the XML document generated by running the program - gtest_prog_name matches expected_xml, a string containing another - XML document. Furthermore, the program's exit code must be - expected_exit_code. - """ - - actual = self._GetXmlOutput(gtest_prog_name, extra_args or [], - extra_env or {}, expected_exit_code) - expected = minidom.parseString(expected_xml) - self.NormalizeXml(actual.documentElement) - self.AssertEquivalentNodes(expected.documentElement, - actual.documentElement) - expected.unlink() - actual.unlink() - - -if __name__ == '__main__': - os.environ['GTEST_STACK_TRACE_DEPTH'] = '1' - gtest_test_utils.Main() diff --git a/test/gtest-1.8.0/test/gtest_xml_output_unittest_.cc b/test/gtest-1.8.0/test/gtest_xml_output_unittest_.cc deleted file mode 100644 index 2ee8838005..0000000000 --- a/test/gtest-1.8.0/test/gtest_xml_output_unittest_.cc +++ /dev/null @@ -1,179 +0,0 @@ -// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Unit test for Google Test XML output. -// -// A user can specify XML output in a Google Test program to run via -// either the GTEST_OUTPUT environment variable or the --gtest_output -// flag. This is used for testing such functionality. -// -// This program will be invoked from a Python unit test. Don't run it -// directly. - -#include "gtest/gtest.h" - -using ::testing::InitGoogleTest; -using ::testing::TestEventListeners; -using ::testing::TestWithParam; -using ::testing::UnitTest; -using ::testing::Test; -using ::testing::Values; - -class SuccessfulTest : public Test { -}; - -TEST_F(SuccessfulTest, Succeeds) { - SUCCEED() << "This is a success."; - ASSERT_EQ(1, 1); -} - -class FailedTest : public Test { -}; - -TEST_F(FailedTest, Fails) { - ASSERT_EQ(1, 2); -} - -class DisabledTest : public Test { -}; - -TEST_F(DisabledTest, DISABLED_test_not_run) { - FAIL() << "Unexpected failure: Disabled test should not be run"; -} - -TEST(MixedResultTest, Succeeds) { - EXPECT_EQ(1, 1); - ASSERT_EQ(1, 1); -} - -TEST(MixedResultTest, Fails) { - EXPECT_EQ(1, 2); - ASSERT_EQ(2, 3); -} - -TEST(MixedResultTest, DISABLED_test) { - FAIL() << "Unexpected failure: Disabled test should not be run"; -} - -TEST(XmlQuotingTest, OutputsCData) { - FAIL() << "XML output: " - ""; -} - -// Helps to test that invalid characters produced by test code do not make -// it into the XML file. -TEST(InvalidCharactersTest, InvalidCharactersInMessage) { - FAIL() << "Invalid characters in brackets [\x1\x2]"; -} - -class PropertyRecordingTest : public Test { - public: - static void SetUpTestCase() { RecordProperty("SetUpTestCase", "yes"); } - static void TearDownTestCase() { RecordProperty("TearDownTestCase", "aye"); } -}; - -TEST_F(PropertyRecordingTest, OneProperty) { - RecordProperty("key_1", "1"); -} - -TEST_F(PropertyRecordingTest, IntValuedProperty) { - RecordProperty("key_int", 1); -} - -TEST_F(PropertyRecordingTest, ThreeProperties) { - RecordProperty("key_1", "1"); - RecordProperty("key_2", "2"); - RecordProperty("key_3", "3"); -} - -TEST_F(PropertyRecordingTest, TwoValuesForOneKeyUsesLastValue) { - RecordProperty("key_1", "1"); - RecordProperty("key_1", "2"); -} - -TEST(NoFixtureTest, RecordProperty) { - RecordProperty("key", "1"); -} - -void ExternalUtilityThatCallsRecordProperty(const std::string& key, int value) { - testing::Test::RecordProperty(key, value); -} - -void ExternalUtilityThatCallsRecordProperty(const std::string& key, - const std::string& value) { - testing::Test::RecordProperty(key, value); -} - -TEST(NoFixtureTest, ExternalUtilityThatCallsRecordIntValuedProperty) { - ExternalUtilityThatCallsRecordProperty("key_for_utility_int", 1); -} - -TEST(NoFixtureTest, ExternalUtilityThatCallsRecordStringValuedProperty) { - ExternalUtilityThatCallsRecordProperty("key_for_utility_string", "1"); -} - -// Verifies that the test parameter value is output in the 'value_param' -// XML attribute for value-parameterized tests. -class ValueParamTest : public TestWithParam {}; -TEST_P(ValueParamTest, HasValueParamAttribute) {} -TEST_P(ValueParamTest, AnotherTestThatHasValueParamAttribute) {} -INSTANTIATE_TEST_CASE_P(Single, ValueParamTest, Values(33, 42)); - -#if GTEST_HAS_TYPED_TEST -// Verifies that the type parameter name is output in the 'type_param' -// XML attribute for typed tests. -template class TypedTest : public Test {}; -typedef testing::Types TypedTestTypes; -TYPED_TEST_CASE(TypedTest, TypedTestTypes); -TYPED_TEST(TypedTest, HasTypeParamAttribute) {} -#endif - -#if GTEST_HAS_TYPED_TEST_P -// Verifies that the type parameter name is output in the 'type_param' -// XML attribute for type-parameterized tests. -template class TypeParameterizedTestCase : public Test {}; -TYPED_TEST_CASE_P(TypeParameterizedTestCase); -TYPED_TEST_P(TypeParameterizedTestCase, HasTypeParamAttribute) {} -REGISTER_TYPED_TEST_CASE_P(TypeParameterizedTestCase, HasTypeParamAttribute); -typedef testing::Types TypeParameterizedTestCaseTypes; -INSTANTIATE_TYPED_TEST_CASE_P(Single, - TypeParameterizedTestCase, - TypeParameterizedTestCaseTypes); -#endif - -int main(int argc, char** argv) { - InitGoogleTest(&argc, argv); - - if (argc > 1 && strcmp(argv[1], "--shut_down_xml") == 0) { - TestEventListeners& listeners = UnitTest::GetInstance()->listeners(); - delete listeners.Release(listeners.default_xml_generator()); - } - testing::Test::RecordProperty("ad_hoc_property", "42"); - return RUN_ALL_TESTS(); -} diff --git a/test/gtest-1.8.0/test/gtest_xml_test_utils.py b/test/gtest-1.8.0/test/gtest_xml_test_utils.py deleted file mode 100644 index 1e0358592f..0000000000 --- a/test/gtest-1.8.0/test/gtest_xml_test_utils.py +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 2006, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""Unit test utilities for gtest_xml_output""" - -import re -from xml.dom import minidom, Node -import gtest_test_utils - -GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.xml' - -class GTestXMLTestCase(gtest_test_utils.TestCase): - """ - Base class for tests of Google Test's XML output functionality. - """ - - - def AssertEquivalentNodes(self, expected_node, actual_node): - """ - Asserts that actual_node (a DOM node object) is equivalent to - expected_node (another DOM node object), in that either both of - them are CDATA nodes and have the same value, or both are DOM - elements and actual_node meets all of the following conditions: - - * It has the same tag name as expected_node. - * It has the same set of attributes as expected_node, each with - the same value as the corresponding attribute of expected_node. - Exceptions are any attribute named "time", which needs only be - convertible to a floating-point number and any attribute named - "type_param" which only has to be non-empty. - * It has an equivalent set of child nodes (including elements and - CDATA sections) as expected_node. Note that we ignore the - order of the children as they are not guaranteed to be in any - particular order. - """ - - if expected_node.nodeType == Node.CDATA_SECTION_NODE: - self.assertEquals(Node.CDATA_SECTION_NODE, actual_node.nodeType) - self.assertEquals(expected_node.nodeValue, actual_node.nodeValue) - return - - self.assertEquals(Node.ELEMENT_NODE, actual_node.nodeType) - self.assertEquals(Node.ELEMENT_NODE, expected_node.nodeType) - self.assertEquals(expected_node.tagName, actual_node.tagName) - - expected_attributes = expected_node.attributes - actual_attributes = actual_node .attributes - self.assertEquals( - expected_attributes.length, actual_attributes.length, - 'attribute numbers differ in element %s:\nExpected: %r\nActual: %r' % ( - actual_node.tagName, expected_attributes.keys(), - actual_attributes.keys())) - for i in range(expected_attributes.length): - expected_attr = expected_attributes.item(i) - actual_attr = actual_attributes.get(expected_attr.name) - self.assert_( - actual_attr is not None, - 'expected attribute %s not found in element %s' % - (expected_attr.name, actual_node.tagName)) - self.assertEquals( - expected_attr.value, actual_attr.value, - ' values of attribute %s in element %s differ: %s vs %s' % - (expected_attr.name, actual_node.tagName, - expected_attr.value, actual_attr.value)) - - expected_children = self._GetChildren(expected_node) - actual_children = self._GetChildren(actual_node) - self.assertEquals( - len(expected_children), len(actual_children), - 'number of child elements differ in element ' + actual_node.tagName) - for child_id, child in expected_children.iteritems(): - self.assert_(child_id in actual_children, - '<%s> is not in <%s> (in element %s)' % - (child_id, actual_children, actual_node.tagName)) - self.AssertEquivalentNodes(child, actual_children[child_id]) - - identifying_attribute = { - 'testsuites': 'name', - 'testsuite': 'name', - 'testcase': 'name', - 'failure': 'message', - 'property': 'name', - } - - def _GetChildren(self, element): - """ - Fetches all of the child nodes of element, a DOM Element object. - Returns them as the values of a dictionary keyed by the IDs of the - children. For , , , and - elements, the ID is the value of their "name" attribute; for - elements, it is the value of the "message" attribute; for - elements, it is the value of their parent's "name" attribute plus the - literal string "properties"; CDATA sections and non-whitespace - text nodes are concatenated into a single CDATA section with ID - "detail". An exception is raised if any element other than the above - four is encountered, if two child elements with the same identifying - attributes are encountered, or if any other type of node is encountered. - """ - - children = {} - for child in element.childNodes: - if child.nodeType == Node.ELEMENT_NODE: - if child.tagName == 'properties': - self.assert_(child.parentNode is not None, - 'Encountered element without a parent') - child_id = child.parentNode.getAttribute('name') + '-properties' - else: - self.assert_(child.tagName in self.identifying_attribute, - 'Encountered unknown element <%s>' % child.tagName) - child_id = child.getAttribute( - self.identifying_attribute[child.tagName]) - self.assert_(child_id not in children) - children[child_id] = child - elif child.nodeType in [Node.TEXT_NODE, Node.CDATA_SECTION_NODE]: - if 'detail' not in children: - if (child.nodeType == Node.CDATA_SECTION_NODE or - not child.nodeValue.isspace()): - children['detail'] = child.ownerDocument.createCDATASection( - child.nodeValue) - else: - children['detail'].nodeValue += child.nodeValue - else: - self.fail('Encountered unexpected node type %d' % child.nodeType) - return children - - def NormalizeXml(self, element): - """ - Normalizes Google Test's XML output to eliminate references to transient - information that may change from run to run. - - * The "time" attribute of , and - elements is replaced with a single asterisk, if it contains - only digit characters. - * The "timestamp" attribute of elements is replaced with a - single asterisk, if it contains a valid ISO8601 datetime value. - * The "type_param" attribute of elements is replaced with a - single asterisk (if it sn non-empty) as it is the type name returned - by the compiler and is platform dependent. - * The line info reported in the first line of the "message" - attribute and CDATA section of elements is replaced with the - file's basename and a single asterisk for the line number. - * The directory names in file paths are removed. - * The stack traces are removed. - """ - - if element.tagName == 'testsuites': - timestamp = element.getAttributeNode('timestamp') - timestamp.value = re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d$', - '*', timestamp.value) - if element.tagName in ('testsuites', 'testsuite', 'testcase'): - time = element.getAttributeNode('time') - time.value = re.sub(r'^\d+(\.\d+)?$', '*', time.value) - type_param = element.getAttributeNode('type_param') - if type_param and type_param.value: - type_param.value = '*' - elif element.tagName == 'failure': - source_line_pat = r'^.*[/\\](.*:)\d+\n' - # Replaces the source line information with a normalized form. - message = element.getAttributeNode('message') - message.value = re.sub(source_line_pat, '\\1*\n', message.value) - for child in element.childNodes: - if child.nodeType == Node.CDATA_SECTION_NODE: - # Replaces the source line information with a normalized form. - cdata = re.sub(source_line_pat, '\\1*\n', child.nodeValue) - # Removes the actual stack trace. - child.nodeValue = re.sub(r'Stack trace:\n(.|\n)*', - 'Stack trace:\n*', cdata) - for child in element.childNodes: - if child.nodeType == Node.ELEMENT_NODE: - self.NormalizeXml(child) diff --git a/test/gtest-1.8.0/test/production.cc b/test/gtest-1.8.0/test/production.cc deleted file mode 100644 index 006bb970e3..0000000000 --- a/test/gtest-1.8.0/test/production.cc +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// This is part of the unit test for gtest_prod.h. - -#include "production.h" - -PrivateCode::PrivateCode() : x_(0) {} diff --git a/test/gtest-1.8.0/test/production.h b/test/gtest-1.8.0/test/production.h deleted file mode 100644 index 0f01d83e4e..0000000000 --- a/test/gtest-1.8.0/test/production.h +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// This is part of the unit test for gtest_prod.h. - -#ifndef GTEST_TEST_PRODUCTION_H_ -#define GTEST_TEST_PRODUCTION_H_ - -#include "gtest/gtest_prod.h" - -class PrivateCode { - public: - // Declares a friend test that does not use a fixture. - FRIEND_TEST(PrivateCodeTest, CanAccessPrivateMembers); - - // Declares a friend test that uses a fixture. - FRIEND_TEST(PrivateCodeFixtureTest, CanAccessPrivateMembers); - - PrivateCode(); - - int x() const { return x_; } - private: - void set_x(int an_x) { x_ = an_x; } - int x_; -}; - -#endif // GTEST_TEST_PRODUCTION_H_ diff --git a/test/gtest-1.8.0/xcode/Config/DebugProject.xcconfig b/test/gtest-1.8.0/xcode/Config/DebugProject.xcconfig deleted file mode 100644 index 3d68157d5d..0000000000 --- a/test/gtest-1.8.0/xcode/Config/DebugProject.xcconfig +++ /dev/null @@ -1,30 +0,0 @@ -// -// DebugProject.xcconfig -// -// These are Debug Configuration project settings for the gtest framework and -// examples. It is set in the "Based On:" dropdown in the "Project" info -// dialog. -// This file is based on the Xcode Configuration files in: -// http://code.google.com/p/google-toolbox-for-mac/ -// - -#include "General.xcconfig" - -// No optimization -GCC_OPTIMIZATION_LEVEL = 0 - -// Deployment postprocessing is what triggers Xcode to strip, turn it off -DEPLOYMENT_POSTPROCESSING = NO - -// Dead code stripping off -DEAD_CODE_STRIPPING = NO - -// Debug symbols should be on obviously -GCC_GENERATE_DEBUGGING_SYMBOLS = YES - -// Define the DEBUG macro in all debug builds -OTHER_CFLAGS = $(OTHER_CFLAGS) -DDEBUG=1 - -// These are turned off to avoid STL incompatibilities with client code -// // Turns on special C++ STL checks to "encourage" good STL use -// GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) _GLIBCXX_DEBUG_PEDANTIC _GLIBCXX_DEBUG _GLIBCPP_CONCEPT_CHECKS diff --git a/test/gtest-1.8.0/xcode/Config/FrameworkTarget.xcconfig b/test/gtest-1.8.0/xcode/Config/FrameworkTarget.xcconfig deleted file mode 100644 index 357b1c8fbf..0000000000 --- a/test/gtest-1.8.0/xcode/Config/FrameworkTarget.xcconfig +++ /dev/null @@ -1,17 +0,0 @@ -// -// FrameworkTarget.xcconfig -// -// These are Framework target settings for the gtest framework and examples. It -// is set in the "Based On:" dropdown in the "Target" info dialog. -// This file is based on the Xcode Configuration files in: -// http://code.google.com/p/google-toolbox-for-mac/ -// - -// Dynamic libs need to be position independent -GCC_DYNAMIC_NO_PIC = NO - -// Dynamic libs should not have their external symbols stripped. -STRIP_STYLE = non-global - -// Let the user install by specifying the $DSTROOT with xcodebuild -SKIP_INSTALL = NO diff --git a/test/gtest-1.8.0/xcode/Config/General.xcconfig b/test/gtest-1.8.0/xcode/Config/General.xcconfig deleted file mode 100644 index f23e322272..0000000000 --- a/test/gtest-1.8.0/xcode/Config/General.xcconfig +++ /dev/null @@ -1,41 +0,0 @@ -// -// General.xcconfig -// -// These are General configuration settings for the gtest framework and -// examples. -// This file is based on the Xcode Configuration files in: -// http://code.google.com/p/google-toolbox-for-mac/ -// - -// Build for PPC and Intel, 32- and 64-bit -ARCHS = i386 x86_64 ppc ppc64 - -// Zerolink prevents link warnings so turn it off -ZERO_LINK = NO - -// Prebinding considered unhelpful in 10.3 and later -PREBINDING = NO - -// Strictest warning policy -WARNING_CFLAGS = -Wall -Werror -Wendif-labels -Wnewline-eof -Wno-sign-compare -Wshadow - -// Work around Xcode bugs by using external strip. See: -// http://lists.apple.com/archives/Xcode-users/2006/Feb/msg00050.html -SEPARATE_STRIP = YES - -// Force C99 dialect -GCC_C_LANGUAGE_STANDARD = c99 - -// not sure why apple defaults this on, but it's pretty risky -ALWAYS_SEARCH_USER_PATHS = NO - -// Turn on position dependent code for most cases (overridden where appropriate) -GCC_DYNAMIC_NO_PIC = YES - -// Default SDK and minimum OS version is 10.4 -SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk -MACOSX_DEPLOYMENT_TARGET = 10.4 -GCC_VERSION = 4.0 - -// VERSIONING BUILD SETTINGS (used in Info.plist) -GTEST_VERSIONINFO_ABOUT = © 2008 Google Inc. diff --git a/test/gtest-1.8.0/xcode/Config/ReleaseProject.xcconfig b/test/gtest-1.8.0/xcode/Config/ReleaseProject.xcconfig deleted file mode 100644 index 5349f0a04a..0000000000 --- a/test/gtest-1.8.0/xcode/Config/ReleaseProject.xcconfig +++ /dev/null @@ -1,32 +0,0 @@ -// -// ReleaseProject.xcconfig -// -// These are Release Configuration project settings for the gtest framework -// and examples. It is set in the "Based On:" dropdown in the "Project" info -// dialog. -// This file is based on the Xcode Configuration files in: -// http://code.google.com/p/google-toolbox-for-mac/ -// - -#include "General.xcconfig" - -// subconfig/Release.xcconfig - -// Optimize for space and size (Apple recommendation) -GCC_OPTIMIZATION_LEVEL = s - -// Deploment postprocessing is what triggers Xcode to strip -DEPLOYMENT_POSTPROCESSING = YES - -// No symbols -GCC_GENERATE_DEBUGGING_SYMBOLS = NO - -// Dead code strip does not affect ObjC code but can help for C -DEAD_CODE_STRIPPING = YES - -// NDEBUG is used by things like assert.h, so define it for general compat. -// ASSERT going away in release tends to create unused vars. -OTHER_CFLAGS = $(OTHER_CFLAGS) -DNDEBUG=1 -Wno-unused-variable - -// When we strip we want to strip all symbols in release, but save externals. -STRIP_STYLE = all diff --git a/test/gtest-1.8.0/xcode/Config/StaticLibraryTarget.xcconfig b/test/gtest-1.8.0/xcode/Config/StaticLibraryTarget.xcconfig deleted file mode 100644 index 3922fa51d5..0000000000 --- a/test/gtest-1.8.0/xcode/Config/StaticLibraryTarget.xcconfig +++ /dev/null @@ -1,18 +0,0 @@ -// -// StaticLibraryTarget.xcconfig -// -// These are static library target settings for libgtest.a. It -// is set in the "Based On:" dropdown in the "Target" info dialog. -// This file is based on the Xcode Configuration files in: -// http://code.google.com/p/google-toolbox-for-mac/ -// - -// Static libs can be included in bundles so make them position independent -GCC_DYNAMIC_NO_PIC = NO - -// Static libs should not have their internal globals or external symbols -// stripped. -STRIP_STYLE = debugging - -// Let the user install by specifying the $DSTROOT with xcodebuild -SKIP_INSTALL = NO diff --git a/test/gtest-1.8.0/xcode/Config/TestTarget.xcconfig b/test/gtest-1.8.0/xcode/Config/TestTarget.xcconfig deleted file mode 100644 index e6652ba859..0000000000 --- a/test/gtest-1.8.0/xcode/Config/TestTarget.xcconfig +++ /dev/null @@ -1,8 +0,0 @@ -// -// TestTarget.xcconfig -// -// These are Test target settings for the gtest framework and examples. It -// is set in the "Based On:" dropdown in the "Target" info dialog. - -PRODUCT_NAME = $(TARGET_NAME) -HEADER_SEARCH_PATHS = ../include diff --git a/test/gtest-1.8.0/xcode/Resources/Info.plist b/test/gtest-1.8.0/xcode/Resources/Info.plist deleted file mode 100644 index 9dd28ea148..0000000000 --- a/test/gtest-1.8.0/xcode/Resources/Info.plist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.google.${PRODUCT_NAME} - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - GTEST_VERSIONINFO_LONG - CFBundleShortVersionString - GTEST_VERSIONINFO_SHORT - CFBundleGetInfoString - ${PRODUCT_NAME} GTEST_VERSIONINFO_LONG, ${GTEST_VERSIONINFO_ABOUT} - NSHumanReadableCopyright - ${GTEST_VERSIONINFO_ABOUT} - CSResourcesFileMapped - - - diff --git a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/Info.plist b/test/gtest-1.8.0/xcode/Samples/FrameworkSample/Info.plist deleted file mode 100644 index f3852edea2..0000000000 --- a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/Info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.google.gtest.${PRODUCT_NAME:identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - CSResourcesFileMapped - - - diff --git a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/test/gtest-1.8.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj deleted file mode 100644 index 497617eb68..0000000000 --- a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj +++ /dev/null @@ -1,457 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXAggregateTarget section */ - 4024D162113D7D2400C7059E /* Test */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 4024D169113D7D4600C7059E /* Build configuration list for PBXAggregateTarget "Test" */; - buildPhases = ( - 4024D161113D7D2400C7059E /* ShellScript */, - ); - dependencies = ( - 4024D166113D7D3100C7059E /* PBXTargetDependency */, - ); - name = Test; - productName = TestAndBuild; - }; - 4024D1E9113D83FF00C7059E /* TestAndBuild */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 4024D1F0113D842B00C7059E /* Build configuration list for PBXAggregateTarget "TestAndBuild" */; - buildPhases = ( - ); - dependencies = ( - 4024D1ED113D840900C7059E /* PBXTargetDependency */, - 4024D1EF113D840D00C7059E /* PBXTargetDependency */, - ); - name = TestAndBuild; - productName = TestAndBuild; - }; -/* End PBXAggregateTarget section */ - -/* Begin PBXBuildFile section */ - 3B7EB1250E5AEE3500C7F239 /* widget.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B7EB1230E5AEE3500C7F239 /* widget.cc */; }; - 3B7EB1260E5AEE3500C7F239 /* widget.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B7EB1240E5AEE3500C7F239 /* widget.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3B7EB1280E5AEE4600C7F239 /* widget_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B7EB1270E5AEE4600C7F239 /* widget_test.cc */; }; - 3B7EB1480E5AF3B400C7F239 /* Widget.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D07F2C80486CC7A007CD1D0 /* Widget.framework */; }; - 4024D188113D7D7800C7059E /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4024D185113D7D5500C7059E /* libgtest.a */; }; - 4024D189113D7D7A00C7059E /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4024D183113D7D5500C7059E /* libgtest_main.a */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 3B07BDF00E3F3FAE00647869 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0; - remoteInfo = gTestExample; - }; - 4024D165113D7D3100C7059E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3B07BDE90E3F3F9E00647869; - remoteInfo = WidgetFrameworkTest; - }; - 4024D1EC113D840900C7059E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0; - remoteInfo = WidgetFramework; - }; - 4024D1EE113D840D00C7059E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4024D162113D7D2400C7059E; - remoteInfo = Test; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 3B07BDEA0E3F3F9E00647869 /* WidgetFrameworkTest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = WidgetFrameworkTest; sourceTree = BUILT_PRODUCTS_DIR; }; - 3B7EB1230E5AEE3500C7F239 /* widget.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = widget.cc; sourceTree = ""; }; - 3B7EB1240E5AEE3500C7F239 /* widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = widget.h; sourceTree = ""; }; - 3B7EB1270E5AEE4600C7F239 /* widget_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = widget_test.cc; sourceTree = ""; }; - 4024D183113D7D5500C7059E /* libgtest_main.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgtest_main.a; path = /usr/local/lib/libgtest_main.a; sourceTree = ""; }; - 4024D185113D7D5500C7059E /* libgtest.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgtest.a; path = /usr/local/lib/libgtest.a; sourceTree = ""; }; - 4024D1E2113D838200C7059E /* runtests.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = runtests.sh; sourceTree = ""; }; - 8D07F2C70486CC7A007CD1D0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - 8D07F2C80486CC7A007CD1D0 /* Widget.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Widget.framework; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 3B07BDE80E3F3F9E00647869 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4024D189113D7D7A00C7059E /* libgtest_main.a in Frameworks */, - 4024D188113D7D7800C7059E /* libgtest.a in Frameworks */, - 3B7EB1480E5AF3B400C7F239 /* Widget.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D07F2C30486CC7A007CD1D0 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 034768DDFF38A45A11DB9C8B /* Products */ = { - isa = PBXGroup; - children = ( - 8D07F2C80486CC7A007CD1D0 /* Widget.framework */, - 3B07BDEA0E3F3F9E00647869 /* WidgetFrameworkTest */, - ); - name = Products; - sourceTree = ""; - }; - 0867D691FE84028FC02AAC07 /* gTestExample */ = { - isa = PBXGroup; - children = ( - 4024D1E1113D836C00C7059E /* Scripts */, - 08FB77ACFE841707C02AAC07 /* Source */, - 089C1665FE841158C02AAC07 /* Resources */, - 3B07BE350E4094E400647869 /* Test */, - 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */, - 034768DDFF38A45A11DB9C8B /* Products */, - ); - name = gTestExample; - sourceTree = ""; - }; - 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = { - isa = PBXGroup; - children = ( - 4024D183113D7D5500C7059E /* libgtest_main.a */, - 4024D185113D7D5500C7059E /* libgtest.a */, - ); - name = "External Frameworks and Libraries"; - sourceTree = ""; - }; - 089C1665FE841158C02AAC07 /* Resources */ = { - isa = PBXGroup; - children = ( - 8D07F2C70486CC7A007CD1D0 /* Info.plist */, - ); - name = Resources; - sourceTree = ""; - }; - 08FB77ACFE841707C02AAC07 /* Source */ = { - isa = PBXGroup; - children = ( - 3B7EB1230E5AEE3500C7F239 /* widget.cc */, - 3B7EB1240E5AEE3500C7F239 /* widget.h */, - ); - name = Source; - sourceTree = ""; - }; - 3B07BE350E4094E400647869 /* Test */ = { - isa = PBXGroup; - children = ( - 3B7EB1270E5AEE4600C7F239 /* widget_test.cc */, - ); - name = Test; - sourceTree = ""; - }; - 4024D1E1113D836C00C7059E /* Scripts */ = { - isa = PBXGroup; - children = ( - 4024D1E2113D838200C7059E /* runtests.sh */, - ); - name = Scripts; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 8D07F2BD0486CC7A007CD1D0 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 3B7EB1260E5AEE3500C7F239 /* widget.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 3B07BDE90E3F3F9E00647869 /* WidgetFrameworkTest */ = { - isa = PBXNativeTarget; - buildConfigurationList = 3B07BDF40E3F3FB600647869 /* Build configuration list for PBXNativeTarget "WidgetFrameworkTest" */; - buildPhases = ( - 3B07BDE70E3F3F9E00647869 /* Sources */, - 3B07BDE80E3F3F9E00647869 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 3B07BDF10E3F3FAE00647869 /* PBXTargetDependency */, - ); - name = WidgetFrameworkTest; - productName = gTestExampleTest; - productReference = 3B07BDEA0E3F3F9E00647869 /* WidgetFrameworkTest */; - productType = "com.apple.product-type.tool"; - }; - 8D07F2BC0486CC7A007CD1D0 /* WidgetFramework */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "WidgetFramework" */; - buildPhases = ( - 8D07F2C10486CC7A007CD1D0 /* Sources */, - 8D07F2C30486CC7A007CD1D0 /* Frameworks */, - 8D07F2BD0486CC7A007CD1D0 /* Headers */, - 8D07F2BF0486CC7A007CD1D0 /* Resources */, - 8D07F2C50486CC7A007CD1D0 /* Rez */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = WidgetFramework; - productInstallPath = "$(HOME)/Library/Frameworks"; - productName = gTestExample; - productReference = 8D07F2C80486CC7A007CD1D0 /* Widget.framework */; - productType = "com.apple.product-type.framework"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 0867D690FE84028FC02AAC07 /* Project object */ = { - isa = PBXProject; - buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "WidgetFramework" */; - compatibilityVersion = "Xcode 2.4"; - hasScannedForEncodings = 1; - mainGroup = 0867D691FE84028FC02AAC07 /* gTestExample */; - productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8D07F2BC0486CC7A007CD1D0 /* WidgetFramework */, - 3B07BDE90E3F3F9E00647869 /* WidgetFrameworkTest */, - 4024D162113D7D2400C7059E /* Test */, - 4024D1E9113D83FF00C7059E /* TestAndBuild */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8D07F2BF0486CC7A007CD1D0 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXRezBuildPhase section */ - 8D07F2C50486CC7A007CD1D0 /* Rez */ = { - isa = PBXRezBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXRezBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 4024D161113D7D2400C7059E /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/bash $SRCROOT/runtests.sh $BUILT_PRODUCTS_DIR/WidgetFrameworkTest\n"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 3B07BDE70E3F3F9E00647869 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 3B7EB1280E5AEE4600C7F239 /* widget_test.cc in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D07F2C10486CC7A007CD1D0 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 3B7EB1250E5AEE3500C7F239 /* widget.cc in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 3B07BDF10E3F3FAE00647869 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8D07F2BC0486CC7A007CD1D0 /* WidgetFramework */; - targetProxy = 3B07BDF00E3F3FAE00647869 /* PBXContainerItemProxy */; - }; - 4024D166113D7D3100C7059E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3B07BDE90E3F3F9E00647869 /* WidgetFrameworkTest */; - targetProxy = 4024D165113D7D3100C7059E /* PBXContainerItemProxy */; - }; - 4024D1ED113D840900C7059E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8D07F2BC0486CC7A007CD1D0 /* WidgetFramework */; - targetProxy = 4024D1EC113D840900C7059E /* PBXContainerItemProxy */; - }; - 4024D1EF113D840D00C7059E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4024D162113D7D2400C7059E /* Test */; - targetProxy = 4024D1EE113D840D00C7059E /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 3B07BDEC0E3F3F9F00647869 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = WidgetFrameworkTest; - }; - name = Debug; - }; - 3B07BDED0E3F3F9F00647869 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = WidgetFrameworkTest; - }; - name = Release; - }; - 4024D163113D7D2400C7059E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = TestAndBuild; - }; - name = Debug; - }; - 4024D164113D7D2400C7059E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = TestAndBuild; - }; - name = Release; - }; - 4024D1EA113D83FF00C7059E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = TestAndBuild; - }; - name = Debug; - }; - 4024D1EB113D83FF00C7059E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = TestAndBuild; - }; - name = Release; - }; - 4FADC24308B4156D00ABE55E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "@loader_path/../Frameworks"; - PRODUCT_NAME = Widget; - }; - name = Debug; - }; - 4FADC24408B4156D00ABE55E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "@loader_path/../Frameworks"; - PRODUCT_NAME = Widget; - }; - name = Release; - }; - 4FADC24708B4156D00ABE55E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_VERSION = 4.0; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - }; - name = Debug; - }; - 4FADC24808B4156D00ABE55E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_VERSION = 4.0; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 3B07BDF40E3F3FB600647869 /* Build configuration list for PBXNativeTarget "WidgetFrameworkTest" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3B07BDEC0E3F3F9F00647869 /* Debug */, - 3B07BDED0E3F3F9F00647869 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4024D169113D7D4600C7059E /* Build configuration list for PBXAggregateTarget "Test" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4024D163113D7D2400C7059E /* Debug */, - 4024D164113D7D2400C7059E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4024D1F0113D842B00C7059E /* Build configuration list for PBXAggregateTarget "TestAndBuild" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4024D1EA113D83FF00C7059E /* Debug */, - 4024D1EB113D83FF00C7059E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "WidgetFramework" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4FADC24308B4156D00ABE55E /* Debug */, - 4FADC24408B4156D00ABE55E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "WidgetFramework" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4FADC24708B4156D00ABE55E /* Debug */, - 4FADC24808B4156D00ABE55E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 0867D690FE84028FC02AAC07 /* Project object */; -} diff --git a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/runtests.sh b/test/gtest-1.8.0/xcode/Samples/FrameworkSample/runtests.sh deleted file mode 100644 index 4a0d413e52..0000000000 --- a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/runtests.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -# -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Executes the samples and tests for the Google Test Framework. - -# Help the dynamic linker find the path to the libraries. -export DYLD_FRAMEWORK_PATH=$BUILT_PRODUCTS_DIR -export DYLD_LIBRARY_PATH=$BUILT_PRODUCTS_DIR - -# Create some executables. -test_executables=$@ - -# Now execute each one in turn keeping track of how many succeeded and failed. -succeeded=0 -failed=0 -failed_list=() -for test in ${test_executables[*]}; do - "$test" - result=$? - if [ $result -eq 0 ]; then - succeeded=$(( $succeeded + 1 )) - else - failed=$(( failed + 1 )) - failed_list="$failed_list $test" - fi -done - -# Report the successes and failures to the console. -echo "Tests complete with $succeeded successes and $failed failures." -if [ $failed -ne 0 ]; then - echo "The following tests failed:" - echo $failed_list -fi -exit $failed diff --git a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.cc b/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.cc deleted file mode 100644 index bfc4e7fcfd..0000000000 --- a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.cc +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: preston.a.jackson@gmail.com (Preston Jackson) -// -// Google Test - FrameworkSample -// widget.cc -// - -// Widget is a very simple class used for demonstrating the use of gtest - -#include "widget.h" - -Widget::Widget(int number, const std::string& name) - : number_(number), - name_(name) {} - -Widget::~Widget() {} - -float Widget::GetFloatValue() const { - return number_; -} - -int Widget::GetIntValue() const { - return static_cast(number_); -} - -std::string Widget::GetStringValue() const { - return name_; -} - -void Widget::GetCharPtrValue(char* buffer, size_t max_size) const { - // Copy the char* representation of name_ into buffer, up to max_size. - strncpy(buffer, name_.c_str(), max_size-1); - buffer[max_size-1] = '\0'; - return; -} diff --git a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.h b/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.h deleted file mode 100644 index 0c55cdc8cf..0000000000 --- a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.h +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: preston.a.jackson@gmail.com (Preston Jackson) -// -// Google Test - FrameworkSample -// widget.h -// - -// Widget is a very simple class used for demonstrating the use of gtest. It -// simply stores two values a string and an integer, which are returned via -// public accessors in multiple forms. - -#import - -class Widget { - public: - Widget(int number, const std::string& name); - ~Widget(); - - // Public accessors to number data - float GetFloatValue() const; - int GetIntValue() const; - - // Public accessors to the string data - std::string GetStringValue() const; - void GetCharPtrValue(char* buffer, size_t max_size) const; - - private: - // Data members - float number_; - std::string name_; -}; diff --git a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget_test.cc b/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget_test.cc deleted file mode 100644 index 8725994218..0000000000 --- a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget_test.cc +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: preston.a.jackson@gmail.com (Preston Jackson) -// -// Google Test - FrameworkSample -// widget_test.cc -// - -// This is a simple test file for the Widget class in the Widget.framework - -#include -#include "gtest/gtest.h" - -#include - -// This test verifies that the constructor sets the internal state of the -// Widget class correctly. -TEST(WidgetInitializerTest, TestConstructor) { - Widget widget(1.0f, "name"); - EXPECT_FLOAT_EQ(1.0f, widget.GetFloatValue()); - EXPECT_EQ(std::string("name"), widget.GetStringValue()); -} - -// This test verifies the conversion of the float and string values to int and -// char*, respectively. -TEST(WidgetInitializerTest, TestConversion) { - Widget widget(1.0f, "name"); - EXPECT_EQ(1, widget.GetIntValue()); - - size_t max_size = 128; - char buffer[max_size]; - widget.GetCharPtrValue(buffer, max_size); - EXPECT_STREQ("name", buffer); -} - -// Use the Google Test main that is linked into the framework. It does something -// like this: -// int main(int argc, char** argv) { -// testing::InitGoogleTest(&argc, argv); -// return RUN_ALL_TESTS(); -// } diff --git a/test/gtest-1.8.0/xcode/Scripts/runtests.sh b/test/gtest-1.8.0/xcode/Scripts/runtests.sh deleted file mode 100644 index 3fc229f1d4..0000000000 --- a/test/gtest-1.8.0/xcode/Scripts/runtests.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Executes the samples and tests for the Google Test Framework. - -# Help the dynamic linker find the path to the libraries. -export DYLD_FRAMEWORK_PATH=$BUILT_PRODUCTS_DIR -export DYLD_LIBRARY_PATH=$BUILT_PRODUCTS_DIR - -# Create some executables. -test_executables=("$BUILT_PRODUCTS_DIR/gtest_unittest-framework" - "$BUILT_PRODUCTS_DIR/gtest_unittest" - "$BUILT_PRODUCTS_DIR/sample1_unittest-framework" - "$BUILT_PRODUCTS_DIR/sample1_unittest-static") - -# Now execute each one in turn keeping track of how many succeeded and failed. -succeeded=0 -failed=0 -failed_list=() -for test in ${test_executables[*]}; do - "$test" - result=$? - if [ $result -eq 0 ]; then - succeeded=$(( $succeeded + 1 )) - else - failed=$(( failed + 1 )) - failed_list="$failed_list $test" - fi -done - -# Report the successes and failures to the console. -echo "Tests complete with $succeeded successes and $failed failures." -if [ $failed -ne 0 ]; then - echo "The following tests failed:" - echo $failed_list -fi -exit $failed diff --git a/test/gtest-1.8.0/xcode/Scripts/versiongenerate.py b/test/gtest-1.8.0/xcode/Scripts/versiongenerate.py deleted file mode 100644 index bdd7541ad7..0000000000 --- a/test/gtest-1.8.0/xcode/Scripts/versiongenerate.py +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -"""A script to prepare version information for use the gtest Info.plist file. - - This script extracts the version information from the configure.ac file and - uses it to generate a header file containing the same information. The - #defines in this header file will be included in during the generation of - the Info.plist of the framework, giving the correct value to the version - shown in the Finder. - - This script makes the following assumptions (these are faults of the script, - not problems with the Autoconf): - 1. The AC_INIT macro will be contained within the first 1024 characters - of configure.ac - 2. The version string will be 3 integers separated by periods and will be - surrounded by square brackets, "[" and "]" (e.g. [1.0.1]). The first - segment represents the major version, the second represents the minor - version and the third represents the fix version. - 3. No ")" character exists between the opening "(" and closing ")" of - AC_INIT, including in comments and character strings. -""" - -import sys -import re - -# Read the command line argument (the output directory for Version.h) -if (len(sys.argv) < 3): - print "Usage: versiongenerate.py input_dir output_dir" - sys.exit(1) -else: - input_dir = sys.argv[1] - output_dir = sys.argv[2] - -# Read the first 1024 characters of the configure.ac file -config_file = open("%s/configure.ac" % input_dir, 'r') -buffer_size = 1024 -opening_string = config_file.read(buffer_size) -config_file.close() - -# Extract the version string from the AC_INIT macro -# The following init_expression means: -# Extract three integers separated by periods and surrounded by square -# brackets(e.g. "[1.0.1]") between "AC_INIT(" and ")". Do not be greedy -# (*? is the non-greedy flag) since that would pull in everything between -# the first "(" and the last ")" in the file. -version_expression = re.compile(r"AC_INIT\(.*?\[(\d+)\.(\d+)\.(\d+)\].*?\)", - re.DOTALL) -version_values = version_expression.search(opening_string) -major_version = version_values.group(1) -minor_version = version_values.group(2) -fix_version = version_values.group(3) - -# Write the version information to a header file to be included in the -# Info.plist file. -file_data = """// -// DO NOT MODIFY THIS FILE (but you can delete it) -// -// This file is autogenerated by the versiongenerate.py script. This script -// is executed in a "Run Script" build phase when creating gtest.framework. This -// header file is not used during compilation of C-source. Rather, it simply -// defines some version strings for substitution in the Info.plist. Because of -// this, we are not restricted to C-syntax nor are we using include guards. -// - -#define GTEST_VERSIONINFO_SHORT %s.%s -#define GTEST_VERSIONINFO_LONG %s.%s.%s - -""" % (major_version, minor_version, major_version, minor_version, fix_version) -version_file = open("%s/Version.h" % output_dir, 'w') -version_file.write(file_data) -version_file.close() diff --git a/test/gtest-1.8.0/xcode/gtest.xcodeproj/project.pbxproj b/test/gtest-1.8.0/xcode/gtest.xcodeproj/project.pbxproj deleted file mode 100644 index 003bff8cb8..0000000000 --- a/test/gtest-1.8.0/xcode/gtest.xcodeproj/project.pbxproj +++ /dev/null @@ -1,1182 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXAggregateTarget section */ - 3B238F5F0E828B5400846E11 /* Check */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 3B238FA30E828BB600846E11 /* Build configuration list for PBXAggregateTarget "Check" */; - buildPhases = ( - 3B238F5E0E828B5400846E11 /* ShellScript */, - ); - dependencies = ( - 40899F9D0FFA740F000B29AE /* PBXTargetDependency */, - 40C849F7101A43440083642A /* PBXTargetDependency */, - 4089A0980FFAD34A000B29AE /* PBXTargetDependency */, - 40C849F9101A43490083642A /* PBXTargetDependency */, - ); - name = Check; - productName = Check; - }; - 40C44ADC0E3798F4008FCC51 /* Version Info */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 40C44AE40E379905008FCC51 /* Build configuration list for PBXAggregateTarget "Version Info" */; - buildPhases = ( - 40C44ADB0E3798F4008FCC51 /* Generate Version.h */, - ); - comments = "The generation of Version.h must be performed in its own target. Since the Info.plist is preprocessed before any of the other build phases in gtest, the Version.h file would not be ready if included as a build phase of that target."; - dependencies = ( - ); - name = "Version Info"; - productName = Version.h; - }; -/* End PBXAggregateTarget section */ - -/* Begin PBXBuildFile section */ - 224A12A30E9EADCC00BD17FD /* gtest-test-part.h in Headers */ = {isa = PBXBuildFile; fileRef = 224A12A20E9EADCC00BD17FD /* gtest-test-part.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3BF6F2A00E79B5AD000F2EEE /* gtest-type-util.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */; }; - 3BF6F2A50E79B616000F2EEE /* gtest-typed-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BF6F2A40E79B616000F2EEE /* gtest-typed-test.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 404884380E2F799B00CF7658 /* gtest-death-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DB0E2F799B00CF7658 /* gtest-death-test.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 404884390E2F799B00CF7658 /* gtest-message.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DC0E2F799B00CF7658 /* gtest-message.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4048843A0E2F799B00CF7658 /* gtest-spi.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DD0E2F799B00CF7658 /* gtest-spi.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4048843B0E2F799B00CF7658 /* gtest.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DE0E2F799B00CF7658 /* gtest.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4048843C0E2F799B00CF7658 /* gtest_pred_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DF0E2F799B00CF7658 /* gtest_pred_impl.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4048843D0E2F799B00CF7658 /* gtest_prod.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883E00E2F799B00CF7658 /* gtest_prod.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 404884500E2F799B00CF7658 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 404883F60E2F799B00CF7658 /* README.md */; }; - 404884A00E2F7BE600CF7658 /* gtest-death-test-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E20E2F799B00CF7658 /* gtest-death-test-internal.h */; }; - 404884A10E2F7BE600CF7658 /* gtest-filepath.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E30E2F799B00CF7658 /* gtest-filepath.h */; }; - 404884A20E2F7BE600CF7658 /* gtest-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E40E2F799B00CF7658 /* gtest-internal.h */; }; - 404884A30E2F7BE600CF7658 /* gtest-port.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E50E2F799B00CF7658 /* gtest-port.h */; }; - 404884A40E2F7BE600CF7658 /* gtest-string.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E60E2F799B00CF7658 /* gtest-string.h */; }; - 404884AC0E2F7CD900CF7658 /* CHANGES in Resources */ = {isa = PBXBuildFile; fileRef = 404884A90E2F7CD900CF7658 /* CHANGES */; }; - 404884AD0E2F7CD900CF7658 /* CONTRIBUTORS in Resources */ = {isa = PBXBuildFile; fileRef = 404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */; }; - 404884AE0E2F7CD900CF7658 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 404884AB0E2F7CD900CF7658 /* LICENSE */; }; - 40899F3A0FFA70D4000B29AE /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = 224A12A10E9EADA700BD17FD /* gtest-all.cc */; }; - 40899F500FFA7281000B29AE /* gtest-tuple.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 40899F4D0FFA7271000B29AE /* gtest-tuple.h */; }; - 40899F530FFA72A0000B29AE /* gtest_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B238C120E7FE13C00846E11 /* gtest_unittest.cc */; }; - 4089A0440FFAD1BE000B29AE /* sample1.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02C0FFACF7F000B29AE /* sample1.cc */; }; - 4089A0460FFAD1BE000B29AE /* sample1_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02E0FFACF7F000B29AE /* sample1_unittest.cc */; }; - 40C848FF101A21150083642A /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = 224A12A10E9EADA700BD17FD /* gtest-all.cc */; }; - 40C84915101A21DF0083642A /* gtest_main.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4048840D0E2F799B00CF7658 /* gtest_main.cc */; }; - 40C84916101A235B0083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; }; - 40C84921101A23AD0083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; }; - 40C84978101A36540083642A /* libgtest_main.a in Resources */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; }; - 40C84980101A36850083642A /* gtest_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B238C120E7FE13C00846E11 /* gtest_unittest.cc */; }; - 40C84982101A36850083642A /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C848FA101A209C0083642A /* libgtest.a */; }; - 40C84983101A36850083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; }; - 40C8498F101A36A60083642A /* sample1.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02C0FFACF7F000B29AE /* sample1.cc */; }; - 40C84990101A36A60083642A /* sample1_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02E0FFACF7F000B29AE /* sample1_unittest.cc */; }; - 40C84992101A36A60083642A /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C848FA101A209C0083642A /* libgtest.a */; }; - 40C84993101A36A60083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; }; - 40C849A2101A37050083642A /* gtest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4539C8FF0EC27F6400A70F4C /* gtest.framework */; }; - 40C849A4101A37150083642A /* gtest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4539C8FF0EC27F6400A70F4C /* gtest.framework */; }; - 4539C9340EC280AE00A70F4C /* gtest-param-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 4539C9330EC280AE00A70F4C /* gtest-param-test.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4539C9380EC280E200A70F4C /* gtest-linked_ptr.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */; }; - 4539C9390EC280E200A70F4C /* gtest-param-util-generated.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */; }; - 4539C93A0EC280E200A70F4C /* gtest-param-util.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9370EC280E200A70F4C /* gtest-param-util.h */; }; - 4567C8181264FF71007740BE /* gtest-printers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4567C8171264FF71007740BE /* gtest-printers.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F67D4F3E1C7F5D8B0017C729 /* gtest-port-arch.h in Headers */ = {isa = PBXBuildFile; fileRef = F67D4F3D1C7F5D8B0017C729 /* gtest-port-arch.h */; }; - F67D4F3F1C7F5DA70017C729 /* gtest-port-arch.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = F67D4F3D1C7F5D8B0017C729 /* gtest-port-arch.h */; }; - F67D4F441C7F5DD00017C729 /* gtest-port.h in Headers */ = {isa = PBXBuildFile; fileRef = F67D4F411C7F5DD00017C729 /* gtest-port.h */; }; - F67D4F451C7F5DD00017C729 /* gtest-printers.h in Headers */ = {isa = PBXBuildFile; fileRef = F67D4F421C7F5DD00017C729 /* gtest-printers.h */; }; - F67D4F461C7F5DD00017C729 /* gtest.h in Headers */ = {isa = PBXBuildFile; fileRef = F67D4F431C7F5DD00017C729 /* gtest.h */; }; - F67D4F481C7F5E160017C729 /* gtest-port.h in Copy Headers Internal Custom */ = {isa = PBXBuildFile; fileRef = F67D4F411C7F5DD00017C729 /* gtest-port.h */; }; - F67D4F491C7F5E260017C729 /* gtest-printers.h in Copy Headers Internal Custom */ = {isa = PBXBuildFile; fileRef = F67D4F421C7F5DD00017C729 /* gtest-printers.h */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 40899F9C0FFA740F000B29AE /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 40899F420FFA7184000B29AE; - remoteInfo = gtest_unittest; - }; - 4089A0970FFAD34A000B29AE /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4089A0120FFACEFC000B29AE; - remoteInfo = sample1_unittest; - }; - 408BEC0F1046CFE900DEF522 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 40C848F9101A209C0083642A; - remoteInfo = "gtest-static"; - }; - 40C44AE50E379922008FCC51 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 40C44ADC0E3798F4008FCC51; - remoteInfo = Version.h; - }; - 40C8497C101A36850083642A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 40C848F9101A209C0083642A; - remoteInfo = "gtest-static"; - }; - 40C8497E101A36850083642A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 40C8490A101A217E0083642A; - remoteInfo = "gtest_main-static"; - }; - 40C8498B101A36A60083642A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 40C848F9101A209C0083642A; - remoteInfo = "gtest-static"; - }; - 40C8498D101A36A60083642A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 40C8490A101A217E0083642A; - remoteInfo = "gtest_main-static"; - }; - 40C8499B101A36DC0083642A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 40C8490A101A217E0083642A; - remoteInfo = "gtest_main-static"; - }; - 40C8499D101A36E50083642A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0; - remoteInfo = "gtest-framework"; - }; - 40C8499F101A36F10083642A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0; - remoteInfo = "gtest-framework"; - }; - 40C849F6101A43440083642A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 40C8497A101A36850083642A; - remoteInfo = "gtest_unittest-static"; - }; - 40C849F8101A43490083642A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 40C84989101A36A60083642A; - remoteInfo = "sample1_unittest-static"; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 404884A50E2F7C0400CF7658 /* Copy Headers Internal */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = Headers/internal; - dstSubfolderSpec = 6; - files = ( - F67D4F3F1C7F5DA70017C729 /* gtest-port-arch.h in Copy Headers Internal */, - 404884A00E2F7BE600CF7658 /* gtest-death-test-internal.h in Copy Headers Internal */, - 404884A10E2F7BE600CF7658 /* gtest-filepath.h in Copy Headers Internal */, - 404884A20E2F7BE600CF7658 /* gtest-internal.h in Copy Headers Internal */, - 4539C9380EC280E200A70F4C /* gtest-linked_ptr.h in Copy Headers Internal */, - 4539C9390EC280E200A70F4C /* gtest-param-util-generated.h in Copy Headers Internal */, - 4539C93A0EC280E200A70F4C /* gtest-param-util.h in Copy Headers Internal */, - 404884A30E2F7BE600CF7658 /* gtest-port.h in Copy Headers Internal */, - 404884A40E2F7BE600CF7658 /* gtest-string.h in Copy Headers Internal */, - 40899F500FFA7281000B29AE /* gtest-tuple.h in Copy Headers Internal */, - 3BF6F2A00E79B5AD000F2EEE /* gtest-type-util.h in Copy Headers Internal */, - ); - name = "Copy Headers Internal"; - runOnlyForDeploymentPostprocessing = 0; - }; - F67D4F471C7F5DF60017C729 /* Copy Headers Internal Custom */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = Headers/internal/custom; - dstSubfolderSpec = 6; - files = ( - F67D4F491C7F5E260017C729 /* gtest-printers.h in Copy Headers Internal Custom */, - F67D4F481C7F5E160017C729 /* gtest-port.h in Copy Headers Internal Custom */, - ); - name = "Copy Headers Internal Custom"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 224A12A10E9EADA700BD17FD /* gtest-all.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "gtest-all.cc"; sourceTree = ""; }; - 224A12A20E9EADCC00BD17FD /* gtest-test-part.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "gtest-test-part.h"; sourceTree = ""; }; - 3B238C120E7FE13C00846E11 /* gtest_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_unittest.cc; sourceTree = ""; }; - 3B87D2100E96B92E000D1852 /* runtests.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = runtests.sh; sourceTree = ""; }; - 3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-type-util.h"; sourceTree = ""; }; - 3BF6F2A40E79B616000F2EEE /* gtest-typed-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-typed-test.h"; sourceTree = ""; }; - 403EE37C0E377822004BD1E2 /* versiongenerate.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = versiongenerate.py; sourceTree = ""; }; - 404883DB0E2F799B00CF7658 /* gtest-death-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-death-test.h"; sourceTree = ""; }; - 404883DC0E2F799B00CF7658 /* gtest-message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-message.h"; sourceTree = ""; }; - 404883DD0E2F799B00CF7658 /* gtest-spi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-spi.h"; sourceTree = ""; }; - 404883DE0E2F799B00CF7658 /* gtest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gtest.h; sourceTree = ""; }; - 404883DF0E2F799B00CF7658 /* gtest_pred_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gtest_pred_impl.h; sourceTree = ""; }; - 404883E00E2F799B00CF7658 /* gtest_prod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gtest_prod.h; sourceTree = ""; }; - 404883E20E2F799B00CF7658 /* gtest-death-test-internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-death-test-internal.h"; sourceTree = ""; }; - 404883E30E2F799B00CF7658 /* gtest-filepath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-filepath.h"; sourceTree = ""; }; - 404883E40E2F799B00CF7658 /* gtest-internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-internal.h"; sourceTree = ""; }; - 404883E50E2F799B00CF7658 /* gtest-port.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-port.h"; sourceTree = ""; }; - 404883E60E2F799B00CF7658 /* gtest-string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-string.h"; sourceTree = ""; }; - 404883F60E2F799B00CF7658 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = SOURCE_ROOT; }; - 4048840D0E2F799B00CF7658 /* gtest_main.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_main.cc; sourceTree = ""; }; - 404884A90E2F7CD900CF7658 /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CHANGES; path = ../CHANGES; sourceTree = SOURCE_ROOT; }; - 404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CONTRIBUTORS; path = ../CONTRIBUTORS; sourceTree = SOURCE_ROOT; }; - 404884AB0E2F7CD900CF7658 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = SOURCE_ROOT; }; - 40899F430FFA7184000B29AE /* gtest_unittest-framework */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "gtest_unittest-framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 40899F4D0FFA7271000B29AE /* gtest-tuple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-tuple.h"; sourceTree = ""; }; - 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = StaticLibraryTarget.xcconfig; sourceTree = ""; }; - 4089A0130FFACEFC000B29AE /* sample1_unittest-framework */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "sample1_unittest-framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 4089A02C0FFACF7F000B29AE /* sample1.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sample1.cc; sourceTree = ""; }; - 4089A02D0FFACF7F000B29AE /* sample1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sample1.h; sourceTree = ""; }; - 4089A02E0FFACF7F000B29AE /* sample1_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sample1_unittest.cc; sourceTree = ""; }; - 40C848FA101A209C0083642A /* libgtest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgtest.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 40C8490B101A217E0083642A /* libgtest_main.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgtest_main.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 40C84987101A36850083642A /* gtest_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gtest_unittest; sourceTree = BUILT_PRODUCTS_DIR; }; - 40C84997101A36A60083642A /* sample1_unittest-static */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "sample1_unittest-static"; sourceTree = BUILT_PRODUCTS_DIR; }; - 40D4CDF10E30E07400294801 /* DebugProject.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugProject.xcconfig; sourceTree = ""; }; - 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FrameworkTarget.xcconfig; sourceTree = ""; }; - 40D4CDF30E30E07400294801 /* General.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = General.xcconfig; sourceTree = ""; }; - 40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ReleaseProject.xcconfig; sourceTree = ""; }; - 40D4CF510E30F5E200294801 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 4539C8FF0EC27F6400A70F4C /* gtest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = gtest.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4539C9330EC280AE00A70F4C /* gtest-param-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-test.h"; sourceTree = ""; }; - 4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-linked_ptr.h"; sourceTree = ""; }; - 4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-util-generated.h"; sourceTree = ""; }; - 4539C9370EC280E200A70F4C /* gtest-param-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-util.h"; sourceTree = ""; }; - 4567C8171264FF71007740BE /* gtest-printers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-printers.h"; sourceTree = ""; }; - F67D4F3D1C7F5D8B0017C729 /* gtest-port-arch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-port-arch.h"; sourceTree = ""; }; - F67D4F411C7F5DD00017C729 /* gtest-port.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-port.h"; sourceTree = ""; }; - F67D4F421C7F5DD00017C729 /* gtest-printers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-printers.h"; sourceTree = ""; }; - F67D4F431C7F5DD00017C729 /* gtest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gtest.h; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 40899F410FFA7184000B29AE /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 40C849A4101A37150083642A /* gtest.framework in Frameworks */, - 40C84916101A235B0083642A /* libgtest_main.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4089A0110FFACEFC000B29AE /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 40C849A2101A37050083642A /* gtest.framework in Frameworks */, - 40C84921101A23AD0083642A /* libgtest_main.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 40C84981101A36850083642A /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 40C84982101A36850083642A /* libgtest.a in Frameworks */, - 40C84983101A36850083642A /* libgtest_main.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 40C84991101A36A60083642A /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 40C84992101A36A60083642A /* libgtest.a in Frameworks */, - 40C84993101A36A60083642A /* libgtest_main.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 034768DDFF38A45A11DB9C8B /* Products */ = { - isa = PBXGroup; - children = ( - 4539C8FF0EC27F6400A70F4C /* gtest.framework */, - 40C848FA101A209C0083642A /* libgtest.a */, - 40C8490B101A217E0083642A /* libgtest_main.a */, - 40899F430FFA7184000B29AE /* gtest_unittest-framework */, - 40C84987101A36850083642A /* gtest_unittest */, - 4089A0130FFACEFC000B29AE /* sample1_unittest-framework */, - 40C84997101A36A60083642A /* sample1_unittest-static */, - ); - name = Products; - sourceTree = ""; - }; - 0867D691FE84028FC02AAC07 /* gtest */ = { - isa = PBXGroup; - children = ( - 40D4CDF00E30E07400294801 /* Config */, - 08FB77ACFE841707C02AAC07 /* Source */, - 40D4CF4E0E30F5E200294801 /* Resources */, - 403EE37B0E377822004BD1E2 /* Scripts */, - 034768DDFF38A45A11DB9C8B /* Products */, - ); - name = gtest; - sourceTree = ""; - }; - 08FB77ACFE841707C02AAC07 /* Source */ = { - isa = PBXGroup; - children = ( - 404884A90E2F7CD900CF7658 /* CHANGES */, - 404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */, - 404884AB0E2F7CD900CF7658 /* LICENSE */, - 404883F60E2F799B00CF7658 /* README.md */, - 404883D90E2F799B00CF7658 /* include */, - 4089A02F0FFACF84000B29AE /* samples */, - 404884070E2F799B00CF7658 /* src */, - 3B238BF00E7FE13B00846E11 /* test */, - ); - name = Source; - sourceTree = ""; - }; - 3B238BF00E7FE13B00846E11 /* test */ = { - isa = PBXGroup; - children = ( - 3B238C120E7FE13C00846E11 /* gtest_unittest.cc */, - ); - name = test; - path = ../test; - sourceTree = SOURCE_ROOT; - }; - 403EE37B0E377822004BD1E2 /* Scripts */ = { - isa = PBXGroup; - children = ( - 403EE37C0E377822004BD1E2 /* versiongenerate.py */, - 3B87D2100E96B92E000D1852 /* runtests.sh */, - ); - path = Scripts; - sourceTree = ""; - }; - 404883D90E2F799B00CF7658 /* include */ = { - isa = PBXGroup; - children = ( - 404883DA0E2F799B00CF7658 /* gtest */, - ); - name = include; - path = ../include; - sourceTree = SOURCE_ROOT; - }; - 404883DA0E2F799B00CF7658 /* gtest */ = { - isa = PBXGroup; - children = ( - 404883E10E2F799B00CF7658 /* internal */, - 224A12A20E9EADCC00BD17FD /* gtest-test-part.h */, - 404883DB0E2F799B00CF7658 /* gtest-death-test.h */, - 404883DC0E2F799B00CF7658 /* gtest-message.h */, - 4539C9330EC280AE00A70F4C /* gtest-param-test.h */, - 4567C8171264FF71007740BE /* gtest-printers.h */, - 404883DD0E2F799B00CF7658 /* gtest-spi.h */, - 404883DE0E2F799B00CF7658 /* gtest.h */, - 404883DF0E2F799B00CF7658 /* gtest_pred_impl.h */, - 404883E00E2F799B00CF7658 /* gtest_prod.h */, - 3BF6F2A40E79B616000F2EEE /* gtest-typed-test.h */, - ); - path = gtest; - sourceTree = ""; - }; - 404883E10E2F799B00CF7658 /* internal */ = { - isa = PBXGroup; - children = ( - F67D4F401C7F5DD00017C729 /* custom */, - 404883E20E2F799B00CF7658 /* gtest-death-test-internal.h */, - 404883E30E2F799B00CF7658 /* gtest-filepath.h */, - 404883E40E2F799B00CF7658 /* gtest-internal.h */, - 4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */, - 4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */, - 4539C9370EC280E200A70F4C /* gtest-param-util.h */, - 404883E50E2F799B00CF7658 /* gtest-port.h */, - F67D4F3D1C7F5D8B0017C729 /* gtest-port-arch.h */, - 404883E60E2F799B00CF7658 /* gtest-string.h */, - 40899F4D0FFA7271000B29AE /* gtest-tuple.h */, - 3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */, - ); - path = internal; - sourceTree = ""; - }; - 404884070E2F799B00CF7658 /* src */ = { - isa = PBXGroup; - children = ( - 224A12A10E9EADA700BD17FD /* gtest-all.cc */, - 4048840D0E2F799B00CF7658 /* gtest_main.cc */, - ); - name = src; - path = ../src; - sourceTree = SOURCE_ROOT; - }; - 4089A02F0FFACF84000B29AE /* samples */ = { - isa = PBXGroup; - children = ( - 4089A02C0FFACF7F000B29AE /* sample1.cc */, - 4089A02D0FFACF7F000B29AE /* sample1.h */, - 4089A02E0FFACF7F000B29AE /* sample1_unittest.cc */, - ); - name = samples; - path = ../samples; - sourceTree = SOURCE_ROOT; - }; - 40D4CDF00E30E07400294801 /* Config */ = { - isa = PBXGroup; - children = ( - 40D4CDF10E30E07400294801 /* DebugProject.xcconfig */, - 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */, - 40D4CDF30E30E07400294801 /* General.xcconfig */, - 40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */, - 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */, - ); - path = Config; - sourceTree = ""; - }; - 40D4CF4E0E30F5E200294801 /* Resources */ = { - isa = PBXGroup; - children = ( - 40D4CF510E30F5E200294801 /* Info.plist */, - ); - path = Resources; - sourceTree = ""; - }; - F67D4F401C7F5DD00017C729 /* custom */ = { - isa = PBXGroup; - children = ( - F67D4F411C7F5DD00017C729 /* gtest-port.h */, - F67D4F421C7F5DD00017C729 /* gtest-printers.h */, - F67D4F431C7F5DD00017C729 /* gtest.h */, - ); - path = custom; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 8D07F2BD0486CC7A007CD1D0 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - F67D4F451C7F5DD00017C729 /* gtest-printers.h in Headers */, - 404884380E2F799B00CF7658 /* gtest-death-test.h in Headers */, - 404884390E2F799B00CF7658 /* gtest-message.h in Headers */, - 4539C9340EC280AE00A70F4C /* gtest-param-test.h in Headers */, - F67D4F461C7F5DD00017C729 /* gtest.h in Headers */, - F67D4F441C7F5DD00017C729 /* gtest-port.h in Headers */, - 4567C8181264FF71007740BE /* gtest-printers.h in Headers */, - F67D4F3E1C7F5D8B0017C729 /* gtest-port-arch.h in Headers */, - 3BF6F2A50E79B616000F2EEE /* gtest-typed-test.h in Headers */, - 4048843A0E2F799B00CF7658 /* gtest-spi.h in Headers */, - 4048843B0E2F799B00CF7658 /* gtest.h in Headers */, - 4048843C0E2F799B00CF7658 /* gtest_pred_impl.h in Headers */, - 4048843D0E2F799B00CF7658 /* gtest_prod.h in Headers */, - 224A12A30E9EADCC00BD17FD /* gtest-test-part.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 40899F420FFA7184000B29AE /* gtest_unittest-framework */ = { - isa = PBXNativeTarget; - buildConfigurationList = 40899F4A0FFA71BC000B29AE /* Build configuration list for PBXNativeTarget "gtest_unittest-framework" */; - buildPhases = ( - 40899F400FFA7184000B29AE /* Sources */, - 40899F410FFA7184000B29AE /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 40C849A0101A36F10083642A /* PBXTargetDependency */, - ); - name = "gtest_unittest-framework"; - productName = gtest_unittest; - productReference = 40899F430FFA7184000B29AE /* gtest_unittest-framework */; - productType = "com.apple.product-type.tool"; - }; - 4089A0120FFACEFC000B29AE /* sample1_unittest-framework */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4089A0240FFACF01000B29AE /* Build configuration list for PBXNativeTarget "sample1_unittest-framework" */; - buildPhases = ( - 4089A0100FFACEFC000B29AE /* Sources */, - 4089A0110FFACEFC000B29AE /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 40C8499E101A36E50083642A /* PBXTargetDependency */, - ); - name = "sample1_unittest-framework"; - productName = sample1_unittest; - productReference = 4089A0130FFACEFC000B29AE /* sample1_unittest-framework */; - productType = "com.apple.product-type.tool"; - }; - 40C848F9101A209C0083642A /* gtest-static */ = { - isa = PBXNativeTarget; - buildConfigurationList = 40C84902101A212E0083642A /* Build configuration list for PBXNativeTarget "gtest-static" */; - buildPhases = ( - 40C848F7101A209C0083642A /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "gtest-static"; - productName = "gtest-static"; - productReference = 40C848FA101A209C0083642A /* libgtest.a */; - productType = "com.apple.product-type.library.static"; - }; - 40C8490A101A217E0083642A /* gtest_main-static */ = { - isa = PBXNativeTarget; - buildConfigurationList = 40C84912101A21D20083642A /* Build configuration list for PBXNativeTarget "gtest_main-static" */; - buildPhases = ( - 40C84908101A217E0083642A /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "gtest_main-static"; - productName = "gtest_main-static"; - productReference = 40C8490B101A217E0083642A /* libgtest_main.a */; - productType = "com.apple.product-type.library.static"; - }; - 40C8497A101A36850083642A /* gtest_unittest-static */ = { - isa = PBXNativeTarget; - buildConfigurationList = 40C84984101A36850083642A /* Build configuration list for PBXNativeTarget "gtest_unittest-static" */; - buildPhases = ( - 40C8497F101A36850083642A /* Sources */, - 40C84981101A36850083642A /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 40C8497B101A36850083642A /* PBXTargetDependency */, - 40C8497D101A36850083642A /* PBXTargetDependency */, - ); - name = "gtest_unittest-static"; - productName = gtest_unittest; - productReference = 40C84987101A36850083642A /* gtest_unittest */; - productType = "com.apple.product-type.tool"; - }; - 40C84989101A36A60083642A /* sample1_unittest-static */ = { - isa = PBXNativeTarget; - buildConfigurationList = 40C84994101A36A60083642A /* Build configuration list for PBXNativeTarget "sample1_unittest-static" */; - buildPhases = ( - 40C8498E101A36A60083642A /* Sources */, - 40C84991101A36A60083642A /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 40C8498A101A36A60083642A /* PBXTargetDependency */, - 40C8498C101A36A60083642A /* PBXTargetDependency */, - ); - name = "sample1_unittest-static"; - productName = sample1_unittest; - productReference = 40C84997101A36A60083642A /* sample1_unittest-static */; - productType = "com.apple.product-type.tool"; - }; - 8D07F2BC0486CC7A007CD1D0 /* gtest-framework */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "gtest-framework" */; - buildPhases = ( - 8D07F2C10486CC7A007CD1D0 /* Sources */, - 8D07F2BD0486CC7A007CD1D0 /* Headers */, - 404884A50E2F7C0400CF7658 /* Copy Headers Internal */, - F67D4F471C7F5DF60017C729 /* Copy Headers Internal Custom */, - 8D07F2BF0486CC7A007CD1D0 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 40C44AE60E379922008FCC51 /* PBXTargetDependency */, - 408BEC101046CFE900DEF522 /* PBXTargetDependency */, - 40C8499C101A36DC0083642A /* PBXTargetDependency */, - ); - name = "gtest-framework"; - productInstallPath = "$(HOME)/Library/Frameworks"; - productName = gtest; - productReference = 4539C8FF0EC27F6400A70F4C /* gtest.framework */; - productType = "com.apple.product-type.framework"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 0867D690FE84028FC02AAC07 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0460; - }; - buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "gtest" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - en, - ); - mainGroup = 0867D691FE84028FC02AAC07 /* gtest */; - productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8D07F2BC0486CC7A007CD1D0 /* gtest-framework */, - 40C848F9101A209C0083642A /* gtest-static */, - 40C8490A101A217E0083642A /* gtest_main-static */, - 40899F420FFA7184000B29AE /* gtest_unittest-framework */, - 40C8497A101A36850083642A /* gtest_unittest-static */, - 4089A0120FFACEFC000B29AE /* sample1_unittest-framework */, - 40C84989101A36A60083642A /* sample1_unittest-static */, - 3B238F5F0E828B5400846E11 /* Check */, - 40C44ADC0E3798F4008FCC51 /* Version Info */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8D07F2BF0486CC7A007CD1D0 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 404884500E2F799B00CF7658 /* README.md in Resources */, - 404884AC0E2F7CD900CF7658 /* CHANGES in Resources */, - 404884AD0E2F7CD900CF7658 /* CONTRIBUTORS in Resources */, - 404884AE0E2F7CD900CF7658 /* LICENSE in Resources */, - 40C84978101A36540083642A /* libgtest_main.a in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 3B238F5E0E828B5400846E11 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Remember, this \"Run Script\" build phase will be executed from $SRCROOT\n/bin/bash Scripts/runtests.sh"; - }; - 40C44ADB0E3798F4008FCC51 /* Generate Version.h */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Scripts/versiongenerate.py", - "$(SRCROOT)/../configure.ac", - ); - name = "Generate Version.h"; - outputPaths = ( - "$(PROJECT_TEMP_DIR)/Version.h", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Remember, this \"Run Script\" build phase will be executed from $SRCROOT\n/usr/bin/python Scripts/versiongenerate.py ../ $PROJECT_TEMP_DIR"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 40899F400FFA7184000B29AE /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 40899F530FFA72A0000B29AE /* gtest_unittest.cc in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4089A0100FFACEFC000B29AE /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4089A0440FFAD1BE000B29AE /* sample1.cc in Sources */, - 4089A0460FFAD1BE000B29AE /* sample1_unittest.cc in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 40C848F7101A209C0083642A /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 40C848FF101A21150083642A /* gtest-all.cc in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 40C84908101A217E0083642A /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 40C84915101A21DF0083642A /* gtest_main.cc in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 40C8497F101A36850083642A /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 40C84980101A36850083642A /* gtest_unittest.cc in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 40C8498E101A36A60083642A /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 40C8498F101A36A60083642A /* sample1.cc in Sources */, - 40C84990101A36A60083642A /* sample1_unittest.cc in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D07F2C10486CC7A007CD1D0 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 40899F3A0FFA70D4000B29AE /* gtest-all.cc in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 40899F9D0FFA740F000B29AE /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 40899F420FFA7184000B29AE /* gtest_unittest-framework */; - targetProxy = 40899F9C0FFA740F000B29AE /* PBXContainerItemProxy */; - }; - 4089A0980FFAD34A000B29AE /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4089A0120FFACEFC000B29AE /* sample1_unittest-framework */; - targetProxy = 4089A0970FFAD34A000B29AE /* PBXContainerItemProxy */; - }; - 408BEC101046CFE900DEF522 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 40C848F9101A209C0083642A /* gtest-static */; - targetProxy = 408BEC0F1046CFE900DEF522 /* PBXContainerItemProxy */; - }; - 40C44AE60E379922008FCC51 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 40C44ADC0E3798F4008FCC51 /* Version Info */; - targetProxy = 40C44AE50E379922008FCC51 /* PBXContainerItemProxy */; - }; - 40C8497B101A36850083642A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 40C848F9101A209C0083642A /* gtest-static */; - targetProxy = 40C8497C101A36850083642A /* PBXContainerItemProxy */; - }; - 40C8497D101A36850083642A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 40C8490A101A217E0083642A /* gtest_main-static */; - targetProxy = 40C8497E101A36850083642A /* PBXContainerItemProxy */; - }; - 40C8498A101A36A60083642A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 40C848F9101A209C0083642A /* gtest-static */; - targetProxy = 40C8498B101A36A60083642A /* PBXContainerItemProxy */; - }; - 40C8498C101A36A60083642A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 40C8490A101A217E0083642A /* gtest_main-static */; - targetProxy = 40C8498D101A36A60083642A /* PBXContainerItemProxy */; - }; - 40C8499C101A36DC0083642A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 40C8490A101A217E0083642A /* gtest_main-static */; - targetProxy = 40C8499B101A36DC0083642A /* PBXContainerItemProxy */; - }; - 40C8499E101A36E50083642A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8D07F2BC0486CC7A007CD1D0 /* gtest-framework */; - targetProxy = 40C8499D101A36E50083642A /* PBXContainerItemProxy */; - }; - 40C849A0101A36F10083642A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8D07F2BC0486CC7A007CD1D0 /* gtest-framework */; - targetProxy = 40C8499F101A36F10083642A /* PBXContainerItemProxy */; - }; - 40C849F7101A43440083642A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 40C8497A101A36850083642A /* gtest_unittest-static */; - targetProxy = 40C849F6101A43440083642A /* PBXContainerItemProxy */; - }; - 40C849F9101A43490083642A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 40C84989101A36A60083642A /* sample1_unittest-static */; - targetProxy = 40C849F8101A43490083642A /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 3B238F600E828B5400846E11 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - PRODUCT_NAME = Check; - SDKROOT = macosx; - }; - name = Debug; - }; - 3B238F610E828B5400846E11 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - PRODUCT_NAME = Check; - SDKROOT = macosx; - ZERO_LINK = NO; - }; - name = Release; - }; - 40899F450FFA7185000B29AE /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ../; - PRODUCT_NAME = "gtest_unittest-framework"; - SDKROOT = macosx; - }; - name = Debug; - }; - 40899F460FFA7185000B29AE /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ../; - PRODUCT_NAME = "gtest_unittest-framework"; - SDKROOT = macosx; - }; - name = Release; - }; - 4089A0150FFACEFD000B29AE /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - PRODUCT_NAME = "sample1_unittest-framework"; - SDKROOT = macosx; - }; - name = Debug; - }; - 4089A0160FFACEFD000B29AE /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - PRODUCT_NAME = "sample1_unittest-framework"; - SDKROOT = macosx; - }; - name = Release; - }; - 40C44ADF0E3798F4008FCC51 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = gtest; - SDKROOT = macosx; - TARGET_NAME = gtest; - }; - name = Debug; - }; - 40C44AE00E3798F4008FCC51 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = gtest; - SDKROOT = macosx; - TARGET_NAME = gtest; - }; - name = Release; - }; - 40C848FB101A209D0083642A /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ( - ../, - ../include/, - ); - PRODUCT_NAME = gtest; - SDKROOT = macosx; - }; - name = Debug; - }; - 40C848FC101A209D0083642A /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ( - ../, - ../include/, - ); - PRODUCT_NAME = gtest; - SDKROOT = macosx; - }; - name = Release; - }; - 40C8490E101A217F0083642A /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ( - ../, - ../include/, - ); - PRODUCT_NAME = gtest_main; - SDKROOT = macosx; - }; - name = Debug; - }; - 40C8490F101A217F0083642A /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ( - ../, - ../include/, - ); - PRODUCT_NAME = gtest_main; - SDKROOT = macosx; - }; - name = Release; - }; - 40C84985101A36850083642A /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ../; - PRODUCT_NAME = gtest_unittest; - SDKROOT = macosx; - }; - name = Debug; - }; - 40C84986101A36850083642A /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ../; - PRODUCT_NAME = gtest_unittest; - SDKROOT = macosx; - }; - name = Release; - }; - 40C84995101A36A60083642A /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - PRODUCT_NAME = "sample1_unittest-static"; - SDKROOT = macosx; - }; - name = Debug; - }; - 40C84996101A36A60083642A /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - PRODUCT_NAME = "sample1_unittest-static"; - SDKROOT = macosx; - }; - name = Release; - }; - 4FADC24308B4156D00ABE55E /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ( - ../, - ../include/, - ); - INFOPLIST_FILE = Resources/Info.plist; - INFOPLIST_PREFIX_HEADER = "$(PROJECT_TEMP_DIR)/Version.h"; - INFOPLIST_PREPROCESS = YES; - PRODUCT_NAME = gtest; - SDKROOT = macosx; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Debug; - }; - 4FADC24408B4156D00ABE55E /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ( - ../, - ../include/, - ); - INFOPLIST_FILE = Resources/Info.plist; - INFOPLIST_PREFIX_HEADER = "$(PROJECT_TEMP_DIR)/Version.h"; - INFOPLIST_PREPROCESS = YES; - PRODUCT_NAME = gtest; - SDKROOT = macosx; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Release; - }; - 4FADC24708B4156D00ABE55E /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 40D4CDF10E30E07400294801 /* DebugProject.xcconfig */; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - }; - name = Debug; - }; - 4FADC24808B4156D00ABE55E /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 3B238FA30E828BB600846E11 /* Build configuration list for PBXAggregateTarget "Check" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3B238F600E828B5400846E11 /* Debug */, - 3B238F610E828B5400846E11 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 40899F4A0FFA71BC000B29AE /* Build configuration list for PBXNativeTarget "gtest_unittest-framework" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 40899F450FFA7185000B29AE /* Debug */, - 40899F460FFA7185000B29AE /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4089A0240FFACF01000B29AE /* Build configuration list for PBXNativeTarget "sample1_unittest-framework" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4089A0150FFACEFD000B29AE /* Debug */, - 4089A0160FFACEFD000B29AE /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 40C44AE40E379905008FCC51 /* Build configuration list for PBXAggregateTarget "Version Info" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 40C44ADF0E3798F4008FCC51 /* Debug */, - 40C44AE00E3798F4008FCC51 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 40C84902101A212E0083642A /* Build configuration list for PBXNativeTarget "gtest-static" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 40C848FB101A209D0083642A /* Debug */, - 40C848FC101A209D0083642A /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 40C84912101A21D20083642A /* Build configuration list for PBXNativeTarget "gtest_main-static" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 40C8490E101A217F0083642A /* Debug */, - 40C8490F101A217F0083642A /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 40C84984101A36850083642A /* Build configuration list for PBXNativeTarget "gtest_unittest-static" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 40C84985101A36850083642A /* Debug */, - 40C84986101A36850083642A /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 40C84994101A36A60083642A /* Build configuration list for PBXNativeTarget "sample1_unittest-static" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 40C84995101A36A60083642A /* Debug */, - 40C84996101A36A60083642A /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "gtest-framework" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4FADC24308B4156D00ABE55E /* Debug */, - 4FADC24408B4156D00ABE55E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "gtest" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4FADC24708B4156D00ABE55E /* Debug */, - 4FADC24808B4156D00ABE55E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 0867D690FE84028FC02AAC07 /* Project object */; -} diff --git a/test/gtest/googletest b/test/gtest/googletest new file mode 160000 index 0000000000..4e4df226fc --- /dev/null +++ b/test/gtest/googletest @@ -0,0 +1 @@ +Subproject commit 4e4df226fc197c0dda6e37f5c8c3845ca1e73a49 diff --git a/test/gtest/gtest.vcxproj b/test/gtest/gtest.vcxproj new file mode 100644 index 0000000000..660be83f21 --- /dev/null +++ b/test/gtest/gtest.vcxproj @@ -0,0 +1,175 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + 15.0 + {CAC1267B-8778-4257-AAC6-CAF481723B01} + Win32Proj + gtest + 10.0.15063.0 + + + + StaticLibrary + true + v141 + Unicode + gtestd + + + StaticLibrary + false + v141 + true + Unicode + gtest + + + StaticLibrary + true + v141 + Unicode + gtestd + + + StaticLibrary + false + v141 + true + Unicode + gtest + + + + + + + + + + + + + + + + + + + + + true + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_SourcePath); + + + true + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_SourcePath); + + + false + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_SourcePath); + + + false + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_SourcePath); + + + + NotUsing + Level3 + Disabled + true + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Windows + true + + + + + NotUsing + Level3 + Disabled + true + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Windows + true + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) + MultiThreaded + + + Windows + true + true + true + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) + MultiThreaded + + + Windows + true + true + true + + + + + + \ No newline at end of file From 182299235438d9272066f0b34fd5f93d24bbe1de Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 4 Jun 2018 14:59:50 -0700 Subject: [PATCH 052/363] Fix null ref on ExeLocation not being set (#884) --- .../CommonLib/FileOutputManager.cpp | 2 +- .../CommonLib/FileOutputManager.h | 1 + .../CommonLib/LoggingHelpers.cpp | 27 ++-- .../CommonLib/requesthandler_config.cpp | 55 ++++---- .../CommonLib/requesthandler_config.h | 4 +- src/AspNetCoreModuleV2/CommonLib/stdafx.h | 1 + src/AspNetCoreModuleV2/CommonLib/sttimer.h | 4 +- .../InProcessRequestHandler.vcxproj | 10 +- .../InProcessRequestHandler/dllmain.cxx | 61 ++++++-- .../{inprocess => }/inprocessapplication.cpp | 27 +++- .../{inprocess => }/inprocessapplication.h | 11 +- .../{inprocess => }/inprocesshandler.cpp | 7 +- .../{inprocess => }/inprocesshandler.h | 7 +- .../managedexports.cxx | 4 +- .../InProcessRequestHandler/precomp.hxx | 20 --- test/CommonLibTests/CommonLibTests.vcxproj | 21 ++- test/CommonLibTests/fakeclasses.h | 131 ++++++++++++++++++ .../inprocess_application_tests.cpp | 23 +++ test/CommonLibTests/stdafx.h | 10 +- .../Inprocess/StartupExceptionTests.cs | 4 +- 20 files changed, 332 insertions(+), 98 deletions(-) rename src/AspNetCoreModuleV2/InProcessRequestHandler/{inprocess => }/inprocessapplication.cpp (97%) rename src/AspNetCoreModuleV2/InProcessRequestHandler/{inprocess => }/inprocessapplication.h (96%) rename src/AspNetCoreModuleV2/InProcessRequestHandler/{inprocess => }/inprocesshandler.cpp (92%) rename src/AspNetCoreModuleV2/InProcessRequestHandler/{inprocess => }/inprocesshandler.h (87%) create mode 100644 test/CommonLibTests/fakeclasses.h create mode 100644 test/CommonLibTests/inprocess_application_tests.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp index 9f9ec1e75c..f7b77c92fc 100644 --- a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp @@ -2,7 +2,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "stdafx.h" - +#include "sttimer.h" FileOutputManager::FileOutputManager() : m_pStdOutFile(NULL) diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h index c4f087161c..11fb662c67 100644 --- a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h @@ -3,6 +3,7 @@ #pragma once +#include "sttimer.h" class FileOutputManager : public IOutputManager { diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp index dbb6f71474..2af111253e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp @@ -16,19 +16,26 @@ LoggingHelpers::CreateLoggingProvider( DBG_ASSERT(outputManager != NULL); - if (fIsLoggingEnabled) + try { - FileOutputManager* manager = new FileOutputManager; - hr = manager->Initialize(pwzStdOutFileName, pwzApplicationPath); - *outputManager = manager; + if (fIsLoggingEnabled) + { + FileOutputManager* manager = new FileOutputManager; + hr = manager->Initialize(pwzStdOutFileName, pwzApplicationPath); + *outputManager = manager; + } + else if (fEnablePipe) + { + *outputManager = new PipeOutputManager; + } + else + { + *outputManager = new NullOutputManager; + } } - else if (fEnablePipe) + catch (std::bad_alloc&) { - *outputManager = new PipeOutputManager; - } - else - { - *outputManager = new NullOutputManager; + hr = E_OUTOFMEMORY; } return hr; diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp index a341445fc6..9a9a5cdd46 100644 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp @@ -33,35 +33,42 @@ REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig( STRU struHostFxrDllLocation; STRU struExeLocation; - if (ppAspNetCoreConfig == NULL) + try { - hr = E_INVALIDARG; - goto Finished; + if (ppAspNetCoreConfig == NULL) + { + hr = E_INVALIDARG; + goto Finished; + } + + *ppAspNetCoreConfig = NULL; + + pRequestHandlerConfig = new REQUESTHANDLER_CONFIG; + + hr = pRequestHandlerConfig->Populate(pHttpServer, pHttpApplication); + if (FAILED(hr)) + { + goto Finished; + } + + DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, + "REQUESTHANDLER_CONFIG::GetConfig, set config to ModuleContext"); + // set appliction info here instead of inside Populate() + // as the destructor will delete the backend process + hr = pRequestHandlerConfig->QueryApplicationPath()->Copy(pHttpApplication->GetApplicationId()); + if (FAILED(hr)) + { + goto Finished; + } + + *ppAspNetCoreConfig = pRequestHandlerConfig; + pRequestHandlerConfig = NULL; } - - *ppAspNetCoreConfig = NULL; - - pRequestHandlerConfig = new REQUESTHANDLER_CONFIG; - - hr = pRequestHandlerConfig->Populate(pHttpServer, pHttpApplication); - if (FAILED(hr)) + catch (std::bad_alloc&) { - goto Finished; + hr = E_OUTOFMEMORY; } - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "REQUESTHANDLER_CONFIG::GetConfig, set config to ModuleContext"); - // set appliction info here instead of inside Populate() - // as the destructor will delete the backend process - hr = pRequestHandlerConfig->QueryApplicationPath()->Copy(pHttpApplication->GetApplicationId()); - if (FAILED(hr)) - { - goto Finished; - } - - *ppAspNetCoreConfig = pRequestHandlerConfig; - pRequestHandlerConfig = NULL; - Finished: if (pRequestHandlerConfig != NULL) diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h index d9c368468a..71f5cb6e66 100644 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h +++ b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h @@ -209,10 +209,10 @@ public: return &m_struConfigPath; } -private: +protected: // - // private constructor + // protected constructor // REQUESTHANDLER_CONFIG() : m_fStdoutLogEnabled(FALSE), diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index 8e5563da25..969590ea6e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -23,6 +23,7 @@ #include "dbgutil.h" #include "ahutil.h" #include "hashfn.h" +#include "sttimer.h" #include "irequesthandler.h" #include "sttimer.h" #include "requesthandler.h" diff --git a/src/AspNetCoreModuleV2/CommonLib/sttimer.h b/src/AspNetCoreModuleV2/CommonLib/sttimer.h index dfb79e7a6a..ada44158a7 100644 --- a/src/AspNetCoreModuleV2/CommonLib/sttimer.h +++ b/src/AspNetCoreModuleV2/CommonLib/sttimer.h @@ -3,6 +3,8 @@ #pragma once +#include "stdafx.h" + #ifndef _STTIMER_H #define _STTIMER_H @@ -276,4 +278,4 @@ private: BOOL _fUsingHighResolution; }; -#endif // _STTIMER_H \ No newline at end of file +#endif // _STTIMER_H diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index db22833452..4d7de9cf3a 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -211,16 +211,14 @@ - - + + - - - - + + diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx index 00002cd023..ac020d6369 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -1,8 +1,16 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + // dllmain.cpp : Defines the entry point for the DLL application. + #include "precomp.hxx" #include #include +#include "inprocessapplication.h" +#include "inprocesshandler.h" +#include "requesthandler_config.h" + BOOL g_fGlobalInitialize = FALSE; BOOL g_fProcessDetach = FALSE; DWORD g_dwAspNetCoreDebugFlags = 0; @@ -103,31 +111,56 @@ __stdcall CreateApplication( _In_ IHttpServer *pServer, _In_ IHttpContext *pHttpContext, - _In_ PCWSTR pwzExeLocation, + _In_ PCWSTR pwzExeLocation, _Out_ IAPPLICATION **ppApplication ) { - HRESULT hr = S_OK; - IAPPLICATION *pApplication = NULL; - REQUESTHANDLER_CONFIG *pConfig; + HRESULT hr = S_OK; + IN_PROCESS_APPLICATION *pApplication = NULL; + REQUESTHANDLER_CONFIG *pConfig = NULL; + // Initialze some global variables here InitializeGlobalConfiguration(pServer); - hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpContext->GetApplication(), &pConfig); - if (FAILED(hr)) + try { - return hr; - } + hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpContext->GetApplication(), &pConfig); + if (FAILED(hr)) + { + goto Finished; + } - pApplication = new IN_PROCESS_APPLICATION(pServer, pConfig, pwzExeLocation); - if (pApplication == NULL) + pApplication = new IN_PROCESS_APPLICATION(pServer, pConfig); + + pConfig = NULL; + + hr = pApplication->Initialize(pwzExeLocation); + if (FAILED(hr)) + { + goto Finished; + } + + *ppApplication = pApplication; + } + catch (std::bad_alloc&) { - hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); - goto Finished; + hr = E_OUTOFMEMORY; } - *ppApplication = pApplication; - Finished: + if (FAILED(hr)) + { + if (pApplication != NULL) + { + delete pApplication; + pApplication = NULL; + } + if (pConfig != NULL) + { + delete pConfig; + pConfig = NULL; + } + } + return hr; } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp similarity index 97% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 81ec85fab3..44ea05ab3c 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -1,21 +1,26 @@ -#include "..\precomp.hxx" +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "inprocessapplication.h" +#include "inprocesshandler.h" #include "hostfxroptions.h" +#include "requesthandler_config.h" +#include "environmentvariablehelpers.h" +#include "aspnetcore_event.h" IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL; hostfxr_main_fn IN_PROCESS_APPLICATION::s_fMainCallback = NULL; IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( IHttpServer *pHttpServer, - REQUESTHANDLER_CONFIG *pConfig, - PCWSTR pDotnetExeLocation) : + REQUESTHANDLER_CONFIG *pConfig) : m_pHttpServer(pHttpServer), m_ProcessExitCode(0), m_fBlockCallbacksIntoManaged(FALSE), m_fInitialized(FALSE), m_fShutdownCalledFromNative(FALSE), m_fShutdownCalledFromManaged(FALSE), - m_srwLock(), - m_pstrDotnetExeLocation(pDotnetExeLocation) + m_srwLock() { // is it guaranteed that we have already checked app offline at this point? // If so, I don't think there is much to do here. @@ -24,10 +29,18 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( InitializeSRWLock(&m_srwLock); m_pConfig = pConfig; - // TODO we can probably initialized as I believe we are the only ones calling recycle. + m_status = APPLICATION_STATUS::STARTING; } +HRESULT +IN_PROCESS_APPLICATION::Initialize( + PCWSTR pDotnetExeLocation +) +{ + return m_struExeLocation.Copy(pDotnetExeLocation); +} + IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION() { @@ -573,7 +586,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication( } if (FAILED(hr = HOSTFXR_OPTIONS::Create( - m_pstrDotnetExeLocation, + m_struExeLocation.QueryStr(), m_pConfig->QueryProcessPath()->QueryStr(), m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), m_pConfig->QueryArguments()->QueryStr(), diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h similarity index 96% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index c9d0285369..4641cd67b1 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -2,6 +2,11 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #pragma once + +#include "precomp.hxx" +#include "inprocesshandler.h" +#include "requesthandler_config.h" + typedef INT(*hostfxr_main_fn) (CONST DWORD argc, CONST PCWSTR argv[]); // TODO these may need to be BSTRs typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_REQUEST_HANDLER) (IN_PROCESS_HANDLER* pInProcessHandler, void* pvRequestHandlerContext); @@ -13,14 +18,13 @@ class IN_PROCESS_APPLICATION : public APPLICATION public: IN_PROCESS_APPLICATION( IHttpServer* pHttpServer, - REQUESTHANDLER_CONFIG *pConfig, - PCWSTR pDotnetExeLocation); + REQUESTHANDLER_CONFIG *pConfig); ~IN_PROCESS_APPLICATION(); HRESULT Initialize( - VOID + PCWSTR pDotnetExeLocation ); __override @@ -156,7 +160,6 @@ private: HANDLE m_hErrThread; CHAR m_pzFileContents[4096] = { 0 }; DWORD m_dwStdErrReadTotal; - PCWSTR m_pstrDotnetExeLocation; static IN_PROCESS_APPLICATION* s_Application; IOutputManager* m_pLoggerProvider; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp similarity index 92% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.cpp rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 82e3328388..5678e2c4fd 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -1,4 +1,9 @@ -#include "..\precomp.hxx" +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "inprocesshandler.h" +#include "inprocessapplication.h" +#include "aspnetcore_event.h" IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( _In_ IHttpContext *pW3Context, diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h similarity index 87% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.h rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h index 5fbaa96940..256b355ce5 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h @@ -1,12 +1,17 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + #pragma once +#include "precomp.hxx" +#include "requesthandler.h" + class IN_PROCESS_APPLICATION; class IN_PROCESS_HANDLER : public REQUEST_HANDLER { public: IN_PROCESS_HANDLER( - _In_ IHttpContext *pW3Context, _In_ IN_PROCESS_APPLICATION *pApplication); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx index c548d6b85f..3c82bd850a 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx @@ -2,7 +2,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. #include "precomp.hxx" - +#include "inprocessapplication.h" +#include "inprocesshandler.h" +#include "requesthandler_config.h" // // Initialization export // diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx index 2a2c5812e7..6c4cd3bdad 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx @@ -44,26 +44,6 @@ #define WINVER 0x0601 #define _WIN32_WINNT 0x0601 -#include "..\IISLib\acache.h" -#include "..\IISLib\multisz.h" -#include "..\IISLib\multisza.h" -#include "..\IISLib\base64.h" -#include "..\IISLib\listentry.h" -#include "..\CommonLib\fx_ver.h" -#include "..\CommonLib\debugutil.h" -#include "..\CommonLib\requesthandler.h" -#include "..\CommonLib\requesthandler_config.h" -#include "..\CommonLib\utility.h" -#include "..\CommonLib\application.h" -#include "..\CommonLib\resources.h" -#include "aspnetcore_event.h" -#include "aspnetcore_msg.h" -#include "disconnectcontext.h" -#include "environmentvariablehelpers.h" -#include "sttimer.h" -#include ".\inprocess\InProcessHandler.h" -#include ".\inprocess\inprocessapplication.h" - #ifdef max #undef max template inline T max(T a, T b) diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 5e30180286..33756b7bd0 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -46,12 +46,14 @@ + + @@ -75,6 +77,9 @@ {cac1267b-8778-4257-aac6-caf481723b01} + + {d57ea297-6dc2-4bc0-8c91-334863327863} + @@ -88,13 +93,15 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 true Console + ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;%(AdditionalDependencies) @@ -111,13 +118,15 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 true Console + ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;%(AdditionalDependencies) @@ -132,7 +141,7 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -141,6 +150,8 @@ Console true true + ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;%(AdditionalDependencies) @@ -155,7 +166,7 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\..\src\AspNetCoreModuleV2\AspNetCore\Inc; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp14 @@ -164,6 +175,8 @@ Console true true + ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;%(AdditionalDependencies) diff --git a/test/CommonLibTests/fakeclasses.h b/test/CommonLibTests/fakeclasses.h new file mode 100644 index 0000000000..5f79138879 --- /dev/null +++ b/test/CommonLibTests/fakeclasses.h @@ -0,0 +1,131 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" + +class MockHttpServer : public IHttpServer +{ + // Inherited via IHttpServer + virtual BOOL IsCommandLineLaunch(VOID) const override + { + return 0; + } + virtual PCWSTR GetAppPoolName(VOID) const override + { + return PCWSTR(); + } + virtual HRESULT AssociateWithThreadPool(HANDLE hHandle, LPOVERLAPPED_COMPLETION_ROUTINE completionRoutine) override + { + return E_NOTIMPL; + } + virtual VOID IncrementThreadCount(VOID) override + { + return VOID(); + } + virtual VOID DecrementThreadCount(VOID) override + { + return VOID(); + } + virtual VOID ReportUnhealthy(PCWSTR pszReasonString, HRESULT hrReason) override + { + return VOID(); + } + virtual VOID RecycleProcess(PCWSTR pszReason) override + { + return VOID(); + } + virtual IAppHostAdminManager * GetAdminManager(VOID) const override + { + return nullptr; + } + virtual HRESULT GetFileInfo(PCWSTR pszPhysicalPath, HANDLE hUserToken, PSID pSid, PCWSTR pszChangeNotificationPath, HANDLE hChangeNotificationToken, BOOL fCache, IHttpFileInfo ** ppFileInfo, IHttpTraceContext * pHttpTraceContext = NULL) override + { + return E_NOTIMPL; + } + virtual HRESULT FlushKernelCache(PCWSTR pszUrl) override + { + return E_NOTIMPL; + } + virtual HRESULT DoCacheOperation(CACHE_OPERATION cacheOperation, IHttpCacheKey * pCacheKey, IHttpCacheSpecificData ** ppCacheSpecificData, IHttpTraceContext * pHttpTraceContext = NULL) override + { + return E_NOTIMPL; + } + virtual GLOBAL_NOTIFICATION_STATUS NotifyCustomNotification(ICustomNotificationProvider * pCustomOutput) override + { + return GLOBAL_NOTIFICATION_STATUS(); + } + virtual IHttpPerfCounterInfo * GetPerfCounterInfo(VOID) override + { + return nullptr; + } + virtual VOID RecycleApplication(PCWSTR pszAppConfigPath) override + { + return VOID(); + } + virtual VOID NotifyConfigurationChange(PCWSTR pszPath) override + { + return VOID(); + } + virtual VOID NotifyFileChange(PCWSTR pszFileName) override + { + return VOID(); + } + virtual IDispensedHttpModuleContextContainer * DispenseContainer(VOID) override + { + return nullptr; + } + virtual HRESULT AddFragmentToCache(HTTP_DATA_CHUNK * pDataChunk, PCWSTR pszFragmentName) override + { + return E_NOTIMPL; + } + virtual HRESULT ReadFragmentFromCache(PCWSTR pszFragmentName, BYTE * pvBuffer, DWORD cbSize, DWORD * pcbCopied) override + { + return E_NOTIMPL; + } + virtual HRESULT RemoveFragmentFromCache(PCWSTR pszFragmentName) override + { + return E_NOTIMPL; + } + virtual HRESULT GetWorkerProcessSettings(IWpfSettings ** ppWorkerProcessSettings) override + { + return E_NOTIMPL; + } + virtual HRESULT GetProtocolManagerCustomInterface(PCWSTR pProtocolManagerDll, PCWSTR pProtocolManagerDllInitFunction, DWORD dwCustomInterfaceId, PVOID * ppCustomInterface) override + { + return E_NOTIMPL; + } + virtual BOOL SatisfiesPrecondition(PCWSTR pszPrecondition, BOOL * pfUnknownPrecondition = NULL) const override + { + return 0; + } + virtual IHttpTraceContext * GetTraceContext(VOID) const override + { + return nullptr; + } + virtual HRESULT RegisterFileChangeMonitor(PCWSTR pszPath, HANDLE hToken, IHttpFileMonitor ** ppFileMonitor) override + { + return E_NOTIMPL; + } + virtual HRESULT GetExtendedInterface(HTTP_SERVER_INTERFACE_VERSION version, PVOID * ppInterface) override + { + return E_NOTIMPL; + } +}; + +class MockRequestHandlerConfig : public REQUESTHANDLER_CONFIG +{ +public: + static + MockRequestHandlerConfig* + CreateConfig() + { + return new MockRequestHandlerConfig; + } + +private: + MockRequestHandlerConfig() + { + + } +}; + diff --git a/test/CommonLibTests/inprocess_application_tests.cpp b/test/CommonLibTests/inprocess_application_tests.cpp new file mode 100644 index 0000000000..42ca949749 --- /dev/null +++ b/test/CommonLibTests/inprocess_application_tests.cpp @@ -0,0 +1,23 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "inprocessapplication.h" +#include "fakeclasses.h" + +namespace InprocessTests +{ + TEST(InProcessTest, NoNullRefForExePath) + { + auto server = new MockHttpServer(); + auto requestHandlerConfig = MockRequestHandlerConfig::CreateConfig(); + IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, requestHandlerConfig); + { + std::wstring exePath(L"hello"); + app->Initialize(exePath.c_str()); + } + ASSERT_STREQ(app->QueryExeLocation(), L"hello"); + } +} + + diff --git a/test/CommonLibTests/stdafx.h b/test/CommonLibTests/stdafx.h index e7c8024eda..ed238e1b3d 100644 --- a/test/CommonLibTests/stdafx.h +++ b/test/CommonLibTests/stdafx.h @@ -39,9 +39,9 @@ #include "stringa.h" #include "multisz.h" #include "dbgutil.h" -#include "ahutil.h" #include "hashfn.h" +#include "requesthandler_config.h" #include "hostfxr_utility.h" #include "environmentvariablehash.h" #include "iapplication.h" @@ -54,3 +54,11 @@ #undef assert // Macro redefinition in IISLib. #include "gtest\gtest.h" + +// Externals defined in inprocess +BOOL g_fProcessDetach; +HANDLE g_hEventLog; +DWORD g_dwAspNetCoreDebugFlags; +PCSTR g_szDebugLabel; +DWORD g_dwDebugFlags; + diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs index 6ca6a200cc..79b92c3424 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -11,13 +11,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class StartupExceptionTests : IISFunctionalTestBase { - + // TODO FileNotFound here. [Theory] [InlineData("CheckLogFile")] [InlineData("CheckErrLogFile")] public async Task CheckStdoutWithRandomNumber(string path) { var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite"); + deploymentParameters.PublishApplicationBeforeDeployment = true; deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; var randomNumberString = new Random(Guid.NewGuid().GetHashCode()).Next(10000000).ToString(); deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_RANDOM_VALUE"] = randomNumberString; @@ -39,6 +40,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CheckStdoutWithLargeWrites(string path) { var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite"); + deploymentParameters.PublishApplicationBeforeDeployment = true; deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; var deploymentResult = await DeployAsync(deploymentParameters); From 5ebf74fa328ed0de04637982456e54e2e1764f3b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 6 Jun 2018 08:55:18 -0700 Subject: [PATCH 053/363] Add certificate names for code signing (#889) --- Directory.Build.props | 4 +- build/repo.targets | 49 ++++++++++--------- korebuild-lock.txt | 4 +- .../Microsoft.AspNetCore.Server.IIS.csproj | 5 +- .../Microsoft.AspNetCore.Server.IIS.nuspec | 32 ------------ 5 files changed, 32 insertions(+), 62 deletions(-) delete mode 100644 src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec diff --git a/Directory.Build.props b/Directory.Build.props index 46a1159f78..f015ba2785 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,4 @@ - + @@ -14,6 +14,8 @@ $(MSBuildThisFileDirectory) $(MSBuildThisFileDirectory)build\Key.snk true + Microsoft + MicrosoftNuGet true true diff --git a/build/repo.targets b/build/repo.targets index a70e25df5f..c5c7cfd50e 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -2,6 +2,7 @@ InitializeComponents;$(PrepareDependsOn) + $(GetArtifactInfoDependsOn);GetNativeArtifactsInfo BuildNativeAssets;$(CompileDependsOn) $(PackageDependsOn);PackageNativeProjects $(TestDependsOn);RunNativeTest @@ -61,33 +62,35 @@ Condition="'$(VisualStudioMSBuildx86Path)' != ''" /> - - - NuGetPackage - Microsoft.AspNetCore.AspNetCoreModule - $(PackageVersion) - $(RepositoryRoot) - - + + + + NuGetPackage + Microsoft.AspNetCore.AspNetCoreModule + $(PackageVersion) + $(RepositoryRoot) + + - - NuGetPackage - Microsoft.AspNetCore.AspNetCoreModuleV2 - $(PackageVersion) - $(RepositoryRoot) - - + + NuGetPackage + Microsoft.AspNetCore.AspNetCoreModuleV2 + $(PackageVersion) + $(RepositoryRoot) + + - - ZipArchive - $(RepositoryRoot) - shipoob - + + ZipArchive + $(RepositoryRoot) + shipoob + - + - - + + + - - - - + diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec deleted file mode 100644 index 8e6ff9c302..0000000000 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec +++ /dev/null @@ -1,32 +0,0 @@ - - - - Microsoft.AspNetCore.Server.IIS - $version$ - $author$ - $licenseUrl$ - $copyright$ - $projectUrl$ - $iconUrl$ - true - $description$ - en-US - aspnetcore iis - $serviceable$ - - - - - - - - - - - - - - - - - From a2a1f00916dd667eeded9a93f1428e883471135e Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 7 Jun 2018 11:26:36 -0700 Subject: [PATCH 054/363] Disable tests until product issues are resolved (#898) --- test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs | 2 +- .../Inprocess/SynchronousReadAndWriteTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs index e6215f34bc..b3c3dd89df 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class LoggingTests : IISFunctionalTestBase { - [Theory] + [Theory(Skip = "See: https://github.com/aspnet/IISIntegration/issues/897")] [InlineData("CheckErrLogFile")] [InlineData("CheckLogFile")] public async Task CheckStdoutLogging(string path) diff --git a/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs index 469018acb2..122b67f005 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _fixture = fixture; } - [ConditionalFact] + [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/766")] public async Task ReadAndWriteSynchronously() { for (int i = 0; i < 100; i++) From a5b054ab0914d3d76f62bcad9e2e3fa046488976 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 7 Jun 2018 12:00:10 -0700 Subject: [PATCH 055/363] Add "building from source" section to readme.md (#900) --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index f9310e5d9e..c5e9f7ec57 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,17 @@ +ASP.NET Core IISIntegration +======== This repo hosts the ASP.NET Core middleware for IIS integration and the ASP.NET Core Module. This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. + +## Building from source +1. Install prerequisites + 1. Visual Studio 2017 + 1. Workload: `Desktop development with C++` + 1. Additional Component: `Windows 8.1 SDK and UCRT SDK` + 2. Additional Component: `Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64]` + 2. Workload: `ASP.NET and web development` +2. Clone with submodules + 1. `git clone --recurse-submodules IISIntegration` + 2. OR run `git submodule update --init --recursive` after initial clone +3. `build.cmd` From 4debd23b1b30989b2ff49823d801ce3d83327336 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 7 Jun 2018 19:37:45 +0000 Subject: [PATCH 056/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 72 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 78c6b98d98..fd173b6d98 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,48 +4,48 @@ 0.10.13 - 2.2.0-preview1-17067 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 0.6.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 + 2.2.0-preview1-17081 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 0.6.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 15.6.82 15.6.82 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 2.0.0 2.1.0 - 2.2.0-preview1-26531-03 - 2.2.0-preview1-34373 + 2.2.0-preview1-26606-01 + 2.2.0-preview1-34411 15.6.1 2.0.3 - 4.6.0-preview1-26531-03 - 4.6.0-preview1-26531-03 - 4.6.0-preview1-26531-03 - 4.6.0-preview1-26531-03 - 4.6.0-preview1-26531-03 - 4.6.0-preview1-26531-03 - 4.6.0-preview1-26531-03 + 4.6.0-preview1-26605-01 + 4.6.0-preview1-26605-01 + 4.6.0-preview1-26605-01 + 4.6.0-preview1-26605-01 + 4.6.0-preview1-26605-01 + 4.6.0-preview1-26605-01 + 4.6.0-preview1-26605-01 9.0.1 2.3.1 2.4.0-beta.1.build3945 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 2dedb9dd4c..9592880b2a 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17075 -commithash:d9f07c7f313a0af1d49f003f5424b4dbbdd3e09f +version:2.2.0-preview1-17081 +commithash:73f09c256e2a54270951562ecc0ef4a953926c36 From 05a6e42fe74edfb2d407ebd731ec78b6a6344b0e Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Mon, 11 Jun 2018 18:58:10 -0700 Subject: [PATCH 057/363] Upgrade IntegrationTesting version to prevent hang during "dotnet publish" (#902) --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index fd173b6d98..cf867dcfa4 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -14,7 +14,7 @@ 2.2.0-preview1-34411 2.2.0-preview1-34411 2.2.0-preview1-34411 - 0.6.0-preview1-34411 + 0.6.0-a-preview1-publish-wait-for-exit-17062 2.2.0-preview1-34411 2.2.0-preview1-34411 2.2.0-preview1-34411 From cd71cc050e96e5cd8d4ab3f950b1ffdb14dfccad Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 12 Jun 2018 08:27:11 -0700 Subject: [PATCH 058/363] Spleelin (#910) --- .../Core/IISHttpContext.FeatureCollection.cs | 2 +- src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs | 2 +- src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs index 60f651acdf..05c376de0e 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs @@ -182,7 +182,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core bool IHttpResponseFeature.HasStarted => HasResponseStarted; - bool IHttpUpgradeFeature.IsUpgradableRequest => _server.IsWebSocketAvailible(_pInProcessHandler); + bool IHttpUpgradeFeature.IsUpgradableRequest => _server.IsWebSocketAvailable(_pInProcessHandler); bool IFeatureCollection.IsReadOnly => false; diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs index 2668fb1485..1866967527 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs @@ -147,7 +147,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core ResetFeatureCollection(); - if (!_server.IsWebSocketAvailible(_pInProcessHandler)) + if (!_server.IsWebSocketAvailable(_pInProcessHandler)) { _currentIHttpUpgradeFeature = null; } diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs index 9838417df7..64c9eaf33a 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs @@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core public IFeatureCollection Features { get; } = new FeatureCollection(); // TODO: Remove pInProcessHandler argument - public bool IsWebSocketAvailible(IntPtr pInProcessHandler) + public bool IsWebSocketAvailable(IntPtr pInProcessHandler) { // Check if the Http upgrade feature is available in IIS. // To check this, we can look at the server variable WEBSOCKET_VERSION From f00d7b34c56af4dd6d4f5f794dfeac3f71571bb9 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 12 Jun 2018 08:51:56 -0700 Subject: [PATCH 059/363] Revert out of process no new throw functionality (#909) --- .../OutOfProcessRequestHandler.vcxproj | 8 +++--- .../outofprocess/forwardinghandler.cpp | 20 +++++++++++++++ .../outofprocess/outprocessapplication.cpp | 5 ++++ .../outofprocess/processmanager.cxx | 11 ++++++++ .../outofprocess/serverprocess.cxx | 25 +++++++++++++++++++ 5 files changed, 65 insertions(+), 4 deletions(-) diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 08cd979af8..3667f51481 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -109,7 +109,7 @@ Windows true - kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;nothrownew.obj;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) Source.def @@ -141,7 +141,7 @@ Windows true - kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;nothrownew.obj;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) Source.def @@ -176,7 +176,7 @@ true true Source.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;nothrownew.obj;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) @@ -210,7 +210,7 @@ true true Source.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;nothrownew.obj;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp index 1b3df88da0..149b06edef 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp @@ -208,6 +208,11 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() if (m_pDisconnect == NULL) { m_pDisconnect = new ASYNC_DISCONNECT_CONTEXT(); + if (m_pDisconnect == NULL) + { + hr = E_OUTOFMEMORY; + goto Failure; + } hr = pClientConnection->GetModuleContextContainer()-> SetConnectionModuleContext(m_pDisconnect, @@ -454,6 +459,11 @@ REQUEST_NOTIFICATION_STATUS // This should be the write completion of the 101 response. // m_pWebSocket = new WEBSOCKET_HANDLER(); + if (m_pWebSocket == NULL) + { + hr = E_OUTOFMEMORY; + goto Failure; + } hr = m_pWebSocket->ProcessRequest(this, m_pW3Context, m_hRequest, &fWebSocketUpgraded); if (fWebSocketUpgraded) @@ -708,6 +718,11 @@ HRESULT HRESULT hr = S_OK; sm_pAlloc = new ALLOC_CACHE_HANDLER; + if (sm_pAlloc == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } hr = sm_pAlloc->Initialize(sizeof(FORWARDING_HANDLER), 64); // nThreshold @@ -717,6 +732,11 @@ HRESULT } sm_pResponseHeaderHash = new RESPONSE_HEADER_HASH; + if (sm_pResponseHeaderHash == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } hr = sm_pResponseHeaderHash->Initialize(); if (FAILED(hr)) diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp index 3e6bb30299..356029efd3 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp @@ -34,6 +34,11 @@ OUT_OF_PROCESS_APPLICATION::Initialize( if (m_pProcessManager == NULL) { m_pProcessManager = new PROCESS_MANAGER; + if (m_pProcessManager == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } hr = m_pProcessManager->Initialize(); if (FAILED(hr)) diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx index 7241362d31..7c75d65a0d 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx @@ -123,6 +123,11 @@ PROCESS_MANAGER::GetProcess( { m_dwProcessesPerApplication = pConfig->QueryProcessesPerApplication(); m_ppServerProcessList = new SERVER_PROCESS*[m_dwProcessesPerApplication]; + if (m_ppServerProcessList == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } for (DWORD i = 0; i < m_dwProcessesPerApplication; ++i) { @@ -198,6 +203,12 @@ PROCESS_MANAGER::GetProcess( { pSelectedServerProcess = new SERVER_PROCESS(); + if (pSelectedServerProcess == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } + hr = pSelectedServerProcess->Initialize( this, //ProcessManager diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx index 4deea28d74..cedbd0ba12 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx @@ -187,6 +187,11 @@ SERVER_PROCESS::SetupListenPort( } pEntry = new ENVIRONMENT_VAR_ENTRY(); + if (pEntry == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } if (FAILED(hr = pEntry->Initialize(ASPNETCORE_PORT_ENV_STR, buffer)) || FAILED(hr = pEnvironmentVarTable->InsertRecord(pEntry)) || @@ -237,6 +242,11 @@ SERVER_PROCESS::SetupAppPath( } pEntry = new ENVIRONMENT_VAR_ENTRY(); + if (pEntry == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } if (FAILED(hr = pEntry->Initialize(ASPNETCORE_APP_PATH_ENV_STR, m_struAppVirtualPath.QueryStr())) || FAILED(hr = pEnvironmentVarTable->InsertRecord(pEntry))) @@ -304,6 +314,11 @@ SERVER_PROCESS::SetupAppToken( } pEntry = new ENVIRONMENT_VAR_ENTRY(); + if (pEntry == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } if (FAILED(strAppToken.CopyA(m_straGuid.QueryStr())) || FAILED(hr = pEntry->Initialize(ASPNETCORE_APP_TOKEN_ENV_STR, strAppToken.QueryStr())) || @@ -443,6 +458,11 @@ SERVER_PROCESS::SetupCommandLine( dwBufferSize = strRelativePath.QueryCCH() + 1; pszFullPath = new WCHAR[dwBufferSize]; + if (pszFullPath == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } if (_wfullpath(pszFullPath, strRelativePath.QueryStr(), @@ -674,6 +694,11 @@ SERVER_PROCESS::PostStartCheck( if (m_pForwarderConnection == NULL) { m_pForwarderConnection = new FORWARDER_CONNECTION(); + if (m_pForwarderConnection == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } hr = m_pForwarderConnection->Initialize(m_dwPort); if (FAILED(hr)) From 9d97ff38f8ecc1b4cbd95c806badc48fafe247ef Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 12 Jun 2018 14:04:21 -0700 Subject: [PATCH 060/363] Load ANCM out of process via global versioning (#895) --- build/testsite.props | 4 +- nuget/AspNetCoreV2.nuspec | 4 +- ...icrosoft.AspNetCore.AspNetCoreModule.props | 4 +- .../AspNetCore/Inc/aspnetcore_shim_config.h | 10 ++ .../AspNetCore/src/applicationinfo.cpp | 69 +++----- .../AspNetCore/src/aspnetcore_shim_config.cpp | 3 + .../CommonLib/CommonLib.vcxproj | 3 + .../CommonLib/GlobalVersionUtility.cpp | 131 ++++++++++++++ .../CommonLib/GlobalVersionUtility.h | 31 ++++ .../CommonLib/config_utility.h | 106 ++++++++++++ src/AspNetCoreModuleV2/CommonLib/stdafx.h | 6 +- src/AspNetCoreModuleV2/CommonLib/utility.cxx | 2 +- src/AspNetCoreModuleV2/CommonLib/utility.h | 3 + test/CommonLibTests/CommonLibTests.vcxproj | 12 +- test/CommonLibTests/ConfigUtilityTests.cpp | 106 ++++++++++++ .../CommonLibTests/FileOutputManagerTests.cpp | 2 - test/CommonLibTests/GlobalVersionTests.cpp | 153 +++++++++++++++++ test/CommonLibTests/fakeclasses.h | 57 ++++++- test/CommonLibTests/stdafx.h | 5 +- .../OutOfProcess/GlobalVersionTests.cs | 160 ++++++++++++++++++ .../Utilities/Helpers.cs | 30 +++- test/WebSites/OutOfProcessWebSite/Startup.cs | 19 +++ test/gtest/gtest.vcxproj | 9 +- version.props | 1 + 24 files changed, 862 insertions(+), 68 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/config_utility.h create mode 100644 test/CommonLibTests/ConfigUtilityTests.cpp create mode 100644 test/CommonLibTests/GlobalVersionTests.cpp create mode 100644 test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs diff --git a/build/testsite.props b/build/testsite.props index be0f2c72cc..42e3cb1d8e 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -29,8 +29,8 @@ - - + + diff --git a/nuget/AspNetCoreV2.nuspec b/nuget/AspNetCoreV2.nuspec index 6de70ba91a..5d26da23c8 100644 --- a/nuget/AspNetCoreV2.nuspec +++ b/nuget/AspNetCoreV2.nuspec @@ -21,8 +21,8 @@ - - + + diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props index 38b8eafcc4..1f33b20ed2 100644 --- a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props +++ b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props @@ -5,8 +5,8 @@ $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcore.dll $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_inprocess.dll $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_inprocess.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_outofprocess.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_outofprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h index 2d1e8e7944..36f2a18c51 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h @@ -4,6 +4,7 @@ #pragma once #include "precomp.hxx" +#include #define CS_ASPNETCORE_SECTION L"system.webServer/aspNetCore" #define CS_ASPNETCORE_PROCESS_EXE_PATH L"processPath" @@ -105,6 +106,14 @@ public: return m_hostingModel; } + STRU* + QueryHandlerVersion( + VOID + ) + { + return &m_struHandlerVersion; + } + private: ASPNETCORE_SHIM_CONFIG() : m_cRefs(1), @@ -120,5 +129,6 @@ private: STRU m_struConfigPath; APP_HOSTING_MODEL m_hostingModel; STRU m_struHostFxrLocation; + STRU m_struHandlerVersion; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 3f18c63507..38e4d8cb80 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -358,60 +358,47 @@ Finished: HRESULT APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation( - PCWSTR libraryName, - STRU* struFilename) + PCWSTR pstrHandlerDllName, + STRU* struFilename +) { HRESULT hr = S_OK; - DWORD dwSize = MAX_PATH; - BOOL fDone = FALSE; - DWORD dwPosition = 0; - // Though we could call LoadLibrary(L"aspnetcorerh.dll") relying the OS to solve - // the path (the targeted dll is the same folder of w3wp.exe/iisexpress) - // let's still load with full path to avoid security issue - if (FAILED(hr = struFilename->Resize(dwSize + 20))) + try { - goto Finished; - } + std::wstring modulePath = GlobalVersionUtility::GetModuleName(g_hModule); - while (!fDone) - { - DWORD dwReturnedSize = GetModuleFileNameW(g_hModule, struFilename->QueryStr(), dwSize); - if (dwReturnedSize == 0) + modulePath = GlobalVersionUtility::RemoveFileNameFromFolderPath(modulePath); + + std::wstring retval = GlobalVersionUtility::GetGlobalRequestHandlerPath(modulePath.c_str(), + m_pConfiguration->QueryHandlerVersion()->QueryStr(), + pstrHandlerDllName + ); + + if (FAILED(hr = struFilename->Copy(retval.c_str()))) { - hr = HRESULT_FROM_WIN32(GetLastError()); - fDone = TRUE; - goto Finished; - } - else if ((dwReturnedSize == dwSize) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) - { - dwSize *= 2; // smaller buffer. increase the buffer and retry - if (FAILED(hr = struFilename->Resize(dwSize + 40))) // + 40 for aspnetcorerh.dll - { - goto Finished; - } - } - else - { - fDone = TRUE; + return hr; } } - - if (FAILED(hr = struFilename->SyncWithBuffer())) + catch (std::exception& e) { - goto Finished; + STRU struEvent; + if (SUCCEEDED(struEvent.Copy(ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG)) + && SUCCEEDED(struEvent.AppendA(e.what()))) + { + UTILITY::LogEvent(g_hEventLog, + EVENTLOG_INFORMATION_TYPE, + ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, + struEvent.QueryStr()); + } + + hr = E_FAIL; } - dwPosition = struFilename->LastIndexOf(L'\\', 0); - struFilename->QueryStr()[dwPosition] = L'\0'; - - if (FAILED(hr = struFilename->SyncWithBuffer()) || - FAILED(hr = struFilename->Append(L"\\")) || - FAILED(hr = struFilename->Append(libraryName))) + catch (...) { - goto Finished; + hr = E_FAIL; } -Finished: return hr; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp index 1a59586160..08fd9821f3 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp @@ -3,6 +3,7 @@ #include "aspnetcore_shim_config.h" +#include "config_utility.h" #include "hostfxr_utility.h" #include "debugutil.h" #include "ahutil.h" @@ -192,6 +193,8 @@ ASPNETCORE_SHIM_CONFIG::Populate( goto Finished; } + hr = ConfigUtility::FindHandlerVersion(pAspNetCoreElement, &m_struHandlerVersion); + Finished: if (pAspNetCoreElement != NULL) diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 42079abe33..353c0b8b9f 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -181,6 +181,8 @@ + + @@ -205,6 +207,7 @@ + diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp new file mode 100644 index 0000000000..09a927104a --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp @@ -0,0 +1,131 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "stdafx.h" +#include + +namespace fs = std::experimental::filesystem; + +// throws runtime error if no request handler versions are installed. +// Throw invalid_argument if any argument is null +std::wstring +GlobalVersionUtility::GetGlobalRequestHandlerPath(PCWSTR pwzAspNetCoreFolderPath, PCWSTR pwzHandlerVersion, PCWSTR pwzHandlerName) +{ + if (pwzAspNetCoreFolderPath == NULL) + { + throw new std::invalid_argument("pwzAspNetCoreFolderPath is NULL"); + } + + if (pwzHandlerVersion == NULL) + { + throw new std::invalid_argument("pwzHandlerVersion is NULL"); + } + + if (pwzHandlerName == NULL) + { + throw new std::invalid_argument("pwzHandlerName is NULL"); + } + + std::wstring folderVersion(pwzHandlerVersion); + fs::path aspNetCoreFolderPath(pwzAspNetCoreFolderPath); + + if (folderVersion.empty()) + { + folderVersion = FindHighestGlobalVersion(pwzAspNetCoreFolderPath); + } + + aspNetCoreFolderPath = aspNetCoreFolderPath + .append(folderVersion) + .append(pwzHandlerName); + return aspNetCoreFolderPath; +} + +// Throw filesystem_error if directory_iterator can't iterate over the directory +// Throw invalid_argument if any argument is null +std::vector +GlobalVersionUtility::GetRequestHandlerVersions(PCWSTR pwzAspNetCoreFolderPath) +{ + if (pwzAspNetCoreFolderPath == NULL) + { + throw new std::invalid_argument("pwzAspNetCoreFolderPath is NULL"); + } + + std::vector versionsInDirectory; + for (auto& p : fs::directory_iterator(pwzAspNetCoreFolderPath)) + { + if (!fs::is_directory(p)) + { + continue; + } + + fx_ver_t requested_ver(-1, -1, -1); + if (fx_ver_t::parse(p.path().filename(), &requested_ver, false)) + { + versionsInDirectory.push_back(requested_ver); + } + } + return versionsInDirectory; +} + +// throws runtime error if no request handler versions are installed. +// Throw invalid_argument if any argument is null +std::wstring +GlobalVersionUtility::FindHighestGlobalVersion(PCWSTR pwzAspNetCoreFolderPath) +{ + if (pwzAspNetCoreFolderPath == NULL) + { + throw new std::invalid_argument("pwzAspNetCoreFolderPath is NULL"); + } + + std::vector versionsInDirectory = GetRequestHandlerVersions(pwzAspNetCoreFolderPath); + if (versionsInDirectory.empty()) + { + throw new std::runtime_error("Cannot find request handler next to aspnetcorev2.dll. Verify a version of the request handler is installed in a version folder."); + } + std::sort(versionsInDirectory.begin(), versionsInDirectory.end()); + + return versionsInDirectory.back().as_str(); +} + +// Throws std::out_of_range if there is an index out of range +// Throw invalid_argument if any argument is null +std::wstring +GlobalVersionUtility::RemoveFileNameFromFolderPath(std::wstring fileName) +{ + fs::path path(fileName); + return path.parent_path(); +} + +std::wstring +GlobalVersionUtility::GetModuleName(HMODULE hModuleName) +{ + DWORD dwSize = MAX_PATH; + BOOL fDone = FALSE; + + // Instead of creating a temporary buffer, use the std::wstring directly as the receive buffer. + std::wstring retVal; + retVal.resize(dwSize); + + while (!fDone) + { + DWORD dwReturnedSize = GetModuleFileNameW(hModuleName, &retVal[0], dwSize); + if (dwReturnedSize == 0) + { + throw new std::runtime_error("GetModuleFileNameW returned 0."); + } + else if ((dwReturnedSize == dwSize) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + { + dwSize *= 2; + retVal.resize(dwSize); // smaller buffer. increase the buffer and retry + } + else + { + // GetModuleFilename will not account for the null terminator + // std::wstring auto appends one, so we don't need to subtract 1 when resizing. + retVal.resize(dwReturnedSize); + fDone = TRUE; + } + } + + return retVal; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h new file mode 100644 index 0000000000..fd1a5ee252 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h @@ -0,0 +1,31 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#pragma once +#include + +class GlobalVersionUtility +{ +public: + + static + std::wstring + GetGlobalRequestHandlerPath(PCWSTR pwzAspNetCoreFolderPath, PCWSTR pwzHandlerVersion, PCWSTR pwzHandlerName); + + static + std::wstring + FindHighestGlobalVersion(PCWSTR pwzAspNetCoreFolderPath); + + static + std::wstring + RemoveFileNameFromFolderPath(std::wstring fileName); + + static + std::vector + GetRequestHandlerVersions(PCWSTR pwzAspNetCoreFolderPath); + + static + std::wstring + GetModuleName(HMODULE hModuleName); +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/AspNetCoreModuleV2/CommonLib/config_utility.h new file mode 100644 index 0000000000..0a53ff63e3 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/config_utility.h @@ -0,0 +1,106 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#pragma once + +#include "stdafx.h" + +class ConfigUtility +{ + #define CS_ASPNETCORE_HANDLER_SETTINGS L"handlerSettings" + #define CS_ASPNETCORE_HANDLER_VERSION L"handlerVersion" + #define CS_ASPNETCORE_HANDLER_SETTINGS_NAME L"name" + #define CS_ASPNETCORE_HANDLER_SETTINGS_VALUE L"value" + +public: + static + HRESULT + FindHandlerVersion(IAppHostElement* pElement, STRU* strHandlerVersionValue) + { + HRESULT hr = S_OK; + IAppHostElement *pHandlerSettings = NULL; + IAppHostElementCollection *pHandlerSettingsCollection = NULL; + ENUM_INDEX index; + IAppHostElement *pHandlerVar = NULL; + STRU strHandlerName; + STRU strHandlerValue; + + hr = GetElementChildByName(pElement, + CS_ASPNETCORE_HANDLER_SETTINGS, + &pHandlerSettings); + if (FAILED(hr)) + { + goto Finished; + } + + hr = pHandlerSettings->get_Collection(&pHandlerSettingsCollection); + if (FAILED(hr)) + { + goto Finished; + } + + for (hr = FindFirstElement(pHandlerSettingsCollection, &index, &pHandlerVar); + SUCCEEDED(hr); + hr = FindNextElement(pHandlerSettingsCollection, &index, &pHandlerVar)) + { + if (hr == S_FALSE) + { + hr = S_OK; + break; + } + + hr = GetElementStringProperty(pHandlerVar, + CS_ASPNETCORE_HANDLER_SETTINGS_NAME, + &strHandlerName); + + if (FAILED(hr)) + { + goto Finished; + } + + hr = GetElementStringProperty(pHandlerVar, + CS_ASPNETCORE_HANDLER_SETTINGS_VALUE, + &strHandlerValue); + + if (FAILED(hr)) + { + goto Finished; + + } + + if (strHandlerName.Equals(CS_ASPNETCORE_HANDLER_VERSION)) + { + hr = strHandlerVersionValue->Copy(strHandlerValue); + goto Finished; + } + + strHandlerName.Reset(); + strHandlerValue.Reset(); + + pHandlerVar->Release(); + pHandlerVar = NULL; + } + Finished: + + if (pHandlerVar != NULL) + { + pHandlerVar->Release(); + pHandlerVar = NULL; + } + + if (pHandlerSettingsCollection != NULL) + { + pHandlerSettingsCollection->Release(); + pHandlerSettingsCollection = NULL; + } + + if (pHandlerSettings != NULL) + { + pHandlerSettings->Release(); + pHandlerSettings = NULL; + } + + return hr; + } +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index 969590ea6e..b75217ae4d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -14,6 +14,8 @@ #include #include #include +#include + #include "Shlwapi.h" #include #include "hashtable.h" @@ -31,10 +33,11 @@ #include "application.h" #include "SRWLockWrapper.h" #include "environmentvariablehash.h" +#include "fx_ver.h" #include "utility.h" +#include "GlobalVersionUtility.h" #include "resources.h" #include "aspnetcore_msg.h" -#include "fx_ver.h" #include "hostfxr_utility.h" #include "hostfxroptions.h" #include "IOutputManager.h" @@ -42,3 +45,4 @@ #include "PipeOutputManager.h" #include "NullOutputManager.h" #include "LoggingHelpers.h" + diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.cxx b/src/AspNetCoreModuleV2/CommonLib/utility.cxx index a7bb7b1d63..965b13eb58 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.cxx +++ b/src/AspNetCoreModuleV2/CommonLib/utility.cxx @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include"stdafx.h" +#include "stdafx.h" // static HRESULT diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.h b/src/AspNetCoreModuleV2/CommonLib/utility.h index 58a5824044..f1f2c38afd 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/utility.h @@ -3,6 +3,8 @@ #pragma once +#include "stdafx.h" + class UTILITY { public: @@ -121,3 +123,4 @@ private: UTILITY() {} ~UTILITY() {} }; + diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 33756b7bd0..2a21ef619e 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -50,7 +50,9 @@ + + @@ -93,7 +95,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -118,7 +120,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -141,7 +143,7 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -166,9 +168,9 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - stdcpp14 + stdcpp17 true diff --git a/test/CommonLibTests/ConfigUtilityTests.cpp b/test/CommonLibTests/ConfigUtilityTests.cpp new file mode 100644 index 0000000000..fbed259117 --- /dev/null +++ b/test/CommonLibTests/ConfigUtilityTests.cpp @@ -0,0 +1,106 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "gmock/gmock.h" +using ::testing::_; +using ::testing::NiceMock; + +namespace ConfigUtilityTests +{ + TEST(ConfigUtilityTest, HandlerVersionSet) + { + IAppHostElement* retElement = NULL; + + STRU handlerVersion; + + // NiceMock removes warnings about "uninteresting calls", + auto element = std::make_unique>(); + auto innerElement = std::make_unique>(); + auto collection = std::make_unique>(); + auto nameElement = std::make_unique>(); + auto mockProperty = std::make_unique>(); + + ON_CALL(*element, GetElementByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); + ON_CALL(*innerElement, get_Collection(_)) + .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); + ON_CALL(*collection, get_Count(_)) + .WillByDefault(DoAll(testing::SetArgPointee<0>(1), testing::Return(S_OK))); + ON_CALL(*collection, get_Item(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); + ON_CALL(*nameElement, GetPropertyByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); + EXPECT_CALL(*mockProperty, get_StringValue(_)) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"handlerVersion")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))); + + HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); + + EXPECT_STREQ(handlerVersion.QueryStr(), L"value"); + } + + TEST(ConfigUtilityTest, NoHandlerVersion) + { + IAppHostElement* retElement = NULL; + + STRU handlerVersion; + + // NiceMock removes warnings about "uninteresting calls", + auto element = std::make_unique>(); + auto innerElement = std::make_unique>(); + auto collection = std::make_unique>(); + auto nameElement = std::make_unique>(); + auto mockProperty = std::make_unique>(); + + ON_CALL(*element, GetElementByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); + ON_CALL(*innerElement, get_Collection(_)) + .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); + ON_CALL(*collection, get_Count(_)) + .WillByDefault(DoAll(testing::SetArgPointee<0>(1), testing::Return(S_OK))); + ON_CALL(*collection, get_Item(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); + ON_CALL(*nameElement, GetPropertyByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); + EXPECT_CALL(*mockProperty, get_StringValue(_)) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"randomvalue")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))); + + HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); + + EXPECT_STREQ(handlerVersion.QueryStr(), L""); + } + + TEST(ConfigUtilityTest, MultipleElements) + { + IAppHostElement* retElement = NULL; + STRU handlerVersion; + + auto element = std::make_unique>(); + auto innerElement = std::make_unique>(); + auto collection = std::make_unique>(); + auto nameElement = std::make_unique>(); + auto mockProperty = std::make_unique>(); + + ON_CALL(*element, GetElementByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); + ON_CALL(*innerElement, get_Collection(_)) + .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); + ON_CALL(*collection, get_Count(_)) + .WillByDefault(DoAll(testing::SetArgPointee<0>(2), testing::Return(S_OK))); + ON_CALL(*collection, get_Item(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); + ON_CALL(*nameElement, GetPropertyByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); + EXPECT_CALL(*mockProperty, get_StringValue(_)) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"key")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"handlerVersion")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value2")), testing::Return(S_OK))); + + HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); + + EXPECT_STREQ(handlerVersion.QueryStr(), L"value2"); + } +} diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/test/CommonLibTests/FileOutputManagerTests.cpp index e3d261097a..ebfb790ed5 100644 --- a/test/CommonLibTests/FileOutputManagerTests.cpp +++ b/test/CommonLibTests/FileOutputManagerTests.cpp @@ -40,8 +40,6 @@ namespace FileOutManagerStartupTests wprintf(expected, out); } - // std::filesystem is available on c++17, however gtest fails to build when using it - // c++14 has filesystem as experimental. for (auto & p : std::experimental::filesystem::directory_iterator(tempDirectory)) { std::wstring filename(p.path().filename()); diff --git a/test/CommonLibTests/GlobalVersionTests.cpp b/test/CommonLibTests/GlobalVersionTests.cpp new file mode 100644 index 0000000000..00ec23f479 --- /dev/null +++ b/test/CommonLibTests/GlobalVersionTests.cpp @@ -0,0 +1,153 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "gtest/internal/gtest-port.h" + +namespace GlobalVersionTests +{ + using ::testing::Test; + namespace fs = std::experimental::filesystem; + + class GlobalVersionTest : public Test + { + protected: + void + RemoveFileNamePath(PCWSTR dllPath, PCWSTR expected) + { + std::wstring res = GlobalVersionUtility::RemoveFileNameFromFolderPath(dllPath); + EXPECT_STREQ(res.c_str(), expected); + } + }; + + TEST_F(GlobalVersionTest, RemovesPathCorrectly) + { + RemoveFileNamePath(L"test\\log.txt", L"test"); + RemoveFileNamePath(L"test\\log", L"test"); + RemoveFileNamePath(L"C:\\Program Files\\IIS\\aspnetcorev2.dll", L"C:\\Program Files\\IIS"); + RemoveFileNamePath(L"test\\log.txt", L"test"); + } + + TEST(GetRequestHandlerVersions, GetFolders) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + + auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.c_str()); + EXPECT_EQ(res.size(), 1); + EXPECT_EQ(res.at(0), fx_ver_t(2, 0, 0, std::wstring())); + } + + TEST(GetRequestHandlerVersions, GetFolderPreview) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0-preview")); + + auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.c_str()); + EXPECT_EQ(res.size(), 1); + EXPECT_EQ(res.at(0), fx_ver_t(2, 0, 0, std::wstring(L"-preview"))); + } + + TEST(GetRequestHandlerVersions, GetFolderManyVersions) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\1.9.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); + + auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.c_str()); + EXPECT_EQ(res.size(), 3); + EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(1, 9, 0, std::wstring())) != std::end(res)); + EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(2, 0, 0, std::wstring())) != std::end(res)); + EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(2, 1, 0, std::wstring())) != std::end(res)); + } + + TEST(FindHighestGlobalVersion, HighestVersionWithSingleFolder) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); + + EXPECT_STREQ(res.c_str(), L"2.0.0"); + } + + TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersions) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); + + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); + + EXPECT_STREQ(res.c_str(), L"2.1.0"); + } + + TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersionsPreview) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.2.0-preview")); + + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); + + EXPECT_STREQ(res.c_str(), L"2.2.0-preview"); + } + + TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersionNoPreview) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); + + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); + + EXPECT_STREQ(res.c_str(), L"2.1.0"); + } + + TEST(GetGlobalRequestHandlerPath, FindHighestVersionNoHandlerName) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"", L"aspnetcorev2_outofprocess.dll"); + + EXPECT_STREQ(result.c_str(), (tempPath + L"2.0.0\\aspnetcorev2_outofprocess.dll").c_str()); + } + + TEST(GetGlobalRequestHandlerPath, FindHighestVersionPreviewWins) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); + + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"", L"aspnetcorev2_outofprocess.dll"); + + EXPECT_STREQ(result.c_str(), (tempPath + L"2.1.0-preview\\aspnetcorev2_outofprocess.dll").c_str()); + } + + TEST(GetGlobalRequestHandlerPath, FindHighestVersionSpecificVersion) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); + + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"2.0.0", L"aspnetcorev2_outofprocess.dll"); + + EXPECT_STREQ(result.c_str(), (tempPath + L"2.0.0\\aspnetcorev2_outofprocess.dll").c_str()); + } + + TEST(GetGlobalRequestHandlerPath, FindHighestVersionSpecificPreview) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.2.0")); + + + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"2.1.0-preview", L"aspnetcorev2_outofprocess.dll"); + + EXPECT_STREQ(result.c_str(), (tempPath + L"2.1.0-preview\\aspnetcorev2_outofprocess.dll").c_str()); + } +} diff --git a/test/CommonLibTests/fakeclasses.h b/test/CommonLibTests/fakeclasses.h index 5f79138879..14c6f8dfee 100644 --- a/test/CommonLibTests/fakeclasses.h +++ b/test/CommonLibTests/fakeclasses.h @@ -1,7 +1,62 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#include "stdafx.h" +#pragma once + +#include "gtest/gtest.h" +#include "gmock/gmock.h" + +class MockProperty : public IAppHostProperty +{ +public: + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, QueryInterface, HRESULT(REFIID riid, void ** ppvObject)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, AddRef, ULONG()); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Release, ULONG()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Name, HRESULT(BSTR* pbstrValue)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Value, HRESULT(VARIANT * pVariant)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, put_Value, HRESULT(VARIANT value)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Clear, HRESULT()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_StringValue, HRESULT(BSTR* pbstrValue)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Exception, HRESULT(IAppHostPropertyException ** ppException)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT * pValue)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, SetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT value)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Schema, HRESULT(IAppHostPropertySchema ** ppSchema)); +}; + +class MockCollection : public IAppHostElementCollection +{ +public: + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, QueryInterface, HRESULT(REFIID riid, void ** ppvObject)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, AddRef, ULONG()); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Release, ULONG()); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Clear, HRESULT()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Schema, HRESULT(IAppHostCollectionSchema** pSchema)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Count, HRESULT(DWORD * dwordElem)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, get_Item, HRESULT(VARIANT cIndex, IAppHostElement ** ppElement)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, AddElement, HRESULT(IAppHostElement * pElement, INT cPosition)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, DeleteElement, HRESULT(VARIANT cIndex)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, CreateNewElement, HRESULT(BSTR bstrElementName, IAppHostElement** ppElement)); +}; + +class MockElement : public IAppHostElement +{ +public: + + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, QueryInterface, HRESULT(REFIID riid, void ** ppvObject)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, AddRef, ULONG()); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Release, ULONG()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Name, HRESULT(BSTR * pbstrName)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Collection, HRESULT(IAppHostElementCollection ** ppCollection)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Properties, HRESULT(IAppHostPropertyCollection ** ppProperties)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_ChildElements, HRESULT(IAppHostChildElementCollection ** ppElements)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT * pValue)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, SetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT value)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Schema, HRESULT(IAppHostElementSchema** pSchema)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetElementByName, HRESULT(BSTR bstrSubName, IAppHostElement ** ppElement)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetPropertyByName, HRESULT(BSTR bstrSubName, IAppHostProperty ** ppProperty)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Clear, HRESULT()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Methods, HRESULT(IAppHostMethodCollection ** ppMethods)); +}; class MockHttpServer : public IHttpServer { diff --git a/test/CommonLibTests/stdafx.h b/test/CommonLibTests/stdafx.h index ed238e1b3d..47095a9fee 100644 --- a/test/CommonLibTests/stdafx.h +++ b/test/CommonLibTests/stdafx.h @@ -43,6 +43,7 @@ #include "requesthandler_config.h" #include "hostfxr_utility.h" +#include "config_utility.h" #include "environmentvariablehash.h" #include "iapplication.h" #include "utility.h" @@ -51,9 +52,11 @@ #include "resources.h" #include "aspnetcore_msg.h" #include "Helpers.h" +#include "GlobalVersionUtility.h" #undef assert // Macro redefinition in IISLib. -#include "gtest\gtest.h" +#include "gtest/gtest.h" +#include "fakeclasses.h" // Externals defined in inprocess BOOL g_fProcessDetach; diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs new file mode 100644 index 0000000000..6e50228564 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -0,0 +1,160 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Xml.Linq; +using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class GlobalVersionTests : IISFunctionalTestBase + { + private const string _aspNetCoreDll = "aspnetcorev2_outofprocess.dll"; + private const string _handlerVersion20 = "2.0.0"; + private const string _helloWorldRequest = "HelloWorld"; + private const string _helloWorldResponse = "Hello World"; + private const string _outOfProcessVersionVariable = "/p:AspNetCoreModuleOutOfProcessVersion="; + + [Fact] + public async Task GlobalVersion_DefaultWorks() + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + deploymentParameters.PublishApplicationBeforeDeployment = false; + + deploymentParameters.ServerConfigTemplateContent = GetServerConfig( + element => + { + var handlerVersionElement = new XElement("handlerSetting"); + handlerVersionElement.SetAttributeValue("name", "handlerVersion"); + handlerVersionElement.SetAttributeValue("value", _handlerVersion20); + + element.Descendants("aspNetCore").Single() + .Add(new XElement("handlerSettings", handlerVersionElement)); + }); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(_helloWorldResponse, responseText); + } + + [Theory] // Tests need to publish to change folder locations + [InlineData("2.1.0")] + [InlineData("2.1.0-preview")] + public async Task GlobalVersion_NewVersionNumber_Fails(string version) + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + + var deploymentResult = await DeployAsync(deploymentParameters); + + Helpers.ModifyHandlerSectionInWebConfig(deploymentResult, version); + + var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); + Assert.False(response.IsSuccessStatusCode); + } + + [Theory] // Tests need to publish to change folder locations + [InlineData("2.1.0")] + [InlineData("2.1.0-preview")] + public async Task GlobalVersion_NewVersionNumber(string version) + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + deploymentParameters.AdditionalPublishParameters = $"{_outOfProcessVersionVariable}{version}"; + + var deploymentResult = await DeployAsync(deploymentParameters); + + Helpers.ModifyHandlerSectionInWebConfig(deploymentResult, version); + + var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(_helloWorldResponse, responseText); + } + + [Theory] // Tests need to publish to change folder locations + [InlineData("2.1.0")] + [InlineData("2.1.0-preview")] + public async Task GlobalVersion_MultipleRequestHandlers_PicksHighestOne(string version) + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); + + var newANCMPath = GetANCMRequestHandlerPath(deploymentResult, version); + + var di = Directory.CreateDirectory(Path.GetDirectoryName(newANCMPath)); + + File.Copy(originalANCMPath, newANCMPath, true); + + deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); + var response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(_helloWorldResponse, responseText); + } + + [Theory] + [InlineData("2.1.0")] + [InlineData("2.1.0-preview")] + public async Task GlobalVersion_MultipleRequestHandlers_UpgradeWorks(string version) + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + var deploymentResult = await DeployAsync(deploymentParameters); + + var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); + + deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", originalANCMPath); + var response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(_helloWorldResponse, responseText); + + Dispose(); + + deploymentResult = await DeployAsync(deploymentParameters); + + originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); + + var newANCMPath = GetANCMRequestHandlerPath(deploymentResult, version); + + var di = Directory.CreateDirectory(Path.GetDirectoryName(newANCMPath)); + + File.Copy(originalANCMPath, newANCMPath, true); + + deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); + response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); + responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(_helloWorldResponse, responseText); + } + + private DeploymentParameters GetGlobalVersionBaseDeploymentParameters() + { + return new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + { + TargetFramework = Tfm.NetCoreApp22, + ApplicationType = ApplicationType.Portable, + AncmVersion = AncmVersion.AspNetCoreModuleV2, + HostingModel = HostingModel.OutOfProcess, + PublishApplicationBeforeDeployment = true, + AdditionalPublishParameters = $"{_outOfProcessVersionVariable}{_handlerVersion20}" + }; + } + + private string GetANCMRequestHandlerPath(IISDeploymentResult deploymentResult, string version) + { + return Path.Combine(deploymentResult.DeploymentResult.ContentRoot, + deploymentResult.DeploymentResult.DeploymentParameters.RuntimeArchitecture.ToString(), + version, + _aspNetCoreDll); + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs index 4d3e0e65dc..d66fecf3cb 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs @@ -21,16 +21,31 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string GetOutOfProcessTestSitesPath() => GetTestWebSitePath("OutOfProcessWebSite"); public static void ModifyAspNetCoreSectionInWebConfig(IISDeploymentResult deploymentResult, string key, string value) - => ModifySectionInWebConfig(deploymentResult, key, value, section: "aspNetCore", 0); + => ModifyAttributeInWebConfig(deploymentResult, key, value, section: "aspNetCore"); - public static void ModifySectionInWebConfig(IISDeploymentResult deploymentResult, string key, string value, string section, int index) + public static void ModifyAttributeInWebConfig(IISDeploymentResult deploymentResult, string key, string value, string section) { - // modify the web.config after publish - var root = deploymentResult.DeploymentResult.ContentRoot; - var webConfigFile = $"{root}/web.config"; + var webConfigFile = GetWebConfigFile(deploymentResult); var config = XDocument.Load(webConfigFile); - var element = config.Descendants(section).ToList()[index]; + + var element = config.Descendants(section).Single(); element.SetAttributeValue(key, value); + + config.Save(webConfigFile); + } + + public static void ModifyHandlerSectionInWebConfig(IISDeploymentResult deploymentResult, string handlerVersionValue) + { + var webConfigFile = GetWebConfigFile(deploymentResult); + var config = XDocument.Load(webConfigFile); + + var handlerVersionElement = new XElement("handlerSetting"); + handlerVersionElement.SetAttributeValue("name", "handlerVersion"); + handlerVersionElement.SetAttributeValue("value", handlerVersionValue); + + config.Descendants("aspNetCore").Single() + .Add(new XElement("handlerSettings", handlerVersionElement)); + config.Save(webConfigFile); } @@ -46,5 +61,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests PublishApplicationBeforeDeployment = site == "InProcessWebSite", }; } + + private static string GetWebConfigFile(IISDeploymentResult deploymentResult) + => Path.Combine(deploymentResult.DeploymentResult.ContentRoot, "web.config"); } } diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/test/WebSites/OutOfProcessWebSite/Startup.cs index 4b26fa7ba2..fc7021c992 100644 --- a/test/WebSites/OutOfProcessWebSite/Startup.cs +++ b/test/WebSites/OutOfProcessWebSite/Startup.cs @@ -2,7 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Security.Principal; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; @@ -84,5 +86,22 @@ namespace TestSites public Task UpgradeFeatureDetection(HttpContext context) => context.Response.WriteAsync(context.Features.Get() != null? "Enabled": "Disabled"); + + public Task CheckRequestHandlerVersion(HttpContext context) + { + // We need to check if the aspnetcorev2_outofprocess dll is loaded by iisexpress.exe + // As they aren't in the same process, we will try to delete the file and expect a file + // in use error + try + { + File.Delete(context.Request.Headers["ANCMRHPath"]); + } + catch(UnauthorizedAccessException) + { + return context.Response.WriteAsync("Hello World"); + } + + return context.Response.WriteAsync(context.Request.Headers["ANCMRHPath"]); + } } } diff --git a/test/gtest/gtest.vcxproj b/test/gtest/gtest.vcxproj index 660be83f21..9f745f3a84 100644 --- a/test/gtest/gtest.vcxproj +++ b/test/gtest/gtest.vcxproj @@ -19,6 +19,7 @@ + @@ -105,7 +106,7 @@ true WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) + googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -121,7 +122,7 @@ true _DEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) + googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -139,7 +140,7 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) + googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -159,7 +160,7 @@ true NDEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) + googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) MultiThreaded diff --git a/version.props b/version.props index c836c8d68c..ddf502f2b3 100644 --- a/version.props +++ b/version.props @@ -11,5 +11,6 @@ 8 1 0 + 2.0.0 From ec7f23308ed9157b390aca719a57ba25ef88184d Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 12 Jun 2018 15:26:25 -0700 Subject: [PATCH 061/363] Revert "Load ANCM out of process via global versioning (#895)" This reverts commit 9d97ff38f8ecc1b4cbd95c806badc48fafe247ef. --- build/testsite.props | 4 +- nuget/AspNetCoreV2.nuspec | 4 +- ...icrosoft.AspNetCore.AspNetCoreModule.props | 4 +- .../AspNetCore/Inc/aspnetcore_shim_config.h | 10 -- .../AspNetCore/src/applicationinfo.cpp | 69 +++++--- .../AspNetCore/src/aspnetcore_shim_config.cpp | 3 - .../CommonLib/CommonLib.vcxproj | 3 - .../CommonLib/GlobalVersionUtility.cpp | 131 -------------- .../CommonLib/GlobalVersionUtility.h | 31 ---- .../CommonLib/config_utility.h | 106 ------------ src/AspNetCoreModuleV2/CommonLib/stdafx.h | 6 +- src/AspNetCoreModuleV2/CommonLib/utility.cxx | 2 +- src/AspNetCoreModuleV2/CommonLib/utility.h | 3 - test/CommonLibTests/CommonLibTests.vcxproj | 12 +- test/CommonLibTests/ConfigUtilityTests.cpp | 106 ------------ .../CommonLibTests/FileOutputManagerTests.cpp | 2 + test/CommonLibTests/GlobalVersionTests.cpp | 153 ----------------- test/CommonLibTests/fakeclasses.h | 57 +------ test/CommonLibTests/stdafx.h | 5 +- .../OutOfProcess/GlobalVersionTests.cs | 160 ------------------ .../Utilities/Helpers.cs | 30 +--- test/WebSites/OutOfProcessWebSite/Startup.cs | 19 --- test/gtest/gtest.vcxproj | 9 +- version.props | 1 - 24 files changed, 68 insertions(+), 862 deletions(-) delete mode 100644 src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp delete mode 100644 src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h delete mode 100644 src/AspNetCoreModuleV2/CommonLib/config_utility.h delete mode 100644 test/CommonLibTests/ConfigUtilityTests.cpp delete mode 100644 test/CommonLibTests/GlobalVersionTests.cpp delete mode 100644 test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs diff --git a/build/testsite.props b/build/testsite.props index 42e3cb1d8e..be0f2c72cc 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -29,8 +29,8 @@ - - + + diff --git a/nuget/AspNetCoreV2.nuspec b/nuget/AspNetCoreV2.nuspec index 5d26da23c8..6de70ba91a 100644 --- a/nuget/AspNetCoreV2.nuspec +++ b/nuget/AspNetCoreV2.nuspec @@ -21,8 +21,8 @@ - - + + diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props index 1f33b20ed2..38b8eafcc4 100644 --- a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props +++ b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props @@ -5,8 +5,8 @@ $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcore.dll $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_inprocess.dll $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_inprocess.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_outofprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_outofprocess.dll diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h index 36f2a18c51..2d1e8e7944 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h @@ -4,7 +4,6 @@ #pragma once #include "precomp.hxx" -#include #define CS_ASPNETCORE_SECTION L"system.webServer/aspNetCore" #define CS_ASPNETCORE_PROCESS_EXE_PATH L"processPath" @@ -106,14 +105,6 @@ public: return m_hostingModel; } - STRU* - QueryHandlerVersion( - VOID - ) - { - return &m_struHandlerVersion; - } - private: ASPNETCORE_SHIM_CONFIG() : m_cRefs(1), @@ -129,6 +120,5 @@ private: STRU m_struConfigPath; APP_HOSTING_MODEL m_hostingModel; STRU m_struHostFxrLocation; - STRU m_struHandlerVersion; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 38e4d8cb80..3f18c63507 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -358,47 +358,60 @@ Finished: HRESULT APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation( - PCWSTR pstrHandlerDllName, - STRU* struFilename -) + PCWSTR libraryName, + STRU* struFilename) { HRESULT hr = S_OK; + DWORD dwSize = MAX_PATH; + BOOL fDone = FALSE; + DWORD dwPosition = 0; - try + // Though we could call LoadLibrary(L"aspnetcorerh.dll") relying the OS to solve + // the path (the targeted dll is the same folder of w3wp.exe/iisexpress) + // let's still load with full path to avoid security issue + if (FAILED(hr = struFilename->Resize(dwSize + 20))) { - std::wstring modulePath = GlobalVersionUtility::GetModuleName(g_hModule); + goto Finished; + } - modulePath = GlobalVersionUtility::RemoveFileNameFromFolderPath(modulePath); - - std::wstring retval = GlobalVersionUtility::GetGlobalRequestHandlerPath(modulePath.c_str(), - m_pConfiguration->QueryHandlerVersion()->QueryStr(), - pstrHandlerDllName - ); - - if (FAILED(hr = struFilename->Copy(retval.c_str()))) + while (!fDone) + { + DWORD dwReturnedSize = GetModuleFileNameW(g_hModule, struFilename->QueryStr(), dwSize); + if (dwReturnedSize == 0) { - return hr; + hr = HRESULT_FROM_WIN32(GetLastError()); + fDone = TRUE; + goto Finished; + } + else if ((dwReturnedSize == dwSize) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + { + dwSize *= 2; // smaller buffer. increase the buffer and retry + if (FAILED(hr = struFilename->Resize(dwSize + 40))) // + 40 for aspnetcorerh.dll + { + goto Finished; + } + } + else + { + fDone = TRUE; } } - catch (std::exception& e) + + if (FAILED(hr = struFilename->SyncWithBuffer())) { - STRU struEvent; - if (SUCCEEDED(struEvent.Copy(ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG)) - && SUCCEEDED(struEvent.AppendA(e.what()))) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, - ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, - struEvent.QueryStr()); - } - - hr = E_FAIL; + goto Finished; } - catch (...) + dwPosition = struFilename->LastIndexOf(L'\\', 0); + struFilename->QueryStr()[dwPosition] = L'\0'; + + if (FAILED(hr = struFilename->SyncWithBuffer()) || + FAILED(hr = struFilename->Append(L"\\")) || + FAILED(hr = struFilename->Append(libraryName))) { - hr = E_FAIL; + goto Finished; } +Finished: return hr; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp index 08fd9821f3..1a59586160 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp @@ -3,7 +3,6 @@ #include "aspnetcore_shim_config.h" -#include "config_utility.h" #include "hostfxr_utility.h" #include "debugutil.h" #include "ahutil.h" @@ -193,8 +192,6 @@ ASPNETCORE_SHIM_CONFIG::Populate( goto Finished; } - hr = ConfigUtility::FindHandlerVersion(pAspNetCoreElement, &m_struHandlerVersion); - Finished: if (pAspNetCoreElement != NULL) diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 353c0b8b9f..42079abe33 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -181,8 +181,6 @@ - - @@ -207,7 +205,6 @@ - diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp deleted file mode 100644 index 09a927104a..0000000000 --- a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp +++ /dev/null @@ -1,131 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#include "stdafx.h" -#include - -namespace fs = std::experimental::filesystem; - -// throws runtime error if no request handler versions are installed. -// Throw invalid_argument if any argument is null -std::wstring -GlobalVersionUtility::GetGlobalRequestHandlerPath(PCWSTR pwzAspNetCoreFolderPath, PCWSTR pwzHandlerVersion, PCWSTR pwzHandlerName) -{ - if (pwzAspNetCoreFolderPath == NULL) - { - throw new std::invalid_argument("pwzAspNetCoreFolderPath is NULL"); - } - - if (pwzHandlerVersion == NULL) - { - throw new std::invalid_argument("pwzHandlerVersion is NULL"); - } - - if (pwzHandlerName == NULL) - { - throw new std::invalid_argument("pwzHandlerName is NULL"); - } - - std::wstring folderVersion(pwzHandlerVersion); - fs::path aspNetCoreFolderPath(pwzAspNetCoreFolderPath); - - if (folderVersion.empty()) - { - folderVersion = FindHighestGlobalVersion(pwzAspNetCoreFolderPath); - } - - aspNetCoreFolderPath = aspNetCoreFolderPath - .append(folderVersion) - .append(pwzHandlerName); - return aspNetCoreFolderPath; -} - -// Throw filesystem_error if directory_iterator can't iterate over the directory -// Throw invalid_argument if any argument is null -std::vector -GlobalVersionUtility::GetRequestHandlerVersions(PCWSTR pwzAspNetCoreFolderPath) -{ - if (pwzAspNetCoreFolderPath == NULL) - { - throw new std::invalid_argument("pwzAspNetCoreFolderPath is NULL"); - } - - std::vector versionsInDirectory; - for (auto& p : fs::directory_iterator(pwzAspNetCoreFolderPath)) - { - if (!fs::is_directory(p)) - { - continue; - } - - fx_ver_t requested_ver(-1, -1, -1); - if (fx_ver_t::parse(p.path().filename(), &requested_ver, false)) - { - versionsInDirectory.push_back(requested_ver); - } - } - return versionsInDirectory; -} - -// throws runtime error if no request handler versions are installed. -// Throw invalid_argument if any argument is null -std::wstring -GlobalVersionUtility::FindHighestGlobalVersion(PCWSTR pwzAspNetCoreFolderPath) -{ - if (pwzAspNetCoreFolderPath == NULL) - { - throw new std::invalid_argument("pwzAspNetCoreFolderPath is NULL"); - } - - std::vector versionsInDirectory = GetRequestHandlerVersions(pwzAspNetCoreFolderPath); - if (versionsInDirectory.empty()) - { - throw new std::runtime_error("Cannot find request handler next to aspnetcorev2.dll. Verify a version of the request handler is installed in a version folder."); - } - std::sort(versionsInDirectory.begin(), versionsInDirectory.end()); - - return versionsInDirectory.back().as_str(); -} - -// Throws std::out_of_range if there is an index out of range -// Throw invalid_argument if any argument is null -std::wstring -GlobalVersionUtility::RemoveFileNameFromFolderPath(std::wstring fileName) -{ - fs::path path(fileName); - return path.parent_path(); -} - -std::wstring -GlobalVersionUtility::GetModuleName(HMODULE hModuleName) -{ - DWORD dwSize = MAX_PATH; - BOOL fDone = FALSE; - - // Instead of creating a temporary buffer, use the std::wstring directly as the receive buffer. - std::wstring retVal; - retVal.resize(dwSize); - - while (!fDone) - { - DWORD dwReturnedSize = GetModuleFileNameW(hModuleName, &retVal[0], dwSize); - if (dwReturnedSize == 0) - { - throw new std::runtime_error("GetModuleFileNameW returned 0."); - } - else if ((dwReturnedSize == dwSize) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) - { - dwSize *= 2; - retVal.resize(dwSize); // smaller buffer. increase the buffer and retry - } - else - { - // GetModuleFilename will not account for the null terminator - // std::wstring auto appends one, so we don't need to subtract 1 when resizing. - retVal.resize(dwReturnedSize); - fDone = TRUE; - } - } - - return retVal; -} diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h deleted file mode 100644 index fd1a5ee252..0000000000 --- a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#pragma once -#include - -class GlobalVersionUtility -{ -public: - - static - std::wstring - GetGlobalRequestHandlerPath(PCWSTR pwzAspNetCoreFolderPath, PCWSTR pwzHandlerVersion, PCWSTR pwzHandlerName); - - static - std::wstring - FindHighestGlobalVersion(PCWSTR pwzAspNetCoreFolderPath); - - static - std::wstring - RemoveFileNameFromFolderPath(std::wstring fileName); - - static - std::vector - GetRequestHandlerVersions(PCWSTR pwzAspNetCoreFolderPath); - - static - std::wstring - GetModuleName(HMODULE hModuleName); -}; - diff --git a/src/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/AspNetCoreModuleV2/CommonLib/config_utility.h deleted file mode 100644 index 0a53ff63e3..0000000000 --- a/src/AspNetCoreModuleV2/CommonLib/config_utility.h +++ /dev/null @@ -1,106 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#pragma once - -#include "stdafx.h" - -class ConfigUtility -{ - #define CS_ASPNETCORE_HANDLER_SETTINGS L"handlerSettings" - #define CS_ASPNETCORE_HANDLER_VERSION L"handlerVersion" - #define CS_ASPNETCORE_HANDLER_SETTINGS_NAME L"name" - #define CS_ASPNETCORE_HANDLER_SETTINGS_VALUE L"value" - -public: - static - HRESULT - FindHandlerVersion(IAppHostElement* pElement, STRU* strHandlerVersionValue) - { - HRESULT hr = S_OK; - IAppHostElement *pHandlerSettings = NULL; - IAppHostElementCollection *pHandlerSettingsCollection = NULL; - ENUM_INDEX index; - IAppHostElement *pHandlerVar = NULL; - STRU strHandlerName; - STRU strHandlerValue; - - hr = GetElementChildByName(pElement, - CS_ASPNETCORE_HANDLER_SETTINGS, - &pHandlerSettings); - if (FAILED(hr)) - { - goto Finished; - } - - hr = pHandlerSettings->get_Collection(&pHandlerSettingsCollection); - if (FAILED(hr)) - { - goto Finished; - } - - for (hr = FindFirstElement(pHandlerSettingsCollection, &index, &pHandlerVar); - SUCCEEDED(hr); - hr = FindNextElement(pHandlerSettingsCollection, &index, &pHandlerVar)) - { - if (hr == S_FALSE) - { - hr = S_OK; - break; - } - - hr = GetElementStringProperty(pHandlerVar, - CS_ASPNETCORE_HANDLER_SETTINGS_NAME, - &strHandlerName); - - if (FAILED(hr)) - { - goto Finished; - } - - hr = GetElementStringProperty(pHandlerVar, - CS_ASPNETCORE_HANDLER_SETTINGS_VALUE, - &strHandlerValue); - - if (FAILED(hr)) - { - goto Finished; - - } - - if (strHandlerName.Equals(CS_ASPNETCORE_HANDLER_VERSION)) - { - hr = strHandlerVersionValue->Copy(strHandlerValue); - goto Finished; - } - - strHandlerName.Reset(); - strHandlerValue.Reset(); - - pHandlerVar->Release(); - pHandlerVar = NULL; - } - Finished: - - if (pHandlerVar != NULL) - { - pHandlerVar->Release(); - pHandlerVar = NULL; - } - - if (pHandlerSettingsCollection != NULL) - { - pHandlerSettingsCollection->Release(); - pHandlerSettingsCollection = NULL; - } - - if (pHandlerSettings != NULL) - { - pHandlerSettings->Release(); - pHandlerSettings = NULL; - } - - return hr; - } -}; - diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index b75217ae4d..969590ea6e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -14,8 +14,6 @@ #include #include #include -#include - #include "Shlwapi.h" #include #include "hashtable.h" @@ -33,11 +31,10 @@ #include "application.h" #include "SRWLockWrapper.h" #include "environmentvariablehash.h" -#include "fx_ver.h" #include "utility.h" -#include "GlobalVersionUtility.h" #include "resources.h" #include "aspnetcore_msg.h" +#include "fx_ver.h" #include "hostfxr_utility.h" #include "hostfxroptions.h" #include "IOutputManager.h" @@ -45,4 +42,3 @@ #include "PipeOutputManager.h" #include "NullOutputManager.h" #include "LoggingHelpers.h" - diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.cxx b/src/AspNetCoreModuleV2/CommonLib/utility.cxx index 965b13eb58..a7bb7b1d63 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.cxx +++ b/src/AspNetCoreModuleV2/CommonLib/utility.cxx @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "stdafx.h" +#include"stdafx.h" // static HRESULT diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.h b/src/AspNetCoreModuleV2/CommonLib/utility.h index f1f2c38afd..58a5824044 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/utility.h @@ -3,8 +3,6 @@ #pragma once -#include "stdafx.h" - class UTILITY { public: @@ -123,4 +121,3 @@ private: UTILITY() {} ~UTILITY() {} }; - diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 2a21ef619e..33756b7bd0 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -50,9 +50,7 @@ - - @@ -95,7 +93,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -120,7 +118,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -143,7 +141,7 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -168,9 +166,9 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - stdcpp17 + stdcpp14 true diff --git a/test/CommonLibTests/ConfigUtilityTests.cpp b/test/CommonLibTests/ConfigUtilityTests.cpp deleted file mode 100644 index fbed259117..0000000000 --- a/test/CommonLibTests/ConfigUtilityTests.cpp +++ /dev/null @@ -1,106 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#include "stdafx.h" -#include "gmock/gmock.h" -using ::testing::_; -using ::testing::NiceMock; - -namespace ConfigUtilityTests -{ - TEST(ConfigUtilityTest, HandlerVersionSet) - { - IAppHostElement* retElement = NULL; - - STRU handlerVersion; - - // NiceMock removes warnings about "uninteresting calls", - auto element = std::make_unique>(); - auto innerElement = std::make_unique>(); - auto collection = std::make_unique>(); - auto nameElement = std::make_unique>(); - auto mockProperty = std::make_unique>(); - - ON_CALL(*element, GetElementByName(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); - ON_CALL(*innerElement, get_Collection(_)) - .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); - ON_CALL(*collection, get_Count(_)) - .WillByDefault(DoAll(testing::SetArgPointee<0>(1), testing::Return(S_OK))); - ON_CALL(*collection, get_Item(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); - ON_CALL(*nameElement, GetPropertyByName(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); - EXPECT_CALL(*mockProperty, get_StringValue(_)) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"handlerVersion")), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))); - - HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); - - EXPECT_STREQ(handlerVersion.QueryStr(), L"value"); - } - - TEST(ConfigUtilityTest, NoHandlerVersion) - { - IAppHostElement* retElement = NULL; - - STRU handlerVersion; - - // NiceMock removes warnings about "uninteresting calls", - auto element = std::make_unique>(); - auto innerElement = std::make_unique>(); - auto collection = std::make_unique>(); - auto nameElement = std::make_unique>(); - auto mockProperty = std::make_unique>(); - - ON_CALL(*element, GetElementByName(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); - ON_CALL(*innerElement, get_Collection(_)) - .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); - ON_CALL(*collection, get_Count(_)) - .WillByDefault(DoAll(testing::SetArgPointee<0>(1), testing::Return(S_OK))); - ON_CALL(*collection, get_Item(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); - ON_CALL(*nameElement, GetPropertyByName(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); - EXPECT_CALL(*mockProperty, get_StringValue(_)) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"randomvalue")), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))); - - HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); - - EXPECT_STREQ(handlerVersion.QueryStr(), L""); - } - - TEST(ConfigUtilityTest, MultipleElements) - { - IAppHostElement* retElement = NULL; - STRU handlerVersion; - - auto element = std::make_unique>(); - auto innerElement = std::make_unique>(); - auto collection = std::make_unique>(); - auto nameElement = std::make_unique>(); - auto mockProperty = std::make_unique>(); - - ON_CALL(*element, GetElementByName(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); - ON_CALL(*innerElement, get_Collection(_)) - .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); - ON_CALL(*collection, get_Count(_)) - .WillByDefault(DoAll(testing::SetArgPointee<0>(2), testing::Return(S_OK))); - ON_CALL(*collection, get_Item(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); - ON_CALL(*nameElement, GetPropertyByName(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); - EXPECT_CALL(*mockProperty, get_StringValue(_)) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"key")), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"handlerVersion")), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value2")), testing::Return(S_OK))); - - HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); - - EXPECT_STREQ(handlerVersion.QueryStr(), L"value2"); - } -} diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/test/CommonLibTests/FileOutputManagerTests.cpp index ebfb790ed5..e3d261097a 100644 --- a/test/CommonLibTests/FileOutputManagerTests.cpp +++ b/test/CommonLibTests/FileOutputManagerTests.cpp @@ -40,6 +40,8 @@ namespace FileOutManagerStartupTests wprintf(expected, out); } + // std::filesystem is available on c++17, however gtest fails to build when using it + // c++14 has filesystem as experimental. for (auto & p : std::experimental::filesystem::directory_iterator(tempDirectory)) { std::wstring filename(p.path().filename()); diff --git a/test/CommonLibTests/GlobalVersionTests.cpp b/test/CommonLibTests/GlobalVersionTests.cpp deleted file mode 100644 index 00ec23f479..0000000000 --- a/test/CommonLibTests/GlobalVersionTests.cpp +++ /dev/null @@ -1,153 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#include "stdafx.h" -#include "gtest/internal/gtest-port.h" - -namespace GlobalVersionTests -{ - using ::testing::Test; - namespace fs = std::experimental::filesystem; - - class GlobalVersionTest : public Test - { - protected: - void - RemoveFileNamePath(PCWSTR dllPath, PCWSTR expected) - { - std::wstring res = GlobalVersionUtility::RemoveFileNameFromFolderPath(dllPath); - EXPECT_STREQ(res.c_str(), expected); - } - }; - - TEST_F(GlobalVersionTest, RemovesPathCorrectly) - { - RemoveFileNamePath(L"test\\log.txt", L"test"); - RemoveFileNamePath(L"test\\log", L"test"); - RemoveFileNamePath(L"C:\\Program Files\\IIS\\aspnetcorev2.dll", L"C:\\Program Files\\IIS"); - RemoveFileNamePath(L"test\\log.txt", L"test"); - } - - TEST(GetRequestHandlerVersions, GetFolders) - { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - - auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.c_str()); - EXPECT_EQ(res.size(), 1); - EXPECT_EQ(res.at(0), fx_ver_t(2, 0, 0, std::wstring())); - } - - TEST(GetRequestHandlerVersions, GetFolderPreview) - { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0-preview")); - - auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.c_str()); - EXPECT_EQ(res.size(), 1); - EXPECT_EQ(res.at(0), fx_ver_t(2, 0, 0, std::wstring(L"-preview"))); - } - - TEST(GetRequestHandlerVersions, GetFolderManyVersions) - { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\1.9.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); - - auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.c_str()); - EXPECT_EQ(res.size(), 3); - EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(1, 9, 0, std::wstring())) != std::end(res)); - EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(2, 0, 0, std::wstring())) != std::end(res)); - EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(2, 1, 0, std::wstring())) != std::end(res)); - } - - TEST(FindHighestGlobalVersion, HighestVersionWithSingleFolder) - { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - - auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); - - EXPECT_STREQ(res.c_str(), L"2.0.0"); - } - - TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersions) - { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); - - auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); - - EXPECT_STREQ(res.c_str(), L"2.1.0"); - } - - TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersionsPreview) - { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.2.0-preview")); - - auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); - - EXPECT_STREQ(res.c_str(), L"2.2.0-preview"); - } - - TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersionNoPreview) - { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); - - auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); - - EXPECT_STREQ(res.c_str(), L"2.1.0"); - } - - TEST(GetGlobalRequestHandlerPath, FindHighestVersionNoHandlerName) - { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"", L"aspnetcorev2_outofprocess.dll"); - - EXPECT_STREQ(result.c_str(), (tempPath + L"2.0.0\\aspnetcorev2_outofprocess.dll").c_str()); - } - - TEST(GetGlobalRequestHandlerPath, FindHighestVersionPreviewWins) - { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); - - auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"", L"aspnetcorev2_outofprocess.dll"); - - EXPECT_STREQ(result.c_str(), (tempPath + L"2.1.0-preview\\aspnetcorev2_outofprocess.dll").c_str()); - } - - TEST(GetGlobalRequestHandlerPath, FindHighestVersionSpecificVersion) - { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); - - auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"2.0.0", L"aspnetcorev2_outofprocess.dll"); - - EXPECT_STREQ(result.c_str(), (tempPath + L"2.0.0\\aspnetcorev2_outofprocess.dll").c_str()); - } - - TEST(GetGlobalRequestHandlerPath, FindHighestVersionSpecificPreview) - { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.2.0")); - - - auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"2.1.0-preview", L"aspnetcorev2_outofprocess.dll"); - - EXPECT_STREQ(result.c_str(), (tempPath + L"2.1.0-preview\\aspnetcorev2_outofprocess.dll").c_str()); - } -} diff --git a/test/CommonLibTests/fakeclasses.h b/test/CommonLibTests/fakeclasses.h index 14c6f8dfee..5f79138879 100644 --- a/test/CommonLibTests/fakeclasses.h +++ b/test/CommonLibTests/fakeclasses.h @@ -1,62 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#pragma once - -#include "gtest/gtest.h" -#include "gmock/gmock.h" - -class MockProperty : public IAppHostProperty -{ -public: - MOCK_METHOD2_WITH_CALLTYPE(__stdcall, QueryInterface, HRESULT(REFIID riid, void ** ppvObject)); - MOCK_METHOD0_WITH_CALLTYPE(__stdcall, AddRef, ULONG()); - MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Release, ULONG()); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Name, HRESULT(BSTR* pbstrValue)); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Value, HRESULT(VARIANT * pVariant)); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, put_Value, HRESULT(VARIANT value)); - MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Clear, HRESULT()); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_StringValue, HRESULT(BSTR* pbstrValue)); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Exception, HRESULT(IAppHostPropertyException ** ppException)); - MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT * pValue)); - MOCK_METHOD2_WITH_CALLTYPE(__stdcall, SetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT value)); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Schema, HRESULT(IAppHostPropertySchema ** ppSchema)); -}; - -class MockCollection : public IAppHostElementCollection -{ -public: - MOCK_METHOD2_WITH_CALLTYPE(__stdcall, QueryInterface, HRESULT(REFIID riid, void ** ppvObject)); - MOCK_METHOD0_WITH_CALLTYPE(__stdcall, AddRef, ULONG()); - MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Release, ULONG()); - MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Clear, HRESULT()); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Schema, HRESULT(IAppHostCollectionSchema** pSchema)); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Count, HRESULT(DWORD * dwordElem)); - MOCK_METHOD2_WITH_CALLTYPE(__stdcall, get_Item, HRESULT(VARIANT cIndex, IAppHostElement ** ppElement)); - MOCK_METHOD2_WITH_CALLTYPE(__stdcall, AddElement, HRESULT(IAppHostElement * pElement, INT cPosition)); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, DeleteElement, HRESULT(VARIANT cIndex)); - MOCK_METHOD2_WITH_CALLTYPE(__stdcall, CreateNewElement, HRESULT(BSTR bstrElementName, IAppHostElement** ppElement)); -}; - -class MockElement : public IAppHostElement -{ -public: - - MOCK_METHOD2_WITH_CALLTYPE(__stdcall, QueryInterface, HRESULT(REFIID riid, void ** ppvObject)); - MOCK_METHOD0_WITH_CALLTYPE(__stdcall, AddRef, ULONG()); - MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Release, ULONG()); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Name, HRESULT(BSTR * pbstrName)); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Collection, HRESULT(IAppHostElementCollection ** ppCollection)); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Properties, HRESULT(IAppHostPropertyCollection ** ppProperties)); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_ChildElements, HRESULT(IAppHostChildElementCollection ** ppElements)); - MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT * pValue)); - MOCK_METHOD2_WITH_CALLTYPE(__stdcall, SetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT value)); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Schema, HRESULT(IAppHostElementSchema** pSchema)); - MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetElementByName, HRESULT(BSTR bstrSubName, IAppHostElement ** ppElement)); - MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetPropertyByName, HRESULT(BSTR bstrSubName, IAppHostProperty ** ppProperty)); - MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Clear, HRESULT()); - MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Methods, HRESULT(IAppHostMethodCollection ** ppMethods)); -}; +#include "stdafx.h" class MockHttpServer : public IHttpServer { diff --git a/test/CommonLibTests/stdafx.h b/test/CommonLibTests/stdafx.h index 47095a9fee..ed238e1b3d 100644 --- a/test/CommonLibTests/stdafx.h +++ b/test/CommonLibTests/stdafx.h @@ -43,7 +43,6 @@ #include "requesthandler_config.h" #include "hostfxr_utility.h" -#include "config_utility.h" #include "environmentvariablehash.h" #include "iapplication.h" #include "utility.h" @@ -52,11 +51,9 @@ #include "resources.h" #include "aspnetcore_msg.h" #include "Helpers.h" -#include "GlobalVersionUtility.h" #undef assert // Macro redefinition in IISLib. -#include "gtest/gtest.h" -#include "fakeclasses.h" +#include "gtest\gtest.h" // Externals defined in inprocess BOOL g_fProcessDetach; diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs deleted file mode 100644 index 6e50228564..0000000000 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ /dev/null @@ -1,160 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using System.Xml.Linq; -using IISIntegration.FunctionalTests.Utilities; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Xunit; -using Xunit.Abstractions; - -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests -{ - public class GlobalVersionTests : IISFunctionalTestBase - { - private const string _aspNetCoreDll = "aspnetcorev2_outofprocess.dll"; - private const string _handlerVersion20 = "2.0.0"; - private const string _helloWorldRequest = "HelloWorld"; - private const string _helloWorldResponse = "Hello World"; - private const string _outOfProcessVersionVariable = "/p:AspNetCoreModuleOutOfProcessVersion="; - - [Fact] - public async Task GlobalVersion_DefaultWorks() - { - var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); - deploymentParameters.PublishApplicationBeforeDeployment = false; - - deploymentParameters.ServerConfigTemplateContent = GetServerConfig( - element => - { - var handlerVersionElement = new XElement("handlerSetting"); - handlerVersionElement.SetAttributeValue("name", "handlerVersion"); - handlerVersionElement.SetAttributeValue("value", _handlerVersion20); - - element.Descendants("aspNetCore").Single() - .Add(new XElement("handlerSettings", handlerVersionElement)); - }); - - var deploymentResult = await DeployAsync(deploymentParameters); - - var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); - var responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal(_helloWorldResponse, responseText); - } - - [Theory] // Tests need to publish to change folder locations - [InlineData("2.1.0")] - [InlineData("2.1.0-preview")] - public async Task GlobalVersion_NewVersionNumber_Fails(string version) - { - var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); - - var deploymentResult = await DeployAsync(deploymentParameters); - - Helpers.ModifyHandlerSectionInWebConfig(deploymentResult, version); - - var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); - Assert.False(response.IsSuccessStatusCode); - } - - [Theory] // Tests need to publish to change folder locations - [InlineData("2.1.0")] - [InlineData("2.1.0-preview")] - public async Task GlobalVersion_NewVersionNumber(string version) - { - var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); - deploymentParameters.AdditionalPublishParameters = $"{_outOfProcessVersionVariable}{version}"; - - var deploymentResult = await DeployAsync(deploymentParameters); - - Helpers.ModifyHandlerSectionInWebConfig(deploymentResult, version); - - var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); - var responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal(_helloWorldResponse, responseText); - } - - [Theory] // Tests need to publish to change folder locations - [InlineData("2.1.0")] - [InlineData("2.1.0-preview")] - public async Task GlobalVersion_MultipleRequestHandlers_PicksHighestOne(string version) - { - var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); - - var deploymentResult = await DeployAsync(deploymentParameters); - - var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); - - var newANCMPath = GetANCMRequestHandlerPath(deploymentResult, version); - - var di = Directory.CreateDirectory(Path.GetDirectoryName(newANCMPath)); - - File.Copy(originalANCMPath, newANCMPath, true); - - deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); - var response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); - var responseText = await response.Content.ReadAsStringAsync(); - - Assert.Equal(_helloWorldResponse, responseText); - } - - [Theory] - [InlineData("2.1.0")] - [InlineData("2.1.0-preview")] - public async Task GlobalVersion_MultipleRequestHandlers_UpgradeWorks(string version) - { - var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); - var deploymentResult = await DeployAsync(deploymentParameters); - - var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); - - deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", originalANCMPath); - var response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); - var responseText = await response.Content.ReadAsStringAsync(); - - Assert.Equal(_helloWorldResponse, responseText); - - Dispose(); - - deploymentResult = await DeployAsync(deploymentParameters); - - originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); - - var newANCMPath = GetANCMRequestHandlerPath(deploymentResult, version); - - var di = Directory.CreateDirectory(Path.GetDirectoryName(newANCMPath)); - - File.Copy(originalANCMPath, newANCMPath, true); - - deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); - response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); - responseText = await response.Content.ReadAsStringAsync(); - - Assert.Equal(_helloWorldResponse, responseText); - } - - private DeploymentParameters GetGlobalVersionBaseDeploymentParameters() - { - return new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) - { - TargetFramework = Tfm.NetCoreApp22, - ApplicationType = ApplicationType.Portable, - AncmVersion = AncmVersion.AspNetCoreModuleV2, - HostingModel = HostingModel.OutOfProcess, - PublishApplicationBeforeDeployment = true, - AdditionalPublishParameters = $"{_outOfProcessVersionVariable}{_handlerVersion20}" - }; - } - - private string GetANCMRequestHandlerPath(IISDeploymentResult deploymentResult, string version) - { - return Path.Combine(deploymentResult.DeploymentResult.ContentRoot, - deploymentResult.DeploymentResult.DeploymentParameters.RuntimeArchitecture.ToString(), - version, - _aspNetCoreDll); - } - } -} diff --git a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs index d66fecf3cb..4d3e0e65dc 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs @@ -21,31 +21,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string GetOutOfProcessTestSitesPath() => GetTestWebSitePath("OutOfProcessWebSite"); public static void ModifyAspNetCoreSectionInWebConfig(IISDeploymentResult deploymentResult, string key, string value) - => ModifyAttributeInWebConfig(deploymentResult, key, value, section: "aspNetCore"); + => ModifySectionInWebConfig(deploymentResult, key, value, section: "aspNetCore", 0); - public static void ModifyAttributeInWebConfig(IISDeploymentResult deploymentResult, string key, string value, string section) + public static void ModifySectionInWebConfig(IISDeploymentResult deploymentResult, string key, string value, string section, int index) { - var webConfigFile = GetWebConfigFile(deploymentResult); + // modify the web.config after publish + var root = deploymentResult.DeploymentResult.ContentRoot; + var webConfigFile = $"{root}/web.config"; var config = XDocument.Load(webConfigFile); - - var element = config.Descendants(section).Single(); + var element = config.Descendants(section).ToList()[index]; element.SetAttributeValue(key, value); - - config.Save(webConfigFile); - } - - public static void ModifyHandlerSectionInWebConfig(IISDeploymentResult deploymentResult, string handlerVersionValue) - { - var webConfigFile = GetWebConfigFile(deploymentResult); - var config = XDocument.Load(webConfigFile); - - var handlerVersionElement = new XElement("handlerSetting"); - handlerVersionElement.SetAttributeValue("name", "handlerVersion"); - handlerVersionElement.SetAttributeValue("value", handlerVersionValue); - - config.Descendants("aspNetCore").Single() - .Add(new XElement("handlerSettings", handlerVersionElement)); - config.Save(webConfigFile); } @@ -61,8 +46,5 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests PublishApplicationBeforeDeployment = site == "InProcessWebSite", }; } - - private static string GetWebConfigFile(IISDeploymentResult deploymentResult) - => Path.Combine(deploymentResult.DeploymentResult.ContentRoot, "web.config"); } } diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/test/WebSites/OutOfProcessWebSite/Startup.cs index fc7021c992..4b26fa7ba2 100644 --- a/test/WebSites/OutOfProcessWebSite/Startup.cs +++ b/test/WebSites/OutOfProcessWebSite/Startup.cs @@ -2,9 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.IO; using System.Linq; -using System.Runtime.InteropServices; using System.Security.Principal; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; @@ -86,22 +84,5 @@ namespace TestSites public Task UpgradeFeatureDetection(HttpContext context) => context.Response.WriteAsync(context.Features.Get() != null? "Enabled": "Disabled"); - - public Task CheckRequestHandlerVersion(HttpContext context) - { - // We need to check if the aspnetcorev2_outofprocess dll is loaded by iisexpress.exe - // As they aren't in the same process, we will try to delete the file and expect a file - // in use error - try - { - File.Delete(context.Request.Headers["ANCMRHPath"]); - } - catch(UnauthorizedAccessException) - { - return context.Response.WriteAsync("Hello World"); - } - - return context.Response.WriteAsync(context.Request.Headers["ANCMRHPath"]); - } } } diff --git a/test/gtest/gtest.vcxproj b/test/gtest/gtest.vcxproj index 9f745f3a84..660be83f21 100644 --- a/test/gtest/gtest.vcxproj +++ b/test/gtest/gtest.vcxproj @@ -19,7 +19,6 @@ - @@ -106,7 +105,7 @@ true WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) + googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -122,7 +121,7 @@ true _DEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) + googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -140,7 +139,7 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) + googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) MultiThreaded @@ -160,7 +159,7 @@ true NDEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) + googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) MultiThreaded diff --git a/version.props b/version.props index ddf502f2b3..c836c8d68c 100644 --- a/version.props +++ b/version.props @@ -11,6 +11,5 @@ 8 1 0 - 2.0.0 From 1687eabcde863f93e3bfa4c3f2ab1443161b89c2 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 13 Jun 2018 12:00:00 -0700 Subject: [PATCH 062/363] Revert "Revert "Load ANCM out of process via global versioning (#895)"" This reverts commit ec7f23308ed9157b390aca719a57ba25ef88184d. --- build/testsite.props | 4 +- nuget/AspNetCoreV2.nuspec | 4 +- ...icrosoft.AspNetCore.AspNetCoreModule.props | 4 +- .../AspNetCore/Inc/aspnetcore_shim_config.h | 10 ++ .../AspNetCore/src/applicationinfo.cpp | 69 +++----- .../AspNetCore/src/aspnetcore_shim_config.cpp | 3 + .../CommonLib/CommonLib.vcxproj | 3 + .../CommonLib/GlobalVersionUtility.cpp | 131 ++++++++++++++ .../CommonLib/GlobalVersionUtility.h | 31 ++++ .../CommonLib/config_utility.h | 106 ++++++++++++ src/AspNetCoreModuleV2/CommonLib/stdafx.h | 6 +- src/AspNetCoreModuleV2/CommonLib/utility.cxx | 2 +- src/AspNetCoreModuleV2/CommonLib/utility.h | 3 + test/CommonLibTests/CommonLibTests.vcxproj | 12 +- test/CommonLibTests/ConfigUtilityTests.cpp | 106 ++++++++++++ .../CommonLibTests/FileOutputManagerTests.cpp | 2 - test/CommonLibTests/GlobalVersionTests.cpp | 153 +++++++++++++++++ test/CommonLibTests/fakeclasses.h | 57 ++++++- test/CommonLibTests/stdafx.h | 5 +- .../OutOfProcess/GlobalVersionTests.cs | 160 ++++++++++++++++++ .../Utilities/Helpers.cs | 30 +++- test/WebSites/OutOfProcessWebSite/Startup.cs | 19 +++ test/gtest/gtest.vcxproj | 9 +- version.props | 1 + 24 files changed, 862 insertions(+), 68 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/config_utility.h create mode 100644 test/CommonLibTests/ConfigUtilityTests.cpp create mode 100644 test/CommonLibTests/GlobalVersionTests.cpp create mode 100644 test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs diff --git a/build/testsite.props b/build/testsite.props index be0f2c72cc..42e3cb1d8e 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -29,8 +29,8 @@ - - + + diff --git a/nuget/AspNetCoreV2.nuspec b/nuget/AspNetCoreV2.nuspec index 6de70ba91a..5d26da23c8 100644 --- a/nuget/AspNetCoreV2.nuspec +++ b/nuget/AspNetCoreV2.nuspec @@ -21,8 +21,8 @@ - - + + diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props index 38b8eafcc4..1f33b20ed2 100644 --- a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props +++ b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props @@ -5,8 +5,8 @@ $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcore.dll $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_inprocess.dll $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_inprocess.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_outofprocess.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_outofprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h index 2d1e8e7944..36f2a18c51 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h @@ -4,6 +4,7 @@ #pragma once #include "precomp.hxx" +#include #define CS_ASPNETCORE_SECTION L"system.webServer/aspNetCore" #define CS_ASPNETCORE_PROCESS_EXE_PATH L"processPath" @@ -105,6 +106,14 @@ public: return m_hostingModel; } + STRU* + QueryHandlerVersion( + VOID + ) + { + return &m_struHandlerVersion; + } + private: ASPNETCORE_SHIM_CONFIG() : m_cRefs(1), @@ -120,5 +129,6 @@ private: STRU m_struConfigPath; APP_HOSTING_MODEL m_hostingModel; STRU m_struHostFxrLocation; + STRU m_struHandlerVersion; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 3f18c63507..38e4d8cb80 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -358,60 +358,47 @@ Finished: HRESULT APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation( - PCWSTR libraryName, - STRU* struFilename) + PCWSTR pstrHandlerDllName, + STRU* struFilename +) { HRESULT hr = S_OK; - DWORD dwSize = MAX_PATH; - BOOL fDone = FALSE; - DWORD dwPosition = 0; - // Though we could call LoadLibrary(L"aspnetcorerh.dll") relying the OS to solve - // the path (the targeted dll is the same folder of w3wp.exe/iisexpress) - // let's still load with full path to avoid security issue - if (FAILED(hr = struFilename->Resize(dwSize + 20))) + try { - goto Finished; - } + std::wstring modulePath = GlobalVersionUtility::GetModuleName(g_hModule); - while (!fDone) - { - DWORD dwReturnedSize = GetModuleFileNameW(g_hModule, struFilename->QueryStr(), dwSize); - if (dwReturnedSize == 0) + modulePath = GlobalVersionUtility::RemoveFileNameFromFolderPath(modulePath); + + std::wstring retval = GlobalVersionUtility::GetGlobalRequestHandlerPath(modulePath.c_str(), + m_pConfiguration->QueryHandlerVersion()->QueryStr(), + pstrHandlerDllName + ); + + if (FAILED(hr = struFilename->Copy(retval.c_str()))) { - hr = HRESULT_FROM_WIN32(GetLastError()); - fDone = TRUE; - goto Finished; - } - else if ((dwReturnedSize == dwSize) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) - { - dwSize *= 2; // smaller buffer. increase the buffer and retry - if (FAILED(hr = struFilename->Resize(dwSize + 40))) // + 40 for aspnetcorerh.dll - { - goto Finished; - } - } - else - { - fDone = TRUE; + return hr; } } - - if (FAILED(hr = struFilename->SyncWithBuffer())) + catch (std::exception& e) { - goto Finished; + STRU struEvent; + if (SUCCEEDED(struEvent.Copy(ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG)) + && SUCCEEDED(struEvent.AppendA(e.what()))) + { + UTILITY::LogEvent(g_hEventLog, + EVENTLOG_INFORMATION_TYPE, + ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, + struEvent.QueryStr()); + } + + hr = E_FAIL; } - dwPosition = struFilename->LastIndexOf(L'\\', 0); - struFilename->QueryStr()[dwPosition] = L'\0'; - - if (FAILED(hr = struFilename->SyncWithBuffer()) || - FAILED(hr = struFilename->Append(L"\\")) || - FAILED(hr = struFilename->Append(libraryName))) + catch (...) { - goto Finished; + hr = E_FAIL; } -Finished: return hr; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp index 1a59586160..08fd9821f3 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp @@ -3,6 +3,7 @@ #include "aspnetcore_shim_config.h" +#include "config_utility.h" #include "hostfxr_utility.h" #include "debugutil.h" #include "ahutil.h" @@ -192,6 +193,8 @@ ASPNETCORE_SHIM_CONFIG::Populate( goto Finished; } + hr = ConfigUtility::FindHandlerVersion(pAspNetCoreElement, &m_struHandlerVersion); + Finished: if (pAspNetCoreElement != NULL) diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 42079abe33..353c0b8b9f 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -181,6 +181,8 @@ + + @@ -205,6 +207,7 @@ + diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp new file mode 100644 index 0000000000..09a927104a --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp @@ -0,0 +1,131 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "stdafx.h" +#include + +namespace fs = std::experimental::filesystem; + +// throws runtime error if no request handler versions are installed. +// Throw invalid_argument if any argument is null +std::wstring +GlobalVersionUtility::GetGlobalRequestHandlerPath(PCWSTR pwzAspNetCoreFolderPath, PCWSTR pwzHandlerVersion, PCWSTR pwzHandlerName) +{ + if (pwzAspNetCoreFolderPath == NULL) + { + throw new std::invalid_argument("pwzAspNetCoreFolderPath is NULL"); + } + + if (pwzHandlerVersion == NULL) + { + throw new std::invalid_argument("pwzHandlerVersion is NULL"); + } + + if (pwzHandlerName == NULL) + { + throw new std::invalid_argument("pwzHandlerName is NULL"); + } + + std::wstring folderVersion(pwzHandlerVersion); + fs::path aspNetCoreFolderPath(pwzAspNetCoreFolderPath); + + if (folderVersion.empty()) + { + folderVersion = FindHighestGlobalVersion(pwzAspNetCoreFolderPath); + } + + aspNetCoreFolderPath = aspNetCoreFolderPath + .append(folderVersion) + .append(pwzHandlerName); + return aspNetCoreFolderPath; +} + +// Throw filesystem_error if directory_iterator can't iterate over the directory +// Throw invalid_argument if any argument is null +std::vector +GlobalVersionUtility::GetRequestHandlerVersions(PCWSTR pwzAspNetCoreFolderPath) +{ + if (pwzAspNetCoreFolderPath == NULL) + { + throw new std::invalid_argument("pwzAspNetCoreFolderPath is NULL"); + } + + std::vector versionsInDirectory; + for (auto& p : fs::directory_iterator(pwzAspNetCoreFolderPath)) + { + if (!fs::is_directory(p)) + { + continue; + } + + fx_ver_t requested_ver(-1, -1, -1); + if (fx_ver_t::parse(p.path().filename(), &requested_ver, false)) + { + versionsInDirectory.push_back(requested_ver); + } + } + return versionsInDirectory; +} + +// throws runtime error if no request handler versions are installed. +// Throw invalid_argument if any argument is null +std::wstring +GlobalVersionUtility::FindHighestGlobalVersion(PCWSTR pwzAspNetCoreFolderPath) +{ + if (pwzAspNetCoreFolderPath == NULL) + { + throw new std::invalid_argument("pwzAspNetCoreFolderPath is NULL"); + } + + std::vector versionsInDirectory = GetRequestHandlerVersions(pwzAspNetCoreFolderPath); + if (versionsInDirectory.empty()) + { + throw new std::runtime_error("Cannot find request handler next to aspnetcorev2.dll. Verify a version of the request handler is installed in a version folder."); + } + std::sort(versionsInDirectory.begin(), versionsInDirectory.end()); + + return versionsInDirectory.back().as_str(); +} + +// Throws std::out_of_range if there is an index out of range +// Throw invalid_argument if any argument is null +std::wstring +GlobalVersionUtility::RemoveFileNameFromFolderPath(std::wstring fileName) +{ + fs::path path(fileName); + return path.parent_path(); +} + +std::wstring +GlobalVersionUtility::GetModuleName(HMODULE hModuleName) +{ + DWORD dwSize = MAX_PATH; + BOOL fDone = FALSE; + + // Instead of creating a temporary buffer, use the std::wstring directly as the receive buffer. + std::wstring retVal; + retVal.resize(dwSize); + + while (!fDone) + { + DWORD dwReturnedSize = GetModuleFileNameW(hModuleName, &retVal[0], dwSize); + if (dwReturnedSize == 0) + { + throw new std::runtime_error("GetModuleFileNameW returned 0."); + } + else if ((dwReturnedSize == dwSize) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + { + dwSize *= 2; + retVal.resize(dwSize); // smaller buffer. increase the buffer and retry + } + else + { + // GetModuleFilename will not account for the null terminator + // std::wstring auto appends one, so we don't need to subtract 1 when resizing. + retVal.resize(dwReturnedSize); + fDone = TRUE; + } + } + + return retVal; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h new file mode 100644 index 0000000000..fd1a5ee252 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h @@ -0,0 +1,31 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#pragma once +#include + +class GlobalVersionUtility +{ +public: + + static + std::wstring + GetGlobalRequestHandlerPath(PCWSTR pwzAspNetCoreFolderPath, PCWSTR pwzHandlerVersion, PCWSTR pwzHandlerName); + + static + std::wstring + FindHighestGlobalVersion(PCWSTR pwzAspNetCoreFolderPath); + + static + std::wstring + RemoveFileNameFromFolderPath(std::wstring fileName); + + static + std::vector + GetRequestHandlerVersions(PCWSTR pwzAspNetCoreFolderPath); + + static + std::wstring + GetModuleName(HMODULE hModuleName); +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/AspNetCoreModuleV2/CommonLib/config_utility.h new file mode 100644 index 0000000000..0a53ff63e3 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/config_utility.h @@ -0,0 +1,106 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#pragma once + +#include "stdafx.h" + +class ConfigUtility +{ + #define CS_ASPNETCORE_HANDLER_SETTINGS L"handlerSettings" + #define CS_ASPNETCORE_HANDLER_VERSION L"handlerVersion" + #define CS_ASPNETCORE_HANDLER_SETTINGS_NAME L"name" + #define CS_ASPNETCORE_HANDLER_SETTINGS_VALUE L"value" + +public: + static + HRESULT + FindHandlerVersion(IAppHostElement* pElement, STRU* strHandlerVersionValue) + { + HRESULT hr = S_OK; + IAppHostElement *pHandlerSettings = NULL; + IAppHostElementCollection *pHandlerSettingsCollection = NULL; + ENUM_INDEX index; + IAppHostElement *pHandlerVar = NULL; + STRU strHandlerName; + STRU strHandlerValue; + + hr = GetElementChildByName(pElement, + CS_ASPNETCORE_HANDLER_SETTINGS, + &pHandlerSettings); + if (FAILED(hr)) + { + goto Finished; + } + + hr = pHandlerSettings->get_Collection(&pHandlerSettingsCollection); + if (FAILED(hr)) + { + goto Finished; + } + + for (hr = FindFirstElement(pHandlerSettingsCollection, &index, &pHandlerVar); + SUCCEEDED(hr); + hr = FindNextElement(pHandlerSettingsCollection, &index, &pHandlerVar)) + { + if (hr == S_FALSE) + { + hr = S_OK; + break; + } + + hr = GetElementStringProperty(pHandlerVar, + CS_ASPNETCORE_HANDLER_SETTINGS_NAME, + &strHandlerName); + + if (FAILED(hr)) + { + goto Finished; + } + + hr = GetElementStringProperty(pHandlerVar, + CS_ASPNETCORE_HANDLER_SETTINGS_VALUE, + &strHandlerValue); + + if (FAILED(hr)) + { + goto Finished; + + } + + if (strHandlerName.Equals(CS_ASPNETCORE_HANDLER_VERSION)) + { + hr = strHandlerVersionValue->Copy(strHandlerValue); + goto Finished; + } + + strHandlerName.Reset(); + strHandlerValue.Reset(); + + pHandlerVar->Release(); + pHandlerVar = NULL; + } + Finished: + + if (pHandlerVar != NULL) + { + pHandlerVar->Release(); + pHandlerVar = NULL; + } + + if (pHandlerSettingsCollection != NULL) + { + pHandlerSettingsCollection->Release(); + pHandlerSettingsCollection = NULL; + } + + if (pHandlerSettings != NULL) + { + pHandlerSettings->Release(); + pHandlerSettings = NULL; + } + + return hr; + } +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index 969590ea6e..b75217ae4d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -14,6 +14,8 @@ #include #include #include +#include + #include "Shlwapi.h" #include #include "hashtable.h" @@ -31,10 +33,11 @@ #include "application.h" #include "SRWLockWrapper.h" #include "environmentvariablehash.h" +#include "fx_ver.h" #include "utility.h" +#include "GlobalVersionUtility.h" #include "resources.h" #include "aspnetcore_msg.h" -#include "fx_ver.h" #include "hostfxr_utility.h" #include "hostfxroptions.h" #include "IOutputManager.h" @@ -42,3 +45,4 @@ #include "PipeOutputManager.h" #include "NullOutputManager.h" #include "LoggingHelpers.h" + diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.cxx b/src/AspNetCoreModuleV2/CommonLib/utility.cxx index a7bb7b1d63..965b13eb58 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.cxx +++ b/src/AspNetCoreModuleV2/CommonLib/utility.cxx @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include"stdafx.h" +#include "stdafx.h" // static HRESULT diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.h b/src/AspNetCoreModuleV2/CommonLib/utility.h index 58a5824044..f1f2c38afd 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/utility.h @@ -3,6 +3,8 @@ #pragma once +#include "stdafx.h" + class UTILITY { public: @@ -121,3 +123,4 @@ private: UTILITY() {} ~UTILITY() {} }; + diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 33756b7bd0..2a21ef619e 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -50,7 +50,9 @@ + + @@ -93,7 +95,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -118,7 +120,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -141,7 +143,7 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -166,9 +168,9 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - stdcpp14 + stdcpp17 true diff --git a/test/CommonLibTests/ConfigUtilityTests.cpp b/test/CommonLibTests/ConfigUtilityTests.cpp new file mode 100644 index 0000000000..fbed259117 --- /dev/null +++ b/test/CommonLibTests/ConfigUtilityTests.cpp @@ -0,0 +1,106 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "gmock/gmock.h" +using ::testing::_; +using ::testing::NiceMock; + +namespace ConfigUtilityTests +{ + TEST(ConfigUtilityTest, HandlerVersionSet) + { + IAppHostElement* retElement = NULL; + + STRU handlerVersion; + + // NiceMock removes warnings about "uninteresting calls", + auto element = std::make_unique>(); + auto innerElement = std::make_unique>(); + auto collection = std::make_unique>(); + auto nameElement = std::make_unique>(); + auto mockProperty = std::make_unique>(); + + ON_CALL(*element, GetElementByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); + ON_CALL(*innerElement, get_Collection(_)) + .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); + ON_CALL(*collection, get_Count(_)) + .WillByDefault(DoAll(testing::SetArgPointee<0>(1), testing::Return(S_OK))); + ON_CALL(*collection, get_Item(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); + ON_CALL(*nameElement, GetPropertyByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); + EXPECT_CALL(*mockProperty, get_StringValue(_)) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"handlerVersion")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))); + + HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); + + EXPECT_STREQ(handlerVersion.QueryStr(), L"value"); + } + + TEST(ConfigUtilityTest, NoHandlerVersion) + { + IAppHostElement* retElement = NULL; + + STRU handlerVersion; + + // NiceMock removes warnings about "uninteresting calls", + auto element = std::make_unique>(); + auto innerElement = std::make_unique>(); + auto collection = std::make_unique>(); + auto nameElement = std::make_unique>(); + auto mockProperty = std::make_unique>(); + + ON_CALL(*element, GetElementByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); + ON_CALL(*innerElement, get_Collection(_)) + .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); + ON_CALL(*collection, get_Count(_)) + .WillByDefault(DoAll(testing::SetArgPointee<0>(1), testing::Return(S_OK))); + ON_CALL(*collection, get_Item(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); + ON_CALL(*nameElement, GetPropertyByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); + EXPECT_CALL(*mockProperty, get_StringValue(_)) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"randomvalue")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))); + + HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); + + EXPECT_STREQ(handlerVersion.QueryStr(), L""); + } + + TEST(ConfigUtilityTest, MultipleElements) + { + IAppHostElement* retElement = NULL; + STRU handlerVersion; + + auto element = std::make_unique>(); + auto innerElement = std::make_unique>(); + auto collection = std::make_unique>(); + auto nameElement = std::make_unique>(); + auto mockProperty = std::make_unique>(); + + ON_CALL(*element, GetElementByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); + ON_CALL(*innerElement, get_Collection(_)) + .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); + ON_CALL(*collection, get_Count(_)) + .WillByDefault(DoAll(testing::SetArgPointee<0>(2), testing::Return(S_OK))); + ON_CALL(*collection, get_Item(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); + ON_CALL(*nameElement, GetPropertyByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); + EXPECT_CALL(*mockProperty, get_StringValue(_)) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"key")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"handlerVersion")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value2")), testing::Return(S_OK))); + + HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); + + EXPECT_STREQ(handlerVersion.QueryStr(), L"value2"); + } +} diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/test/CommonLibTests/FileOutputManagerTests.cpp index e3d261097a..ebfb790ed5 100644 --- a/test/CommonLibTests/FileOutputManagerTests.cpp +++ b/test/CommonLibTests/FileOutputManagerTests.cpp @@ -40,8 +40,6 @@ namespace FileOutManagerStartupTests wprintf(expected, out); } - // std::filesystem is available on c++17, however gtest fails to build when using it - // c++14 has filesystem as experimental. for (auto & p : std::experimental::filesystem::directory_iterator(tempDirectory)) { std::wstring filename(p.path().filename()); diff --git a/test/CommonLibTests/GlobalVersionTests.cpp b/test/CommonLibTests/GlobalVersionTests.cpp new file mode 100644 index 0000000000..00ec23f479 --- /dev/null +++ b/test/CommonLibTests/GlobalVersionTests.cpp @@ -0,0 +1,153 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "gtest/internal/gtest-port.h" + +namespace GlobalVersionTests +{ + using ::testing::Test; + namespace fs = std::experimental::filesystem; + + class GlobalVersionTest : public Test + { + protected: + void + RemoveFileNamePath(PCWSTR dllPath, PCWSTR expected) + { + std::wstring res = GlobalVersionUtility::RemoveFileNameFromFolderPath(dllPath); + EXPECT_STREQ(res.c_str(), expected); + } + }; + + TEST_F(GlobalVersionTest, RemovesPathCorrectly) + { + RemoveFileNamePath(L"test\\log.txt", L"test"); + RemoveFileNamePath(L"test\\log", L"test"); + RemoveFileNamePath(L"C:\\Program Files\\IIS\\aspnetcorev2.dll", L"C:\\Program Files\\IIS"); + RemoveFileNamePath(L"test\\log.txt", L"test"); + } + + TEST(GetRequestHandlerVersions, GetFolders) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + + auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.c_str()); + EXPECT_EQ(res.size(), 1); + EXPECT_EQ(res.at(0), fx_ver_t(2, 0, 0, std::wstring())); + } + + TEST(GetRequestHandlerVersions, GetFolderPreview) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0-preview")); + + auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.c_str()); + EXPECT_EQ(res.size(), 1); + EXPECT_EQ(res.at(0), fx_ver_t(2, 0, 0, std::wstring(L"-preview"))); + } + + TEST(GetRequestHandlerVersions, GetFolderManyVersions) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\1.9.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); + + auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.c_str()); + EXPECT_EQ(res.size(), 3); + EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(1, 9, 0, std::wstring())) != std::end(res)); + EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(2, 0, 0, std::wstring())) != std::end(res)); + EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(2, 1, 0, std::wstring())) != std::end(res)); + } + + TEST(FindHighestGlobalVersion, HighestVersionWithSingleFolder) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); + + EXPECT_STREQ(res.c_str(), L"2.0.0"); + } + + TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersions) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); + + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); + + EXPECT_STREQ(res.c_str(), L"2.1.0"); + } + + TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersionsPreview) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.2.0-preview")); + + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); + + EXPECT_STREQ(res.c_str(), L"2.2.0-preview"); + } + + TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersionNoPreview) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); + + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); + + EXPECT_STREQ(res.c_str(), L"2.1.0"); + } + + TEST(GetGlobalRequestHandlerPath, FindHighestVersionNoHandlerName) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"", L"aspnetcorev2_outofprocess.dll"); + + EXPECT_STREQ(result.c_str(), (tempPath + L"2.0.0\\aspnetcorev2_outofprocess.dll").c_str()); + } + + TEST(GetGlobalRequestHandlerPath, FindHighestVersionPreviewWins) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); + + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"", L"aspnetcorev2_outofprocess.dll"); + + EXPECT_STREQ(result.c_str(), (tempPath + L"2.1.0-preview\\aspnetcorev2_outofprocess.dll").c_str()); + } + + TEST(GetGlobalRequestHandlerPath, FindHighestVersionSpecificVersion) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); + + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"2.0.0", L"aspnetcorev2_outofprocess.dll"); + + EXPECT_STREQ(result.c_str(), (tempPath + L"2.0.0\\aspnetcorev2_outofprocess.dll").c_str()); + } + + TEST(GetGlobalRequestHandlerPath, FindHighestVersionSpecificPreview) + { + std::wstring tempPath = Helpers::CreateRandomTempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); + EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.2.0")); + + + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"2.1.0-preview", L"aspnetcorev2_outofprocess.dll"); + + EXPECT_STREQ(result.c_str(), (tempPath + L"2.1.0-preview\\aspnetcorev2_outofprocess.dll").c_str()); + } +} diff --git a/test/CommonLibTests/fakeclasses.h b/test/CommonLibTests/fakeclasses.h index 5f79138879..14c6f8dfee 100644 --- a/test/CommonLibTests/fakeclasses.h +++ b/test/CommonLibTests/fakeclasses.h @@ -1,7 +1,62 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#include "stdafx.h" +#pragma once + +#include "gtest/gtest.h" +#include "gmock/gmock.h" + +class MockProperty : public IAppHostProperty +{ +public: + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, QueryInterface, HRESULT(REFIID riid, void ** ppvObject)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, AddRef, ULONG()); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Release, ULONG()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Name, HRESULT(BSTR* pbstrValue)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Value, HRESULT(VARIANT * pVariant)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, put_Value, HRESULT(VARIANT value)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Clear, HRESULT()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_StringValue, HRESULT(BSTR* pbstrValue)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Exception, HRESULT(IAppHostPropertyException ** ppException)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT * pValue)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, SetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT value)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Schema, HRESULT(IAppHostPropertySchema ** ppSchema)); +}; + +class MockCollection : public IAppHostElementCollection +{ +public: + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, QueryInterface, HRESULT(REFIID riid, void ** ppvObject)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, AddRef, ULONG()); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Release, ULONG()); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Clear, HRESULT()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Schema, HRESULT(IAppHostCollectionSchema** pSchema)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Count, HRESULT(DWORD * dwordElem)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, get_Item, HRESULT(VARIANT cIndex, IAppHostElement ** ppElement)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, AddElement, HRESULT(IAppHostElement * pElement, INT cPosition)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, DeleteElement, HRESULT(VARIANT cIndex)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, CreateNewElement, HRESULT(BSTR bstrElementName, IAppHostElement** ppElement)); +}; + +class MockElement : public IAppHostElement +{ +public: + + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, QueryInterface, HRESULT(REFIID riid, void ** ppvObject)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, AddRef, ULONG()); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Release, ULONG()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Name, HRESULT(BSTR * pbstrName)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Collection, HRESULT(IAppHostElementCollection ** ppCollection)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Properties, HRESULT(IAppHostPropertyCollection ** ppProperties)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_ChildElements, HRESULT(IAppHostChildElementCollection ** ppElements)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT * pValue)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, SetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT value)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Schema, HRESULT(IAppHostElementSchema** pSchema)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetElementByName, HRESULT(BSTR bstrSubName, IAppHostElement ** ppElement)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetPropertyByName, HRESULT(BSTR bstrSubName, IAppHostProperty ** ppProperty)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Clear, HRESULT()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Methods, HRESULT(IAppHostMethodCollection ** ppMethods)); +}; class MockHttpServer : public IHttpServer { diff --git a/test/CommonLibTests/stdafx.h b/test/CommonLibTests/stdafx.h index ed238e1b3d..47095a9fee 100644 --- a/test/CommonLibTests/stdafx.h +++ b/test/CommonLibTests/stdafx.h @@ -43,6 +43,7 @@ #include "requesthandler_config.h" #include "hostfxr_utility.h" +#include "config_utility.h" #include "environmentvariablehash.h" #include "iapplication.h" #include "utility.h" @@ -51,9 +52,11 @@ #include "resources.h" #include "aspnetcore_msg.h" #include "Helpers.h" +#include "GlobalVersionUtility.h" #undef assert // Macro redefinition in IISLib. -#include "gtest\gtest.h" +#include "gtest/gtest.h" +#include "fakeclasses.h" // Externals defined in inprocess BOOL g_fProcessDetach; diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs new file mode 100644 index 0000000000..6e50228564 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -0,0 +1,160 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Xml.Linq; +using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class GlobalVersionTests : IISFunctionalTestBase + { + private const string _aspNetCoreDll = "aspnetcorev2_outofprocess.dll"; + private const string _handlerVersion20 = "2.0.0"; + private const string _helloWorldRequest = "HelloWorld"; + private const string _helloWorldResponse = "Hello World"; + private const string _outOfProcessVersionVariable = "/p:AspNetCoreModuleOutOfProcessVersion="; + + [Fact] + public async Task GlobalVersion_DefaultWorks() + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + deploymentParameters.PublishApplicationBeforeDeployment = false; + + deploymentParameters.ServerConfigTemplateContent = GetServerConfig( + element => + { + var handlerVersionElement = new XElement("handlerSetting"); + handlerVersionElement.SetAttributeValue("name", "handlerVersion"); + handlerVersionElement.SetAttributeValue("value", _handlerVersion20); + + element.Descendants("aspNetCore").Single() + .Add(new XElement("handlerSettings", handlerVersionElement)); + }); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(_helloWorldResponse, responseText); + } + + [Theory] // Tests need to publish to change folder locations + [InlineData("2.1.0")] + [InlineData("2.1.0-preview")] + public async Task GlobalVersion_NewVersionNumber_Fails(string version) + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + + var deploymentResult = await DeployAsync(deploymentParameters); + + Helpers.ModifyHandlerSectionInWebConfig(deploymentResult, version); + + var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); + Assert.False(response.IsSuccessStatusCode); + } + + [Theory] // Tests need to publish to change folder locations + [InlineData("2.1.0")] + [InlineData("2.1.0-preview")] + public async Task GlobalVersion_NewVersionNumber(string version) + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + deploymentParameters.AdditionalPublishParameters = $"{_outOfProcessVersionVariable}{version}"; + + var deploymentResult = await DeployAsync(deploymentParameters); + + Helpers.ModifyHandlerSectionInWebConfig(deploymentResult, version); + + var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(_helloWorldResponse, responseText); + } + + [Theory] // Tests need to publish to change folder locations + [InlineData("2.1.0")] + [InlineData("2.1.0-preview")] + public async Task GlobalVersion_MultipleRequestHandlers_PicksHighestOne(string version) + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); + + var newANCMPath = GetANCMRequestHandlerPath(deploymentResult, version); + + var di = Directory.CreateDirectory(Path.GetDirectoryName(newANCMPath)); + + File.Copy(originalANCMPath, newANCMPath, true); + + deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); + var response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(_helloWorldResponse, responseText); + } + + [Theory] + [InlineData("2.1.0")] + [InlineData("2.1.0-preview")] + public async Task GlobalVersion_MultipleRequestHandlers_UpgradeWorks(string version) + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + var deploymentResult = await DeployAsync(deploymentParameters); + + var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); + + deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", originalANCMPath); + var response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(_helloWorldResponse, responseText); + + Dispose(); + + deploymentResult = await DeployAsync(deploymentParameters); + + originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); + + var newANCMPath = GetANCMRequestHandlerPath(deploymentResult, version); + + var di = Directory.CreateDirectory(Path.GetDirectoryName(newANCMPath)); + + File.Copy(originalANCMPath, newANCMPath, true); + + deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); + response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); + responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(_helloWorldResponse, responseText); + } + + private DeploymentParameters GetGlobalVersionBaseDeploymentParameters() + { + return new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + { + TargetFramework = Tfm.NetCoreApp22, + ApplicationType = ApplicationType.Portable, + AncmVersion = AncmVersion.AspNetCoreModuleV2, + HostingModel = HostingModel.OutOfProcess, + PublishApplicationBeforeDeployment = true, + AdditionalPublishParameters = $"{_outOfProcessVersionVariable}{_handlerVersion20}" + }; + } + + private string GetANCMRequestHandlerPath(IISDeploymentResult deploymentResult, string version) + { + return Path.Combine(deploymentResult.DeploymentResult.ContentRoot, + deploymentResult.DeploymentResult.DeploymentParameters.RuntimeArchitecture.ToString(), + version, + _aspNetCoreDll); + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs index 4d3e0e65dc..d66fecf3cb 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs @@ -21,16 +21,31 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string GetOutOfProcessTestSitesPath() => GetTestWebSitePath("OutOfProcessWebSite"); public static void ModifyAspNetCoreSectionInWebConfig(IISDeploymentResult deploymentResult, string key, string value) - => ModifySectionInWebConfig(deploymentResult, key, value, section: "aspNetCore", 0); + => ModifyAttributeInWebConfig(deploymentResult, key, value, section: "aspNetCore"); - public static void ModifySectionInWebConfig(IISDeploymentResult deploymentResult, string key, string value, string section, int index) + public static void ModifyAttributeInWebConfig(IISDeploymentResult deploymentResult, string key, string value, string section) { - // modify the web.config after publish - var root = deploymentResult.DeploymentResult.ContentRoot; - var webConfigFile = $"{root}/web.config"; + var webConfigFile = GetWebConfigFile(deploymentResult); var config = XDocument.Load(webConfigFile); - var element = config.Descendants(section).ToList()[index]; + + var element = config.Descendants(section).Single(); element.SetAttributeValue(key, value); + + config.Save(webConfigFile); + } + + public static void ModifyHandlerSectionInWebConfig(IISDeploymentResult deploymentResult, string handlerVersionValue) + { + var webConfigFile = GetWebConfigFile(deploymentResult); + var config = XDocument.Load(webConfigFile); + + var handlerVersionElement = new XElement("handlerSetting"); + handlerVersionElement.SetAttributeValue("name", "handlerVersion"); + handlerVersionElement.SetAttributeValue("value", handlerVersionValue); + + config.Descendants("aspNetCore").Single() + .Add(new XElement("handlerSettings", handlerVersionElement)); + config.Save(webConfigFile); } @@ -46,5 +61,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests PublishApplicationBeforeDeployment = site == "InProcessWebSite", }; } + + private static string GetWebConfigFile(IISDeploymentResult deploymentResult) + => Path.Combine(deploymentResult.DeploymentResult.ContentRoot, "web.config"); } } diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/test/WebSites/OutOfProcessWebSite/Startup.cs index 4b26fa7ba2..fc7021c992 100644 --- a/test/WebSites/OutOfProcessWebSite/Startup.cs +++ b/test/WebSites/OutOfProcessWebSite/Startup.cs @@ -2,7 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Security.Principal; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; @@ -84,5 +86,22 @@ namespace TestSites public Task UpgradeFeatureDetection(HttpContext context) => context.Response.WriteAsync(context.Features.Get() != null? "Enabled": "Disabled"); + + public Task CheckRequestHandlerVersion(HttpContext context) + { + // We need to check if the aspnetcorev2_outofprocess dll is loaded by iisexpress.exe + // As they aren't in the same process, we will try to delete the file and expect a file + // in use error + try + { + File.Delete(context.Request.Headers["ANCMRHPath"]); + } + catch(UnauthorizedAccessException) + { + return context.Response.WriteAsync("Hello World"); + } + + return context.Response.WriteAsync(context.Request.Headers["ANCMRHPath"]); + } } } diff --git a/test/gtest/gtest.vcxproj b/test/gtest/gtest.vcxproj index 660be83f21..9f745f3a84 100644 --- a/test/gtest/gtest.vcxproj +++ b/test/gtest/gtest.vcxproj @@ -19,6 +19,7 @@ + @@ -105,7 +106,7 @@ true WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) + googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -121,7 +122,7 @@ true _DEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) + googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -139,7 +140,7 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) + googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -159,7 +160,7 @@ true NDEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;%(AdditionalIncludeDirectories) + googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) MultiThreaded diff --git a/version.props b/version.props index c836c8d68c..ddf502f2b3 100644 --- a/version.props +++ b/version.props @@ -11,5 +11,6 @@ 8 1 0 + 2.0.0 From d218881f5fb1f955064bc5a14d10cb09bf596fa9 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 13 Jun 2018 14:27:24 -0700 Subject: [PATCH 063/363] Fix nuspec file path to out of proc request handler. (#914) --- build/repo.targets | 2 +- nuget/AspNetCoreV2.nuspec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/repo.targets b/build/repo.targets index c5c7cfd50e..2adc903471 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -101,7 +101,7 @@ diff --git a/nuget/AspNetCoreV2.nuspec b/nuget/AspNetCoreV2.nuspec index 5d26da23c8..4fc349ed86 100644 --- a/nuget/AspNetCoreV2.nuspec +++ b/nuget/AspNetCoreV2.nuspec @@ -21,8 +21,8 @@ - - + + From da14806d9e9a6d7323aa4d02553413cd040b72cd Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 13 Jun 2018 15:39:47 -0700 Subject: [PATCH 064/363] Make content files include subdirectory dlls. --- nuget/AspNetCoreV2.nuspec | 1 + 1 file changed, 1 insertion(+) diff --git a/nuget/AspNetCoreV2.nuspec b/nuget/AspNetCoreV2.nuspec index 4fc349ed86..10430a581b 100644 --- a/nuget/AspNetCoreV2.nuspec +++ b/nuget/AspNetCoreV2.nuspec @@ -16,6 +16,7 @@ Microsoft.AspNetCore.AspNetCoreModule + From 2db54362a507b05ad400750aeebc69577c71294e Mon Sep 17 00:00:00 2001 From: pan-wang Date: Wed, 13 Jun 2018 21:52:52 -0700 Subject: [PATCH 065/363] Panwang/shim (#911) remove shim config from module context and remove application_info_key as we can use string directly --- .../AspNetCore/Inc/applicationinfo.h | 92 ++++---- .../AspNetCore/Inc/applicationmanager.h | 2 +- .../AspNetCore/Inc/aspnetcore_shim_config.h | 35 +-- .../AspNetCore/src/applicationinfo.cpp | 56 +++-- .../AspNetCore/src/applicationmanager.cxx | 204 +++++++----------- .../AspNetCore/src/aspnetcore_shim_config.cpp | 105 --------- .../AspNetCore/src/proxymodule.cxx | 19 +- src/AspNetCoreModuleV2/CommonLib/resources.h | 4 +- 8 files changed, 167 insertions(+), 350 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h index 0648f3bf79..f1080bfa12 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h @@ -27,64 +27,27 @@ HRESULT extern BOOL g_fRecycleProcessCalled; extern PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; -// -// The key used for hash-table lookups, consists of the port on which the http process is created. -// -class APPLICATION_INFO_KEY -{ -public: - - APPLICATION_INFO_KEY( - VOID - ) : INLINE_STRU_INIT(m_struKey) - { - } - - HRESULT - Initialize( - _In_ LPCWSTR pszKey - ) - { - return m_struKey.Copy(pszKey); - } - - BOOL - GetIsEqual( - const APPLICATION_INFO_KEY * key2 - ) const - { - return m_struKey.Equals(key2->m_struKey); - } - - DWORD CalcKeyHash() const - { - return Hash(m_struKey.QueryStr()); - } - -private: - - INLINE_STRU(m_struKey, 1024); -}; - - class APPLICATION_INFO { public: - APPLICATION_INFO(IHttpServer *pServer) : - m_pServer(pServer), - m_cRefs(1), m_fAppOfflineFound(FALSE), - m_pAppOfflineHtm(NULL), m_pFileWatcherEntry(NULL), + APPLICATION_INFO() : + m_pServer(NULL), + m_cRefs(1), + m_fAppOfflineFound(FALSE), + m_fAllowStart(FALSE), + m_pAppOfflineHtm(NULL), + m_pFileWatcherEntry(NULL), m_pConfiguration(NULL), m_pfnAspNetCoreCreateApplication(NULL) { InitializeSRWLock(&m_srwLock); } - APPLICATION_INFO_KEY * + PCWSTR QueryApplicationInfoKey() { - return &m_applicationInfoKey; + return m_struInfoKey.QueryStr(); } virtual @@ -92,7 +55,8 @@ public: HRESULT Initialize( - _In_ ASPNETCORE_SHIM_CONFIG *pConfiguration, + _In_ IHttpServer *pServer, + _In_ IHttpApplication *pApplication, _In_ FILE_WATCHER *pFileWatcher ); @@ -122,6 +86,18 @@ public: return m_fAppOfflineFound; } + BOOL QueryAllowStart() + { + return m_fAllowStart; + } + + VOID + UpdateAllowStartStatus(BOOL fAllowed) + { + // no lock, as no expectation for concurrent accesses + m_fAllowStart = fAllowed; + } + VOID UpdateAppOfflineFileHandle(); @@ -134,6 +110,7 @@ public: return m_pConfiguration; } + // // ExtractApplication will increase the reference counter of the application // Caller is responsible for dereference the application. @@ -170,8 +147,9 @@ private: static VOID DoRecycleApplication(LPVOID lpParam); mutable LONG m_cRefs; - APPLICATION_INFO_KEY m_applicationInfoKey; + STRU m_struInfoKey; BOOL m_fAppOfflineFound; + BOOL m_fAllowStart; // Flag indicates whether there is (configuration) error blocking application from starting APP_OFFLINE_HTM *m_pAppOfflineHtm; FILE_WATCHER_ENTRY *m_pFileWatcherEntry; ASPNETCORE_SHIM_CONFIG *m_pConfiguration; @@ -185,7 +163,7 @@ private: }; class APPLICATION_INFO_HASH : - public HASH_TABLE + public HASH_TABLE { public: @@ -193,7 +171,7 @@ public: APPLICATION_INFO_HASH() {} - APPLICATION_INFO_KEY * + PCWSTR ExtractKey( APPLICATION_INFO *pApplicationInfo ) @@ -203,19 +181,23 @@ public: DWORD CalcKeyHash( - APPLICATION_INFO_KEY *key + PCWSTR pszApplicationId ) { - return key->CalcKeyHash(); + return HashStringNoCase(pszApplicationId); } BOOL EqualKeys( - APPLICATION_INFO_KEY *key1, - APPLICATION_INFO_KEY *key2 + PCWSTR pszKey1, + PCWSTR pszKey2 ) { - return key1->GetIsEqual(key2); + return CompareStringOrdinal(pszKey1, + -1, + pszKey2, + -1, + TRUE) == CSTR_EQUAL; } VOID diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h index 5577df2de2..06c168d4b9 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h @@ -71,7 +71,7 @@ public: HRESULT GetOrCreateApplicationInfo( _In_ IHttpServer* pServer, - _In_ ASPNETCORE_SHIM_CONFIG* pConfig, + _In_ IHttpContext* pHttpContext, _Out_ APPLICATION_INFO ** ppApplicationInfo ); diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h index 36f2a18c51..401efa3010 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h @@ -18,46 +18,18 @@ enum APP_HOSTING_MODEL HOSTING_OUT_PROCESS }; -class ASPNETCORE_SHIM_CONFIG : IHttpStoredContext +class ASPNETCORE_SHIM_CONFIG { public: virtual ~ASPNETCORE_SHIM_CONFIG(); - static - HRESULT - GetConfig( - _In_ IHttpServer *pHttpServer, - _In_ HTTP_MODULE_ID pModuleId, - _In_ IHttpApplication *pHttpApplication, - _Out_ ASPNETCORE_SHIM_CONFIG **ppAspNetCoreConfig - ); - HRESULT Populate( IHttpServer *pHttpServer, IHttpApplication *pHttpContext ); - VOID - ReferenceConfiguration( - VOID - ) const; - - VOID - DereferenceConfiguration( - VOID - ) const; - - - VOID - CleanupStoredContext( - VOID - ) - { - DereferenceConfiguration(); - } - STRU* QueryApplicationPhysicalPath( VOID @@ -114,14 +86,13 @@ public: return &m_struHandlerVersion; } -private: ASPNETCORE_SHIM_CONFIG() : - m_cRefs(1), m_hostingModel(HOSTING_UNKNOWN) { } - mutable LONG m_cRefs; +private: + STRU m_struArguments; STRU m_struProcessPath; STRU m_struApplication; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 38e4d8cb80..56fcc08f6f 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -41,38 +41,51 @@ APPLICATION_INFO::~APPLICATION_INFO() // since the former will use it during shutdown if (m_pConfiguration != NULL) { - // Need to dereference the configuration instance - m_pConfiguration->DereferenceConfiguration(); + delete m_pConfiguration; m_pConfiguration = NULL; } } HRESULT APPLICATION_INFO::Initialize( - _In_ ASPNETCORE_SHIM_CONFIG *pConfiguration, + _In_ IHttpServer *pServer, + _In_ IHttpApplication *pApplication, _In_ FILE_WATCHER *pFileWatcher ) { HRESULT hr = S_OK; - DBG_ASSERT(pConfiguration); + DBG_ASSERT(pServer); + DBG_ASSERT(pApplication); DBG_ASSERT(pFileWatcher); - m_pConfiguration = pConfiguration; + // todo: make sure Initialize should be called only once + m_pServer = pServer; + m_pConfiguration = new ASPNETCORE_SHIM_CONFIG(); - // reference the configuration instance to prevent it will be not release - // earlier in case of configuration change and shutdown - m_pConfiguration->ReferenceConfiguration(); + if (m_pConfiguration == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } - hr = m_applicationInfoKey.Initialize(pConfiguration->QueryConfigPath()->QueryStr()); + hr = m_pConfiguration->Populate(m_pServer, pApplication); if (FAILED(hr)) { goto Finished; } + hr = m_struInfoKey.Copy(pApplication->GetApplicationId()); + if (FAILED(hr)) + { + goto Finished; + } + + m_pFileWatcherEntry = new FILE_WATCHER_ENTRY(pFileWatcher); if (m_pFileWatcherEntry == NULL) { - m_pFileWatcherEntry = new FILE_WATCHER_ENTRY(pFileWatcher); + hr = E_OUTOFMEMORY; + goto Finished; } UpdateAppOfflineFileHandle(); @@ -296,10 +309,11 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) if (FAILED(hr = FindNativeAssemblyFromHostfxr(options.get(), pstrHandlerDllName, &struFileName))) { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_ERROR_TYPE, ASPNETCORE_EVENT_INPROCESS_RH_MISSING, - ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG); + ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG, + struFileName.IsEmpty() ? s_pwzAspnetcoreInProcessRequestHandlerName : struFileName.QueryStr()); goto Finished; } @@ -308,10 +322,11 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) { if (FAILED(hr = FindNativeAssemblyFromGlobalLocation(pstrHandlerDllName, &struFileName))) { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_ERROR_TYPE, ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, - ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG); + ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG, + struFileName.IsEmpty() ? s_pwzAspnetcoreOutOfProcessRequestHandlerName : struFileName.QueryStr()); goto Finished; } @@ -582,6 +597,15 @@ APPLICATION_INFO::RecycleApplication() 0, // default creation flags NULL); // receive thread identifier } + else + { + if (m_pConfiguration->QueryHostingModel() == HOSTING_IN_PROCESS) + { + // In process application failed to start for whatever reason, need to recycle the work process + m_pServer->RecycleProcess(L"AspNetCore InProcess Recycle Process on Demand"); + } + + } if (hThread == NULL) { diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx index 7d49d91ace..cbe291a28f 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx @@ -1,11 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. +#include #include "applicationmanager.h" - #include "proxymodule.h" #include "utility.h" -#include // The application manager is a singleton across ANCM. APPLICATION_MANAGER* APPLICATION_MANAGER::sm_pApplicationManager = NULL; @@ -17,34 +16,30 @@ APPLICATION_MANAGER* APPLICATION_MANAGER::sm_pApplicationManager = NULL; HRESULT APPLICATION_MANAGER::GetOrCreateApplicationInfo( _In_ IHttpServer* pServer, - _In_ ASPNETCORE_SHIM_CONFIG* pConfig, + _In_ IHttpContext* pHttpContext, _Out_ APPLICATION_INFO ** ppApplicationInfo ) { - HRESULT hr = S_OK; - APPLICATION_INFO *pApplicationInfo = NULL; - APPLICATION_INFO_KEY key; - BOOL fExclusiveLock = FALSE; - BOOL fMixedHostingModelError = FALSE; - BOOL fDuplicatedInProcessApp = FALSE; - PCWSTR pszApplicationId = NULL; + HRESULT hr = S_OK; + APPLICATION_INFO *pApplicationInfo = NULL; + BOOL fExclusiveLock = FALSE; + BOOL fMixedHostingModelError = FALSE; + BOOL fDuplicatedInProcessApp = FALSE; + PCWSTR pszApplicationId = NULL; + APP_HOSTING_MODEL hostingModel = HOSTING_UNKNOWN; + STACK_STRU ( strEventMsg, 256 ); DBG_ASSERT(pServer); - DBG_ASSERT(pConfig); + DBG_ASSERT(pHttpContext); DBG_ASSERT(ppApplicationInfo); *ppApplicationInfo = NULL; // The configuration path is unique for each application and is used for the // key in the applicationInfoHash. - pszApplicationId = pConfig->QueryConfigPath()->QueryStr(); - hr = key.Initialize(pszApplicationId); - if (FAILED(hr)) - { - goto Finished; - } - + pszApplicationId = pHttpContext->GetApplication()->GetApplicationId(); + // When accessing the m_pApplicationInfoHash, we need to acquire the application manager // lock to avoid races on setting state. AcquireSRWLockShared(&m_srwLock); @@ -54,32 +49,24 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( hr = HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS); goto Finished; } - m_pApplicationInfoHash->FindKey(&key, ppApplicationInfo); + m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); ReleaseSRWLockShared(&m_srwLock); if (*ppApplicationInfo == NULL) { - // Check which hosting model we want to support - switch (pConfig->QueryHostingModel()) + + pApplicationInfo = new APPLICATION_INFO(); + if (pApplicationInfo == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } + + hr = pApplicationInfo->Initialize(pServer, pHttpContext->GetApplication(), m_pFileWatcher); + if (FAILED(hr)) { - case HOSTING_IN_PROCESS: - if (m_pApplicationInfoHash->Count() > 0) - { - // Only one inprocess app is allowed per IIS worker process - fDuplicatedInProcessApp = TRUE; - hr = HRESULT_FROM_WIN32(ERROR_APP_INIT_FAILURE); - goto Finished; - } - break; - - case HOSTING_OUT_PROCESS: - break; - - default: - hr = E_UNEXPECTED; goto Finished; } - pApplicationInfo = new APPLICATION_INFO(pServer); AcquireSRWLockExclusive(&m_srwLock); fExclusiveLock = TRUE; @@ -89,56 +76,47 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( hr = HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS); goto Finished; } - m_pApplicationInfoHash->FindKey(&key, ppApplicationInfo); + m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); if (*ppApplicationInfo != NULL) { // someone else created the application - delete pApplicationInfo; - pApplicationInfo = NULL; goto Finished; } - // hosting model check. We do not allow mixed scenario for now - // could be changed in the future - if (m_hostingModel != HOSTING_UNKNOWN) + hr = m_pApplicationInfoHash->InsertRecord(pApplicationInfo); + if (FAILED(hr)) { - if (m_hostingModel != pConfig->QueryHostingModel()) + goto Finished; + } + + hostingModel = pApplicationInfo->QueryConfig()->QueryHostingModel(); + + if (m_pApplicationInfoHash->Count() == 1) + { + m_hostingModel = hostingModel; + pApplicationInfo->UpdateAllowStartStatus(TRUE); + } + else + { + if (hostingModel == HOSTING_OUT_PROCESS && hostingModel == m_hostingModel) { - // hosting model does not match, error out - fMixedHostingModelError = TRUE; - hr = HRESULT_FROM_WIN32(ERROR_APP_INIT_FAILURE); - goto Finished; + pApplicationInfo->UpdateAllowStartStatus(TRUE); + } + else + { + if (hostingModel != m_hostingModel) + { + fMixedHostingModelError = TRUE; + } + else + { + fDuplicatedInProcessApp = TRUE; + } } } - hr = pApplicationInfo->Initialize(pConfig, m_pFileWatcher); - if (FAILED(hr)) - { - goto Finished; - } - - hr = m_pApplicationInfoHash->InsertRecord( pApplicationInfo ); - if (FAILED(hr)) - { - goto Finished; - } - - // - // first application will decide which hosting model allowed by this process - // - if (m_hostingModel == HOSTING_UNKNOWN) - { - m_hostingModel = pConfig->QueryHostingModel(); - } - *ppApplicationInfo = pApplicationInfo; - pApplicationInfo->StartMonitoringAppOffline(); - - // Release the locko after starting to monitor for app offline to avoid races with it being dropped. - ReleaseSRWLockExclusive(&m_srwLock); - - fExclusiveLock = FALSE; pApplicationInfo = NULL; } @@ -149,54 +127,32 @@ Finished: ReleaseSRWLockExclusive(&m_srwLock); } + // log the error + if (fDuplicatedInProcessApp) + { + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_ERROR_TYPE, + ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP, + ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG, + pszApplicationId); + + } + else if (fMixedHostingModelError) + { + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_ERROR_TYPE, + ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR, + ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG, + pszApplicationId, + hostingModel); + } + if (pApplicationInfo != NULL) { pApplicationInfo->DereferenceApplicationInfo(); pApplicationInfo = NULL; } - if (FAILED(hr)) - { - if (fDuplicatedInProcessApp) - { - if (SUCCEEDED(strEventMsg.SafeSnwprintf( - ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG, - pszApplicationId))) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP, - strEventMsg.QueryStr()); - } - } - else if (fMixedHostingModelError) - { - if (SUCCEEDED(strEventMsg.SafeSnwprintf( - ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG, - pszApplicationId, - pConfig->QueryHostingModel()))) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR, - strEventMsg.QueryStr()); - } - } - else - { - if (SUCCEEDED(strEventMsg.SafeSnwprintf( - ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG, - pszApplicationId, - hr))) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_ADD_APPLICATION_ERROR, - strEventMsg.QueryStr()); - } - } - } - return hr; } @@ -237,7 +193,7 @@ APPLICATION_MANAGER::FindConfigChangedApplication( } else { - pContext->MultiSz.Append(*pstruConfigPath); + pContext->MultiSz.Append(pEntry->QueryApplicationInfoKey()); } } return fChanged; @@ -256,7 +212,6 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( ) { HRESULT hr = S_OK; - APPLICATION_INFO_KEY key; DWORD dwPreviousCounter = 0; APPLICATION_INFO_HASH* table = NULL; CONFIG_CHANGE_CONTEXT context; @@ -276,11 +231,6 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( return hr; } - hr = key.Initialize(pszApplicationId); - if (FAILED(hr)) - { - goto Finished; - } // Make a shallow copy of existing hashtable as we may need to remove nodes // This will be used for finding differences in which applications are affected by a config change. table = new APPLICATION_INFO_HASH(); @@ -353,13 +303,7 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( strEventMsg.QueryStr()); } - hr = key.Initialize(path); - if (FAILED(hr)) - { - goto Finished; - } - - table->FindKey(&key, &pRecord); + table->FindKey(path, &pRecord); DBG_ASSERT(pRecord != NULL); // RecycleApplication is called on a separate thread. diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp index 08fd9821f3..108d5f4f6c 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp @@ -12,110 +12,6 @@ ASPNETCORE_SHIM_CONFIG::~ASPNETCORE_SHIM_CONFIG() { } -VOID -ASPNETCORE_SHIM_CONFIG::ReferenceConfiguration( - VOID -) const -{ - InterlockedIncrement(&m_cRefs); -} - -VOID -ASPNETCORE_SHIM_CONFIG::DereferenceConfiguration( - VOID -) const -{ - DBG_ASSERT(m_cRefs != 0); - LONG cRefs = 0; - if ((cRefs = InterlockedDecrement(&m_cRefs)) == 0) - { - delete this; - } -} - -HRESULT -ASPNETCORE_SHIM_CONFIG::GetConfig( - _In_ IHttpServer *pHttpServer, - _In_ HTTP_MODULE_ID pModuleId, - _In_ IHttpApplication *pHttpApplication, - _Out_ ASPNETCORE_SHIM_CONFIG **ppAspNetCoreShimConfig -) -{ - HRESULT hr = S_OK; - ASPNETCORE_SHIM_CONFIG *pAspNetCoreShimConfig = NULL; - STRU struHostFxrDllLocation; - STRU struExeAbsolutePath; - - if (ppAspNetCoreShimConfig == NULL) - { - hr = E_INVALIDARG; - goto Finished; - } - - *ppAspNetCoreShimConfig = NULL; - - // potential bug if user sepcific config at virtual dir level - pAspNetCoreShimConfig = (ASPNETCORE_SHIM_CONFIG*) - pHttpApplication->GetModuleContextContainer()->GetModuleContext(pModuleId); - - if (pAspNetCoreShimConfig != NULL) - { - *ppAspNetCoreShimConfig = pAspNetCoreShimConfig; - pAspNetCoreShimConfig = NULL; - goto Finished; - } - - pAspNetCoreShimConfig = new ASPNETCORE_SHIM_CONFIG; - - hr = pAspNetCoreShimConfig->Populate(pHttpServer, pHttpApplication); - if (FAILED(hr)) - { - goto Finished; - } - - hr = pHttpApplication->GetModuleContextContainer()-> - SetModuleContext(pAspNetCoreShimConfig, pModuleId); - - if (FAILED(hr)) - { - if (hr == HRESULT_FROM_WIN32(ERROR_ALREADY_ASSIGNED)) - { - delete pAspNetCoreShimConfig; - - pAspNetCoreShimConfig = (ASPNETCORE_SHIM_CONFIG*)pHttpApplication-> - GetModuleContextContainer()-> - GetModuleContext(pModuleId); - - _ASSERT(pAspNetCoreShimConfig != NULL); - - hr = S_OK; - } - else - { - goto Finished; - } - } - else - { - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "ASPNETCORE_SHIM_CONFIG::GetConfig, set config to ModuleContext"); - } - - *ppAspNetCoreShimConfig = pAspNetCoreShimConfig; - pAspNetCoreShimConfig = NULL; - -Finished: - - if (pAspNetCoreShimConfig != NULL) - { - delete pAspNetCoreShimConfig; - pAspNetCoreShimConfig = NULL; - } - - return hr; -} - - HRESULT ASPNETCORE_SHIM_CONFIG::Populate( IHttpServer *pHttpServer, @@ -205,4 +101,3 @@ Finished: return hr; } - diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index 69ad025692..47d49ffcff 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -82,7 +82,6 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( ) { HRESULT hr = S_OK; - ASPNETCORE_SHIM_CONFIG *pConfig = NULL; APPLICATION_MANAGER *pApplicationManager = NULL; REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; IAPPLICATION* pApplication = NULL; @@ -94,20 +93,22 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( goto Finished; } - hr = ASPNETCORE_SHIM_CONFIG::GetConfig(g_pHttpServer, g_pModuleId, pHttpContext->GetApplication(), &pConfig); + pApplicationManager = APPLICATION_MANAGER::GetInstance(); + + hr = pApplicationManager->GetOrCreateApplicationInfo( + g_pHttpServer, + pHttpContext, + &m_pApplicationInfo); if (FAILED(hr)) { goto Finished; } - pApplicationManager = APPLICATION_MANAGER::GetInstance(); - - hr = pApplicationManager->GetOrCreateApplicationInfo( - g_pHttpServer, - pConfig, - &m_pApplicationInfo); - if (FAILED(hr)) + if (!m_pApplicationInfo->QueryAllowStart()) { + // Application cannot be started due to wrong hosting mode + // the error should already been logged to window event log for the first request + hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; goto Finished; } diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index 140a573f3f..773021784a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -43,5 +43,5 @@ #define ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_MSG L"Could not find application executable in '%s'. ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, ErrorCode = '0x%x. Please check the stderr logs for more information." #define ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG L"Invalid or unknown processPath provided in web.config: processPath = %s, ErrorCode = '0x%x'." -#define ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG L"Could not find the aspnetcorerh.dll for in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application." -#define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG L"Could not find the aspnetcorerh.dll for out-of-process application. Please confirm the aspnetcorerh.dll is installed in installed globally for IIS or IISExpress." +#define ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application." +#define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for out-of-process application. Please confirm the assembly is installed correctly for IIS or IISExpress." From 9a7ad90a8f704136a34d0a6c1b634af6a5bd6168 Mon Sep 17 00:00:00 2001 From: Peter Hsu Date: Thu, 14 Jun 2018 09:17:15 -0700 Subject: [PATCH 066/363] Revert stdout logging behavior to call SetStdHandle (#907) --- .../CommonLib/FileOutputManager.cpp | 106 ++++++++++-------- .../CommonLib/FileOutputManager.h | 5 +- .../CommonLib/PipeOutputManager.cpp | 23 ++-- .../CommonLib/PipeOutputManager.h | 4 +- .../inprocessapplication.cpp | 5 +- .../CommonLibTests/FileOutputManagerTests.cpp | 10 +- 6 files changed, 77 insertions(+), 76 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp index f7b77c92fc..74c02a43cb 100644 --- a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp @@ -5,7 +5,6 @@ #include "sttimer.h" FileOutputManager::FileOutputManager() - : m_pStdOutFile(NULL) { } @@ -14,16 +13,17 @@ FileOutputManager::~FileOutputManager() HANDLE handle = NULL; WIN32_FIND_DATA fileData; - if (m_pStdOutFile != NULL) + if (m_hLogFileHandle != INVALID_HANDLE_VALUE) { m_Timer.CancelTimer(); - _close(_fileno(m_pStdOutFile)); - m_pStdOutFile = NULL; + CloseHandle(m_hLogFileHandle); + m_hLogFileHandle = INVALID_HANDLE_VALUE; } // delete empty log file handle = FindFirstFile(m_struLogFilePath.QueryStr(), &fileData); if (handle != INVALID_HANDLE_VALUE && + handle != NULL && fileData.nFileSizeHigh == 0 && fileData.nFileSizeLow == 0) // skip check of nFileSizeHigh { @@ -33,8 +33,15 @@ FileOutputManager::~FileOutputManager() DeleteFile(m_struLogFilePath.QueryStr()); } - _dup2(m_fdStdOut, _fileno(stdout)); - _dup2(m_fdStdErr, _fileno(stderr)); + if (m_fdPreviousStdOut >= 0) + { + _dup2(m_fdPreviousStdOut, _fileno(stdout)); + } + + if (m_fdPreviousStdErr >= 0) + { + _dup2(m_fdPreviousStdErr, _fileno(stderr)); + } } HRESULT @@ -104,35 +111,19 @@ FileOutputManager::Start() SYSTEMTIME systemTime; SECURITY_ATTRIBUTES saAttr = { 0 }; STRU struPath; - hr = UTILITY::ConvertPathToFullPath( m_wsStdOutLogFileName.QueryStr(), m_wsApplicationPath.QueryStr(), &struPath); - if (FAILED(hr)) { - goto Finished; + return hr; } hr = UTILITY::EnsureDirectoryPathExist(struPath.QueryStr()); if (FAILED(hr)) { - goto Finished; - } - - m_fdStdOut = _dup(_fileno(stdout)); - if (m_fdStdOut == -1) - { - hr = E_HANDLE; - goto Finished; - } - - m_fdStdErr = _dup(_fileno(stderr)); - if (m_fdStdErr == -1) - { - hr = E_HANDLE; - goto Finished; + return hr; } GetSystemTime(&systemTime); @@ -147,38 +138,55 @@ FileOutputManager::Start() GetCurrentProcessId()); if (FAILED(hr)) { - goto Finished; - } - saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); - saAttr.bInheritHandle = TRUE; - saAttr.lpSecurityDescriptor = NULL; - - if (_wfreopen_s(&m_pStdOutFile, m_struLogFilePath.QueryStr(), L"w+", stdout) == 0) - { - setvbuf(m_pStdOutFile, NULL, _IONBF, 0); - if (_dup2(_fileno(m_pStdOutFile), _fileno(stdout)) == -1) - { - hr = E_HANDLE; - goto Finished; - } - if (_dup2(_fileno(m_pStdOutFile), _fileno(stderr)) == -1) - { - hr = E_HANDLE; - goto Finished; - } + return hr; } - m_hLogFileHandle = (HANDLE)_get_osfhandle(_fileno(m_pStdOutFile)); + m_fdPreviousStdOut = _dup(_fileno(stdout)); + m_fdPreviousStdErr = _dup(_fileno(stderr)); + + m_hLogFileHandle = CreateFileW(m_struLogFilePath.QueryStr(), + FILE_READ_DATA | FILE_WRITE_DATA, + FILE_SHARE_READ, + &saAttr, + CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (m_hLogFileHandle == INVALID_HANDLE_VALUE) { - hr = E_HANDLE; - goto Finished; + hr = HRESULT_FROM_WIN32(GetLastError()); + return hr; } - // Periodically flush the log content to file - m_Timer.InitializeTimer(STTIMER::TimerCallback, &m_struLogFilePath, FILE_FLUSH_TIMEOUT, FILE_FLUSH_TIMEOUT); + // There are a few options for redirecting stdout/stderr, + // but there are issues with most of them. + // AllocConsole() + // *stdout = *m_pStdFile; + // *stderr = *m_pStdFile; + // Calling _dup2 on stderr fails on IIS. IIS sets stderr to -2 + // _dup2(_fileno(m_pStdFile), _fileno(stdout)); + // _dup2(_fileno(m_pStdFile), _fileno(stderr)); + // If we were okay setting stdout and stderr to separate files, we could use: + // _wfreopen_s(&m_pStdFile, struLogFileName.QueryStr(), L"w+", stdout); + // _wfreopen_s(&m_pStdFile, struLogFileName.QueryStr(), L"w+", stderr); + // Calling SetStdHandle works for redirecting managed logs, however you cannot + // capture native logs (including hostfxr failures). -Finished: + if (!SetStdHandle(STD_OUTPUT_HANDLE, m_hLogFileHandle)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + return hr; + } + + if (!SetStdHandle(STD_ERROR_HANDLE, m_hLogFileHandle)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + return hr; + } + + + // Periodically flush the log content to file + m_Timer.InitializeTimer(STTIMER::TimerCallback, &m_struLogFilePath, 3000, 3000); return hr; } diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h index 11fb662c67..184a935596 100644 --- a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h @@ -25,8 +25,7 @@ private: STRU m_wsStdOutLogFileName; STRU m_wsApplicationPath; STRU m_struLogFilePath; - int m_fdStdOut; - int m_fdStdErr; - FILE* m_pStdOutFile; + int m_fdPreviousStdOut; + int m_fdPreviousStdErr; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp index f5e6acc782..d15f5b458b 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp @@ -39,6 +39,7 @@ PipeOutputManager::StopOutputRedirection() } if (m_hErrThread != NULL && + m_hErrThread != INVALID_HANDLE_VALUE && GetExitCodeThread(m_hErrThread, &dwThreadStatus) != 0 && dwThreadStatus == STILL_ACTIVE) { @@ -64,14 +65,14 @@ PipeOutputManager::StopOutputRedirection() // Restore the original stdout and stderr handles of the process, // as the application has either finished startup or has exited. - if (_dup2(m_fdStdOut, _fileno(stdout)) == -1) + if (m_fdPreviousStdOut != -1) { - return; + _dup2(m_fdPreviousStdOut, _fileno(stdout)); } - if (_dup2(m_fdStdErr, _fileno(stderr)) == -1) + if (m_fdPreviousStdErr != -1) { - return; + _dup2(m_fdPreviousStdErr, _fileno(stderr)); } if (GetStdOutContent(&straStdOutput)) @@ -89,18 +90,8 @@ HRESULT PipeOutputManager::Start() HANDLE hStdErrReadPipe; HANDLE hStdErrWritePipe; - m_fdStdOut = _dup(_fileno(stdout)); - if (m_fdStdOut == -1) - { - hr = E_HANDLE; - goto Finished; - } - m_fdStdErr = _dup(_fileno(stderr)); - if (m_fdStdErr == -1) - { - hr = E_HANDLE; - goto Finished; - } + m_fdPreviousStdOut = _dup(_fileno(stdout)); + m_fdPreviousStdErr = _dup(_fileno(stderr)); if (!CreatePipe(&hStdErrReadPipe, &hStdErrWritePipe, &saAttr, 0 /*nSize*/)) { diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h index fb4e19a449..57081ea8cd 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h @@ -32,7 +32,7 @@ private: CHAR m_pzFileContents[MAX_PIPE_READ_SIZE] = { 0 }; BOOL m_fDisposed; DWORD m_dwStdErrReadTotal; - int m_fdStdOut; - int m_fdStdErr; + int m_fdPreviousStdOut; + int m_fdPreviousStdErr; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 44ea05ab3c..566b0e0aca 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -403,7 +403,10 @@ IN_PROCESS_APPLICATION::LoadManagedApplication goto Finished; } - m_pLoggerProvider->Start(); + if (FAILED(hr = m_pLoggerProvider->Start())) + { + goto Finished; + } } if (m_status != APPLICATION_STATUS::STARTING) diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/test/CommonLibTests/FileOutputManagerTests.cpp index ebfb790ed5..ee3a446633 100644 --- a/test/CommonLibTests/FileOutputManagerTests.cpp +++ b/test/CommonLibTests/FileOutputManagerTests.cpp @@ -54,13 +54,13 @@ namespace FileOutManagerStartupTests } }; - TEST_F(FileOutputManagerTest, WriteToFileCheckContentsWritten) + TEST_F(FileOutputManagerTest, DISABLED_WriteToFileCheckContentsWritten) { Test(L"", stdout); Test(L"log", stdout); } - TEST_F(FileOutputManagerTest, WriteToFileCheckContentsWrittenErr) + TEST_F(FileOutputManagerTest, DISABLED_WriteToFileCheckContentsWrittenErr) { Test(L"", stderr); Test(L"log", stderr); @@ -70,7 +70,7 @@ namespace FileOutManagerStartupTests namespace FileOutManagerOutputTests { - TEST(FileOutManagerOutputTest, StdErr) + TEST(FileOutManagerOutputTest, DISABLED_StdErr) { PCSTR expected = "test"; @@ -91,7 +91,7 @@ namespace FileOutManagerOutputTests Helpers::DeleteDirectory(tempDirectory); } - TEST(FileOutManagerOutputTest, CheckFileOutput) + TEST(FileOutManagerOutputTest, DISABLED_CheckFileOutput) { PCSTR expected = "test"; @@ -112,7 +112,7 @@ namespace FileOutManagerOutputTests Helpers::DeleteDirectory(tempDirectory); } - TEST(FileOutManagerOutputTest, CapAt4KB) + TEST(FileOutManagerOutputTest, DISABLED_CapAt4KB) { PCSTR expected = "test"; From 7a93d693542a1940782c6eb391c51310cf931407 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 14 Jun 2018 15:51:24 -0700 Subject: [PATCH 067/363] Adds shared request handler lib project (#916) --- IISIntegration.sln | 13 ++ .../CommonLib/CommonLib.vcxproj | 33 +-- src/AspNetCoreModuleV2/CommonLib/stdafx.cpp | 4 - src/AspNetCoreModuleV2/CommonLib/stdafx.h | 6 - .../InProcessRequestHandler.vcxproj | 11 +- .../OutOfProcessRequestHandler.vcxproj | 11 +- .../FileOutputManager.cpp | 0 .../FileOutputManager.h | 0 .../IOutputManager.h | 0 .../LoggingHelpers.cpp | 0 .../LoggingHelpers.h | 0 .../NullOutputManager.h | 0 .../PipeOutputManager.cpp | 0 .../PipeOutputManager.h | 0 .../RequestHandlerLib.vcxproj | 218 ++++++++++++++++++ .../RequestHandlerLib/aspnetcore_msg.rc | 2 + .../environmentvariablehash.h | 0 .../environmentvariablehelpers.h | 0 .../requesthandler_config.cpp | 0 .../requesthandler_config.h | 0 .../RequestHandlerLib/stdafx.h | 32 +++ .../AspNetCoreModuleTests.vcxproj | 6 - test/CommonLibTests/CommonLibTests.vcxproj | 37 +-- .../inprocess_application_tests.cpp | 7 + test/CommonLibTests/stdafx.cpp | 4 - test/CommonLibTests/stdafx.h | 7 +- 26 files changed, 318 insertions(+), 73 deletions(-) delete mode 100644 src/AspNetCoreModuleV2/CommonLib/stdafx.cpp rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/FileOutputManager.cpp (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/FileOutputManager.h (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/IOutputManager.h (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/LoggingHelpers.cpp (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/LoggingHelpers.h (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/NullOutputManager.h (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/PipeOutputManager.cpp (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/PipeOutputManager.h (100%) create mode 100644 src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj create mode 100644 src/AspNetCoreModuleV2/RequestHandlerLib/aspnetcore_msg.rc rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/environmentvariablehash.h (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/environmentvariablehelpers.h (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/requesthandler_config.cpp (100%) rename src/AspNetCoreModuleV2/{CommonLib => RequestHandlerLib}/requesthandler_config.h (100%) create mode 100644 src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h delete mode 100644 test/CommonLibTests/stdafx.cpp diff --git a/IISIntegration.sln b/IISIntegration.sln index 93242a80b1..86393ab4b7 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -114,6 +114,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartupExceptionWebSite", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.vcxproj", "{CAC1267B-8778-4257-AAC6-CAF481723B01}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -368,6 +370,16 @@ Global {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.Build.0 = Release|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.ActiveCfg = Release|Win32 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.Build.0 = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.ActiveCfg = Debug|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.Build.0 = Debug|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.ActiveCfg = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.Build.0 = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|Any CPU.ActiveCfg = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.ActiveCfg = Release|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.Build.0 = Release|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.ActiveCfg = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -398,6 +410,7 @@ Global {7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {340C59FC-C682-4CBA-81F8-791821EC8EDE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 353c0b8b9f..a8e8a60937 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -85,12 +85,14 @@ - Use + NotUsing Level4 true Disabled false WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h true MultiThreadedDebug false @@ -106,12 +108,14 @@ - Use + NotUsing Level4 true Disabled false _DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h true ProgramDatabase false @@ -128,7 +132,7 @@ - Use + NotUsing Level4 true MaxSpeed @@ -136,6 +140,8 @@ true false WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h true MultiThreaded false @@ -152,7 +158,7 @@ - Use + NotUsing Level4 true MaxSpeed @@ -160,6 +166,8 @@ true false NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h true ..\iislib; true @@ -183,21 +191,14 @@ - - - - - - - @@ -205,21 +206,11 @@ - - - - - - Create - Create - Create - Create - diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp b/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp deleted file mode 100644 index 0351feb240..0000000000 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#include "stdafx.h" diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index b75217ae4d..129de31a5c 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -32,7 +32,6 @@ #include "iapplication.h" #include "application.h" #include "SRWLockWrapper.h" -#include "environmentvariablehash.h" #include "fx_ver.h" #include "utility.h" #include "GlobalVersionUtility.h" @@ -40,9 +39,4 @@ #include "aspnetcore_msg.h" #include "hostfxr_utility.h" #include "hostfxroptions.h" -#include "IOutputManager.h" -#include "FileOutputManager.h" -#include "PipeOutputManager.h" -#include "NullOutputManager.h" -#include "LoggingHelpers.h" diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 4d7de9cf3a..99a40ce218 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -91,7 +91,7 @@ $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -122,7 +122,7 @@ $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -153,7 +153,7 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) precomp.hxx MultiThreaded - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -186,7 +186,7 @@ NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) precomp.hxx MultiThreaded - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -228,6 +228,9 @@ {09d9d1d6-2951-4e14-bc35-76a23cf9391a} + + {1533e271-f61b-441b-8b74-59fb61df0552} + diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 3667f51481..3778b906c6 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -91,7 +91,7 @@ $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -123,7 +123,7 @@ $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -155,7 +155,7 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) precomp.hxx MultiThreaded - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -189,7 +189,7 @@ NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) precomp.hxx MultiThreaded - ..\IISLib;..\CommonLib;.\Inc + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true true true @@ -247,6 +247,9 @@ {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + {1533e271-f61b-441b-8b74-59fb61df0552} + diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp rename to src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/IOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/IOutputManager.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/IOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp rename to src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h b/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.h diff --git a/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/NullOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/NullOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp rename to src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj new file mode 100644 index 0000000000..844328640e --- /dev/null +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -0,0 +1,218 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {1533E271-F61B-441B-8B74-59FB61DF0552} + Win32Proj + NewCommon + 10.0.15063.0 + + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + false + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + C:\AspNetCoreModule\src\IISLib;$(IncludePath) + + + + NotUsing + Level4 + true + Disabled + false + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + MultiThreadedDebug + false + ProgramDatabase + ..\iislib;..\CommonLib; + true + stdcpp17 + + + Windows + true + + + + + NotUsing + Level4 + true + Disabled + false + _DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + ProgramDatabase + false + MultiThreadedDebug + false + ..\iislib;..\CommonLib; + true + stdcpp17 + + + Windows + true + + + + + NotUsing + Level4 + true + MaxSpeed + true + true + false + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + MultiThreaded + false + ..\iislib;..\CommonLib; + true + stdcpp17 + + + Windows + true + true + true + + + + + NotUsing + Level4 + true + MaxSpeed + true + true + false + NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + ..\iislib;..\CommonLib; + true + + + MultiThreaded + false + stdcpp17 + + + Windows + true + true + true + + + ..\iislib + + + + + + + + + + + + + + + + + + + + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/aspnetcore_msg.rc b/src/AspNetCoreModuleV2/RequestHandlerLib/aspnetcore_msg.rc new file mode 100644 index 0000000000..0abcb0fa2c --- /dev/null +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/aspnetcore_msg.rc @@ -0,0 +1,2 @@ +LANGUAGE 0x9,0x1 +1 11 "MSG00001.bin" diff --git a/src/AspNetCoreModuleV2/CommonLib/environmentvariablehash.h b/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/environmentvariablehash.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h diff --git a/src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h b/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp rename to src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h b/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h new file mode 100644 index 0000000000..094c71d0cd --- /dev/null +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h @@ -0,0 +1,32 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "Shlwapi.h" +#include +#include "hashtable.h" +#include "stringu.h" +#include "stringa.h" +#include "multisz.h" +#include "dbgutil.h" +#include "ahutil.h" +#include "hashfn.h" +#include "environmentvariablehash.h" +#include "IOutputManager.h" +#include "FileOutputManager.h" +#include "PipeOutputManager.h" +#include "NullOutputManager.h" +#include "LoggingHelpers.h" + diff --git a/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj b/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj index 8f12548e9f..fe6851d189 100644 --- a/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj +++ b/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj @@ -160,12 +160,6 @@ - - Create - Create - Create - Create - diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 2a21ef619e..6844054804 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -58,12 +58,6 @@ - - Create - Create - Create - Create - @@ -76,6 +70,9 @@ {09d9d1d6-2951-4e14-bc35-76a23cf9391a} + + {1533e271-f61b-441b-8b74-59fb61df0552} + {cac1267b-8778-4257-aac6-caf481723b01} @@ -87,15 +84,16 @@ - Use - stdafx.h + NotUsing Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h true EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -112,15 +110,16 @@ - Use - stdafx.h + NotUsing Disabled X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h true EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -137,13 +136,14 @@ - Use - stdafx.h + NotUsing WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -162,13 +162,14 @@ - Use - stdafx.h + NotUsing X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\; + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 diff --git a/test/CommonLibTests/inprocess_application_tests.cpp b/test/CommonLibTests/inprocess_application_tests.cpp index 42ca949749..da3a2c1271 100644 --- a/test/CommonLibTests/inprocess_application_tests.cpp +++ b/test/CommonLibTests/inprocess_application_tests.cpp @@ -5,6 +5,13 @@ #include "inprocessapplication.h" #include "fakeclasses.h" +// Externals defined in inprocess +BOOL g_fProcessDetach; +HANDLE g_hEventLog; +DWORD g_dwAspNetCoreDebugFlags; +PCSTR g_szDebugLabel; +DWORD g_dwDebugFlags; + namespace InprocessTests { TEST(InProcessTest, NoNullRefForExePath) diff --git a/test/CommonLibTests/stdafx.cpp b/test/CommonLibTests/stdafx.cpp deleted file mode 100644 index bd7a85614c..0000000000 --- a/test/CommonLibTests/stdafx.cpp +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#include "stdafx.h" diff --git a/test/CommonLibTests/stdafx.h b/test/CommonLibTests/stdafx.h index 47095a9fee..74af866aa7 100644 --- a/test/CommonLibTests/stdafx.h +++ b/test/CommonLibTests/stdafx.h @@ -58,10 +58,5 @@ #include "gtest/gtest.h" #include "fakeclasses.h" -// Externals defined in inprocess -BOOL g_fProcessDetach; -HANDLE g_hEventLog; -DWORD g_dwAspNetCoreDebugFlags; -PCSTR g_szDebugLabel; -DWORD g_dwDebugFlags; +\ From b9b62932fab3d7107c81097de974d51ff710be15 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 14 Jun 2018 16:27:00 -0700 Subject: [PATCH 068/363] Deleting commented out file --- .../AspNetCore/src/precomp.hxx | 160 ------------------ 1 file changed, 160 deletions(-) delete mode 100644 src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx deleted file mode 100644 index 64b579339f..0000000000 --- a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx +++ /dev/null @@ -1,160 +0,0 @@ -// // Copyright (c) .NET Foundation. All rights reserved. -// // Licensed under the MIT License. See License.txt in the project root for license information. - -// #pragma once -// #pragma warning( disable : 4091) - -// // -// // System related headers -// // -// #define _WINSOCKAPI_ - -// #define NTDDI_VERSION 0x06010000 -// #define WINVER 0x0601 -// #define _WIN32_WINNT 0x0601 - -// #include -// #include -// #include - -// //#include -// #include -// #include - -// // This should remove our issue of compiling for win7 without header files. -// // We force the Windows 8 version check logic in iiswebsocket.h to succeed even though we're compiling for Windows 7. -// // Then, we set the version defines back to Windows 7 to for the remainder of the compilation. -// #undef NTDDI_VERSION -// #undef WINVER -// #undef _WIN32_WINNT -// #define NTDDI_VERSION 0x06020000 -// #define WINVER 0x0602 -// #define _WIN32_WINNT 0x0602 -// #include -// #undef NTDDI_VERSION -// #undef WINVER -// #undef _WIN32_WINNT - -// #define NTDDI_VERSION 0x06010000 -// #define WINVER 0x0601 -// #define _WIN32_WINNT 0x0601 - -// #include -// #include - -// #include -// #include -// #include - -// // -// // Option available starting Windows 8. -// // 111 is the value in SDK on May 15, 2012. -// // -// #ifndef WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS -// #define WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS 111 -// #endif - -// #ifdef max -// #undef max -// template inline T max(T a, T b) -// { -// return a > b ? a : b; -// } -// #endif - -// #ifdef min -// #undef min -// template inline T min(T a, T b) -// { -// return a < b ? a : b; -// } -// #endif - -// inline bool IsSpace(char ch) -// { -// switch(ch) -// { -// case 32: // ' ' -// case 9: // '\t' -// case 10: // '\n' -// case 13: // '\r' -// case 11: // '\v' -// case 12: // '\f' -// return true; -// default: -// return false; -// } -// } - -// #include -// #include -// #include "stringa.h" -// #include "stringu.h" -// #include "dbgutil.h" -// #include "ahutil.h" -// #include "multisz.h" -// #include "multisza.h" -// #include "base64.h" -// #include -// #include -// #include -// #include -// #include - -// #include "environmentvariablehash.h" -// #include "hostfxr_utility.h" -// #include "utility.h" -// #include "debugutil.h" -// #include "requesthandler.h" -// #include "resources.h" -// #include "aspnetcore_msg.h" -// //#include "aspnetcore_event.h" -// #include "aspnetcore_shim_config.h" -// #include "fx_ver.h" - -// #include "appoffline.h" -// #include "filewatcher.h" -// #include "applicationinfo.h" -// #include "applicationmanager.h" -// #include "globalmodule.h" -// #include "proxymodule.h" -// #include "applicationinfo.h" -// #include "hostfxroptions.h" - -// FORCEINLINE -// DWORD -// WIN32_FROM_HRESULT( -// HRESULT hr -// ) -// { -// if ((FAILED(hr)) && -// (HRESULT_FACILITY(hr) == FACILITY_WIN32)) -// { -// return HRESULT_CODE(hr); -// } -// return hr; -// } - -// FORCEINLINE -// HRESULT -// HRESULT_FROM_GETLASTERROR() -// { -// return ( GetLastError() != NO_ERROR ) -// ? HRESULT_FROM_WIN32( GetLastError() ) -// : E_FAIL; -// } - -// extern PVOID g_pModuleId; -// extern BOOL g_fAspnetcoreRHAssemblyLoaded; -// extern BOOL g_fAspnetcoreRHLoadedError; -// extern BOOL g_fInShutdown; -// extern BOOL g_fEnableReferenceCountTracing; -// extern DWORD g_dwActiveServerProcesses; -// extern HINSTANCE g_hModule; -// extern HMODULE g_hAspnetCoreRH; -// extern SRWLOCK g_srwLock; -// extern HANDLE g_hEventLog; -// extern PCWSTR g_pwzAspnetcoreInProcessRequestHandlerName; -// extern PCWSTR g_pwzAspnetcoreOutOfProcessRequestHandlerName; -// extern PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; -// #pragma warning( error : 4091) From 38c360668543a7e6ef2bc707404fe35e8024b44a Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 19 Jun 2018 08:52:13 -0700 Subject: [PATCH 069/363] Adds pdbs (and other files) to testing package (#929) --- nuget/AspNetCoreV1.nuspec | 6 ++++-- nuget/AspNetCoreV2.nuspec | 22 +++++++++++++++------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/nuget/AspNetCoreV1.nuspec b/nuget/AspNetCoreV1.nuspec index 4b9112cd72..5a682e1407 100644 --- a/nuget/AspNetCoreV1.nuspec +++ b/nuget/AspNetCoreV1.nuspec @@ -19,8 +19,10 @@ - - + + + + diff --git a/nuget/AspNetCoreV2.nuspec b/nuget/AspNetCoreV2.nuspec index 10430a581b..d9b7f4366e 100644 --- a/nuget/AspNetCoreV2.nuspec +++ b/nuget/AspNetCoreV2.nuspec @@ -20,15 +20,23 @@ - - - - - - + + + + + + + + + + + + + + - + \ No newline at end of file From 17fdbf6514af680e937c80ebb66fbd3f02c330d1 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 19 Jun 2018 10:31:41 -0700 Subject: [PATCH 070/363] pdbs in content files (#938) --- nuget/AspNetCoreV1.nuspec | 1 + nuget/AspNetCoreV2.nuspec | 2 ++ 2 files changed, 3 insertions(+) diff --git a/nuget/AspNetCoreV1.nuspec b/nuget/AspNetCoreV1.nuspec index 5a682e1407..273b826516 100644 --- a/nuget/AspNetCoreV1.nuspec +++ b/nuget/AspNetCoreV1.nuspec @@ -16,6 +16,7 @@ Microsoft.AspNetCore.AspNetCoreModuleV1 + diff --git a/nuget/AspNetCoreV2.nuspec b/nuget/AspNetCoreV2.nuspec index d9b7f4366e..9210f7a7cc 100644 --- a/nuget/AspNetCoreV2.nuspec +++ b/nuget/AspNetCoreV2.nuspec @@ -17,6 +17,8 @@ + + From 60711bfca1c32c91604634b8128d4533a456bc54 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 19 Jun 2018 11:29:42 -0700 Subject: [PATCH 071/363] Use std::filesystem in hostfxr utilities (#926) --- src/AspNetCoreModuleV2/CommonLib/EventLog.h | 6 + .../CommonLib/GlobalVersionUtility.cpp | 5 +- .../CommonLib/GlobalVersionUtility.h | 6 +- .../CommonLib/aspnetcore_msg.mc | 6 + .../CommonLib/hostfxr_utility.cpp | 508 ++++++------------ .../CommonLib/hostfxr_utility.h | 70 ++- .../CommonLib/hostfxroptions.cpp | 2 +- src/AspNetCoreModuleV2/CommonLib/resources.h | 5 + src/AspNetCoreModuleV2/CommonLib/stdafx.h | 1 + src/AspNetCoreModuleV2/CommonLib/utility.cxx | 8 +- .../OutOfProcessRequestHandler/precomp.hxx | 1 - test/CommonLibTests/hostfxr_utility_tests.cpp | 12 +- .../Inprocess/StartupTests.cs | 70 ++- 13 files changed, 276 insertions(+), 424 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/EventLog.h diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.h b/src/AspNetCoreModuleV2/CommonLib/EventLog.h new file mode 100644 index 0000000000..70bd1a1be6 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/EventLog.h @@ -0,0 +1,6 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#define EVENTLOG(log, name, ...) UTILITY::LogEventF(log, ASPNETCORE_EVENT_ ## name ## _LEVEL, ASPNETCORE_EVENT_ ## name, ASPNETCORE_EVENT_ ## name ## _MSG, __VA_ARGS__) diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp index 09a927104a..a7bd703589 100644 --- a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. #include "stdafx.h" -#include namespace fs = std::experimental::filesystem; @@ -96,7 +95,7 @@ GlobalVersionUtility::RemoveFileNameFromFolderPath(std::wstring fileName) return path.parent_path(); } -std::wstring +std::wstring GlobalVersionUtility::GetModuleName(HMODULE hModuleName) { DWORD dwSize = MAX_PATH; @@ -126,6 +125,6 @@ GlobalVersionUtility::GetModuleName(HMODULE hModuleName) fDone = TRUE; } } - + return retVal; } diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h index fd1a5ee252..4a4e736eb7 100644 --- a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h +++ b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h @@ -8,15 +8,15 @@ class GlobalVersionUtility { public: - static - std::wstring + static + std::wstring GetGlobalRequestHandlerPath(PCWSTR pwzAspNetCoreFolderPath, PCWSTR pwzHandlerVersion, PCWSTR pwzHandlerName); static std::wstring FindHighestGlobalVersion(PCWSTR pwzAspNetCoreFolderPath); - static + static std::wstring RemoveFileNameFromFolderPath(std::wstring fileName); diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc index 96cf5fec0c..5ea3c030d2 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc +++ b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc @@ -212,6 +212,12 @@ Language=English %1 . +Messageid=1031 +SymbolicName=ASPNETCORE_EVENT_INVALID_PROCESS_PATH +Language=English +%1 +. + ; ;#endif // _ASPNETCORE_MODULE_MSG_H_ ; diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index 6ea7c46eeb..ad13fd7438 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -2,14 +2,9 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "stdafx.h" +#include -HOSTFXR_UTILITY::HOSTFXR_UTILITY() -{ -} - -HOSTFXR_UTILITY::~HOSTFXR_UTILITY() -{ -} +namespace fs = std::experimental::filesystem; // // Runs a standalone appliction. @@ -25,131 +20,72 @@ HOSTFXR_UTILITY::~HOSTFXR_UTILITY() // HRESULT HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( - PCWSTR pwzExeAbsolutePath, // includes .exe file extension. - PCWSTR pcwzApplicationPhysicalPath, - PCWSTR pcwzArguments, - HANDLE hEventLog, - _Inout_ STRU* pStruHostFxrDllLocation, - _Out_ DWORD* pdwArgCount, - _Out_ BSTR** ppwzArgv + PCWSTR pwzExeAbsolutePath, // includes .exe file extension. + PCWSTR pcwzApplicationPhysicalPath, + PCWSTR pcwzArguments, + HANDLE hEventLog, + _Inout_ STRU* pStruHostFxrDllLocation, + _Out_ DWORD* pdwArgCount, + _Out_ BSTR** ppwzArgv ) { - HRESULT hr = S_OK; - STRU struDllPath; - STRU struArguments; - STRU struHostFxrPath; - STRU struRuntimeConfigLocation; - DWORD dwPosition; + HRESULT hr = S_OK; - // Obtain the app name from the processPath section. - if (FAILED(hr = struDllPath.Copy(pwzExeAbsolutePath))) + const fs::path exePath(pwzExeAbsolutePath); + + if (!exePath.has_extension()) { - goto Finished; + return false; } - dwPosition = struDllPath.LastIndexOf(L'.', 0); - if (dwPosition == -1) - { - hr = E_FAIL; - goto Finished; - } + const fs::path physicalPath(pcwzApplicationPhysicalPath); + const fs::path hostFxrLocation = physicalPath / "hostfxr.dll"; - hr = UTILITY::ConvertPathToFullPath(L".\\hostfxr.dll", pcwzApplicationPhysicalPath, &struHostFxrPath); - if (FAILED(hr)) + if (!is_regular_file(hostFxrLocation)) { - goto Finished; - } + fs::path runtimeConfigLocation = exePath; + runtimeConfigLocation.replace_extension(L".runtimeconfig.json"); - struDllPath.QueryStr()[dwPosition] = L'\0'; - if (FAILED(hr = struDllPath.SyncWithBuffer())) - { - goto Finished; - } - - if (!UTILITY::CheckIfFileExists(struHostFxrPath.QueryStr())) - { - // Most likely a full framework app. - // Check that the runtime config file doesn't exist in the folder as another heuristic. - if (FAILED(hr = struRuntimeConfigLocation.Copy(struDllPath)) || - FAILED(hr = struRuntimeConfigLocation.Append(L".runtimeconfig.json"))) + if (!is_regular_file(runtimeConfigLocation)) { - goto Finished; - } - if (!UTILITY::CheckIfFileExists(struRuntimeConfigLocation.QueryStr())) - { - - hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; - UTILITY::LogEventF(hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP, - ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP_MSG, - pcwzApplicationPhysicalPath, - hr); - } - else - { - // If a runtime config file does exist, report a file not found on the app.exe - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - UTILITY::LogEventF(hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND, - ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_MSG, - pcwzApplicationPhysicalPath, - hr); + EVENTLOG(hEventLog, INPROCESS_FULL_FRAMEWORK_APP, pcwzApplicationPhysicalPath, 0); + return E_FAIL; } - goto Finished; + EVENTLOG(hEventLog, APPLICATION_EXE_NOT_FOUND, pcwzApplicationPhysicalPath, 0); + return E_FAIL; } - if (FAILED(hr = pStruHostFxrDllLocation->Copy(struHostFxrPath))) + fs::path dllPath = exePath; + dllPath.replace_extension(".dll"); + + if (!is_regular_file(dllPath)) { - goto Finished; + return E_FAIL; } + auto arguments = std::wstring(dllPath) + L" " + pcwzArguments; - if (FAILED(hr = struDllPath.Append(L".dll"))) + if (FAILED(hr = pStruHostFxrDllLocation->Copy(hostFxrLocation.c_str()))) { - goto Finished; + return hr; } - if (!UTILITY::CheckIfFileExists(struDllPath.QueryStr())) - { - // Treat access issue as File not found - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - goto Finished; - } - - if (FAILED(hr = struArguments.Copy(struDllPath)) || - FAILED(hr = struArguments.Append(L" ")) || - FAILED(hr = struArguments.Append(pcwzArguments))) - { - goto Finished; - } - - if (FAILED(hr = ParseHostfxrArguments( - struArguments.QueryStr(), + return ParseHostfxrArguments( + arguments.c_str(), pwzExeAbsolutePath, pcwzApplicationPhysicalPath, hEventLog, pdwArgCount, - ppwzArgv))) - { - goto Finished; - } - -Finished: - - return hr; + ppwzArgv); } BOOL -HOSTFXR_UTILITY::IsDotnetExecutable(STRU *struExecutablePath) +HOSTFXR_UTILITY::IsDotnetExecutable(const std::experimental::filesystem::path & dotnetPath) { - if (struExecutablePath == NULL) - { - return FALSE; - } - return struExecutablePath->EndsWith(L"dotnet.exe") || struExecutablePath->EndsWith(L"dotnet"); + auto name = dotnetPath.filename(); + name.replace_extension(""); + return _wcsnicmp(name.c_str(), L"dotnet", 6) == 0; } HRESULT @@ -165,70 +101,58 @@ HOSTFXR_UTILITY::GetHostFxrParameters( ) { HRESULT hr = S_OK; - STRU struSystemPathVariable; - STRU struAbsolutePathToHostFxr; - STRU struAbsolutePathToDotnet; - STRU struEventMsg; - STACK_STRU(struExpandedProcessPath, MAX_PATH); - STACK_STRU(struExpandedArguments, MAX_PATH); - // Copy and Expand the processPath and Arguments. - if (FAILED(hr = struExpandedProcessPath.CopyAndExpandEnvironmentStrings(pcwzProcessPath)) - || FAILED(hr = struExpandedArguments.CopyAndExpandEnvironmentStrings(pcwzArguments))) + const fs::path applicationPhysicalPath = pcwzApplicationPhysicalPath; + fs::path processPath = ExpandEnvironmentVariables(pcwzProcessPath); + std::wstring arguments = ExpandEnvironmentVariables(pcwzArguments); + + if (processPath.is_relative()) { - goto Finished; - } - - // Convert the process path an absolute path to our current application directory. - // If the path is already an absolute path, it will be unchanged. - hr = UTILITY::ConvertPathToFullPath( - struExpandedProcessPath.QueryStr(), - pcwzApplicationPhysicalPath, - &struAbsolutePathToDotnet - ); - - if (FAILED(hr)) - { - goto Finished; + processPath = applicationPhysicalPath / processPath; } // Check if the absolute path is to dotnet or not. - if (HOSTFXR_UTILITY::IsDotnetExecutable(&struAbsolutePathToDotnet)) + if (IsDotnetExecutable(processPath)) { // // The processPath ends with dotnet.exe or dotnet // like: C:\Program Files\dotnet\dotnet.exe, C:\Program Files\dotnet\dotnet, dotnet.exe, or dotnet. // Get the absolute path to dotnet. If the path is already an absolute path, it will return that path // - if (FAILED(hr = HOSTFXR_UTILITY::GetAbsolutePathToDotnet(&struAbsolutePathToDotnet))) // Make sure to append the dotnet.exe path correctly here (pass in regular path)? + // Make sure to append the dotnet.exe path correctly here (pass in regular path)? + auto fullProcessPath = GetAbsolutePathToDotnet(processPath); + if (!fullProcessPath.has_value()) { - goto Finished; + return E_FAIL; } - if (FAILED(hr = GetAbsolutePathToHostFxr(&struAbsolutePathToDotnet, hEventLog, &struAbsolutePathToHostFxr))) + processPath = fullProcessPath.value(); + + auto hostFxrPath = GetAbsolutePathToHostFxr(processPath, hEventLog); + if (!hostFxrPath.has_value()) { - goto Finished; + return E_FAIL; } if (FAILED(hr = HOSTFXR_UTILITY::ParseHostfxrArguments( - struExpandedArguments.QueryStr(), - struAbsolutePathToDotnet.QueryStr(), + arguments.c_str(), + processPath.c_str(), pcwzApplicationPhysicalPath, hEventLog, pdwArgCount, pbstrArgv))) { - goto Finished; + return hr; } - if (FAILED(hr = pStruHostFxrDllLocation->Copy(struAbsolutePathToHostFxr))) + if (FAILED(hr = pStruHostFxrDllLocation->Copy(hostFxrPath->c_str()))) { - goto Finished; + return hr; } - if (FAILED(hr = pStruExeAbsolutePath->Copy(struAbsolutePathToDotnet))) + if (FAILED(hr = pStruExeAbsolutePath->Copy(processPath.c_str()))) { - goto Finished; + return hr; } } else @@ -238,25 +162,25 @@ HOSTFXR_UTILITY::GetHostFxrParameters( // like: C:\test\MyApp.Exe or MyApp.Exe // Check if the file exists, and if it does, get the parameters for a standalone application // - if (UTILITY::CheckIfFileExists(struAbsolutePathToDotnet.QueryStr())) + if (is_regular_file(processPath)) { - hr = HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( - struAbsolutePathToDotnet.QueryStr(), + if (FAILED(hr = GetStandaloneHostfxrParameters( + processPath.c_str(), pcwzApplicationPhysicalPath, - struExpandedArguments.QueryStr(), + arguments.c_str(), hEventLog, pStruHostFxrDllLocation, pdwArgCount, - pbstrArgv); - if (FAILED(hr)) + pbstrArgv))) { - goto Finished; + return hr; } - if (FAILED(hr = pStruExeAbsolutePath->Copy(struAbsolutePathToDotnet))) + if (FAILED(hr = pStruExeAbsolutePath->Copy(processPath.c_str()))) { - goto Finished; + return hr; } + } else { @@ -264,19 +188,13 @@ HOSTFXR_UTILITY::GetHostFxrParameters( // If the processPath file does not exist and it doesn't include dotnet.exe or dotnet // then it is an invalid argument. // - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);; - UTILITY::LogEventF(hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_GENERAL_ERROR_MSG, - ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG, - struExpandedProcessPath.QueryStr(), - hr); + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + UTILITY::LogEventF(hEventLog, ASPNETCORE_EVENT_INVALID_PROCESS_PATH_LEVEL, ASPNETCORE_EVENT_INVALID_PROCESS_PATH, ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG, processPath.c_str(), hr); + return hr; } } -Finished: - - return hr; + return S_OK; } // @@ -394,163 +312,82 @@ Finished: return hr; } -HRESULT +std::optional HOSTFXR_UTILITY::GetAbsolutePathToDotnet( - _Inout_ STRU* pStruAbsolutePathToDotnet + const fs::path & requestedPath ) { - HRESULT hr = S_OK; - // // If we are given an absolute path to dotnet.exe, we are done // - if (UTILITY::CheckIfFileExists(pStruAbsolutePathToDotnet->QueryStr())) + if (is_regular_file(requestedPath)) { - goto Finished; + return std::make_optional(requestedPath); } - // - // If the path was C:\Program Files\dotnet\dotnet - // We need to try appending .exe and check if the file exists too. - // - if (FAILED(hr = pStruAbsolutePathToDotnet->Append(L".exe"))) - { - goto Finished; - } + auto pathWithExe = requestedPath; + pathWithExe.concat(L".exe"); - if (UTILITY::CheckIfFileExists(pStruAbsolutePathToDotnet->QueryStr())) + if (is_regular_file(pathWithExe)) { - goto Finished; + return std::make_optional(pathWithExe); } // At this point, we are calling where.exe to find dotnet. // If we encounter any failures, try getting dotnet.exe from the // backup location. - if (!InvokeWhereToFindDotnet(pStruAbsolutePathToDotnet)) + // Only do it if no path is specified + if (!requestedPath.has_parent_path()) { - hr = GetAbsolutePathToDotnetFromProgramFiles(pStruAbsolutePathToDotnet); + return std::nullopt; } -Finished: + const auto dotnetViaWhere = InvokeWhereToFindDotnet(); + if (dotnetViaWhere.has_value()) + { + return dotnetViaWhere; + } - return hr; + return GetAbsolutePathToDotnetFromProgramFiles(); } -HRESULT +std::optional HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( - STRU* pStruAbsolutePathToDotnet, - HANDLE hEventLog, - STRU* pStruAbsolutePathToHostfxr + const fs::path & dotnetPath, + HANDLE hEventLog ) { - HRESULT hr = S_OK; - STRU struHostFxrPath; - STRU struHostFxrSearchExpression; - STRU struHighestDotnetVersion; - STRU struEventMsg; - std::vector vVersionFolders; - DWORD dwPosition = 0; + std::vector versionFolders; + const auto hostFxrBase = dotnetPath.parent_path() / "host" / "fxr"; - if (FAILED(hr = struHostFxrPath.Copy(pStruAbsolutePathToDotnet))) + if (!is_directory(hostFxrBase)) { - goto Finished; + EVENTLOG(hEventLog, HOSTFXR_DIRECTORY_NOT_FOUND, hostFxrBase.c_str(), HRESULT_FROM_WIN32(ERROR_BAD_ENVIRONMENT)); + + return std::nullopt; } - dwPosition = struHostFxrPath.LastIndexOf(L'\\', 0); - if (dwPosition == -1) + auto searchPattern = std::wstring(hostFxrBase) + L"\\*"; + FindDotNetFolders(searchPattern.c_str(), versionFolders); + + if (versionFolders.empty()) { - hr = E_FAIL; - goto Finished; + EVENTLOG(hEventLog, HOSTFXR_DIRECTORY_NOT_FOUND, hostFxrBase.c_str(), HRESULT_FROM_WIN32(ERROR_BAD_ENVIRONMENT)); + + return std::nullopt; } - struHostFxrPath.QueryStr()[dwPosition] = L'\0'; + const auto highestVersion = FindHighestDotNetVersion(versionFolders); + const auto hostFxrPath = hostFxrBase / highestVersion / "hostfxr.dll"; - if (FAILED(hr = struHostFxrPath.SyncWithBuffer()) || - FAILED(hr = struHostFxrPath.Append(L"\\"))) + if (!is_regular_file(hostFxrPath)) { - goto Finished; + EVENTLOG(hEventLog, HOSTFXR_DLL_NOT_FOUND, hostFxrPath.c_str(), HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + + return std::nullopt; } - hr = struHostFxrPath.Append(L"host\\fxr"); - if (FAILED(hr)) - { - goto Finished; - } - - if (!UTILITY::DirectoryExists(&struHostFxrPath)) - { - hr = ERROR_BAD_ENVIRONMENT; - UTILITY::LogEventF(hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND, - struEventMsg.QueryStr(), - ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND_MSG, - struHostFxrPath.QueryStr(), - hr); - goto Finished; - } - - // Find all folders under host\\fxr\\ for version numbers. - hr = struHostFxrSearchExpression.Copy(struHostFxrPath); - if (FAILED(hr)) - { - goto Finished; - } - - hr = struHostFxrSearchExpression.Append(L"\\*"); - if (FAILED(hr)) - { - goto Finished; - } - - // As we use the logic from core-setup, we are opting to use std here. - HOSTFXR_UTILITY::FindDotNetFolders(struHostFxrSearchExpression.QueryStr(), &vVersionFolders); - - if (vVersionFolders.size() == 0) - { - hr = HRESULT_FROM_WIN32(ERROR_BAD_ENVIRONMENT); - UTILITY::LogEventF(hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND, - ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND_MSG, - struHostFxrPath.QueryStr(), - hr); - goto Finished; - } - - hr = FindHighestDotNetVersion(vVersionFolders, &struHighestDotnetVersion); - if (FAILED(hr)) - { - goto Finished; - } - - if (FAILED(hr = struHostFxrPath.Append(L"\\")) - || FAILED(hr = struHostFxrPath.Append(struHighestDotnetVersion.QueryStr())) - || FAILED(hr = struHostFxrPath.Append(L"\\hostfxr.dll"))) - { - goto Finished; - } - - if (!UTILITY::CheckIfFileExists(struHostFxrPath.QueryStr())) - { - // ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND_MSG - hr = HRESULT_FROM_WIN32(ERROR_FILE_INVALID); - UTILITY::LogEventF(hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND, - ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND_MSG, - struHostFxrPath.QueryStr(), - hr); - goto Finished; - } - - if (FAILED(hr = pStruAbsolutePathToHostfxr->Copy(struHostFxrPath))) - { - goto Finished; - } - -Finished: - return hr; + return std::make_optional(hostFxrPath); } // @@ -559,10 +396,8 @@ Finished: // worker process bitness. // Returns true if a valid dotnet was found, else false. // -BOOL -HOSTFXR_UTILITY::InvokeWhereToFindDotnet( - _Inout_ STRU* pStruAbsolutePathToDotnet -) +std::optional +HOSTFXR_UTILITY::InvokeWhereToFindDotnet() { HRESULT hr = S_OK; // Arguments to call where.exe @@ -586,16 +421,13 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet( INT prevIndex = 0; BOOL fProcessCreationResult = FALSE; BOOL fResult = FALSE; + std::optional result; // Set the security attributes for the read/write pipe securityAttributes.nLength = sizeof(securityAttributes); securityAttributes.lpSecurityDescriptor = NULL; securityAttributes.bInheritHandle = TRUE; - // Reset the path to dotnet as we will be using whether the string is - // empty or not as state - pStruAbsolutePathToDotnet->Reset(); - // Create a read/write pipe that will be used for reading the result of where.exe if (!CreatePipe(&hStdOutReadPipe, &hStdOutWritePipe, &securityAttributes, 0)) { @@ -736,10 +568,7 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet( fIsCurrentProcess64Bit == (dwBinaryType == SCS_64BIT_BINARY)) { // The bitness of dotnet matched with the current worker process bitness. - if (FAILED(hr = pStruAbsolutePathToDotnet->Copy(struDotnetSubstring))) - { - goto Finished; - } + result = std::make_optional(struDotnetSubstring.QueryStr()); fResult = TRUE; break; } @@ -768,71 +597,21 @@ Finished: SysFreeString(pwzDotnetName); } - return fResult; + return result; } - -HRESULT -HOSTFXR_UTILITY::GetAbsolutePathToDotnetFromProgramFiles( - _Inout_ STRU* pStruAbsolutePathToDotnet -) +std::optional +HOSTFXR_UTILITY::GetAbsolutePathToDotnetFromProgramFiles() { - HRESULT hr = S_OK; - BOOL fFound = FALSE; - DWORD dwNumBytesRead = 0; - DWORD dwPathSize = MAX_PATH; - STRU struDotnetSubstring; - - while (!fFound) - { - if (FAILED(hr = struDotnetSubstring.Resize(dwPathSize))) - { - goto Finished; - } - - dwNumBytesRead = GetEnvironmentVariable(L"ProgramFiles", struDotnetSubstring.QueryStr(), dwPathSize); - if (dwNumBytesRead == 0) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - else if (dwNumBytesRead >= dwPathSize) - { - // - // The path to ProgramFiles should never be this long, but resize and try again. - dwPathSize *= 2 + 30; // for dotnet substring - } - else - { - if (FAILED(hr = struDotnetSubstring.SyncWithBuffer()) || - FAILED(hr = struDotnetSubstring.Append(L"\\dotnet\\dotnet.exe"))) - { - goto Finished; - } - if (!UTILITY::CheckIfFileExists(struDotnetSubstring.QueryStr())) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - if (FAILED(hr = pStruAbsolutePathToDotnet->Copy(struDotnetSubstring))) - { - goto Finished; - } - fFound = TRUE; - } - } - -Finished: - return hr; + const auto programFilesDotnet = fs::path(ExpandEnvironmentVariables(L"%ProgramFiles%")) / "dotnet" / "dotnet.exe"; + return is_regular_file(programFilesDotnet) ? std::make_optional(programFilesDotnet) : std::nullopt; } -HRESULT +std::wstring HOSTFXR_UTILITY::FindHighestDotNetVersion( - _In_ std::vector vFolders, - _Out_ STRU *pstrResult + _In_ std::vector & vFolders ) { - HRESULT hr = S_OK; fx_ver_t max_ver(-1, -1, -1); for (const auto& dir : vFolders) { @@ -844,16 +623,13 @@ HOSTFXR_UTILITY::FindHighestDotNetVersion( } } - hr = pstrResult->Copy(max_ver.as_str().c_str()); - - // we check FAILED(hr) outside of function - return hr; + return max_ver.as_str(); } VOID HOSTFXR_UTILITY::FindDotNetFolders( _In_ PCWSTR pszPath, - _Out_ std::vector *pvFolders + _Out_ std::vector & pvFolders ) { HANDLE handle = NULL; @@ -868,8 +644,34 @@ HOSTFXR_UTILITY::FindDotNetFolders( do { std::wstring folder(data.cFileName); - pvFolders->push_back(folder); + pvFolders.push_back(folder); } while (FindNextFileW(handle, &data)); FindClose(handle); } + +std::wstring +HOSTFXR_UTILITY::ExpandEnvironmentVariables(const std::wstring & str) +{ + DWORD requestedSize = ExpandEnvironmentStringsW(str.c_str(), nullptr, 0); + if (requestedSize == 0) + { + throw std::system_error(GetLastError(), std::system_category(), "ExpandEnvironmentVariables"); + } + + std::wstring expandedStr; + do + { + expandedStr.resize(requestedSize); + requestedSize = ExpandEnvironmentStringsW(str.c_str(), &expandedStr[0], requestedSize); + if (requestedSize == 0) + { + throw std::system_error(GetLastError(), std::system_category(), "ExpandEnvironmentVariables"); + } + } while (expandedStr.size() != requestedSize); + + // trim null character as ExpandEnvironmentStringsW returns size including null character + expandedStr.resize(requestedSize - 1); + + return expandedStr; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index 57f77260f4..5e35cc4a6d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -6,6 +6,8 @@ #include "precomp.h" #include +#include +#include typedef INT(*hostfxr_get_native_search_directories_fn) (CONST INT argc, CONST PCWSTR* argv, PWSTR buffer, DWORD buffer_size, DWORD* required_buffer_size); typedef INT(*hostfxr_main_fn) (CONST DWORD argc, CONST PCWSTR argv[]); @@ -42,7 +44,7 @@ public: static BOOL IsDotnetExecutable( - STRU* struExecutablePath + _In_ const std::experimental::filesystem::path & dotnetPath ); static @@ -58,47 +60,41 @@ public: _Out_ BSTR **ppwzArgv ); - static - HRESULT - GetAbsolutePathToDotnet( - STRU* pStruAbsolutePathToDotnet - ); - - static - HRESULT - GetAbsolutePathToHostFxr( - _In_ STRU* pStruAbsolutePathToDotnet, - _In_ HANDLE hEventLog, - _Out_ STRU* pStruAbsolutePathToHostfxr - ); - - static - BOOL - InvokeWhereToFindDotnet( - _Inout_ STRU* pStruAbsolutePathToDotnet - ); - - static - HRESULT - GetAbsolutePathToDotnetFromProgramFiles( - _Inout_ STRU* pStruAbsolutePathToDotnet - ); - - static - HRESULT - FindHighestDotNetVersion( - _In_ std::vector vFolders, - _Out_ STRU *pstrResult - ); - static VOID FindDotNetFolders( _In_ PCWSTR pszPath, - _Out_ std::vector *pvFolders + _Out_ std::vector & pvFolders ); - HOSTFXR_UTILITY(); - ~HOSTFXR_UTILITY(); + static + std::wstring + FindHighestDotNetVersion( + _In_ std::vector & vFolders + ); + + static + std::optional + GetAbsolutePathToHostFxr( + _In_ const std::experimental::filesystem::path & dotnetPath, + _In_ HANDLE hEventLog + ); + + static + std::optional + GetAbsolutePathToDotnetFromProgramFiles(); + + static + std::optional + InvokeWhereToFindDotnet(); + + static + std::optional + GetAbsolutePathToDotnet( + _In_ const std::experimental::filesystem::path & requestedPath + ); + + static + std::wstring ExpandEnvironmentVariables(const std::wstring & str); }; diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp index 73493ddc1d..feeaa0bf6c 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp @@ -39,7 +39,7 @@ HRESULT HOSTFXR_OPTIONS::Create( goto Finished; } } - else if (HOSTFXR_UTILITY::IsDotnetExecutable(&struExeLocation)) + else if (HOSTFXR_UTILITY::IsDotnetExecutable(struExeLocation.QueryStr())) { if (FAILED(hr = HOSTFXR_UTILITY::ParseHostfxrArguments( pcwzArguments, diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index 773021784a..aaf4f1d50b 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -36,12 +36,17 @@ #define ASPNETCORE_EVENT_RECYCLE_CONFIGURATION_MSG L"Application '%s' was recycled due to configuration change" #define ASPNETCORE_EVENT_RECYCLE_FAILURE_CONFIGURATION_MSG L"Failed to recycle application due to a configuration change at '%s'. Recycling worker process." #define ASPNETCORE_EVENT_MODULE_DISABLED_MSG L"AspNetCore Module is disabled" +#define ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP_LEVEL EVENTLOG_ERROR_TYPE #define ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP_MSG L"Application '%s' was compiled for .NET Framework. Please compile for .NET core to run the inprocess application or change the process mode to out of process. ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_PORTABLE_APP_DOTNET_MISSING_MSG L"Could not find dotnet.exe on the system PATH environment variable for portable application '%s'. Check that a valid path to dotnet is on the PATH and the bitness of dotnet matches the bitness of the IIS worker process. ErrorCode = '0x%x'." +#define ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND_LEVEL EVENTLOG_ERROR_TYPE #define ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND_MSG L"Could not find the hostfxr directory '%s' in the dotnet directory. ErrorCode = '0x%x'." +#define ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND_LEVEL EVENTLOG_ERROR_TYPE #define ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND_MSG L"Could not find hostfxr.dll in '%s'. ErrorCode = '0x%x'." +#define ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_LEVEL EVENTLOG_ERROR_TYPE #define ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_MSG L"Could not find application executable in '%s'. ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, ErrorCode = '0x%x. Please check the stderr logs for more information." +#define ASPNETCORE_EVENT_INVALID_PROCESS_PATH_LEVEL EVENTLOG_ERROR_TYPE #define ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG L"Invalid or unknown processPath provided in web.config: processPath = %s, ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application." #define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for out-of-process application. Please confirm the assembly is installed correctly for IIS or IISExpress." diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index 129de31a5c..43c8a1b2bf 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -38,5 +38,6 @@ #include "resources.h" #include "aspnetcore_msg.h" #include "hostfxr_utility.h" +#include "EventLog.h" #include "hostfxroptions.h" diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.cxx b/src/AspNetCoreModuleV2/CommonLib/utility.cxx index 965b13eb58..a4d7ed46bd 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.cxx +++ b/src/AspNetCoreModuleV2/CommonLib/utility.cxx @@ -2,6 +2,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "stdafx.h" +#include "debugutil.h" // static HRESULT @@ -569,9 +570,12 @@ UTILITY::LogEvent( ); } - if (dwEventInfoType == EVENTLOG_ERROR_TYPE) + STACK_STRA(converted, 256); + if (converted.CopyW(pstrMsg)) { - fwprintf(stderr, L"ERROR: %s\n", pstrMsg); + DebugPrintf( + dwEventInfoType == EVENTLOG_ERROR_TYPE ? ASPNETCORE_DEBUG_FLAG_ERROR : ASPNETCORE_DEBUG_FLAG_INFO, + "Event Log: %s", converted.QueryStr()); } } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx index 1cf69ec0dd..e77b603820 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx @@ -54,7 +54,6 @@ #include "debugutil.h" // Common lib -#include "hostfxr_utility.h" #include "requesthandler.h" #include "utility.h" #include "application.h" diff --git a/test/CommonLibTests/hostfxr_utility_tests.cpp b/test/CommonLibTests/hostfxr_utility_tests.cpp index 2aace524e0..a8cd554ec0 100644 --- a/test/CommonLibTests/hostfxr_utility_tests.cpp +++ b/test/CommonLibTests/hostfxr_utility_tests.cpp @@ -84,7 +84,6 @@ TEST(ParseHostFxrArguments, ProvideNoArgs_InvalidArgs) TEST(GetAbsolutePathToDotnetFromProgramFiles, BackupWorks) { STRU struAbsolutePathToDotnet; - HRESULT hr = S_OK; BOOL fDotnetInProgramFiles; BOOL is64Bit; BOOL fIsWow64 = FALSE; @@ -109,15 +108,14 @@ TEST(GetAbsolutePathToDotnetFromProgramFiles, BackupWorks) fDotnetInProgramFiles = UTILITY::CheckIfFileExists(L"C:/Program Files (x86)/dotnet/dotnet.exe"); } - hr = HOSTFXR_UTILITY::GetAbsolutePathToDotnetFromProgramFiles(&struAbsolutePathToDotnet); + auto dotnetPath = HOSTFXR_UTILITY::GetAbsolutePathToDotnetFromProgramFiles(); if (fDotnetInProgramFiles) { - EXPECT_EQ(hr, S_OK); + EXPECT_TRUE(dotnetPath.has_value()); } else { - EXPECT_NE(hr, S_OK); - EXPECT_TRUE(struAbsolutePathToDotnet.IsEmpty()); + EXPECT_FALSE(dotnetPath.has_value()); } } @@ -138,5 +136,5 @@ TEST(GetHostFxrArguments, InvalidParams) &retVal, // arg count &bstrArray); // args array. - EXPECT_EQ(E_INVALIDARG, hr); -} \ No newline at end of file + EXPECT_EQ(HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), hr); +} diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index 19c59a9161..c470e12360 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -2,10 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Linq; +using System.IO; using System.Net; using System.Threading.Tasks; -using System.Xml.Linq; using IISIntegration.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; @@ -18,30 +17,22 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [SkipIfIISExpressSchemaMissingInProcess] public class StartupTests : IISFunctionalTestBase { + private readonly string _dotnetLocation = DotNetMuxer.MuxerPathOrDefault(); + public StartupTests(ITestOutputHelper output) : base(output) { } - [Fact] + [ConditionalFact] public async Task ExpandEnvironmentVariableInWebConfig() { - var dotnetLocation = DotNetMuxer.MuxerPathOrDefault(); - var deploymentParameters = GetBaseDeploymentParameters(); - // Point to dotnet installed in user profile. - deploymentParameters.EnvironmentVariables["DotnetPath"] = dotnetLocation; - - var deploymentResult = await DeployAsync(deploymentParameters); - - Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", "%DotnetPath%"); - - var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); - - var responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal("Hello World", responseText); + await AssertStarts( + deploymentResult => Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", "%DotnetPath%"), + deploymentParameters => deploymentParameters.EnvironmentVariables["DotnetPath"] = _dotnetLocation); } - [Fact] + [ConditionalFact] public async Task InvalidProcessPath_ExpectServerError() { var dotnetLocation = "bogus"; @@ -60,6 +51,51 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); } + [ConditionalFact] + public async Task StartsWithDotnetLocationWithoutExe() + { + var dotnetLocationWithoutExtension = _dotnetLocation.Substring(0, _dotnetLocation.LastIndexOf(".")); + + await AssertStarts( + deploymentResult => Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", dotnetLocationWithoutExtension)); + } + + [ConditionalFact] + public async Task StartsWithDotnetLocationUppercase() + { + var dotnetLocationWithoutExtension = _dotnetLocation.Substring(0, _dotnetLocation.LastIndexOf(".")).ToUpperInvariant(); + + await AssertStarts( + deploymentResult => Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", dotnetLocationWithoutExtension)); + } + + [ConditionalTheory] + [InlineData("dotnet")] + [InlineData("dotnet.EXE")] + public async Task StartsWithDotnetOnThePath(string path) + { + await AssertStarts( + deploymentResult => Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", path), + deploymentParameters => deploymentParameters.EnvironmentVariables["PATH"] = Path.GetDirectoryName(_dotnetLocation)); + } + + private async Task AssertStarts(Action postDeploy, Action preDeploy = null) + { + var deploymentParameters = GetBaseDeploymentParameters(); + + preDeploy?.Invoke(deploymentParameters); + + var deploymentResult = await DeployAsync(deploymentParameters); + + postDeploy?.Invoke(deploymentResult); + + var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); + + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("Hello World", responseText); + } + + public static TestMatrix TestVariants => TestMatrix.ForServers(ServerType.IISExpress) .WithTfms(Tfm.NetCoreApp22) From b24a838301b44ac6e93fc39c6cb3833f4e0ed91e Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 19 Jun 2018 12:13:52 -0700 Subject: [PATCH 072/363] Cleanup debug logging (#932) --- build/launchSettings.json | 6 +- .../Properties/launchSettings.json | 6 +- .../AspNetCore/src/applicationinfo.cpp | 5 +- .../AspNetCore/src/dllmain.cpp | 27 +- .../CommonLib/CommonLib.vcxproj | 481 ++++++------ .../CommonLib/debugutil.cpp | 163 ++++ src/AspNetCoreModuleV2/CommonLib/debugutil.h | 85 +- src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj | 1 - src/AspNetCoreModuleV2/IISLib/dbgutil.h | 6 +- src/AspNetCoreModuleV2/IISLib/pudebug.h | 736 ------------------ src/AspNetCoreModuleV2/IISLib/reftrace.c | 1 - src/AspNetCoreModuleV2/IISLib/tracelog.c | 1 - .../InProcessRequestHandler/dllmain.cxx | 31 +- .../inprocessapplication.cpp | 2 +- .../OutOfProcessRequestHandler/dllmain.cxx | 20 +- .../inprocess_application_tests.cpp | 1 - .../OutOfProcess/GlobalVersionTests.cs | 10 +- .../Utilities/FunctionalTestsBase.cs | 7 + .../Properties/launchSettings.json | 6 +- .../Properties/launchSettings.json | 6 +- .../Properties/launchSettings.json | 6 +- .../Properties/launchSettings.json | 6 +- .../Properties/launchSettings.json | 6 +- 23 files changed, 490 insertions(+), 1129 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/debugutil.cpp delete mode 100644 src/AspNetCoreModuleV2/IISLib/pudebug.h diff --git a/build/launchSettings.json b/build/launchSettings.json index aa0472a2dd..0ef9e81546 100644 --- a/build/launchSettings.json +++ b/build/launchSettings.json @@ -18,7 +18,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } }, "ANCM IIS": { @@ -30,7 +31,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } } } diff --git a/samples/NativeIISSample/Properties/launchSettings.json b/samples/NativeIISSample/Properties/launchSettings.json index aa0472a2dd..0ef9e81546 100644 --- a/samples/NativeIISSample/Properties/launchSettings.json +++ b/samples/NativeIISSample/Properties/launchSettings.json @@ -18,7 +18,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } }, "ANCM IIS": { @@ -30,7 +31,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } } } diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 56fcc08f6f..032b61f43e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -6,6 +6,7 @@ #include "proxymodule.h" #include "hostfxr_utility.h" #include "utility.h" +#include "debugutil.h" const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; @@ -332,6 +333,8 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) } } + WDebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, L"Loading request handler: %s", struFileName.QueryStr()); + g_hAspnetCoreRH = LoadLibraryW(struFileName.QueryStr()); if (g_hAspnetCoreRH == NULL) @@ -406,7 +409,7 @@ APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation( ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, struEvent.QueryStr()); } - + hr = E_FAIL; } catch (...) diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp index f7b9f8aa81..2b77015e36 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp @@ -9,6 +9,9 @@ #include "globalmodule.h" #include "acache.h" #include "utility.h" +#include "debugutil.h" + +DECLARE_DEBUG_PRINT_OBJECT("aspnetcore.dll"); HTTP_MODULE_ID g_pModuleId = NULL; IHttpServer * g_pHttpServer = NULL; @@ -20,11 +23,8 @@ HMODULE g_hAspnetCoreRH = NULL; BOOL g_fAspnetcoreRHAssemblyLoaded = FALSE; BOOL g_fAspnetcoreRHLoadedError = FALSE; BOOL g_fInShutdown = FALSE; -DWORD g_dwAspNetCoreDebugFlags = 0; DWORD g_dwActiveServerProcesses = 0; SRWLOCK g_srwLock; -DWORD g_dwDebugFlags = 0; -PCSTR g_szDebugLabel = "ASPNET_CORE_MODULE"; PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; VOID @@ -100,13 +100,6 @@ HRESULT UNREFERENCED_PARAMETER(dwServerVersion); -#ifdef DEBUG - CREATE_DEBUG_PRINT_OBJECT("Asp.Net Core Module"); - g_dwDebugFlags = DEBUG_FLAGS_ANY; -#endif // DEBUG - - CREATE_DEBUG_PRINT_OBJECT; - //LoadGlobalConfiguration(); InitializeSRWLock(&g_srwLock); @@ -147,21 +140,11 @@ HRESULT fDisableANCM = (dwData != 0); } - cbData = sizeof(dwData); - if ((RegQueryValueEx(hKey, - L"DebugFlags", - NULL, - &dwType, - (LPBYTE)&dwData, - &cbData) == NO_ERROR) && - (dwType == REG_DWORD)) - { - g_dwAspNetCoreDebugFlags = dwData; - } - RegCloseKey(hKey); } + DebugInitialize(); + if (fDisableANCM) { // Logging diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index a8e8a60937..cf8f7a929d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -1,241 +1,242 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {55494E58-E061-4C4C-A0A8-837008E72F85} - Win32Proj - NewCommon - 10.0.15063.0 - - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - true - Unicode - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - false - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - C:\AspNetCoreModule\src\IISLib;$(IncludePath) - - - - NotUsing - Level4 - true - Disabled - false - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - true - MultiThreadedDebug - false - ProgramDatabase - ..\iislib; - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level4 - true - Disabled - false - _DEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - true - ProgramDatabase - false - MultiThreadedDebug - false - ..\iislib; - true - stdcpp17 - - - Windows - true - - - - - NotUsing - Level4 - true - MaxSpeed - true - true - false - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - true - MultiThreaded - false - ..\iislib; - true - stdcpp17 - - - Windows - true - true - true - - - - - NotUsing - Level4 - true - MaxSpeed - true - true - false - NDEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - true - ..\iislib; - true - - - MultiThreaded - false - stdcpp17 - - - Windows - true - true - true - - - ..\iislib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - - - - - Document - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {55494E58-E061-4C4C-A0A8-837008E72F85} + Win32Proj + NewCommon + 10.0.15063.0 + + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + false + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + C:\AspNetCoreModule\src\IISLib;$(IncludePath) + + + + NotUsing + Level4 + true + Disabled + false + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + MultiThreadedDebug + false + ProgramDatabase + ..\iislib; + true + stdcpp17 + + + Windows + true + + + + + NotUsing + Level4 + true + Disabled + false + _DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + ProgramDatabase + false + MultiThreadedDebug + false + ..\iislib; + true + stdcpp17 + + + Windows + true + + + + + NotUsing + Level4 + true + MaxSpeed + true + true + false + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + MultiThreaded + false + ..\iislib; + true + stdcpp17 + + + Windows + true + true + true + + + + + NotUsing + Level4 + true + MaxSpeed + true + true + false + NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + ..\iislib; + true + + + MultiThreaded + false + stdcpp17 + + + Windows + true + true + true + + + ..\iislib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + + + + Document + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp new file mode 100644 index 0000000000..023d578387 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -0,0 +1,163 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "debugutil.h" +#include "dbgutil.h" + +inline HANDLE g_hStandardOutput; + +VOID +DebugInitialize() +{ + g_hStandardOutput = GetStdHandle(STD_OUTPUT_HANDLE); + + HKEY hKey; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module\\Parameters", + 0, + KEY_READ, + &hKey) == NO_ERROR) + { + DWORD dwType; + DWORD dwData; + DWORD cbData; + + cbData = sizeof(dwData); + if ((RegQueryValueEx(hKey, + L"DebugFlags", + NULL, + &dwType, + (LPBYTE)&dwData, + &cbData) == NO_ERROR) && + (dwType == REG_DWORD)) + { + DEBUG_FLAGS_VAR = dwData; + } + + RegCloseKey(hKey); + } + + // We expect single digit value and a null char + const size_t environmentVariableValueSize = 2; + std::wstring environmentVariableValue(environmentVariableValueSize, '\0'); + + if (GetEnvironmentVariable(L"ASPNETCORE_MODULE_DEBUG", environmentVariableValue.data(), environmentVariableValueSize) == environmentVariableValueSize - 1) + { + try + { + const auto value = std::stoi(environmentVariableValue); + + if (value >= 1) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_ERROR; + if (value >= 2) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_WARNING; + if (value >= 3) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_INFO; + if (value >= 4) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_CONSOLE; + } + catch (...) + { + // ignore + } + } +} + +BOOL +IsEnabled( + DWORD dwFlag + ) +{ + return ( dwFlag & DEBUG_FLAGS_VAR ); +} + +VOID +DebugPrint( + DWORD dwFlag, + const LPCSTR szString + ) +{ + STACK_STRA (strOutput, 256); + HRESULT hr = S_OK; + + if ( IsEnabled( dwFlag ) ) + { + hr = strOutput.SafeSnprintf( + "[%s] %s\r\n", + DEBUG_LABEL_VAR, szString ); + + if (FAILED (hr)) + { + return; + } + + OutputDebugStringA( strOutput.QueryStr() ); + + if (IsEnabled(ASPNETCORE_DEBUG_FLAG_CONSOLE)) + { + DWORD nBytesWritten = 0; + WriteFile(g_hStandardOutput, strOutput.QueryStr(), strOutput.QueryCB(), &nBytesWritten, NULL); + } + } +} + +VOID +DebugPrintf( + DWORD dwFlag, + const LPCSTR szFormat, + ... + ) +{ + STACK_STRA (strCooked,256); + + va_list args; + HRESULT hr = S_OK; + + if ( IsEnabled( dwFlag ) ) + { + va_start( args, szFormat ); + + hr = strCooked.SafeVsnprintf(szFormat, args ); + + va_end( args ); + + if (FAILED (hr)) + { + return; + } + + DebugPrint( dwFlag, strCooked.QueryStr() ); + } +} + +VOID +WDebugPrintf( + DWORD dwFlag, + LPWSTR szFormat, + ... + ) +{ + va_list args; + HRESULT hr = S_OK; + + if ( IsEnabled( dwFlag ) ) + { + STACK_STRU (formatted,256); + + va_start( args, szFormat ); + + hr = formatted.SafeVsnwprintf(szFormat, args ); + + va_end( args ); + + if (FAILED (hr)) + { + return; + } + + STACK_STRA (converted, 256); + if (FAILED ( converted.CopyW(formatted.QueryStr(), formatted.QueryCCH()) )) + { + return; + } + + DebugPrint( dwFlag, converted.QueryStr() ); + } +} diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/AspNetCoreModuleV2/CommonLib/debugutil.h index 16fce88edd..d2340d6214 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.h +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.h @@ -2,80 +2,37 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #pragma once -#define ASPNETCORE_DEBUG_FLAG_INFO 0x00000001 -#define ASPNETCORE_DEBUG_FLAG_WARNING 0x00000002 -#define ASPNETCORE_DEBUG_FLAG_ERROR 0x00000004 +#include "stdafx.h" -extern DWORD g_dwAspNetCoreDebugFlags; +#define ASPNETCORE_DEBUG_FLAG_INFO DEBUG_FLAG_INFO +#define ASPNETCORE_DEBUG_FLAG_WARNING DEBUG_FLAG_WARN +#define ASPNETCORE_DEBUG_FLAG_ERROR DEBUG_FLAG_ERROR +#define ASPNETCORE_DEBUG_FLAG_CONSOLE 0x00000008 + +VOID +DebugInitialize(); -static BOOL -IfDebug( +IsEnabled( DWORD dwFlag - ) -{ - return ( dwFlag & g_dwAspNetCoreDebugFlags ); -} + ); -static VOID DebugPrint( DWORD dwFlag, LPCSTR szString - ) -{ - STACK_STRA (strOutput, 256); - HRESULT hr = S_OK; + ); - if ( IfDebug( dwFlag ) ) - { - hr = strOutput.SafeSnprintf( - "[aspnetcore.dll] %s\r\n", - szString ); - - if (FAILED (hr)) - { - goto Finished; - } - - OutputDebugStringA( strOutput.QueryStr() ); - } - -Finished: - - return; -} - -static VOID DebugPrintf( -DWORD dwFlag, -LPCSTR szFormat, -... -) -{ - STACK_STRA (strCooked,256); - - va_list args; - HRESULT hr = S_OK; - - if ( IfDebug( dwFlag ) ) - { - va_start( args, szFormat ); - - hr = strCooked.SafeVsnprintf(szFormat, args ); - - va_end( args ); - - if (FAILED (hr)) - { - goto Finished; - } - - DebugPrint( dwFlag, strCooked.QueryStr() ); - } - -Finished: - return; -} + DWORD dwFlag, + LPCSTR szFormat, + ... + ); +VOID +WDebugPrintf( + DWORD dwFlag, + LPWSTR szFormat, + ... + ); diff --git a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index a13fc774fd..6d947fcb58 100644 --- a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -179,7 +179,6 @@ - diff --git a/src/AspNetCoreModuleV2/IISLib/dbgutil.h b/src/AspNetCoreModuleV2/IISLib/dbgutil.h index 45c26777a9..bf745bfcd9 100644 --- a/src/AspNetCoreModuleV2/IISLib/dbgutil.h +++ b/src/AspNetCoreModuleV2/IISLib/dbgutil.h @@ -7,11 +7,11 @@ #include // -// TODO +// TODO // Using _CrtDbg implementation. If hooking is desired // wrappers should be provided here so that we can reimplement // if neecessary. -// +// // IF_DEBUG/DEBUG FLAGS // // registry configuration @@ -56,7 +56,7 @@ extern DWORD DEBUG_FLAGS_VAR; #define DECLARE_DEBUG_PRINT_OBJECT( _pszLabel_ ) \ PCSTR DEBUG_LABEL_VAR = _pszLabel_; \ - DWORD DEBUG_FLAGS_VAR = DEBUG_FLAGS_ANY; \ + DWORD DEBUG_FLAGS_VAR = DEBUG_FLAGS_WARN; \ #define DECLARE_DEBUG_PRINT_OBJECT2( _pszLabel_, _dwLevel_ ) \ PCSTR DEBUG_LABEL_VAR = _pszLabel_; \ diff --git a/src/AspNetCoreModuleV2/IISLib/pudebug.h b/src/AspNetCoreModuleV2/IISLib/pudebug.h deleted file mode 100644 index 7b0e35da0f..0000000000 --- a/src/AspNetCoreModuleV2/IISLib/pudebug.h +++ /dev/null @@ -1,736 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -# ifndef _PUDEBUG_H_ -# define _PUDEBUG_H_ - -#ifndef _NO_TRACING_ -# define _NO_TRACING_ -#endif // _NO_TRACING_ - -/************************************************************ - * Include Headers - ************************************************************/ - -# ifdef __cplusplus -extern "C" { -# endif // __cplusplus - -# include - -# ifndef dllexp -# define dllexp __declspec( dllexport) -# endif // dllexp - -#include - -#ifndef IN_OUT -#define IN_OUT __inout -#endif - -/*********************************************************** - * Macros - ************************************************************/ - -enum PRINT_REASONS { - PrintNone = 0x0, // Nothing to be printed - PrintError = 0x1, // An error message - PrintWarning = 0x2, // A warning message - PrintLog = 0x3, // Just logging. Indicates a trace of where ... - PrintMsg = 0x4, // Echo input message - PrintCritical = 0x5, // Print and Exit - PrintAssertion= 0x6 // Printing for an assertion failure - }; - - -enum DEBUG_OUTPUT_FLAGS { - DbgOutputNone = 0x0, // None - DbgOutputKdb = 0x1, // Output to Kernel Debugger - DbgOutputLogFile = 0x2, // Output to LogFile - DbgOutputTruncate = 0x4, // Truncate Log File if necessary - DbgOutputStderr = 0x8, // Send output to std error - DbgOutputBackup = 0x10, // Make backup of debug file ? - DbgOutputMemory = 0x20, // Dump to memory buffer - DbgOutputAll = 0xFFFFFFFF // All the bits set. - }; - - -# define MAX_LABEL_LENGTH ( 100) - - -// The following flags are used internally to track what level of tracing we -// are currently using. Bitmapped for extensibility. -#define DEBUG_FLAG_ODS 0x00000001 -//#define DEBUG_FLAG_INFO 0x00000002 -//#define DEBUG_FLAG_WARN 0x00000004 -//#define DEBUG_FLAG_ERROR 0x00000008 -// The following are used internally to determine whether to log or not based -// on what the current state is -//#define DEBUG_FLAGS_INFO (DEBUG_FLAG_ODS | DEBUG_FLAG_INFO) -//#define DEBUG_FLAGS_WARN (DEBUG_FLAG_ODS | DEBUG_FLAG_INFO | DEBUG_FLAG_WARN) -//#define DEBUG_FLAGS_ERROR (DEBUG_FLAG_ODS | DEBUG_FLAG_INFO | DEBUG_FLAG_WARN | DEBUG_FLAG_ERROR) - -#define DEBUG_FLAGS_ANY (DEBUG_FLAG_INFO | DEBUG_FLAG_WARN | DEBUG_FLAG_ERROR) - -// -// user of DEBUG infrastructure may choose unique variable name for DEBUG_FLAGS -// that's specially useful for cases where DEBUG infrastructure is used within -// static library (static library may prefer to maintain it's own DebugFlags independent -// on the main program it links to -// -#ifndef DEBUG_FLAGS_VAR -#define DEBUG_FLAGS_VAR g_dwDebugFlags -#endif - -extern -#ifdef __cplusplus -"C" -# endif // _cplusplus - DWORD DEBUG_FLAGS_VAR ; // Debugging Flags - -# define DECLARE_DEBUG_VARIABLE() - -# define SET_DEBUG_FLAGS( dwFlags) DEBUG_FLAGS_VAR = dwFlags -# define GET_DEBUG_FLAGS() ( DEBUG_FLAGS_VAR ) - -# define LOAD_DEBUG_FLAGS_FROM_REG(hkey, dwDefault) \ - DEBUG_FLAGS_VAR = PuLoadDebugFlagsFromReg((hkey), (dwDefault)) - -# define LOAD_DEBUG_FLAGS_FROM_REG_STR(pszRegKey, dwDefault) \ - DEBUG_FLAGS_VAR = PuLoadDebugFlagsFromRegStr((pszRegKey), (dwDefault)) - -# define SAVE_DEBUG_FLAGS_IN_REG(hkey, dwDbg) \ - PuSaveDebugFlagsInReg((hkey), (dwDbg)) - -# define DEBUG_IF( arg, s) if ( DEBUG_ ## arg & GET_DEBUG_FLAGS()) { \ - s \ - } else {} - -# define IF_DEBUG( arg) if ( DEBUG_## arg & GET_DEBUG_FLAGS()) - - -/*++ - class DEBUG_PRINTS - - This class is responsible for printing messages to log file / kernel debugger - - Currently the class supports only member functions for char. - ( not unicode-strings). - ---*/ - - -typedef struct _DEBUG_PRINTS { - - CHAR m_rgchLabel[MAX_LABEL_LENGTH]; - CHAR m_rgchLogFilePath[MAX_PATH]; - CHAR m_rgchLogFileName[MAX_PATH]; - HANDLE m_LogFileHandle; - HANDLE m_StdErrHandle; - BOOL m_fInitialized; - BOOL m_fBreakOnAssert; - DWORD m_dwOutputFlags; - VOID *m_pMemoryLog; -} DEBUG_PRINTS, FAR * LPDEBUG_PRINTS; - - -LPDEBUG_PRINTS -PuCreateDebugPrintsObject( - IN const char * pszPrintLabel, - IN DWORD dwOutputFlags); - -// -// frees the debug prints object and closes any file if necessary. -// Returns NULL on success or returns pDebugPrints on failure. -// -LPDEBUG_PRINTS -PuDeleteDebugPrintsObject( - IN_OUT LPDEBUG_PRINTS pDebugPrints); - - -VOID -PuDbgPrint( - IN_OUT LPDEBUG_PRINTS pDebugPrints, - IN const char * pszFilePath, - IN int nLineNum, - IN const char * pszFunctionName, - IN const char * pszFormat, - ...); - // arglist -VOID -PuDbgPrintW( - IN_OUT LPDEBUG_PRINTS pDebugPrints, - IN const char * pszFilePath, - IN int nLineNum, - IN const char * pszFunctionName, - IN const WCHAR * pszFormat, - ...); // arglist - -// PuDbgPrintError is similar to PuDbgPrint() but allows -// one to print error code in friendly manner -VOID -PuDbgPrintError( - IN_OUT LPDEBUG_PRINTS pDebugPrints, - IN const char * pszFilePath, - IN int nLineNum, - IN const char * pszFunctionName, - IN DWORD dwError, - IN const char * pszFormat, - ...); // arglist - -/*++ - PuDbgDump() does not do any formatting of output. - It just dumps the given message onto the debug destinations. ---*/ -VOID -PuDbgDump( - IN_OUT LPDEBUG_PRINTS pDebugPrints, - IN const char * pszFilePath, - IN int nLineNum, - IN const char * pszFunctionName, - IN const char * pszDump - ); - -// -// PuDbgAssertFailed() *must* be __cdecl to properly capture the -// thread context at the time of the failure. -// - -INT -__cdecl -PuDbgAssertFailed( - IN_OUT LPDEBUG_PRINTS pDebugPrints, - IN const char * pszFilePath, - IN int nLineNum, - IN const char * pszFunctionName, - IN const char * pszExpression, - IN const char * pszMessage); - -INT -WINAPI -PuDbgPrintAssertFailed( - IN_OUT LPDEBUG_PRINTS pDebugPrints, - IN const char * pszFilePath, - IN int nLineNum, - IN const char * pszFunctionName, - IN const char * pszExpression, - IN const char * pszMessage); - -VOID -PuDbgCaptureContext ( - OUT PCONTEXT ContextRecord - ); - -VOID -PuDbgPrintCurrentTime( - IN_OUT LPDEBUG_PRINTS pDebugPrints, - IN const char * pszFilePath, - IN int nLineNum, - IN const char * pszFunctionName - ); - -VOID -PuSetDbgOutputFlags( - IN_OUT LPDEBUG_PRINTS pDebugPrints, - IN DWORD dwFlags); - -DWORD -PuGetDbgOutputFlags( - IN const LPDEBUG_PRINTS pDebugPrints); - - -// -// Following functions return Win32 error codes. -// NO_ERROR if success -// - -DWORD -PuOpenDbgPrintFile( - IN_OUT LPDEBUG_PRINTS pDebugPrints, - IN const char * pszFileName, - IN const char * pszPathForFile); - -DWORD -PuReOpenDbgPrintFile( - IN_OUT LPDEBUG_PRINTS pDebugPrints); - -DWORD -PuCloseDbgPrintFile( - IN_OUT LPDEBUG_PRINTS pDebugPrints); - -DWORD -PuOpenDbgMemoryLog( - IN_OUT LPDEBUG_PRINTS pDebugPrints); - -DWORD -PuCloseDbgMemoryLog( - IN_OUT LPDEBUG_PRINTS pDebugPrints); - -DWORD -PuLoadDebugFlagsFromReg(IN HKEY hkey, IN DWORD dwDefault); - -DWORD -PuLoadDebugFlagsFromRegStr(IN LPCSTR pszRegKey, IN DWORD dwDefault); - -DWORD -PuSaveDebugFlagsInReg(IN HKEY hkey, IN DWORD dwDbg); - - -# define PuPrintToKdb( pszOutput) \ - if ( pszOutput != NULL) { \ - OutputDebugString( pszOutput); \ - } else {} - - - -# ifdef __cplusplus -}; -# endif // __cplusplus - -// begin_user_unmodifiable - - - -/*********************************************************** - * Macros - ************************************************************/ - - -extern -#ifdef __cplusplus -"C" -# endif // _cplusplus -DEBUG_PRINTS * g_pDebug; // define a global debug variable - -# if DBG - -// For the CHK build we want ODS enabled. For an explanation of these flags see -// the comment just after the definition of DBG_CONTEXT -# define DECLARE_DEBUG_PRINTS_OBJECT() \ - DEBUG_PRINTS * g_pDebug = NULL; \ - DWORD DEBUG_FLAGS_VAR = DEBUG_FLAG_ERROR; - -#else // !DBG - -# define DECLARE_DEBUG_PRINTS_OBJECT() \ - DEBUG_PRINTS * g_pDebug = NULL; \ - DWORD DEBUG_FLAGS_VAR = 0; - -#endif // !DBG - - -// -// Call the following macro as part of your initialization for program -// planning to use the debugging class. -// -/** DEBUGDEBUG -# define CREATE_DEBUG_PRINT_OBJECT( pszLabel) \ - g_pDebug = PuCreateDebugPrintsObject( pszLabel, DEFAULT_OUTPUT_FLAGS);\ - if ( g_pDebug == NULL) { \ - OutputDebugStringA( "Unable to Create Debug Print Object \n"); \ - } -*/ - -// -// Call the following macro once as part of the termination of program -// which uses the debugging class. -// -# define DELETE_DEBUG_PRINT_OBJECT( ) \ - g_pDebug = PuDeleteDebugPrintsObject( g_pDebug); - - -# define VALID_DEBUG_PRINT_OBJECT() \ - ( ( g_pDebug != NULL) && g_pDebug->m_fInitialized) - - -// -// Use the DBG_CONTEXT without any surrounding braces. -// This is used to pass the values for global DebugPrintObject -// and File/Line information -// -//# define DBG_CONTEXT g_pDebug, __FILE__, __LINE__, __FUNCTION__ - -// The 3 main tracing macros, each one corresponds to a different level of -// tracing - -// The 3 main tracing macros, each one corresponds to a different level of -// tracing -//# define DBGINFO(args) {if (DEBUG_FLAGS_VAR & DEBUG_FLAGS_INFO) { PuDbgPrint args; }} -//# define DBGWARN(args) {if (DEBUG_FLAGS_VAR & DEBUG_FLAGS_WARN) { PuDbgPrint args; }} -//# define DBGERROR(args) {if (DEBUG_FLAGS_VAR & DEBUG_FLAGS_ERROR) { PuDbgPrint args; }} - -# define DBGINFOW(args) {if (DEBUG_FLAGS_VAR & DEBUG_FLAGS_INFO) { PuDbgPrintW args; }} -# define DBGWARNW(args) {if (DEBUG_FLAGS_VAR & DEBUG_FLAGS_WARN) { PuDbgPrintW args; }} -# define DBGERRORW(args) {if (DEBUG_FLAGS_VAR & DEBUG_FLAGS_ERROR) { PuDbgPrintW args; }} - - -// -// DBGPRINTF() is printing function ( much like printf) but always called -// with the DBG_CONTEXT as follows -// DBGPRINTF( ( DBG_CONTEXT, format-string, arguments for format list)); -// -# define DBGPRINTF DBGINFO - -// -// DPERROR() is printing function ( much like printf) but always called -// with the DBG_CONTEXT as follows -// DPERROR( ( DBG_CONTEXT, error, format-string, -// arguments for format list)); -// -# define DPERROR( args) {if (DEBUG_FLAGS_VAR & DEBUG_FLAGS_ERROR) { PuDbgPrintError args; }} - -# if DBG - -# define DBG_CODE(s) s /* echoes code in debugging mode */ - -// The same 3 main tracing macros however in this case the macros are only compiled -// into the CHK build. This is necessary because some tracing info used functions or -// variables which are not compiled into the FRE build. -# define CHKINFO(args) { PuDbgPrint args; } -# define CHKWARN(args) { PuDbgPrint args; } -# define CHKERROR(args) { PuDbgPrint args; } - -# define CHKINFOW(args) { PuDbgPrintW args; } -# define CHKWARNW(args) { PuDbgPrintW args; } -# define CHKERRORW(args) { PuDbgPrintW args; } - - -#ifndef DBG_ASSERT -# ifdef _PREFAST_ -# define DBG_ASSERT(exp) ((void)0) /* Do Nothing */ -# define DBG_ASSERT_MSG(exp, pszMsg) ((void)0) /* Do Nothing */ -# define DBG_REQUIRE( exp) ((void) (exp)) -# else // !_PREFAST_ -# define DBG_ASSERT( exp ) \ - ( (VOID)( ( exp ) || ( DebugBreak(), \ - PuDbgPrintAssertFailed( DBG_CONTEXT, #exp, "" ) ) ) ) - -# define DBG_ASSERT_MSG( exp, pszMsg) \ - ( (VOID)( ( exp ) || ( DebugBreak(), \ - PuDbgPrintAssertFailed( DBG_CONTEXT, #exp, pszMsg ) ) ) ) - -# define DBG_REQUIRE( exp ) \ - DBG_ASSERT( exp ) -# endif // !_PREFAST_ -#endif - - -# define DBG_LOG() PuDbgPrint( DBG_CONTEXT, "\n" ) - -# define DBG_OPEN_LOG_FILE( pszFile, pszPath ) \ - PuOpenDbgPrintFile( g_pDebug, (pszFile), (pszPath) ) - -# define DBG_CLOSE_LOG_FILE( ) \ - PuCloseDbgPrintFile( g_pDebug ) - -# define DBG_OPEN_MEMORY_LOG( ) \ - PuOpenDbgMemoryLog( g_pDebug ) - - -# define DBGDUMP( args ) PuDbgDump args - -# define DBGPRINT_CURRENT_TIME() PuDbgPrintCurrentTime( DBG_CONTEXT ) - -# else // !DBG - -# define DBG_CODE(s) ((void)0) /* Do Nothing */ - -# define CHKINFO(args) ((void)0) /* Do Nothing */ -# define CHKWARN(args) ((void)0) /* Do Nothing */ -# define CHKERROR(args) ((void)0) /* Do Nothing */ - -# define CHKINFOW(args) ((void)0) /* Do Nothing */ -# define CHKWARNW(args) ((void)0) /* Do Nothing */ -# define CHKERRORW(args) ((void)0) /* Do Nothing */ - -#ifndef DBG_ASSERT -# define DBG_ASSERT(exp) ((void)0) /* Do Nothing */ - -# define DBG_ASSERT_MSG(exp, pszMsg) ((void)0) /* Do Nothing */ - -# define DBG_REQUIRE( exp) ((void) (exp)) -#endif // !DBG_ASSERT - -# define DBGDUMP( args) ((void)0) /* Do nothing */ - -# define DBG_LOG() ((void)0) /* Do Nothing */ - -# define DBG_OPEN_LOG_FILE( pszFile, pszPath) ((void)0) /* Do Nothing */ - -# define DBG_OPEN_MEMORY_LOG() ((void)0) /* Do Nothing */ - -# define DBG_CLOSE_LOG_FILE() ((void)0) /* Do Nothing */ - -# define DBGPRINT_CURRENT_TIME() ((void)0) /* Do Nothing */ - -# endif // !DBG - - -// end_user_unmodifiable - -// begin_user_unmodifiable - - -#ifdef ASSERT -# undef ASSERT -#endif - - -# define ASSERT( exp) DBG_ASSERT( exp) - - -// end_user_unmodifiable - -// begin_user_modifiable - -// -// Debugging constants consist of two pieces. -// All constants in the range 0x0 to 0x8000 are reserved -// User extensions may include additional constants (bit flags) -// - -# define DEBUG_API_ENTRY 0x00000001L -# define DEBUG_API_EXIT 0x00000002L -# define DEBUG_INIT_CLEAN 0x00000004L -# define DEBUG_ERROR 0x00000008L - - // End of Reserved Range -# define DEBUG_RESERVED 0x00000FFFL - -// end_user_modifiable - - - -/*********************************************************** - * Platform Type related variables and macros - ************************************************************/ - -// -// Enum for product types -// - -typedef enum _PLATFORM_TYPE { - - PtInvalid = 0, // Invalid - PtNtWorkstation = 1, // NT Workstation - PtNtServer = 2, // NT Server - -} PLATFORM_TYPE; - -// -// IISGetPlatformType is the function used to the platform type -// - -extern -#ifdef __cplusplus -"C" -# endif // _cplusplus -PLATFORM_TYPE -IISGetPlatformType( - VOID - ); - -// -// External Macros -// - -#define InetIsNtServer( _pt ) ((_pt) == PtNtServer) -#define InetIsNtWksta( _pt ) ((_pt) == PtNtWorkstation) -#define InetIsValidPT(_pt) ((_pt) != PtInvalid) - -extern -#ifdef __cplusplus -"C" -# endif // _cplusplus -PLATFORM_TYPE g_PlatformType; - - -// Use the DECLARE_PLATFORM_TYPE macro to declare the platform type -#define DECLARE_PLATFORM_TYPE() \ - PLATFORM_TYPE g_PlatformType = PtInvalid; - -// Use the INITIALIZE_PLATFORM_TYPE to init the platform type -// This should typically go inside the DLLInit or equivalent place. -#define INITIALIZE_PLATFORM_TYPE() \ - g_PlatformType = IISGetPlatformType(); - -// -// Additional Macros to use the Platform Type -// - -#define TsIsNtServer( ) InetIsNtServer(g_PlatformType) -#define TsIsNtWksta( ) InetIsNtWksta(g_PlatformType) -#define IISIsValidPlatform() InetIsValidPT(g_PlatformType) -#define IISPlatformType() (g_PlatformType) - - -/*********************************************************** - * Some utility functions for Critical Sections - ************************************************************/ - -// -// IISSetCriticalSectionSpinCount() provides a thunk for the -// original NT4.0sp3 API SetCriticalSectionSpinCount() for CS with Spin counts -// Users of this function should definitely dynlink with kernel32.dll, -// Otherwise errors will surface to a large extent -// -extern -# ifdef __cplusplus -"C" -# endif // _cplusplus -DWORD -IISSetCriticalSectionSpinCount( - LPCRITICAL_SECTION lpCriticalSection, - DWORD dwSpinCount -); - - -// -// Macro for the calls to SetCriticalSectionSpinCount() -// -# define SET_CRITICAL_SECTION_SPIN_COUNT( lpCS, dwSpins) \ - IISSetCriticalSectionSpinCount( (lpCS), (dwSpins)) - -// -// IIS_DEFAULT_CS_SPIN_COUNT is the default value of spins used by -// Critical sections defined within IIS. -// NYI: We should have to switch the individual values based on experiments! -// Current value is an arbitrary choice -// -# define IIS_DEFAULT_CS_SPIN_COUNT (1000) - -// -// Initializes a critical section and sets its spin count -// to IIS_DEFAULT_CS_SPIN_COUNT. Equivalent to -// InitializeCriticalSectionAndSpinCount(lpCS, IIS_DEFAULT_CS_SPIN_COUNT), -// but provides a safe thunking layer for older systems that don't provide -// this API. -// -extern -# ifdef __cplusplus -"C" -# endif // _cplusplus -BOOL -IISInitializeCriticalSection( - LPCRITICAL_SECTION lpCriticalSection -); - -// -// Macro for the calls to InitializeCriticalSection() -// -# define INITIALIZE_CRITICAL_SECTION(lpCS) IISInitializeCriticalSection(lpCS) - -# endif /* _DEBUG_HXX_ */ - -// -// The following macros allow the automatic naming of certain Win32 objects. -// See IIS\SVCS\IISRTL\WIN32OBJ.C for details on the naming convention. -// -// Set IIS_NAMED_WIN32_OBJECTS to a non-zero value to enable named events, -// semaphores, and mutexes. -// - -#if DBG -#define IIS_NAMED_WIN32_OBJECTS 1 -#else -#define IIS_NAMED_WIN32_OBJECTS 0 -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -HANDLE -PuDbgCreateEvent( - __in LPSTR FileName, - IN ULONG LineNumber, - __in LPSTR MemberName, - IN PVOID Address, - IN BOOL ManualReset, - IN BOOL InitialState - ); - -HANDLE -PuDbgCreateSemaphore( - __in LPSTR FileName, - IN ULONG LineNumber, - __in LPSTR MemberName, - IN PVOID Address, - IN LONG InitialCount, - IN LONG MaximumCount - ); - -HANDLE -PuDbgCreateMutex( - __in LPSTR FileName, - IN ULONG LineNumber, - __in LPSTR MemberName, - IN PVOID Address, - IN BOOL InitialOwner - ); - -#ifdef __cplusplus -} // extern "C" -#endif - -#if IIS_NAMED_WIN32_OBJECTS - -#define IIS_CREATE_EVENT( membername, address, manual, state ) \ - PuDbgCreateEvent( \ - (LPSTR)__FILE__, \ - (ULONG)__LINE__, \ - (membername), \ - (PVOID)(address), \ - (manual), \ - (state) \ - ) - -#define IIS_CREATE_SEMAPHORE( membername, address, initial, maximum ) \ - PuDbgCreateSemaphore( \ - (LPSTR)__FILE__, \ - (ULONG)__LINE__, \ - (membername), \ - (PVOID)(address), \ - (initial), \ - (maximum) \ - ) - -#define IIS_CREATE_MUTEX( membername, address, initial ) \ - PuDbgCreateMutex( \ - (LPSTR)__FILE__, \ - (ULONG)__LINE__, \ - (membername), \ - (PVOID)(address), \ - (initial) \ - ) - -#else // !IIS_NAMED_WIN32_OBJECTS - -#define IIS_CREATE_EVENT( membername, address, manual, state ) \ - CreateEventA( \ - NULL, \ - (manual), \ - (state), \ - NULL \ - ) - -#define IIS_CREATE_SEMAPHORE( membername, address, initial, maximum ) \ - CreateSemaphoreA( \ - NULL, \ - (initial), \ - (maximum), \ - NULL \ - ) - -#define IIS_CREATE_MUTEX( membername, address, initial ) \ - CreateMutexA( \ - NULL, \ - (initial), \ - NULL \ - ) - -#endif // IIS_NAMED_WIN32_OBJECTS - - -/************************ End of File ***********************/ - diff --git a/src/AspNetCoreModuleV2/IISLib/reftrace.c b/src/AspNetCoreModuleV2/IISLib/reftrace.c index c1b2e13a6e..877d358c76 100644 --- a/src/AspNetCoreModuleV2/IISLib/reftrace.c +++ b/src/AspNetCoreModuleV2/IISLib/reftrace.c @@ -3,7 +3,6 @@ #include #include "dbgutil.h" -#include "pudebug.h" #include "reftrace.h" diff --git a/src/AspNetCoreModuleV2/IISLib/tracelog.c b/src/AspNetCoreModuleV2/IISLib/tracelog.c index f7b2da5e43..6c0d080299 100644 --- a/src/AspNetCoreModuleV2/IISLib/tracelog.c +++ b/src/AspNetCoreModuleV2/IISLib/tracelog.c @@ -2,7 +2,6 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include -#include "pudebug.h" #include "tracelog.h" #include diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx index ac020d6369..91d8dab0ef 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -10,24 +10,23 @@ #include "inprocessapplication.h" #include "inprocesshandler.h" #include "requesthandler_config.h" +#include "debugutil.h" + +DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_inprocess.dll"); BOOL g_fGlobalInitialize = FALSE; BOOL g_fProcessDetach = FALSE; -DWORD g_dwAspNetCoreDebugFlags = 0; -DWORD g_dwDebugFlags = 0; SRWLOCK g_srwLockRH; IHttpServer * g_pHttpServer = NULL; HINSTANCE g_hWinHttpModule; HINSTANCE g_hAspNetCoreModule; HANDLE g_hEventLog = NULL; -PCSTR g_szDebugLabel = "ASPNET_CORE_MODULE_INPROCESS_REQUEST_HANDLER"; VOID InitializeGlobalConfiguration( IHttpServer * pServer ) { - HKEY hKey; BOOL fLocked = FALSE; if (!g_fGlobalInitialize) @@ -51,29 +50,7 @@ InitializeGlobalConfiguration( g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_EVENT_PROVIDER); } - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module\\Parameters", - 0, - KEY_READ, - &hKey) == NO_ERROR) - { - DWORD dwType; - DWORD dwData; - DWORD cbData; - - cbData = sizeof(dwData); - if ((RegQueryValueEx(hKey, - L"DebugFlags", - NULL, - &dwType, - (LPBYTE)&dwData, - &cbData) == NO_ERROR) && - (dwType == REG_DWORD)) - { - g_dwAspNetCoreDebugFlags = dwData; - } - RegCloseKey(hKey); - } + DebugInitialize(); g_fGlobalInitialize = TRUE; } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 566b0e0aca..3f4e40a27e 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -408,7 +408,7 @@ IN_PROCESS_APPLICATION::LoadManagedApplication goto Finished; } } - + if (m_status != APPLICATION_STATUS::STARTING) { if (m_status == APPLICATION_STATUS::FAIL) diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx index 23b7816ca6..625e884767 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx @@ -3,6 +3,8 @@ #include #include +DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_outofprocess.dll"); + BOOL g_fNsiApiNotSupported = FALSE; BOOL g_fWebSocketStaticInitialize = FALSE; BOOL g_fEnableReferenceCountTracing = FALSE; @@ -12,8 +14,6 @@ BOOL g_fOutOfProcessInitializeError = FALSE; BOOL g_fWinHttpNonBlockingCallbackAvailable = FALSE; BOOL g_fProcessDetach = FALSE; DWORD g_OptionalWinHttpFlags = 0; -DWORD g_dwAspNetCoreDebugFlags = 0; -DWORD g_dwDebugFlags = 0; DWORD g_dwTlsIndex = TLS_OUT_OF_INDEXES; SRWLOCK g_srwLockRH; HINTERNET g_hWinhttpSession = NULL; @@ -21,7 +21,6 @@ IHttpServer * g_pHttpServer = NULL; HINSTANCE g_hWinHttpModule; HINSTANCE g_hAspNetCoreModule; HANDLE g_hEventLog = NULL; -PCSTR g_szDebugLabel = "ASPNET_CORE_MODULE_REQUEST_HANDLER"; VOID InitializeGlobalConfiguration( @@ -87,21 +86,10 @@ InitializeGlobalConfiguration( { g_fEnableReferenceCountTracing = !!dwData; } - - cbData = sizeof(dwData); - if ((RegQueryValueEx(hKey, - L"DebugFlags", - NULL, - &dwType, - (LPBYTE)&dwData, - &cbData) == NO_ERROR) && - (dwType == REG_DWORD)) - { - g_dwAspNetCoreDebugFlags = dwData; - } - RegCloseKey(hKey); } + DebugInitialize(); + dwResult = GetExtendedTcpTable(NULL, &dwSize, FALSE, diff --git a/test/CommonLibTests/inprocess_application_tests.cpp b/test/CommonLibTests/inprocess_application_tests.cpp index da3a2c1271..5a713e901a 100644 --- a/test/CommonLibTests/inprocess_application_tests.cpp +++ b/test/CommonLibTests/inprocess_application_tests.cpp @@ -8,7 +8,6 @@ // Externals defined in inprocess BOOL g_fProcessDetach; HANDLE g_hEventLog; -DWORD g_dwAspNetCoreDebugFlags; PCSTR g_szDebugLabel; DWORD g_dwDebugFlags; diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index 6e50228564..dfeefd3d8b 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -75,6 +75,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(_helloWorldResponse, responseText); + AssertLoadedVersion(version); } [Theory] // Tests need to publish to change folder locations @@ -99,9 +100,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(_helloWorldResponse, responseText); + AssertLoadedVersion(version); } - [Theory] + [Theory] [InlineData("2.1.0")] [InlineData("2.1.0-preview")] public async Task GlobalVersion_MultipleRequestHandlers_UpgradeWorks(string version) @@ -134,6 +136,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(_helloWorldResponse, responseText); + AssertLoadedVersion(version); } private DeploymentParameters GetGlobalVersionBaseDeploymentParameters() @@ -156,5 +159,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests version, _aspNetCoreDll); } + + private void AssertLoadedVersion(string version) + { + Assert.Contains(TestSink.Writes, context => context.Message.Contains(version + @"\aspnetcorev2_outofprocess.dll")); + } } } diff --git a/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs index 3d2be31553..7817fd661f 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -9,6 +9,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting { public class FunctionalTestsBase : LoggedTest { + private const string DebugEnvironmentVariable = "ASPNETCORE_MODULE_DEBUG"; + public FunctionalTestsBase(ITestOutputHelper output = null) : base(output) { } @@ -17,6 +19,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting protected virtual async Task DeployAsync(DeploymentParameters parameters) { + if (!parameters.EnvironmentVariables.ContainsKey(DebugEnvironmentVariable)) + { + // enable debug output + parameters.EnvironmentVariables[DebugEnvironmentVariable] = "4"; + } _deployer = ApplicationDeployerFactory.Create(parameters, LoggerFactory); var result = await _deployer.DeployAsync(); diff --git a/test/WebSites/InProcessWebSite/Properties/launchSettings.json b/test/WebSites/InProcessWebSite/Properties/launchSettings.json index aa0472a2dd..0ef9e81546 100644 --- a/test/WebSites/InProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/InProcessWebSite/Properties/launchSettings.json @@ -18,7 +18,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } }, "ANCM IIS": { @@ -30,7 +31,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } } } diff --git a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json index aa0472a2dd..0ef9e81546 100644 --- a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json @@ -18,7 +18,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } }, "ANCM IIS": { @@ -30,7 +31,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } } } diff --git a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json index aa0472a2dd..0ef9e81546 100644 --- a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json +++ b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json @@ -18,7 +18,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } }, "ANCM IIS": { @@ -30,7 +31,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } } } diff --git a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json index aa0472a2dd..0ef9e81546 100644 --- a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json +++ b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json @@ -18,7 +18,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } }, "ANCM IIS": { @@ -30,7 +31,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } } } diff --git a/test/WebSites/StressTestWebSite/Properties/launchSettings.json b/test/WebSites/StressTestWebSite/Properties/launchSettings.json index aa0472a2dd..0ef9e81546 100644 --- a/test/WebSites/StressTestWebSite/Properties/launchSettings.json +++ b/test/WebSites/StressTestWebSite/Properties/launchSettings.json @@ -18,7 +18,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } }, "ANCM IIS": { @@ -30,7 +31,8 @@ "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)" + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "4" } } } From a159cadf18bd8f5ac4aa763ce3ed57625c0747c0 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 19 Jun 2018 14:41:34 -0700 Subject: [PATCH 073/363] Dispose server before checking test sink (#940) --- .../Inprocess/LoggingTests.cs | 2 +- .../Inprocess/StartupExceptionTests.cs | 4 ++++ .../Inprocess/StartupTests.cs | 3 +++ .../OutOfProcess/GlobalVersionTests.cs | 2 +- .../Utilities/FunctionalTestsBase.cs | 6 ++++++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs index b3c3dd89df..60e39ceb35 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs @@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal("Hello World", responseText); - Dispose(); + StopServer(); var folderPath = Path.Combine(deploymentResult.DeploymentResult.ContentRoot, @"logs"); diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs index 79b92c3424..d82877d20c 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -29,6 +29,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + StopServer(); + Assert.Contains(TestSink.Writes, context => context.Message.Contains($"Random number: {randomNumberString}")); } @@ -48,6 +50,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + StopServer(); + Assert.Contains(TestSink.Writes, context => context.Message.Contains(new string('a', 4096))); } } diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index c470e12360..2f36110c90 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -126,6 +126,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(GetBaseDeploymentParameters("OverriddenServerWebSite")); var response = await deploymentResult.HttpClient.GetAsync("/"); Assert.False(response.IsSuccessStatusCode); + + StopServer(); + Assert.Contains(TestSink.Writes, context => context.Message.Contains("Application is running inside IIS process but is not configured to use IIS server")); } diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index dfeefd3d8b..2bef2b3c16 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -119,7 +119,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(_helloWorldResponse, responseText); - Dispose(); + StopServer(); deploymentResult = await DeployAsync(deploymentParameters); diff --git a/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs index 7817fd661f..1e739b645a 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -32,8 +32,14 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting } public override void Dispose() + { + StopServer(); + } + + public void StopServer() { _deployer?.Dispose(); + _deployer = null; } } } From bac1b1e8b67636cb16d865740ab13b599b4c4164 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 19 Jun 2018 17:19:38 -0700 Subject: [PATCH 074/363] Readd update schema to jenkins agents (#942) --- build/buildpipeline/windows.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy index b0b729de77..3aa3d99283 100644 --- a/build/buildpipeline/windows.groovy +++ b/build/buildpipeline/windows.groovy @@ -10,6 +10,6 @@ simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { stage ('Build') { def logFolder = getLogFolder() def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" - bat "${environment}&.\\run.cmd -CI default-build" + bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"&.\\tools\\update_schema.ps1;${environment};&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\"" } } From 0a97bf9ae832f073dd80997cf2847540db0086a2 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 19 Jun 2018 21:40:29 -0700 Subject: [PATCH 075/363] Use lock wrapper in shim (#936) --- .gitattributes | 1 + .../AspNetCore/Inc/applicationinfo.h | 4 +- .../AspNetCore/src/applicationinfo.cpp | 40 ++---- .../AspNetCore/src/applicationmanager.cxx | 128 ++++++++---------- .../AspNetCore/src/proxymodule.cxx | 4 - .../CommonLib/CommonLib.vcxproj | 6 +- ...RWLockWrapper.cpp => SRWExclusiveLock.cpp} | 6 +- .../CommonLib/SRWExclusiveLock.h | 13 ++ .../CommonLib/SRWSharedLock.cpp | 16 +++ .../{SRWLockWrapper.h => SRWSharedLock.h} | 6 +- src/AspNetCoreModuleV2/CommonLib/stdafx.h | 2 +- .../inprocessapplication.cpp | 6 +- 12 files changed, 114 insertions(+), 118 deletions(-) rename src/AspNetCoreModuleV2/CommonLib/{SRWLockWrapper.cpp => SRWExclusiveLock.cpp} (71%) create mode 100644 src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp rename src/AspNetCoreModuleV2/CommonLib/{SRWLockWrapper.h => SRWSharedLock.h} (73%) diff --git a/.gitattributes b/.gitattributes index 62fe7c511d..204c7323a3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -44,6 +44,7 @@ *.hs text=auto *.rc text=auto +*.vcxproj text=auto *.csproj text=auto *.vbproj text=auto *.fsproj text=auto diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h index f1080bfa12..c53041a664 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h @@ -12,6 +12,7 @@ #include "hashfn.h" #include "aspnetcore_shim_config.h" #include "iapplication.h" +#include "SRWSharedLock.h" #define API_BUFFER_TOO_SMALL 0x80008098 @@ -119,13 +120,12 @@ public: VOID ExtractApplication(IAPPLICATION** ppApplication) { - AcquireSRWLockShared(&m_srwLock); + SRWSharedLock lock(m_srwLock); if (m_pApplication != NULL) { m_pApplication->ReferenceApplication(); } *ppApplication = m_pApplication; - ReleaseSRWLockShared(&m_srwLock); } VOID diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 032b61f43e..6b2649a007 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -192,7 +192,6 @@ APPLICATION_INFO::EnsureApplicationCreated( ) { HRESULT hr = S_OK; - BOOL fLocked = FALSE; IAPPLICATION *pApplication = NULL; STRU struExeLocation; STACK_STRU(struFileName, 300); // >MAX_PATH @@ -205,8 +204,7 @@ APPLICATION_INFO::EnsureApplicationCreated( if (m_pApplication == NULL) { - AcquireSRWLockExclusive(&m_srwLock); - fLocked = TRUE; + SRWExclusiveLock lock(m_srwLock); if (m_pApplication != NULL) { goto Finished; @@ -243,10 +241,6 @@ APPLICATION_INFO::EnsureApplicationCreated( Finished: - if (fLocked) - { - ReleaseSRWLockExclusive(&m_srwLock); - } return hr; } @@ -254,7 +248,6 @@ HRESULT APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) { HRESULT hr = S_OK; - BOOL fLocked = FALSE; PCWSTR pstrHandlerDllName; STACK_STRU(struFileName, 256); @@ -265,8 +258,8 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) } else if (!g_fAspnetcoreRHAssemblyLoaded) { - AcquireSRWLockExclusive(&g_srwLock); - fLocked = TRUE; + SRWExclusiveLock lock(g_srwLock); + if (g_fAspnetcoreRHLoadedError) { hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; @@ -366,11 +359,6 @@ Finished: { g_fAspnetcoreRHLoadedError = TRUE; } - - if (fLocked) - { - ReleaseSRWLockExclusive(&g_srwLock); - } return hr; } @@ -561,14 +549,13 @@ Finished: VOID APPLICATION_INFO::RecycleApplication() { - IAPPLICATION* pApplication = NULL; + IAPPLICATION* pApplication; HANDLE hThread = INVALID_HANDLE_VALUE; - BOOL fLockAcquired = FALSE; if (m_pApplication != NULL) { - AcquireSRWLockExclusive(&m_srwLock); - fLockAcquired = TRUE; + SRWExclusiveLock lock(m_srwLock); + if (m_pApplication != NULL) { pApplication = m_pApplication; @@ -623,11 +610,6 @@ APPLICATION_INFO::RecycleApplication() // Closing a thread handle does not terminate the associated thread or remove the thread object. CloseHandle(hThread); } - - if (fLockAcquired) - { - ReleaseSRWLockExclusive(&m_srwLock); - } } } @@ -655,13 +637,12 @@ VOID APPLICATION_INFO::ShutDownApplication() { IAPPLICATION* pApplication = NULL; - BOOL fLockAcquired = FALSE; // pApplication can be NULL due to app_offline if (m_pApplication != NULL) { - AcquireSRWLockExclusive(&m_srwLock); - fLockAcquired = TRUE; + SRWExclusiveLock lock(m_srwLock); + if (m_pApplication != NULL) { pApplication = m_pApplication; @@ -671,10 +652,5 @@ APPLICATION_INFO::ShutDownApplication() pApplication->ShutDown(); pApplication->DereferenceApplication(); } - - if (fLockAcquired) - { - ReleaseSRWLockExclusive(&m_srwLock); - } } } diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx index cbe291a28f..ed3f1a67b0 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx @@ -22,7 +22,6 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( { HRESULT hr = S_OK; APPLICATION_INFO *pApplicationInfo = NULL; - BOOL fExclusiveLock = FALSE; BOOL fMixedHostingModelError = FALSE; BOOL fDuplicatedInProcessApp = FALSE; PCWSTR pszApplicationId = NULL; @@ -39,18 +38,18 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( // The configuration path is unique for each application and is used for the // key in the applicationInfoHash. pszApplicationId = pHttpContext->GetApplication()->GetApplicationId(); - + // When accessing the m_pApplicationInfoHash, we need to acquire the application manager // lock to avoid races on setting state. - AcquireSRWLockShared(&m_srwLock); - if (g_fInShutdown) { - ReleaseSRWLockShared(&m_srwLock); - hr = HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS); - goto Finished; + SRWSharedLock lock(m_srwLock); + if (g_fInShutdown) + { + hr = HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS); + goto Finished; + } + m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); } - m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); - ReleaseSRWLockShared(&m_srwLock); if (*ppApplicationInfo == NULL) { @@ -68,8 +67,8 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( goto Finished; } - AcquireSRWLockExclusive(&m_srwLock); - fExclusiveLock = TRUE; + SRWExclusiveLock lock(m_srwLock); + if (g_fInShutdown) { // Already in shuting down. No need to create the application @@ -122,11 +121,6 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( Finished: - if (fExclusiveLock) - { - ReleaseSRWLockExclusive(&m_srwLock); - } - // log the error if (fDuplicatedInProcessApp) { @@ -135,7 +129,7 @@ Finished: ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP, ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG, pszApplicationId); - + } else if (fMixedHostingModelError) { @@ -224,60 +218,59 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( return hr; } - AcquireSRWLockExclusive(&m_srwLock); - if (g_fInShutdown) { - ReleaseSRWLockExclusive(&m_srwLock); - return hr; - } - - // Make a shallow copy of existing hashtable as we may need to remove nodes - // This will be used for finding differences in which applications are affected by a config change. - table = new APPLICATION_INFO_HASH(); - - // few application expected, small bucket size for hash table - if (FAILED(hr = table->Initialize(17 /*prime*/))) - { - goto Finished; - } - - context.pstrPath = pszApplicationId; - - // Keep track of the preview count of applications to know whether there are applications to delete - dwPreviousCounter = m_pApplicationInfoHash->Count(); - - // We don't want to hold the application manager lock for long time as it will block all incoming requests - // Don't call application shutdown inside the lock - m_pApplicationInfoHash->Apply(APPLICATION_INFO_HASH::ReferenceCopyToTable, static_cast(table)); - DBG_ASSERT(dwPreviousCounter == table->Count()); - - // Removed the applications which are impacted by the configurtion change - m_pApplicationInfoHash->DeleteIf(FindConfigChangedApplication, (PVOID)&context); - - if (dwPreviousCounter != m_pApplicationInfoHash->Count()) - { - if (m_hostingModel == HOSTING_IN_PROCESS) + SRWExclusiveLock lock(m_srwLock); + if (g_fInShutdown) { - // When we are inprocess, we need to keep the application the - // application manager that is being deleted. This is because we will always need to recycle the worker - // process and any requests that hit this worker process must be rejected (while out of process can - // start a new dotnet process). We will immediately call Recycle after this call. - DBG_ASSERT(m_pApplicationInfoHash->Count() == 0); - delete m_pApplicationInfoHash; + return hr; + } - // We don't want to delete the table as m_pApplicationInfoHash = table - fKeepTable = TRUE; - m_pApplicationInfoHash = table; + // Make a shallow copy of existing hashtable as we may need to remove nodes + // This will be used for finding differences in which applications are affected by a config change. + table = new APPLICATION_INFO_HASH(); + + // few application expected, small bucket size for hash table + if (FAILED(hr = table->Initialize(17 /*prime*/))) + { + goto Finished; + } + + context.pstrPath = pszApplicationId; + + // Keep track of the preview count of applications to know whether there are applications to delete + dwPreviousCounter = m_pApplicationInfoHash->Count(); + + // We don't want to hold the application manager lock for long time as it will block all incoming requests + // Don't call application shutdown inside the lock + m_pApplicationInfoHash->Apply(APPLICATION_INFO_HASH::ReferenceCopyToTable, static_cast(table)); + DBG_ASSERT(dwPreviousCounter == table->Count()); + + // Removed the applications which are impacted by the configurtion change + m_pApplicationInfoHash->DeleteIf(FindConfigChangedApplication, (PVOID)&context); + + if (dwPreviousCounter != m_pApplicationInfoHash->Count()) + { + if (m_hostingModel == HOSTING_IN_PROCESS) + { + // When we are inprocess, we need to keep the application the + // application manager that is being deleted. This is because we will always need to recycle the worker + // process and any requests that hit this worker process must be rejected (while out of process can + // start a new dotnet process). We will immediately call Recycle after this call. + DBG_ASSERT(m_pApplicationInfoHash->Count() == 0); + delete m_pApplicationInfoHash; + + // We don't want to delete the table as m_pApplicationInfoHash = table + fKeepTable = TRUE; + m_pApplicationInfoHash = table; + } + } + + if (m_pApplicationInfoHash->Count() == 0) + { + m_hostingModel = HOSTING_UNKNOWN; } } - if (m_pApplicationInfoHash->Count() == 0) - { - m_hostingModel = HOSTING_UNKNOWN; - } - - ReleaseSRWLockExclusive(&m_srwLock); - // If we receive a request at this point. // OutOfProcess: we will create a new application with new configuration // InProcess: the request would have to be rejected, as we are about to call g_HttpServer->RecycleProcess @@ -364,16 +357,15 @@ APPLICATION_MANAGER::ShutDown() } DBG_ASSERT(m_pApplicationInfoHash); + // During shutdown we lock until we delete the application - AcquireSRWLockExclusive(&m_srwLock); + SRWExclusiveLock lock(m_srwLock); // Call shutdown on each application in the application manager m_pApplicationInfoHash->Apply(ShutdownApplication, NULL); m_pApplicationInfoHash->Clear(); delete m_pApplicationInfoHash; m_pApplicationInfoHash = NULL; - - ReleaseSRWLockExclusive(&m_srwLock); } } diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index 47d49ffcff..59a1ac9c1f 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -46,10 +46,6 @@ Return value: --*/ { - /* FORWARDING_HANDLER::StaticTerminate(); - - WEBSOCKET_HANDLER::StaticTerminate();*/ - ALLOC_CACHE_HANDLER::StaticTerminate(); delete this; } diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index cf8f7a929d..dde46fc814 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -200,7 +200,8 @@ - + + @@ -211,7 +212,8 @@ - + + diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.cpp b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp similarity index 71% rename from src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.cpp rename to src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp index 52ecf57d07..ae492f005e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp @@ -2,15 +2,15 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "stdafx.h" -#include "SRWLockWrapper.h" +#include "SRWExclusiveLock.h" -SRWLockWrapper::SRWLockWrapper(const SRWLOCK& lock) +SRWExclusiveLock:: SRWExclusiveLock(const SRWLOCK& lock) : m_lock(lock) { AcquireSRWLockExclusive(const_cast(&m_lock)); } -SRWLockWrapper::~SRWLockWrapper() +SRWExclusiveLock::~SRWExclusiveLock() { ReleaseSRWLockExclusive(const_cast(&m_lock)); } diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h new file mode 100644 index 0000000000..15fcc1f673 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h @@ -0,0 +1,13 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +class SRWExclusiveLock +{ +public: + SRWExclusiveLock(const SRWLOCK& lock); + ~SRWExclusiveLock(); +private: + const SRWLOCK& m_lock; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp b/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp new file mode 100644 index 0000000000..613e56984e --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp @@ -0,0 +1,16 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "SRWSharedLock.h" + +SRWSharedLock:: SRWSharedLock(const SRWLOCK& lock) + : m_lock(lock) +{ + AcquireSRWLockShared(const_cast(&m_lock)); +} + +SRWSharedLock::~SRWSharedLock() +{ + ReleaseSRWLockShared(const_cast(&m_lock)); +} diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.h b/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h similarity index 73% rename from src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.h rename to src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h index e8c112a2d5..b05b0090fb 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.h +++ b/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h @@ -3,11 +3,11 @@ #pragma once -class SRWLockWrapper +class SRWSharedLock { public: - SRWLockWrapper(const SRWLOCK& lock); - ~SRWLockWrapper(); + SRWSharedLock(const SRWLOCK& lock); + ~SRWSharedLock(); private: const SRWLOCK& m_lock; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index 43c8a1b2bf..8b6893759c 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -31,7 +31,7 @@ #include "requesthandler.h" #include "iapplication.h" #include "application.h" -#include "SRWLockWrapper.h" +#include "SRWExclusiveLock.h" #include "fx_ver.h" #include "utility.h" #include "GlobalVersionUtility.h" diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 3f4e40a27e..a48bde809a 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -153,7 +153,7 @@ IN_PROCESS_APPLICATION::ShutDownInternal() } { - SRWLockWrapper lock(m_srwLock); + SRWExclusiveLock lock(m_srwLock); if (m_fShutdownCalledFromNative || m_status == APPLICATION_STATUS::STARTING || @@ -223,7 +223,7 @@ IN_PROCESS_APPLICATION::Recycle( } { - SRWLockWrapper lock(m_srwLock); + SRWExclusiveLock lock(m_srwLock); if (m_fRecycleCalled) { @@ -388,7 +388,7 @@ IN_PROCESS_APPLICATION::LoadManagedApplication { // Set up stdout redirect - SRWLockWrapper lock(m_srwLock); + SRWExclusiveLock lock(m_srwLock); if (m_pLoggerProvider == NULL) { From 1e823d88e2c0ae77dc2003577155a08e94284461 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 20 Jun 2018 09:11:19 -0700 Subject: [PATCH 076/363] Ignore case on handlerVersion (#941) --- .../CommonLib/config_utility.h | 2 +- test/CommonLibTests/ConfigUtilityTests.cpp | 121 +++++++++--------- 2 files changed, 61 insertions(+), 62 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/AspNetCoreModuleV2/CommonLib/config_utility.h index 0a53ff63e3..8fde16f010 100644 --- a/src/AspNetCoreModuleV2/CommonLib/config_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/config_utility.h @@ -68,7 +68,7 @@ public: } - if (strHandlerName.Equals(CS_ASPNETCORE_HANDLER_VERSION)) + if (strHandlerName.Equals(CS_ASPNETCORE_HANDLER_VERSION, TRUE)) { hr = strHandlerVersionValue->Copy(strHandlerValue); goto Finished; diff --git a/test/CommonLibTests/ConfigUtilityTests.cpp b/test/CommonLibTests/ConfigUtilityTests.cpp index fbed259117..e37abe896a 100644 --- a/test/CommonLibTests/ConfigUtilityTests.cpp +++ b/test/CommonLibTests/ConfigUtilityTests.cpp @@ -8,75 +8,69 @@ using ::testing::NiceMock; namespace ConfigUtilityTests { - TEST(ConfigUtilityTest, HandlerVersionSet) + using ::testing::Test; + + class ConfigUtilityTest : public Test { - IAppHostElement* retElement = NULL; + protected: + void Test(std::wstring key, std::wstring value, std::wstring expected) + { + IAppHostElement* retElement = NULL; - STRU handlerVersion; + STRU handlerVersion; + BSTR bstrKey = SysAllocString(key.c_str()); + BSTR bstrValue = SysAllocString(value.c_str()); - // NiceMock removes warnings about "uninteresting calls", - auto element = std::make_unique>(); - auto innerElement = std::make_unique>(); - auto collection = std::make_unique>(); - auto nameElement = std::make_unique>(); - auto mockProperty = std::make_unique>(); + // NiceMock removes warnings about "uninteresting calls", + auto element = std::make_unique>(); + auto innerElement = std::make_unique>(); + auto collection = std::make_unique>(); + auto nameElement = std::make_unique>(); + auto mockProperty = std::make_unique>(); - ON_CALL(*element, GetElementByName(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); - ON_CALL(*innerElement, get_Collection(_)) - .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); - ON_CALL(*collection, get_Count(_)) - .WillByDefault(DoAll(testing::SetArgPointee<0>(1), testing::Return(S_OK))); - ON_CALL(*collection, get_Item(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); - ON_CALL(*nameElement, GetPropertyByName(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); - EXPECT_CALL(*mockProperty, get_StringValue(_)) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"handlerVersion")), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))); + ON_CALL(*element, GetElementByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); + ON_CALL(*innerElement, get_Collection(_)) + .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); + ON_CALL(*collection, get_Count(_)) + .WillByDefault(DoAll(testing::SetArgPointee<0>(1), testing::Return(S_OK))); + ON_CALL(*collection, get_Item(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); + ON_CALL(*nameElement, GetPropertyByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); + EXPECT_CALL(*mockProperty, get_StringValue(_)) + .WillOnce(DoAll(testing::SetArgPointee<0>(bstrKey), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(bstrValue), testing::Return(S_OK))); - HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); + HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); - EXPECT_STREQ(handlerVersion.QueryStr(), L"value"); + EXPECT_STREQ(handlerVersion.QueryStr(), expected.c_str()); + + SysFreeString(bstrKey); + SysFreeString(bstrValue); + } + }; + + TEST_F(ConfigUtilityTest, CheckHandlerVersionKeysAndValues) + { + Test(L"handlerVersion", L"value", L"value"); + Test(L"handlerversion", L"value", L"value"); + Test(L"HandlerversioN", L"value", L"value"); + Test(L"randomvalue", L"value", L""); + Test(L"", L"value", L""); + Test(L"", L"", L""); } - TEST(ConfigUtilityTest, NoHandlerVersion) - { - IAppHostElement* retElement = NULL; - - STRU handlerVersion; - - // NiceMock removes warnings about "uninteresting calls", - auto element = std::make_unique>(); - auto innerElement = std::make_unique>(); - auto collection = std::make_unique>(); - auto nameElement = std::make_unique>(); - auto mockProperty = std::make_unique>(); - - ON_CALL(*element, GetElementByName(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); - ON_CALL(*innerElement, get_Collection(_)) - .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); - ON_CALL(*collection, get_Count(_)) - .WillByDefault(DoAll(testing::SetArgPointee<0>(1), testing::Return(S_OK))); - ON_CALL(*collection, get_Item(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); - ON_CALL(*nameElement, GetPropertyByName(_, _)) - .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); - EXPECT_CALL(*mockProperty, get_StringValue(_)) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"randomvalue")), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))); - - HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); - - EXPECT_STREQ(handlerVersion.QueryStr(), L""); - } - - TEST(ConfigUtilityTest, MultipleElements) + TEST(ConfigUtilityTestSingle, MultipleElements) { IAppHostElement* retElement = NULL; STRU handlerVersion; + BSTR bstrKey = SysAllocString(L"key"); + BSTR bstrValue = SysAllocString(L"value"); + BSTR bstrKey2 = SysAllocString(L"handlerVersion"); + BSTR bstrValue2 = SysAllocString(L"value2"); + auto element = std::make_unique>(); auto innerElement = std::make_unique>(); auto collection = std::make_unique>(); @@ -94,13 +88,18 @@ namespace ConfigUtilityTests ON_CALL(*nameElement, GetPropertyByName(_, _)) .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); EXPECT_CALL(*mockProperty, get_StringValue(_)) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"key")), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"handlerVersion")), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value2")), testing::Return(S_OK))); + .WillOnce(DoAll(testing::SetArgPointee<0>(bstrKey), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(bstrValue), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(bstrKey2), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(bstrValue2), testing::Return(S_OK))); HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); EXPECT_STREQ(handlerVersion.QueryStr(), L"value2"); + + SysFreeString(bstrKey); + SysFreeString(bstrValue); + SysFreeString(bstrKey2); + SysFreeString(bstrValue2); } } From 7977793d4fbb8f9eda2bc850435414b0b9fe08f3 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 20 Jun 2018 09:27:42 -0700 Subject: [PATCH 077/363] Catch all exceptions on ANCM/IIS border (#864) --- .../AspNetCore/src/dllmain.cpp | 4 +- .../AspNetCore/src/proxymodule.cxx | 177 ++++++++++-------- .../CommonLib/CommonLib.vcxproj | 1 + .../CommonLib/debugutil.cpp | 2 + src/AspNetCoreModuleV2/CommonLib/debugutil.h | 3 +- src/AspNetCoreModuleV2/CommonLib/exceptions.h | 59 ++++++ src/AspNetCoreModuleV2/CommonLib/stdafx.h | 2 +- .../exception_handler_tests.cpp | 49 +++++ 8 files changed, 212 insertions(+), 85 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/exceptions.h create mode 100644 test/CommonLibTests/exception_handler_tests.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp index 2b77015e36..373b835190 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp @@ -70,7 +70,7 @@ RegisterModule( DWORD dwServerVersion, IHttpModuleRegistrationInfo * pModuleInfo, IHttpServer * pHttpServer -) +) try /*++ Routine description: @@ -222,4 +222,4 @@ Finished: return hr; } - +CATCH_RETURN() diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index 59a1ac9c1f..94b6f356a1 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -6,8 +6,7 @@ #include "applicationmanager.h" #include "applicationinfo.h" #include "acache.h" -#include "hostfxroptions.h" - +#include "exceptions.h" __override HRESULT @@ -16,13 +15,12 @@ ASPNET_CORE_PROXY_MODULE_FACTORY::GetHttpModule( IModuleAllocator * pAllocator ) { - ASPNET_CORE_PROXY_MODULE *pModule = new (pAllocator) ASPNET_CORE_PROXY_MODULE(); - if (pModule == NULL) + try { - return E_OUTOFMEMORY; + *ppModule = THROW_IF_NULL_ALLOC(new (pAllocator) ASPNET_CORE_PROXY_MODULE());; + return S_OK; } - *ppModule = pModule; - return S_OK; + CATCH_RETURN(); } __override @@ -82,21 +80,23 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; IAPPLICATION* pApplication = NULL; STRU struExeLocation; - - if (g_fInShutdown) + try { - hr = HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS); - goto Finished; - } - pApplicationManager = APPLICATION_MANAGER::GetInstance(); + if (g_fInShutdown) + { + hr = HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS); + goto Finished; + } - hr = pApplicationManager->GetOrCreateApplicationInfo( - g_pHttpServer, + pApplicationManager = APPLICATION_MANAGER::GetInstance(); + + hr = pApplicationManager->GetOrCreateApplicationInfo( + g_pHttpServer, pHttpContext, - &m_pApplicationInfo); - if (FAILED(hr)) - { + &m_pApplicationInfo); + if (FAILED(hr)) + { goto Finished; } @@ -105,70 +105,76 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( // Application cannot be started due to wrong hosting mode // the error should already been logged to window event log for the first request hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; - goto Finished; - } + goto Finished; + } - // app_offline check to avoid loading aspnetcorerh.dll unnecessarily - if (m_pApplicationInfo->AppOfflineFound()) + // app_offline check to avoid loading aspnetcorerh.dll unnecessarily + if (m_pApplicationInfo->AppOfflineFound()) + { + // servicing app_offline + HTTP_DATA_CHUNK DataChunk; + IHttpResponse *pResponse = NULL; + APP_OFFLINE_HTM *pAppOfflineHtm = NULL; + + pResponse = pHttpContext->GetResponse(); + pAppOfflineHtm = m_pApplicationInfo->QueryAppOfflineHtm(); + DBG_ASSERT(pAppOfflineHtm); + DBG_ASSERT(pResponse); + + // Ignore failure hresults as nothing we can do + // Set fTrySkipCustomErrors to true as we want client see the offline content + pResponse->SetStatus(503, "Service Unavailable", 0, hr, NULL, TRUE); + pResponse->SetHeader("Content-Type", + "text/html", + (USHORT)strlen("text/html"), + FALSE + ); + + DataChunk.DataChunkType = HttpDataChunkFromMemory; + DataChunk.FromMemory.pBuffer = (PVOID)pAppOfflineHtm->m_Contents.QueryStr(); + DataChunk.FromMemory.BufferLength = pAppOfflineHtm->m_Contents.QueryCB(); + pResponse->WriteEntityChunkByReference(&DataChunk); + + retVal = RQ_NOTIFICATION_FINISH_REQUEST; + goto Finished; + } + + // make sure assmebly is loaded and application is created + hr = m_pApplicationInfo->EnsureApplicationCreated(pHttpContext); + if (FAILED(hr)) + { + goto Finished; + } + + m_pApplicationInfo->ExtractApplication(&pApplication); + + // make sure application is in running state + // cannot recreate the application as we cannot reload clr for inprocess + if (pApplication != NULL && + pApplication->QueryStatus() != APPLICATION_STATUS::RUNNING && + pApplication->QueryStatus() != APPLICATION_STATUS::STARTING) + { + hr = HRESULT_FROM_WIN32(ERROR_SERVER_DISABLED); + goto Finished; + } + + // Create RequestHandler and process the request + hr = pApplication->CreateHandler(pHttpContext, + &m_pHandler); + + if (FAILED(hr)) + { + goto Finished; + } + + retVal = m_pHandler->OnExecuteRequestHandler(); + + } + catch (...) { - // servicing app_offline - HTTP_DATA_CHUNK DataChunk; - IHttpResponse *pResponse = NULL; - APP_OFFLINE_HTM *pAppOfflineHtm = NULL; - - pResponse = pHttpContext->GetResponse(); - pAppOfflineHtm = m_pApplicationInfo->QueryAppOfflineHtm(); - DBG_ASSERT(pAppOfflineHtm); - DBG_ASSERT(pResponse); - - // Ignore failure hresults as nothing we can do - // Set fTrySkipCustomErrors to true as we want client see the offline content - pResponse->SetStatus(503, "Service Unavailable", 0, hr, NULL, TRUE); - pResponse->SetHeader("Content-Type", - "text/html", - (USHORT)strlen("text/html"), - FALSE - ); - - DataChunk.DataChunkType = HttpDataChunkFromMemory; - DataChunk.FromMemory.pBuffer = (PVOID)pAppOfflineHtm->m_Contents.QueryStr(); - DataChunk.FromMemory.BufferLength = pAppOfflineHtm->m_Contents.QueryCB(); - pResponse->WriteEntityChunkByReference(&DataChunk); - - retVal = RQ_NOTIFICATION_FINISH_REQUEST; - goto Finished; + hr = CaughtExceptionHResult(); } - // make sure assmebly is loaded and application is created - hr = m_pApplicationInfo->EnsureApplicationCreated(pHttpContext); - if (FAILED(hr)) - { - goto Finished; - } - - m_pApplicationInfo->ExtractApplication(&pApplication); - - // make sure application is in running state - // cannot recreate the application as we cannot reload clr for inprocess - if (pApplication != NULL && - pApplication->QueryStatus() != APPLICATION_STATUS::RUNNING && - pApplication->QueryStatus() != APPLICATION_STATUS::STARTING) - { - hr = HRESULT_FROM_WIN32(ERROR_SERVER_DISABLED); - goto Finished; - } - - // Create RequestHandler and process the request - hr = pApplication->CreateHandler(pHttpContext, - &m_pHandler); - - if (FAILED(hr)) - { - goto Finished; - } - - retVal = m_pHandler->OnExecuteRequestHandler(); - Finished: if (FAILED(hr)) { @@ -200,7 +206,16 @@ ASPNET_CORE_PROXY_MODULE::OnAsyncCompletion( IHttpCompletionInfo * pCompletionInfo ) { - return m_pHandler->OnAsyncCompletion( - pCompletionInfo->GetCompletionBytes(), - pCompletionInfo->GetCompletionStatus()); + try + { + return m_pHandler->OnAsyncCompletion( + pCompletionInfo->GetCompletionBytes(), + pCompletionInfo->GetCompletionStatus()); + } + catch (...) + { + // Log exception + CaughtExceptionHResult(); + return RQ_NOTIFICATION_FINISH_REQUEST; + } } diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index dde46fc814..3ce37711c7 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -190,6 +190,7 @@ + diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index 023d578387..4cc4e3815d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. +#include "stdafx.h" + #include "debugutil.h" #include "dbgutil.h" diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/AspNetCoreModuleV2/CommonLib/debugutil.h index d2340d6214..715f5273a2 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.h +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.h @@ -2,7 +2,8 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #pragma once -#include "stdafx.h" + +#include #define ASPNETCORE_DEBUG_FLAG_INFO DEBUG_FLAG_INFO #define ASPNETCORE_DEBUG_FLAG_WARNING DEBUG_FLAG_WARN diff --git a/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/AspNetCoreModuleV2/CommonLib/exceptions.h new file mode 100644 index 0000000000..84bb984bf4 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/exceptions.h @@ -0,0 +1,59 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include + +#include "debugutil.h" + +inline VOID ReportUntypedException() +{ + DebugPrint(ASPNETCORE_DEBUG_FLAG_ERROR, "Unhandled non-standard exception"); +} + +inline VOID ReportException(std::exception& exception) +{ + DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, "Unhandled exception: %s", exception.what()); +} + +inline __declspec(noinline) HRESULT CaughtExceptionHResult() +{ + try + { + throw; + } + catch (const std::bad_alloc&) + { + return E_OUTOFMEMORY; + } + catch (std::system_error& exception) + { + ReportException(exception); + return exception.code().value(); + } + catch (std::exception& exception) + { + ReportException(exception); + return HRESULT_FROM_WIN32(ERROR_UNHANDLED_EXCEPTION); + } + catch (...) + { + ReportUntypedException(); + return HRESULT_FROM_WIN32(ERROR_UNHANDLED_EXCEPTION); + } +} + +template auto Throw_IfNullAlloc(PointerT pointer) +{ + if (pointer == nullptr) + { + throw std::bad_alloc(); + } + return pointer; +} + + +#define RETURN_CAUGHT_EXCEPTION() return CaughtExceptionHResult(); +#define CATCH_RETURN() catch (...) { RETURN_CAUGHT_EXCEPTION(); } +#define THROW_IF_NULL_ALLOC(ptr) Throw_IfNullAlloc(ptr) diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index 8b6893759c..24e683b14e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -40,4 +40,4 @@ #include "hostfxr_utility.h" #include "EventLog.h" #include "hostfxroptions.h" - +#include "exceptions.h" diff --git a/test/CommonLibTests/exception_handler_tests.cpp b/test/CommonLibTests/exception_handler_tests.cpp new file mode 100644 index 0000000000..d0a9e97fdb --- /dev/null +++ b/test/CommonLibTests/exception_handler_tests.cpp @@ -0,0 +1,49 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" + +TEST(CaughtExceptionHResult, ReturnsOutOfMemoryForBadAlloc) +{ + HRESULT hr; + try + { + throw std::bad_alloc(); + } + catch(...) + { + hr = CaughtExceptionHResult(); + } + + EXPECT_EQ(E_OUTOFMEMORY, hr); +} + +TEST(CaughtExceptionHResult, ReturnsValueForSystemError) +{ + HRESULT hr; + try + { + throw std::system_error(E_INVALIDARG, std::system_category()); + } + catch(...) + { + hr = CaughtExceptionHResult(); + } + + EXPECT_EQ(E_INVALIDARG, hr); +} + +TEST(CaughtExceptionHResult, ReturnsUhandledExceptionForOtherExceptions) +{ + HRESULT hr; + try + { + throw E_INVALIDARG; + } + catch(...) + { + hr = CaughtExceptionHResult(); + } + + EXPECT_EQ(HRESULT_FROM_WIN32(ERROR_UNHANDLED_EXCEPTION), hr); +} From ed1fa44a3ddbe9668b4ffc2a8de208ec0d7a0449 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 20 Jun 2018 16:22:19 -0700 Subject: [PATCH 078/363] Add diagnostics to hostfxrutil (#951) --- .../AspNetCore/src/applicationinfo.cpp | 38 +++---- .../AspNetCore/src/proxymodule.cxx | 9 +- .../CommonLib/config_utility.h | 88 ++++------------- .../CommonLib/debugutil.cpp | 2 +- src/AspNetCoreModuleV2/CommonLib/debugutil.h | 14 ++- src/AspNetCoreModuleV2/CommonLib/exceptions.h | 58 ++++++++--- .../CommonLib/hostfxr_utility.cpp | 99 ++++++++++++------- .../CommonLib/hostfxroptions.cpp | 35 ++----- .../inprocessapplication.cpp | 18 ++-- test/CommonLibTests/ConfigUtilityTests.cpp | 29 ++---- .../inprocess_application_tests.cpp | 2 - test/CommonLibTests/main.cpp | 2 + 12 files changed, 183 insertions(+), 211 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 6b2649a007..0839090ed0 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -191,15 +191,14 @@ APPLICATION_INFO::EnsureApplicationCreated( IHttpContext *pHttpContext ) { - HRESULT hr = S_OK; IAPPLICATION *pApplication = NULL; STRU struExeLocation; - STACK_STRU(struFileName, 300); // >MAX_PATH STRU struHostFxrDllLocation; + STACK_STRU(struFileName, 300); // >MAX_PATH if (m_pApplication != NULL) { - goto Finished; + return S_OK; } if (m_pApplication == NULL) @@ -207,7 +206,7 @@ APPLICATION_INFO::EnsureApplicationCreated( SRWExclusiveLock lock(m_srwLock); if (m_pApplication != NULL) { - goto Finished; + return S_OK; } // @@ -221,27 +220,19 @@ APPLICATION_INFO::EnsureApplicationCreated( // FindRequestHandlerAssembly obtains a global lock, but after releasing the lock, // there is a period where we could call - hr = FindRequestHandlerAssembly(struExeLocation); - if (FAILED(hr)) - { - goto Finished; - } + RETURN_IF_FAILED(FindRequestHandlerAssembly(struExeLocation)); if (m_pfnAspNetCoreCreateApplication == NULL) { - hr = HRESULT_FROM_WIN32(ERROR_INVALID_FUNCTION); - goto Finished; + RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_INVALID_FUNCTION)); } - hr = m_pfnAspNetCoreCreateApplication(m_pServer, pHttpContext, struExeLocation.QueryStr(), &pApplication); - + RETURN_IF_FAILED(m_pfnAspNetCoreCreateApplication(m_pServer, pHttpContext, struExeLocation.QueryStr(), &pApplication)); m_pApplication = pApplication; } } -Finished: - - return hr; + return S_OK; } HRESULT @@ -288,20 +279,17 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) { std::unique_ptr options; - if (FAILED(hr = HOSTFXR_OPTIONS::Create( + FINISHED_IF_FAILED(HOSTFXR_OPTIONS::Create( NULL, m_pConfiguration->QueryProcessPath()->QueryStr(), m_pConfiguration->QueryApplicationPhysicalPath()->QueryStr(), m_pConfiguration->QueryArguments()->QueryStr(), g_hEventLog, - options))) - { - goto Finished; - } + options)); - location.Copy(options->GetExeLocation()); + FINISHED_IF_FAILED(location.Copy(options->GetExeLocation())); - if (FAILED(hr = FindNativeAssemblyFromHostfxr(options.get(), pstrHandlerDllName, &struFileName))) + if (FAILED_LOG(hr = FindNativeAssemblyFromHostfxr(options.get(), pstrHandlerDllName, &struFileName))) { UTILITY::LogEventF(g_hEventLog, EVENTLOG_ERROR_TYPE, @@ -314,7 +302,7 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) } else { - if (FAILED(hr = FindNativeAssemblyFromGlobalLocation(pstrHandlerDllName, &struFileName))) + if (FAILED_LOG(hr = FindNativeAssemblyFromGlobalLocation(pstrHandlerDllName, &struFileName))) { UTILITY::LogEventF(g_hEventLog, EVENTLOG_ERROR_TYPE, @@ -326,7 +314,7 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) } } - WDebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, L"Loading request handler: %s", struFileName.QueryStr()); + WLOG_INFOF(L"Loading request handler: %s", struFileName.QueryStr()); g_hAspnetCoreRH = LoadLibraryW(struFileName.QueryStr()); diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index 94b6f356a1..2dce65cf09 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -97,8 +97,8 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( &m_pApplicationInfo); if (FAILED(hr)) { - goto Finished; - } + goto Finished; + } if (!m_pApplicationInfo->QueryAllowStart()) { @@ -172,7 +172,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( } catch (...) { - hr = CaughtExceptionHResult(); + hr = OBSERVE_CAUGHT_EXCEPTION(); } Finished: @@ -214,8 +214,7 @@ ASPNET_CORE_PROXY_MODULE::OnAsyncCompletion( } catch (...) { - // Log exception - CaughtExceptionHResult(); + OBSERVE_CAUGHT_EXCEPTION(); return RQ_NOTIFICATION_FINISH_REQUEST; } } diff --git a/src/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/AspNetCoreModuleV2/CommonLib/config_utility.h index 8fde16f010..92320d97ed 100644 --- a/src/AspNetCoreModuleV2/CommonLib/config_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/config_utility.h @@ -17,90 +17,38 @@ public: HRESULT FindHandlerVersion(IAppHostElement* pElement, STRU* strHandlerVersionValue) { - HRESULT hr = S_OK; - IAppHostElement *pHandlerSettings = NULL; - IAppHostElementCollection *pHandlerSettingsCollection = NULL; - ENUM_INDEX index; - IAppHostElement *pHandlerVar = NULL; + HRESULT hr; + CComPtr pHandlerSettings = nullptr; + CComPtr pHandlerSettingsCollection = nullptr; + CComPtr pHandlerVar = nullptr; + ENUM_INDEX index {}; STRU strHandlerName; STRU strHandlerValue; - hr = GetElementChildByName(pElement, - CS_ASPNETCORE_HANDLER_SETTINGS, - &pHandlerSettings); - if (FAILED(hr)) + RETURN_IF_FAILED(GetElementChildByName(pElement, CS_ASPNETCORE_HANDLER_SETTINGS,&pHandlerSettings)); + RETURN_IF_FAILED(pHandlerSettings->get_Collection(&pHandlerSettingsCollection)); + + RETURN_IF_FAILED(hr = FindFirstElement(pHandlerSettingsCollection, &index, &pHandlerVar)); + + while (hr != S_FALSE) { - goto Finished; - } - - hr = pHandlerSettings->get_Collection(&pHandlerSettingsCollection); - if (FAILED(hr)) - { - goto Finished; - } - - for (hr = FindFirstElement(pHandlerSettingsCollection, &index, &pHandlerVar); - SUCCEEDED(hr); - hr = FindNextElement(pHandlerSettingsCollection, &index, &pHandlerVar)) - { - if (hr == S_FALSE) - { - hr = S_OK; - break; - } - - hr = GetElementStringProperty(pHandlerVar, - CS_ASPNETCORE_HANDLER_SETTINGS_NAME, - &strHandlerName); - - if (FAILED(hr)) - { - goto Finished; - } - - hr = GetElementStringProperty(pHandlerVar, - CS_ASPNETCORE_HANDLER_SETTINGS_VALUE, - &strHandlerValue); - - if (FAILED(hr)) - { - goto Finished; - - } + RETURN_IF_FAILED(GetElementStringProperty(pHandlerVar, CS_ASPNETCORE_HANDLER_SETTINGS_NAME, &strHandlerName)); + RETURN_IF_FAILED(GetElementStringProperty(pHandlerVar, CS_ASPNETCORE_HANDLER_SETTINGS_VALUE, &strHandlerValue)); if (strHandlerName.Equals(CS_ASPNETCORE_HANDLER_VERSION, TRUE)) { - hr = strHandlerVersionValue->Copy(strHandlerValue); - goto Finished; + RETURN_IF_FAILED(strHandlerVersionValue->Copy(strHandlerValue)); + break; } strHandlerName.Reset(); strHandlerValue.Reset(); + pHandlerVar.Release(); - pHandlerVar->Release(); - pHandlerVar = NULL; - } - Finished: - - if (pHandlerVar != NULL) - { - pHandlerVar->Release(); - pHandlerVar = NULL; + RETURN_IF_FAILED(hr = FindNextElement(pHandlerSettingsCollection, &index, &pHandlerVar)); } - if (pHandlerSettingsCollection != NULL) - { - pHandlerSettingsCollection->Release(); - pHandlerSettingsCollection = NULL; - } - - if (pHandlerSettings != NULL) - { - pHandlerSettings->Release(); - pHandlerSettings = NULL; - } - - return hr; + return S_OK; } }; diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index 4cc4e3815d..a0dfdbb00a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -132,7 +132,7 @@ DebugPrintf( VOID WDebugPrintf( DWORD dwFlag, - LPWSTR szFormat, + LPCWSTR szFormat, ... ) { diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/AspNetCoreModuleV2/CommonLib/debugutil.h index 715f5273a2..54b0809221 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.h +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.h @@ -10,6 +10,18 @@ #define ASPNETCORE_DEBUG_FLAG_ERROR DEBUG_FLAG_ERROR #define ASPNETCORE_DEBUG_FLAG_CONSOLE 0x00000008 +#define LOG_INFO(...) DebugPrint(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) +#define LOG_INFOF(...) DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) +#define WLOG_INFOF(...) WDebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) + +#define LOG_WARN(...) DebugPrint(ASPNETCORE_DEBUG_FLAG_WARNING, __VA_ARGS__) +#define LOG_WARNF(...) DebugPrintf(ASPNETCORE_DEBUG_FLAG_WARNING, __VA_ARGS__) +#define WLOG_WARNF(...) WDebugPrintf(ASPNETCORE_DEBUG_FLAG_WARNING, __VA_ARGS__) + +#define LOG_ERROR(...) DebugPrint(ASPNETCORE_DEBUG_FLAG_ERROR, __VA_ARGS__) +#define LOG_ERRORF(...) DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, __VA_ARGS__) +#define WLOG_ERRORF(...) WDebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, __VA_ARGS__) + VOID DebugInitialize(); @@ -34,6 +46,6 @@ DebugPrintf( VOID WDebugPrintf( DWORD dwFlag, - LPWSTR szFormat, + LPCWSTR szFormat, ... ); diff --git a/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/AspNetCoreModuleV2/CommonLib/exceptions.h index 84bb984bf4..fc765d50a3 100644 --- a/src/AspNetCoreModuleV2/CommonLib/exceptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/exceptions.h @@ -7,17 +7,54 @@ #include "debugutil.h" -inline VOID ReportUntypedException() +#define LOCATION_INFO_ENABLED TRUE + +#if LOCATION_INFO_ENABLED +#define LOCATION_FORMAT "%s:%d " +#define LOCATION_ARGUMENTS_ONLY _In_opt_ PCSTR fileName, unsigned int lineNumber +#define LOCATION_ARGUMENTS LOCATION_ARGUMENTS_ONLY, +#define LOCATION_CALL_ONLY fileName, lineNumber +#define LOCATION_CALL LOCATION_CALL_ONLY, +#define LOCATION_INFO __FILE__, __LINE__ +#else +#define LOCATION_FORMAT +#define LOCATION_ARGUMENTS_ONLY +#define LOCATION_ARGUMENTS +#define LOCATION_CALL_ONLY +#define LOCATION_CALL +#define LOCATION_INFO +#endif + +#define OBSERVE_CAUGHT_EXCEPTION() CaughtExceptionHResult(LOCATION_INFO); +#define RETURN_CAUGHT_EXCEPTION() return CaughtExceptionHResult(LOCATION_INFO); +#define CATCH_RETURN() catch (...) { RETURN_CAUGHT_EXCEPTION(); } +#define THROW_IF_NULL_ALLOC(ptr) Throw_IfNullAlloc(ptr) +#define RETURN_IF_FAILED(hr) do { HRESULT __hrRet = hr; if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); return __hrRet; }} while (0, 0) +#define FINISHED_IF_FAILED(hrr) do { HRESULT __hrRet = hrr; if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); hr = __hrRet; goto Finished; }} while (0, 0) +#define LOG_IF_FAILED(hr) LogHResultFailed(LOCATION_INFO, hr) +#define SUCCEEDED_LOG(hr) SUCCEEDED(LOG_IF_FAILED(hr)) +#define FAILED_LOG(hr) FAILED(LOG_IF_FAILED(hr)) + + __declspec(noinline) inline VOID ReportUntypedException(LOCATION_ARGUMENTS_ONLY) { - DebugPrint(ASPNETCORE_DEBUG_FLAG_ERROR, "Unhandled non-standard exception"); + DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, LOCATION_FORMAT "Unhandled non-standard exception", LOCATION_CALL_ONLY); } -inline VOID ReportException(std::exception& exception) + __declspec(noinline) inline VOID ReportException(LOCATION_ARGUMENTS std::exception& exception) { - DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, "Unhandled exception: %s", exception.what()); + DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, LOCATION_FORMAT "Unhandled exception: %s", LOCATION_CALL exception.what()); } -inline __declspec(noinline) HRESULT CaughtExceptionHResult() + __declspec(noinline) inline HRESULT LogHResultFailed(LOCATION_ARGUMENTS HRESULT hr) +{ + if (FAILED(hr)) + { + DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, "Failed HRESULT returned: 0x%x at " LOCATION_FORMAT, hr, LOCATION_CALL_ONLY); + } + return hr; +} + +__declspec(noinline) inline HRESULT CaughtExceptionHResult(LOCATION_ARGUMENTS_ONLY) { try { @@ -29,17 +66,17 @@ inline __declspec(noinline) HRESULT CaughtExceptionHResult() } catch (std::system_error& exception) { - ReportException(exception); + ReportException(LOCATION_CALL exception); return exception.code().value(); } catch (std::exception& exception) { - ReportException(exception); + ReportException(LOCATION_CALL exception); return HRESULT_FROM_WIN32(ERROR_UNHANDLED_EXCEPTION); } catch (...) { - ReportUntypedException(); + ReportUntypedException(LOCATION_CALL_ONLY); return HRESULT_FROM_WIN32(ERROR_UNHANDLED_EXCEPTION); } } @@ -52,8 +89,3 @@ template auto Throw_IfNullAlloc(PointerT pointer) } return pointer; } - - -#define RETURN_CAUGHT_EXCEPTION() return CaughtExceptionHResult(); -#define CATCH_RETURN() catch (...) { RETURN_CAUGHT_EXCEPTION(); } -#define THROW_IF_NULL_ALLOC(ptr) Throw_IfNullAlloc(ptr) diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index ad13fd7438..5c7cc6f679 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -29,23 +29,31 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( _Out_ BSTR** ppwzArgv ) { - HRESULT hr = S_OK; + WLOG_INFOF(L"Resolving standalone hostfxr parameters for application: %s arguments: %s path: %s", + pwzExeAbsolutePath, + pcwzArguments, + pwzExeAbsolutePath); const fs::path exePath(pwzExeAbsolutePath); if (!exePath.has_extension()) { + WLOG_INFOF(L"Exe path has not extension, returning"); + return false; } const fs::path physicalPath(pcwzApplicationPhysicalPath); const fs::path hostFxrLocation = physicalPath / "hostfxr.dll"; + WLOG_INFOF(L"Checking hostfxr.dll at %s", hostFxrLocation.c_str()); + if (!is_regular_file(hostFxrLocation)) { fs::path runtimeConfigLocation = exePath; runtimeConfigLocation.replace_extension(L".runtimeconfig.json"); + WLOG_INFOF(L"Checking runtimeconfig.json at %s", runtimeConfigLocation.c_str()); if (!is_regular_file(runtimeConfigLocation)) { EVENTLOG(hEventLog, INPROCESS_FULL_FRAMEWORK_APP, pcwzApplicationPhysicalPath, 0); @@ -61,23 +69,23 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( if (!is_regular_file(dllPath)) { + WLOG_INFOF(L"Application dll at %s was not found", dllPath.c_str()); return E_FAIL; } auto arguments = std::wstring(dllPath) + L" " + pcwzArguments; - if (FAILED(hr = pStruHostFxrDllLocation->Copy(hostFxrLocation.c_str()))) - { - return hr; - } + RETURN_IF_FAILED(pStruHostFxrDllLocation->Copy(hostFxrLocation.c_str())); - return ParseHostfxrArguments( + RETURN_IF_FAILED(ParseHostfxrArguments( arguments.c_str(), pwzExeAbsolutePath, pcwzApplicationPhysicalPath, hEventLog, pdwArgCount, - ppwzArgv); + ppwzArgv)); + + return S_OK; } BOOL @@ -102,6 +110,11 @@ HOSTFXR_UTILITY::GetHostFxrParameters( { HRESULT hr = S_OK; + WLOG_INFOF(L"Resolving hostfxr parameters for application: %s arguments: %s path: %s", + pcwzProcessPath, + pcwzArguments, + pcwzApplicationPhysicalPath); + const fs::path applicationPhysicalPath = pcwzApplicationPhysicalPath; fs::path processPath = ExpandEnvironmentVariables(pcwzProcessPath); std::wstring arguments = ExpandEnvironmentVariables(pcwzArguments); @@ -114,6 +127,7 @@ HOSTFXR_UTILITY::GetHostFxrParameters( // Check if the absolute path is to dotnet or not. if (IsDotnetExecutable(processPath)) { + WLOG_INFOF(L"Process path %s is dotnet, treating application as portable", processPath.c_str()); // // The processPath ends with dotnet.exe or dotnet // like: C:\Program Files\dotnet\dotnet.exe, C:\Program Files\dotnet\dotnet, dotnet.exe, or dotnet. @@ -134,29 +148,21 @@ HOSTFXR_UTILITY::GetHostFxrParameters( return E_FAIL; } - if (FAILED(hr = HOSTFXR_UTILITY::ParseHostfxrArguments( + RETURN_IF_FAILED(HOSTFXR_UTILITY::ParseHostfxrArguments( arguments.c_str(), processPath.c_str(), pcwzApplicationPhysicalPath, hEventLog, pdwArgCount, - pbstrArgv))) - { - return hr; - } + pbstrArgv)); - if (FAILED(hr = pStruHostFxrDllLocation->Copy(hostFxrPath->c_str()))) - { - return hr; - } - - if (FAILED(hr = pStruExeAbsolutePath->Copy(processPath.c_str()))) - { - return hr; - } + RETURN_IF_FAILED(pStruHostFxrDllLocation->Copy(hostFxrPath->c_str())); + RETURN_IF_FAILED(pStruExeAbsolutePath->Copy(processPath.c_str())); } else { + WLOG_INFOF(L"Process path %s is not dotnet, treating application as standalone", processPath.c_str()); + // // The processPath is a path to the application executable // like: C:\test\MyApp.Exe or MyApp.Exe @@ -164,23 +170,16 @@ HOSTFXR_UTILITY::GetHostFxrParameters( // if (is_regular_file(processPath)) { - if (FAILED(hr = GetStandaloneHostfxrParameters( + RETURN_IF_FAILED(GetStandaloneHostfxrParameters( processPath.c_str(), pcwzApplicationPhysicalPath, arguments.c_str(), hEventLog, pStruHostFxrDllLocation, pdwArgCount, - pbstrArgv))) - { - return hr; - } - - if (FAILED(hr = pStruExeAbsolutePath->Copy(processPath.c_str()))) - { - return hr; - } + pbstrArgv)); + RETURN_IF_FAILED(pStruExeAbsolutePath->Copy(processPath.c_str())); } else { @@ -189,7 +188,7 @@ HOSTFXR_UTILITY::GetHostFxrParameters( // then it is an invalid argument. // hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - UTILITY::LogEventF(hEventLog, ASPNETCORE_EVENT_INVALID_PROCESS_PATH_LEVEL, ASPNETCORE_EVENT_INVALID_PROCESS_PATH, ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG, processPath.c_str(), hr); + EVENTLOG(hEventLog, INVALID_PROCESS_PATH, processPath.c_str(), hr); return hr; } } @@ -228,6 +227,11 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( STRU struTempPath; INT intArgsProcessed = 0; + WLOG_INFOF(L"Resolving hostfxr_main arguments application: %s arguments: %s path: %s", + pwzExePath, + pwzArgumentsFromConfig, + pcwzApplicationPhysicalPath); + // If we call CommandLineToArgvW with an empty string, argc is 5 for some interesting reason. // Protectively guard against this by check if the string is null or empty. if (pwzArgumentsFromConfig == NULL || wcscmp(pwzArgumentsFromConfig, L"") == 0) @@ -240,7 +244,7 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( if (pwzArgs == NULL) { - hr = HRESULT_FROM_WIN32(GetLastError()); + hr = LOG_IF_FAILED(HRESULT_FROM_WIN32(GetLastError())); goto Failure; } @@ -283,6 +287,10 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( goto Failure; } } + + WLOG_INFOF(L"Argument[%d] = %s", + intArgsProcessed + 1, + argv[intArgsProcessed + 1]); } *pbstrArgv = argv; @@ -317,11 +325,15 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( const fs::path & requestedPath ) { + WLOG_INFOF(L"Resolving absolute path do dotnet.exe from %s", requestedPath.c_str()); + // // If we are given an absolute path to dotnet.exe, we are done // if (is_regular_file(requestedPath)) { + WLOG_INFOF(L"Found dotnet.exe at %s", requestedPath.c_str()); + return std::make_optional(requestedPath); } @@ -330,6 +342,8 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( if (is_regular_file(pathWithExe)) { + WLOG_INFOF(L"Found dotnet.exe at %s", pathWithExe.c_str()); + return std::make_optional(pathWithExe); } @@ -345,10 +359,21 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( const auto dotnetViaWhere = InvokeWhereToFindDotnet(); if (dotnetViaWhere.has_value()) { + WLOG_INFOF(L"Found dotnet.exe wia where.exe invocation at %s", dotnetViaWhere.value().c_str()); + return dotnetViaWhere; } - return GetAbsolutePathToDotnetFromProgramFiles(); + const auto programFilesLocation = GetAbsolutePathToDotnetFromProgramFiles(); + if (programFilesLocation.has_value()) + { + WLOG_INFOF(L"Found dotnet.exe in Program Files at %s", programFilesLocation.value().c_str()); + + return programFilesLocation; + } + + WLOG_INFOF(L"dotnet.exe not found"); + return std::nullopt; } std::optional @@ -360,6 +385,8 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( std::vector versionFolders; const auto hostFxrBase = dotnetPath.parent_path() / "host" / "fxr"; + WLOG_INFOF(L"Resolving absolute path do hostfxr.dll from %s", dotnetPath.c_str()); + if (!is_directory(hostFxrBase)) { EVENTLOG(hEventLog, HOSTFXR_DIRECTORY_NOT_FOUND, hostFxrBase.c_str(), HRESULT_FROM_WIN32(ERROR_BAD_ENVIRONMENT)); @@ -387,6 +414,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( return std::nullopt; } + WLOG_INFOF(L"hostfxr.dll located at %s", hostFxrPath.c_str()); return std::make_optional(hostFxrPath); } @@ -643,8 +671,7 @@ HOSTFXR_UTILITY::FindDotNetFolders( do { - std::wstring folder(data.cFileName); - pvFolders.push_back(folder); + pvFolders.emplace_back(data.cFileName); } while (FindNextFileW(handle, &data)); FindClose(handle); diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp index feeaa0bf6c..69e60c8b90 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp @@ -11,22 +11,21 @@ HRESULT HOSTFXR_OPTIONS::Create( _In_ HANDLE hEventLog, _Out_ std::unique_ptr& ppWrapper) { - HRESULT hr = S_OK; STRU struHostFxrDllLocation; STRU struExeAbsolutePath; STRU struExeLocation; BSTR* pwzArgv; DWORD dwArgCount; - if (pcwzExeLocation != NULL && FAILED(struExeLocation.Copy(pcwzExeLocation))) + if (pcwzExeLocation != NULL) { - goto Finished; + RETURN_IF_FAILED(struExeLocation.Copy(pcwzExeLocation)); } // If the exe was not provided by the shim, reobtain the hostfxr parameters (which finds dotnet). if (struExeLocation.IsEmpty()) { - if (FAILED(hr = HOSTFXR_UTILITY::GetHostFxrParameters( + RETURN_IF_FAILED(HOSTFXR_UTILITY::GetHostFxrParameters( hEventLog, pcwzProcessPath, pcwzApplicationPhysicalPath, @@ -34,48 +33,34 @@ HRESULT HOSTFXR_OPTIONS::Create( &struHostFxrDllLocation, &struExeAbsolutePath, &dwArgCount, - &pwzArgv))) - { - goto Finished; - } + &pwzArgv)); } else if (HOSTFXR_UTILITY::IsDotnetExecutable(struExeLocation.QueryStr())) { - if (FAILED(hr = HOSTFXR_UTILITY::ParseHostfxrArguments( + RETURN_IF_FAILED(HOSTFXR_UTILITY::ParseHostfxrArguments( pcwzArguments, pcwzExeLocation, pcwzApplicationPhysicalPath, hEventLog, &dwArgCount, - &pwzArgv))) - { - goto Finished; - } + &pwzArgv)); } else { - if (FAILED(hr = HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( + RETURN_IF_FAILED(HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( pcwzExeLocation, pcwzApplicationPhysicalPath, pcwzArguments, hEventLog, &struHostFxrDllLocation, &dwArgCount, - &pwzArgv))) - { - goto Finished; - } + &pwzArgv)); } ppWrapper = std::make_unique(); - if (FAILED(hr = ppWrapper->Populate(struHostFxrDllLocation.QueryStr(), struExeAbsolutePath.QueryStr(), dwArgCount, pwzArgv))) - { - goto Finished; - } + RETURN_IF_FAILED(ppWrapper->Populate(struHostFxrDllLocation.QueryStr(), struExeAbsolutePath.QueryStr(), dwArgCount, pwzArgv)); -Finished: - - return hr; + return S_OK; } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index a48bde809a..34359b1f2f 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -557,7 +557,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication( VOID ) { - HRESULT hr = S_OK; + HRESULT hr; HMODULE hModule = nullptr; DWORD hostfxrArgc = 0; BSTR *hostfxrArgv = NULL; @@ -576,7 +576,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication( if (hModule == NULL) { // .NET Core not installed (we can log a more detailed error message here) - hr = ERROR_BAD_ENVIRONMENT; + hr = LOG_IF_FAILED(ERROR_BAD_ENVIRONMENT); goto Finished; } @@ -584,29 +584,23 @@ IN_PROCESS_APPLICATION::ExecuteApplication( pProc = (hostfxr_main_fn)GetProcAddress(hModule, "hostfxr_main"); if (pProc == NULL) { - hr = ERROR_BAD_ENVIRONMENT; + hr = LOG_IF_FAILED(ERROR_BAD_ENVIRONMENT); goto Finished; } - if (FAILED(hr = HOSTFXR_OPTIONS::Create( + FINISHED_IF_FAILED(hr = HOSTFXR_OPTIONS::Create( m_struExeLocation.QueryStr(), m_pConfig->QueryProcessPath()->QueryStr(), m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), m_pConfig->QueryArguments()->QueryStr(), g_hEventLog, hostFxrOptions - ))) - { - goto Finished; - } + )); hostfxrArgc = hostFxrOptions->GetArgc(); hostfxrArgv = hostFxrOptions->GetArgv(); - if (FAILED(hr = SetEnvironementVariablesOnWorkerProcess())) - { - goto Finished; - } + FINISHED_IF_FAILED(SetEnvironementVariablesOnWorkerProcess()); } // There can only ever be a single instance of .NET Core diff --git a/test/CommonLibTests/ConfigUtilityTests.cpp b/test/CommonLibTests/ConfigUtilityTests.cpp index e37abe896a..99ee323f43 100644 --- a/test/CommonLibTests/ConfigUtilityTests.cpp +++ b/test/CommonLibTests/ConfigUtilityTests.cpp @@ -18,8 +18,6 @@ namespace ConfigUtilityTests IAppHostElement* retElement = NULL; STRU handlerVersion; - BSTR bstrKey = SysAllocString(key.c_str()); - BSTR bstrValue = SysAllocString(value.c_str()); // NiceMock removes warnings about "uninteresting calls", auto element = std::make_unique>(); @@ -39,15 +37,13 @@ namespace ConfigUtilityTests ON_CALL(*nameElement, GetPropertyByName(_, _)) .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); EXPECT_CALL(*mockProperty, get_StringValue(_)) - .WillOnce(DoAll(testing::SetArgPointee<0>(bstrKey), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(bstrValue), testing::Return(S_OK))); + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(key.c_str())), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(value.c_str())), testing::Return(S_OK))); HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); + EXPECT_EQ(hr, S_OK); EXPECT_STREQ(handlerVersion.QueryStr(), expected.c_str()); - - SysFreeString(bstrKey); - SysFreeString(bstrValue); } }; @@ -66,11 +62,6 @@ namespace ConfigUtilityTests IAppHostElement* retElement = NULL; STRU handlerVersion; - BSTR bstrKey = SysAllocString(L"key"); - BSTR bstrValue = SysAllocString(L"value"); - BSTR bstrKey2 = SysAllocString(L"handlerVersion"); - BSTR bstrValue2 = SysAllocString(L"value2"); - auto element = std::make_unique>(); auto innerElement = std::make_unique>(); auto collection = std::make_unique>(); @@ -88,18 +79,14 @@ namespace ConfigUtilityTests ON_CALL(*nameElement, GetPropertyByName(_, _)) .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); EXPECT_CALL(*mockProperty, get_StringValue(_)) - .WillOnce(DoAll(testing::SetArgPointee<0>(bstrKey), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(bstrValue), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(bstrKey2), testing::Return(S_OK))) - .WillOnce(DoAll(testing::SetArgPointee<0>(bstrValue2), testing::Return(S_OK))); + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"key")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"handlerVersion")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value2")), testing::Return(S_OK))); HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); + EXPECT_EQ(hr, S_OK); EXPECT_STREQ(handlerVersion.QueryStr(), L"value2"); - - SysFreeString(bstrKey); - SysFreeString(bstrValue); - SysFreeString(bstrKey2); - SysFreeString(bstrValue2); } } diff --git a/test/CommonLibTests/inprocess_application_tests.cpp b/test/CommonLibTests/inprocess_application_tests.cpp index 5a713e901a..0467f33c4f 100644 --- a/test/CommonLibTests/inprocess_application_tests.cpp +++ b/test/CommonLibTests/inprocess_application_tests.cpp @@ -8,8 +8,6 @@ // Externals defined in inprocess BOOL g_fProcessDetach; HANDLE g_hEventLog; -PCSTR g_szDebugLabel; -DWORD g_dwDebugFlags; namespace InprocessTests { diff --git a/test/CommonLibTests/main.cpp b/test/CommonLibTests/main.cpp index 47c991b3e9..f4a91c733a 100644 --- a/test/CommonLibTests/main.cpp +++ b/test/CommonLibTests/main.cpp @@ -3,6 +3,8 @@ #include "stdafx.h" +DECLARE_DEBUG_PRINT_OBJECT2("tests", ASPNETCORE_DEBUG_FLAG_INFO | ASPNETCORE_DEBUG_FLAG_CONSOLE); + #if defined(_WIN32) int wmain(int argc, wchar_t* argv[]) #else From d7bcb19c796f4631539cf1950f8e6fce684efda5 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 21 Jun 2018 09:39:24 -0700 Subject: [PATCH 079/363] Update deps --- build/dependencies.props | 72 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index cf867dcfa4..7b5df9ab2a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,48 +4,48 @@ 0.10.13 - 2.2.0-preview1-17081 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 0.6.0-a-preview1-publish-wait-for-exit-17062 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 + 2.2.0-preview1-17090 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 0.6.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 15.6.82 15.6.82 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 + 2.2.0-preview1-34507 2.0.0 2.1.0 - 2.2.0-preview1-26606-01 - 2.2.0-preview1-34411 + 2.2.0-preview1-26618-02 + 2.2.0-preview1-34507 15.6.1 2.0.3 - 4.6.0-preview1-26605-01 - 4.6.0-preview1-26605-01 - 4.6.0-preview1-26605-01 - 4.6.0-preview1-26605-01 - 4.6.0-preview1-26605-01 - 4.6.0-preview1-26605-01 - 4.6.0-preview1-26605-01 + 4.6.0-preview1-26617-01 + 4.6.0-preview1-26617-01 + 4.6.0-preview1-26617-01 + 4.6.0-preview1-26617-01 + 4.6.0-preview1-26617-01 + 4.6.0-preview1-26617-01 + 4.6.0-preview1-26617-01 9.0.1 2.3.1 2.4.0-beta.1.build3945 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 9592880b2a..3e694b2ed8 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17081 -commithash:73f09c256e2a54270951562ecc0ef4a953926c36 +version:2.2.0-preview1-17090 +commithash:b19e903e946579cd9482089bce7d917e8bacd765 From 93de3f83ce648901bd820531c739af45cb4d0259 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 21 Jun 2018 11:32:56 -0700 Subject: [PATCH 080/363] Reenable precompiled headers in AspNetCore project (#937) --- .../AspNetCore/AspNetCore.vcxproj | 12 +++++-- .../AspNetCore/Inc/applicationinfo.h | 3 +- .../AspNetCore/Inc/applicationmanager.h | 2 -- .../AspNetCore/Inc/appoffline.h | 3 +- .../AspNetCore/Inc/aspnetcore_shim_config.h | 6 ++-- .../AspNetCore/Inc/filewatcher.h | 14 ++------ .../AspNetCore/Inc/globalmodule.h | 2 -- .../AspNetCore/Inc/precomp.hxx | 34 +------------------ .../AspNetCore/Inc/proxymodule.h | 2 -- .../AspNetCore/src/applicationinfo.cpp | 3 ++ .../AspNetCore/src/applicationmanager.cxx | 4 ++- .../AspNetCore/src/aspnetcore_shim_config.cpp | 1 - .../AspNetCore/src/dllmain.cpp | 4 +-- .../AspNetCore/src/precomp.cpp | 4 +++ .../AspNetCore/src/proxymodule.cxx | 1 - .../CommonLib/CommonLib.vcxproj | 18 +++++++--- src/AspNetCoreModuleV2/CommonLib/EventLog.h | 3 ++ .../CommonLib/GlobalVersionUtility.cpp | 5 ++- .../CommonLib/GlobalVersionUtility.h | 3 +- .../CommonLib/SRWExclusiveLock.cpp | 1 - .../CommonLib/SRWExclusiveLock.h | 2 ++ .../CommonLib/SRWSharedLock.cpp | 1 - .../CommonLib/SRWSharedLock.h | 2 ++ .../CommonLib/application.h | 3 +- .../CommonLib/config_utility.h | 4 ++- .../CommonLib/debugutil.cpp | 6 ++-- src/AspNetCoreModuleV2/CommonLib/debugutil.h | 1 + src/AspNetCoreModuleV2/CommonLib/fx_ver.cxx | 8 +++-- src/AspNetCoreModuleV2/CommonLib/fx_ver.h | 4 +-- .../CommonLib/hostfxr_utility.cpp | 6 +++- .../CommonLib/hostfxr_utility.h | 4 +-- .../CommonLib/hostfxroptions.cpp | 4 ++- .../CommonLib/hostfxroptions.h | 3 ++ .../CommonLib/iapplication.h | 2 +- .../CommonLib/irequesthandler.h | 2 ++ .../CommonLib/requesthandler.h | 3 +- src/AspNetCoreModuleV2/CommonLib/resources.h | 2 ++ src/AspNetCoreModuleV2/CommonLib/stdafx.cpp | 4 +++ src/AspNetCoreModuleV2/CommonLib/stdafx.h | 28 +-------------- src/AspNetCoreModuleV2/CommonLib/sttimer.h | 1 - src/AspNetCoreModuleV2/CommonLib/utility.cxx | 4 ++- src/AspNetCoreModuleV2/CommonLib/utility.h | 4 +++ src/AspNetCoreModuleV2/IISLib/ahutil.h | 2 +- .../InProcessRequestHandler/dllmain.cxx | 2 +- .../inprocessapplication.cpp | 3 ++ .../inprocessapplication.h | 1 + .../RequestHandlerLib/FileOutputManager.cpp | 5 +-- 47 files changed, 120 insertions(+), 116 deletions(-) create mode 100644 src/AspNetCoreModuleV2/AspNetCore/src/precomp.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/stdafx.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index 77e0442946..db4a1edf2d 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -76,7 +76,6 @@ - NotUsing Level4 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) @@ -98,6 +97,7 @@ true true stdcpp17 + precomp.hxx Windows @@ -112,7 +112,6 @@ - NotUsing Level4 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) @@ -134,6 +133,7 @@ true true stdcpp17 + precomp.hxx Windows @@ -170,6 +170,7 @@ true true stdcpp17 + precomp.hxx Windows @@ -208,6 +209,7 @@ true true stdcpp17 + precomp.hxx Windows @@ -239,6 +241,12 @@ + + Create + Create + Create + Create + diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h index c53041a664..ecb85b0355 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h @@ -3,7 +3,7 @@ #pragma once -#include "precomp.hxx" +#include #include "hostfxroptions.h" #include "appoffline.h" @@ -13,6 +13,7 @@ #include "aspnetcore_shim_config.h" #include "iapplication.h" #include "SRWSharedLock.h" +#include "ntassert.h" #define API_BUFFER_TOO_SMALL 0x80008098 diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h index 06c168d4b9..dac98163f5 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h @@ -3,8 +3,6 @@ #pragma once -#include "precomp.hxx" - #include "applicationinfo.h" #include "multisz.h" #include "filewatcher.h" diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h index 581292fdba..0f985ca64d 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h @@ -3,7 +3,8 @@ #pragma once -#include "precomp.hxx" +#include "stringa.h" +#include "stringu.h" class APP_OFFLINE_HTM { diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h index 401efa3010..7560df38d1 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h @@ -3,8 +3,10 @@ #pragma once -#include "precomp.hxx" -#include +#include +#include + +#include "stringu.h" #define CS_ASPNETCORE_SECTION L"system.webServer/aspNetCore" #define CS_ASPNETCORE_PROCESS_EXE_PATH L"processPath" diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h index 8290b4b118..8bcd746326 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h @@ -3,20 +3,12 @@ #pragma once -#include "precomp.hxx" +#include + +#include "stringu.h" #define FILE_WATCHER_SHUTDOWN_KEY (ULONG_PTR)(-1) #define FILE_WATCHER_ENTRY_BUFFER_SIZE 4096 -#ifndef CONTAINING_RECORD -// -// Calculate the address of the base of the structure given its type, and an -// address of a field within the structure. -// - -#define CONTAINING_RECORD(address, type, field) \ - ((type *)((PCHAR)(address)-(ULONG_PTR)(&((type *)0)->field))) - -#endif // !CONTAINING_RECORD #define FILE_NOTIFY_VALID_MASK 0x00000fff #define FILE_WATCHER_ENTRY_SIGNATURE ((DWORD) 'FWES') #define FILE_WATCHER_ENTRY_SIGNATURE_FREE ((DWORD) 'sewf') diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h index a21ea907d5..0a7b38f0ff 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h @@ -3,8 +3,6 @@ #pragma once -#include "precomp.hxx" - #include "applicationmanager.h" class ASPNET_CORE_GLOBAL_MODULE : public CGlobalModule diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx b/src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx index 6e6e2619e3..b0ee0b7e32 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx @@ -16,40 +16,8 @@ #include #include #include - #include "stringu.h" -#include "stringa.h" - -#include "ntassert.h" -#include "dbgutil.h" - -#include "aspnetcore_msg.h" -#include "resources.h" - -#include - -FORCEINLINE -DWORD -WIN32_FROM_HRESULT( - HRESULT hr -) -{ - if ((FAILED(hr)) && - (HRESULT_FACILITY(hr) == FACILITY_WIN32)) - { - return HRESULT_CODE(hr); - } - return hr; -} - -FORCEINLINE -HRESULT -HRESULT_FROM_GETLASTERROR() -{ - return ( GetLastError() != NO_ERROR ) - ? HRESULT_FROM_WIN32( GetLastError() ) - : E_FAIL; -} +#include "stringu.h" extern PVOID g_pModuleId; extern BOOL g_fAspnetcoreRHAssemblyLoaded; diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h index a5711f84c4..a0580b39b1 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h @@ -3,8 +3,6 @@ #pragma once -#include "precomp.hxx" - #include "applicationinfo.h" #include "irequesthandler.h" diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 0839090ed0..28c7c3636e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -7,6 +7,9 @@ #include "hostfxr_utility.h" #include "utility.h" #include "debugutil.h" +#include "resources.h" +#include "SRWExclusiveLock.h" +#include "GlobalVersionUtility.h" const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx index ed3f1a67b0..45e0ae3b68 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx @@ -1,10 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include #include "applicationmanager.h" + #include "proxymodule.h" #include "utility.h" +#include "resources.h" +#include "SRWExclusiveLock.h" // The application manager is a singleton across ANCM. APPLICATION_MANAGER* APPLICATION_MANAGER::sm_pApplicationManager = NULL; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp index 108d5f4f6c..21c3bd997e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp @@ -5,7 +5,6 @@ #include "config_utility.h" #include "hostfxr_utility.h" -#include "debugutil.h" #include "ahutil.h" ASPNETCORE_SHIM_CONFIG::~ASPNETCORE_SHIM_CONFIG() diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp index 373b835190..3f1ea78354 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp @@ -1,8 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "precomp.hxx" - #include "applicationinfo.h" #include "applicationmanager.h" #include "proxymodule.h" @@ -10,6 +8,8 @@ #include "acache.h" #include "utility.h" #include "debugutil.h" +#include "resources.h" +#include "exceptions.h" DECLARE_DEBUG_PRINT_OBJECT("aspnetcore.dll"); diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.cpp new file mode 100644 index 0000000000..12fcb1d436 --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.cpp @@ -0,0 +1,4 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +// Do not remove this file. It is used for precompiled header generation diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index 2dce65cf09..96372b48a1 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -7,7 +7,6 @@ #include "applicationinfo.h" #include "acache.h" #include "exceptions.h" - __override HRESULT ASPNET_CORE_PROXY_MODULE_FACTORY::GetHttpModule( diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 3ce37711c7..2b6164989a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -85,7 +85,7 @@ - NotUsing + Use Level4 true Disabled @@ -100,6 +100,7 @@ ..\iislib; true stdcpp17 + stdafx.h Windows @@ -108,7 +109,7 @@ - NotUsing + Use Level4 true Disabled @@ -124,6 +125,7 @@ ..\iislib; true stdcpp17 + stdafx.h Windows @@ -132,7 +134,7 @@ - NotUsing + Use Level4 true MaxSpeed @@ -148,6 +150,7 @@ ..\iislib; true stdcpp17 + stdafx.h Windows @@ -158,7 +161,7 @@ - NotUsing + Use Level4 true MaxSpeed @@ -176,6 +179,7 @@ MultiThreaded false stdcpp17 + stdafx.h Windows @@ -215,6 +219,12 @@ + + Create + Create + Create + Create + diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.h b/src/AspNetCoreModuleV2/CommonLib/EventLog.h index 70bd1a1be6..8782eff6d4 100644 --- a/src/AspNetCoreModuleV2/CommonLib/EventLog.h +++ b/src/AspNetCoreModuleV2/CommonLib/EventLog.h @@ -3,4 +3,7 @@ #pragma once +#include "Utility.h" +#include "resources.h" + #define EVENTLOG(log, name, ...) UTILITY::LogEventF(log, ASPNETCORE_EVENT_ ## name ## _LEVEL, ASPNETCORE_EVENT_ ## name, ASPNETCORE_EVENT_ ## name ## _MSG, __VA_ARGS__) diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp index a7bd703589..396a69ff31 100644 --- a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp @@ -1,7 +1,10 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -#include "stdafx.h" +#include +#include + +#include "GlobalVersionUtility.h" namespace fs = std::experimental::filesystem; diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h index 4a4e736eb7..7cd8420b5b 100644 --- a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h +++ b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h @@ -2,7 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. #pragma once -#include + +#include "fx_ver.h" class GlobalVersionUtility { diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp index ae492f005e..a7e1b53ee0 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "stdafx.h" #include "SRWExclusiveLock.h" SRWExclusiveLock:: SRWExclusiveLock(const SRWLOCK& lock) diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h index 15fcc1f673..7ff977f70d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h +++ b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h @@ -3,6 +3,8 @@ #pragma once +#include + class SRWExclusiveLock { public: diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp b/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp index 613e56984e..d561281385 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "stdafx.h" #include "SRWSharedLock.h" SRWSharedLock:: SRWSharedLock(const SRWLOCK& lock) diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h b/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h index b05b0090fb..7f1573e27e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h +++ b/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h @@ -3,6 +3,8 @@ #pragma once +#include + class SRWSharedLock { public: diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index 212fb27f63..0c0752f0c4 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -3,7 +3,8 @@ #pragma once -#include "stdafx.h" +#include "iapplication.h" +#include "ntassert.h" class APPLICATION : public IAPPLICATION { diff --git a/src/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/AspNetCoreModuleV2/CommonLib/config_utility.h index 92320d97ed..a9e0259ea7 100644 --- a/src/AspNetCoreModuleV2/CommonLib/config_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/config_utility.h @@ -3,7 +3,9 @@ #pragma once -#include "stdafx.h" +#include +#include "ahutil.h" +#include "stringu.h" class ConfigUtility { diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index a0dfdbb00a..293bdfb4e8 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -1,10 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "stdafx.h" - #include "debugutil.h" + +#include #include "dbgutil.h" +#include "stringu.h" +#include "stringa.h" inline HANDLE g_hStandardOutput; diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/AspNetCoreModuleV2/CommonLib/debugutil.h index 54b0809221..5b81d0130b 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.h +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.h @@ -4,6 +4,7 @@ #pragma once #include +#include "dbgutil.h" #define ASPNETCORE_DEBUG_FLAG_INFO DEBUG_FLAG_INFO #define ASPNETCORE_DEBUG_FLAG_WARNING DEBUG_FLAG_WARN diff --git a/src/AspNetCoreModuleV2/CommonLib/fx_ver.cxx b/src/AspNetCoreModuleV2/CommonLib/fx_ver.cxx index 7aeb0999c0..63183adf01 100644 --- a/src/AspNetCoreModuleV2/CommonLib/fx_ver.cxx +++ b/src/AspNetCoreModuleV2/CommonLib/fx_ver.cxx @@ -1,7 +1,11 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -#include "stdafx.h" +#include "fx_ver.h" + +#include +#include +#include fx_ver_t::fx_ver_t(int major, int minor, int patch, const std::wstring& pre, const std::wstring& build) : m_major(major) @@ -189,4 +193,4 @@ bool fx_ver_t::parse(const std::wstring& ver, fx_ver_t* fx_ver, bool parse_only_ bool valid = parse_internal(ver, fx_ver, parse_only_production); assert(!valid || fx_ver->as_str() == ver); return valid; -} \ No newline at end of file +} diff --git a/src/AspNetCoreModuleV2/CommonLib/fx_ver.h b/src/AspNetCoreModuleV2/CommonLib/fx_ver.h index a8f8e26fff..2740fa37ee 100644 --- a/src/AspNetCoreModuleV2/CommonLib/fx_ver.h +++ b/src/AspNetCoreModuleV2/CommonLib/fx_ver.h @@ -3,6 +3,8 @@ #pragma once +#include + // Note: This is not SemVer (esp., in comparing pre-release part, fx_ver_t does not // compare multiple dot separated identifiers individually.) ex: 1.0.0-beta.2 vs. 1.0.0-beta.11 struct fx_ver_t @@ -22,8 +24,6 @@ struct fx_ver_t bool is_prerelease() const { return !m_pre.empty(); } std::wstring as_str() const; - std::wstring prerelease_glob() const; - std::wstring patch_glob() const; bool operator ==(const fx_ver_t& b) const; bool operator !=(const fx_ver_t& b) const; diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index 5c7cc6f679..07854d97da 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -1,8 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "stdafx.h" +#include "hostfxr_utility.h" + #include +#include "EventLog.h" +#include "ntassert.h" +#include "fx_ver.h" namespace fs = std::experimental::filesystem; diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index 5e35cc4a6d..b7dfcbf67c 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -3,11 +3,11 @@ #pragma once -#include "precomp.h" - +#include #include #include #include +#include "stringu.h" typedef INT(*hostfxr_get_native_search_directories_fn) (CONST INT argc, CONST PCWSTR* argv, PWSTR buffer, DWORD buffer_size, DWORD* required_buffer_size); typedef INT(*hostfxr_main_fn) (CONST DWORD argc, CONST PCWSTR argv[]); diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp index 69e60c8b90..a17258f5cf 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "stdafx.h" +#include "hostfxroptions.h" + +#include "hostfxr_utility.h" HRESULT HOSTFXR_OPTIONS::Create( _In_ PCWSTR pcwzExeLocation, diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h index 391e01291d..0529de4e62 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h @@ -3,8 +3,11 @@ #pragma once +#include #include +#include "stringu.h" + class HOSTFXR_OPTIONS { public: diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h index 36b2b40ddb..f8c67a6309 100644 --- a/src/AspNetCoreModuleV2/CommonLib/iapplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -3,7 +3,7 @@ #pragma once -class IREQUEST_HANDLER; +#include "irequesthandler.h" enum APPLICATION_STATUS { diff --git a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h index d3e5707063..b2be7ee401 100644 --- a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h @@ -3,6 +3,8 @@ #pragma once +#include + // // Pure abstract class // diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h index ad12b90733..4553ee5c87 100644 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h @@ -3,7 +3,8 @@ #pragma once -#include "stdafx.h" +#include "irequesthandler.h" +#include "ntassert.h" // // Pure abstract class diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index aaf4f1d50b..2d4ccee855 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -3,6 +3,8 @@ #pragma once +#include "aspnetcore_msg.h" + #define IDS_INVALID_PROPERTY 1000 #define IDS_SERVER_ERROR 1001 diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp b/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp new file mode 100644 index 0000000000..12fcb1d436 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp @@ -0,0 +1,4 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +// Do not remove this file. It is used for precompiled header generation diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index 24e683b14e..d5407df316 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -9,35 +9,9 @@ #include #include -#include +#include #include #include #include #include #include - -#include "Shlwapi.h" -#include -#include "hashtable.h" -#include "stringu.h" -#include "stringa.h" -#include "multisz.h" -#include "dbgutil.h" -#include "ahutil.h" -#include "hashfn.h" -#include "sttimer.h" -#include "irequesthandler.h" -#include "sttimer.h" -#include "requesthandler.h" -#include "iapplication.h" -#include "application.h" -#include "SRWExclusiveLock.h" -#include "fx_ver.h" -#include "utility.h" -#include "GlobalVersionUtility.h" -#include "resources.h" -#include "aspnetcore_msg.h" -#include "hostfxr_utility.h" -#include "EventLog.h" -#include "hostfxroptions.h" -#include "exceptions.h" diff --git a/src/AspNetCoreModuleV2/CommonLib/sttimer.h b/src/AspNetCoreModuleV2/CommonLib/sttimer.h index ada44158a7..0ebbdbd822 100644 --- a/src/AspNetCoreModuleV2/CommonLib/sttimer.h +++ b/src/AspNetCoreModuleV2/CommonLib/sttimer.h @@ -3,7 +3,6 @@ #pragma once -#include "stdafx.h" #ifndef _STTIMER_H #define _STTIMER_H diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.cxx b/src/AspNetCoreModuleV2/CommonLib/utility.cxx index a4d7ed46bd..b98cc24359 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.cxx +++ b/src/AspNetCoreModuleV2/CommonLib/utility.cxx @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "stdafx.h" +#include "utility.h" + +#include #include "debugutil.h" // static diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.h b/src/AspNetCoreModuleV2/CommonLib/utility.h index f1f2c38afd..998d8fb3d6 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/utility.h @@ -5,6 +5,10 @@ #include "stdafx.h" +#include +#include "stringa.h" +#include "stringu.h" + class UTILITY { public: diff --git a/src/AspNetCoreModuleV2/IISLib/ahutil.h b/src/AspNetCoreModuleV2/IISLib/ahutil.h index 5694b21b7e..3632650aa4 100644 --- a/src/AspNetCoreModuleV2/IISLib/ahutil.h +++ b/src/AspNetCoreModuleV2/IISLib/ahutil.h @@ -255,4 +255,4 @@ FindNextLocationElement( HRESULT GetSharedConfigEnabled( BOOL * pfIsSharedConfig -); \ No newline at end of file +); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx index 91d8dab0ef..2fba26d406 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -8,9 +8,9 @@ #include #include "inprocessapplication.h" -#include "inprocesshandler.h" #include "requesthandler_config.h" #include "debugutil.h" +#include "resources.h" DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_inprocess.dll"); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 34359b1f2f..7ad1eb06f4 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -7,6 +7,9 @@ #include "requesthandler_config.h" #include "environmentvariablehelpers.h" #include "aspnetcore_event.h" +#include "utility.h" +#include "EventLog.h" +#include "SRWExclusiveLock.h" IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL; hostfxr_main_fn IN_PROCESS_APPLICATION::s_fMainCallback = NULL; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index 4641cd67b1..0bd0ecf4d7 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -4,6 +4,7 @@ #pragma once #include "precomp.hxx" +#include "application.h" #include "inprocesshandler.h" #include "requesthandler_config.h" diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp index 74c02a43cb..9aca9ae0c3 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp @@ -3,6 +3,7 @@ #include "stdafx.h" #include "sttimer.h" +#include "utility.h" FileOutputManager::FileOutputManager() { @@ -160,8 +161,8 @@ FileOutputManager::Start() // There are a few options for redirecting stdout/stderr, // but there are issues with most of them. - // AllocConsole() - // *stdout = *m_pStdFile; + // AllocConsole() + // *stdout = *m_pStdFile; // *stderr = *m_pStdFile; // Calling _dup2 on stderr fails on IIS. IIS sets stderr to -2 // _dup2(_fileno(m_pStdFile), _fileno(stdout)); From e5505ceefc8c965054d463fccef93417dca0422a Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 21 Jun 2018 12:32:13 -0700 Subject: [PATCH 081/363] Fixing build issues (#957) --- src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp | 1 + src/AspNetCoreModuleV2/CommonLib/config_utility.h | 1 + src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp | 2 ++ src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp | 2 ++ .../InProcessRequestHandler/inprocessapplication.cpp | 1 + 5 files changed, 7 insertions(+) diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 28c7c3636e..5fa4ca4db1 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -10,6 +10,7 @@ #include "resources.h" #include "SRWExclusiveLock.h" #include "GlobalVersionUtility.h" +#include "exceptions.h" const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; diff --git a/src/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/AspNetCoreModuleV2/CommonLib/config_utility.h index a9e0259ea7..78efe9a04b 100644 --- a/src/AspNetCoreModuleV2/CommonLib/config_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/config_utility.h @@ -6,6 +6,7 @@ #include #include "ahutil.h" #include "stringu.h" +#include "exceptions.h" class ConfigUtility { diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index 07854d97da..ba45242e5b 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -7,6 +7,8 @@ #include "EventLog.h" #include "ntassert.h" #include "fx_ver.h" +#include "debugutil.h" +#include "exceptions.h" namespace fs = std::experimental::filesystem; diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp index a17258f5cf..fb65edf710 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp @@ -4,6 +4,8 @@ #include "hostfxroptions.h" #include "hostfxr_utility.h" +#include "debugutil.h" +#include "exceptions.h" HRESULT HOSTFXR_OPTIONS::Create( _In_ PCWSTR pcwzExeLocation, diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 7ad1eb06f4..70c535f0b3 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -10,6 +10,7 @@ #include "utility.h" #include "EventLog.h" #include "SRWExclusiveLock.h" +#include "exceptions.h" IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL; hostfxr_main_fn IN_PROCESS_APPLICATION::s_fMainCallback = NULL; From de197bfcd13ea1da7fa2b8c67372ab380352d648 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 21 Jun 2018 14:27:48 -0700 Subject: [PATCH 082/363] Use dynamic ports for Https/Ntlm tests (#874) --- .../OutOfProcess/HttpsTest.cs | 11 +++++++---- .../OutOfProcess/NtlmAuthentationTest.cs | 3 +-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs index 5667b0b6b1..15f3c5f3b9 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -6,6 +6,7 @@ using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; using IISIntegration.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Abstractions; @@ -30,10 +31,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [MemberData(nameof(TestVariants))] public async Task HttpsHelloWorld(TestVariant variant) { + var port = TestPortHelper.GetNextSSLPort(); var deploymentParameters = new DeploymentParameters(variant) { ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), - ApplicationBaseUriHint = "https://localhost:44394/", + ApplicationBaseUriHint = $"https://localhost:{port}/", ServerConfigTemplateContent = GetHttpsServerConfig() }; @@ -53,7 +55,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [MemberData(nameof(TestVariants))] public Task HttpsHelloWorld_NoClientCert(TestVariant variant) { - return HttpsHelloWorldCerts(variant, port: 44397, sendClientCert: false); + return HttpsHelloWorldCerts(variant, sendClientCert: false); } #pragma warning disable xUnit1004 // Test methods should not be skipped @@ -62,11 +64,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests #pragma warning restore xUnit1004 // Test methods should not be skipped public Task HttpsHelloWorld_ClientCert(TestVariant variant) { - return HttpsHelloWorldCerts(variant, port: 44301, sendClientCert: true); + return HttpsHelloWorldCerts(variant, sendClientCert: true); } - private async Task HttpsHelloWorldCerts(TestVariant variant, int port, bool sendClientCert) + private async Task HttpsHelloWorldCerts(TestVariant variant, bool sendClientCert) { + var port = TestPortHelper.GetNextSSLPort(); var deploymentParameters = new DeploymentParameters(variant) { ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index d75223aa7b..39ae2fe0e3 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.IO; using System.Net; using System.Net.Http; using System.Threading.Tasks; @@ -31,7 +30,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentParameters = new DeploymentParameters(variant) { ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), - ApplicationBaseUriHint = "http://localhost:5052" + ApplicationBaseUriHint = $"http://localhost:0/", }; var result = await DeployAsync(deploymentParameters); From cd81cfc243a8a533aeffdc86413d483d96e1c845 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 21 Jun 2018 15:29:03 -0700 Subject: [PATCH 083/363] Remove extra arguments from CreateApplication (#952) --- .../AspNetCore/Inc/applicationinfo.h | 7 +++--- .../AspNetCore/src/applicationinfo.cpp | 3 ++- .../CommonLib/application.h | 10 ++++++++ .../CommonLib/iapplication.h | 6 +++++ .../InProcessRequestHandler/dllmain.cxx | 12 ++-------- .../inprocessapplication.cpp | 8 ------- .../inprocessapplication.h | 23 +++++++++++-------- .../OutOfProcessRequestHandler/dllmain.cxx | 7 ++---- .../inprocess_application_tests.cpp | 3 ++- 9 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h index ecb85b0355..b21764d691 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h @@ -20,10 +20,9 @@ typedef HRESULT (WINAPI * PFN_ASPNETCORE_CREATE_APPLICATION)( - _In_ IHttpServer *pServer, - _In_ IHttpContext *pHttpContext, - _In_ PCWSTR pwzExeLocation, // TODO remove both pwzExeLocation and pHttpContext from this api - _Out_ IAPPLICATION **pApplication + _In_ IHttpServer *pServer, + _In_ IHttpApplication *pHttpApplication, + _Out_ IAPPLICATION **pApplication ); extern BOOL g_fRecycleProcessCalled; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 5fa4ca4db1..5cc5ea2f90 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -231,7 +231,8 @@ APPLICATION_INFO::EnsureApplicationCreated( RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_INVALID_FUNCTION)); } - RETURN_IF_FAILED(m_pfnAspNetCoreCreateApplication(m_pServer, pHttpContext, struExeLocation.QueryStr(), &pApplication)); + RETURN_IF_FAILED(m_pfnAspNetCoreCreateApplication(m_pServer, pHttpContext->GetApplication(), &pApplication)); + pApplication->SetParameter(L"InProcessExeLocation", struExeLocation.QueryStr()); m_pApplication = pApplication; } } diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index 0c0752f0c4..6025fdd0fb 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -40,6 +40,16 @@ public: } } + VOID + SetParameter( + _In_ LPCWSTR pzName, + _In_ LPCWSTR pzValue) + override + { + UNREFERENCED_PARAMETER(pzName); + UNREFERENCED_PARAMETER(pzValue); + } + protected: volatile APPLICATION_STATUS m_status = APPLICATION_STATUS::UNKNOWN; diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h index f8c67a6309..f74ebc021c 100644 --- a/src/AspNetCoreModuleV2/CommonLib/iapplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -46,4 +46,10 @@ public: CreateHandler( _In_ IHttpContext *pHttpContext, _Out_ IREQUEST_HANDLER **pRequestHandler) = 0; + + virtual + VOID + SetParameter( + _In_ LPCWSTR pzName, + _In_ LPCWSTR pzValue) = 0; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx index 2fba26d406..33dad24f03 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -82,13 +82,11 @@ BOOL APIENTRY DllMain(HMODULE hModule, return TRUE; } -// TODO remove pHttpContext from the CreateApplication call. HRESULT __stdcall CreateApplication( _In_ IHttpServer *pServer, - _In_ IHttpContext *pHttpContext, - _In_ PCWSTR pwzExeLocation, + _In_ IHttpApplication *pHttpApplication, _Out_ IAPPLICATION **ppApplication ) { @@ -101,7 +99,7 @@ CreateApplication( try { - hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpContext->GetApplication(), &pConfig); + hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpApplication, &pConfig); if (FAILED(hr)) { goto Finished; @@ -111,12 +109,6 @@ CreateApplication( pConfig = NULL; - hr = pApplication->Initialize(pwzExeLocation); - if (FAILED(hr)) - { - goto Finished; - } - *ppApplication = pApplication; } catch (std::bad_alloc&) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 70c535f0b3..4b214457e7 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -37,14 +37,6 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( m_status = APPLICATION_STATUS::STARTING; } -HRESULT -IN_PROCESS_APPLICATION::Initialize( - PCWSTR pDotnetExeLocation -) -{ - return m_struExeLocation.Copy(pDotnetExeLocation); -} - IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION() { diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index 0bd0ecf4d7..0713ff5016 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -23,11 +23,6 @@ public: ~IN_PROCESS_APPLICATION(); - HRESULT - Initialize( - PCWSTR pDotnetExeLocation - ); - __override VOID ShutDown(); @@ -54,6 +49,19 @@ public: _Out_ IREQUEST_HANDLER **pRequestHandler) override; + VOID + SetParameter( + _In_ LPCWSTR pzName, + _In_ LPCWSTR pzValue) + override + { + const auto exeLocationParameterName = L"InProcessExeLocation"; + if (_wcsicmp(pzName, exeLocationParameterName) == 0) + { + m_struExeLocation.Copy(pzValue); + } + } + // Executes the .NET Core process HRESULT ExecuteApplication( @@ -170,11 +178,6 @@ private: // used in testing static hostfxr_main_fn s_fMainCallback; - VOID - SetStdOut( - VOID - ); - static VOID ExecuteAspNetCoreProcess( diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx index 625e884767..611e8d7e3f 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx @@ -260,25 +260,22 @@ BOOL APIENTRY DllMain(HMODULE hModule, return TRUE; } -// TODO remove pHttpContext from the CreateApplication call. HRESULT __stdcall CreateApplication( _In_ IHttpServer *pServer, - _In_ IHttpContext *pHttpContext, - _In_ PCWSTR pwzExeLocation, + _In_ IHttpApplication *pHttpApplication, _Out_ IAPPLICATION **ppApplication ) { HRESULT hr = S_OK; IAPPLICATION *pApplication = NULL; REQUESTHANDLER_CONFIG *pConfig = NULL; - UNREFERENCED_PARAMETER(pwzExeLocation); // Initialze some global variables here InitializeGlobalConfiguration(pServer); - hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpContext->GetApplication(), &pConfig); + hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpApplication, &pConfig); if (FAILED(hr)) { return hr; diff --git a/test/CommonLibTests/inprocess_application_tests.cpp b/test/CommonLibTests/inprocess_application_tests.cpp index 0467f33c4f..98326312f1 100644 --- a/test/CommonLibTests/inprocess_application_tests.cpp +++ b/test/CommonLibTests/inprocess_application_tests.cpp @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. #include "stdafx.h" + #include "inprocessapplication.h" #include "fakeclasses.h" @@ -18,7 +19,7 @@ namespace InprocessTests IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, requestHandlerConfig); { std::wstring exePath(L"hello"); - app->Initialize(exePath.c_str()); + app->SetParameter(L"InProcessExeLocation", exePath.c_str()); } ASSERT_STREQ(app->QueryExeLocation(), L"hello"); } From 306ab78b886cc55515b4c499840021d1463778de Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 21 Jun 2018 16:35:11 -0700 Subject: [PATCH 084/363] Fix App_offline and start adding tests (#953) --- .../AspNetCore/src/applicationmanager.cxx | 2 + .../inprocessapplication.cpp | 8 +- .../outofprocess/outprocessapplication.cpp | 4 +- .../Inprocess/AppOfflineTests.cs | 135 ++++++++++++++++++ .../Inprocess/StartupTests.cs | 1 - .../Inprocess/TestServerTest.cs | 2 +- 6 files changed, 146 insertions(+), 6 deletions(-) create mode 100644 test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx index 45e0ae3b68..9690dcb2fd 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx @@ -118,6 +118,8 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( } *ppApplicationInfo = pApplicationInfo; + pApplicationInfo->StartMonitoringAppOffline(); + pApplicationInfo = NULL; } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 4b214457e7..0d5ce7670a 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -232,14 +232,18 @@ IN_PROCESS_APPLICATION::Recycle( if (!m_pHttpServer->IsCommandLineLaunch()) { // IIS scenario. - // notify IIS first so that new request will be routed to new worker process + // We don't actually handle any shutdown logic here. + // Instead, we notify IIS that the process needs to be recycled, which will call + // ApplicationManager->Shutdown(). This will call shutdown on the application. m_pHttpServer->RecycleProcess(L"AspNetCore InProcess Recycle Process on Demand"); } else { // IISExpress scenario - // Shutdown the managed application and call exit to terminate current process + // Try to graceful shutdown the managed application + // and call exit to terminate current process ShutDown(); + exit(0); } } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp index 356029efd3..0457b4d552 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp @@ -118,8 +118,8 @@ OUT_OF_PROCESS_APPLICATION::SetWebsocketStatus( IHttpContext* pHttpContext ) { - // Even though the applicationhost.config file contains the websocket element, - // the websocket module may still not be enabled. + // Even though the applicationhost.config file contains the websocket element, + // the websocket module may still not be enabled. PCWSTR pszTempWebsocketValue; DWORD cbLength; HRESULT hr; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs new file mode 100644 index 0000000000..b5ac2758e0 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs @@ -0,0 +1,135 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; +using Xunit; + +namespace IISIntegration.FunctionalTests.Inprocess +{ + [SkipIfIISExpressSchemaMissingInProcess] + public class AppOfflineTests : IISFunctionalTestBase + { + [ConditionalFact] + public async Task AppOfflineDroppedWhileSiteIsDown_SiteReturns503() + { + var deploymentResult = await DeployApp(); + + AddAppOffline(deploymentResult.DeploymentResult.ContentRoot); + + await AssertAppOffline(deploymentResult); + } + + [ConditionalFact] + public async Task AppOfflineDroppedWhileSiteIsDown_CustomResponse() + { + var expectedResponse = "The app is offline."; + var deploymentResult = await DeployApp(); + + AddAppOffline(deploymentResult.DeploymentResult.ContentRoot, expectedResponse); + + await AssertAppOffline(deploymentResult, expectedResponse); + } + + [ConditionalFact] + public async Task AppOfflineDroppedWhileSiteRunning_SiteShutsDown() + { + var deploymentResult = await AssertStarts(); + + AddAppOffline(deploymentResult.DeploymentResult.ContentRoot); + + await AssertStopsProcess(deploymentResult); + } + + [ConditionalFact] + public async Task AppOfflineDropped_CanRemoveAppOfflineAfterAddingAndSiteWorks() + { + var deploymentResult = await DeployApp(); + + AddAppOffline(deploymentResult.DeploymentResult.ContentRoot); + + await AssertAppOffline(deploymentResult); + + RemoveAppOffline(deploymentResult.DeploymentResult.ContentRoot); + + var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + + } + + private async Task DeployApp() + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters(); + + return await DeployAsync(deploymentParameters); + } + + private void AddAppOffline(string appPath, string content = "") + { + File.WriteAllText(Path.Combine(appPath, "app_offline.htm"), content); + } + + private void RemoveAppOffline(string appPath) + { + RetryHelper.RetryOperation( + () => File.Delete(Path.Combine(appPath, "app_offline.htm")), + e => Logger.LogError($"Failed to remove app_offline : {e.Message}"), + retryCount: 3, + retryDelayMilliseconds: 100); + } + + private async Task AssertAppOffline(IISDeploymentResult deploymentResult, string expectedResponse = "") + { + var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + + for (var i = 0; response.IsSuccessStatusCode && i < 5; i++) + { + // Keep retrying until app_offline is present. + response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + } + + Assert.Equal(HttpStatusCode.ServiceUnavailable, response.StatusCode); + + Assert.Equal(expectedResponse, await response.Content.ReadAsStringAsync()); + } + + private async Task AssertStopsProcess(IISDeploymentResult deploymentResult) + { + try + { + var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); + } + catch (HttpRequestException) + { + // dropping app_offline will kill the process + } + + var hostShutdownToken = deploymentResult.DeploymentResult.HostShutdownToken; + + Assert.True(hostShutdownToken.WaitHandle.WaitOne(millisecondsTimeout: 1000)); + Assert.True(hostShutdownToken.IsCancellationRequested); + } + + private async Task AssertStarts() + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters(); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); + + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("Hello World", responseText); + + return deploymentResult; + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index 2f36110c90..68fac580db 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -95,7 +95,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal("Hello World", responseText); } - public static TestMatrix TestVariants => TestMatrix.ForServers(ServerType.IISExpress) .WithTfms(Tfm.NetCoreApp22) diff --git a/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs b/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs index b48611b2fa..9c9f9918bb 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs @@ -22,7 +22,7 @@ namespace IISIntegration.FunctionalTests.Inprocess [ConditionalFact] [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] - public async Task Test() + public async Task SingleProcessTestServer_HelloWorld() { var helloWorld = "Hello World"; var expectedPath = "/Path"; From da206e8afeb5d3a684d5750bc5953c5e1d7a1d5f Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 21 Jun 2018 18:00:22 -0700 Subject: [PATCH 085/363] Create a separate sln for V1 (#944) --- IISIntegration.NoV1.sln | 388 ++++++++++++++++++++++++++++++++++++++++ build/repo.props | 1 + 2 files changed, 389 insertions(+) create mode 100644 IISIntegration.NoV1.sln diff --git a/IISIntegration.NoV1.sln b/IISIntegration.NoV1.sln new file mode 100644 index 0000000000..c2bd1b9ade --- /dev/null +++ b/IISIntegration.NoV1.sln @@ -0,0 +1,388 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2036 +MinimumVisualStudioVersion = 15.0.26730.03 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04B1EDB6-E967-4D25-89B9-E6F8304038CD}" + ProjectSection(SolutionItems) = preProject + src\Directory.Build.props = src\Directory.Build.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + NuGet.Config = NuGet.Config + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EF30B533-D715-421A-92B7-92FEF460AC9C}" + ProjectSection(SolutionItems) = preProject + test\Directory.Build.props = test\Directory.Build.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "samples\IISSample\IISSample.csproj", "{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{8B3446E8-E6A8-4591-AA63-A95837C6E97C}" + ProjectSection(ProjectDependencies) = postProject + {46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473} + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "test\Microsoft.AspNetCore.Server.IISIntegration.Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{4106DB10-E09F-480E-9CE6-B39235512EE6}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E-9CC8-450C-8A8D-94FC76428150}" + ProjectSection(SolutionItems) = preProject + build\applicationhost.config = build\applicationhost.config + build\applicationhost.iis.config = build\applicationhost.iis.config + build\build.msbuild = build\build.msbuild + build\Build.Settings = build\Build.Settings + build\Config.Definitions.Props = build\Config.Definitions.Props + build\dependencies.props = build\dependencies.props + build\Key.snk = build\Key.snk + build\launchSettings.json = build\launchSettings.json + build\native.targets = build\native.targets + build\repo.props = build\repo.props + build\repo.targets = build\repo.targets + build\sources.props = build\sources.props + build\testsite.props = build\testsite.props + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISIntegration.FunctionalTests", "test\IISIntegration.FunctionalTests\IISIntegration.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}" + ProjectSection(ProjectDependencies) = postProject + {7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67} + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeIISSample", "samples\NativeIISSample\NativeIISSample.csproj", "{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "test\WebSites\InProcessWebSite\InProcessWebSite.csproj", "{679FA2A2-898B-4320-884E-C2D294A97CE1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj", "{46A8612B-418B-4D70-B3A7-A21DD0627473}" + ProjectSection(ProjectDependencies) = postProject + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} + {55494E58-E061-4C4C-A0A8-837008E72F85} = {55494E58-E061-4C4C-A0A8-837008E72F85} + {7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67} + {D57EA297-6DC2-4BC0-8C91-334863327863} = {D57EA297-6DC2-4BC0-8C91-334863327863} + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StressTestWebSite", "test\WebSites\StressTestWebSite\StressTestWebSite.csproj", "{13FD8F12-FFBE-4D01-B4AC-444F2994B04F}" + ProjectSection(ProjectDependencies) = postProject + {46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473} + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "test\TestTasks\TestTasks.csproj", "{064D860B-4D7C-4B1D-918F-E020F1B99E2A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OverriddenServerWebSite", "test\WebSites\OverriddenServerWebSite\OverriddenServerWebSite.csproj", "{FC2A97F8-A749-4C04-97D1-97500066A820}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "test\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV2", "AspNetCoreModuleV2", "{06CA2C2B-83B0-4D83-905A-E0C74790009E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj", "{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\AspNetCoreModuleV2\CommonLib\CommonLib.vcxproj", "{55494E58-E061-4C4C-A0A8-837008E72F85}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV2\IISLib\IISLib.vcxproj", "{09D9D1D6-2951-4E14-BC35-76A23CF9391A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\WebSites\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{42E60F88-E23F-417A-8143-0CCEC05E1D02}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{622D35C9-627B-466E-8D15-752968CC79AF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Performance", "benchmarks\IIS.Performance\IIS.Performance.csproj", "{48F46909-E76A-4788-BCE1-E543C0E140FE}" + ProjectSection(ProjectDependencies) = postProject + {46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", "src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}" + ProjectSection(ProjectDependencies) = postProject + {09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {09D9D1D6-2951-4E14-BC35-76A23CF9391A} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartupExceptionWebSite", "test\WebSites\StartupExceptionWebSite\StartupExceptionWebSite.csproj", "{340C59FC-C682-4CBA-81F8-791821EC8EDE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.vcxproj", "{CAC1267B-8778-4257-AAC6-CAF481723B01}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x64.ActiveCfg = Debug|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x64.Build.0 = Debug|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.ActiveCfg = Debug|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.Build.0 = Debug|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.Build.0 = Release|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x64.ActiveCfg = Release|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x64.Build.0 = Release|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x86.ActiveCfg = Release|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x86.Build.0 = Release|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x64.ActiveCfg = Debug|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x64.Build.0 = Debug|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x86.ActiveCfg = Debug|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x86.Build.0 = Debug|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.Build.0 = Release|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.ActiveCfg = Release|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.Build.0 = Release|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.ActiveCfg = Release|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.Build.0 = Release|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x64.ActiveCfg = Debug|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x64.Build.0 = Debug|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.ActiveCfg = Debug|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.Build.0 = Debug|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.Build.0 = Release|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.ActiveCfg = Release|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.Build.0 = Release|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.ActiveCfg = Release|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.Build.0 = Release|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x64.ActiveCfg = Debug|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x64.Build.0 = Debug|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x86.ActiveCfg = Debug|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x86.Build.0 = Debug|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.Build.0 = Release|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x64.ActiveCfg = Release|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x64.Build.0 = Release|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x86.ActiveCfg = Release|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x86.Build.0 = Release|Any CPU + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|Any CPU.ActiveCfg = Debug|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|Any CPU.Build.0 = Debug|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x64.ActiveCfg = Debug|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x64.Build.0 = Debug|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x86.ActiveCfg = Debug|x86 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x86.Build.0 = Debug|x86 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|Any CPU.ActiveCfg = Release|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|Any CPU.Build.0 = Release|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x64.ActiveCfg = Release|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x64.Build.0 = Release|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.ActiveCfg = Release|x86 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.Build.0 = Release|x86 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.ActiveCfg = Debug|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.Build.0 = Debug|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x64.ActiveCfg = Debug|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x64.Build.0 = Debug|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.ActiveCfg = Debug|x86 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.Build.0 = Debug|x86 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.ActiveCfg = Release|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.Build.0 = Release|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.ActiveCfg = Release|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.Build.0 = Release|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x86.ActiveCfg = Release|x86 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x86.Build.0 = Release|x86 + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|Any CPU.Build.0 = Debug|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x64.ActiveCfg = Debug|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x64.Build.0 = Debug|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.ActiveCfg = Debug|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.Build.0 = Debug|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.ActiveCfg = Release|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.Build.0 = Release|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.ActiveCfg = Release|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.Build.0 = Release|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.ActiveCfg = Release|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.Build.0 = Release|Any CPU + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.ActiveCfg = Debug|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.Build.0 = Debug|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.ActiveCfg = Debug|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.Build.0 = Debug|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.ActiveCfg = Debug|x86 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.Build.0 = Debug|x86 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.ActiveCfg = Release|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.Build.0 = Release|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x64.ActiveCfg = Release|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x64.Build.0 = Release|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x86.ActiveCfg = Release|x86 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x86.Build.0 = Release|x86 + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|x64.ActiveCfg = Debug|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|x64.Build.0 = Debug|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|x86.ActiveCfg = Debug|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|x86.Build.0 = Debug|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|Any CPU.Build.0 = Release|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x64.ActiveCfg = Release|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x64.Build.0 = Release|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x86.ActiveCfg = Release|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x86.Build.0 = Release|Any CPU + {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|Any CPU.ActiveCfg = Debug|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|Any CPU.Build.0 = Debug|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x64.ActiveCfg = Debug|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x64.Build.0 = Debug|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x86.ActiveCfg = Debug|x86 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x86.Build.0 = Debug|x86 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.ActiveCfg = Release|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.Build.0 = Release|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x64.ActiveCfg = Release|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x64.Build.0 = Release|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x86.ActiveCfg = Release|x86 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x86.Build.0 = Release|x86 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.ActiveCfg = Debug|x64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.ActiveCfg = Debug|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.Build.0 = Debug|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|Any CPU.ActiveCfg = Release|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.ActiveCfg = Release|x64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.Build.0 = Release|x64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.ActiveCfg = Release|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.Build.0 = Release|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.ActiveCfg = Debug|x64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.Build.0 = Debug|x64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.ActiveCfg = Debug|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.Build.0 = Debug|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|Any CPU.ActiveCfg = Release|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.ActiveCfg = Release|x64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.Build.0 = Release|x64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x86.ActiveCfg = Release|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x86.Build.0 = Release|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.ActiveCfg = Debug|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.Build.0 = Debug|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.ActiveCfg = Debug|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.Build.0 = Debug|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|Any CPU.ActiveCfg = Release|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.ActiveCfg = Release|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.Build.0 = Release|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.ActiveCfg = Release|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.Build.0 = Release|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x64.ActiveCfg = Debug|x64 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x64.Build.0 = Debug|x64 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.ActiveCfg = Debug|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.Build.0 = Debug|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|Any CPU.ActiveCfg = Release|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.ActiveCfg = Release|x64 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.Build.0 = Release|x64 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.ActiveCfg = Release|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.Build.0 = Release|Win32 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.ActiveCfg = Debug|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.Build.0 = Debug|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.ActiveCfg = Debug|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.Build.0 = Debug|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.ActiveCfg = Debug|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.Build.0 = Debug|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.ActiveCfg = Release|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.Build.0 = Release|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.ActiveCfg = Release|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.Build.0 = Release|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.ActiveCfg = Release|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.Build.0 = Release|x86 + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x64.ActiveCfg = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x64.Build.0 = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x86.ActiveCfg = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x86.Build.0 = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.Build.0 = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x64.ActiveCfg = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x64.Build.0 = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x86.ActiveCfg = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x86.Build.0 = Release|Any CPU + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.ActiveCfg = Debug|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.ActiveCfg = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.Build.0 = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.ActiveCfg = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.ActiveCfg = Release|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.ActiveCfg = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.Build.0 = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.ActiveCfg = Debug|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.Build.0 = Debug|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.ActiveCfg = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.Build.0 = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|Any CPU.ActiveCfg = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.ActiveCfg = Release|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.Build.0 = Release|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.ActiveCfg = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.Build.0 = Release|Win32 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|Any CPU.ActiveCfg = Debug|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x64.ActiveCfg = Debug|x64 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x64.Build.0 = Debug|x64 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x86.ActiveCfg = Debug|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x86.Build.0 = Debug|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|Any CPU.ActiveCfg = Release|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x64.ActiveCfg = Release|x64 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x64.Build.0 = Release|x64 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x86.ActiveCfg = Release|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x86.Build.0 = Release|x86 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.ActiveCfg = Debug|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.Build.0 = Debug|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.ActiveCfg = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.Build.0 = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|Any CPU.ActiveCfg = Release|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.ActiveCfg = Release|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.Build.0 = Release|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.ActiveCfg = Release|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.Build.0 = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.ActiveCfg = Debug|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.Build.0 = Debug|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.ActiveCfg = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.Build.0 = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|Any CPU.ActiveCfg = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.ActiveCfg = Release|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.Build.0 = Release|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.ActiveCfg = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9} + {8B3446E8-E6A8-4591-AA63-A95837C6E97C} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} + {4106DB10-E09F-480E-9CE6-B39235512EE6} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9} + {679FA2A2-898B-4320-884E-C2D294A97CE1} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} + {46A8612B-418B-4D70-B3A7-A21DD0627473} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} + {064D860B-4D7C-4B1D-918F-E020F1B99E2A} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {FC2A97F8-A749-4C04-97D1-97500066A820} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {06CA2C2B-83B0-4D83-905A-E0C74790009E} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} + {55494E58-E061-4C4C-A0A8-837008E72F85} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} + {09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} + {42E60F88-E23F-417A-8143-0CCEC05E1D02} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} + {48F46909-E76A-4788-BCE1-E543C0E140FE} = {622D35C9-627B-466E-8D15-752968CC79AF} + {D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} + {7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} + {340C59FC-C682-4CBA-81F8-791821EC8EDE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} + {CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} + EndGlobalSection +EndGlobal diff --git a/build/repo.props b/build/repo.props index 143448ce88..68acab72ce 100644 --- a/build/repo.props +++ b/build/repo.props @@ -14,6 +14,7 @@ + From b12c9b33f715092b5a0e7f7b78905f84fb25a2ff Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 22 Jun 2018 07:36:46 -0700 Subject: [PATCH 086/363] Cleanup where.exe invocation (#958) --- .../CommonLib/CommonLib.vcxproj | 1 + .../CommonLib/HandleWrapper.h | 52 +++++++ src/AspNetCoreModuleV2/CommonLib/exceptions.h | 35 ++++- .../CommonLib/hostfxr_utility.cpp | 129 +++++++----------- 4 files changed, 131 insertions(+), 86 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 2b6164989a..4ba17f46db 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -197,6 +197,7 @@ + diff --git a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h new file mode 100644 index 0000000000..635d37cf4d --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h @@ -0,0 +1,52 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#pragma once + +#include + +struct InvalidHandleTraits +{ + using HandleType = HANDLE; + static const HANDLE DefaultHandle; + static void Close(HANDLE handle) { CloseHandle(handle); } +}; + +// Workaround for VC++ bug https://developercommunity.visualstudio.com/content/problem/33928/constexpr-failing-on-nullptr-v141-compiler-regress.html +const HANDLE InvalidHandleTraits::DefaultHandle = INVALID_HANDLE_VALUE; + +struct NullHandleTraits +{ + using HandleType = HANDLE; + static constexpr HANDLE DefaultHandle = NULL; + static void Close(HANDLE handle) { CloseHandle(handle); } +}; + +template +class HandleWrapper +{ +public: + using HandleType = typename traits::HandleType; + + HandleWrapper(HandleType handle = traits::DefaultHandle) : m_handle(handle) { } + ~HandleWrapper() + { + if (m_handle != traits::DefaultHandle) + { + traits::Close(m_handle); + } + } + + operator HandleType() { return m_handle; } + HandleWrapper& operator =(HandleType value) + { + DBG_ASSERT(m_handle == traits::DefaultHandle); + m_handle = value; + return *this; + } + + HandleType* operator&() { return &m_handle; } + +private: + HandleType m_handle; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/AspNetCoreModuleV2/CommonLib/exceptions.h index fc765d50a3..efdd9de9a8 100644 --- a/src/AspNetCoreModuleV2/CommonLib/exceptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/exceptions.h @@ -26,12 +26,21 @@ #endif #define OBSERVE_CAUGHT_EXCEPTION() CaughtExceptionHResult(LOCATION_INFO); -#define RETURN_CAUGHT_EXCEPTION() return CaughtExceptionHResult(LOCATION_INFO); -#define CATCH_RETURN() catch (...) { RETURN_CAUGHT_EXCEPTION(); } -#define THROW_IF_NULL_ALLOC(ptr) Throw_IfNullAlloc(ptr) #define RETURN_IF_FAILED(hr) do { HRESULT __hrRet = hr; if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); return __hrRet; }} while (0, 0) +#define RETURN_CAUGHT_EXCEPTION() return CaughtExceptionHResult(LOCATION_INFO); +#define RETURN_LAST_ERROR_IF(condition) do { if (condition) { return LogLastError(LOCATION_INFO); }} while (0, 0) +#define RETURN_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { return LogLastError(LOCATION_INFO); }} while (0, 0) + #define FINISHED_IF_FAILED(hrr) do { HRESULT __hrRet = hrr; if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); hr = __hrRet; goto Finished; }} while (0, 0) +#define FINISHED_IF_NULL_ALLOC(ptr) do { if ((ptr) == nullptr) { hr = LogHResultFailed(LOCATION_INFO, E_OUTOFMEMORY); goto Finished; }} while (0, 0) +#define FINISHED_LAST_ERROR_IF(condition) do { if (condition) { hr = LogLastError(LOCATION_INFO); goto Finished; }} while (0, 0) +#define FINISHED_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { hr = LogLastError(LOCATION_INFO); goto Finished; }} while (0, 0) + +#define THROW_IF_NULL_ALLOC(ptr) Throw_IfNullAlloc(ptr) + +#define CATCH_RETURN() catch (...) { RETURN_CAUGHT_EXCEPTION(); } #define LOG_IF_FAILED(hr) LogHResultFailed(LOCATION_INFO, hr) +#define LOG_LAST_ERROR_IF(condition) LogLastErrorIf(LOCATION_INFO, condition) #define SUCCEEDED_LOG(hr) SUCCEEDED(LOG_IF_FAILED(hr)) #define FAILED_LOG(hr) FAILED(LOG_IF_FAILED(hr)) @@ -40,6 +49,26 @@ DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, LOCATION_FORMAT "Unhandled non-standard exception", LOCATION_CALL_ONLY); } + __declspec(noinline) inline HRESULT LogLastError(LOCATION_ARGUMENTS_ONLY) +{ + const auto lastError = GetLastError(); + const auto hr = HRESULT_FROM_WIN32(lastError); + + DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, LOCATION_FORMAT "Operation failed with LastError: %d HR: 0x%x", LOCATION_CALL lastError, hr); + + return hr; +} + + __declspec(noinline) inline bool LogLastErrorIf(LOCATION_ARGUMENTS_ONLY, bool condition) +{ + if (condition) + { + LogLastError(LOCATION_CALL_ONLY); + } + + return condition; +} + __declspec(noinline) inline VOID ReportException(LOCATION_ARGUMENTS std::exception& exception) { DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, LOCATION_FORMAT "Unhandled exception: %s", LOCATION_CALL exception.what()); diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index ba45242e5b..a41fd0d4cd 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -4,11 +4,13 @@ #include "hostfxr_utility.h" #include +#include #include "EventLog.h" #include "ntassert.h" #include "fx_ver.h" #include "debugutil.h" #include "exceptions.h" +#include "HandleWrapper.h" namespace fs = std::experimental::filesystem; @@ -440,9 +442,11 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() SECURITY_ATTRIBUTES securityAttributes; CHAR pzFileContents[READ_BUFFER_SIZE]; - HANDLE hStdOutReadPipe = INVALID_HANDLE_VALUE; - HANDLE hStdOutWritePipe = INVALID_HANDLE_VALUE; - LPWSTR pwzDotnetName = NULL; + HandleWrapper hStdOutReadPipe; + HandleWrapper hStdOutWritePipe; + HandleWrapper hProcess; + HandleWrapper hThread; + CComBSTR pwzDotnetName = NULL; DWORD dwFilePointer; BOOL fIsWow64Process; BOOL fIsCurrentProcess64Bit; @@ -453,8 +457,6 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() DWORD dwBinaryType; INT index = 0; INT prevIndex = 0; - BOOL fProcessCreationResult = FALSE; - BOOL fResult = FALSE; std::optional result; // Set the security attributes for the read/write pipe @@ -462,17 +464,11 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() securityAttributes.lpSecurityDescriptor = NULL; securityAttributes.bInheritHandle = TRUE; + LOG_INFO("Invoking where.exe to find dotnet.exe"); + // Create a read/write pipe that will be used for reading the result of where.exe - if (!CreatePipe(&hStdOutReadPipe, &hStdOutWritePipe, &securityAttributes, 0)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - if (!SetHandleInformation(hStdOutReadPipe, HANDLE_FLAG_INHERIT, 0)) - { - hr = ERROR_FILE_INVALID; - goto Finished; - } + FINISHED_LAST_ERROR_IF(!CreatePipe(&hStdOutReadPipe, &hStdOutWritePipe, &securityAttributes, 0)); + FINISHED_LAST_ERROR_IF(!SetHandleInformation(hStdOutReadPipe, HANDLE_FLAG_INHERIT, 0)); // Set the stdout and err pipe to the write pipes. startupInfo.cb = sizeof(startupInfo); @@ -482,14 +478,10 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() // CreateProcess requires a mutable string to be passed to commandline // See https://blogs.msdn.microsoft.com/oldnewthing/20090601-00/?p=18083/ - pwzDotnetName = SysAllocString(L"\"where.exe\" dotnet.exe"); - if (pwzDotnetName == NULL) - { - goto Finished; - } + pwzDotnetName = L"\"where.exe\" dotnet.exe"; // Create a process to invoke where.exe - fProcessCreationResult = CreateProcessW(NULL, + FINISHED_LAST_ERROR_IF(!CreateProcessW(NULL, pwzDotnetName, NULL, NULL, @@ -499,20 +491,18 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() NULL, &startupInfo, &processInformation - ); + )); - if (!fProcessCreationResult) - { - goto Finished; - } + // Store handles into wrapper so they get closed automatically + hProcess = processInformation.hProcess; + hThread = processInformation.hThread; // Wait for where.exe to return, waiting 2 seconds. - if (WaitForSingleObject(processInformation.hProcess, 2000) != WAIT_OBJECT_0) + if (LOG_LAST_ERROR_IF(WaitForSingleObject(processInformation.hProcess, 2000) != WAIT_OBJECT_0)) { // Timeout occured, terminate the where.exe process and return. - TerminateProcess(processInformation.hProcess, 2); - hr = HRESULT_FROM_WIN32(ERROR_TIMEOUT); - goto Finished; + FINISHED_LAST_ERROR_IF(!TerminateProcess(processInformation.hProcess, 2)); + FINISHED_IF_FAILED(HRESULT_FROM_WIN32(ERROR_TIMEOUT)); } // @@ -520,10 +510,7 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() // and 2 if there was an error. Check if the exit code is 1 and set // a new hr result saying it couldn't find dotnet.exe // - if (!GetExitCodeProcess(processInformation.hProcess, &dwExitCode)) - { - goto Finished; - } + FINISHED_LAST_ERROR_IF (!GetExitCodeProcess(processInformation.hProcess, &dwExitCode)); // // In this block, if anything fails, we will goto our fallback of @@ -531,7 +518,7 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() // if (dwExitCode != 0) { - goto Finished; + FINISHED_IF_FAILED(E_FAIL); } // Where succeeded. @@ -539,38 +526,30 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() dwFilePointer = SetFilePointer(hStdOutReadPipe, 0, NULL, FILE_BEGIN); if (dwFilePointer == INVALID_SET_FILE_POINTER) { - goto Finished; + FINISHED_IF_FAILED(E_FAIL); } // // As the call to where.exe succeeded (dotnet.exe was found), ReadFile should not hang. // TODO consider putting ReadFile in a separate thread with a timeout to guarantee it doesn't block. // - if (!ReadFile(hStdOutReadPipe, pzFileContents, READ_BUFFER_SIZE, &dwNumBytesRead, NULL)) - { - goto Finished; - } + FINISHED_LAST_ERROR_IF (!ReadFile(hStdOutReadPipe, pzFileContents, READ_BUFFER_SIZE, &dwNumBytesRead, NULL)); if (dwNumBytesRead >= READ_BUFFER_SIZE) { // This shouldn't ever be this large. We could continue to call ReadFile in a loop, // however if someone had this many dotnet.exes on their machine. - goto Finished; + FINISHED_IF_FAILED(E_FAIL); } - hr = HRESULT_FROM_WIN32(GetLastError()); - if (FAILED(hr = struDotnetLocationsString.CopyA(pzFileContents, dwNumBytesRead))) - { - goto Finished; - } + FINISHED_IF_FAILED(struDotnetLocationsString.CopyA(pzFileContents, dwNumBytesRead)); + + WLOG_INFOF(L"where.exe invocation returned: %s", struDotnetLocationsString.QueryStr()); // Check the bitness of the currently running process // matches the dotnet.exe found. - if (!IsWow64Process(GetCurrentProcess(), &fIsWow64Process)) - { - // Calling IsWow64Process failed - goto Finished; - } + FINISHED_LAST_ERROR_IF (!IsWow64Process(GetCurrentProcess(), &fIsWow64Process)); + if (fIsWow64Process) { // 32 bit mode @@ -584,6 +563,8 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() fIsCurrentProcess64Bit = systemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64; } + WLOG_INFOF(L"Current process bitness type detected as isX64=%d", fIsCurrentProcess64Bit); + while (TRUE) { index = struDotnetLocationsString.IndexOf(L"\r\n", prevIndex); @@ -591,46 +572,28 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() { break; } - if (FAILED(hr = struDotnetSubstring.Copy(&struDotnetLocationsString.QueryStr()[prevIndex], index - prevIndex))) - { - goto Finished; - } + + FINISHED_IF_FAILED(struDotnetSubstring.Copy(&struDotnetLocationsString.QueryStr()[prevIndex], index - prevIndex)); // \r\n is two wchars, so add 2 here. prevIndex = index + 2; - if (GetBinaryTypeW(struDotnetSubstring.QueryStr(), &dwBinaryType) && - fIsCurrentProcess64Bit == (dwBinaryType == SCS_64BIT_BINARY)) + WLOG_INFOF(L"Processing entry %s", struDotnetSubstring.QueryStr()); + + if (LOG_LAST_ERROR_IF(!GetBinaryTypeW(struDotnetSubstring.QueryStr(), &dwBinaryType))) + { + continue; + } + + WLOG_INFOF(L"Binary type %d", dwBinaryType); + + if (fIsCurrentProcess64Bit == (dwBinaryType == SCS_64BIT_BINARY)) { // The bitness of dotnet matched with the current worker process bitness. - result = std::make_optional(struDotnetSubstring.QueryStr()); - fResult = TRUE; - break; + return std::make_optional(struDotnetSubstring.QueryStr()); } } -Finished: - - if (hStdOutReadPipe != INVALID_HANDLE_VALUE) - { - CloseHandle(hStdOutReadPipe); - } - if (hStdOutWritePipe != INVALID_HANDLE_VALUE) - { - CloseHandle(hStdOutWritePipe); - } - if (processInformation.hProcess != INVALID_HANDLE_VALUE) - { - CloseHandle(processInformation.hProcess); - } - if (processInformation.hThread != INVALID_HANDLE_VALUE) - { - CloseHandle(processInformation.hThread); - } - if (pwzDotnetName != NULL) - { - SysFreeString(pwzDotnetName); - } - + Finished: return result; } From 9d1ffa2d0603a5ae399bd019f426925c7baf1f21 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 22 Jun 2018 09:38:21 -0700 Subject: [PATCH 087/363] Use guid for temp directories and delete them after tests (#963) --- test/CommonLibTests/CommonLibTests.vcxproj | 8 +- .../CommonLibTests/FileOutputManagerTests.cpp | 28 ++---- test/CommonLibTests/GlobalVersionTests.cpp | 96 +++++++++---------- test/CommonLibTests/Helpers.cpp | 49 ++++------ test/CommonLibTests/Helpers.h | 29 +++--- test/CommonLibTests/main.cpp | 6 -- 6 files changed, 99 insertions(+), 117 deletions(-) diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 6844054804..5117512c47 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -101,7 +101,7 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;%(AdditionalDependencies) @@ -127,7 +127,7 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;%(AdditionalDependencies) @@ -153,7 +153,7 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;%(AdditionalDependencies) @@ -179,7 +179,7 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;%(AdditionalDependencies) diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/test/CommonLibTests/FileOutputManagerTests.cpp index ee3a446633..93557c73a3 100644 --- a/test/CommonLibTests/FileOutputManagerTests.cpp +++ b/test/CommonLibTests/FileOutputManagerTests.cpp @@ -31,16 +31,16 @@ namespace FileOutManagerStartupTests { PCWSTR expected = L"test"; - std::wstring tempDirectory = Helpers::CreateRandomTempDirectory(); + auto tempDirectory = TempDirectory(); FileOutputManager* pManager = new FileOutputManager; - pManager->Initialize(fileNamePrefix.c_str(), tempDirectory.c_str()); + pManager->Initialize(fileNamePrefix.c_str(), tempDirectory.path().c_str()); { FileManagerWrapper wrapper(pManager); wprintf(expected, out); } - - for (auto & p : std::experimental::filesystem::directory_iterator(tempDirectory)) + + for (auto & p : std::experimental::filesystem::directory_iterator(tempDirectory.path())) { std::wstring filename(p.path().filename()); ASSERT_EQ(filename.substr(0, fileNamePrefix.size()), fileNamePrefix); @@ -49,8 +49,6 @@ namespace FileOutManagerStartupTests ASSERT_EQ(content.length(), DWORD(4)); ASSERT_STREQ(content.c_str(), expected); } - - Helpers::DeleteDirectory(tempDirectory); } }; @@ -74,10 +72,10 @@ namespace FileOutManagerOutputTests { PCSTR expected = "test"; - std::wstring tempDirectory = Helpers::CreateRandomTempDirectory(); + auto tempDirectory = TempDirectory(); FileOutputManager* pManager = new FileOutputManager; - pManager->Initialize(L"", tempDirectory.c_str()); + pManager->Initialize(L"", tempDirectory.path().c_str()); { FileManagerWrapper wrapper(pManager); @@ -87,18 +85,16 @@ namespace FileOutManagerOutputTests ASSERT_STREQ(straContent.QueryStr(), expected); } - - Helpers::DeleteDirectory(tempDirectory); } TEST(FileOutManagerOutputTest, DISABLED_CheckFileOutput) { PCSTR expected = "test"; - std::wstring tempDirectory = Helpers::CreateRandomTempDirectory(); + auto tempDirectory = TempDirectory(); FileOutputManager* pManager = new FileOutputManager; - pManager->Initialize(L"", tempDirectory.c_str()); + pManager->Initialize(L"", tempDirectory.path().c_str()); { FileManagerWrapper wrapper(pManager); @@ -108,18 +104,16 @@ namespace FileOutManagerOutputTests ASSERT_STREQ(straContent.QueryStr(), expected); } - - Helpers::DeleteDirectory(tempDirectory); } TEST(FileOutManagerOutputTest, DISABLED_CapAt4KB) { PCSTR expected = "test"; - std::wstring tempDirectory = Helpers::CreateRandomTempDirectory(); + auto tempDirectory = TempDirectory(); FileOutputManager* pManager = new FileOutputManager; - pManager->Initialize(L"", tempDirectory.c_str()); + pManager->Initialize(L"", tempDirectory.path().c_str()); { FileManagerWrapper wrapper(pManager); @@ -133,8 +127,6 @@ namespace FileOutManagerOutputTests ASSERT_EQ(straContent.QueryCCH(), 4096); } - - Helpers::DeleteDirectory(tempDirectory); } } diff --git a/test/CommonLibTests/GlobalVersionTests.cpp b/test/CommonLibTests/GlobalVersionTests.cpp index 00ec23f479..9c74b6720e 100644 --- a/test/CommonLibTests/GlobalVersionTests.cpp +++ b/test/CommonLibTests/GlobalVersionTests.cpp @@ -30,32 +30,32 @@ namespace GlobalVersionTests TEST(GetRequestHandlerVersions, GetFolders) { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / L"2.0.0")); - auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.c_str()); + auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.path().c_str()); EXPECT_EQ(res.size(), 1); EXPECT_EQ(res.at(0), fx_ver_t(2, 0, 0, std::wstring())); } TEST(GetRequestHandlerVersions, GetFolderPreview) { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0-preview")); + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / L"2.0.0-preview")); - auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.c_str()); + auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.path().c_str()); EXPECT_EQ(res.size(), 1); EXPECT_EQ(res.at(0), fx_ver_t(2, 0, 0, std::wstring(L"-preview"))); } TEST(GetRequestHandlerVersions, GetFolderManyVersions) { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\1.9.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / + L"2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / + L"1.9.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / + L"2.1.0")); - auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.c_str()); + auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.path().c_str()); EXPECT_EQ(res.size(), 3); EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(1, 9, 0, std::wstring())) != std::end(res)); EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(2, 0, 0, std::wstring())) != std::end(res)); @@ -64,90 +64,90 @@ namespace GlobalVersionTests TEST(FindHighestGlobalVersion, HighestVersionWithSingleFolder) { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); - auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.path().c_str()); EXPECT_STREQ(res.c_str(), L"2.0.0"); } TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersions) { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0")); - auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.path().c_str()); EXPECT_STREQ(res.c_str(), L"2.1.0"); } TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersionsPreview) { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.2.0-preview")); + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.2.0-preview")); - auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.path().c_str()); EXPECT_STREQ(res.c_str(), L"2.2.0-preview"); } TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersionNoPreview) { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0")); + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0-preview")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0")); - auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.c_str()); + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.path().c_str()); EXPECT_STREQ(res.c_str(), L"2.1.0"); } TEST(GetGlobalRequestHandlerPath, FindHighestVersionNoHandlerName) { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"", L"aspnetcorev2_outofprocess.dll"); + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.path().c_str(), L"", L"aspnetcorev2_outofprocess.dll"); - EXPECT_STREQ(result.c_str(), (tempPath + L"2.0.0\\aspnetcorev2_outofprocess.dll").c_str()); + EXPECT_STREQ(result.c_str(), (tempPath.path() / L"2.0.0\\aspnetcorev2_outofprocess.dll").c_str()); } TEST(GetGlobalRequestHandlerPath, FindHighestVersionPreviewWins) { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0-preview")); - auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"", L"aspnetcorev2_outofprocess.dll"); + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.path().c_str(), L"", L"aspnetcorev2_outofprocess.dll"); - EXPECT_STREQ(result.c_str(), (tempPath + L"2.1.0-preview\\aspnetcorev2_outofprocess.dll").c_str()); + EXPECT_STREQ(result.c_str(), (tempPath.path() / L"2.1.0-preview\\aspnetcorev2_outofprocess.dll").c_str()); } TEST(GetGlobalRequestHandlerPath, FindHighestVersionSpecificVersion) { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0-preview")); - auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"2.0.0", L"aspnetcorev2_outofprocess.dll"); + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.path().c_str(), L"2.0.0", L"aspnetcorev2_outofprocess.dll"); - EXPECT_STREQ(result.c_str(), (tempPath + L"2.0.0\\aspnetcorev2_outofprocess.dll").c_str()); + EXPECT_STREQ(result.c_str(), (tempPath.path() / L"2.0.0\\aspnetcorev2_outofprocess.dll").c_str()); } TEST(GetGlobalRequestHandlerPath, FindHighestVersionSpecificPreview) { - std::wstring tempPath = Helpers::CreateRandomTempDirectory(); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.0.0")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.1.0-preview")); - EXPECT_TRUE(fs::create_directories(tempPath + L"\\2.2.0")); + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0-preview")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.2.0")); - auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.c_str(), L"2.1.0-preview", L"aspnetcorev2_outofprocess.dll"); + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.path().c_str(), L"2.1.0-preview", L"aspnetcorev2_outofprocess.dll"); - EXPECT_STREQ(result.c_str(), (tempPath + L"2.1.0-preview\\aspnetcorev2_outofprocess.dll").c_str()); + EXPECT_STREQ(result.c_str(), (tempPath.path() / L"2.1.0-preview\\aspnetcorev2_outofprocess.dll").c_str()); } } diff --git a/test/CommonLibTests/Helpers.cpp b/test/CommonLibTests/Helpers.cpp index 9ad7560c94..3e429a6665 100644 --- a/test/CommonLibTests/Helpers.cpp +++ b/test/CommonLibTests/Helpers.cpp @@ -3,29 +3,6 @@ #include "stdafx.h" -std::wstring -Helpers::CreateRandomValue() -{ - int randomValue = rand(); - return std::to_wstring(randomValue); -} - -std::wstring -Helpers::CreateRandomTempDirectory() -{ - PWSTR tempPath = new WCHAR[256]; - GetTempPath(256, tempPath); - std::wstring wstringPath(tempPath); - - return wstringPath.append(Helpers::CreateRandomValue()).append(L"\\"); -} - -void -Helpers::DeleteDirectory(std::wstring directory) -{ - std::experimental::filesystem::remove_all(directory); -} - std::wstring Helpers::ReadFileContent(std::wstring file) { @@ -37,12 +14,28 @@ Helpers::ReadFileContent(std::wstring file) int nChars = MultiByteToWideChar(CP_ACP, 0, buffer.str().c_str(), -1, NULL, 0); - LPWSTR pwzName = new WCHAR[nChars]; - MultiByteToWideChar(CP_UTF8, 0, buffer.str().c_str(), -1, pwzName, nChars); + std::wstring retVal(nChars, '\0'); - std::wstring retVal(pwzName); - - delete pwzName; + MultiByteToWideChar(CP_UTF8, 0, buffer.str().c_str(), -1, retVal.data(), nChars); return retVal; } + +TempDirectory::TempDirectory() +{ + UUID uuid; + UuidCreate(&uuid); + RPC_CSTR szUuid = NULL; + if (UuidToStringA(&uuid, &szUuid) == RPC_S_OK) + { + m_path = std::experimental::filesystem::temp_directory_path() / szUuid; + RpcStringFreeA(&szUuid); + return; + } + throw std::exception("Cannot create temp directory"); +} + +TempDirectory::~TempDirectory() +{ + std::experimental::filesystem::remove_all(m_path); +} diff --git a/test/CommonLibTests/Helpers.h b/test/CommonLibTests/Helpers.h index f9e06bbca4..657766dd43 100644 --- a/test/CommonLibTests/Helpers.h +++ b/test/CommonLibTests/Helpers.h @@ -5,21 +5,24 @@ class Helpers { public: - - static - std::wstring - CreateRandomValue(); - - static - std::wstring - CreateRandomTempDirectory(); - - static - void - DeleteDirectory(std::wstring directory); - static std::wstring ReadFileContent(std::wstring file); }; +class TempDirectory +{ +public: + + TempDirectory(); + + ~TempDirectory(); + + std::experimental::filesystem::path path() const + { + return m_path; + } + +private: + std::experimental::filesystem::path m_path; +}; diff --git a/test/CommonLibTests/main.cpp b/test/CommonLibTests/main.cpp index f4a91c733a..1ad0a10ccd 100644 --- a/test/CommonLibTests/main.cpp +++ b/test/CommonLibTests/main.cpp @@ -5,14 +5,8 @@ DECLARE_DEBUG_PRINT_OBJECT2("tests", ASPNETCORE_DEBUG_FLAG_INFO | ASPNETCORE_DEBUG_FLAG_CONSOLE); -#if defined(_WIN32) int wmain(int argc, wchar_t* argv[]) -#else -int main(int argc, char* argv[]) -#endif { - std::srand((unsigned int)std::time(0)); ::testing::InitGoogleTest(&argc, argv); RUN_ALL_TESTS(); - return 0; } From 32121abde308c046b6821e8ec9f5f6e4dce3c04c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 22 Jun 2018 15:29:28 -0700 Subject: [PATCH 088/363] Fixes exit(0) with hostable webcore (#966) --- .../InProcessRequestHandler/inprocessapplication.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 0d5ce7670a..4a3fd9901d 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -243,7 +243,13 @@ IN_PROCESS_APPLICATION::Recycle( // Try to graceful shutdown the managed application // and call exit to terminate current process ShutDown(); - exit(0); + + // If we set a static callback, we don't want to kill the current process as + // that will kill the test process and means we are running in hostable webcore mode. + if (s_fMainCallback == NULL) + { + exit(0); + } } } From aeebcdefc18d8ba208477bf69fb9db34087a3094 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 25 Jun 2018 08:38:46 -0700 Subject: [PATCH 089/363] Switch to tracing macros in application info (#965) --- .../AspNetCore/src/applicationinfo.cpp | 111 ++++-------------- src/AspNetCoreModuleV2/CommonLib/exceptions.h | 1 + 2 files changed, 26 insertions(+), 86 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 5cc5ea2f90..fbade6cf76 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -66,32 +66,10 @@ APPLICATION_INFO::Initialize( // todo: make sure Initialize should be called only once m_pServer = pServer; - m_pConfiguration = new ASPNETCORE_SHIM_CONFIG(); - - if (m_pConfiguration == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } - - hr = m_pConfiguration->Populate(m_pServer, pApplication); - if (FAILED(hr)) - { - goto Finished; - } - - hr = m_struInfoKey.Copy(pApplication->GetApplicationId()); - if (FAILED(hr)) - { - goto Finished; - } - - m_pFileWatcherEntry = new FILE_WATCHER_ENTRY(pFileWatcher); - if (m_pFileWatcherEntry == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } + FINISHED_IF_NULL_ALLOC(m_pConfiguration = new ASPNETCORE_SHIM_CONFIG()); + FINISHED_IF_FAILED(m_pConfiguration->Populate(m_pServer, pApplication)); + FINISHED_IF_FAILED(m_struInfoKey.Copy(pApplication->GetApplicationId())); + FINISHED_IF_NULL_ALLOC(m_pFileWatcherEntry = new FILE_WATCHER_ENTRY(pFileWatcher)); UpdateAppOfflineFileHandle(); @@ -102,12 +80,11 @@ Finished: HRESULT APPLICATION_INFO::StartMonitoringAppOffline() { - HRESULT hr = S_OK; if (m_pFileWatcherEntry != NULL) { - hr = m_pFileWatcherEntry->Create(m_pConfiguration->QueryApplicationPhysicalPath()->QueryStr(), L"app_offline.htm", this, NULL); + RETURN_IF_FAILED(m_pFileWatcherEntry->Create(m_pConfiguration->QueryApplicationPhysicalPath()->QueryStr(), L"app_offline.htm", this, NULL)); } - return hr; + return S_OK; } // @@ -249,8 +226,7 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) if (g_fAspnetcoreRHLoadedError) { - hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; - goto Finished; + FINISHED_IF_FAILED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); } else if (!g_fAspnetcoreRHAssemblyLoaded) { @@ -258,12 +234,11 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) if (g_fAspnetcoreRHLoadedError) { - hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; - goto Finished; + FINISHED_IF_FAILED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); } if (g_fAspnetcoreRHAssemblyLoaded) { - goto Finished; + FINISHED(S_OK); } if (m_pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) @@ -302,7 +277,7 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG, struFileName.IsEmpty() ? s_pwzAspnetcoreInProcessRequestHandlerName : struFileName.QueryStr()); - goto Finished; + FINISHED(hr); } } else @@ -315,7 +290,7 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG, struFileName.IsEmpty() ? s_pwzAspnetcoreOutOfProcessRequestHandlerName : struFileName.QueryStr()); - goto Finished; + FINISHED(hr); } } @@ -325,8 +300,7 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) if (g_hAspnetCoreRH == NULL) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; + FINISHED(HRESULT_FROM_WIN32(GetLastError())); } } @@ -334,8 +308,7 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) GetProcAddress(g_hAspnetCoreRH, "CreateApplication"); if (g_pfnAspNetCoreCreateApplication == NULL) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; + FINISHED(HRESULT_FROM_WIN32(GetLastError())); } g_fAspnetcoreRHAssemblyLoaded = TRUE; @@ -374,10 +347,7 @@ APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation( pstrHandlerDllName ); - if (FAILED(hr = struFilename->Copy(retval.c_str()))) - { - return hr; - } + RETURN_IF_FAILED(struFilename->Copy(retval.c_str())); } catch (std::exception& e) { @@ -427,14 +397,7 @@ APPLICATION_INFO::FindNativeAssemblyFromHostfxr( DBG_ASSERT(struFileName != NULL); - hmHostFxrDll = LoadLibraryW(hostfxrOptions->GetHostFxrLocation()); - - if (hmHostFxrDll == NULL) - { - // Could not load hostfxr - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + FINISHED_LAST_ERROR_IF_NULL(hmHostFxrDll = LoadLibraryW(hostfxrOptions->GetHostFxrLocation())); hostfxr_get_native_search_directories_fn pFnHostFxrSearchDirectories = (hostfxr_get_native_search_directories_fn) GetProcAddress(hmHostFxrDll, "hostfxr_get_native_search_directories"); @@ -443,14 +406,10 @@ APPLICATION_INFO::FindNativeAssemblyFromHostfxr( { // Host fxr version is incorrect (need a higher version). // TODO log error - hr = E_FAIL; - goto Finished; + FINISHED(E_FAIL); } - if (FAILED(hr = struNativeSearchPaths.Resize(dwBufferSize))) - { - goto Finished; - } + FINISHED_IF_FAILED(hr = struNativeSearchPaths.Resize(dwBufferSize)); while (TRUE) { @@ -470,23 +429,16 @@ APPLICATION_INFO::FindNativeAssemblyFromHostfxr( { dwBufferSize = dwRequiredBufferSize + 1; // for null terminator - if (FAILED(hr = struNativeSearchPaths.Resize(dwBufferSize))) - { - goto Finished; - } + FINISHED_IF_FAILED(struNativeSearchPaths.Resize(dwBufferSize)); } else { - hr = E_FAIL; // Log "Error finding native search directories from aspnetcore application. - goto Finished; + FINISHED(E_FAIL); } } - if (FAILED(hr = struNativeSearchPaths.SyncWithBuffer())) - { - goto Finished; - } + FINISHED_IF_FAILED(hr = struNativeSearchPaths.SyncWithBuffer()); fFound = FALSE; @@ -494,30 +446,18 @@ APPLICATION_INFO::FindNativeAssemblyFromHostfxr( // Split on semicolons, append aspnetcorerh.dll, and check if the file exists. while ((intIndex = struNativeSearchPaths.IndexOf(L";", intPrevIndex)) != -1) { - if (FAILED(hr = struNativeDllLocation.Copy(&struNativeSearchPaths.QueryStr()[intPrevIndex], intIndex - intPrevIndex))) - { - goto Finished; - } + FINISHED_IF_FAILED(struNativeDllLocation.Copy(&struNativeSearchPaths.QueryStr()[intPrevIndex], intIndex - intPrevIndex)); if (!struNativeDllLocation.EndsWith(L"\\")) { - if (FAILED(hr = struNativeDllLocation.Append(L"\\"))) - { - goto Finished; - } + FINISHED_IF_FAILED(struNativeDllLocation.Append(L"\\")); } - if (FAILED(hr = struNativeDllLocation.Append(libraryName))) - { - goto Finished; - } + FINISHED_IF_FAILED(struNativeDllLocation.Append(libraryName)); if (UTILITY::CheckIfFileExists(struNativeDllLocation.QueryStr())) { - if (FAILED(hr = struFilename->Copy(struNativeDllLocation))) - { - goto Finished; - } + FINISHED_IF_FAILED(struFilename->Copy(struNativeDllLocation)); fFound = TRUE; break; } @@ -527,8 +467,7 @@ APPLICATION_INFO::FindNativeAssemblyFromHostfxr( if (!fFound) { - hr = E_FAIL; - goto Finished; + FINISHED(E_FAIL); } Finished: diff --git a/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/AspNetCoreModuleV2/CommonLib/exceptions.h index efdd9de9a8..ac05f910c1 100644 --- a/src/AspNetCoreModuleV2/CommonLib/exceptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/exceptions.h @@ -31,6 +31,7 @@ #define RETURN_LAST_ERROR_IF(condition) do { if (condition) { return LogLastError(LOCATION_INFO); }} while (0, 0) #define RETURN_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { return LogLastError(LOCATION_INFO); }} while (0, 0) +#define FINISHED(hrr) do { HRESULT __hrRet = hrr; LogHResultFailed(LOCATION_INFO, __hrRet); hr = __hrRet; goto Finished; } while (0, 0) #define FINISHED_IF_FAILED(hrr) do { HRESULT __hrRet = hrr; if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); hr = __hrRet; goto Finished; }} while (0, 0) #define FINISHED_IF_NULL_ALLOC(ptr) do { if ((ptr) == nullptr) { hr = LogHResultFailed(LOCATION_INFO, E_OUTOFMEMORY); goto Finished; }} while (0, 0) #define FINISHED_LAST_ERROR_IF(condition) do { if (condition) { hr = LogLastError(LOCATION_INFO); goto Finished; }} while (0, 0) From d3d257b90efd4df95557842b0b6c10c2253edd26 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 25 Jun 2018 08:44:02 -0700 Subject: [PATCH 090/363] Add tracing to shimconfig (#964) --- .../AspNetCore/Inc/aspnetcore_shim_config.h | 32 +++----- .../AspNetCore/src/aspnetcore_shim_config.cpp | 74 +++++-------------- 2 files changed, 26 insertions(+), 80 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h index 7560df38d1..3fde28273f 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h @@ -24,66 +24,52 @@ class ASPNETCORE_SHIM_CONFIG { public: virtual - ~ASPNETCORE_SHIM_CONFIG(); + ~ASPNETCORE_SHIM_CONFIG() = default; HRESULT Populate( IHttpServer *pHttpServer, - IHttpApplication *pHttpContext + IHttpApplication *pHttpApplication ); STRU* - QueryApplicationPhysicalPath( - VOID - ) + QueryApplicationPhysicalPath() { return &m_struApplicationPhysicalPath; } STRU* - QueryApplicationPath( - VOID - ) + QueryApplicationPath() { return &m_struApplication; } STRU* - QueryConfigPath( - VOID - ) + QueryConfigPath() { return &m_struConfigPath; } STRU* - QueryProcessPath( - VOID - ) + QueryProcessPath() { return &m_struProcessPath; } STRU* - QueryArguments( - VOID - ) + QueryArguments() { return &m_struArguments; } APP_HOSTING_MODEL - QueryHostingModel( - VOID - ) + QueryHostingModel() { return m_hostingModel; } STRU* - QueryHandlerVersion( - VOID - ) + QueryHandlerVersion() { return &m_struHandlerVersion; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp index 21c3bd997e..0cfc9b4133 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp @@ -7,63 +7,36 @@ #include "hostfxr_utility.h" #include "ahutil.h" -ASPNETCORE_SHIM_CONFIG::~ASPNETCORE_SHIM_CONFIG() -{ -} - HRESULT ASPNETCORE_SHIM_CONFIG::Populate( IHttpServer *pHttpServer, IHttpApplication *pHttpApplication ) { - STACK_STRU(strHostingModel, 300); - HRESULT hr = S_OK; + STACK_STRU(strHostingModel, 12); STRU strApplicationFullPath; IAppHostAdminManager *pAdminManager = NULL; - IAppHostElement *pAspNetCoreElement = NULL; - BSTR bstrAspNetCoreSection = NULL; + CComPtr pAspNetCoreElement; pAdminManager = pHttpServer->GetAdminManager(); - hr = m_struConfigPath.Copy(pHttpApplication->GetAppConfigPath()); - if (FAILED(hr)) - { - goto Finished; - } + RETURN_IF_FAILED(m_struConfigPath.Copy(pHttpApplication->GetAppConfigPath())); + RETURN_IF_FAILED(m_struApplicationPhysicalPath.Copy(pHttpApplication->GetApplicationPhysicalPath())); - hr = m_struApplicationPhysicalPath.Copy(pHttpApplication->GetApplicationPhysicalPath()); - if (FAILED(hr)) - { - goto Finished; - } + const CComBSTR bstrAspNetCoreSection = CS_ASPNETCORE_SECTION; - bstrAspNetCoreSection = SysAllocString(CS_ASPNETCORE_SECTION); - - hr = pAdminManager->GetAdminSection(bstrAspNetCoreSection, + RETURN_IF_FAILED(pAdminManager->GetAdminSection(bstrAspNetCoreSection, m_struConfigPath.QueryStr(), - &pAspNetCoreElement); - if (FAILED(hr)) - { - goto Finished; - } + &pAspNetCoreElement)); - hr = GetElementStringProperty(pAspNetCoreElement, + RETURN_IF_FAILED(GetElementStringProperty(pAspNetCoreElement, CS_ASPNETCORE_PROCESS_EXE_PATH, - &m_struProcessPath); - if (FAILED(hr)) - { - goto Finished; - } + &m_struProcessPath)); - hr = GetElementStringProperty(pAspNetCoreElement, + // Swallow this error for backward compatability + // Use default behavior for empty string + GetElementStringProperty(pAspNetCoreElement, CS_ASPNETCORE_HOSTING_MODEL, &strHostingModel); - if (FAILED(hr)) - { - // Swallow this error for backward compatability - // Use default behavior for empty string - hr = S_OK; - } if (strHostingModel.IsEmpty() || strHostingModel.Equals(L"outofprocess", TRUE)) { @@ -76,27 +49,14 @@ ASPNETCORE_SHIM_CONFIG::Populate( else { // block unknown hosting value - hr = HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); - goto Finished; + RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED)); } - hr = GetElementStringProperty(pAspNetCoreElement, + RETURN_IF_FAILED(GetElementStringProperty(pAspNetCoreElement, CS_ASPNETCORE_PROCESS_ARGUMENTS, - &m_struArguments); - if (FAILED(hr)) - { - goto Finished; - } + &m_struArguments)); - hr = ConfigUtility::FindHandlerVersion(pAspNetCoreElement, &m_struHandlerVersion); + RETURN_IF_FAILED(ConfigUtility::FindHandlerVersion(pAspNetCoreElement, &m_struHandlerVersion)); -Finished: - - if (pAspNetCoreElement != NULL) - { - pAspNetCoreElement->Release(); - pAspNetCoreElement = NULL; - } - - return hr; + return S_OK; } From bc345bc8e7846195d24563b8bffbf311eac7fa31 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 25 Jun 2018 08:46:16 -0700 Subject: [PATCH 091/363] Reduce usage of static inprocess application (#962) --- .../managedexports.cxx | 47 +++++++++++----- .../Core/IISConfigurationData.cs | 4 +- .../Core/IISHttpServer.cs | 54 +++++++++++-------- .../Core/IISNativeApplication.cs | 48 +++++++++++++++++ .../NativeMethods.cs | 18 +++---- .../WebHostBuilderIISExtensions.cs | 1 + .../Inprocess/AppOfflineTests.cs | 2 +- .../Inprocess/ShutdownTests.cs | 31 +++++++++++ .../Utilities/Helpers.cs | 3 ++ test/WebSites/InProcessWebSite/Startup.cs | 11 ++++ 10 files changed, 172 insertions(+), 47 deletions(-) create mode 100644 src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs create mode 100644 test/IISIntegration.FunctionalTests/Inprocess/ShutdownTests.cs diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx index 3c82bd850a..9bc3c9de00 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx @@ -9,8 +9,9 @@ // Initialization export // EXTERN_C __MIDL_DECLSPEC_DLLEXPORT -VOID +HRESULT register_callbacks( + _In_ IN_PROCESS_APPLICATION* pInProcessApplication, _In_ PFN_REQUEST_HANDLER request_handler, _In_ PFN_SHUTDOWN_HANDLER shutdown_handler, _In_ PFN_MANAGED_CONTEXT_HANDLER async_completion_handler, @@ -18,13 +19,20 @@ register_callbacks( _In_ VOID* pvShutdownHandlerContext ) { - IN_PROCESS_APPLICATION::GetInstance()->SetCallbackHandles( + if (pInProcessApplication == NULL) + { + return E_INVALIDARG; + } + + pInProcessApplication->SetCallbackHandles( request_handler, shutdown_handler, async_completion_handler, pvRequstHandlerContext, pvShutdownHandlerContext ); + + return S_OK; } EXTERN_C __MIDL_DECLSPEC_DLLEXPORT @@ -150,12 +158,12 @@ http_get_completion_info( } // -// todo: we should not rely on IN_PROCESS_APPLICATION::GetInstance() // the signature should be changed. application's based address should be passed in // struct IISConfigurationData { + IN_PROCESS_APPLICATION* pInProcessApplication; BSTR pwzFullApplicationPath; BSTR pwzVirtualApplicationPath; BOOL fWindowsAuthEnabled; @@ -169,16 +177,15 @@ http_get_application_properties( _In_ IISConfigurationData* pIISCofigurationData ) { - REQUESTHANDLER_CONFIG* pConfiguration = NULL; - IN_PROCESS_APPLICATION* pApplication = IN_PROCESS_APPLICATION::GetInstance(); - - if (pApplication == NULL) + auto pInProcessApplication = IN_PROCESS_APPLICATION::GetInstance(); + if (pInProcessApplication == NULL) { return E_FAIL; } - pConfiguration = pApplication->QueryConfig(); + auto pConfiguration = pInProcessApplication->QueryConfig(); + pIISCofigurationData->pInProcessApplication = pInProcessApplication; pIISCofigurationData->pwzFullApplicationPath = SysAllocString(pConfiguration->QueryApplicationPhysicalPath()->QueryStr()); pIISCofigurationData->pwzVirtualApplicationPath = SysAllocString(pConfiguration->QueryApplicationVirtualPath()->QueryStr()); pIISCofigurationData->fWindowsAuthEnabled = pConfiguration->QueryWindowsAuthEnabled(); @@ -433,17 +440,29 @@ http_get_authentication_information( } EXTERN_C __MIDL_DECLSPEC_DLLEXPORT -VOID -http_stop_calls_into_managed() +HRESULT +http_stop_calls_into_managed(_In_ IN_PROCESS_APPLICATION* pInProcessApplication) { - IN_PROCESS_APPLICATION::GetInstance()->StopCallsIntoManaged(); + if (pInProcessApplication == NULL) + { + return E_INVALIDARG; + } + + pInProcessApplication->StopCallsIntoManaged(); + return S_OK; } EXTERN_C __MIDL_DECLSPEC_DLLEXPORT -VOID -http_stop_incoming_requests() +HRESULT +http_stop_incoming_requests(_In_ IN_PROCESS_APPLICATION* pInProcessApplication) { - IN_PROCESS_APPLICATION::GetInstance()->StopIncomingRequests(); + if (pInProcessApplication == NULL) + { + return E_INVALIDARG; + } + + pInProcessApplication->StopIncomingRequests(); + return S_OK; } EXTERN_C __MIDL_DECLSPEC_DLLEXPORT diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs index 8f1f473766..5c55267756 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs @@ -1,13 +1,15 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.Runtime.InteropServices; namespace Microsoft.AspNetCore.Server.IIS.Core { [StructLayout(LayoutKind.Sequential)] - internal unsafe struct IISConfigurationData + internal struct IISConfigurationData { + public IntPtr pNativeApplication; [MarshalAs(UnmanagedType.BStr)] public string pwzFullApplicationPath; [MarshalAs(UnmanagedType.BStr)] diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs index 64c9eaf33a..1e6a7c86f4 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs @@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Http.Features; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; namespace Microsoft.AspNetCore.Server.IIS.Core @@ -27,8 +28,9 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private readonly MemoryPool _memoryPool = new SlabMemoryPool(); private GCHandle _httpServerHandle; private readonly IApplicationLifetime _applicationLifetime; - private readonly IAuthenticationSchemeProvider _authentication; + private readonly ILogger _logger; private readonly IISServerOptions _options; + private readonly IISNativeApplication _nativeApplication; private volatile int _stopping; private bool Stopping => _stopping == 1; @@ -56,10 +58,17 @@ namespace Microsoft.AspNetCore.Server.IIS.Core return _websocketAvailable.Value; } - public IISHttpServer(IApplicationLifetime applicationLifetime, IAuthenticationSchemeProvider authentication, IOptions options) + public IISHttpServer( + IISNativeApplication nativeApplication, + IApplicationLifetime applicationLifetime, + IAuthenticationSchemeProvider authentication, + IOptions options, + ILogger logger + ) { + _nativeApplication = nativeApplication; _applicationLifetime = applicationLifetime; - _authentication = authentication; + _logger = logger; _options = options.Value; if (_options.ForwardWindowsAuthentication) @@ -73,10 +82,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core _httpServerHandle = GCHandle.Alloc(this); _iisContextFactory = new IISContextFactory(_memoryPool, application, _options, this); - - // Start the server by registering the callback - NativeMethods.HttpRegisterCallbacks(_requestHandler, _shutdownHandler, _onAsyncCompletion, (IntPtr)_httpServerHandle, (IntPtr)_httpServerHandle); - + _nativeApplication.RegisterCallbacks(_requestHandler, _shutdownHandler, _onAsyncCompletion, (IntPtr)_httpServerHandle, (IntPtr)_httpServerHandle); return Task.CompletedTask; } @@ -86,7 +92,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { cancellationToken.Register(() => { - NativeMethods.HttpStopCallsIntoManaged(); + _nativeApplication.StopCallsIntoManaged(); _shutdownSignal.TrySetResult(null); }); } @@ -98,7 +104,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } // First call back into native saying "DON'T SEND ME ANY MORE REQUESTS" - NativeMethods.HttpStopIncomingRequests(); + _nativeApplication.StopIncomingRequests(); try { @@ -110,7 +116,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core else { // We have drained all requests. Block any callbacks into managed at this point. - NativeMethods.HttpStopCallsIntoManaged(); + _nativeApplication.StopCallsIntoManaged(); _shutdownSignal.TrySetResult(null); } } @@ -127,7 +133,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core _stopping = 1; // Block any more calls into managed from native as we are unloading. - NativeMethods.HttpStopCallsIntoManaged(); + _nativeApplication.StopCallsIntoManaged(); _shutdownSignal.TrySetResult(null); if (_httpServerHandle.IsAllocated) @@ -136,8 +142,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } _memoryPool.Dispose(); - - GC.SuppressFinalize(this); + _nativeApplication.Dispose(); } private static NativeMethods.REQUEST_NOTIFICATION_STATUS HandleRequest(IntPtr pInProcessHandler, IntPtr pvRequestContext) @@ -155,8 +160,19 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private static async Task HandleRequest(IISHttpContext context) { - var result = await context.ProcessRequestAsync(); - CompleteRequest(context, result); + bool successfulRequest = false; + try + { + successfulRequest = await context.ProcessRequestAsync(); + } + catch (Exception ex) + { + context.Server._logger.LogError("Exception in ProcessRequestAsync", ex); + } + finally + { + CompleteRequest(context, successfulRequest); + } } private static bool HandleShutdown(IntPtr pvRequestContext) @@ -181,7 +197,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core if (Interlocked.Decrement(ref context.Server._outstandingRequests) == 0 && context.Server.Stopping) { // All requests have been drained. - NativeMethods.HttpStopCallsIntoManaged(); + context.Server._nativeApplication.StopCallsIntoManaged(); context.Server._shutdownSignal.TrySetResult(null); } @@ -215,12 +231,6 @@ namespace Microsoft.AspNetCore.Server.IIS.Core return new IISHttpContextOfT(_memoryPool, _application, pInProcessHandler, _options, _server); } } - - ~IISHttpServer() - { - // If this finalize is invoked, try our best to block all calls into managed. - NativeMethods.HttpStopCallsIntoManaged(); - } } // Over engineering to avoid allocations... diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs new file mode 100644 index 0000000000..6d574867b4 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs @@ -0,0 +1,48 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; + +namespace Microsoft.AspNetCore.Server.IIS.Core +{ + internal class IISNativeApplication + { + private readonly IntPtr _nativeApplication; + + public IISNativeApplication(IntPtr nativeApplication) + { + _nativeApplication = nativeApplication; + } + + public void StopIncomingRequests() + { + NativeMethods.HttpStopIncomingRequests(_nativeApplication); + } + + public void StopCallsIntoManaged() + { + NativeMethods.HttpStopCallsIntoManaged(_nativeApplication); + } + + public void RegisterCallbacks( + NativeMethods.PFN_REQUEST_HANDLER requestHandler, + NativeMethods.PFN_SHUTDOWN_HANDLER shutdownHandler, + NativeMethods.PFN_ASYNC_COMPLETION onAsyncCompletion, + IntPtr requestContext, + IntPtr shutdownContext) + { + NativeMethods.HttpRegisterCallbacks(_nativeApplication, requestHandler, shutdownHandler, onAsyncCompletion, requestContext, shutdownContext); + } + + public void Dispose() + { + GC.SuppressFinalize(this); + } + + ~IISNativeApplication() + { + // If this finalize is invoked, try our best to block all calls into managed. + StopCallsIntoManaged(); + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs index bd4a31db78..55b8084e59 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs @@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Server.IIS private static extern void http_indicate_completion(IntPtr pInProcessHandler, REQUEST_NOTIFICATION_STATUS notificationStatus); [DllImport(AspNetCoreModuleDll)] - private static extern void register_callbacks(PFN_REQUEST_HANDLER request_callback, PFN_SHUTDOWN_HANDLER shutdown_callback, PFN_ASYNC_COMPLETION managed_context_handler, IntPtr pvRequestContext, IntPtr pvShutdownContext); + private static extern int register_callbacks(IntPtr pInProcessApplication, PFN_REQUEST_HANDLER requestCallback, PFN_SHUTDOWN_HANDLER shutdownCallback, PFN_ASYNC_COMPLETION asyncCallback, IntPtr pvRequestContext, IntPtr pvShutdownContext); [DllImport(AspNetCoreModuleDll)] private static extern unsafe int http_write_response_bytes(IntPtr pInProcessHandler, HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, int nChunks, out bool fCompletionExpected); @@ -65,10 +65,10 @@ namespace Microsoft.AspNetCore.Server.IIS private static extern unsafe HttpApiTypes.HTTP_REQUEST_V2* http_get_raw_request(IntPtr pInProcessHandler); [DllImport(AspNetCoreModuleDll)] - private static extern void http_stop_calls_into_managed(); + private static extern int http_stop_calls_into_managed(IntPtr pInProcessApplication); [DllImport(AspNetCoreModuleDll)] - private static extern void http_stop_incoming_requests(); + private static extern int http_stop_incoming_requests(IntPtr pInProcessApplication); [DllImport(AspNetCoreModuleDll)] private static extern unsafe HttpApiTypes.HTTP_RESPONSE_V2* http_get_raw_response(IntPtr pInProcessHandler); @@ -142,9 +142,9 @@ namespace Microsoft.AspNetCore.Server.IIS { http_indicate_completion(pInProcessHandler, notificationStatus); } - public static void HttpRegisterCallbacks(PFN_REQUEST_HANDLER request_callback, PFN_SHUTDOWN_HANDLER shutdown_callback, PFN_ASYNC_COMPLETION managed_context_handler, IntPtr pvRequestContext, IntPtr pvShutdownContext) + public static void HttpRegisterCallbacks(IntPtr pInProcessApplication, PFN_REQUEST_HANDLER requestCallback, PFN_SHUTDOWN_HANDLER shutdownCallback, PFN_ASYNC_COMPLETION asyncCallback, IntPtr pvRequestContext, IntPtr pvShutdownContext) { - register_callbacks(request_callback, shutdown_callback, managed_context_handler, pvRequestContext, pvShutdownContext); + Validate(register_callbacks(pInProcessApplication, requestCallback, shutdownCallback, asyncCallback, pvRequestContext, pvShutdownContext)); } public static unsafe int HttpWriteResponseBytes(IntPtr pInProcessHandler, HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, int nChunks, out bool fCompletionExpected) @@ -161,14 +161,14 @@ namespace Microsoft.AspNetCore.Server.IIS return http_get_raw_request(pInProcessHandler); } - public static void HttpStopCallsIntoManaged() + public static void HttpStopCallsIntoManaged(IntPtr pInProcessApplication) { - http_stop_calls_into_managed(); + Validate(http_stop_calls_into_managed(pInProcessApplication)); } - public static void HttpStopIncomingRequests() + public static void HttpStopIncomingRequests(IntPtr pInProcessApplication) { - http_stop_incoming_requests(); + Validate(http_stop_incoming_requests(pInProcessApplication)); } public static unsafe HttpApiTypes.HTTP_RESPONSE_V2* HttpGetRawResponse(IntPtr pInProcessHandler) diff --git a/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs b/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs index e5ca048afc..6ce99f7832 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs @@ -35,6 +35,7 @@ namespace Microsoft.AspNetCore.Hosting hostBuilder.UseContentRoot(iisConfigData.pwzFullApplicationPath); return hostBuilder.ConfigureServices( services => { + services.AddSingleton(new IISNativeApplication(iisConfigData.pNativeApplication)); services.AddSingleton(); services.AddSingleton(new IISServerSetupFilter(iisConfigData.pwzVirtualApplicationPath)); services.AddAuthenticationCore(); diff --git a/test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs index b5ac2758e0..d88fad5d21 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs @@ -114,7 +114,7 @@ namespace IISIntegration.FunctionalTests.Inprocess var hostShutdownToken = deploymentResult.DeploymentResult.HostShutdownToken; - Assert.True(hostShutdownToken.WaitHandle.WaitOne(millisecondsTimeout: 1000)); + Assert.True(hostShutdownToken.WaitHandle.WaitOne(Helpers.DefaultTimeout)); Assert.True(hostShutdownToken.IsCancellationRequested); } diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ShutdownTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/ShutdownTests.cs new file mode 100644 index 0000000000..9b1eb28eab --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Inprocess/ShutdownTests.cs @@ -0,0 +1,31 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Threading.Tasks; +using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [SkipIfIISExpressSchemaMissingInProcess] + public class ShutdownTests : IISFunctionalTestBase + { + + public ShutdownTests(ITestOutputHelper output) : base(output) + { + } + + [ConditionalFact] + public async Task ServerShutsDownWhenMainExits() + { + var parameters = Helpers.GetBaseDeploymentParameters(); + var result = await DeployAsync(parameters); + + var response = await result.RetryingHttpClient.GetAsync("/Shutdown"); + Assert.True(result.DeploymentResult.HostShutdownToken.WaitHandle.WaitOne(Helpers.DefaultTimeout)); + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs index d66fecf3cb..cfee3377f2 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.IO; using System.Linq; using System.Xml.Linq; @@ -11,6 +12,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class Helpers { + public static TimeSpan DefaultTimeout = TimeSpan.FromSeconds(3); + public static string GetTestWebSitePath(string name) { return Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"),"test", "WebSites", name); diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index 8a190d47f0..8d0e49d946 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -8,10 +8,12 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.IISIntegration.FunctionalTests; using Microsoft.AspNetCore.Server.IIS; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Primitives; using Xunit; @@ -725,5 +727,14 @@ namespace IISTestSite }); } + private void Shutdown(IApplicationBuilder app) + { + app.Run(async ctx => + { + await ctx.Response.WriteAsync("Shutting down"); + ctx.RequestServices.GetService().StopApplication(); + }); + } + } } From 2da24826713de10d0aa2179ca04998b2245e1c68 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 25 Jun 2018 11:17:31 -0700 Subject: [PATCH 092/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 7b5df9ab2a..0736961427 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,38 +5,38 @@ 0.10.13 2.2.0-preview1-17090 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 0.6.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 0.6.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 15.6.82 15.6.82 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 - 2.2.0-preview1-34507 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 2.0.0 2.1.0 2.2.0-preview1-26618-02 - 2.2.0-preview1-34507 + 2.2.0-preview1-34530 15.6.1 2.0.3 4.6.0-preview1-26617-01 From 4a0691a36c8ce81cf449b83b3c6121768b8587af Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 25 Jun 2018 15:14:59 -0700 Subject: [PATCH 093/363] Remove where.exe timeout (#970) --- src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index a41fd0d4cd..5746730507 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -497,13 +497,8 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() hProcess = processInformation.hProcess; hThread = processInformation.hThread; - // Wait for where.exe to return, waiting 2 seconds. - if (LOG_LAST_ERROR_IF(WaitForSingleObject(processInformation.hProcess, 2000) != WAIT_OBJECT_0)) - { - // Timeout occured, terminate the where.exe process and return. - FINISHED_LAST_ERROR_IF(!TerminateProcess(processInformation.hProcess, 2)); - FINISHED_IF_FAILED(HRESULT_FROM_WIN32(ERROR_TIMEOUT)); - } + // Wait for where.exe to return + WaitForSingleObject(processInformation.hProcess, INFINITE); // // where.exe will return 0 on success, 1 if the file is not found From 0d96354eef8a3149c6feb82186768f50440c59d3 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 25 Jun 2018 17:12:30 -0700 Subject: [PATCH 094/363] Return static 500.30 file on startup fails for in-process (#934) --- .../AspNetCore/src/applicationmanager.cxx | 1 - .../AspNetCore/src/proxymodule.cxx | 6 +- .../CommonLib/SRWExclusiveLock.cpp | 2 +- .../CommonLib/SRWSharedLock.cpp | 2 +- .../InProcessApplicationBase.cpp | 65 +++++++++++++++++ .../InProcessApplicationBase.h | 30 ++++++++ .../InProcessRequestHandler.vcxproj | 6 ++ .../StartupExceptionApplication.cpp | 15 ++++ .../StartupExceptionApplication.h | 70 +++++++++++++++++++ .../StartupExceptionHandler.cpp | 42 +++++++++++ .../StartupExceptionHandler.h | 38 ++++++++++ .../InProcessRequestHandler/dllmain.cxx | 51 +++++--------- .../inprocessapplication.cpp | 66 ++--------------- .../inprocessapplication.h | 20 ++---- .../inprocesshandler.cpp | 22 ------ .../RequestHandlerLib/requesthandler_config.h | 3 +- test/CommonLibTests/CommonLibTests.vcxproj | 8 +-- .../inprocess_application_tests.cpp | 5 +- .../Inprocess/StartupExceptionTests.cs | 20 +++++- .../Inprocess/StartupTests.cs | 2 +- .../StartupExceptionWebSite.csproj | 2 +- 21 files changed, 324 insertions(+), 152 deletions(-) create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx index 9690dcb2fd..01d3e0ecfc 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx @@ -55,7 +55,6 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( if (*ppApplicationInfo == NULL) { - pApplicationInfo = new APPLICATION_INFO(); if (pApplicationInfo == NULL) { diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index 96372b48a1..e71a5daf54 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -147,8 +147,8 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( m_pApplicationInfo->ExtractApplication(&pApplication); - // make sure application is in running state - // cannot recreate the application as we cannot reload clr for inprocess + // make sure application is in running state + // cannot recreate the application as we cannot reload clr for inprocess if (pApplication != NULL && pApplication->QueryStatus() != APPLICATION_STATUS::RUNNING && pApplication->QueryStatus() != APPLICATION_STATUS::STARTING) @@ -156,7 +156,6 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( hr = HRESULT_FROM_WIN32(ERROR_SERVER_DISABLED); goto Finished; } - // Create RequestHandler and process the request hr = pApplication->CreateHandler(pHttpContext, &m_pHandler); @@ -167,7 +166,6 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( } retVal = m_pHandler->OnExecuteRequestHandler(); - } catch (...) { diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp index a7e1b53ee0..0bc46b8cf5 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp @@ -3,7 +3,7 @@ #include "SRWExclusiveLock.h" -SRWExclusiveLock:: SRWExclusiveLock(const SRWLOCK& lock) +SRWExclusiveLock::SRWExclusiveLock(const SRWLOCK& lock) : m_lock(lock) { AcquireSRWLockExclusive(const_cast(&m_lock)); diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp b/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp index d561281385..51f88ccbe0 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp @@ -3,7 +3,7 @@ #include "SRWSharedLock.h" -SRWSharedLock:: SRWSharedLock(const SRWLOCK& lock) +SRWSharedLock::SRWSharedLock(const SRWLOCK& lock) : m_lock(lock) { AcquireSRWLockShared(const_cast(&m_lock)); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp new file mode 100644 index 0000000000..2f3986a0f5 --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp @@ -0,0 +1,65 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "InProcessApplicationBase.h" +#include "SRWExclusiveLock.h" + +hostfxr_main_fn InProcessApplicationBase::s_fMainCallback = NULL; + +InProcessApplicationBase::InProcessApplicationBase( + IHttpServer *pHttpServer) + : + m_srwLock(), + m_fRecycleCalled(FALSE), + m_pHttpServer(pHttpServer) +{ + InitializeSRWLock(&m_srwLock); +} + +VOID +InProcessApplicationBase::Recycle( + VOID +) +{ + // We need to guarantee that recycle is only called once, as calling pHttpServer->RecycleProcess + // multiple times can lead to AVs. + if (m_fRecycleCalled) + { + return; + } + + { + SRWExclusiveLock lock(m_srwLock); + + if (m_fRecycleCalled) + { + return; + } + + m_fRecycleCalled = true; + } + + if (!m_pHttpServer->IsCommandLineLaunch()) + { + // IIS scenario. + // We don't actually handle any shutdown logic here. + // Instead, we notify IIS that the process needs to be recycled, which will call + // ApplicationManager->Shutdown(). This will call shutdown on the application. + m_pHttpServer->RecycleProcess(L"AspNetCore InProcess Recycle Process on Demand"); + } + else + { + // IISExpress scenario + // Try to graceful shutdown the managed application + // and call exit to terminate current process + ShutDown(); + // If we set a static callback, we don't want to kill the current process as + // that will kill the test process and means we are running in hostable webcore mode. + if (m_pHttpServer->IsCommandLineLaunch() + && s_fMainCallback == NULL) + { + exit(0); + } + } +} + diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h new file mode 100644 index 0000000000..defcf3bdf8 --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h @@ -0,0 +1,30 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include "precomp.hxx" +#include "application.h" +#include "requesthandler_config.h" + +typedef INT(*hostfxr_main_fn) (CONST DWORD argc, CONST PCWSTR argv[]); // TODO these may need to be BSTRs + +class InProcessApplicationBase : public APPLICATION +{ +public: + + InProcessApplicationBase(IHttpServer* pHttpServer); + + ~InProcessApplicationBase() = default; + + VOID Recycle(VOID) override; + +protected: + BOOL m_fRecycleCalled; + SRWLOCK m_srwLock; + IHttpServer* const m_pHttpServer; + // Allows to override call to hostfxr_main with custome callback + // used in testing + static hostfxr_main_fn s_fMainCallback; +}; + diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 99a40ce218..907726e2b2 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -212,14 +212,20 @@ + + + + + + diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp new file mode 100644 index 0000000000..10d6ddb4af --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "StartupExceptionApplication.h" + +VOID StartupExceptionApplication::ShutDown() +{ + exit(0); +} + +HRESULT StartupExceptionApplication::CreateHandler(IHttpContext *pContext, IREQUEST_HANDLER ** pRequestHandler) +{ + *pRequestHandler = new StartupExceptionHandler(pContext, m_disableLogs, this); + return S_OK; +} diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h new file mode 100644 index 0000000000..52658c8cda --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h @@ -0,0 +1,70 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include "precomp.hxx" +#include "InProcessApplicationBase.h" +#include "StartupExceptionHandler.h" +#include "SRWExclusiveLock.h" + +class StartupExceptionApplication : public InProcessApplicationBase +{ +public: + StartupExceptionApplication(IHttpServer* pServer, BOOL disableLogs) + : m_disableLogs(disableLogs), + m_pHttpServer(pServer), + InProcessApplicationBase(pServer) + { + InitializeSRWLock(&m_srwLock); + m_status = APPLICATION_STATUS::RUNNING; + } + + ~StartupExceptionApplication() = default; + + virtual VOID ShutDown() override; + virtual HRESULT CreateHandler(IHttpContext * pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override; + + std::string& + GetStaticHtml500Content() + { + { + SRWExclusiveLock lock(m_srwLock); + if (html500Page.empty()) + { + html500Page = std::string(" \ + \ + \ + \ + IIS 500.30 Error \ + "); + } + } + + return html500Page; + } + +private: + std::string html500Page; + SRWLOCK m_srwLock; + BOOL m_disableLogs; + IHttpServer* m_pHttpServer; +}; + diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp new file mode 100644 index 0000000000..b0817a4659 --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp @@ -0,0 +1,42 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "StartupExceptionHandler.h" + +REQUEST_NOTIFICATION_STATUS StartupExceptionHandler::OnExecuteRequestHandler() +{ + if (!m_disableLogs) + { + HTTP_DATA_CHUNK DataChunk; + IHttpResponse* pResponse = m_pContext->GetResponse(); + pResponse->SetStatus(500, "Internal Server Error", 30, E_FAIL, NULL, TRUE); + pResponse->SetHeader("Content-Type", + "text/html", + (USHORT)strlen("text/html"), + FALSE + ); + const std::string& html500Page = m_pApplication->GetStaticHtml500Content(); + + DataChunk.DataChunkType = HttpDataChunkFromMemory; + DataChunk.FromMemory.pBuffer = (PVOID)html500Page.c_str(); + DataChunk.FromMemory.BufferLength = (ULONG)html500Page.size(); + pResponse->WriteEntityChunkByReference(&DataChunk); + } + else + { + m_pContext->GetResponse()->SetStatus(500, "Internal Server Error", 30, E_FAIL); + } + + return REQUEST_NOTIFICATION_STATUS::RQ_NOTIFICATION_FINISH_REQUEST; + +} + +REQUEST_NOTIFICATION_STATUS StartupExceptionHandler::OnAsyncCompletion(DWORD , HRESULT ) +{ + return REQUEST_NOTIFICATION_STATUS::RQ_NOTIFICATION_FINISH_REQUEST; +} + +VOID StartupExceptionHandler::TerminateRequest(bool ) +{ + return VOID(); +} diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h new file mode 100644 index 0000000000..859f3a73f5 --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h @@ -0,0 +1,38 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include "precomp.hxx" +#include "requesthandler.h" +#include "StartupExceptionApplication.h" + +class StartupExceptionApplication; + +class StartupExceptionHandler : public REQUEST_HANDLER +{ +public: + virtual REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override; + + virtual REQUEST_NOTIFICATION_STATUS OnAsyncCompletion(DWORD cbCompletion, HRESULT hrCompletionStatus) override; + + virtual VOID TerminateRequest(bool fClientInitiated) override; + + StartupExceptionHandler(IHttpContext* pContext, BOOL disableLogs, StartupExceptionApplication* pApplication) + : + m_pContext(pContext), + m_disableLogs(disableLogs), + m_pApplication(pApplication) + { + } + + ~StartupExceptionHandler() + { + } + +private: + IHttpContext * m_pContext; + BOOL m_disableLogs; + StartupExceptionApplication* m_pApplication; +}; + diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx index 33dad24f03..42d1f2e45f 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -8,9 +8,12 @@ #include #include "inprocessapplication.h" +#include "StartupExceptionApplication.h" +#include "inprocesshandler.h" #include "requesthandler_config.h" #include "debugutil.h" #include "resources.h" +#include "exceptions.h" DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_inprocess.dll"); @@ -90,46 +93,30 @@ CreateApplication( _Out_ IAPPLICATION **ppApplication ) { - HRESULT hr = S_OK; - IN_PROCESS_APPLICATION *pApplication = NULL; - REQUESTHANDLER_CONFIG *pConfig = NULL; - - // Initialze some global variables here InitializeGlobalConfiguration(pServer); try { - hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpApplication, &pConfig); - if (FAILED(hr)) + REQUESTHANDLER_CONFIG *pConfig = NULL; + RETURN_IF_FAILED(REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpApplication, &pConfig)); + + auto config = std::unique_ptr(pConfig); + + BOOL disableStartupPage = pConfig->QueryDisableStartUpErrorPage(); + + auto pApplication = std::make_unique(pServer, std::move(config)); + + if (FAILED(pApplication->LoadManagedApplication())) { - goto Finished; + // Set the currently running application to a fake application that returns startup exceptions. + *ppApplication = new StartupExceptionApplication(pServer, disableStartupPage); } - - pApplication = new IN_PROCESS_APPLICATION(pServer, pConfig); - - pConfig = NULL; - - *ppApplication = pApplication; - } - catch (std::bad_alloc&) - { - hr = E_OUTOFMEMORY; - } - -Finished: - if (FAILED(hr)) - { - if (pApplication != NULL) + else { - delete pApplication; - pApplication = NULL; - } - if (pConfig != NULL) - { - delete pConfig; - pConfig = NULL; + *ppApplication = pApplication.release(); } } + CATCH_RETURN(); - return hr; + return S_OK; } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 4a3fd9901d..caf55a20f1 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -13,39 +13,30 @@ #include "exceptions.h" IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL; -hostfxr_main_fn IN_PROCESS_APPLICATION::s_fMainCallback = NULL; IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( IHttpServer *pHttpServer, - REQUESTHANDLER_CONFIG *pConfig) : + std::unique_ptr pConfig) : m_pHttpServer(pHttpServer), m_ProcessExitCode(0), m_fBlockCallbacksIntoManaged(FALSE), m_fInitialized(FALSE), m_fShutdownCalledFromNative(FALSE), m_fShutdownCalledFromManaged(FALSE), - m_srwLock() + InProcessApplicationBase(pHttpServer), + m_pConfig(std::move(pConfig)) { // is it guaranteed that we have already checked app offline at this point? // If so, I don't think there is much to do here. DBG_ASSERT(pHttpServer != NULL); DBG_ASSERT(pConfig != NULL); - InitializeSRWLock(&m_srwLock); - m_pConfig = pConfig; m_status = APPLICATION_STATUS::STARTING; } IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION() { - - if (m_pConfig != NULL) - { - delete m_pConfig; - m_pConfig = NULL; - } - m_hThread = NULL; s_Application = NULL; } @@ -129,7 +120,6 @@ Finished: } } - VOID IN_PROCESS_APPLICATION::ShutDownInternal() { @@ -205,54 +195,6 @@ IN_PROCESS_APPLICATION::ShutDownInternal() s_Application = NULL; } -__override -VOID -IN_PROCESS_APPLICATION::Recycle( - VOID -) -{ - // We need to guarantee that recycle is only called once, as calling pHttpServer->RecycleProcess - // multiple times can lead to AVs. - if (m_fRecycleCalled) - { - return; - } - - { - SRWExclusiveLock lock(m_srwLock); - - if (m_fRecycleCalled) - { - return; - } - - m_fRecycleCalled = true; - } - - if (!m_pHttpServer->IsCommandLineLaunch()) - { - // IIS scenario. - // We don't actually handle any shutdown logic here. - // Instead, we notify IIS that the process needs to be recycled, which will call - // ApplicationManager->Shutdown(). This will call shutdown on the application. - m_pHttpServer->RecycleProcess(L"AspNetCore InProcess Recycle Process on Demand"); - } - else - { - // IISExpress scenario - // Try to graceful shutdown the managed application - // and call exit to terminate current process - ShutDown(); - - // If we set a static callback, we don't want to kill the current process as - // that will kill the test process and means we are running in hostable webcore mode. - if (s_fMainCallback == NULL) - { - exit(0); - } - } -} - REQUEST_NOTIFICATION_STATUS IN_PROCESS_APPLICATION::OnAsyncCompletion( DWORD cbCompletion, @@ -712,7 +654,7 @@ IN_PROCESS_APPLICATION::RunDotnetApplication(DWORD argc, CONST PCWSTR* argv, hos REQUESTHANDLER_CONFIG* IN_PROCESS_APPLICATION::QueryConfig() const { - return m_pConfig; + return m_pConfig.get(); } HRESULT diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index 0713ff5016..c80ca92d0c 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -4,22 +4,21 @@ #pragma once #include "precomp.hxx" -#include "application.h" +#include "InProcessApplicationBase.h" #include "inprocesshandler.h" #include "requesthandler_config.h" -typedef INT(*hostfxr_main_fn) (CONST DWORD argc, CONST PCWSTR argv[]); // TODO these may need to be BSTRs typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_REQUEST_HANDLER) (IN_PROCESS_HANDLER* pInProcessHandler, void* pvRequestHandlerContext); typedef BOOL(WINAPI * PFN_SHUTDOWN_HANDLER) (void* pvShutdownHandlerContext); typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_MANAGED_CONTEXT_HANDLER)(void *pvManagedHttpContext, HRESULT hrCompletionStatus, DWORD cbCompletion); -class IN_PROCESS_APPLICATION : public APPLICATION +class IN_PROCESS_APPLICATION : public InProcessApplicationBase { public: IN_PROCESS_APPLICATION( IHttpServer* pHttpServer, - REQUESTHANDLER_CONFIG *pConfig); + std::unique_ptr pConfig); ~IN_PROCESS_APPLICATION(); @@ -36,12 +35,6 @@ public: _In_ VOID* pvShutdownHandlerContext ); - __override - VOID - Recycle( - VOID - ); - __override HRESULT CreateHandler( @@ -163,7 +156,6 @@ private: BOOL m_fRecycleCalled; BOOL m_fInitialized; - SRWLOCK m_srwLock; // Thread for capturing startup stderr logs when logging is disabled HANDLE m_hErrThread; @@ -172,11 +164,9 @@ private: static IN_PROCESS_APPLICATION* s_Application; IOutputManager* m_pLoggerProvider; - REQUESTHANDLER_CONFIG* m_pConfig; + std::unique_ptr m_pConfig; + - // Allows to override call to hostfxr_main with custome callback - // used in testing - static hostfxr_main_fn s_fMainCallback; static VOID diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 5678e2c4fd..5c7d9571da 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -23,28 +23,6 @@ __override REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::OnExecuteRequestHandler() { - // First get the in process Application - HRESULT hr; - - hr = m_pApplication->LoadManagedApplication(); - - if (FAILED(hr)) - { - // TODO remove com_error? - /*_com_error err(hr); - if (ANCMEvents::ANCM_START_APPLICATION_FAIL::IsEnabled(m_pW3Context->GetTraceContext())) - { - ANCMEvents::ANCM_START_APPLICATION_FAIL::RaiseEvent( - m_pW3Context->GetTraceContext(), - NULL, - err.ErrorMessage()); - } - */ - //fInternalError = TRUE; - m_pW3Context->GetResponse()->SetStatus(500, "Internal Server Error", 0, hr); - return REQUEST_NOTIFICATION_STATUS::RQ_NOTIFICATION_FINISH_REQUEST; - } - // FREB log if (ANCMEvents::ANCM_START_APPLICATION_SUCCESS::IsEnabled(m_pW3Context->GetTraceContext())) diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h index 71f5cb6e66..60cbd7c8b7 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h @@ -53,9 +53,8 @@ enum APP_HOSTING_MODEL class REQUESTHANDLER_CONFIG { public: - virtual - ~REQUESTHANDLER_CONFIG(); + ~REQUESTHANDLER_CONFIG(); static HRESULT diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 5117512c47..906518c621 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -101,7 +101,7 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;%(AdditionalDependencies) @@ -127,7 +127,7 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;%(AdditionalDependencies) @@ -153,7 +153,7 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;%(AdditionalDependencies) @@ -179,7 +179,7 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;%(AdditionalDependencies) diff --git a/test/CommonLibTests/inprocess_application_tests.cpp b/test/CommonLibTests/inprocess_application_tests.cpp index 98326312f1..d362b8f56c 100644 --- a/test/CommonLibTests/inprocess_application_tests.cpp +++ b/test/CommonLibTests/inprocess_application_tests.cpp @@ -16,7 +16,8 @@ namespace InprocessTests { auto server = new MockHttpServer(); auto requestHandlerConfig = MockRequestHandlerConfig::CreateConfig(); - IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, requestHandlerConfig); + auto config = std::unique_ptr(requestHandlerConfig); + IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, std::move(config)); { std::wstring exePath(L"hello"); app->SetParameter(L"InProcessExeLocation", exePath.c_str()); @@ -24,5 +25,3 @@ namespace InprocessTests ASSERT_STREQ(app->QueryExeLocation(), L"hello"); } } - - diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs index d82877d20c..0b09c7a465 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Net; using System.Threading.Tasks; using IISIntegration.FunctionalTests.Utilities; using Xunit; -using System.Net; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { @@ -18,7 +18,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CheckStdoutWithRandomNumber(string path) { var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite"); - deploymentParameters.PublishApplicationBeforeDeployment = true; deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; var randomNumberString = new Random(Guid.NewGuid().GetHashCode()).Next(10000000).ToString(); deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_RANDOM_VALUE"] = randomNumberString; @@ -42,8 +41,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CheckStdoutWithLargeWrites(string path) { var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite"); - deploymentParameters.PublishApplicationBeforeDeployment = true; deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + var deploymentResult = await DeployAsync(deploymentParameters); var response = await deploymentResult.RetryingHttpClient.GetAsync(path); @@ -54,5 +53,20 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Contains(TestSink.Writes, context => context.Message.Contains(new string('a', 4096))); } + + [Fact] + public async Task Gets500_30_ErrorPage() + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite"); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/"); + Assert.False(response.IsSuccessStatusCode); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Contains("500.30 - ANCM In-Process Start Failure", responseText); + } } } diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index 68fac580db..f848ab910a 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -108,7 +108,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentParameters = new DeploymentParameters(variant) { ApplicationPath = Helpers.GetInProcessTestSitesPath(), - PublishApplicationBeforeDeployment = true, + PublishApplicationBeforeDeployment = true }; var deploymentResult = await DeployAsync(deploymentParameters); diff --git a/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj b/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj index 2b9db3ce4a..d279ce41b4 100644 --- a/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj +++ b/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj @@ -1,4 +1,4 @@ - + From e3b84fbe850eef28a1fad0bf85fdaa5e6fe64b3e Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 25 Jun 2018 21:04:17 -0700 Subject: [PATCH 095/363] Updating Readme to call run.ps1 install vs. --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c5e9f7ec57..217e6fe345 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,9 @@ This project is part of ASP.NET Core. You can find samples, documentation and ge 1. Install prerequisites 1. Visual Studio 2017 1. Workload: `Desktop development with C++` - 1. Additional Component: `Windows 8.1 SDK and UCRT SDK` - 2. Additional Component: `Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64]` + 1. Run `run.ps1 install vs` or install the following components + 1. Additional Component: `Windows 8.1 SDK and UCRT SDK` + 2. Additional Component: `Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64]` 2. Workload: `ASP.NET and web development` 2. Clone with submodules 1. `git clone --recurse-submodules IISIntegration` From fac42c78a178866e5ad4638869e1026b4e8e7c52 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 26 Jun 2018 11:28:56 -0700 Subject: [PATCH 096/363] Re-enable flaky logging tests, add logs to output redirection providers, fix potential race condition in closing pipe output. (#971) --- .../RequestHandlerLib/FileOutputManager.cpp | 62 ++++++--------- .../RequestHandlerLib/PipeOutputManager.cpp | 48 ++++++------ .../RequestHandlerLib/PipeOutputManager.h | 6 +- .../Inprocess/LoggingTests.cs | 76 +++++++++---------- 4 files changed, 86 insertions(+), 106 deletions(-) diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp index 9aca9ae0c3..28d3c47884 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp @@ -4,6 +4,8 @@ #include "stdafx.h" #include "sttimer.h" #include "utility.h" +#include "exceptions.h" +#include "debugutil.h" FileOutputManager::FileOutputManager() { @@ -37,25 +39,23 @@ FileOutputManager::~FileOutputManager() if (m_fdPreviousStdOut >= 0) { _dup2(m_fdPreviousStdOut, _fileno(stdout)); + LOG_INFOF("Restoring original stdout of stdout: %d", m_fdPreviousStdOut); } if (m_fdPreviousStdErr >= 0) { _dup2(m_fdPreviousStdErr, _fileno(stderr)); + LOG_INFOF("Restoring original stdout of stdout: %d", m_fdPreviousStdOut); } } HRESULT FileOutputManager::Initialize(PCWSTR pwzStdOutLogFileName, PCWSTR pwzApplicationPath) { - HRESULT hr = S_OK; + RETURN_IF_FAILED(m_wsApplicationPath.Copy(pwzApplicationPath)); + RETURN_IF_FAILED(m_wsStdOutLogFileName.Copy(pwzStdOutLogFileName)); - if (SUCCEEDED(hr = m_wsApplicationPath.Copy(pwzApplicationPath))) - { - hr = m_wsStdOutLogFileName.Copy(pwzStdOutLogFileName); - } - - return hr; + return S_OK; } void FileOutputManager::NotifyStartupComplete() @@ -102,33 +102,28 @@ bool FileOutputManager::GetStdOutContent(STRA* struStdOutput) } } + LOG_INFOF("First 4KB captured by stdout: %s", pzFileContents); + return fLogged; } HRESULT FileOutputManager::Start() { - HRESULT hr; SYSTEMTIME systemTime; SECURITY_ATTRIBUTES saAttr = { 0 }; STRU struPath; - hr = UTILITY::ConvertPathToFullPath( + + RETURN_IF_FAILED(UTILITY::ConvertPathToFullPath( m_wsStdOutLogFileName.QueryStr(), m_wsApplicationPath.QueryStr(), - &struPath); - if (FAILED(hr)) - { - return hr; - } + &struPath)); - hr = UTILITY::EnsureDirectoryPathExist(struPath.QueryStr()); - if (FAILED(hr)) - { - return hr; - } + RETURN_IF_FAILED(UTILITY::EnsureDirectoryPathExist(struPath.QueryStr())); GetSystemTime(&systemTime); - hr = m_struLogFilePath.SafeSnwprintf(L"%s_%d%02d%02d%02d%02d%02d_%d.log", + RETURN_IF_FAILED( + m_struLogFilePath.SafeSnwprintf(L"%s_%d%02d%02d%02d%02d%02d_%d.log", struPath.QueryStr(), systemTime.wYear, systemTime.wMonth, @@ -136,11 +131,7 @@ FileOutputManager::Start() systemTime.wHour, systemTime.wMinute, systemTime.wSecond, - GetCurrentProcessId()); - if (FAILED(hr)) - { - return hr; - } + GetCurrentProcessId())); m_fdPreviousStdOut = _dup(_fileno(stdout)); m_fdPreviousStdErr = _dup(_fileno(stderr)); @@ -155,8 +146,7 @@ FileOutputManager::Start() if (m_hLogFileHandle == INVALID_HANDLE_VALUE) { - hr = HRESULT_FROM_WIN32(GetLastError()); - return hr; + return LOG_IF_FAILED(HRESULT_FROM_WIN32(GetLastError())); } // There are a few options for redirecting stdout/stderr, @@ -173,21 +163,15 @@ FileOutputManager::Start() // Calling SetStdHandle works for redirecting managed logs, however you cannot // capture native logs (including hostfxr failures). - if (!SetStdHandle(STD_OUTPUT_HANDLE, m_hLogFileHandle)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - return hr; - } - - if (!SetStdHandle(STD_ERROR_HANDLE, m_hLogFileHandle)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - return hr; - } + RETURN_LAST_ERROR_IF(!SetStdHandle(STD_OUTPUT_HANDLE, m_hLogFileHandle)); + RETURN_LAST_ERROR_IF(!SetStdHandle(STD_ERROR_HANDLE, m_hLogFileHandle)); // Periodically flush the log content to file m_Timer.InitializeTimer(STTIMER::TimerCallback, &m_struLogFilePath, 3000, 3000); - return hr; + WLOG_INFOF(L"Created log file for inprocess application: %s", + m_struLogFilePath.QueryStr()); + + return S_OK; } diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp index d15f5b458b..79ec3e356f 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp @@ -2,6 +2,8 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "stdafx.h" +#include "exceptions.h" +#include "SRWExclusiveLock.h" PipeOutputManager::PipeOutputManager() : m_dwStdErrReadTotal(0), @@ -10,6 +12,7 @@ PipeOutputManager::PipeOutputManager() : m_hErrThread(INVALID_HANDLE_VALUE), m_fDisposed(FALSE) { + InitializeSRWLock(&m_srwLock); } PipeOutputManager::~PipeOutputManager() @@ -23,6 +26,12 @@ PipeOutputManager::StopOutputRedirection() DWORD dwThreadStatus = 0; STRA straStdOutput; + if (m_fDisposed) + { + return; + } + SRWExclusiveLock lock(m_srwLock); + if (m_fDisposed) { return; @@ -38,17 +47,20 @@ PipeOutputManager::StopOutputRedirection() m_hErrWritePipe = INVALID_HANDLE_VALUE; } + // GetExitCodeThread returns 0 on failure; thread status code is invalid. if (m_hErrThread != NULL && m_hErrThread != INVALID_HANDLE_VALUE && - GetExitCodeThread(m_hErrThread, &dwThreadStatus) != 0 && + !LOG_LAST_ERROR_IF(GetExitCodeThread(m_hErrThread, &dwThreadStatus) == 0) && dwThreadStatus == STILL_ACTIVE) { - // wait for gracefullshut down, i.e., the exit of the background thread or timeout + // wait for graceful shutdown, i.e., the exit of the background thread or timeout if (WaitForSingleObject(m_hErrThread, PIPE_OUTPUT_THREAD_TIMEOUT) != WAIT_OBJECT_0) { // if the thread is still running, we need kill it first before exit to avoid AV - if (GetExitCodeThread(m_hErrThread, &dwThreadStatus) != 0 && dwThreadStatus == STILL_ACTIVE) + if (!LOG_LAST_ERROR_IF(GetExitCodeThread(m_hErrThread, &dwThreadStatus) == 0) && + dwThreadStatus == STILL_ACTIVE) { + LOG_WARN("Thread reading stdout/err hit timeout, forcibly closing thread."); TerminateThread(m_hErrThread, STATUS_CONTROL_C_EXIT); } } @@ -68,11 +80,13 @@ PipeOutputManager::StopOutputRedirection() if (m_fdPreviousStdOut != -1) { _dup2(m_fdPreviousStdOut, _fileno(stdout)); + LOG_INFOF("Restoring original stdout of stdout: %d", m_fdPreviousStdOut); } if (m_fdPreviousStdErr != -1) { _dup2(m_fdPreviousStdErr, _fileno(stderr)); + LOG_INFOF("Restoring original stdout of stderr: %d", m_fdPreviousStdErr); } if (GetStdOutContent(&straStdOutput)) @@ -85,7 +99,6 @@ PipeOutputManager::StopOutputRedirection() HRESULT PipeOutputManager::Start() { - HRESULT hr = S_OK; SECURITY_ATTRIBUTES saAttr = { 0 }; HANDLE hStdErrReadPipe; HANDLE hStdErrWritePipe; @@ -93,24 +106,12 @@ HRESULT PipeOutputManager::Start() m_fdPreviousStdOut = _dup(_fileno(stdout)); m_fdPreviousStdErr = _dup(_fileno(stderr)); - if (!CreatePipe(&hStdErrReadPipe, &hStdErrWritePipe, &saAttr, 0 /*nSize*/)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + RETURN_LAST_ERROR_IF(!CreatePipe(&hStdErrReadPipe, &hStdErrWritePipe, &saAttr, 0 /*nSize*/)); // TODO this still doesn't redirect calls in native, like wprintf - if (!SetStdHandle(STD_ERROR_HANDLE, hStdErrWritePipe)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + RETURN_LAST_ERROR_IF(!SetStdHandle(STD_ERROR_HANDLE, hStdErrWritePipe)); - if (!SetStdHandle(STD_OUTPUT_HANDLE, hStdErrWritePipe)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + RETURN_LAST_ERROR_IF(!SetStdHandle(STD_OUTPUT_HANDLE, hStdErrWritePipe)); m_hErrReadPipe = hStdErrReadPipe; m_hErrWritePipe = hStdErrWritePipe; @@ -124,14 +125,9 @@ HRESULT PipeOutputManager::Start() 0, // default creation flags NULL); // receive thread identifier - if (m_hErrThread == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + RETURN_LAST_ERROR_IF_NULL(m_hErrThread); -Finished: - return hr; + return S_OK; } VOID diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h index 57081ea8cd..f51688197c 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h @@ -23,15 +23,17 @@ public: static VOID ReadStdErrHandle(LPVOID pContext); - VOID StopOutputRedirection(); private: + VOID StopOutputRedirection(); + HANDLE m_hErrReadPipe; HANDLE m_hErrWritePipe; STRU m_struLogFilePath; HANDLE m_hErrThread; CHAR m_pzFileContents[MAX_PIPE_READ_SIZE] = { 0 }; - BOOL m_fDisposed; DWORD m_dwStdErrReadTotal; + BOOL m_fDisposed; + SRWLOCK m_srwLock; int m_fdPreviousStdOut; int m_fdPreviousStdErr; }; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs index 60e39ceb35..defdf6a8a4 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class LoggingTests : IISFunctionalTestBase { - [Theory(Skip = "See: https://github.com/aspnet/IISIntegration/issues/897")] + [Theory] [InlineData("CheckErrLogFile")] [InlineData("CheckLogFile")] public async Task CheckStdoutLogging(string path) @@ -24,47 +24,45 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogEnabled", "true"); - Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogFile", @".\logs\stdout"); - - var response = await deploymentResult.RetryingHttpClient.GetAsync(path); - - var responseText = await response.Content.ReadAsStringAsync(); - - Assert.Equal("Hello World", responseText); - - StopServer(); - - var folderPath = Path.Combine(deploymentResult.DeploymentResult.ContentRoot, @"logs"); - - var fileInDirectory = Directory.GetFiles(folderPath).Single(); - Assert.NotNull(fileInDirectory); - - string contents = null; - for (var i = 0; i < 20; i++) + try { - try - { - contents = await File.ReadAllTextAsync(fileInDirectory); - break; - } - catch (IOException) - { - // File in use by IISExpress, delay a bit before rereading. - } - await Task.Delay(20); + Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogEnabled", "true"); + Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogFile", @".\logs\stdout"); + + var response = await deploymentResult.RetryingHttpClient.GetAsync(path); + + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal("Hello World", responseText); + + StopServer(); + + var folderPath = Path.Combine(deploymentResult.DeploymentResult.ContentRoot, @"logs"); + + var fileInDirectory = Directory.GetFiles(folderPath).Single(); + Assert.NotNull(fileInDirectory); + + string contents = null; + + // RetryOperation doesn't support async lambdas, call synchronous ReadAllText. + RetryHelper.RetryOperation( + () => contents = File.ReadAllText(fileInDirectory), + e => Logger.LogError($"Failed to read file: {e.Message}"), + retryCount: 10, + retryDelayMilliseconds: 100); + + Assert.NotNull(contents); + Assert.Contains("TEST MESSAGE", contents); } + finally + { - Assert.NotNull(contents); - - // Open the log file and see if there are any contents. - Assert.Contains("TEST MESSAGE", contents); - - RetryHelper.RetryOperation( - () => Directory.Delete(deploymentParameters.PublishedApplicationRootPath, true), - e => Logger.LogWarning($"Failed to delete directory : {e.Message}"), - retryCount: 3, - retryDelayMilliseconds: 100); + RetryHelper.RetryOperation( + () => Directory.Delete(deploymentParameters.PublishedApplicationRootPath, true), + e => Logger.LogWarning($"Failed to delete directory : {e.Message}"), + retryCount: 3, + retryDelayMilliseconds: 100); + } } } } From 754c3b0c2eec9117655ad03c0c8a0d6be4b14e31 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 26 Jun 2018 12:39:01 -0700 Subject: [PATCH 097/363] Fix props files inside Microsoft.AspNetCore.AspNetCoreModule* Nuget packages (#975) --- build/repo.targets | 16 +++++++++++++--- ...Microsoft.AspNetCore.AspNetCoreModule.nuspec} | 5 +++-- .../Microsoft.AspNetCore.AspNetCoreModule.props | 4 ---- ...crosoft.AspNetCore.AspNetCoreModuleV2.nuspec} | 4 ++-- ...rosoft.AspNetCore.AspNetCoreModuleV2.props.in | 13 +++++++++++++ 5 files changed, 31 insertions(+), 11 deletions(-) rename nuget/{AspNetCoreV1.nuspec => Microsoft.AspNetCore.AspNetCoreModule.nuspec} (92%) rename nuget/{AspNetCoreV2.nuspec => Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec} (94%) create mode 100644 nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in diff --git a/build/repo.targets b/build/repo.targets index 2adc903471..27117d706f 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -93,15 +93,25 @@ - + $(MSBuildThisFileDirectory)..\nuget\Microsoft.AspNetCore.AspNetCoreModuleV2.props.in + $(MSBuildThisFileDirectory)..\artifacts\Microsoft.AspNetCore.AspNetCoreModuleV2.props + + + + + - diff --git a/nuget/AspNetCoreV1.nuspec b/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec similarity index 92% rename from nuget/AspNetCoreV1.nuspec rename to nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec index 273b826516..80d9490328 100644 --- a/nuget/AspNetCoreV1.nuspec +++ b/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec @@ -13,7 +13,7 @@ true ASP.NET Core Module en-US - Microsoft.AspNetCore.AspNetCoreModuleV1 + Microsoft.AspNetCore.AspNetCoreModule @@ -24,7 +24,8 @@ - + + diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props index 1f33b20ed2..7a761813b4 100644 --- a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props +++ b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props @@ -3,10 +3,6 @@ $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcore.dll $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcore.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_inprocess.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_inprocess.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll diff --git a/nuget/AspNetCoreV2.nuspec b/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec similarity index 94% rename from nuget/AspNetCoreV2.nuspec rename to nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec index 9210f7a7cc..c4d109d5ba 100644 --- a/nuget/AspNetCoreV2.nuspec +++ b/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec @@ -36,9 +36,9 @@ - + - + \ No newline at end of file diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in b/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in new file mode 100644 index 0000000000..09af105513 --- /dev/null +++ b/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in @@ -0,0 +1,13 @@ + + + + ${AspNetCoreModuleOutOfProcessVersion} + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_inprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_inprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\$(AspNetCoreModuleOutOfProcessVersion)\aspnetcorev2_outofprocess.dll + + + From af1bf0e1c3b26f70650d49c36423801762078b1c Mon Sep 17 00:00:00 2001 From: pan-wang Date: Wed, 27 Jun 2018 11:46:24 -0700 Subject: [PATCH 098/363] caching handlers to avoid heap fregamentation (#967) caching handlers to avoid heap fregamentation --- .../AspNetCore/Inc/applicationinfo.h | 19 +++--- .../AspNetCore/src/applicationinfo.cpp | 51 +++++++++++---- .../AspNetCore/src/applicationmanager.cxx | 60 +++++------------- .../AspNetCore/src/dllmain.cpp | 35 +++-------- .../AspNetCore/src/proxymodule.cxx | 12 ++-- src/AspNetCoreModuleV2/CommonLib/resources.h | 1 - .../InProcessRequestHandler/dllmain.cxx | 50 +++++++-------- .../inprocessapplication.cpp | 23 ++++--- .../inprocessapplication.h | 4 -- .../inprocesshandler.cpp | 62 +++++++++++++++++++ .../inprocesshandler.h | 11 +++- .../InProcessRequestHandler/precomp.hxx | 4 ++ .../OutOfProcessRequestHandler/dllmain.cxx | 6 ++ .../outofprocess/forwardinghandler.cpp | 23 ++++++- .../outofprocess/forwardinghandler.h | 4 ++ 15 files changed, 223 insertions(+), 142 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h index b21764d691..3d9073d013 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h @@ -36,7 +36,8 @@ public: m_pServer(NULL), m_cRefs(1), m_fAppOfflineFound(FALSE), - m_fAllowStart(FALSE), + m_fValid(FALSE), + m_fDoneAppCreation(FALSE), m_pAppOfflineHtm(NULL), m_pFileWatcherEntry(NULL), m_pConfiguration(NULL), @@ -76,7 +77,8 @@ public: } } - APP_OFFLINE_HTM* QueryAppOfflineHtm() + APP_OFFLINE_HTM* + QueryAppOfflineHtm() { return m_pAppOfflineHtm; } @@ -87,16 +89,16 @@ public: return m_fAppOfflineFound; } - BOOL QueryAllowStart() + BOOL + IsValid() { - return m_fAllowStart; + return m_fValid; } VOID - UpdateAllowStartStatus(BOOL fAllowed) + MarkValid() { - // no lock, as no expectation for concurrent accesses - m_fAllowStart = fAllowed; + m_fValid = TRUE; } VOID @@ -149,7 +151,8 @@ private: mutable LONG m_cRefs; STRU m_struInfoKey; BOOL m_fAppOfflineFound; - BOOL m_fAllowStart; // Flag indicates whether there is (configuration) error blocking application from starting + BOOL m_fValid; + BOOL m_fDoneAppCreation; APP_OFFLINE_HTM *m_pAppOfflineHtm; FILE_WATCHER_ENTRY *m_pFileWatcherEntry; ASPNETCORE_SHIM_CONFIG *m_pConfiguration; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index fbade6cf76..eca9c56448 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -172,6 +172,7 @@ APPLICATION_INFO::EnsureApplicationCreated( IHttpContext *pHttpContext ) { + HRESULT hr = S_OK; IAPPLICATION *pApplication = NULL; STRU struExeLocation; STRU struHostFxrDllLocation; @@ -182,12 +183,25 @@ APPLICATION_INFO::EnsureApplicationCreated( return S_OK; } - if (m_pApplication == NULL) + // one optimization for failure scenario is to reduce the lock scope + SRWExclusiveLock lock(m_srwLock); + + if (m_fDoneAppCreation) + { + // application is NULL and CreateApplication failed previously + FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); + } + else { - SRWExclusiveLock lock(m_srwLock); if (m_pApplication != NULL) { - return S_OK; + // another thread created the applicaiton + FINISHED(S_OK); + } + else if (m_fDoneAppCreation) + { + // previous CreateApplication failed + FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); } // @@ -195,26 +209,40 @@ APPLICATION_INFO::EnsureApplicationCreated( // if (!m_fAppOfflineFound) { - // Move the request handler check inside of the lock // such that only one request finds and loads it. // FindRequestHandlerAssembly obtains a global lock, but after releasing the lock, // there is a period where we could call - RETURN_IF_FAILED(FindRequestHandlerAssembly(struExeLocation)); + m_fDoneAppCreation = TRUE; + FINISHED_IF_FAILED(FindRequestHandlerAssembly(struExeLocation)); if (m_pfnAspNetCoreCreateApplication == NULL) { - RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_INVALID_FUNCTION)); + FINISHED(HRESULT_FROM_WIN32(ERROR_INVALID_FUNCTION)); } - RETURN_IF_FAILED(m_pfnAspNetCoreCreateApplication(m_pServer, pHttpContext->GetApplication(), &pApplication)); + FINISHED_IF_FAILED(m_pfnAspNetCoreCreateApplication(m_pServer, pHttpContext->GetApplication(), &pApplication)); pApplication->SetParameter(L"InProcessExeLocation", struExeLocation.QueryStr()); + m_pApplication = pApplication; } } - return S_OK; +Finished: + + if (FAILED(hr)) + { + // Log the failure and update application info to not try again + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_ERROR_TYPE, + ASPNETCORE_EVENT_ADD_APPLICATION_ERROR, + ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG, + pHttpContext->GetApplication()->GetApplicationId(), + hr); + } + + return hr; } HRESULT @@ -226,7 +254,7 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) if (g_fAspnetcoreRHLoadedError) { - FINISHED_IF_FAILED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); + FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); } else if (!g_fAspnetcoreRHAssemblyLoaded) { @@ -234,7 +262,7 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) if (g_fAspnetcoreRHLoadedError) { - FINISHED_IF_FAILED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); + FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); } if (g_fAspnetcoreRHAssemblyLoaded) { @@ -438,7 +466,7 @@ APPLICATION_INFO::FindNativeAssemblyFromHostfxr( } } - FINISHED_IF_FAILED(hr = struNativeSearchPaths.SyncWithBuffer()); + FINISHED_IF_FAILED(struNativeSearchPaths.SyncWithBuffer()); fFound = FALSE; @@ -526,7 +554,6 @@ APPLICATION_INFO::RecycleApplication() // In process application failed to start for whatever reason, need to recycle the work process m_pServer->RecycleProcess(L"AspNetCore InProcess Recycle Process on Demand"); } - } if (hThread == NULL) diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx index 01d3e0ecfc..e492b53f04 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx @@ -7,6 +7,7 @@ #include "utility.h" #include "resources.h" #include "SRWExclusiveLock.h" +#include "exceptions.h" // The application manager is a singleton across ANCM. APPLICATION_MANAGER* APPLICATION_MANAGER::sm_pApplicationManager = NULL; @@ -47,8 +48,7 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( SRWSharedLock lock(m_srwLock); if (g_fInShutdown) { - hr = HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS); - goto Finished; + FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); } m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); } @@ -56,52 +56,36 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( if (*ppApplicationInfo == NULL) { pApplicationInfo = new APPLICATION_INFO(); - if (pApplicationInfo == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } - hr = pApplicationInfo->Initialize(pServer, pHttpContext->GetApplication(), m_pFileWatcher); - if (FAILED(hr)) - { - goto Finished; - } + FINISHED_IF_FAILED(pApplicationInfo->Initialize(pServer, pHttpContext->GetApplication(), m_pFileWatcher)); SRWExclusiveLock lock(m_srwLock); if (g_fInShutdown) { // Already in shuting down. No need to create the application - hr = HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS); - goto Finished; + FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); } m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); if (*ppApplicationInfo != NULL) { // someone else created the application - goto Finished; - } - - hr = m_pApplicationInfoHash->InsertRecord(pApplicationInfo); - if (FAILED(hr)) - { - goto Finished; + FINISHED(S_OK); } hostingModel = pApplicationInfo->QueryConfig()->QueryHostingModel(); - if (m_pApplicationInfoHash->Count() == 1) + if (m_pApplicationInfoHash->Count() == 0) { m_hostingModel = hostingModel; - pApplicationInfo->UpdateAllowStartStatus(TRUE); + pApplicationInfo->MarkValid(); } else { if (hostingModel == HOSTING_OUT_PROCESS && hostingModel == m_hostingModel) { - pApplicationInfo->UpdateAllowStartStatus(TRUE); + pApplicationInfo->MarkValid(); } else { @@ -116,6 +100,9 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( } } + FINISHED_IF_FAILED(m_pApplicationInfoHash->InsertRecord(pApplicationInfo)); + + *ppApplicationInfo = pApplicationInfo; pApplicationInfo->StartMonitoringAppOffline(); @@ -212,8 +199,7 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( DWORD dwPreviousCounter = 0; APPLICATION_INFO_HASH* table = NULL; CONFIG_CHANGE_CONTEXT context; - BOOL fKeepTable = FALSE; - + if (g_fInShutdown) { // We are already shutting down, ignore this event as a global configuration change event @@ -251,25 +237,9 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( // Removed the applications which are impacted by the configurtion change m_pApplicationInfoHash->DeleteIf(FindConfigChangedApplication, (PVOID)&context); - if (dwPreviousCounter != m_pApplicationInfoHash->Count()) - { - if (m_hostingModel == HOSTING_IN_PROCESS) - { - // When we are inprocess, we need to keep the application the - // application manager that is being deleted. This is because we will always need to recycle the worker - // process and any requests that hit this worker process must be rejected (while out of process can - // start a new dotnet process). We will immediately call Recycle after this call. - DBG_ASSERT(m_pApplicationInfoHash->Count() == 0); - delete m_pApplicationInfoHash; - - // We don't want to delete the table as m_pApplicationInfoHash = table - fKeepTable = TRUE; - m_pApplicationInfoHash = table; - } - } - - if (m_pApplicationInfoHash->Count() == 0) + if (m_pApplicationInfoHash->Count() == 0 && m_hostingModel == HOSTING_OUT_PROCESS) { + // reuse current process m_hostingModel = HOSTING_UNKNOWN; } } @@ -310,7 +280,7 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( } Finished: - if (table != NULL && !fKeepTable) + if (table != NULL) { table->Clear(); delete table; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp index 3f1ea78354..6b8fa8cea7 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp @@ -100,8 +100,6 @@ HRESULT UNREFERENCED_PARAMETER(dwServerVersion); - //LoadGlobalConfiguration(); - InitializeSRWLock(&g_srwLock); g_pModuleId = pModuleInfo->GetId(); @@ -169,43 +167,28 @@ HRESULT // pFactory = new ASPNET_CORE_PROXY_MODULE_FACTORY; - hr = pModuleInfo->SetRequestNotifications( + FINISHED_IF_FAILED(pModuleInfo->SetRequestNotifications( pFactory, RQ_EXECUTE_REQUEST_HANDLER, - 0); - if (FAILED(hr)) - { - goto Finished; - } + 0)); pFactory = NULL; pApplicationManager = APPLICATION_MANAGER::GetInstance(); - hr = pApplicationManager->Initialize(); - if(FAILED(hr)) - { - goto Finished; - } + FINISHED_IF_FAILED(pApplicationManager->Initialize()); + pGlobalModule = NULL; pGlobalModule = new ASPNET_CORE_GLOBAL_MODULE(pApplicationManager); - hr = pModuleInfo->SetGlobalNotifications( - pGlobalModule, - GL_CONFIGURATION_CHANGE | // Configuration change trigers IIS application stop - GL_STOP_LISTENING); // worker process stop or recycle + FINISHED_IF_FAILED(pModuleInfo->SetGlobalNotifications( + pGlobalModule, + GL_CONFIGURATION_CHANGE | // Configuration change trigers IIS application stop + GL_STOP_LISTENING)); // worker process stop or recycle - if (FAILED(hr)) - { - goto Finished; - } pGlobalModule = NULL; - hr = ALLOC_CACHE_HANDLER::StaticInitialize(); - if (FAILED(hr)) - { - goto Finished; - } + FINISHED_IF_FAILED(ALLOC_CACHE_HANDLER::StaticInitialize()); Finished: if (pGlobalModule != NULL) diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index e71a5daf54..6987863616 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -92,18 +92,18 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( hr = pApplicationManager->GetOrCreateApplicationInfo( g_pHttpServer, - pHttpContext, + pHttpContext, &m_pApplicationInfo); if (FAILED(hr)) { goto Finished; } - if (!m_pApplicationInfo->QueryAllowStart()) - { - // Application cannot be started due to wrong hosting mode - // the error should already been logged to window event log for the first request - hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; + if (!m_pApplicationInfo->IsValid()) + { + // Application cannot be started due to wrong hosting mode + // the error should already been logged to window event log for the first request + hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; goto Finished; } diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index 2d4ccee855..a67f753311 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -29,7 +29,6 @@ #define ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG L"Only one inprocess application is allowed per IIS application pool. Please assign the application '%s' to a different IIS application pool." #define ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG L"Mixed hosting model is not supported. Application '%s' configured with different hostingModel value '%d' other than the one of running application(s)." #define ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG L"Failed to start application '%s', ErrorCode '0x%x'." -#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDERR_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x. First 4KB characters of captured stderr logs on startup:\r\n%s" #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x. Last 4KB characters of captured stdout and stderr logs:\r\n%s" #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x. Please check the stderr logs for more information." #define ASPNETCORE_EVENT_APP_IN_SHUTDOWN_MSG L"Application shutting down." diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx index 42d1f2e45f..01a0968b0e 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -25,43 +25,36 @@ HINSTANCE g_hWinHttpModule; HINSTANCE g_hAspNetCoreModule; HANDLE g_hEventLog = NULL; -VOID +HRESULT InitializeGlobalConfiguration( IHttpServer * pServer ) { - BOOL fLocked = FALSE; - if (!g_fGlobalInitialize) { - AcquireSRWLockExclusive(&g_srwLockRH); - fLocked = TRUE; + SRWExclusiveLock lock(g_srwLockRH); - if (g_fGlobalInitialize) + if (!g_fGlobalInitialize) { - // Done by another thread - goto Finished; - } + g_pHttpServer = pServer; + RETURN_IF_FAILED(ALLOC_CACHE_HANDLER::StaticInitialize()); + RETURN_IF_FAILED(IN_PROCESS_HANDLER::StaticInitialize()); - g_pHttpServer = pServer; - if (pServer->IsCommandLineLaunch()) - { - g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); - } - else - { - g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_EVENT_PROVIDER); - } + if (pServer->IsCommandLineLaunch()) + { + g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); + } + else + { + g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_EVENT_PROVIDER); + } - DebugInitialize(); - - g_fGlobalInitialize = TRUE; - } -Finished: - if (fLocked) - { - ReleaseSRWLockExclusive(&g_srwLockRH); + DebugInitialize(); + g_fGlobalInitialize = TRUE; + } } + + return S_OK; } BOOL APIENTRY DllMain(HMODULE hModule, @@ -93,11 +86,12 @@ CreateApplication( _Out_ IAPPLICATION **ppApplication ) { - InitializeGlobalConfiguration(pServer); + REQUESTHANDLER_CONFIG *pConfig = NULL; try { - REQUESTHANDLER_CONFIG *pConfig = NULL; + // Initialze some global variables here + RETURN_IF_FAILED(InitializeGlobalConfiguration(pServer)); RETURN_IF_FAILED(REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpApplication, &pConfig)); auto config = std::unique_ptr(pConfig); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index caf55a20f1..289f587173 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -601,17 +601,20 @@ IN_PROCESS_APPLICATION::LogErrorsOnMainExit( // This will be a common place for errors as it means the hostfxr_main returned // or there was an exception. // - STRA struStdErrOutput; - if (m_pLoggerProvider->GetStdOutContent(&struStdErrOutput)) + STRA straStdErrOutput; + STRU struStdMsg; + if (m_pLoggerProvider->GetStdOutContent(&straStdErrOutput)) { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT, - ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG, - m_pConfig->QueryApplicationPath()->QueryStr(), - m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), - hr, - struStdErrOutput.QueryStr()); + if (SUCCEEDED(struStdMsg.CopyA(straStdErrOutput.QueryStr()))) { + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_ERROR_TYPE, + ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT, + ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG, + m_pConfig->QueryApplicationPath()->QueryStr(), + m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), + hr, + struStdMsg.QueryStr()); + } } else { diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index c80ca92d0c..c0932d87a0 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -157,10 +157,6 @@ private: BOOL m_fInitialized; - // Thread for capturing startup stderr logs when logging is disabled - HANDLE m_hErrThread; - CHAR m_pzFileContents[4096] = { 0 }; - DWORD m_dwStdErrReadTotal; static IN_PROCESS_APPLICATION* s_Application; IOutputManager* m_pLoggerProvider; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 5c7d9571da..98ec620367 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -5,6 +5,8 @@ #include "inprocessapplication.h" #include "aspnetcore_event.h" +ALLOC_CACHE_HANDLER * IN_PROCESS_HANDLER::sm_pAlloc = NULL; + IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( _In_ IHttpContext *pW3Context, _In_ IN_PROCESS_APPLICATION *pApplication @@ -113,3 +115,63 @@ IN_PROCESS_HANDLER::SetManagedHttpContext( { m_pManagedHttpContext = pManagedHttpContext; } + +// static +void * IN_PROCESS_HANDLER::operator new(size_t) +{ + DBG_ASSERT(sm_pAlloc != NULL); + if (sm_pAlloc == NULL) + { + return NULL; + } + return sm_pAlloc->Alloc(); +} + +// static +void IN_PROCESS_HANDLER::operator delete(void * pMemory) +{ + DBG_ASSERT(sm_pAlloc != NULL); + if (sm_pAlloc != NULL) + { + sm_pAlloc->Free(pMemory); + } +} + +// static +HRESULT +IN_PROCESS_HANDLER::StaticInitialize(VOID) +/*++ + +Routine Description: + +Global initialization routine for IN_PROCESS_HANDLER + +Return Value: + +HRESULT + +--*/ +{ + HRESULT hr = S_OK; + + sm_pAlloc = new ALLOC_CACHE_HANDLER; + if (sm_pAlloc == NULL) + { + hr = E_OUTOFMEMORY; + goto Finished; + } + + hr = sm_pAlloc->Initialize(sizeof(IN_PROCESS_HANDLER), + 64); // nThreshold + +Finished: + if (FAILED(hr)) + { + if (sm_pAlloc != NULL) + { + delete sm_pAlloc; + sm_pAlloc = NULL; + } + } + return hr; +} diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h index 256b355ce5..24a29b737f 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h @@ -69,11 +69,20 @@ public: REQUEST_NOTIFICATION_STATUS requestNotificationStatus ); + static void * operator new(size_t size); + + static void operator delete(void * pMemory); + + static + HRESULT + StaticInitialize(VOID); + + private: PVOID m_pManagedHttpContext; BOOL m_fManagedRequestComplete; REQUEST_NOTIFICATION_STATUS m_requestNotificationStatus; - IHttpContext* m_pW3Context; IN_PROCESS_APPLICATION* m_pApplication; + static ALLOC_CACHE_HANDLER * sm_pAlloc; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx index 6c4cd3bdad..77492b07d5 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx @@ -40,6 +40,10 @@ #undef WINVER #undef _WIN32_WINNT +#include +#include +#include + #define NTDDI_VERSION 0x06010000 #define WINVER 0x0601 #define _WIN32_WINNT 0x0601 diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx index 611e8d7e3f..16a3f6357f 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx @@ -214,6 +214,12 @@ EnsureOutOfProcessInitializtion() goto Finished; } + hr = ALLOC_CACHE_HANDLER::StaticInitialize(); + if (FAILED(hr)) + { + goto Finished; + } + hr = FORWARDING_HANDLER::StaticInitialize(g_fEnableReferenceCountTracing); if (FAILED(hr)) { diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp index 149b06edef..bfe689fe58 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp @@ -725,7 +725,7 @@ HRESULT } hr = sm_pAlloc->Initialize(sizeof(FORWARDING_HANDLER), - 64); // nThreshold + 64); // nThreshold if (FAILED(hr)) { goto Finished; @@ -815,6 +815,27 @@ FORWARDING_HANDLER::StaticTerminate() } } +// static +void * FORWARDING_HANDLER::operator new(size_t) +{ + DBG_ASSERT(sm_pAlloc != NULL); + if (sm_pAlloc == NULL) + { + return NULL; + } + return sm_pAlloc->Alloc(); +} + +// static +void FORWARDING_HANDLER::operator delete(void * pMemory) +{ + DBG_ASSERT(sm_pAlloc != NULL); + if (sm_pAlloc != NULL) + { + sm_pAlloc->Free(pMemory); + } +} + HRESULT FORWARDING_HANDLER::GetHeaders( _In_ const PROTOCOL_CONFIG * pProtocol, diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.h index 725b8ea76c..02516c4f71 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.h @@ -72,6 +72,10 @@ public: bool fClientInitiated ); + static void * operator new(size_t size); + + static void operator delete(void * pMemory); + private: VOID From 32e0d136f2ece87c4a1e118cc73a1f87ab2ec5a9 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 27 Jun 2018 11:54:32 -0700 Subject: [PATCH 099/363] Fix null handle issue on full IIS (#973) --- .../RequestHandlerLib/PipeOutputManager.cpp | 48 +++++++++++++------ 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp index 79ec3e356f..8a0cd0074d 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp @@ -5,6 +5,9 @@ #include "exceptions.h" #include "SRWExclusiveLock.h" +#define LOG_IF_DUPFAIL(err) do { if (err == -1) { LOG_IF_FAILED(HRESULT_FROM_WIN32(_doserrno)); } } while (0, 0); +#define LOG_IF_ERRNO(err) do { if (err != 0) { LOG_IF_FAILED(HRESULT_FROM_WIN32(_doserrno)); } } while (0, 0); + PipeOutputManager::PipeOutputManager() : m_dwStdErrReadTotal(0), m_hErrReadPipe(INVALID_HANDLE_VALUE), @@ -41,6 +44,32 @@ PipeOutputManager::StopOutputRedirection() fflush(stdout); fflush(stderr); + // Restore the original stdout and stderr handles of the process, + // as the application has either finished startup or has exited. + + // If stdout/stderr were not set, we need to set it to NUL: + // such that other calls to Console.WriteLine don't use an invalid handle + FILE *stream; + + if (m_fdPreviousStdOut >= 0) + { + _dup2(m_fdPreviousStdOut, _fileno(stdout)); + LOG_IF_DUPFAIL(_dup2(m_fdPreviousStdOut, _fileno(stdout))); + } + else + { + LOG_IF_ERRNO(freopen_s(&stream, "NUL:", "w", stdout)); + } + + if (m_fdPreviousStdErr >= 0) + { + LOG_IF_DUPFAIL(_dup2(m_fdPreviousStdErr, _fileno(stderr))); + } + else + { + LOG_IF_ERRNO(freopen_s(&stream, "NUL:", "w", stderr)); + } + if (m_hErrWritePipe != INVALID_HANDLE_VALUE) { CloseHandle(m_hErrWritePipe); @@ -75,24 +104,10 @@ PipeOutputManager::StopOutputRedirection() m_hErrReadPipe = INVALID_HANDLE_VALUE; } - // Restore the original stdout and stderr handles of the process, - // as the application has either finished startup or has exited. - if (m_fdPreviousStdOut != -1) - { - _dup2(m_fdPreviousStdOut, _fileno(stdout)); - LOG_INFOF("Restoring original stdout of stdout: %d", m_fdPreviousStdOut); - } - - if (m_fdPreviousStdErr != -1) - { - _dup2(m_fdPreviousStdErr, _fileno(stderr)); - LOG_INFOF("Restoring original stdout of stderr: %d", m_fdPreviousStdErr); - } - if (GetStdOutContent(&straStdOutput)) { printf(straStdOutput.QueryStr()); - // Need to flush contents. + // Need to flush contents for the new stdout and stderr _flushall(); } } @@ -104,7 +119,10 @@ HRESULT PipeOutputManager::Start() HANDLE hStdErrWritePipe; m_fdPreviousStdOut = _dup(_fileno(stdout)); + LOG_IF_DUPFAIL(m_fdPreviousStdOut); + m_fdPreviousStdErr = _dup(_fileno(stderr)); + LOG_IF_DUPFAIL(m_fdPreviousStdErr); RETURN_LAST_ERROR_IF(!CreatePipe(&hStdErrReadPipe, &hStdErrWritePipe, &saAttr, 0 /*nSize*/)); From 27780c28badf81b36c48b9ef691a6194a35c16db Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 27 Jun 2018 22:53:30 -0700 Subject: [PATCH 100/363] Do not override error responses (#985) --- .../managedexports.cxx | 3 +- .../Inprocess/ResponseHeaderTests.cs | 28 +++++++++++++++---- test/WebSites/InProcessWebSite/Startup.cs | 6 ++-- test/WebSites/InProcessWebSite/web.config | 6 ++-- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx index 9bc3c9de00..c4860c1acb 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx @@ -94,7 +94,8 @@ http_set_response_status_code( _In_ PCSTR pszReason ) { - return pInProcessHandler->QueryHttpContext()->GetResponse()->SetStatus(statusCode, pszReason); + return pInProcessHandler->QueryHttpContext()->GetResponse()->SetStatus(statusCode, pszReason, 0, 0, nullptr, + true); // fTrySkipCustomErrors } EXTERN_C __MIDL_DECLSPEC_DLLEXPORT diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs index d96a0ae850..09e3688fbf 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.Linq; using System.Net; using System.Threading.Tasks; @@ -51,15 +52,30 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalTheory] - [InlineData(200, "custom", "custom")] - [InlineData(500, "", "Internal Server Error")] - [InlineData(999, "", "")] - public async Task CustomErrorCodeWorks(int code, string reason, string expectedReason) + [InlineData(200, "custom", "custom", null)] + [InlineData(200, "custom", "custom", "Custom body")] + [InlineData(200, "custom", "custom", "")] + + + [InlineData(500, "", "Internal Server Error", null)] + [InlineData(500, "", "Internal Server Error", "Custom body")] + [InlineData(500, "", "Internal Server Error", "")] + + [InlineData(400, "custom", "custom", null)] + [InlineData(400, "", "Bad Request", "Custom body")] + [InlineData(400, "", "Bad Request", "")] + + [InlineData(999, "", "", null)] + [InlineData(999, "", "", "Custom body")] + [InlineData(999, "", "", "")] + public async Task CustomErrorCodeWorks(int code, string reason, string expectedReason, string body) { - var response = await _fixture.Client.GetAsync($"SetCustomErorCode?code={code}&reason={reason}"); + var response = await _fixture.Client.GetAsync($"SetCustomErorCode?code={code}&reason={reason}&writeBody={body != null}&body={body}"); Assert.Equal((HttpStatusCode)code, response.StatusCode); Assert.Equal(expectedReason, response.ReasonPhrase); - Assert.Equal("Body", await response.Content.ReadAsStringAsync()); + + // ReadAsStringAsync returns empty string for empty results + Assert.Equal(body ?? string.Empty, await response.Content.ReadAsStringAsync()); } } } diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index 8d0e49d946..3aaba9b44f 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -214,7 +214,10 @@ namespace IISTestSite var feature = ctx.Features.Get(); feature.ReasonPhrase = ctx.Request.Query["reason"]; feature.StatusCode = int.Parse(ctx.Request.Query["code"]); - await ctx.Response.WriteAsync("Body"); + if (ctx.Request.Query["writeBody"] == "True") + { + await ctx.Response.WriteAsync(ctx.Request.Query["body"]); + } }); } @@ -735,6 +738,5 @@ namespace IISTestSite ctx.RequestServices.GetService().StopApplication(); }); } - } } diff --git a/test/WebSites/InProcessWebSite/web.config b/test/WebSites/InProcessWebSite/web.config index 3e1be0c169..2a9bd223c3 100644 --- a/test/WebSites/InProcessWebSite/web.config +++ b/test/WebSites/InProcessWebSite/web.config @@ -1,10 +1,10 @@ - + - + @@ -13,4 +13,4 @@ - \ No newline at end of file + From 4a09d4795e5c21eef3e07a7eb76d348a5c7a1617 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 28 Jun 2018 09:09:34 -0700 Subject: [PATCH 101/363] Use HandleWrapper and initialize variables for FileOutputManager (#986) --- src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj | 1 + src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp | 7 +++++++ src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h | 3 --- .../InProcessRequestHandler/inprocessapplication.cpp | 1 + .../InProcessRequestHandler/inprocessapplication.h | 2 +- .../InProcessRequestHandler/inprocesshandler.cpp | 1 + .../RequestHandlerLib/FileOutputManager.cpp | 9 ++++++--- .../RequestHandlerLib/FileOutputManager.h | 4 +++- .../RequestHandlerLib/LoggingHelpers.cpp | 5 +++++ .../RequestHandlerLib/LoggingHelpers.h | 2 ++ .../RequestHandlerLib/PipeOutputManager.cpp | 1 + .../RequestHandlerLib/PipeOutputManager.h | 2 ++ .../RequestHandlerLib/requesthandler_config.cpp | 1 + .../RequestHandlerLib/requesthandler_config.h | 1 + src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h | 8 ++------ test/CommonLibTests/FileOutputManagerTests.cpp | 1 + test/CommonLibTests/PipeOutputManagerTests.cpp | 1 + test/CommonLibTests/stdafx.h | 2 -- 18 files changed, 36 insertions(+), 16 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 4ba17f46db..b40c09583c 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -216,6 +216,7 @@ + diff --git a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp new file mode 100644 index 0000000000..fde7d2fd1f --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp @@ -0,0 +1,7 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "HandleWrapper.h" + +// Workaround for VC++ bug https://developercommunity.visualstudio.com/content/problem/33928/constexpr-failing-on-nullptr-v141-compiler-regress.html +const HANDLE InvalidHandleTraits::DefaultHandle = INVALID_HANDLE_VALUE; diff --git a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h index 635d37cf4d..67f980dfd4 100644 --- a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h +++ b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h @@ -12,9 +12,6 @@ struct InvalidHandleTraits static void Close(HANDLE handle) { CloseHandle(handle); } }; -// Workaround for VC++ bug https://developercommunity.visualstudio.com/content/problem/33928/constexpr-failing-on-nullptr-v141-compiler-regress.html -const HANDLE InvalidHandleTraits::DefaultHandle = INVALID_HANDLE_VALUE; - struct NullHandleTraits { using HandleType = HANDLE; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 289f587173..85897d906c 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -11,6 +11,7 @@ #include "EventLog.h" #include "SRWExclusiveLock.h" #include "exceptions.h" +#include "LoggingHelpers.h" IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index c0932d87a0..6b3bfd18a0 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -7,7 +7,7 @@ #include "InProcessApplicationBase.h" #include "inprocesshandler.h" #include "requesthandler_config.h" - +#include "IOutputManager.h" typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_REQUEST_HANDLER) (IN_PROCESS_HANDLER* pInProcessHandler, void* pvRequestHandlerContext); typedef BOOL(WINAPI * PFN_SHUTDOWN_HANDLER) (void* pvShutdownHandlerContext); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 98ec620367..5daf8d3604 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -4,6 +4,7 @@ #include "inprocesshandler.h" #include "inprocessapplication.h" #include "aspnetcore_event.h" +#include "IOutputManager.h" ALLOC_CACHE_HANDLER * IN_PROCESS_HANDLER::sm_pAlloc = NULL; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp index 28d3c47884..3242f96227 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp @@ -2,12 +2,16 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "stdafx.h" +#include "FileOutputManager.h" #include "sttimer.h" #include "utility.h" #include "exceptions.h" #include "debugutil.h" -FileOutputManager::FileOutputManager() +FileOutputManager::FileOutputManager() : + m_hLogFileHandle(INVALID_HANDLE_VALUE), + m_fdPreviousStdOut(0), + m_fdPreviousStdErr(0) { } @@ -19,8 +23,6 @@ FileOutputManager::~FileOutputManager() if (m_hLogFileHandle != INVALID_HANDLE_VALUE) { m_Timer.CancelTimer(); - CloseHandle(m_hLogFileHandle); - m_hLogFileHandle = INVALID_HANDLE_VALUE; } // delete empty log file @@ -122,6 +124,7 @@ FileOutputManager::Start() RETURN_IF_FAILED(UTILITY::EnsureDirectoryPathExist(struPath.QueryStr())); GetSystemTime(&systemTime); + RETURN_IF_FAILED( m_struLogFilePath.SafeSnwprintf(L"%s_%d%02d%02d%02d%02d%02d_%d.log", struPath.QueryStr(), diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h index 184a935596..7f44d92462 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h @@ -4,6 +4,8 @@ #pragma once #include "sttimer.h" +#include "IOutputManager.h" +#include "HandleWrapper.h" class FileOutputManager : public IOutputManager { @@ -20,7 +22,7 @@ public: virtual void NotifyStartupComplete() override; private: - HANDLE m_hLogFileHandle; + HandleWrapper m_hLogFileHandle; STTIMER m_Timer; STRU m_wsStdOutLogFileName; STRU m_wsApplicationPath; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.cpp index 2af111253e..a133172db4 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.cpp @@ -2,6 +2,11 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "stdafx.h" +#include "LoggingHelpers.h" +#include "IOutputManager.h" +#include "FileOutputManager.h" +#include "PipeOutputManager.h" +#include "NullOutputManager.h" HRESULT LoggingHelpers::CreateLoggingProvider( diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.h b/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.h index fb3f55954f..f11a4ff5f5 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.h @@ -3,6 +3,8 @@ #pragma once +#include "IOutputManager.h" + class LoggingHelpers { public: diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp index 8a0cd0074d..5620572c6f 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp @@ -2,6 +2,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "stdafx.h" +#include "PipeOutputManager.h" #include "exceptions.h" #include "SRWExclusiveLock.h" diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h index f51688197c..9a9b306700 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h @@ -3,6 +3,8 @@ #pragma once +#include "IOutputManager.h" + class PipeOutputManager : public IOutputManager { #define PIPE_OUTPUT_THREAD_TIMEOUT 2000 diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp index 9a9a5cdd46..4f5a253f9e 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp @@ -4,6 +4,7 @@ #include "stdafx.h" #include "requesthandler_config.h" #include "debugutil.h" +#include "environmentvariablehash.h" REQUESTHANDLER_CONFIG::~REQUESTHANDLER_CONFIG() { diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h index 60cbd7c8b7..a7369ca0e7 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h @@ -42,6 +42,7 @@ //#define HEX_TO_ASCII(c) ((CHAR)(((c) < 10) ? ((c) + '0') : ((c) + 'a' - 10))) #include "stdafx.h" +#include "environmentvariablehash.h" enum APP_HOSTING_MODEL { diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h b/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h index 094c71d0cd..96c3ffe6de 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h @@ -16,6 +16,7 @@ #include "Shlwapi.h" #include + #include "hashtable.h" #include "stringu.h" #include "stringa.h" @@ -23,10 +24,5 @@ #include "dbgutil.h" #include "ahutil.h" #include "hashfn.h" -#include "environmentvariablehash.h" -#include "IOutputManager.h" -#include "FileOutputManager.h" -#include "PipeOutputManager.h" -#include "NullOutputManager.h" -#include "LoggingHelpers.h" + diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/test/CommonLibTests/FileOutputManagerTests.cpp index 93557c73a3..d0caa524a8 100644 --- a/test/CommonLibTests/FileOutputManagerTests.cpp +++ b/test/CommonLibTests/FileOutputManagerTests.cpp @@ -3,6 +3,7 @@ #include "stdafx.h" #include "gtest/internal/gtest-port.h" +#include "FileOutputManager.h" class FileManagerWrapper { diff --git a/test/CommonLibTests/PipeOutputManagerTests.cpp b/test/CommonLibTests/PipeOutputManagerTests.cpp index 1b16f470d1..e15fa2868a 100644 --- a/test/CommonLibTests/PipeOutputManagerTests.cpp +++ b/test/CommonLibTests/PipeOutputManagerTests.cpp @@ -3,6 +3,7 @@ #include "stdafx.h" #include "gtest/internal/gtest-port.h" +#include "PipeOutputManager.h" class FileManagerWrapper { diff --git a/test/CommonLibTests/stdafx.h b/test/CommonLibTests/stdafx.h index 74af866aa7..33d3008f40 100644 --- a/test/CommonLibTests/stdafx.h +++ b/test/CommonLibTests/stdafx.h @@ -58,5 +58,3 @@ #include "gtest/gtest.h" #include "fakeclasses.h" -\ - From b84a233d39faaa86591695081b0274fbb4ef2ac4 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 28 Jun 2018 11:52:53 -0700 Subject: [PATCH 102/363] Add ability to print debug logs to a file (#954) --- .../AspNetCore/src/dllmain.cpp | 5 +- .../CommonLib/CommonLib.vcxproj | 2 + .../CommonLib/Environment.cpp | 32 ++++++++ .../CommonLib/Environment.h | 17 +++++ .../CommonLib/debugutil.cpp | 73 +++++++++++++++---- src/AspNetCoreModuleV2/CommonLib/debugutil.h | 4 + .../CommonLib/hostfxr_utility.cpp | 33 +-------- .../CommonLib/hostfxr_utility.h | 3 - .../InProcessRequestHandler/dllmain.cxx | 1 + .../OutOfProcessRequestHandler/dllmain.cxx | 1 + .../Inprocess/LoggingTests.cs | 28 ++++++- 11 files changed, 151 insertions(+), 48 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/Environment.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/Environment.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp index 6b8fa8cea7..34d96e45d3 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp @@ -36,6 +36,8 @@ StaticCleanup() DeregisterEventSource(g_hEventLog); g_hEventLog = NULL; } + + DebugStop(); } BOOL WINAPI DllMain(HMODULE hModule, @@ -50,6 +52,7 @@ BOOL WINAPI DllMain(HMODULE hModule, case DLL_PROCESS_ATTACH: g_hModule = hModule; DisableThreadLibraryCalls(hModule); + DebugInitialize(); break; case DLL_PROCESS_DETACH: // IIS can cause dll detach to occur before we receive global notifications @@ -141,8 +144,6 @@ HRESULT RegCloseKey(hKey); } - DebugInitialize(); - if (fDisableANCM) { // Logging diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index b40c09583c..bb34327e27 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -194,6 +194,7 @@ + @@ -214,6 +215,7 @@ + diff --git a/src/AspNetCoreModuleV2/CommonLib/Environment.cpp b/src/AspNetCoreModuleV2/CommonLib/Environment.cpp new file mode 100644 index 0000000000..9746fe2c9b --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/Environment.cpp @@ -0,0 +1,32 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "Environment.h" + +#include + +std::wstring +Environment::ExpandEnvironmentVariables(const std::wstring & str) +{ + DWORD requestedSize = ExpandEnvironmentStringsW(str.c_str(), nullptr, 0); + if (requestedSize == 0) + { + throw std::system_error(GetLastError(), std::system_category(), "ExpandEnvironmentVariables"); + } + + std::wstring expandedStr; + do + { + expandedStr.resize(requestedSize); + requestedSize = ExpandEnvironmentStringsW(str.c_str(), &expandedStr[0], requestedSize); + if (requestedSize == 0) + { + throw std::system_error(GetLastError(), std::system_category(), "ExpandEnvironmentVariables"); + } + } while (expandedStr.size() != requestedSize); + + // trim null character as ExpandEnvironmentStringsW returns size including null character + expandedStr.resize(requestedSize - 1); + + return expandedStr; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/Environment.h b/src/AspNetCoreModuleV2/CommonLib/Environment.h new file mode 100644 index 0000000000..969833d842 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/Environment.h @@ -0,0 +1,17 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include + +class Environment +{ +public: + Environment() = delete; + ~Environment() = delete; + + static + std::wstring ExpandEnvironmentVariables(const std::wstring & str); +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index 293bdfb4e8..d3d6fa6b32 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -7,8 +7,13 @@ #include "dbgutil.h" #include "stringu.h" #include "stringa.h" +#include "dbgutil.h" +#include "Environment.h" +#include "SRWExclusiveLock.h" inline HANDLE g_hStandardOutput; +inline HANDLE g_logFile; +inline SRWLOCK g_logFileLock; VOID DebugInitialize() @@ -46,21 +51,55 @@ DebugInitialize() const size_t environmentVariableValueSize = 2; std::wstring environmentVariableValue(environmentVariableValueSize, '\0'); - if (GetEnvironmentVariable(L"ASPNETCORE_MODULE_DEBUG", environmentVariableValue.data(), environmentVariableValueSize) == environmentVariableValueSize - 1) + try { - try - { - const auto value = std::stoi(environmentVariableValue); + const auto value = std::stoi(Environment::ExpandEnvironmentVariables(L"%ASPNETCORE_MODULE_DEBUG%")); - if (value >= 1) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_ERROR; - if (value >= 2) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_WARNING; - if (value >= 3) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_INFO; - if (value >= 4) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_CONSOLE; - } - catch (...) + if (value >= 1) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_ERROR; + if (value >= 2) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_WARNING; + if (value >= 3) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_INFO; + if (value >= 4) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_CONSOLE; + } + catch (...) + { + // ignore + } + + try + { + const auto debugOutputFile = Environment::ExpandEnvironmentVariables(L"%ASPNETCORE_MODULE_DEBUG_FILE%"); + + if (!debugOutputFile.empty()) { - // ignore + g_logFile = CreateFileW(debugOutputFile.c_str(), + FILE_GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + nullptr, + OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + nullptr + ); + + if (g_logFile != INVALID_HANDLE_VALUE) + { + InitializeSRWLock(&g_logFileLock); + DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_FILE; + } } + + } + catch (...) + { + // ignore + } +} + +VOID +DebugStop() +{ + if (IsEnabled(ASPNETCORE_DEBUG_FLAG_FILE)) + { + CloseHandle(g_logFile); } } @@ -93,11 +132,19 @@ DebugPrint( } OutputDebugStringA( strOutput.QueryStr() ); + DWORD nBytesWritten = 0; if (IsEnabled(ASPNETCORE_DEBUG_FLAG_CONSOLE)) { - DWORD nBytesWritten = 0; - WriteFile(g_hStandardOutput, strOutput.QueryStr(), strOutput.QueryCB(), &nBytesWritten, NULL); + WriteFile(g_hStandardOutput, strOutput.QueryStr(), strOutput.QueryCB(), &nBytesWritten, nullptr); + } + + if (IsEnabled(ASPNETCORE_DEBUG_FLAG_FILE)) + { + SRWExclusiveLock lock(g_logFileLock); + + SetFilePointer(g_logFile, 0, nullptr, FILE_END); + WriteFile(g_logFile, strOutput.QueryStr(), strOutput.QueryCB(), &nBytesWritten, nullptr); } } } diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/AspNetCoreModuleV2/CommonLib/debugutil.h index 5b81d0130b..0a21a6d51a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.h +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.h @@ -10,6 +10,7 @@ #define ASPNETCORE_DEBUG_FLAG_WARNING DEBUG_FLAG_WARN #define ASPNETCORE_DEBUG_FLAG_ERROR DEBUG_FLAG_ERROR #define ASPNETCORE_DEBUG_FLAG_CONSOLE 0x00000008 +#define ASPNETCORE_DEBUG_FLAG_FILE 0x00000008 #define LOG_INFO(...) DebugPrint(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) #define LOG_INFOF(...) DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) @@ -26,6 +27,9 @@ VOID DebugInitialize(); +VOID +DebugStop(); + BOOL IsEnabled( DWORD dwFlag diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index 5746730507..2ebc70966e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -11,6 +11,7 @@ #include "debugutil.h" #include "exceptions.h" #include "HandleWrapper.h" +#include "Environment.h" namespace fs = std::experimental::filesystem; @@ -124,8 +125,8 @@ HOSTFXR_UTILITY::GetHostFxrParameters( pcwzApplicationPhysicalPath); const fs::path applicationPhysicalPath = pcwzApplicationPhysicalPath; - fs::path processPath = ExpandEnvironmentVariables(pcwzProcessPath); - std::wstring arguments = ExpandEnvironmentVariables(pcwzArguments); + fs::path processPath = Environment::ExpandEnvironmentVariables(pcwzProcessPath); + std::wstring arguments = Environment::ExpandEnvironmentVariables(pcwzArguments); if (processPath.is_relative()) { @@ -595,7 +596,7 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() std::optional HOSTFXR_UTILITY::GetAbsolutePathToDotnetFromProgramFiles() { - const auto programFilesDotnet = fs::path(ExpandEnvironmentVariables(L"%ProgramFiles%")) / "dotnet" / "dotnet.exe"; + const auto programFilesDotnet = fs::path(Environment::ExpandEnvironmentVariables(L"%ProgramFiles%")) / "dotnet" / "dotnet.exe"; return is_regular_file(programFilesDotnet) ? std::make_optional(programFilesDotnet) : std::nullopt; } @@ -640,29 +641,3 @@ HOSTFXR_UTILITY::FindDotNetFolders( FindClose(handle); } - -std::wstring -HOSTFXR_UTILITY::ExpandEnvironmentVariables(const std::wstring & str) -{ - DWORD requestedSize = ExpandEnvironmentStringsW(str.c_str(), nullptr, 0); - if (requestedSize == 0) - { - throw std::system_error(GetLastError(), std::system_category(), "ExpandEnvironmentVariables"); - } - - std::wstring expandedStr; - do - { - expandedStr.resize(requestedSize); - requestedSize = ExpandEnvironmentStringsW(str.c_str(), &expandedStr[0], requestedSize); - if (requestedSize == 0) - { - throw std::system_error(GetLastError(), std::system_category(), "ExpandEnvironmentVariables"); - } - } while (expandedStr.size() != requestedSize); - - // trim null character as ExpandEnvironmentStringsW returns size including null character - expandedStr.resize(requestedSize - 1); - - return expandedStr; -} diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index b7dfcbf67c..9b9952f27a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -93,8 +93,5 @@ public: GetAbsolutePathToDotnet( _In_ const std::experimental::filesystem::path & requestedPath ); - - static - std::wstring ExpandEnvironmentVariables(const std::wstring & str); }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx index 01a0968b0e..d0775e1ae7 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -72,6 +72,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, break; case DLL_PROCESS_DETACH: g_fProcessDetach = TRUE; + DebugStop(); default: break; } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx index 16a3f6357f..0a416a4c7b 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx @@ -260,6 +260,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, break; case DLL_PROCESS_DETACH: g_fProcessDetach = TRUE; + DebugStop(); default: break; } diff --git a/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs index defdf6a8a4..611434f560 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -20,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var deploymentParameters = Helpers.GetBaseDeploymentParameters(); deploymentParameters.PublishApplicationBeforeDeployment = true; - deploymentParameters.PreservePublishedApplicationForDebugging = true; // workaround for keeping + deploymentParameters.PreservePublishedApplicationForDebugging = true; // workaround for keeping var deploymentResult = await DeployAsync(deploymentParameters); @@ -64,5 +65,30 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests retryDelayMilliseconds: 100); } } + + [Fact] + public async Task StartupMessagesAreLoggedIntoDebugLogFile() + { + var tempFile = Path.GetTempFileName(); + try + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters(); + deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"] = tempFile; + + var deploymentResult = await DeployAsync(deploymentParameters); + var response = await deploymentResult.RetryingHttpClient.GetAsync("/"); + + StopServer(); + + var logContents = File.ReadAllText(tempFile); + Assert.Contains("[aspnetcore.dll]", logContents); + Assert.Contains("[aspnetcorev2_inprocess.dll]", logContents); + } + finally + { + File.Delete(tempFile); + } + } + } } From a266d3fa27ae22425e601734e918d2c0d83e2b56 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 28 Jun 2018 16:20:21 -0700 Subject: [PATCH 103/363] Update infrastructure for the 2.2 release --- build/repo.props | 1 + korebuild.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/repo.props b/build/repo.props index 68acab72ce..93ca7cd881 100644 --- a/build/repo.props +++ b/build/repo.props @@ -20,6 +20,7 @@ Internal.AspNetCore.Universe.Lineup + 2.2.0-* https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json diff --git a/korebuild.json b/korebuild.json index 4893e52bc4..2624779e51 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,6 +1,6 @@ { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev", + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json", + "channel": "release/2.2", "toolsets": { "visualstudio": { "required": ["Windows"], @@ -14,4 +14,4 @@ ] } } - } \ No newline at end of file + } From 3254386e411d0ffdc5296f28fb2d3c43fa8098bb Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 28 Jun 2018 16:48:53 -0700 Subject: [PATCH 104/363] Bumping version from 2.2.0 to 3.0.0 --- version.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version.props b/version.props index ddf502f2b3..e37dbcf611 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ - + - 2.2.0 - preview1 + 3.0.0 + alpha1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From f5f0988bafa80c3db498fe1cb56ec30560787d60 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 29 Jun 2018 08:44:03 -0700 Subject: [PATCH 105/363] Make handlerSettings optional (#989) --- .../AspNetCore/src/aspnetcore_shim_config.cpp | 5 ++++- src/AspNetCoreModuleV2/CommonLib/config_utility.h | 7 ++++++- src/AspNetCoreModuleV2/CommonLib/debugutil.cpp | 8 ++++---- src/AspNetCoreModuleV2/CommonLib/utility.cxx | 8 +------- test/CommonLibTests/ConfigUtilityTests.cpp | 14 ++++++++++++++ 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp index 0cfc9b4133..9fb17be078 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp @@ -56,7 +56,10 @@ ASPNETCORE_SHIM_CONFIG::Populate( CS_ASPNETCORE_PROCESS_ARGUMENTS, &m_struArguments)); - RETURN_IF_FAILED(ConfigUtility::FindHandlerVersion(pAspNetCoreElement, &m_struHandlerVersion)); + if (m_hostingModel == HOSTING_OUT_PROCESS) + { + RETURN_IF_FAILED(ConfigUtility::FindHandlerVersion(pAspNetCoreElement, &m_struHandlerVersion)); + } return S_OK; } diff --git a/src/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/AspNetCoreModuleV2/CommonLib/config_utility.h index 78efe9a04b..5585d14614 100644 --- a/src/AspNetCoreModuleV2/CommonLib/config_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/config_utility.h @@ -28,7 +28,12 @@ public: STRU strHandlerName; STRU strHandlerValue; - RETURN_IF_FAILED(GetElementChildByName(pElement, CS_ASPNETCORE_HANDLER_SETTINGS,&pHandlerSettings)); + // backwards complatibility with systems not having schema for handlerSettings + if (FAILED_LOG(GetElementChildByName(pElement, CS_ASPNETCORE_HANDLER_SETTINGS, &pHandlerSettings))) + { + return S_OK; + } + RETURN_IF_FAILED(pHandlerSettings->get_Collection(&pHandlerSettingsCollection)); RETURN_IF_FAILED(hr = FindFirstElement(pHandlerSettingsCollection, &index, &pHandlerVar)); diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index d3d6fa6b32..b7fff04a5c 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -67,19 +67,18 @@ DebugInitialize() try { - const auto debugOutputFile = Environment::ExpandEnvironmentVariables(L"%ASPNETCORE_MODULE_DEBUG_FILE%"); + auto debugOutputFile = Environment::ExpandEnvironmentVariables(L"%ASPNETCORE_MODULE_DEBUG_FILE%"); if (!debugOutputFile.empty()) { g_logFile = CreateFileW(debugOutputFile.c_str(), - FILE_GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, + (GENERIC_READ | GENERIC_WRITE), + (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE), nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr ); - if (g_logFile != INVALID_HANDLE_VALUE) { InitializeSRWLock(&g_logFileLock); @@ -145,6 +144,7 @@ DebugPrint( SetFilePointer(g_logFile, 0, nullptr, FILE_END); WriteFile(g_logFile, strOutput.QueryStr(), strOutput.QueryCB(), &nBytesWritten, nullptr); + FlushFileBuffers(g_logFile); } } } diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.cxx b/src/AspNetCoreModuleV2/CommonLib/utility.cxx index b98cc24359..a82a7d18b3 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.cxx +++ b/src/AspNetCoreModuleV2/CommonLib/utility.cxx @@ -572,13 +572,7 @@ UTILITY::LogEvent( ); } - STACK_STRA(converted, 256); - if (converted.CopyW(pstrMsg)) - { - DebugPrintf( - dwEventInfoType == EVENTLOG_ERROR_TYPE ? ASPNETCORE_DEBUG_FLAG_ERROR : ASPNETCORE_DEBUG_FLAG_INFO, - "Event Log: %s", converted.QueryStr()); - } + WDebugPrintf(dwEventInfoType == EVENTLOG_ERROR_TYPE ? ASPNETCORE_DEBUG_FLAG_ERROR : ASPNETCORE_DEBUG_FLAG_INFO, L"Event Log: %s", pstrMsg); } VOID diff --git a/test/CommonLibTests/ConfigUtilityTests.cpp b/test/CommonLibTests/ConfigUtilityTests.cpp index 99ee323f43..dac87240e1 100644 --- a/test/CommonLibTests/ConfigUtilityTests.cpp +++ b/test/CommonLibTests/ConfigUtilityTests.cpp @@ -89,4 +89,18 @@ namespace ConfigUtilityTests EXPECT_EQ(hr, S_OK); EXPECT_STREQ(handlerVersion.QueryStr(), L"value2"); } + + TEST(ConfigUtilityTestSingle, IgnoresFailedGetElement) + { + STRU handlerVersion; + + auto element = std::make_unique>(); + ON_CALL(*element, GetElementByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(nullptr), testing::Return(HRESULT_FROM_WIN32( ERROR_INVALID_INDEX )))); + + HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); + + EXPECT_EQ(hr, S_OK); + EXPECT_STREQ(handlerVersion.QueryStr(), L""); + } } From dfed3d7563726d1fbd2bf528aae2d0012ee63d95 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 29 Jun 2018 11:17:22 -0700 Subject: [PATCH 106/363] Add and use GetEnvironmentVariableValue (#997) --- .../CommonLib/Environment.cpp | 30 ++++++++++++++++++- .../CommonLib/Environment.h | 3 ++ .../CommonLib/debugutil.cpp | 8 ++--- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/Environment.cpp b/src/AspNetCoreModuleV2/CommonLib/Environment.cpp index 9746fe2c9b..316319207c 100644 --- a/src/AspNetCoreModuleV2/CommonLib/Environment.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/Environment.cpp @@ -18,7 +18,7 @@ Environment::ExpandEnvironmentVariables(const std::wstring & str) do { expandedStr.resize(requestedSize); - requestedSize = ExpandEnvironmentStringsW(str.c_str(), &expandedStr[0], requestedSize); + requestedSize = ExpandEnvironmentStringsW(str.c_str(), expandedStr.data(), requestedSize); if (requestedSize == 0) { throw std::system_error(GetLastError(), std::system_category(), "ExpandEnvironmentVariables"); @@ -30,3 +30,31 @@ Environment::ExpandEnvironmentVariables(const std::wstring & str) return expandedStr; } + +std::optional +Environment::GetEnvironmentVariableValue(const std::wstring & str) +{ + DWORD requestedSize = GetEnvironmentVariableW(str.c_str(), nullptr, 0); + if (requestedSize == 0) + { + if (GetLastError() == ERROR_ENVVAR_NOT_FOUND) + { + return std::nullopt; + } + + throw std::system_error(GetLastError(), std::system_category(), "GetEnvironmentVariableW"); + } + + std::wstring expandedStr; + do + { + expandedStr.resize(requestedSize); + requestedSize = GetEnvironmentVariableW(str.c_str(), expandedStr.data(), requestedSize); + if (requestedSize == 0) + { + throw std::system_error(GetLastError(), std::system_category(), "ExpandEnvironmentStringsW"); + } + } while (expandedStr.size() != requestedSize + 1); + + return expandedStr; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/Environment.h b/src/AspNetCoreModuleV2/CommonLib/Environment.h index 969833d842..16022e18cf 100644 --- a/src/AspNetCoreModuleV2/CommonLib/Environment.h +++ b/src/AspNetCoreModuleV2/CommonLib/Environment.h @@ -4,6 +4,7 @@ #pragma once #include +#include class Environment { @@ -13,5 +14,7 @@ public: static std::wstring ExpandEnvironmentVariables(const std::wstring & str); + static + std::optional GetEnvironmentVariableValue(const std::wstring & str); }; diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index b7fff04a5c..189a5097f9 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -53,7 +53,7 @@ DebugInitialize() try { - const auto value = std::stoi(Environment::ExpandEnvironmentVariables(L"%ASPNETCORE_MODULE_DEBUG%")); + const auto value = std::stoi(Environment::GetEnvironmentVariableValue(L"ASPNETCORE_MODULE_DEBUG").value_or(L"0")); if (value >= 1) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_ERROR; if (value >= 2) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_WARNING; @@ -67,11 +67,11 @@ DebugInitialize() try { - auto debugOutputFile = Environment::ExpandEnvironmentVariables(L"%ASPNETCORE_MODULE_DEBUG_FILE%"); + const auto debugOutputFile = Environment::GetEnvironmentVariableValue(L"ASPNETCORE_MODULE_DEBUG_FILE"); - if (!debugOutputFile.empty()) + if (debugOutputFile.has_value()) { - g_logFile = CreateFileW(debugOutputFile.c_str(), + g_logFile = CreateFileW(debugOutputFile.value().c_str(), (GENERIC_READ | GENERIC_WRITE), (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE), nullptr, From 65d3787fc483959166d9ecc75d392dcee7e90a2a Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 29 Jun 2018 12:42:00 -0700 Subject: [PATCH 107/363] Pass parameters to createapplication method (#998) --- .../AspNetCore/Inc/applicationinfo.h | 8 +++++--- .../AspNetCore/src/applicationinfo.cpp | 13 +++++++++++-- .../CommonLib/application.h | 10 ---------- .../CommonLib/iapplication.h | 12 ++++++------ .../InProcessRequestHandler/dllmain.cxx | 16 +++++++++------- .../inprocessapplication.cpp | 17 ++++++++++++++--- .../inprocessapplication.h | 19 ++++--------------- .../OutOfProcessRequestHandler/dllmain.cxx | 4 ++++ .../inprocess_application_tests.cpp | 13 ++++++++----- .../Inprocess/StartupTests.cs | 4 ++++ 10 files changed, 65 insertions(+), 51 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h index 3d9073d013..f6f5890b8e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h @@ -20,9 +20,11 @@ typedef HRESULT (WINAPI * PFN_ASPNETCORE_CREATE_APPLICATION)( - _In_ IHttpServer *pServer, - _In_ IHttpApplication *pHttpApplication, - _Out_ IAPPLICATION **pApplication + _In_ IHttpServer *pServer, + _In_ IHttpApplication *pHttpApplication, + _In_ APPLICATION_PARAMETER *pParameters, + _In_ DWORD nParameters, + _Out_ IAPPLICATION **pApplication ); extern BOOL g_fRecycleProcessCalled; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index eca9c56448..ccbd586f3e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -3,6 +3,7 @@ #include "applicationinfo.h" +#include #include "proxymodule.h" #include "hostfxr_utility.h" #include "utility.h" @@ -222,8 +223,16 @@ APPLICATION_INFO::EnsureApplicationCreated( FINISHED(HRESULT_FROM_WIN32(ERROR_INVALID_FUNCTION)); } - FINISHED_IF_FAILED(m_pfnAspNetCoreCreateApplication(m_pServer, pHttpContext->GetApplication(), &pApplication)); - pApplication->SetParameter(L"InProcessExeLocation", struExeLocation.QueryStr()); + std::array parameters { + {"InProcessExeLocation", struExeLocation.QueryStr()} + }; + + FINISHED_IF_FAILED(m_pfnAspNetCoreCreateApplication( + m_pServer, + pHttpContext->GetApplication(), + parameters.data(), + static_cast(parameters.size()), + &pApplication)); m_pApplication = pApplication; } diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index 6025fdd0fb..0c0752f0c4 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -40,16 +40,6 @@ public: } } - VOID - SetParameter( - _In_ LPCWSTR pzName, - _In_ LPCWSTR pzValue) - override - { - UNREFERENCED_PARAMETER(pzName); - UNREFERENCED_PARAMETER(pzValue); - } - protected: volatile APPLICATION_STATUS m_status = APPLICATION_STATUS::UNKNOWN; diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h index f74ebc021c..dcec7a5e3e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/iapplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -14,6 +14,12 @@ enum APPLICATION_STATUS FAIL }; +struct APPLICATION_PARAMETER +{ + LPCSTR pzName; + PVOID pValue; +}; + class IAPPLICATION { public: @@ -46,10 +52,4 @@ public: CreateHandler( _In_ IHttpContext *pHttpContext, _Out_ IREQUEST_HANDLER **pRequestHandler) = 0; - - virtual - VOID - SetParameter( - _In_ LPCWSTR pzName, - _In_ LPCWSTR pzValue) = 0; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx index d0775e1ae7..20314d34a4 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -82,9 +82,11 @@ BOOL APIENTRY DllMain(HMODULE hModule, HRESULT __stdcall CreateApplication( - _In_ IHttpServer *pServer, - _In_ IHttpApplication *pHttpApplication, - _Out_ IAPPLICATION **ppApplication + _In_ IHttpServer *pServer, + _In_ IHttpApplication *pHttpApplication, + _In_ APPLICATION_PARAMETER *pParameters, + _In_ DWORD nParameters, + _Out_ IAPPLICATION **ppApplication ) { REQUESTHANDLER_CONFIG *pConfig = NULL; @@ -97,11 +99,11 @@ CreateApplication( auto config = std::unique_ptr(pConfig); - BOOL disableStartupPage = pConfig->QueryDisableStartUpErrorPage(); + const bool disableStartupPage = pConfig->QueryDisableStartUpErrorPage(); - auto pApplication = std::make_unique(pServer, std::move(config)); - - if (FAILED(pApplication->LoadManagedApplication())) + auto pApplication = std::make_unique(pServer, std::move(config), pParameters, nParameters); + + if (FAILED_LOG(pApplication->LoadManagedApplication())) { // Set the currently running application to a fake application that returns startup exceptions. *ppApplication = new StartupExceptionApplication(pServer, disableStartupPage); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 85897d906c..a1cf301054 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -13,18 +13,22 @@ #include "exceptions.h" #include "LoggingHelpers.h" +const LPCSTR IN_PROCESS_APPLICATION::s_exeLocationParameterName = "InProcessExeLocation"; + IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL; IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( IHttpServer *pHttpServer, - std::unique_ptr pConfig) : + std::unique_ptr pConfig, + APPLICATION_PARAMETER *pParameters, + DWORD nParameters) : + InProcessApplicationBase(pHttpServer), m_pHttpServer(pHttpServer), m_ProcessExitCode(0), m_fBlockCallbacksIntoManaged(FALSE), - m_fInitialized(FALSE), m_fShutdownCalledFromNative(FALSE), m_fShutdownCalledFromManaged(FALSE), - InProcessApplicationBase(pHttpServer), + m_fInitialized(FALSE), m_pConfig(std::move(pConfig)) { // is it guaranteed that we have already checked app offline at this point? @@ -32,6 +36,13 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( DBG_ASSERT(pHttpServer != NULL); DBG_ASSERT(pConfig != NULL); + for (DWORD i = 0; i < nParameters; i++) + { + if (_stricmp(pParameters[i].pzName, s_exeLocationParameterName) == 0) + { + m_struExeLocation.Copy(reinterpret_cast(pParameters[i].pValue)); + } + } m_status = APPLICATION_STATUS::STARTING; } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index 6b3bfd18a0..034c36fc93 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -18,7 +18,9 @@ class IN_PROCESS_APPLICATION : public InProcessApplicationBase public: IN_PROCESS_APPLICATION( IHttpServer* pHttpServer, - std::unique_ptr pConfig); + std::unique_ptr pConfig, + APPLICATION_PARAMETER *pParameters, + DWORD nParameters); ~IN_PROCESS_APPLICATION(); @@ -42,19 +44,6 @@ public: _Out_ IREQUEST_HANDLER **pRequestHandler) override; - VOID - SetParameter( - _In_ LPCWSTR pzName, - _In_ LPCWSTR pzValue) - override - { - const auto exeLocationParameterName = L"InProcessExeLocation"; - if (_wcsicmp(pzName, exeLocationParameterName) == 0) - { - m_struExeLocation.Copy(pzValue); - } - } - // Executes the .NET Core process HRESULT ExecuteApplication( @@ -162,7 +151,7 @@ private: IOutputManager* m_pLoggerProvider; std::unique_ptr m_pConfig; - + static const LPCSTR s_exeLocationParameterName; static VOID diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx index 0a416a4c7b..c74f3cacaa 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx @@ -272,9 +272,13 @@ __stdcall CreateApplication( _In_ IHttpServer *pServer, _In_ IHttpApplication *pHttpApplication, + _In_ APPLICATION_PARAMETER *pParameters, + _In_ DWORD nParameters, _Out_ IAPPLICATION **ppApplication ) { + UNREFERENCED_PARAMETER(pParameters); + UNREFERENCED_PARAMETER(nParameters); HRESULT hr = S_OK; IAPPLICATION *pApplication = NULL; REQUESTHANDLER_CONFIG *pConfig = NULL; diff --git a/test/CommonLibTests/inprocess_application_tests.cpp b/test/CommonLibTests/inprocess_application_tests.cpp index d362b8f56c..3f1f67e457 100644 --- a/test/CommonLibTests/inprocess_application_tests.cpp +++ b/test/CommonLibTests/inprocess_application_tests.cpp @@ -3,6 +3,7 @@ #include "stdafx.h" +#include #include "inprocessapplication.h" #include "fakeclasses.h" @@ -17,11 +18,13 @@ namespace InprocessTests auto server = new MockHttpServer(); auto requestHandlerConfig = MockRequestHandlerConfig::CreateConfig(); auto config = std::unique_ptr(requestHandlerConfig); - IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, std::move(config)); - { - std::wstring exePath(L"hello"); - app->SetParameter(L"InProcessExeLocation", exePath.c_str()); - } + + std::wstring exePath(L"hello"); + std::array parameters { + {"InProcessExeLocation", exePath.data()} + }; + + IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, std::move(config), parameters.data(), 1); ASSERT_STREQ(app->QueryExeLocation(), L"hello"); } } diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index f848ab910a..051ae6a2dc 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using System.Linq; using System.Net; using System.Threading.Tasks; using IISIntegration.FunctionalTests.Utilities; @@ -77,6 +78,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await AssertStarts( deploymentResult => Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", path), deploymentParameters => deploymentParameters.EnvironmentVariables["PATH"] = Path.GetDirectoryName(_dotnetLocation)); + + // Verify that in this scenario where.exe was invoked only once by shim and request handler uses cached value + Assert.Equal(1, TestSink.Writes.Count(w => w.Message.Contains("Invoking where.exe to find dotnet.exe"))); } private async Task AssertStarts(Action postDeploy, Action preDeploy = null) From dfd75e939d49733fd8dcb0104a7b121671c467f6 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 2 Jul 2018 12:15:15 -0700 Subject: [PATCH 108/363] Add full IIS tests (#979) --- .appveyor.yml | 1 + .../IIS.Performance/PlaintextBenchmark.cs | 2 +- build/dependencies.props | 4 +- .../CommonLib/hostfxr_utility.cpp | 6 +- .../IISIntegration.FunctionalTests.csproj | 2 + .../Inprocess/IISTests.cs | 40 +++ .../Inprocess/TestServerTest.cs | 4 +- .../Utilities/FunctionalTestsBase.cs | 12 +- .../Utilities/IISApplication.cs | 310 ++++++++++++++++++ .../Utilities/IISDeployer.cs | 95 ++++++ .../Utilities/IISDeploymentResult.cs | 3 + ...pIfHostableWebCoreNotAvailibleAttribute.cs | 2 +- .../Utilities/SkipIfIISCannotRunAttribute.cs | 74 +++++ .../Utilities/TestIISUriHelper.cs | 84 +++++ .../Utilities/TestServer.cs | 2 +- 15 files changed, 629 insertions(+), 12 deletions(-) create mode 100644 test/IISIntegration.FunctionalTests/Inprocess/IISTests.cs create mode 100644 test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs create mode 100644 test/IISIntegration.FunctionalTests/Utilities/IISDeployer.cs create mode 100644 test/IISIntegration.FunctionalTests/Utilities/SkipIfIISCannotRunAttribute.cs create mode 100644 test/IISIntegration.FunctionalTests/Utilities/TestIISUriHelper.cs diff --git a/.appveyor.yml b/.appveyor.yml index 8290b9bacd..f46dcc270f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,6 +8,7 @@ branches: install: - ps: .\tools\update_schema.ps1 - git submodule update --init --recursive + - net start w3svc build_script: - ps: .\run.ps1 default-build clone_depth: 1 diff --git a/benchmarks/IIS.Performance/PlaintextBenchmark.cs b/benchmarks/IIS.Performance/PlaintextBenchmark.cs index ff79705756..8c6b4b2cd3 100644 --- a/benchmarks/IIS.Performance/PlaintextBenchmark.cs +++ b/benchmarks/IIS.Performance/PlaintextBenchmark.cs @@ -6,9 +6,9 @@ using System.Net.Http; using System.Text; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; -using IISIntegration.FunctionalTests.Utilities; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.IIS.Performance diff --git a/build/dependencies.props b/build/dependencies.props index 0736961427..106a216654 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) @@ -38,8 +38,10 @@ 2.2.0-preview1-26618-02 2.2.0-preview1-34530 15.6.1 + 11.1.0 2.0.3 4.6.0-preview1-26617-01 + 4.6.0-preview1-26617-01 4.6.0-preview1-26617-01 4.6.0-preview1-26617-01 4.6.0-preview1-26617-01 diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index 2ebc70966e..48eb39e045 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -334,7 +334,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( const fs::path & requestedPath ) { - WLOG_INFOF(L"Resolving absolute path do dotnet.exe from %s", requestedPath.c_str()); + WLOG_INFOF(L"Resolving absolute path to dotnet.exe from %s", requestedPath.c_str()); // // If we are given an absolute path to dotnet.exe, we are done @@ -368,7 +368,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( const auto dotnetViaWhere = InvokeWhereToFindDotnet(); if (dotnetViaWhere.has_value()) { - WLOG_INFOF(L"Found dotnet.exe wia where.exe invocation at %s", dotnetViaWhere.value().c_str()); + WLOG_INFOF(L"Found dotnet.exe via where.exe invocation at %s", dotnetViaWhere.value().c_str()); return dotnetViaWhere; } @@ -394,7 +394,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( std::vector versionFolders; const auto hostFxrBase = dotnetPath.parent_path() / "host" / "fxr"; - WLOG_INFOF(L"Resolving absolute path do hostfxr.dll from %s", dotnetPath.c_str()); + WLOG_INFOF(L"Resolving absolute path to hostfxr.dll from %s", dotnetPath.c_str()); if (!is_directory(hostFxrBase)) { diff --git a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj index 69861d7aa6..544cde26ee 100644 --- a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj +++ b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj @@ -36,7 +36,9 @@ + + diff --git a/test/IISIntegration.FunctionalTests/Inprocess/IISTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/IISTests.cs new file mode 100644 index 0000000000..040f03fcad --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Inprocess/IISTests.cs @@ -0,0 +1,40 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// 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.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [SkipIfIISCannotRun] + public class IISTests : FunctionalTestsBase + { + [ConditionalFact] + public Task HelloWorld_IIS_CoreClr_X64_Standalone() + { + return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Standalone); + } + + [ConditionalFact] + public Task HelloWorld_IIS_CoreClr_X64_Portable() + { + return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable); + } + + private async Task HelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType) + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters(); + deploymentParameters.ServerType = ServerType.IIS; + deploymentParameters.ApplicationType = applicationType; + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal("Hello World", responseText); + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs b/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs index 9c9f9918bb..4b4d3f25c8 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs @@ -1,8 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Diagnostics; -using System.Threading; using System.Threading.Tasks; using IISIntegration.FunctionalTests.Utilities; using Microsoft.AspNetCore.Http; @@ -11,7 +9,7 @@ using Microsoft.Extensions.Logging.Testing; using Xunit; using Xunit.Abstractions; -namespace IISIntegration.FunctionalTests.Inprocess +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [SkipIfHostableWebCoreNotAvailible] public class TestServerTest: LoggedTest diff --git a/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs index 1e739b645a..a30387f0dd 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -21,10 +21,18 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting { if (!parameters.EnvironmentVariables.ContainsKey(DebugEnvironmentVariable)) { - // enable debug output parameters.EnvironmentVariables[DebugEnvironmentVariable] = "4"; } - _deployer = ApplicationDeployerFactory.Create(parameters, LoggerFactory); + + // Currently hosting throws if the Servertype = IIS. + if (parameters.ServerType == ServerType.IIS) + { + _deployer = new IISDeployer(parameters, LoggerFactory); + } + else + { + _deployer = ApplicationDeployerFactory.Create(parameters, LoggerFactory); + } var result = await _deployer.DeployAsync(); diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs b/test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs new file mode 100644 index 0000000000..013c24e376 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs @@ -0,0 +1,310 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.Extensions.CommandLineUtils; +using Microsoft.Extensions.Logging; +using Microsoft.Web.Administration; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + /// + /// Represents the IIS website registered in the global applicationHost.config + /// + internal class IISApplication + { + private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(2); + private static readonly TimeSpan _retryDelay = TimeSpan.FromMilliseconds(100); + private readonly ServerManager _serverManager = new ServerManager(); + private readonly DeploymentParameters _deploymentParameters; + private readonly ILogger _logger; + private readonly string _ancmVersion; + private readonly object _syncLock = new object(); + private readonly string _apphostConfigBackupPath; + private static readonly string _apphostConfigPath = Path.Combine( + Environment.SystemDirectory, + "inetsrv", + "config", + "applicationhost.config"); + + public IISApplication(DeploymentParameters deploymentParameters, ILogger logger) + { + _deploymentParameters = deploymentParameters; + _logger = logger; + _ancmVersion = deploymentParameters.AncmVersion.ToString(); + WebSiteName = CreateTestSiteName(); + AppPoolName = $"{WebSiteName}Pool"; + _apphostConfigBackupPath = Path.Combine( + Environment.SystemDirectory, + "inetsrv", + "config", + $"applicationhost.config.{WebSiteName}backup"); + } + + public string WebSiteName { get; } + + public string AppPoolName { get; } + + public async Task StartIIS(Uri uri, string contentRoot) + { + // Backup currently deployed apphost.config file + using (_logger.BeginScope("StartIIS")) + { + AddTemporaryAppHostConfig(); + var port = uri.Port; + if (port == 0) + { + throw new NotSupportedException("Cannot set port 0 for IIS."); + } + + ConfigureAppPool(contentRoot); + + ConfigureSite(contentRoot, port); + + ConfigureAppHostConfig(contentRoot); + + if (_deploymentParameters.ApplicationType == ApplicationType.Portable) + { + ModifyAspNetCoreSectionInWebConfig("processPath", DotNetMuxer.MuxerPathOrDefault()); + } + + _serverManager.CommitChanges(); + + await WaitUntilSiteStarted(); + } + } + + private void ModifyAspNetCoreSectionInWebConfig(string key, string value) + { + var webConfigFile = Path.Combine(_deploymentParameters.PublishedApplicationRootPath, "web.config"); + var config = XDocument.Load(webConfigFile); + var element = config.Descendants("aspNetCore").FirstOrDefault(); + element.SetAttributeValue(key, value); + config.Save(webConfigFile); + } + + private async Task WaitUntilSiteStarted() + { + var sw = Stopwatch.StartNew(); + + while (sw.Elapsed < _timeout) + { + try + { + var site = _serverManager.Sites.FirstOrDefault(s => s.Name.Equals(WebSiteName)); + if (site.State == ObjectState.Started) + { + _logger.LogInformation($"Site {WebSiteName} has started."); + return; + } + else if (site.State != ObjectState.Starting) + { + _logger.LogInformation($"Site hasn't started with state: {site.State.ToString()}"); + var state = site.Start(); + _logger.LogInformation($"Tried to start site, state: {state.ToString()}"); + } + } + catch (COMException comException) + { + // Accessing the site.State property while the site + // is starting up returns the COMException + // The object identifier does not represent a valid object. + // (Exception from HRESULT: 0x800710D8) + // This also means the site is not started yet, so catch and retry + // after waiting. + _logger.LogWarning($"ComException: {comException.Message}"); + } + + await Task.Delay(_retryDelay); + } + + throw new TimeoutException($"IIS failed to start site."); + } + + public async Task StopAndDeleteAppPool() + { + if (string.IsNullOrEmpty(WebSiteName)) + { + return; + } + + RestoreAppHostConfig(); + + _serverManager.CommitChanges(); + + await WaitUntilSiteStopped(); + } + + private async Task WaitUntilSiteStopped() + { + var site = _serverManager.Sites.Where(element => element.Name == WebSiteName).FirstOrDefault(); + if (site == null) + { + return; + } + + var sw = Stopwatch.StartNew(); + + while (sw.Elapsed < _timeout) + { + try + { + if (site.State == ObjectState.Stopped) + { + _logger.LogInformation($"Site {WebSiteName} has stopped successfully."); + return; + } + } + catch (COMException) + { + // Accessing the site.State property while the site + // is shutdown down returns the COMException + return; + } + + _logger.LogWarning($"IIS has not stopped after {sw.Elapsed.TotalMilliseconds}"); + await Task.Delay(_retryDelay); + } + + throw new TimeoutException($"IIS failed to stop site {site}."); + } + + private void AddTemporaryAppHostConfig() + { + File.Copy(_apphostConfigPath, _apphostConfigBackupPath); + _logger.LogInformation($"Backed up {_apphostConfigPath} to {_apphostConfigBackupPath}"); + } + + private void RestoreAppHostConfig() + { + RetryHelper.RetryOperation( + () => File.Delete(_apphostConfigPath), + e => _logger.LogWarning($"Failed to delete directory : {e.Message}"), + retryCount: 3, + retryDelayMilliseconds: 100); + + File.Move(_apphostConfigBackupPath, _apphostConfigPath); + _logger.LogInformation($"Restored {_apphostConfigPath}."); + } + + private ApplicationPool ConfigureAppPool(string contentRoot) + { + var pool = _serverManager.ApplicationPools.Add(AppPoolName); + pool.ProcessModel.IdentityType = ProcessModelIdentityType.LocalSystem; + pool.ManagedRuntimeVersion = string.Empty; + var envCollection = pool.GetCollection("environmentVariables"); + + AddEnvironmentVariables(contentRoot, envCollection); + + _logger.LogInformation($"Configured AppPool {AppPoolName}"); + return pool; + } + + private void AddEnvironmentVariables(string contentRoot, ConfigurationElementCollection envCollection) + { + foreach (var tuple in _deploymentParameters.EnvironmentVariables) + { + AddEnvironmentVariableToAppPool(envCollection, tuple.Key, tuple.Value); + } + } + + private static void AddEnvironmentVariableToAppPool(ConfigurationElementCollection envCollection, string key, string value) + { + var addElement = envCollection.CreateElement("add"); + addElement["name"] = key; + addElement["value"] = value; + envCollection.Add(addElement); + } + + private Site ConfigureSite(string contentRoot, int port) + { + var site = _serverManager.Sites.Add(WebSiteName, contentRoot, port); + site.Applications.Single().ApplicationPoolName = AppPoolName; + _logger.LogInformation($"Configured Site {WebSiteName} with AppPool {AppPoolName}"); + return site; + } + + private Configuration ConfigureAppHostConfig(string dllRoot) + { + var config = _serverManager.GetApplicationHostConfiguration(); + + SetGlobalModuleSection(config, dllRoot); + + SetModulesSection(config); + + return config; + } + + private void SetGlobalModuleSection(Configuration config, string dllRoot) + { + var ancmFile = GetAncmLocation(dllRoot); + + var globalModulesSection = config.GetSection("system.webServer/globalModules"); + var globalConfigElement = globalModulesSection + .GetCollection() + .Where(element => (string)element["name"] == _ancmVersion) + .FirstOrDefault(); + + if (globalConfigElement == null) + { + _logger.LogInformation($"Could not find {_ancmVersion} section in global modules; creating section."); + var addElement = globalModulesSection.GetCollection().CreateElement("add"); + addElement["name"] = _ancmVersion; + addElement["image"] = ancmFile; + globalModulesSection.GetCollection().Add(addElement); + } + else + { + _logger.LogInformation($"Replacing {_ancmVersion} section in global modules with {ancmFile}"); + globalConfigElement["image"] = ancmFile; + } + } + + private void SetModulesSection(Configuration config) + { + var modulesSection = config.GetSection("system.webServer/modules"); + var moduleConfigElement = modulesSection.GetCollection().Where(element => (string)element["name"] == _ancmVersion).FirstOrDefault(); + if (moduleConfigElement == null) + { + _logger.LogInformation($"Could not find {_ancmVersion} section in modules; creating section."); + var moduleElement = modulesSection.GetCollection().CreateElement("add"); + moduleElement["name"] = _ancmVersion; + modulesSection.GetCollection().Add(moduleElement); + } + } + + private string CreateTestSiteName() + { + if (!string.IsNullOrEmpty(_deploymentParameters.SiteName)) + { + return $"{_deploymentParameters.SiteName}{DateTime.Now.ToString("yyyyMMddHHmmss")}"; + } + else + { + return $"testsite{DateTime.Now.ToString("yyyyMMddHHmmss")}"; + } + } + + private string GetAncmLocation(string dllRoot) + { + var arch = _deploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? @"x64\aspnetcorev2.dll" : @"x86\aspnetcorev2.dll"; + var ancmFile = Path.Combine(dllRoot, arch); + if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) + { + ancmFile = Path.Combine(dllRoot, "aspnetcorev2.dll"); + if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) + { + throw new FileNotFoundException("AspNetCoreModule could not be found.", ancmFile); + } + } + + return ancmFile; + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISDeployer.cs b/test/IISIntegration.FunctionalTests/Utilities/IISDeployer.cs new file mode 100644 index 0000000000..4f0d5252c9 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Utilities/IISDeployer.cs @@ -0,0 +1,95 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.Extensions.Logging; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + /// + /// Deployer for IIS. + /// + public partial class IISDeployer : ApplicationDeployer + { + private IISApplication _application; + private CancellationTokenSource _hostShutdownToken = new CancellationTokenSource(); + + public IISDeployer(DeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) + : base(deploymentParameters, loggerFactory) + { + } + + public override void Dispose() + { + if (_application != null) + { + _application.StopAndDeleteAppPool().GetAwaiter().GetResult(); + + TriggerHostShutdown(_hostShutdownToken); + } + + GetLogsFromFile($"{_application.WebSiteName}.txt"); + GetLogsFromFile("web.config"); + + CleanPublishedOutput(); + InvokeUserApplicationCleanup(); + + StopTimer(); + } + + public override async Task DeployAsync() + { + using (Logger.BeginScope("Deployment")) + { + StartTimer(); + + var contentRoot = string.Empty; + _application = new IISApplication(DeploymentParameters, Logger); + + // For now, only support using published output + DeploymentParameters.PublishApplicationBeforeDeployment = true; + + if (DeploymentParameters.PublishApplicationBeforeDeployment) + { + DotnetPublish(); + contentRoot = DeploymentParameters.PublishedApplicationRootPath; + } + + var uri = TestIISUriHelper.BuildTestUri(ServerType.IIS, DeploymentParameters.ApplicationBaseUriHint); + // To prevent modifying the IIS setup concurrently. + await _application.StartIIS(uri, contentRoot); + + // Warm up time for IIS setup. + Logger.LogInformation("Successfully finished IIS application directory setup."); + + return new DeploymentResult( + LoggerFactory, + DeploymentParameters, + applicationBaseUri: uri.ToString(), + contentRoot: contentRoot, + hostShutdownToken: _hostShutdownToken.Token + ); + } + } + + private void GetLogsFromFile(string file) + { + var arr = new string[0]; + + RetryHelper.RetryOperation(() => arr = File.ReadAllLines(Path.Combine(DeploymentParameters.PublishedApplicationRootPath, file)), + (ex) => Logger.LogError("Could not read log file"), + 5, + 200); + foreach (var line in arr) + { + Logger.LogInformation(line); + } + } + + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISDeploymentResult.cs b/test/IISIntegration.FunctionalTests/Utilities/IISDeploymentResult.cs index 6ea25b89ec..8e39634f2b 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISDeploymentResult.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/IISDeploymentResult.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + using System.Net.Http; using Microsoft.Extensions.Logging; diff --git a/test/IISIntegration.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs b/test/IISIntegration.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs index 046d430317..b21a087321 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs @@ -5,7 +5,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Testing.xunit; -namespace IISIntegration.FunctionalTests.Utilities +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] public sealed class SkipIfHostableWebCoreNotAvailibleAttribute : Attribute, ITestCondition diff --git a/test/IISIntegration.FunctionalTests/Utilities/SkipIfIISCannotRunAttribute.cs b/test/IISIntegration.FunctionalTests/Utilities/SkipIfIISCannotRunAttribute.cs new file mode 100644 index 0000000000..aa6c3abd75 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Utilities/SkipIfIISCannotRunAttribute.cs @@ -0,0 +1,74 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; +using System.Security.Principal; +using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class SkipIfIISCannotRunAttribute : Attribute, ITestCondition + { + private static readonly bool _isMet; + public static readonly string _skipReason; + + public bool IsMet => _isMet; + public string SkipReason => _skipReason; + + static SkipIfIISCannotRunAttribute() + { + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + _skipReason = "IIS tests can only be run on Windows"; + return; + } + + var identity = WindowsIdentity.GetCurrent(); + var principal = new WindowsPrincipal(identity); + if (!principal.IsInRole(WindowsBuiltInRole.Administrator)) + { + _skipReason += "The current console is not running as admin."; + return; + } + + if (!File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "w3wp.exe"))) + { + _skipReason += "The machine does not have IIS installed."; + return; + } + + var ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema_v2.xml"); + + if (!File.Exists(ancmConfigPath)) + { + _skipReason = "IIS Schema is not installed."; + return; + } + + XDocument ancmConfig; + + try + { + ancmConfig = XDocument.Load(ancmConfigPath); + } + catch + { + _skipReason = "Could not read ANCM schema configuration"; + return; + } + + _isMet = ancmConfig + .Root + .Descendants("attribute") + .Any(n => "hostingModel".Equals(n.Attribute("name")?.Value, StringComparison.Ordinal)); + + _skipReason = _isMet ? null : "IIS schema needs to be upgraded to support ANCM."; + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/TestIISUriHelper.cs b/test/IISIntegration.FunctionalTests/Utilities/TestIISUriHelper.cs new file mode 100644 index 0000000000..b8c37ddd93 --- /dev/null +++ b/test/IISIntegration.FunctionalTests/Utilities/TestIISUriHelper.cs @@ -0,0 +1,84 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Net; +using System.Net.Sockets; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + // Copied from Hosting for now https://github.com/aspnet/Hosting/blob/970bc8a30d66dd6894f8f662e5fdab9e68d57777/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/TestUriHelper.cs + internal static class TestIISUriHelper + { + internal static Uri BuildTestUri(ServerType serverType) + { + return BuildTestUri(serverType, hint: null); + } + + internal static Uri BuildTestUri(ServerType serverType, string hint) + { + // Assume status messages are enabled for Kestrel and disabled for all other servers. + return BuildTestUri(serverType, hint, statusMessagesEnabled: serverType == ServerType.Kestrel); + } + + internal static Uri BuildTestUri(ServerType serverType, string hint, bool statusMessagesEnabled) + { + if (string.IsNullOrEmpty(hint)) + { + if (serverType == ServerType.Kestrel && statusMessagesEnabled) + { + // Most functional tests use this codepath and should directly bind to dynamic port "0" and scrape + // the assigned port from the status message, which should be 100% reliable since the port is bound + // once and never released. Binding to dynamic port "0" on "localhost" (both IPv4 and IPv6) is not + // supported, so the port is only bound on "127.0.0.1" (IPv4). If a test explicitly requires IPv6, + // it should provide a hint URL with "localhost" (IPv4 and IPv6) or "[::1]" (IPv6-only). + return new UriBuilder("http", "127.0.0.1", 0).Uri; + } + else + { + // If the server type is not Kestrel, or status messages are disabled, there is no status message + // from which to scrape the assigned port, so the less reliable GetNextPort() must be used. The + // port is bound on "localhost" (both IPv4 and IPv6), since this is supported when using a specific + // (non-zero) port. + return new UriBuilder("http", "localhost", GetNextPort()).Uri; + } + } + else + { + var uriHint = new Uri(hint); + if (uriHint.Port == 0) + { + // Only a few tests use this codepath, so it's fine to use the less reliable GetNextPort() for simplicity. + // The tests using this codepath will be reviewed to see if they can be changed to directly bind to dynamic + // port "0" on "127.0.0.1" and scrape the assigned port from the status message (the default codepath). + return new UriBuilder(uriHint) { Port = GetNextPort() }.Uri; + } + else + { + // If the hint contains a specific port, return it unchanged. + return uriHint; + } + } + } + + // Copied from https://github.com/aspnet/KestrelHttpServer/blob/47f1db20e063c2da75d9d89653fad4eafe24446c/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs#L508 + // + // This method is an attempt to safely get a free port from the OS. Most of the time, + // when binding to dynamic port "0" the OS increments the assigned port, so it's safe + // to re-use the assigned port in another process. However, occasionally the OS will reuse + // a recently assigned port instead of incrementing, which causes flaky tests with AddressInUse + // exceptions. This method should only be used when the application itself cannot use + // dynamic port "0" (e.g. IISExpress). Most functional tests using raw Kestrel + // (with status messages enabled) should directly bind to dynamic port "0" and scrape + // the assigned port from the status message, which should be 100% reliable since the port + // is bound once and never released. + internal static int GetNextPort() + { + using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + socket.Bind(new IPEndPoint(IPAddress.Loopback, 0)); + return ((IPEndPoint)socket.LocalEndPoint).Port; + } + } + } +} diff --git a/test/IISIntegration.FunctionalTests/Utilities/TestServer.cs b/test/IISIntegration.FunctionalTests/Utilities/TestServer.cs index 10f526f860..6cd61b1459 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/TestServer.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/TestServer.cs @@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace IISIntegration.FunctionalTests.Utilities +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class TestServer: IDisposable, IStartup { From 7d8599ed5cbb870b1b03921312ff0d2faa8eeecd Mon Sep 17 00:00:00 2001 From: "Nate McMaster (automated)" Date: Mon, 2 Jul 2018 12:40:23 -0700 Subject: [PATCH 109/363] [automated] Change default branch to master --- .appveyor.yml | 18 +++++++++--------- korebuild.json | 6 +++--- run.ps1 | 6 +++--- run.sh | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 8290b9bacd..ebd2d12d89 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,20 +1,20 @@ init: - - git config --global core.autocrlf true +- git config --global core.autocrlf true branches: only: - - dev - - /^release\/.*$/ - - /^(.*\/)?ci-.*$/ + - master + - /^release\/.*$/ + - /^(.*\/)?ci-.*$/ install: - - ps: .\tools\update_schema.ps1 - - git submodule update --init --recursive +- ps: .\tools\update_schema.ps1 +- git submodule update --init --recursive build_script: - - ps: .\run.ps1 default-build +- ps: .\run.ps1 default-build clone_depth: 1 environment: global: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: 1 -test: off -deploy: off +test: 'off' +deploy: 'off' os: Visual Studio 2017 diff --git a/korebuild.json b/korebuild.json index 4893e52bc4..b76e84272b 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,6 +1,6 @@ { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev", + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", + "channel": "master", "toolsets": { "visualstudio": { "required": ["Windows"], @@ -14,4 +14,4 @@ ] } } - } \ No newline at end of file + } diff --git a/run.ps1 b/run.ps1 index 3b27382468..34604c7175 100644 --- a/run.ps1 +++ b/run.ps1 @@ -52,8 +52,8 @@ in the file are overridden by command line parameters. Example config file: ```json { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev", + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", + "channel": "master", "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" } ``` @@ -192,7 +192,7 @@ if (!$DotNetHome) { else { Join-Path $PSScriptRoot '.dotnet'} } -if (!$Channel) { $Channel = 'dev' } +if (!$Channel) { $Channel = 'master' } if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } # Execute diff --git a/run.sh b/run.sh index 02aac15874..61f7a53385 100755 --- a/run.sh +++ b/run.sh @@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" fi -[ -z "$channel" ] && channel='dev' +[ -z "$channel" ] && channel='master' [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' get_korebuild From 9b7ee920289cf18fdcbd4e1b7d89d208835e9385 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 2 Jul 2018 17:18:05 -0700 Subject: [PATCH 110/363] Check thread invalid handle and remove extra dup2 call. (#1008) --- .../RequestHandlerLib/PipeOutputManager.cpp | 12 ++++++----- .../CommonLibTests/PipeOutputManagerTests.cpp | 20 +++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp index 5620572c6f..e8b61a962b 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp @@ -13,7 +13,7 @@ PipeOutputManager::PipeOutputManager() : m_dwStdErrReadTotal(0), m_hErrReadPipe(INVALID_HANDLE_VALUE), m_hErrWritePipe(INVALID_HANDLE_VALUE), - m_hErrThread(INVALID_HANDLE_VALUE), + m_hErrThread(NULL), m_fDisposed(FALSE) { InitializeSRWLock(&m_srwLock); @@ -54,7 +54,6 @@ PipeOutputManager::StopOutputRedirection() if (m_fdPreviousStdOut >= 0) { - _dup2(m_fdPreviousStdOut, _fileno(stdout)); LOG_IF_DUPFAIL(_dup2(m_fdPreviousStdOut, _fileno(stdout))); } else @@ -79,7 +78,6 @@ PipeOutputManager::StopOutputRedirection() // GetExitCodeThread returns 0 on failure; thread status code is invalid. if (m_hErrThread != NULL && - m_hErrThread != INVALID_HANDLE_VALUE && !LOG_LAST_ERROR_IF(GetExitCodeThread(m_hErrThread, &dwThreadStatus) == 0) && dwThreadStatus == STILL_ACTIVE) { @@ -96,8 +94,12 @@ PipeOutputManager::StopOutputRedirection() } } - CloseHandle(m_hErrThread); - m_hErrThread = NULL; + if (m_hErrThread != NULL) + { + CloseHandle(m_hErrThread); + m_hErrThread = NULL; + } + if (m_hErrReadPipe != INVALID_HANDLE_VALUE) { diff --git a/test/CommonLibTests/PipeOutputManagerTests.cpp b/test/CommonLibTests/PipeOutputManagerTests.cpp index e15fa2868a..67ce9f2f04 100644 --- a/test/CommonLibTests/PipeOutputManagerTests.cpp +++ b/test/CommonLibTests/PipeOutputManagerTests.cpp @@ -32,6 +32,26 @@ namespace PipeOutputManagerTests pManager->NotifyStartupComplete(); + } + + TEST(PipeManagerOutputTest, SetInvalidHandlesForErrAndOut) + { + auto m_fdPreviousStdOut = _dup(_fileno(stdout)); + auto m_fdPreviousStdErr = _dup(_fileno(stderr)); + + SetStdHandle(STD_ERROR_HANDLE, INVALID_HANDLE_VALUE); + SetStdHandle(STD_OUTPUT_HANDLE, INVALID_HANDLE_VALUE); + + PCWSTR expected = L"test"; + + PipeOutputManager* pManager = new PipeOutputManager(); + ASSERT_EQ(S_OK, pManager->Start()); + + pManager->NotifyStartupComplete(); + + _dup2(m_fdPreviousStdOut, _fileno(stdout)); + _dup2(m_fdPreviousStdErr, _fileno(stderr)); + // Test will fail if we didn't redirect stdout back to a file descriptor. // This is because gtest relies on console output to know if a test succeeded or failed. // If the output still points to a file/pipe, the test (and all other tests after it) will fail. From 3efc1eede43ac046f4956838db90095402b26eb2 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 2 Jul 2018 18:21:22 -0700 Subject: [PATCH 111/363] Set correct event providers for ANCM V2 (#1009) --- .../AspNetCore/Inc/aspnetcore_shim_config.h | 7 ------- src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp | 2 +- src/AspNetCoreModuleV2/CommonLib/resources.h | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h index 3fde28273f..5229f95b79 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h @@ -38,12 +38,6 @@ public: return &m_struApplicationPhysicalPath; } - STRU* - QueryApplicationPath() - { - return &m_struApplication; - } - STRU* QueryConfigPath() { @@ -83,7 +77,6 @@ private: STRU m_struArguments; STRU m_struProcessPath; - STRU m_struApplication; STRU m_struApplicationPhysicalPath; STRU m_struConfigPath; APP_HOSTING_MODEL m_hostingModel; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index ccbd586f3e..b1bcc464c3 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -153,7 +153,7 @@ APPLICATION_INFO::UpdateAppOfflineFileHandle() STACK_STRU(strEventMsg, 256); if (SUCCEEDED(strEventMsg.SafeSnwprintf( ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG, - m_pConfiguration->QueryApplicationPath()->QueryStr()))) + m_pConfiguration->QueryApplicationPhysicalPath()->QueryStr()))) { UTILITY::LogEvent(g_hEventLog, EVENTLOG_INFORMATION_TYPE, diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index a67f753311..153af6d3d0 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -8,8 +8,8 @@ #define IDS_INVALID_PROPERTY 1000 #define IDS_SERVER_ERROR 1001 -#define ASPNETCORE_EVENT_PROVIDER L"IIS AspNetCore Module" -#define ASPNETCORE_IISEXPRESS_EVENT_PROVIDER L"IIS Express AspNetCore Module" +#define ASPNETCORE_EVENT_PROVIDER L"IIS AspNetCore Module V2" +#define ASPNETCORE_IISEXPRESS_EVENT_PROVIDER L"IIS Express AspNetCore Module V2" #define ASPNETCORE_EVENT_MSG_BUFFER_SIZE 256 #define ASPNETCORE_EVENT_PROCESS_START_SUCCESS_MSG L"Application '%s' started process '%d' successfully and process '%d' is listening on port '%d'." From c291d80c19ea66b3afd2d0e7926987274e03d4e2 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 3 Jul 2018 16:15:12 +0000 Subject: [PATCH 112/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 56 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 0736961427..3548f304ae 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,39 +4,39 @@ 0.10.13 - 2.2.0-preview1-17090 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 0.6.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 + 3.0.0-alpha1-10000 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 0.7.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 15.6.82 15.6.82 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 + 3.0.0-alpha1-10016 2.0.0 2.1.0 2.2.0-preview1-26618-02 - 2.2.0-preview1-34530 + 3.0.0-alpha1-10016 15.6.1 2.0.3 4.6.0-preview1-26617-01 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 3e694b2ed8..3f870e51fe 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17090 -commithash:b19e903e946579cd9482089bce7d917e8bacd765 +version:3.0.0-alpha1-10000 +commithash:b7b88d08d55abc8b71de9abf16e26fc713e332cd From e7d36a42e6b7b96451e38c6142445fe0371c1f91 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 3 Jul 2018 16:27:28 -0700 Subject: [PATCH 113/363] Only add environment variables if we are running on win8.1 or above. (#1007) --- .../Utilities/IISApplication.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs b/test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs index 013c24e376..faba405c06 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs @@ -198,19 +198,27 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting var pool = _serverManager.ApplicationPools.Add(AppPoolName); pool.ProcessModel.IdentityType = ProcessModelIdentityType.LocalSystem; pool.ManagedRuntimeVersion = string.Empty; - var envCollection = pool.GetCollection("environmentVariables"); - AddEnvironmentVariables(contentRoot, envCollection); + AddEnvironmentVariables(contentRoot, pool); _logger.LogInformation($"Configured AppPool {AppPoolName}"); return pool; } - private void AddEnvironmentVariables(string contentRoot, ConfigurationElementCollection envCollection) + private void AddEnvironmentVariables(string contentRoot, ApplicationPool pool) { - foreach (var tuple in _deploymentParameters.EnvironmentVariables) + try { - AddEnvironmentVariableToAppPool(envCollection, tuple.Key, tuple.Value); + var envCollection = pool.GetCollection("environmentVariables"); + + foreach (var tuple in _deploymentParameters.EnvironmentVariables) + { + AddEnvironmentVariableToAppPool(envCollection, tuple.Key, tuple.Value); + } + } + catch (COMException comException) + { + _logger.LogInformation($"Could not add environment variables to worker process: {comException.Message}"); } } From 3bdb33ccd4dbe5baa3162ca3d3778df1883db093 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 3 Jul 2018 16:46:39 -0700 Subject: [PATCH 114/363] Sync native calls --- .../Core/IISHttpContext.FeatureCollection.cs | 9 ++- .../Core/IISHttpContext.cs | 20 ++--- .../Core/IO/AsyncIOEngine.cs | 10 ++- .../Core/IO/WebSocketsAsyncIOEngine.cs | 79 +++++++++++-------- .../NativeMethods.cs | 13 +-- 5 files changed, 67 insertions(+), 64 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs index 05c376de0e..a2cd22d113 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs @@ -182,7 +182,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core bool IHttpResponseFeature.HasStarted => HasResponseStarted; - bool IHttpUpgradeFeature.IsUpgradableRequest => _server.IsWebSocketAvailable(_pInProcessHandler); + bool IHttpUpgradeFeature.IsUpgradableRequest => true; bool IFeatureCollection.IsReadOnly => false; @@ -205,7 +205,10 @@ namespace Microsoft.AspNetCore.Server.IIS.Core return null; } - return NativeMethods.HttpTryGetServerVariable(_pInProcessHandler, variableName, out var value) ? value : null; + lock (_contextLock) + { + return NativeMethods.HttpTryGetServerVariable(_pInProcessHandler, variableName, out var value) ? value : null; + } } } @@ -265,7 +268,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core _hasRequestReadingStarted = false; // Upgrade async will cause the stream processing to go into duplex mode - AsyncIO = new WebSocketsAsyncIOEngine(_pInProcessHandler); + AsyncIO = new WebSocketsAsyncIOEngine(_contextLock, _pInProcessHandler); await InitializeResponse(flushHeaders: true); diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs index 1866967527..15c69432ed 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs @@ -28,7 +28,6 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private const int PauseWriterThreshold = 65536; private const int ResumeWriterTheshold = PauseWriterThreshold / 2; - protected readonly IntPtr _pInProcessHandler; private readonly IISServerOptions _options; @@ -38,8 +37,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private int _statusCode; private string _reasonPhrase; - private readonly object _onStartingSync = new object(); - private readonly object _onCompletedSync = new object(); + // Used to synchronize callback registration and native method calls + private readonly object _contextLock = new object(); protected Stack, object>> _onStarting; protected Stack, object>> _onCompleted; @@ -241,7 +240,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core // If at this point request was not upgraded just start a normal IO engine if (AsyncIO == null) { - AsyncIO = new AsyncIOEngine(_pInProcessHandler); + AsyncIO = new AsyncIOEngine(_contextLock, _pInProcessHandler); } } @@ -341,7 +340,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core public void OnStarting(Func callback, object state) { - lock (_onStartingSync) + lock (_contextLock) { if (HasResponseStarted) { @@ -358,7 +357,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core public void OnCompleted(Func callback, object state) { - lock (_onCompletedSync) + lock (_contextLock) { if (_onCompleted == null) { @@ -371,7 +370,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core protected async Task FireOnStarting() { Stack, object>> onStarting = null; - lock (_onStartingSync) + lock (_contextLock) { onStarting = _onStarting; _onStarting = null; @@ -395,7 +394,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core protected async Task FireOnCompleted() { Stack, object>> onCompleted = null; - lock (_onCompletedSync) + lock (_contextLock) { onCompleted = _onCompleted; _onCompleted = null; @@ -438,11 +437,6 @@ namespace Microsoft.AspNetCore.Server.IIS.Core NativeMethods.HttpPostCompletion(_pInProcessHandler, 0); } - public void IndicateCompletion(NativeMethods.REQUEST_NOTIFICATION_STATUS notificationStatus) - { - NativeMethods.HttpIndicateCompletion(_pInProcessHandler, notificationStatus); - } - internal void OnAsyncCompletion(int hr, int bytes) { AsyncIO.NotifyCompletion(hr, bytes); diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs index 614367255a..b07d411630 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs @@ -12,6 +12,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO { internal partial class AsyncIOEngine : IAsyncIOEngine { + private readonly object _contextSync; private readonly IntPtr _handler; private bool _stopped; @@ -23,8 +24,9 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO private AsyncWriteOperation _cachedAsyncWriteOperation; private AsyncFlushOperation _cachedAsyncFlushOperation; - public AsyncIOEngine(IntPtr handler) + public AsyncIOEngine(object contextSync, IntPtr handler) { + this._contextSync = contextSync; _handler = handler; } @@ -46,7 +48,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO private void Run(AsyncIOOperation ioOperation) { - lock (this) + lock (_contextSync) { if (_stopped) { @@ -99,7 +101,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO AsyncIOOperation.AsyncContinuation continuation; AsyncIOOperation.AsyncContinuation? nextContinuation = null; - lock (this) + lock (_contextSync) { Debug.Assert(_runningOperation != null); @@ -135,7 +137,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO public void Dispose() { - lock (this) + lock (_contextSync) { _stopped = true; NativeMethods.HttpTryCancelIO(_handler); diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs index 0c04523cb0..38c737dbce 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs @@ -10,6 +10,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO { internal partial class WebSocketsAsyncIOEngine: IAsyncIOEngine { + private readonly object _contextLock; + private readonly IntPtr _handler; private bool _isInitialized; @@ -22,55 +24,65 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO private AsyncInitializeOperation _cachedAsyncInitializeOperation; - public WebSocketsAsyncIOEngine(IntPtr handler) + public WebSocketsAsyncIOEngine(object contextLock, IntPtr handler) { + _contextLock = contextLock; _handler = handler; } public ValueTask ReadAsync(Memory memory) { - ThrowIfNotInitialized(); + lock (_contextLock) + { + ThrowIfNotInitialized(); - var read = GetReadOperation(); - read.Initialize(_handler, memory); - read.Invoke(); - return new ValueTask(read, 0); + var read = GetReadOperation(); + read.Initialize(_handler, memory); + read.Invoke(); + return new ValueTask(read, 0); + } } public ValueTask WriteAsync(ReadOnlySequence data) { - ThrowIfNotInitialized(); + lock (_contextLock) + { + ThrowIfNotInitialized(); - var write = GetWriteOperation(); - write.Initialize(_handler, data); - write.Invoke(); - return new ValueTask(write, 0); + var write = GetWriteOperation(); + write.Initialize(_handler, data); + write.Invoke(); + return new ValueTask(write, 0); + } } public ValueTask FlushAsync() { - if (_isInitialized) + lock (_contextLock) { - return new ValueTask(Task.CompletedTask); + if (_isInitialized) + { + return new ValueTask(Task.CompletedTask); + } + + NativeMethods.HttpEnableWebsockets(_handler); + + var init = GetInitializeOperation(); + init.Initialize(_handler); + + var continuation = init.Invoke(); + + if (continuation != null) + { + _isInitialized = true; + } + else + { + _initializationFlush = init; + } + + return new ValueTask(init, 0); } - - NativeMethods.HttpEnableWebsockets(_handler); - - var init = GetInitializeOperation(); - init.Initialize(_handler); - - var continuation = init.Invoke(); - - if (continuation != null) - { - _isInitialized = true; - } - else - { - _initializationFlush = init; - } - - return new ValueTask(init, 0); } public void NotifyCompletion(int hr, int bytes) @@ -100,7 +112,10 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO public void Dispose() { - NativeMethods.HttpTryCancelIO(_handler); + lock (_contextLock) + { + NativeMethods.HttpTryCancelIO(_handler); + } } private WebSocketReadOperation GetReadOperation() => diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs index 55b8084e59..de7bcb0562 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs @@ -70,9 +70,6 @@ namespace Microsoft.AspNetCore.Server.IIS [DllImport(AspNetCoreModuleDll)] private static extern int http_stop_incoming_requests(IntPtr pInProcessApplication); - [DllImport(AspNetCoreModuleDll)] - private static extern unsafe HttpApiTypes.HTTP_RESPONSE_V2* http_get_raw_response(IntPtr pInProcessHandler); - [DllImport(AspNetCoreModuleDll, CharSet = CharSet.Ansi)] private static extern int http_set_response_status_code(IntPtr pInProcessHandler, ushort statusCode, string pszReason); @@ -138,10 +135,6 @@ namespace Microsoft.AspNetCore.Server.IIS Validate(http_set_completion_status(pInProcessHandler, rquestNotificationStatus)); } - public static void HttpIndicateCompletion(IntPtr pInProcessHandler, REQUEST_NOTIFICATION_STATUS notificationStatus) - { - http_indicate_completion(pInProcessHandler, notificationStatus); - } public static void HttpRegisterCallbacks(IntPtr pInProcessApplication, PFN_REQUEST_HANDLER requestCallback, PFN_SHUTDOWN_HANDLER shutdownCallback, PFN_ASYNC_COMPLETION asyncCallback, IntPtr pvRequestContext, IntPtr pvShutdownContext) { Validate(register_callbacks(pInProcessApplication, requestCallback, shutdownCallback, asyncCallback, pvRequestContext, pvShutdownContext)); @@ -156,6 +149,7 @@ namespace Microsoft.AspNetCore.Server.IIS { return http_flush_response_bytes(pInProcessHandler, out fCompletionExpected); } + public static unsafe HttpApiTypes.HTTP_REQUEST_V2* HttpGetRawRequest(IntPtr pInProcessHandler) { return http_get_raw_request(pInProcessHandler); @@ -171,11 +165,6 @@ namespace Microsoft.AspNetCore.Server.IIS Validate(http_stop_incoming_requests(pInProcessApplication)); } - public static unsafe HttpApiTypes.HTTP_RESPONSE_V2* HttpGetRawResponse(IntPtr pInProcessHandler) - { - return http_get_raw_response(pInProcessHandler); - } - public static void HttpSetResponseStatusCode(IntPtr pInProcessHandler, ushort statusCode, string pszReason) { Validate(http_set_response_status_code(pInProcessHandler, statusCode, pszReason)); From 724cc3ce88233fa37a01fe447afed2c00c6711bf Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 3 Jul 2018 16:49:24 -0700 Subject: [PATCH 115/363] Only run fallback logic for dotnet and dotnet.exe (#1004) --- .../CommonLib/hostfxr_utility.cpp | 21 ++++++++++++------- .../CommonLib/hostfxr_utility.h | 1 + .../Inprocess/StartupTests.cs | 14 ++++++------- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index 48eb39e045..cf703d34a0 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -128,11 +128,6 @@ HOSTFXR_UTILITY::GetHostFxrParameters( fs::path processPath = Environment::ExpandEnvironmentVariables(pcwzProcessPath); std::wstring arguments = Environment::ExpandEnvironmentVariables(pcwzArguments); - if (processPath.is_relative()) - { - processPath = applicationPhysicalPath / processPath; - } - // Check if the absolute path is to dotnet or not. if (IsDotnetExecutable(processPath)) { @@ -143,7 +138,7 @@ HOSTFXR_UTILITY::GetHostFxrParameters( // Get the absolute path to dotnet. If the path is already an absolute path, it will return that path // // Make sure to append the dotnet.exe path correctly here (pass in regular path)? - auto fullProcessPath = GetAbsolutePathToDotnet(processPath); + auto fullProcessPath = GetAbsolutePathToDotnet(applicationPhysicalPath, processPath); if (!fullProcessPath.has_value()) { return E_FAIL; @@ -172,6 +167,11 @@ HOSTFXR_UTILITY::GetHostFxrParameters( { WLOG_INFOF(L"Process path %s is not dotnet, treating application as standalone", processPath.c_str()); + if (processPath.is_relative()) + { + processPath = applicationPhysicalPath / processPath; + } + // // The processPath is a path to the application executable // like: C:\test\MyApp.Exe or MyApp.Exe @@ -331,11 +331,18 @@ Finished: std::optional HOSTFXR_UTILITY::GetAbsolutePathToDotnet( + const fs::path & applicationPath, const fs::path & requestedPath ) { WLOG_INFOF(L"Resolving absolute path to dotnet.exe from %s", requestedPath.c_str()); + auto processPath = requestedPath; + if (processPath.is_relative()) + { + processPath = applicationPath / processPath; + } + // // If we are given an absolute path to dotnet.exe, we are done // @@ -360,7 +367,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( // If we encounter any failures, try getting dotnet.exe from the // backup location. // Only do it if no path is specified - if (!requestedPath.has_parent_path()) + if (requestedPath.has_parent_path()) { return std::nullopt; } diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index 9b9952f27a..dfdeb08b3a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -91,6 +91,7 @@ public: static std::optional GetAbsolutePathToDotnet( + _In_ const std::experimental::filesystem::path & applicationPath, _In_ const std::experimental::filesystem::path & requestedPath ); }; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index 051ae6a2dc..eda231066a 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -33,20 +33,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests deploymentParameters => deploymentParameters.EnvironmentVariables["DotnetPath"] = _dotnetLocation); } - [ConditionalFact] - public async Task InvalidProcessPath_ExpectServerError() + [ConditionalTheory] + [InlineData("bogus")] + [InlineData("c:\\random files\\dotnet.exe")] + [InlineData(".\\dotnet.exe")] + public async Task InvalidProcessPath_ExpectServerError(string path) { - var dotnetLocation = "bogus"; - var deploymentParameters = GetBaseDeploymentParameters(); - // Point to dotnet installed in user profile. - deploymentParameters.EnvironmentVariables["DotnetPath"] = Environment.ExpandEnvironmentVariables(dotnetLocation); // Path to dotnet. var deploymentResult = await DeployAsync(deploymentParameters); - Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", "%DotnetPath%"); + Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", path); - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); From b280597c689e5e4ae457d8050cda999b5b93f738 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 5 Jul 2018 09:01:47 -0700 Subject: [PATCH 116/363] fb --- .../Core/IISHttpContext.FeatureCollection.cs | 1 + src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs index a2cd22d113..4c2d4342b9 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs @@ -205,6 +205,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core return null; } + // Synchronize access to native methods that might run in parallel with IO loops lock (_contextLock) { return NativeMethods.HttpTryGetServerVariable(_pInProcessHandler, variableName, out var value) ? value : null; diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs index b07d411630..e7a01b331d 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs @@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO public AsyncIOEngine(object contextSync, IntPtr handler) { - this._contextSync = contextSync; + _contextSync = contextSync; _handler = handler; } From 5f02de1e2c9963bc4e108c1309f0477b5250f738 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 6 Jul 2018 11:36:51 -0700 Subject: [PATCH 117/363] Test --- .../AspNetCore/src/applicationinfo.cpp | 6 ----- .../Inprocess/ServerVariablesTest.cs | 26 +++++++++++++++++++ test/WebSites/InProcessWebSite/Startup.cs | 16 ++++++++++++ 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index ccbd586f3e..2919b7cf4c 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -187,12 +187,6 @@ APPLICATION_INFO::EnsureApplicationCreated( // one optimization for failure scenario is to reduce the lock scope SRWExclusiveLock lock(m_srwLock); - if (m_fDoneAppCreation) - { - // application is NULL and CreateApplication failed previously - FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); - } - else { if (m_pApplication != NULL) { diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs b/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs index 56b04c208e..020ef00213 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.Collections.Generic; +using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; @@ -38,5 +40,29 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { Assert.DoesNotContain(@"\\?\", await _fixture.Client.GetStringAsync("/BasePath")); } + + [ConditionalFact] + public async Task GetServerVariableDoesNotCrash() + { + async Task RunRequests() + { + var client = new HttpClient() { BaseAddress = _fixture.Client.BaseAddress }; + + for (int j = 0; j < 10; j++) + { + var response = await client.GetStringAsync("/GetServerVariableStress"); + Assert.StartsWith("Response Begin", response); + Assert.EndsWith("Response End", response); + } + } + + List tasks = new List(); + for (int i = 0; i < 10; i++) + { + tasks.Add(Task.Run(RunRequests)); + } + + await Task.WhenAll(tasks); + } } } diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index 3aaba9b44f..2bf89384f8 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -738,5 +738,21 @@ namespace IISTestSite ctx.RequestServices.GetService().StopApplication(); }); } + + private async Task GetServerVariableStress(HttpContext context) + { + // This test simulates the scenario where native Flush call is being + // executed on background thread while request thread calls GetServerVariable + // concurrent native calls may cause native object corruption + + await context.Response.WriteAsync("Response Begin"); + for (int i = 0; i < 1000; i++) + { + await context.Response.WriteAsync(context.GetIISServerVariable("REMOTE_PORT")); + await context.Response.Body.FlushAsync(); + } + await context.Response.WriteAsync("Response End"); + } + } } From 8ad64d2a35bd4cfb73aa4de3ddce86b7a19e76bb Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 6 Jul 2018 16:16:29 -0700 Subject: [PATCH 118/363] Port IISExpress tests to run on both IIS and IISExpress (#1010) --- IISIntegration.NoV1.sln | 17 +- IISIntegration.sln | 17 +- .../IIS.Performance/IIS.Performance.csproj | 4 +- .../IIS.Performance/StartupTimeBenchmark.cs | 2 +- build/repo.props | 5 - .../AspNetCoreModuleTests.vcxproj | 178 ----- test/AspNetCoreModuleTests/stdafx.h | 56 -- .../AppHostConfig/HostableWebCore.config} | 0 .../AppHostConfig/IIS.config | 741 ++++++++++++++++++ .../AppHostConfig/IISExpress.config} | 11 - .../Inprocess/EnvironmentVariableTests.cs | 2 - .../Inprocess/FeatureCollectionTests.cs | 3 - .../Inprocess/HelloWorldTests.cs | 3 - .../InvalidReadWriteOperationTests.cs | 2 - .../Inprocess/LargeResponseBodyTests.cs | 2 - .../Inprocess/ResponseHeaderTests.cs | 3 - .../Inprocess/ResponseInvalidOrderingTests.cs | 1 - .../Inprocess/ServerVariablesTest.cs | 1 - .../Inprocess/SynchronousReadAndWriteTests.cs | 1 - .../OutOfProcess/HelloWorldTest.cs | 13 +- .../Properties/AssemblyInfo.cs | 3 +- .../Utilities/FunctionalTestsBase.cs | 8 +- .../Utilities/Helpers.cs | 2 +- .../Utilities/IISApplication.cs | 68 +- .../Utilities/IISDeployer.cs | 6 +- .../Utilities/IISDeploymentResult.cs | 0 .../Utilities/IISFunctionalTestBase.cs | 15 +- .../Utilities/IISTestSiteCollection.cs | 0 .../Utilities/IISTestSiteFixture.cs | 13 +- .../Utilities/LoggingHandler.cs | 0 .../Utilities/RetryHandler.cs | 0 ...pIfHostableWebCoreNotAvailibleAttribute.cs | 0 .../Utilities/TestConnections.cs | 0 .../Utilities/TestIISUriHelper.cs | 0 .../Utilities/TestServer.cs | 4 +- test/IIS.FunctionalTests/DeployerSelector.cs | 12 + .../IIS.FunctionalTests.csproj} | 18 +- .../SkipIISTestAttribute.cs} | 5 +- .../DeployerSelector.cs | 12 + .../IISExpress.FunctionalTests.csproj | 55 ++ .../InProcess}/AppOfflineTests.cs | 6 +- .../InProcess}/AuthenticationTests.cs | 26 +- .../InProcess}/LoggingTests.cs | 7 +- .../InProcess}/ShutdownTests.cs | 4 +- .../InProcess}/StartupExceptionTests.cs | 12 +- .../InProcess}/StartupTests.cs | 7 +- .../InProcess}/TestServerTest.cs | 2 +- .../InProcess}/WebSocketTests.cs | 0 .../OutOfProcess/GlobalVersionTests.cs | 4 +- .../OutOfProcess/HttpsTest.cs | 5 +- .../OutOfProcess/NtlmAuthentationTest.cs | 9 +- .../OutOfProcess/WindowsAuthTests.cs | 45 ++ .../SkipIISTestAttribute.cs | 17 + .../UpgradeFeatureDetectionTests.cs | 26 +- .../Inprocess/IISTests.cs | 40 - .../InProcessWebSite/Startup.WebSockets.cs | 2 +- test/WebSites/OutOfProcessWebSite/Startup.cs | 1 + test/WebSites/StressTestWebSite/Startup.cs | 2 +- test/WebSites/shared/WebSockets/Constants.cs | 2 +- .../shared/WebSockets/HandshakeHelpers.cs | 2 +- 60 files changed, 1087 insertions(+), 415 deletions(-) delete mode 100644 test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj delete mode 100644 test/AspNetCoreModuleTests/stdafx.h rename test/{IISIntegration.FunctionalTests/AppHostConfig/TestServer.config => Common.FunctionalTests/AppHostConfig/HostableWebCore.config} (100%) create mode 100644 test/Common.FunctionalTests/AppHostConfig/IIS.config rename test/{IISIntegration.FunctionalTests/AppHostConfig/Http.config => Common.FunctionalTests/AppHostConfig/IISExpress.config} (99%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/EnvironmentVariableTests.cs (95%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/FeatureCollectionTests.cs (89%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/HelloWorldTests.cs (89%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/InvalidReadWriteOperationTests.cs (97%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/LargeResponseBodyTests.cs (92%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/ResponseHeaderTests.cs (96%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/ResponseInvalidOrderingTests.cs (95%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/ServerVariablesTest.cs (98%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/SynchronousReadAndWriteTests.cs (99%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/OutOfProcess/HelloWorldTest.cs (85%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Properties/AssemblyInfo.cs (72%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/FunctionalTestsBase.cs (79%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/Helpers.cs (97%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/IISApplication.cs (83%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/IISDeployer.cs (93%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/IISDeploymentResult.cs (100%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/IISFunctionalTestBase.cs (66%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/IISTestSiteCollection.cs (100%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/IISTestSiteFixture.cs (75%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/LoggingHandler.cs (100%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/RetryHandler.cs (100%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs (100%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/TestConnections.cs (100%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/TestIISUriHelper.cs (100%) rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/TestServer.cs (97%) create mode 100644 test/IIS.FunctionalTests/DeployerSelector.cs rename test/{IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj => IIS.FunctionalTests/IIS.FunctionalTests.csproj} (90%) rename test/{IISIntegration.FunctionalTests/Utilities/SkipIfIISCannotRunAttribute.cs => IIS.FunctionalTests/SkipIISTestAttribute.cs} (92%) create mode 100644 test/IISExpress.FunctionalTests/DeployerSelector.cs create mode 100644 test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/AppOfflineTests.cs (95%) rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/AuthenticationTests.cs (71%) rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/LoggingTests.cs (95%) rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/ShutdownTests.cs (86%) rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/StartupExceptionTests.cs (91%) rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/StartupTests.cs (96%) rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/TestServerTest.cs (95%) rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/WebSocketTests.cs (100%) rename test/{IISIntegration.FunctionalTests => IISExpress.FunctionalTests}/OutOfProcess/GlobalVersionTests.cs (97%) rename test/{IISIntegration.FunctionalTests => IISExpress.FunctionalTests}/OutOfProcess/HttpsTest.cs (97%) rename test/{IISIntegration.FunctionalTests => IISExpress.FunctionalTests}/OutOfProcess/NtlmAuthentationTest.cs (88%) create mode 100644 test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs create mode 100644 test/IISExpress.FunctionalTests/SkipIISTestAttribute.cs rename test/{IISIntegration.FunctionalTests => IISExpress.FunctionalTests}/UpgradeFeatureDetectionTests.cs (81%) delete mode 100644 test/IISIntegration.FunctionalTests/Inprocess/IISTests.cs diff --git a/IISIntegration.NoV1.sln b/IISIntegration.NoV1.sln index c2bd1b9ade..04bda53889 100644 --- a/IISIntegration.NoV1.sln +++ b/IISIntegration.NoV1.sln @@ -49,7 +49,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E build\testsite.props = build\testsite.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISIntegration.FunctionalTests", "test\IISIntegration.FunctionalTests\IISIntegration.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISExpress.FunctionalTests", "test\IISExpress.FunctionalTests\IISExpress.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}" ProjectSection(ProjectDependencies) = postProject {7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67} EndProjectSection @@ -109,6 +109,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.v EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{D182103F-8405-4647-B158-C36F598657EF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -353,6 +355,18 @@ Global {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.Build.0 = Release|x64 {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.ActiveCfg = Release|Win32 {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.Build.0 = Release|Win32 + {D182103F-8405-4647-B158-C36F598657EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D182103F-8405-4647-B158-C36F598657EF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D182103F-8405-4647-B158-C36F598657EF}.Debug|x64.ActiveCfg = Debug|Any CPU + {D182103F-8405-4647-B158-C36F598657EF}.Debug|x64.Build.0 = Debug|Any CPU + {D182103F-8405-4647-B158-C36F598657EF}.Debug|x86.ActiveCfg = Debug|Any CPU + {D182103F-8405-4647-B158-C36F598657EF}.Debug|x86.Build.0 = Debug|Any CPU + {D182103F-8405-4647-B158-C36F598657EF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D182103F-8405-4647-B158-C36F598657EF}.Release|Any CPU.Build.0 = Release|Any CPU + {D182103F-8405-4647-B158-C36F598657EF}.Release|x64.ActiveCfg = Release|Any CPU + {D182103F-8405-4647-B158-C36F598657EF}.Release|x64.Build.0 = Release|Any CPU + {D182103F-8405-4647-B158-C36F598657EF}.Release|x86.ActiveCfg = Release|Any CPU + {D182103F-8405-4647-B158-C36F598657EF}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -381,6 +395,7 @@ Global {340C59FC-C682-4CBA-81F8-791821EC8EDE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} + {D182103F-8405-4647-B158-C36F598657EF} = {EF30B533-D715-421A-92B7-92FEF460AC9C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/IISIntegration.sln b/IISIntegration.sln index 86393ab4b7..d3e7ca4de0 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -49,7 +49,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E build\testsite.props = build\testsite.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISIntegration.FunctionalTests", "test\IISIntegration.FunctionalTests\IISIntegration.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISExpress.FunctionalTests", "test\IISExpress.FunctionalTests\IISExpress.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}" ProjectSection(ProjectDependencies) = postProject {7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67} EndProjectSection @@ -116,6 +116,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.v EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -380,6 +382,18 @@ Global {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.Build.0 = Release|x64 {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.ActiveCfg = Release|Win32 {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.Build.0 = Release|Win32 + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x64.ActiveCfg = Debug|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x64.Build.0 = Debug|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x86.ActiveCfg = Debug|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x86.Build.0 = Debug|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|Any CPU.Build.0 = Release|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x64.ActiveCfg = Release|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x64.Build.0 = Release|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x86.ActiveCfg = Release|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -411,6 +425,7 @@ Global {340C59FC-C682-4CBA-81F8-791821EC8EDE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712} = {EF30B533-D715-421A-92B7-92FEF460AC9C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/benchmarks/IIS.Performance/IIS.Performance.csproj b/benchmarks/IIS.Performance/IIS.Performance.csproj index 179e042514..87102ca7ed 100644 --- a/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -12,7 +12,7 @@ - + @@ -24,7 +24,7 @@ - + False diff --git a/benchmarks/IIS.Performance/StartupTimeBenchmark.cs b/benchmarks/IIS.Performance/StartupTimeBenchmark.cs index 4e16e33b49..ef66b6b671 100644 --- a/benchmarks/IIS.Performance/StartupTimeBenchmark.cs +++ b/benchmarks/IIS.Performance/StartupTimeBenchmark.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Performance RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { - ServerConfigTemplateContent = File.ReadAllText("Http.config"), + ServerConfigTemplateContent = File.ReadAllText("IISExpress.config"), SiteName = "HttpTestSite", TargetFramework = "netcoreapp2.1", ApplicationType = ApplicationType.Portable, diff --git a/build/repo.props b/build/repo.props index 93ca7cd881..ba3cca9388 100644 --- a/build/repo.props +++ b/build/repo.props @@ -9,11 +9,6 @@ - - - - - diff --git a/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj b/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj deleted file mode 100644 index fe6851d189..0000000000 --- a/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {0692D963-DB10-4387-B3EA-460FBB9BD9A3} - Win32Proj - AspNetCoreModuleTests - 10.0.15063.0 - NativeUnitTestProject - - - - DynamicLibrary - true - v141 - Unicode - false - - - DynamicLibrary - false - v141 - true - Unicode - false - - - DynamicLibrary - true - v141 - Unicode - false - - - DynamicLibrary - false - v141 - true - Unicode - false - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - - Use - Level3 - Disabled - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\CommonLib;..\..\src\AspNetCoreModuleV2\IISLib - _DEBUG;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - - - Use - Level3 - Disabled - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\CommonLib;..\..\src\AspNetCoreModuleV2\IISLib - WIN32;_DEBUG;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\CommonLib;..\..\src\AspNetCoreModuleV2\IISLib - WIN32;NDEBUG;%(PreprocessorDefinitions) - true - MultiThreaded - - - Windows - true - true - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\CommonLib;..\..\src\AspNetCoreModuleV2\IISLib - NDEBUG;%(PreprocessorDefinitions) - true - MultiThreaded - - - Windows - true - true - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - - - - - - - - - - - {55494e58-e061-4c4c-a0a8-837008e72f85} - - - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - - - - - - - \ No newline at end of file diff --git a/test/AspNetCoreModuleTests/stdafx.h b/test/AspNetCoreModuleTests/stdafx.h deleted file mode 100644 index 67bd5aa27b..0000000000 --- a/test/AspNetCoreModuleTests/stdafx.h +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#pragma once - -#include "targetver.h" - -#define WIN32_LEAN_AND_MEAN - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include "stringa.h" -#include "stringu.h" -#include "dbgutil.h" -#include "ahutil.h" -#include "multisz.h" -#include "multisza.h" -#include "base64.h" -#include -#include -#include -#include -#include - -#include "..\..\src\AspNetCoreModuleV2\IISLib\hashtable.h" -#include "..\..\src\AspNetCoreModuleV2\IISLib\stringu.h" -#include "..\..\src\AspNetCoreModuleV2\IISLib\stringa.h" -#include "..\..\src\AspNetCoreModuleV2\IISLib\multisz.h" -#include "..\..\src\AspNetCoreModuleV2\IISLib\dbgutil.h" -#include "..\..\src\AspNetCoreModuleV2\IISLib\ahutil.h" -#include "..\..\src\AspNetCoreModuleV2\IISLib\hashfn.h" - -#include "..\..\src\AspNetCoreModuleV2\CommonLib\hostfxr_utility.h" -#include "..\..\src\AspNetCoreModuleV2\CommonLib\environmentvariablehash.h" -#include "..\..\src\AspNetCoreModuleV2\CommonLib\aspnetcoreconfig.h" -#include "..\..\src\AspNetCoreModuleV2\CommonLib\application.h" -#include "..\..\src\AspNetCoreModuleV2\CommonLib\utility.h" -#include "..\..\src\AspNetCoreModuleV2\CommonLib\debugutil.h" -#include "..\..\src\AspNetCoreModuleV2\CommonLib\requesthandler.h" -#include "..\..\src\AspNetCoreModuleV2\CommonLib\resources.h" -#include "..\..\src\AspNetCoreModuleV2\CommonLib\aspnetcore_msg.h" - -#include "CppUnitTest.h" diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config b/test/Common.FunctionalTests/AppHostConfig/HostableWebCore.config similarity index 100% rename from test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config rename to test/Common.FunctionalTests/AppHostConfig/HostableWebCore.config diff --git a/test/Common.FunctionalTests/AppHostConfig/IIS.config b/test/Common.FunctionalTests/AppHostConfig/IIS.config new file mode 100644 index 0000000000..4d30d2ad0f --- /dev/null +++ b/test/Common.FunctionalTests/AppHostConfig/IIS.config @@ -0,0 +1,741 @@ + + + + + + + + +
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config b/test/Common.FunctionalTests/AppHostConfig/IISExpress.config similarity index 99% rename from test/IISIntegration.FunctionalTests/AppHostConfig/Http.config rename to test/Common.FunctionalTests/AppHostConfig/IISExpress.config index b0de53397c..9dfe324091 100644 --- a/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config +++ b/test/Common.FunctionalTests/AppHostConfig/IISExpress.config @@ -344,7 +344,6 @@ - @@ -1033,14 +1032,4 @@ - - - - - - - - - - diff --git a/test/IISIntegration.FunctionalTests/Inprocess/EnvironmentVariableTests.cs b/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs similarity index 95% rename from test/IISIntegration.FunctionalTests/Inprocess/EnvironmentVariableTests.cs rename to test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs index 16467095d8..413aa4c35f 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/EnvironmentVariableTests.cs +++ b/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs @@ -2,14 +2,12 @@ // 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.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] - [SkipIfIISExpressSchemaMissingInProcess] public class EnvironmentVariableTests { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/FeatureCollectionTests.cs b/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs similarity index 89% rename from test/IISIntegration.FunctionalTests/Inprocess/FeatureCollectionTests.cs rename to test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs index b946446db7..e31dc3dbaa 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/FeatureCollectionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs @@ -1,16 +1,13 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] - [SkipIfIISExpressSchemaMissingInProcess] public class FeatureCollectionTest { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/HelloWorldTests.cs b/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs similarity index 89% rename from test/IISIntegration.FunctionalTests/Inprocess/HelloWorldTests.cs rename to test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs index ebc67312df..1b2ad70600 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/HelloWorldTests.cs +++ b/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs @@ -1,16 +1,13 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] - [SkipIfIISExpressSchemaMissingInProcess] public class HelloWorldInProcessTests { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs b/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs similarity index 97% rename from test/IISIntegration.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs rename to test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs index ae27eb426e..95c05308bd 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs +++ b/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs @@ -3,14 +3,12 @@ using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] - [SkipIfIISExpressSchemaMissingInProcess] public class InvalidReadWriteOperationTests { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/LargeResponseBodyTests.cs b/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs similarity index 92% rename from test/IISIntegration.FunctionalTests/Inprocess/LargeResponseBodyTests.cs rename to test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs index 3578718ef6..40db2cfdb8 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/LargeResponseBodyTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs @@ -2,14 +2,12 @@ // 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.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] - [SkipIfIISExpressSchemaMissingInProcess] public class LargeResponseBodyTests { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs b/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs similarity index 96% rename from test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs rename to test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs index 09e3688fbf..3f433b155f 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs +++ b/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs @@ -1,11 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Linq; using System.Net; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Net.Http.Headers; using Xunit; @@ -13,7 +11,6 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] - [SkipIfIISExpressSchemaMissingInProcess] public class ResponseHeaders { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs b/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs similarity index 95% rename from test/IISIntegration.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs rename to test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs index 1bf0f1a483..c39e155e77 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs @@ -9,7 +9,6 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] - [SkipIfIISExpressSchemaMissingInProcess] public class ResponseInvalidOrderingTest { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs b/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs similarity index 98% rename from test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs rename to test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs index 020ef00213..74af2e00cb 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs +++ b/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs @@ -11,7 +11,6 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] - [SkipIfIISExpressSchemaMissingInProcess] public class ServerVariablesTest { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs b/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs similarity index 99% rename from test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs rename to test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs index 122b67f005..9b57d4996b 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs +++ b/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs @@ -13,7 +13,6 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] - [SkipIfIISExpressSchemaMissingInProcess] public class SynchronousReadAndWriteTests { private readonly IISTestSiteFixture _fixture; diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs similarity index 85% rename from test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs rename to test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 659487f51d..876b8e010f 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -1,8 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.IO; using System.Threading.Tasks; -using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; @@ -17,7 +18,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } public static TestMatrix TestVariants - => TestMatrix.ForServers(ServerType.IISExpress) + => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) .WithAllApplicationTypes() .WithAllAncmVersions(); @@ -26,9 +27,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [MemberData(nameof(TestVariants))] public async Task HelloWorld(TestVariant variant) { + // The default in hosting sets windows auth to true. + // Set it to the IISExpress.config file var deploymentParameters = new DeploymentParameters(variant) { - ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), + ApplicationPath = Helpers.GetOutOfProcessTestSitesPath() }; var deploymentResult = await DeployAsync(deploymentParameters); @@ -53,9 +56,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests response = await deploymentResult.HttpClient.GetAsync("/Auth"); responseText = await response.Content.ReadAsStringAsync(); - // We adapted the Http.config file to be used for inprocess too. We specify WindowsAuth is enabled - // We now expect that windows auth is enabled rather than disabled. - Assert.True("backcompat;Windows".Equals(responseText) || "latest;Windows".Equals(responseText), "Auth"); + Assert.True("backcompat;Windows".Equals(responseText) || "latest;null".Equals(responseText), "Auth"); } } } diff --git a/test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs b/test/Common.FunctionalTests/Properties/AssemblyInfo.cs similarity index 72% rename from test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs rename to test/Common.FunctionalTests/Properties/AssemblyInfo.cs index a150572c1f..a3ad8b187e 100644 --- a/test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs +++ b/test/Common.FunctionalTests/Properties/AssemblyInfo.cs @@ -1,7 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -// All functional tests in this project require a version of IIS express with an updated schema +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; using Xunit; [assembly: CollectionBehavior(DisableTestParallelization = true)] +[assembly: RequiresIIS] diff --git a/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs similarity index 79% rename from test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs rename to test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index a30387f0dd..c2a9c3682a 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.IO; using System.Threading.Tasks; using Microsoft.Extensions.Logging.Testing; using Xunit.Abstractions; @@ -24,14 +25,15 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting parameters.EnvironmentVariables[DebugEnvironmentVariable] = "4"; } - // Currently hosting throws if the Servertype = IIS. if (parameters.ServerType == ServerType.IIS) { + // Currently hosting throws if the Servertype = IIS. _deployer = new IISDeployer(parameters, LoggerFactory); } - else + else if (parameters.ServerType == ServerType.IISExpress) { - _deployer = ApplicationDeployerFactory.Create(parameters, LoggerFactory); + parameters.ServerConfigTemplateContent = parameters.ServerConfigTemplateContent ?? File.ReadAllText("IISExpress.config"); + _deployer = new IISExpressDeployer(parameters, LoggerFactory); } var result = await _deployer.DeployAsync(); diff --git a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs similarity index 97% rename from test/IISIntegration.FunctionalTests/Utilities/Helpers.cs rename to test/Common.FunctionalTests/Utilities/Helpers.cs index cfee3377f2..6915d955ec 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // Defaults to inprocess specific deployment parameters public static DeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite") { - return new DeploymentParameters(Helpers.GetTestWebSitePath(site), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + return new DeploymentParameters(Helpers.GetTestWebSitePath(site), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs b/test/Common.FunctionalTests/Utilities/IISApplication.cs similarity index 83% rename from test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs rename to test/Common.FunctionalTests/Utilities/IISApplication.cs index faba405c06..662f9315a6 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs +++ b/test/Common.FunctionalTests/Utilities/IISApplication.cs @@ -19,13 +19,13 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting /// internal class IISApplication { - private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(2); - private static readonly TimeSpan _retryDelay = TimeSpan.FromMilliseconds(100); + private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(5); + private static readonly TimeSpan _retryDelay = TimeSpan.FromMilliseconds(200); private readonly ServerManager _serverManager = new ServerManager(); private readonly DeploymentParameters _deploymentParameters; private readonly ILogger _logger; private readonly string _ancmVersion; - private readonly object _syncLock = new object(); + private readonly string _ancmDllName; private readonly string _apphostConfigBackupPath; private static readonly string _apphostConfigPath = Path.Combine( Environment.SystemDirectory, @@ -38,6 +38,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting _deploymentParameters = deploymentParameters; _logger = logger; _ancmVersion = deploymentParameters.AncmVersion.ToString(); + _ancmDllName = deploymentParameters.AncmVersion == AncmVersion.AspNetCoreModuleV2 ? "aspnetcorev2.dll" : "aspnetcore.dll"; WebSiteName = CreateTestSiteName(); AppPoolName = $"{WebSiteName}Pool"; _apphostConfigBackupPath = Path.Combine( @@ -56,12 +57,12 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting // Backup currently deployed apphost.config file using (_logger.BeginScope("StartIIS")) { - AddTemporaryAppHostConfig(); var port = uri.Port; if (port == 0) { throw new NotSupportedException("Cannot set port 0 for IIS."); } + AddTemporaryAppHostConfig(); ConfigureAppPool(contentRoot); @@ -177,32 +178,60 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting private void AddTemporaryAppHostConfig() { - File.Copy(_apphostConfigPath, _apphostConfigBackupPath); + RetryFileOperation(() => File.Move(_apphostConfigPath, _apphostConfigBackupPath), + e => _logger.LogWarning($"Failed to backup apphost.config: {e.Message}")); + _logger.LogInformation($"Backed up {_apphostConfigPath} to {_apphostConfigBackupPath}"); + + RetryFileOperation( + () => File.WriteAllText(_apphostConfigPath, _deploymentParameters.ServerConfigTemplateContent ?? File.ReadAllText("IIS.config")), + e => _logger.LogWarning($"Failed to copy IIS.config to apphost.config: {e.Message}")); + + _logger.LogInformation($"Copied contents of IIS.config to {_apphostConfigPath}"); } private void RestoreAppHostConfig() { - RetryHelper.RetryOperation( - () => File.Delete(_apphostConfigPath), - e => _logger.LogWarning($"Failed to delete directory : {e.Message}"), - retryCount: 3, - retryDelayMilliseconds: 100); + if (File.Exists(_apphostConfigPath)) + { + RetryFileOperation( + () => File.Delete(_apphostConfigPath), + e => _logger.LogWarning($"Failed to delete file : {e.Message}")); + } + + RetryFileOperation( + () => File.Move(_apphostConfigBackupPath, _apphostConfigPath), + e => _logger.LogError($"Failed to backup apphost.config: {e.Message}")); - File.Move(_apphostConfigBackupPath, _apphostConfigPath); _logger.LogInformation($"Restored {_apphostConfigPath}."); } + private void RetryFileOperation(Action retryBlock, Action exceptionBlock) + { + RetryHelper.RetryOperation(retryBlock, + exceptionBlock, + retryCount: 10, + retryDelayMilliseconds: 100); + } + private ApplicationPool ConfigureAppPool(string contentRoot) { - var pool = _serverManager.ApplicationPools.Add(AppPoolName); - pool.ProcessModel.IdentityType = ProcessModelIdentityType.LocalSystem; - pool.ManagedRuntimeVersion = string.Empty; + try + { + var pool = _serverManager.ApplicationPools.Add(AppPoolName); + pool.ProcessModel.IdentityType = ProcessModelIdentityType.LocalSystem; + pool.ManagedRuntimeVersion = string.Empty; - AddEnvironmentVariables(contentRoot, pool); + AddEnvironmentVariables(contentRoot, pool); - _logger.LogInformation($"Configured AppPool {AppPoolName}"); - return pool; + _logger.LogInformation($"Configured AppPool {AppPoolName}"); + return pool; + } + catch (COMException comException) + { + _logger.LogError(File.ReadAllText(_apphostConfigPath)); + throw comException; + } } private void AddEnvironmentVariables(string contentRoot, ApplicationPool pool) @@ -215,6 +244,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting { AddEnvironmentVariableToAppPool(envCollection, tuple.Key, tuple.Value); } + AddEnvironmentVariableToAppPool(envCollection, "ASPNETCORE_MODULE_DEBUG_FILE", $"{WebSiteName}.txt"); } catch (COMException comException) { @@ -301,11 +331,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting private string GetAncmLocation(string dllRoot) { - var arch = _deploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? @"x64\aspnetcorev2.dll" : @"x86\aspnetcorev2.dll"; + var arch = _deploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? $@"x64\{_ancmDllName}" : $@"x86\{_ancmDllName}"; var ancmFile = Path.Combine(dllRoot, arch); if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) { - ancmFile = Path.Combine(dllRoot, "aspnetcorev2.dll"); + ancmFile = Path.Combine(dllRoot, _ancmDllName); if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) { throw new FileNotFoundException("AspNetCoreModule could not be found.", ancmFile); diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISDeployer.cs b/test/Common.FunctionalTests/Utilities/IISDeployer.cs similarity index 93% rename from test/IISIntegration.FunctionalTests/Utilities/IISDeployer.cs rename to test/Common.FunctionalTests/Utilities/IISDeployer.cs index 4f0d5252c9..f3f9d8e7b9 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISDeployer.cs +++ b/test/Common.FunctionalTests/Utilities/IISDeployer.cs @@ -49,6 +49,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting StartTimer(); var contentRoot = string.Empty; + if (string.IsNullOrEmpty(DeploymentParameters.ServerConfigTemplateContent)) + { + DeploymentParameters.ServerConfigTemplateContent = File.ReadAllText("IIS.config"); + } + _application = new IISApplication(DeploymentParameters, Logger); // For now, only support using published output @@ -90,6 +95,5 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting Logger.LogInformation(line); } } - } } diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISDeploymentResult.cs b/test/Common.FunctionalTests/Utilities/IISDeploymentResult.cs similarity index 100% rename from test/IISIntegration.FunctionalTests/Utilities/IISDeploymentResult.cs rename to test/Common.FunctionalTests/Utilities/IISDeploymentResult.cs diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs b/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs similarity index 66% rename from test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs rename to test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs index 9c6ba61513..d4c74c551b 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs +++ b/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs @@ -5,10 +5,11 @@ using System; using System.Linq; using System.Threading.Tasks; using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; using Microsoft.AspNetCore.Server.IntegrationTesting; using Xunit.Abstractions; -namespace IISIntegration.FunctionalTests.Utilities +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities { public class IISFunctionalTestBase : FunctionalTestsBase { @@ -18,7 +19,7 @@ namespace IISIntegration.FunctionalTests.Utilities protected string GetServerConfig(Action transform) { - var doc = XDocument.Load("AppHostConfig/Http.config"); + var doc = XDocument.Load(DeployerSelector.ServerType == ServerType.IIS ? "IIS.config" : "IISExpress.config"); transform?.Invoke(doc.Root); return doc.ToString(); } @@ -36,5 +37,15 @@ namespace IISIntegration.FunctionalTests.Utilities .SetAttributeValue("sslFlags", "Ssl, SslNegotiateCert"); }); } + + protected string GetWindowsAuthConfig() + { + return GetServerConfig( + element => { + element.Descendants("windowsAuthentication") + .Single() + .SetAttributeValue("enabled", "true"); + }); + } } } diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteCollection.cs b/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs similarity index 100% rename from test/IISIntegration.FunctionalTests/Utilities/IISTestSiteCollection.cs rename to test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs similarity index 75% rename from test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs rename to test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs index 3cbaefa9e6..d19dad36d0 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var logging = AssemblyTestLog.ForAssembly(typeof(IISTestSiteFixture).Assembly); var deploymentParameters = new DeploymentParameters(Helpers.GetInProcessTestSitesPath(), - ServerType.IISExpress, + DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { @@ -30,7 +30,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests PublishApplicationBeforeDeployment = true, }; - _deployer = ApplicationDeployerFactory.Create(deploymentParameters, logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture))); + if (deploymentParameters.ServerType == ServerType.IIS) + { + // Currently hosting throws if the Servertype = IIS. + _deployer = new IISDeployer(deploymentParameters, logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture))); + } + else if (deploymentParameters.ServerType == ServerType.IISExpress) + { + _deployer = new IISExpressDeployer(deploymentParameters, logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture))); + } + DeploymentResult = _deployer.DeployAsync().Result; Client = DeploymentResult.HttpClient; BaseUri = DeploymentResult.ApplicationBaseUri; diff --git a/test/IISIntegration.FunctionalTests/Utilities/LoggingHandler.cs b/test/Common.FunctionalTests/Utilities/LoggingHandler.cs similarity index 100% rename from test/IISIntegration.FunctionalTests/Utilities/LoggingHandler.cs rename to test/Common.FunctionalTests/Utilities/LoggingHandler.cs diff --git a/test/IISIntegration.FunctionalTests/Utilities/RetryHandler.cs b/test/Common.FunctionalTests/Utilities/RetryHandler.cs similarity index 100% rename from test/IISIntegration.FunctionalTests/Utilities/RetryHandler.cs rename to test/Common.FunctionalTests/Utilities/RetryHandler.cs diff --git a/test/IISIntegration.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs b/test/Common.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs similarity index 100% rename from test/IISIntegration.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs rename to test/Common.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs diff --git a/test/IISIntegration.FunctionalTests/Utilities/TestConnections.cs b/test/Common.FunctionalTests/Utilities/TestConnections.cs similarity index 100% rename from test/IISIntegration.FunctionalTests/Utilities/TestConnections.cs rename to test/Common.FunctionalTests/Utilities/TestConnections.cs diff --git a/test/IISIntegration.FunctionalTests/Utilities/TestIISUriHelper.cs b/test/Common.FunctionalTests/Utilities/TestIISUriHelper.cs similarity index 100% rename from test/IISIntegration.FunctionalTests/Utilities/TestIISUriHelper.cs rename to test/Common.FunctionalTests/Utilities/TestIISUriHelper.cs diff --git a/test/IISIntegration.FunctionalTests/Utilities/TestServer.cs b/test/Common.FunctionalTests/Utilities/TestServer.cs similarity index 97% rename from test/IISIntegration.FunctionalTests/Utilities/TestServer.cs rename to test/Common.FunctionalTests/Utilities/TestServer.cs index 6cd61b1459..5eaaaf3440 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/TestServer.cs +++ b/test/Common.FunctionalTests/Utilities/TestServer.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private static readonly SemaphoreSlim WebCoreLock = new SemaphoreSlim(1, 1); - // Currently this is hardcoded in TestServer.config + // Currently this is hardcoded in HostableWebCore.config private static readonly int BasePort = 50691; private static readonly Uri BaseUri = new Uri("http://localhost:" + BasePort); @@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests LoadLibrary(AspNetCoreModuleDll); set_main_handler(Main); - var startResult = WebCoreActivate(Path.GetFullPath("AppHostConfig/TestServer.config"), null, "Instance"); + var startResult = WebCoreActivate(Path.GetFullPath("HostableWebCore.config"), null, "Instance"); if (startResult != 0) { throw new InvalidOperationException($"Error while running WebCoreActivate: {startResult}"); diff --git a/test/IIS.FunctionalTests/DeployerSelector.cs b/test/IIS.FunctionalTests/DeployerSelector.cs new file mode 100644 index 0000000000..2032b716b9 --- /dev/null +++ b/test/IIS.FunctionalTests/DeployerSelector.cs @@ -0,0 +1,12 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Server.IntegrationTesting; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public static class DeployerSelector + { + public static ServerType ServerType => ServerType.IIS; + } +} diff --git a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj similarity index 90% rename from test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj rename to test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index 544cde26ee..718053f101 100644 --- a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj +++ b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -5,10 +5,7 @@ - - - Never - + @@ -19,6 +16,10 @@ + + + + @@ -26,9 +27,6 @@ - - - @@ -45,7 +43,11 @@ - + + + + + PreserveNewest diff --git a/test/IISIntegration.FunctionalTests/Utilities/SkipIfIISCannotRunAttribute.cs b/test/IIS.FunctionalTests/SkipIISTestAttribute.cs similarity index 92% rename from test/IISIntegration.FunctionalTests/Utilities/SkipIfIISCannotRunAttribute.cs rename to test/IIS.FunctionalTests/SkipIISTestAttribute.cs index aa6c3abd75..6602d1125c 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/SkipIfIISCannotRunAttribute.cs +++ b/test/IIS.FunctionalTests/SkipIISTestAttribute.cs @@ -7,13 +7,12 @@ using System.Linq; using System.Runtime.InteropServices; using System.Security.Principal; using System.Xml.Linq; -using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] - public sealed class SkipIfIISCannotRunAttribute : Attribute, ITestCondition + public sealed class RequiresIISAttribute : Attribute, ITestCondition { private static readonly bool _isMet; public static readonly string _skipReason; @@ -21,7 +20,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public bool IsMet => _isMet; public string SkipReason => _skipReason; - static SkipIfIISCannotRunAttribute() + static RequiresIISAttribute() { if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { diff --git a/test/IISExpress.FunctionalTests/DeployerSelector.cs b/test/IISExpress.FunctionalTests/DeployerSelector.cs new file mode 100644 index 0000000000..5344cbacf0 --- /dev/null +++ b/test/IISExpress.FunctionalTests/DeployerSelector.cs @@ -0,0 +1,12 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Server.IntegrationTesting; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public static class DeployerSelector + { + public static ServerType ServerType => ServerType.IISExpress; + } +} diff --git a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj new file mode 100644 index 0000000000..718053f101 --- /dev/null +++ b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -0,0 +1,55 @@ + + + + netcoreapp2.2 + + + + + + + + + + + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + + diff --git a/test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs b/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs similarity index 95% rename from test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs rename to test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs index d88fad5d21..5cfd7fe7c0 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs @@ -6,7 +6,7 @@ using System.IO; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; using Microsoft.AspNetCore.Server.IntegrationTesting; @@ -14,11 +14,11 @@ using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Xunit; -namespace IISIntegration.FunctionalTests.Inprocess +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess { - [SkipIfIISExpressSchemaMissingInProcess] public class AppOfflineTests : IISFunctionalTestBase { + // TODO these will differ between IIS and IISExpress [ConditionalFact] public async Task AppOfflineDroppedWhileSiteIsDown_SiteReturns503() { diff --git a/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs similarity index 71% rename from test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs rename to test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs index a9cc151e6f..c3540d51ee 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs @@ -4,50 +4,48 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.AspNetCore.Server.IntegrationTesting; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { - [Collection(IISTestSiteCollection.Name)] - [SkipIfIISExpressSchemaMissingInProcess] - public class AuthenticationTests + public class AuthenticationTests : IISFunctionalTestBase { - private readonly IISTestSiteFixture _fixture; - public AuthenticationTests(IISTestSiteFixture fixture) - { - _fixture = fixture; - } [ConditionalFact] public async Task Authentication_InProcess() { - var response = await _fixture.Client.GetAsync("/AuthenticationAnonymous"); + var deploymentParameters = Helpers.GetBaseDeploymentParameters(); + deploymentParameters.ServerConfigTemplateContent = GetWindowsAuthConfig(); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.RetryingHttpClient.GetAsync("/AuthenticationAnonymous"); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.Equal("Anonymous?True", responseText); - response = await _fixture.Client.GetAsync("/AuthenticationRestricted"); + response = await deploymentResult.RetryingHttpClient.GetAsync("/AuthenticationRestricted"); responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString()); Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString()); - response = await _fixture.Client.GetAsync("/AuthenticationRestrictedNTLM"); + response = await deploymentResult.RetryingHttpClient.GetAsync("/AuthenticationRestrictedNTLM"); responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString()); // Note we can't restrict a challenge to a specific auth type, the native auth modules always add themselves. Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString()); - response = await _fixture.Client.GetAsync("/AuthenticationForbidden"); + response = await deploymentResult.RetryingHttpClient.GetAsync("/AuthenticationForbidden"); responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); var httpClientHandler = new HttpClientHandler() { UseDefaultCredentials = true }; - var httpClient = _fixture.DeploymentResult.CreateHttpClient(httpClientHandler); + var httpClient = deploymentResult.DeploymentResult.CreateHttpClient(httpClientHandler); response = await httpClient.GetAsync("/AuthenticationAnonymous"); responseText = await response.Content.ReadAsStringAsync(); diff --git a/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs b/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs similarity index 95% rename from test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs rename to test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs index 611434f560..856bf1669f 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs @@ -5,8 +5,9 @@ using System; using System.IO; using System.Linq; using System.Threading.Tasks; -using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Xunit; @@ -14,7 +15,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class LoggingTests : IISFunctionalTestBase { - [Theory] + [ConditionalTheory] [InlineData("CheckErrLogFile")] [InlineData("CheckLogFile")] public async Task CheckStdoutLogging(string path) @@ -66,7 +67,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } - [Fact] + [ConditionalFact] public async Task StartupMessagesAreLoggedIntoDebugLogFile() { var tempFile = Path.GetTempFileName(); diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ShutdownTests.cs b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs similarity index 86% rename from test/IISIntegration.FunctionalTests/Inprocess/ShutdownTests.cs rename to test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs index 9b1eb28eab..69eacfbc43 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/ShutdownTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs @@ -2,15 +2,13 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using IISIntegration.FunctionalTests.Utilities; -using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { - [SkipIfIISExpressSchemaMissingInProcess] public class ShutdownTests : IISFunctionalTestBase { diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupExceptionTests.cs similarity index 91% rename from test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs rename to test/IISExpress.FunctionalTests/InProcess/StartupExceptionTests.cs index 0b09c7a465..00b75c3a7c 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupExceptionTests.cs @@ -4,15 +4,17 @@ using System; using System.Net; using System.Threading.Tasks; -using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + public class StartupExceptionTests : IISFunctionalTestBase { // TODO FileNotFound here. - [Theory] + [ConditionalTheory] [InlineData("CheckLogFile")] [InlineData("CheckErrLogFile")] public async Task CheckStdoutWithRandomNumber(string path) @@ -33,13 +35,15 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Contains(TestSink.Writes, context => context.Message.Contains($"Random number: {randomNumberString}")); } - [Theory] + [ConditionalTheory] [InlineData("CheckLargeStdErrWrites")] [InlineData("CheckLargeStdOutWrites")] [InlineData("CheckOversizedStdErrWrites")] [InlineData("CheckOversizedStdOutWrites")] public async Task CheckStdoutWithLargeWrites(string path) { + // Need a web.config + // Also publish issues. var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite"); deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; @@ -54,7 +58,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Contains(TestSink.Writes, context => context.Message.Contains(new string('a', 4096))); } - [Fact] + [ConditionalFact] public async Task Gets500_30_ErrorPage() { var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite"); diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs similarity index 96% rename from test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs rename to test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index eda231066a..14bdceb024 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -6,7 +6,7 @@ using System.IO; using System.Linq; using System.Net; using System.Threading.Tasks; -using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.CommandLineUtils; @@ -15,7 +15,6 @@ using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { - [SkipIfIISExpressSchemaMissingInProcess] public class StartupTests : IISFunctionalTestBase { private readonly string _dotnetLocation = DotNetMuxer.MuxerPathOrDefault(); @@ -98,7 +97,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } public static TestMatrix TestVariants - => TestMatrix.ForServers(ServerType.IISExpress) + => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp22) .WithAllApplicationTypes() .WithAncmV2InProcess(); @@ -136,7 +135,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // Defaults to inprocess specific deployment parameters public static DeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite") { - return new DeploymentParameters(Helpers.GetTestWebSitePath(site), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + return new DeploymentParameters(Helpers.GetTestWebSitePath(site), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, diff --git a/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs b/test/IISExpress.FunctionalTests/InProcess/TestServerTest.cs similarity index 95% rename from test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs rename to test/IISExpress.FunctionalTests/InProcess/TestServerTest.cs index 4b4d3f25c8..a9a7b89fe7 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs +++ b/test/IISExpress.FunctionalTests/InProcess/TestServerTest.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging.Testing; diff --git a/test/IISIntegration.FunctionalTests/Inprocess/WebSocketTests.cs b/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs similarity index 100% rename from test/IISIntegration.FunctionalTests/Inprocess/WebSocketTests.cs rename to test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs similarity index 97% rename from test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs rename to test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index 2bef2b3c16..3edfdafb22 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -6,7 +6,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using System.Xml.Linq; -using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Xunit; using Xunit.Abstractions; @@ -141,7 +141,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private DeploymentParameters GetGlobalVersionBaseDeploymentParameters() { - return new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + return new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs similarity index 97% rename from test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs rename to test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs index 15f3c5f3b9..543481ee14 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -4,7 +4,7 @@ using System.Net.Http; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; -using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.AspNetCore.Testing.xunit; @@ -16,6 +16,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // IIS Express preregisteres 44300-44399 ports with SSL bindings. // So these tests always have to use ports in this range, and we can't rely on OS-allocated ports without a whole lot of ceremony around // creating self-signed certificates and registering SSL bindings with HTTP.sys + // Test specific to IISExpress public class HttpsTest : IISFunctionalTestBase { public HttpsTest(ITestOutputHelper output) : base(output) @@ -23,7 +24,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } public static TestMatrix TestVariants - => TestMatrix.ForServers(ServerType.IISExpress) + => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) .WithAllAncmVersions(); diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs similarity index 88% rename from test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs rename to test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index 39ae2fe0e3..9aab93a56f 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; -using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; @@ -14,12 +14,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class NtlmAuthenticationTests : IISFunctionalTestBase { + // Test only runs on IISExpress today as our CI machines do not have + // Windows auth installed globally. + // TODO either enable windows auth on our CI or use containers to test this + // behavior public NtlmAuthenticationTests(ITestOutputHelper output) : base(output) { } public static TestMatrix TestVariants - => TestMatrix.ForServers(ServerType.IISExpress) + => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) .WithAllAncmVersions(); @@ -31,6 +35,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), ApplicationBaseUriHint = $"http://localhost:0/", + ServerConfigTemplateContent = GetWindowsAuthConfig() }; var result = await DeployAsync(deploymentParameters); diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs new file mode 100644 index 0000000000..83d6a8e20a --- /dev/null +++ b/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs @@ -0,0 +1,45 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.IO; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class WindowsAuthTests : IISFunctionalTestBase + { + public WindowsAuthTests(ITestOutputHelper output = null) : base(output) + { + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithAllApplicationTypes() + .WithAllAncmVersions(); + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task WindowsAuthTest(TestVariant variant) + { + var deploymentParameters = new DeploymentParameters(variant) + { + ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), + ServerConfigTemplateContent = GetWindowsAuthConfig() + }; + + // The default in hosting sets windows auth to true. + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/Auth"); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.True("backcompat;Windows".Equals(responseText) || "latest;Windows".Equals(responseText), "Auth"); + } + } +} diff --git a/test/IISExpress.FunctionalTests/SkipIISTestAttribute.cs b/test/IISExpress.FunctionalTests/SkipIISTestAttribute.cs new file mode 100644 index 0000000000..15bbb9c26c --- /dev/null +++ b/test/IISExpress.FunctionalTests/SkipIISTestAttribute.cs @@ -0,0 +1,17 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class RequiresIISAttribute : Attribute, ITestCondition + { + public bool IsMet => IISExpressAncmSchema.SupportsInProcessHosting; + + public string SkipReason => IISExpressAncmSchema.SkipReason; + } +} diff --git a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs b/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs similarity index 81% rename from test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs rename to test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs index bc54543067..dc64262d00 100644 --- a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs +++ b/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.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.IO; using System.Linq; using System.Threading.Tasks; -using IISIntegration.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Abstractions; @@ -20,17 +20,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Fact] - public Task UpgradeFeatureDetectionDisabled_InProcess_IISExpress() + [ConditionalFact] + public Task UpgradeFeatureDetectionDisabled_InProcess() { + // fails due to not modifying the apphost.config file. return UpgradeFeatureDetectionDeployer( disableWebSocket: true, Helpers.GetInProcessTestSitesPath(), "Disabled", HostingModel.InProcess); } - [Fact] - public Task UpgradeFeatureDetectionEnabled_InProcess_IISExpress() + [ConditionalFact] + public Task UpgradeFeatureDetectionEnabled_InProcess() { return UpgradeFeatureDetectionDeployer( disableWebSocket: false, @@ -38,8 +39,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _isWebsocketsSupported, HostingModel.InProcess); } - [Fact] - public Task UpgradeFeatureDetectionDisabled_OutOfProcess_IISExpress() + [ConditionalFact] + public Task UpgradeFeatureDetectionDisabled_OutOfProcess() { return UpgradeFeatureDetectionDeployer( disableWebSocket: true, @@ -47,8 +48,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests "Disabled", HostingModel.OutOfProcess); } - [Fact] - public Task UpgradeFeatureDetectionEnabled_OutOfProcess_IISExpress() + [ConditionalFact] + public Task UpgradeFeatureDetectionEnabled_OutOfProcess() { return UpgradeFeatureDetectionDeployer( disableWebSocket: false, @@ -58,17 +59,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private async Task UpgradeFeatureDetectionDeployer(bool disableWebSocket, string sitePath, string expected, HostingModel hostingModel) { - var deploymentParameters = new DeploymentParameters(sitePath, ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + var deploymentParameters = new DeploymentParameters(sitePath, DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, AncmVersion = AncmVersion.AspNetCoreModuleV2, HostingModel = hostingModel, - PublishApplicationBeforeDeployment = hostingModel == HostingModel.InProcess, + PublishApplicationBeforeDeployment = hostingModel == HostingModel.InProcess }; if (disableWebSocket) { + // For IIS, we need to modify the apphost.config file deploymentParameters.ServerConfigTemplateContent = GetServerConfig( element => element.Descendants("webSocket") .Single() diff --git a/test/IISIntegration.FunctionalTests/Inprocess/IISTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/IISTests.cs deleted file mode 100644 index 040f03fcad..0000000000 --- a/test/IISIntegration.FunctionalTests/Inprocess/IISTests.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// 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.Server.IntegrationTesting; -using Microsoft.AspNetCore.Testing.xunit; -using Xunit; - -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests -{ - [SkipIfIISCannotRun] - public class IISTests : FunctionalTestsBase - { - [ConditionalFact] - public Task HelloWorld_IIS_CoreClr_X64_Standalone() - { - return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Standalone); - } - - [ConditionalFact] - public Task HelloWorld_IIS_CoreClr_X64_Portable() - { - return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable); - } - - private async Task HelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType) - { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(); - deploymentParameters.ServerType = ServerType.IIS; - deploymentParameters.ApplicationType = applicationType; - - var deploymentResult = await DeployAsync(deploymentParameters); - - var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); - var responseText = await response.Content.ReadAsStringAsync(); - - Assert.Equal("Hello World", responseText); - } - } -} diff --git a/test/WebSites/InProcessWebSite/Startup.WebSockets.cs b/test/WebSites/InProcessWebSite/Startup.WebSockets.cs index f3fcdb3a1d..e83ae2a72f 100644 --- a/test/WebSites/InProcessWebSite/Startup.WebSockets.cs +++ b/test/WebSites/InProcessWebSite/Startup.WebSockets.cs @@ -8,7 +8,7 @@ using System.Net.WebSockets; using System.Text; using System.Threading; using System.Threading.Tasks; -using IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/test/WebSites/OutOfProcessWebSite/Startup.cs index fc7021c992..185aecb7f4 100644 --- a/test/WebSites/OutOfProcessWebSite/Startup.cs +++ b/test/WebSites/OutOfProcessWebSite/Startup.cs @@ -98,6 +98,7 @@ namespace TestSites } catch(UnauthorizedAccessException) { + // TODO calling delete on the file will succeed when running with IIS return context.Response.WriteAsync("Hello World"); } diff --git a/test/WebSites/StressTestWebSite/Startup.cs b/test/WebSites/StressTestWebSite/Startup.cs index 41eea8728c..68f6eb1f77 100644 --- a/test/WebSites/StressTestWebSite/Startup.cs +++ b/test/WebSites/StressTestWebSite/Startup.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using System.Threading; using System.Text; using System.Net.WebSockets; -using IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; diff --git a/test/WebSites/shared/WebSockets/Constants.cs b/test/WebSites/shared/WebSockets/Constants.cs index 3a27d854f5..95b53003cc 100644 --- a/test/WebSites/shared/WebSockets/Constants.cs +++ b/test/WebSites/shared/WebSockets/Constants.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public static class Constants { diff --git a/test/WebSites/shared/WebSockets/HandshakeHelpers.cs b/test/WebSites/shared/WebSockets/HandshakeHelpers.cs index d477f9113b..b079ea3f85 100644 --- a/test/WebSites/shared/WebSockets/HandshakeHelpers.cs +++ b/test/WebSites/shared/WebSockets/HandshakeHelpers.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Security.Cryptography; using System.Text; -namespace IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { internal static class HandshakeHelpers { From 3ec66beecd8b47bb63713b10d36e17fad465fc0c Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 6 Jul 2018 17:02:54 -0700 Subject: [PATCH 119/363] Move IIS tests to a test group --- test/IIS.FunctionalTests/IIS.FunctionalTests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index 718053f101..cc02e6d69e 100644 --- a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -2,6 +2,7 @@ netcoreapp2.2 + IIS.FunctionalTests From 96b42dc82790b9c34e0d220b8b4a62172a9b79f8 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 8 Jul 2018 12:16:24 -0700 Subject: [PATCH 120/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 64 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 106a216654..7b99d5e296 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,42 +1,42 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 0.10.13 - 2.2.0-preview1-17090 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 0.6.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 + 2.2.0-preview1-17099 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 0.6.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 15.6.82 15.6.82 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.0.0 - 2.1.0 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.0.7 + 2.1.1 2.2.0-preview1-26618-02 - 2.2.0-preview1-34530 + 2.2.0-preview1-34640 15.6.1 11.1.0 2.0.3 @@ -50,7 +50,7 @@ 4.6.0-preview1-26617-01 9.0.1 2.3.1 - 2.4.0-beta.1.build3945 + 2.4.0-rc.1.build4038 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 3e694b2ed8..8b9d17825f 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17090 -commithash:b19e903e946579cd9482089bce7d917e8bacd765 +version:2.2.0-preview1-17099 +commithash:263ed1db9866b6b419b1f5d5189a712aa218acb3 From 4a7d15b9e5500ec1d1bf8feccef632bbb07b8a59 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 8 Jul 2018 19:56:38 +0000 Subject: [PATCH 121/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 60 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 247de66dd7..18a4940549 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,42 +1,42 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 0.10.13 - 3.0.0-alpha1-10000 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 0.7.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 + 3.0.0-alpha1-10005 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 0.7.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 15.6.82 15.6.82 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 - 3.0.0-alpha1-10016 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 + 3.0.0-alpha1-10044 2.0.0 2.1.0 2.2.0-preview1-26618-02 - 3.0.0-alpha1-10016 + 3.0.0-alpha1-10044 15.6.1 11.1.0 2.0.3 @@ -50,7 +50,7 @@ 4.6.0-preview1-26617-01 9.0.1 2.3.1 - 2.4.0-beta.1.build3945 + 2.4.0-rc.1.build4038 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 3f870e51fe..2395ab5956 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-10000 -commithash:b7b88d08d55abc8b71de9abf16e26fc713e332cd +version:3.0.0-alpha1-10005 +commithash:05570853de976a526462ca140a55b1ac59d9a351 From cbfd791d7b929ec86be5c7792c6f7f3fa8f3b7f8 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 9 Jul 2018 09:54:48 -0700 Subject: [PATCH 122/363] Make facts and theories conditional (#1023) --- .../InProcess/StartupTests.cs | 2 +- .../OutOfProcess/GlobalVersionTests.cs | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 14bdceb024..5fbc821d29 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal("Hello World", responseText); } - [Fact] + [ConditionalFact] public async Task DetectsOveriddenServer() { var deploymentResult = await DeployAsync(GetBaseDeploymentParameters("OverriddenServerWebSite")); diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index 3edfdafb22..fd53c0ffbb 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using System.Xml.Linq; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Abstractions; @@ -21,7 +22,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private const string _helloWorldResponse = "Hello World"; private const string _outOfProcessVersionVariable = "/p:AspNetCoreModuleOutOfProcessVersion="; - [Fact] + [ConditionalFact] public async Task GlobalVersion_DefaultWorks() { var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); @@ -45,7 +46,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(_helloWorldResponse, responseText); } - [Theory] // Tests need to publish to change folder locations + [ConditionalTheory] [InlineData("2.1.0")] [InlineData("2.1.0-preview")] public async Task GlobalVersion_NewVersionNumber_Fails(string version) @@ -60,7 +61,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.False(response.IsSuccessStatusCode); } - [Theory] // Tests need to publish to change folder locations + [ConditionalTheory] [InlineData("2.1.0")] [InlineData("2.1.0-preview")] public async Task GlobalVersion_NewVersionNumber(string version) @@ -78,7 +79,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests AssertLoadedVersion(version); } - [Theory] // Tests need to publish to change folder locations + [ConditionalTheory] [InlineData("2.1.0")] [InlineData("2.1.0-preview")] public async Task GlobalVersion_MultipleRequestHandlers_PicksHighestOne(string version) @@ -103,7 +104,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests AssertLoadedVersion(version); } - [Theory] + [ConditionalTheory] [InlineData("2.1.0")] [InlineData("2.1.0-preview")] public async Task GlobalVersion_MultipleRequestHandlers_UpgradeWorks(string version) From f7936ac062ab1cf78811333059e63e1e4e5875d0 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 9 Jul 2018 16:17:33 -0700 Subject: [PATCH 123/363] Finish up appoffline refactoring (#1018) --- .../AspNetCore/AspNetCore.vcxproj | 3 - .../AspNetCore/Inc/applicationinfo.h | 37 +--- .../AspNetCore/Inc/applicationmanager.h | 44 +--- .../AspNetCore/Inc/appoffline.h | 105 --------- .../AspNetCore/Inc/precomp.hxx | 3 +- .../AspNetCore/src/applicationinfo.cpp | 202 +++++------------- .../AspNetCore/src/applicationmanager.cxx | 11 +- .../AspNetCore/src/proxymodule.cxx | 43 +--- .../CommonLib/CommonLib.vcxproj | 2 + .../PollingAppOfflineApplication.cpp | 133 ++++++++++++ .../CommonLib/PollingAppOfflineApplication.h | 57 +++++ .../CommonLib/application.h | 11 +- .../CommonLib/aspnetcore_msg.mc | 2 +- .../CommonLib/iapplication.h | 1 + .../CommonLib/requesthandler.h | 17 +- src/AspNetCoreModuleV2/CommonLib/resources.h | 2 +- .../InProcessApplicationBase.cpp | 21 +- .../InProcessApplicationBase.h | 10 +- .../StartupExceptionApplication.cpp | 7 +- .../StartupExceptionApplication.h | 70 +++--- .../StartupExceptionHandler.cpp | 13 +- .../StartupExceptionHandler.h | 12 +- .../InProcessRequestHandler/dllmain.cxx | 24 ++- .../inprocessapplication.cpp | 15 +- .../inprocessapplication.h | 19 +- .../inprocesshandler.cpp | 6 +- .../inprocesshandler.h | 1 - .../OutOfProcessRequestHandler/dllmain.cxx | 44 +--- .../outofprocess/outprocessapplication.cpp | 37 ++-- .../outofprocess/outprocessapplication.h | 18 +- .../outofprocess/processmanager.cxx | 5 + .../outofprocess/processmanager.h | 12 ++ .../AppOfflineTrackingApplication.cpp | 62 ++++++ .../AppOfflineTrackingApplication.h | 36 ++++ .../RequestHandlerLib.vcxproj | 6 +- .../filewatcher.cpp} | 25 +-- .../Inc => RequestHandlerLib}/filewatcher.h | 23 +- .../RequestHandlerLib/requesthandler_config.h | 7 +- .../RequestHandlerLib/stdafx.h | 2 - .../Utilities/Helpers.cs | 11 +- test/CommonLibTests/fakeclasses.h | 11 +- .../inprocess_application_tests.cpp | 19 +- .../InProcess/AppOfflineTests.cs | 61 ++++-- .../InProcess/AuthenticationTests.cs | 2 +- .../InProcess/LoggingTests.cs | 2 +- .../InProcess/ShutdownTests.cs | 2 +- 46 files changed, 634 insertions(+), 622 deletions(-) delete mode 100644 src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h create mode 100644 src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp create mode 100644 src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h rename src/AspNetCoreModuleV2/{AspNetCore/src/filewatcher.cxx => RequestHandlerLib/filewatcher.cpp} (97%) rename src/AspNetCoreModuleV2/{AspNetCore/Inc => RequestHandlerLib}/filewatcher.h (88%) diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index db4a1edf2d..1a80711d26 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -226,11 +226,9 @@ - - @@ -239,7 +237,6 @@ - Create diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h index f6f5890b8e..92b5aaff81 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h @@ -3,17 +3,12 @@ #pragma once -#include - #include "hostfxroptions.h" -#include "appoffline.h" -#include "filewatcher.h" #include "hashtable.h" #include "hashfn.h" #include "aspnetcore_shim_config.h" #include "iapplication.h" #include "SRWSharedLock.h" -#include "ntassert.h" #define API_BUFFER_TOO_SMALL 0x80008098 @@ -37,11 +32,8 @@ public: APPLICATION_INFO() : m_pServer(NULL), m_cRefs(1), - m_fAppOfflineFound(FALSE), m_fValid(FALSE), - m_fDoneAppCreation(FALSE), - m_pAppOfflineHtm(NULL), - m_pFileWatcherEntry(NULL), + m_fAppCreationAttempted(FALSE), m_pConfiguration(NULL), m_pfnAspNetCoreCreateApplication(NULL) { @@ -60,8 +52,7 @@ public: HRESULT Initialize( _In_ IHttpServer *pServer, - _In_ IHttpApplication *pApplication, - _In_ FILE_WATCHER *pFileWatcher + _In_ IHttpApplication *pApplication ); VOID @@ -79,18 +70,6 @@ public: } } - APP_OFFLINE_HTM* - QueryAppOfflineHtm() - { - return m_pAppOfflineHtm; - } - - BOOL - AppOfflineFound() - { - return m_fAppOfflineFound; - } - BOOL IsValid() { @@ -103,19 +82,12 @@ public: m_fValid = TRUE; } - VOID - UpdateAppOfflineFileHandle(); - - HRESULT - StartMonitoringAppOffline(); - ASPNETCORE_SHIM_CONFIG* QueryConfig() { return m_pConfiguration; } - // // ExtractApplication will increase the reference counter of the application // Caller is responsible for dereference the application. @@ -152,11 +124,8 @@ private: mutable LONG m_cRefs; STRU m_struInfoKey; - BOOL m_fAppOfflineFound; BOOL m_fValid; - BOOL m_fDoneAppCreation; - APP_OFFLINE_HTM *m_pAppOfflineHtm; - FILE_WATCHER_ENTRY *m_pFileWatcherEntry; + BOOL m_fAppCreationAttempted; ASPNETCORE_SHIM_CONFIG *m_pConfiguration; IAPPLICATION *m_pApplication; SRWLOCK m_srwLock; diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h index dac98163f5..5245af06d5 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h @@ -5,7 +5,7 @@ #include "applicationinfo.h" #include "multisz.h" -#include "filewatcher.h" +#include "exceptions.h" #define DEFAULT_HASH_BUCKETS 17 @@ -83,11 +83,6 @@ public: ~APPLICATION_MANAGER() { - if (m_pFileWatcher != NULL) - { - delete m_pFileWatcher; - m_pFileWatcher = NULL; - } if(m_pApplicationInfoHash != NULL) { @@ -97,41 +92,18 @@ public: } } - FILE_WATCHER* - GetFileWatcher() - { - return m_pFileWatcher; - } - HRESULT Initialize() { - HRESULT hr = S_OK; - if(m_pApplicationInfoHash == NULL) { - m_pApplicationInfoHash = new APPLICATION_INFO_HASH(); - - hr = m_pApplicationInfoHash->Initialize(DEFAULT_HASH_BUCKETS); - if(FAILED(hr)) + try { - goto Finished; + m_pApplicationInfoHash = new APPLICATION_INFO_HASH(); } + CATCH_RETURN(); + RETURN_IF_FAILED(m_pApplicationInfoHash->Initialize(DEFAULT_HASH_BUCKETS)); } - - if( m_pFileWatcher == NULL ) - { - m_pFileWatcher = new FILE_WATCHER; - if(m_pFileWatcher == NULL) - { - hr = HRESULT_FROM_WIN32( ERROR_NOT_ENOUGH_MEMORY ); - goto Finished; - } - - m_pFileWatcher->Create(); - } - - Finished: - return hr; + return S_OK; } private: @@ -139,13 +111,11 @@ private: // we currently limit the size of m_pstrErrorInfo to 5000, be careful if you want to change its payload // APPLICATION_MANAGER() : m_pApplicationInfoHash(NULL), - m_pFileWatcher(NULL), - m_hostingModel(HOSTING_UNKNOWN) + m_hostingModel(HOSTING_UNKNOWN) { InitializeSRWLock(&m_srwLock); } - FILE_WATCHER *m_pFileWatcher; APPLICATION_INFO_HASH *m_pApplicationInfoHash; static APPLICATION_MANAGER *sm_pApplicationManager; SRWLOCK m_srwLock; diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h deleted file mode 100644 index 0f985ca64d..0000000000 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h +++ /dev/null @@ -1,105 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#pragma once - -#include "stringa.h" -#include "stringu.h" - -class APP_OFFLINE_HTM -{ -public: - APP_OFFLINE_HTM(LPCWSTR pszPath) : m_cRefs(1) - { - m_Path.Copy(pszPath); - } - - VOID - ReferenceAppOfflineHtm() const - { - InterlockedIncrement(&m_cRefs); - } - - VOID - DereferenceAppOfflineHtm() const - { - if (InterlockedDecrement(&m_cRefs) == 0) - { - delete this; - } - } - - BOOL - Load( - VOID - ) - { - BOOL fResult = TRUE; - LARGE_INTEGER li = { 0 }; - CHAR *pszBuff = NULL; - HANDLE handle = INVALID_HANDLE_VALUE; - - handle = CreateFile(m_Path.QueryStr(), - GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - - if (handle == INVALID_HANDLE_VALUE) - { - if (HRESULT_FROM_WIN32(GetLastError()) == ERROR_FILE_NOT_FOUND) - { - fResult = FALSE; - } - - // This Load() member function is supposed be called only when the change notification event of file creation or file modification happens. - // If file is currenlty locked exclusively by other processes, we might get INVALID_HANDLE_VALUE even though the file exists. In that case, we should return TRUE here. - goto Finished; - } - - if (!GetFileSizeEx(handle, &li)) - { - goto Finished; - } - - if (li.HighPart != 0) - { - // > 4gb file size not supported - // todo: log a warning at event log - goto Finished; - } - - DWORD bytesRead = 0; - - if (li.LowPart > 0) - { - pszBuff = new CHAR[li.LowPart + 1]; - - if (ReadFile(handle, pszBuff, li.LowPart, &bytesRead, NULL)) - { - m_Contents.Copy(pszBuff, bytesRead); - } - } - - Finished: - if (handle != INVALID_HANDLE_VALUE) - { - CloseHandle(handle); - handle = INVALID_HANDLE_VALUE; - } - - if (pszBuff != NULL) - { - delete[] pszBuff; - pszBuff = NULL; - } - - return fResult; - } - - mutable LONG m_cRefs; - STRA m_Contents; - STRU m_Path; -}; diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx b/src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx index b0ee0b7e32..1191022c01 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx @@ -16,8 +16,9 @@ #include #include #include +#include #include "stringu.h" -#include "stringu.h" +#include "stringa.h" extern PVOID g_pModuleId; extern BOOL g_fAspnetcoreRHAssemblyLoaded; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 99251ddc4a..112915ba08 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -12,29 +12,14 @@ #include "SRWExclusiveLock.h" #include "GlobalVersionUtility.h" #include "exceptions.h" +#include "HandleWrapper.h" +#include "PollingAppOfflineApplication.h" const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; APPLICATION_INFO::~APPLICATION_INFO() { - if (m_pAppOfflineHtm != NULL) - { - m_pAppOfflineHtm->DereferenceAppOfflineHtm(); - m_pAppOfflineHtm = NULL; - } - - if (m_pFileWatcherEntry != NULL) - { - // Mark the entry as invalid, - // StopMonitor will close the file handle and trigger a FCN - // the entry will delete itself when processing this FCN - m_pFileWatcherEntry->MarkEntryInValid(); - m_pFileWatcherEntry->StopMonitor(); - m_pFileWatcherEntry->DereferenceFileWatcherEntry(); - m_pFileWatcherEntry = NULL; - } - if (m_pApplication != NULL) { // shutdown the application @@ -55,118 +40,24 @@ APPLICATION_INFO::~APPLICATION_INFO() HRESULT APPLICATION_INFO::Initialize( _In_ IHttpServer *pServer, - _In_ IHttpApplication *pApplication, - _In_ FILE_WATCHER *pFileWatcher + _In_ IHttpApplication *pApplication ) { HRESULT hr = S_OK; DBG_ASSERT(pServer); DBG_ASSERT(pApplication); - DBG_ASSERT(pFileWatcher); // todo: make sure Initialize should be called only once m_pServer = pServer; FINISHED_IF_NULL_ALLOC(m_pConfiguration = new ASPNETCORE_SHIM_CONFIG()); FINISHED_IF_FAILED(m_pConfiguration->Populate(m_pServer, pApplication)); FINISHED_IF_FAILED(m_struInfoKey.Copy(pApplication->GetApplicationId())); - FINISHED_IF_NULL_ALLOC(m_pFileWatcherEntry = new FILE_WATCHER_ENTRY(pFileWatcher)); - - UpdateAppOfflineFileHandle(); Finished: return hr; } -HRESULT -APPLICATION_INFO::StartMonitoringAppOffline() -{ - if (m_pFileWatcherEntry != NULL) - { - RETURN_IF_FAILED(m_pFileWatcherEntry->Create(m_pConfiguration->QueryApplicationPhysicalPath()->QueryStr(), L"app_offline.htm", this, NULL)); - } - return S_OK; -} - -// -// Called by the file watcher when the app_offline.htm's file status has been changed. -// If it finds it, we will call recycle on the application. -// -VOID -APPLICATION_INFO::UpdateAppOfflineFileHandle() -{ - STRU strFilePath; - UTILITY::ConvertPathToFullPath(L".\\app_offline.htm", - m_pConfiguration->QueryApplicationPhysicalPath()->QueryStr(), - &strFilePath); - APP_OFFLINE_HTM *pOldAppOfflineHtm = NULL; - APP_OFFLINE_HTM *pNewAppOfflineHtm = NULL; - - ReferenceApplicationInfo(); - - if (INVALID_FILE_ATTRIBUTES == GetFileAttributes(strFilePath.QueryStr())) - { - // Check if app offline was originally present. - // if it was, log that app_offline has been dropped. - if (m_fAppOfflineFound) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, - ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_REMOVED, - ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_REMOVED_MSG); - } - - m_fAppOfflineFound = FALSE; - } - else - { - pNewAppOfflineHtm = new APP_OFFLINE_HTM(strFilePath.QueryStr()); - - if (pNewAppOfflineHtm != NULL) - { - if (pNewAppOfflineHtm->Load()) - { - // - // loaded the new app_offline.htm - // - pOldAppOfflineHtm = (APP_OFFLINE_HTM *)InterlockedExchangePointer((VOID**)&m_pAppOfflineHtm, pNewAppOfflineHtm); - - if (pOldAppOfflineHtm != NULL) - { - pOldAppOfflineHtm->DereferenceAppOfflineHtm(); - pOldAppOfflineHtm = NULL; - } - } - else - { - // ignored the new app_offline file because the file does not exist. - pNewAppOfflineHtm->DereferenceAppOfflineHtm(); - pNewAppOfflineHtm = NULL; - } - } - - m_fAppOfflineFound = TRUE; - - // recycle the application - if (m_pApplication != NULL) - { - STACK_STRU(strEventMsg, 256); - if (SUCCEEDED(strEventMsg.SafeSnwprintf( - ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG, - m_pConfiguration->QueryApplicationPhysicalPath()->QueryStr()))) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, - ASPNETCORE_EVENT_RECYCLE_APPOFFLINE, - strEventMsg.QueryStr()); - } - - RecycleApplication(); - } - } - - DereferenceApplicationInfo(); -} HRESULT APPLICATION_INFO::EnsureApplicationCreated( @@ -179,57 +70,68 @@ APPLICATION_INFO::EnsureApplicationCreated( STRU struHostFxrDllLocation; STACK_STRU(struFileName, 300); // >MAX_PATH - if (m_pApplication != NULL) + if (m_pApplication != nullptr && m_pApplication->QueryStatus() != RECYCLED) { return S_OK; } - // one optimization for failure scenario is to reduce the lock scope SRWExclusiveLock lock(m_srwLock); + if (m_pApplication != nullptr) { - if (m_pApplication != NULL) + if (m_pApplication->QueryStatus() == RECYCLED) { - // another thread created the applicaiton - FINISHED(S_OK); + LOG_INFO("Application went offline"); + // Application that went offline + // are supposed to recycle themselves + m_pApplication->DereferenceApplication(); + m_pApplication = nullptr; } - else if (m_fDoneAppCreation) + else { - // previous CreateApplication failed - FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); + // another thread created the application + FINISHED(S_OK); + } + } + else if (m_fAppCreationAttempted) + { + // previous CreateApplication failed + FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); + } + + auto& httpApplication = *pHttpContext->GetApplication(); + if (PollingAppOfflineApplication::ShouldBeStarted(httpApplication)) + { + LOG_INFO("Detected app_ofline file, creating polling application"); + m_pApplication = new PollingAppOfflineApplication(httpApplication); + } + else + { + // Move the request handler check inside of the lock + // such that only one request finds and loads it. + // FindRequestHandlerAssembly obtains a global lock, but after releasing the lock, + // there is a period where we could call + + m_fAppCreationAttempted = TRUE; + FINISHED_IF_FAILED(FindRequestHandlerAssembly(struExeLocation)); + + if (m_pfnAspNetCoreCreateApplication == NULL) + { + FINISHED(HRESULT_FROM_WIN32(ERROR_INVALID_FUNCTION)); } - // - // in case of app offline, we don't want to create a new application now - // - if (!m_fAppOfflineFound) - { - // Move the request handler check inside of the lock - // such that only one request finds and loads it. - // FindRequestHandlerAssembly obtains a global lock, but after releasing the lock, - // there is a period where we could call + std::array parameters { + {"InProcessExeLocation", struExeLocation.QueryStr()} + }; + LOG_INFO("Creating handler application"); + FINISHED_IF_FAILED(m_pfnAspNetCoreCreateApplication( + m_pServer, + pHttpContext->GetApplication(), + parameters.data(), + static_cast(parameters.size()), + &pApplication)); - m_fDoneAppCreation = TRUE; - FINISHED_IF_FAILED(FindRequestHandlerAssembly(struExeLocation)); - - if (m_pfnAspNetCoreCreateApplication == NULL) - { - FINISHED(HRESULT_FROM_WIN32(ERROR_INVALID_FUNCTION)); - } - - std::array parameters { - {"InProcessExeLocation", struExeLocation.QueryStr()} - }; - - FINISHED_IF_FAILED(m_pfnAspNetCoreCreateApplication( - m_pServer, - pHttpContext->GetApplication(), - parameters.data(), - static_cast(parameters.size()), - &pApplication)); - - m_pApplication = pApplication; - } + m_pApplication = pApplication; } Finished: diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx index e492b53f04..71fb2e464f 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx @@ -57,7 +57,7 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( { pApplicationInfo = new APPLICATION_INFO(); - FINISHED_IF_FAILED(pApplicationInfo->Initialize(pServer, pHttpContext->GetApplication(), m_pFileWatcher)); + FINISHED_IF_FAILED(pApplicationInfo->Initialize(pServer, pHttpContext->GetApplication())); SRWExclusiveLock lock(m_srwLock); @@ -102,10 +102,7 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( FINISHED_IF_FAILED(m_pApplicationInfoHash->InsertRecord(pApplicationInfo)); - *ppApplicationInfo = pApplicationInfo; - pApplicationInfo->StartMonitoringAppOffline(); - pApplicationInfo = NULL; } @@ -323,12 +320,6 @@ APPLICATION_MANAGER::ShutDown() g_fInShutdown = TRUE; if (m_pApplicationInfoHash != NULL) { - if (m_pFileWatcher != NULL) - { - delete m_pFileWatcher; - m_pFileWatcher = NULL; - } - DBG_ASSERT(m_pApplicationInfoHash); // During shutdown we lock until we delete the application diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index 6987863616..2289143202 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -107,37 +107,6 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( goto Finished; } - // app_offline check to avoid loading aspnetcorerh.dll unnecessarily - if (m_pApplicationInfo->AppOfflineFound()) - { - // servicing app_offline - HTTP_DATA_CHUNK DataChunk; - IHttpResponse *pResponse = NULL; - APP_OFFLINE_HTM *pAppOfflineHtm = NULL; - - pResponse = pHttpContext->GetResponse(); - pAppOfflineHtm = m_pApplicationInfo->QueryAppOfflineHtm(); - DBG_ASSERT(pAppOfflineHtm); - DBG_ASSERT(pResponse); - - // Ignore failure hresults as nothing we can do - // Set fTrySkipCustomErrors to true as we want client see the offline content - pResponse->SetStatus(503, "Service Unavailable", 0, hr, NULL, TRUE); - pResponse->SetHeader("Content-Type", - "text/html", - (USHORT)strlen("text/html"), - FALSE - ); - - DataChunk.DataChunkType = HttpDataChunkFromMemory; - DataChunk.FromMemory.pBuffer = (PVOID)pAppOfflineHtm->m_Contents.QueryStr(); - DataChunk.FromMemory.BufferLength = pAppOfflineHtm->m_Contents.QueryCB(); - pResponse->WriteEntityChunkByReference(&DataChunk); - - retVal = RQ_NOTIFICATION_FINISH_REQUEST; - goto Finished; - } - // make sure assmebly is loaded and application is created hr = m_pApplicationInfo->EnsureApplicationCreated(pHttpContext); if (FAILED(hr)) @@ -147,18 +116,18 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( m_pApplicationInfo->ExtractApplication(&pApplication); - // make sure application is in running state - // cannot recreate the application as we cannot reload clr for inprocess - if (pApplication != NULL && - pApplication->QueryStatus() != APPLICATION_STATUS::RUNNING && + DBG_ASSERT(pHttpContext); + + // We allow OFFLINE application to serve pages + if (pApplication->QueryStatus() != APPLICATION_STATUS::RUNNING && pApplication->QueryStatus() != APPLICATION_STATUS::STARTING) { hr = HRESULT_FROM_WIN32(ERROR_SERVER_DISABLED); goto Finished; } + // Create RequestHandler and process the request - hr = pApplication->CreateHandler(pHttpContext, - &m_pHandler); + hr = pApplication->CreateHandler(pHttpContext, &m_pHandler); if (FAILED(hr)) { diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index bb34327e27..efeb7f1ddc 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -205,6 +205,7 @@ + @@ -221,6 +222,7 @@ + diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp new file mode 100644 index 0000000000..3b07cf8645 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp @@ -0,0 +1,133 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "PollingAppOfflineApplication.h" + +#include +#include "SRWExclusiveLock.h" +#include "HandleWrapper.h" + +HRESULT PollingAppOfflineApplication::CreateHandler(IHttpContext* pHttpContext, IREQUEST_HANDLER** pRequestHandler) +{ + try + { + *pRequestHandler = new PollingAppOfflineHandler(pHttpContext, m_strAppOfflineContent); + } + CATCH_RETURN(); + + return S_OK; +} + +APPLICATION_STATUS PollingAppOfflineApplication::QueryStatus() +{ + if (AppOfflineExists()) + { + return APPLICATION_STATUS::RUNNING; + } + + return APPLICATION_STATUS::RECYCLED; +} + +bool +PollingAppOfflineApplication::AppOfflineExists() +{ + const auto ulCurrentTime = GetTickCount64(); + // + // we only care about app offline presented. If not, it means the application has started + // and is monitoring the app offline file + // we cache the file exist check result for 1 second + // + if (ulCurrentTime - m_ulLastCheckTime > c_appOfflineRefreshIntervalMS) + { + SRWExclusiveLock lock(m_statusLock); + if (ulCurrentTime - m_ulLastCheckTime > c_appOfflineRefreshIntervalMS) + { + m_fAppOfflineFound = is_regular_file(m_appOfflineLocation); + if(m_fAppOfflineFound) + { + LOG_IF_FAILED(LoadAppOfflineContent()); + } + m_ulLastCheckTime = ulCurrentTime; + } + } + return m_fAppOfflineFound; +} + +HRESULT PollingAppOfflineApplication::LoadAppOfflineContent() +{ + LARGE_INTEGER li = {}; + + HandleWrapper handle = CreateFile(m_appOfflineLocation.c_str(), + GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + nullptr, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + nullptr); + + RETURN_LAST_ERROR_IF(handle == INVALID_HANDLE_VALUE); + + RETURN_LAST_ERROR_IF (!GetFileSizeEx(handle, &li)); + + if (li.HighPart != 0) + { + // > 4gb file size not supported + // todo: log a warning at event log + return TRUE; + } + + if (li.LowPart > 0) + { + DWORD bytesRead = 0; + std::string pszBuff(li.LowPart + 1, '\0'); + + RETURN_LAST_ERROR_IF(!ReadFile(handle, pszBuff.data(), li.LowPart, &bytesRead, NULL)); + pszBuff.resize(bytesRead); + + m_strAppOfflineContent = pszBuff; + } + + return S_OK; +} + +bool PollingAppOfflineApplication::ShouldBeStarted(IHttpApplication& pApplication) +{ + return is_regular_file(GetAppOfflineLocation(pApplication)); +} + +std::experimental::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpApplication& pApplication) +{ + return std::experimental::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm"; +} + +void PollingAppOfflineApplication::ShutDown() +{ +} + +void PollingAppOfflineApplication::Recycle() +{ +} + +REQUEST_NOTIFICATION_STATUS PollingAppOfflineHandler::OnExecuteRequestHandler() +{ + HTTP_DATA_CHUNK DataChunk; + IHttpResponse* pResponse = m_pContext->GetResponse(); + + DBG_ASSERT(pResponse); + + // Ignore failure hresults as nothing we can do + // Set fTrySkipCustomErrors to true as we want client see the offline content + pResponse->SetStatus(503, "Service Unavailable", 0, S_OK, nullptr, TRUE); + pResponse->SetHeader("Content-Type", + "text/html", + static_cast(strlen("text/html")), + FALSE + ); + + DataChunk.DataChunkType = HttpDataChunkFromMemory; + DataChunk.FromMemory.pBuffer = m_strAppOfflineContent.data(); + DataChunk.FromMemory.BufferLength = static_cast(m_strAppOfflineContent.size()); + pResponse->WriteEntityChunkByReference(&DataChunk); + + return REQUEST_NOTIFICATION_STATUS::RQ_NOTIFICATION_FINISH_REQUEST; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h new file mode 100644 index 0000000000..e66f5f46c8 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h @@ -0,0 +1,57 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#pragma once +#include +#include "application.h" +#include "requesthandler.h" + +class PollingAppOfflineApplication: public APPLICATION +{ +public: + PollingAppOfflineApplication(IHttpApplication& pApplication) + : + m_ulLastCheckTime(0), + m_appOfflineLocation(GetAppOfflineLocation(pApplication)), + m_fAppOfflineFound(false) + { + InitializeSRWLock(&m_statusLock); + } + + HRESULT CreateHandler(IHttpContext* pHttpContext, IREQUEST_HANDLER** pRequestHandler) override; + + APPLICATION_STATUS QueryStatus() override; + bool AppOfflineExists(); + HRESULT LoadAppOfflineContent(); + static bool ShouldBeStarted(IHttpApplication& pApplication); + void ShutDown() override; + void Recycle() override; + +private: + static const int c_appOfflineRefreshIntervalMS = 200; + static std::experimental::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication); + std::string m_strAppOfflineContent; + ULONGLONG m_ulLastCheckTime; + std::experimental::filesystem::path m_appOfflineLocation; + bool m_fAppOfflineFound; + SRWLOCK m_statusLock {}; +}; + + +class PollingAppOfflineHandler: public REQUEST_HANDLER +{ +public: + PollingAppOfflineHandler(IHttpContext* pContext, const std::string appOfflineContent) + : m_pContext(pContext), + m_strAppOfflineContent(appOfflineContent) + { + } + + REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override; + +private: + IHttpContext* m_pContext; + std::string m_strAppOfflineContent; +}; + + diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index 0c0752f0c4..56cf5ce2ac 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -4,12 +4,18 @@ #pragma once #include "iapplication.h" +#include "exceptions.h" +#include "utility.h" #include "ntassert.h" + class APPLICATION : public IAPPLICATION { public: + // Non-copyable + APPLICATION(const APPLICATION&) = delete; + const APPLICATION& operator=(const APPLICATION&) = delete; APPLICATION_STATUS QueryStatus() override @@ -33,8 +39,7 @@ public: { DBG_ASSERT(m_cRefs != 0); - LONG cRefs = 0; - if ((cRefs = InterlockedDecrement(&m_cRefs)) == 0) + if (InterlockedDecrement(&m_cRefs) == 0) { delete this; } @@ -42,7 +47,7 @@ public: protected: volatile APPLICATION_STATUS m_status = APPLICATION_STATUS::UNKNOWN; - private: + mutable LONG m_cRefs; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc index 5ea3c030d2..13781f7c82 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc +++ b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc @@ -171,7 +171,7 @@ Language=English . Messageid=1024 -SymbolicName=ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_REMOVED +SymbolicName=ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR Language=English %1 . diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h index dcec7a5e3e..590fd7e51a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/iapplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -11,6 +11,7 @@ enum APPLICATION_STATUS STARTING, RUNNING, SHUTDOWN, + RECYCLED, FAIL }; diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h index 4553ee5c87..ea4692f506 100644 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h @@ -24,13 +24,26 @@ public: { DBG_ASSERT(m_cRefs != 0); - LONG cRefs = 0; - if ((cRefs = InterlockedDecrement(&m_cRefs)) == 0) + if (InterlockedDecrement(&m_cRefs) == 0) { delete this; } } + REQUEST_NOTIFICATION_STATUS OnAsyncCompletion(DWORD cbCompletion, HRESULT hrCompletionStatus) override + { + UNREFERENCED_PARAMETER(cbCompletion); + UNREFERENCED_PARAMETER(hrCompletionStatus); + // We shouldn't get here in default implementation + DBG_ASSERT(FALSE); + return RQ_NOTIFICATION_FINISH_REQUEST; + } + + VOID TerminateRequest(bool fClientInitiated) override + { + UNREFERENCED_PARAMETER(fClientInitiated); + } + private: mutable LONG m_cRefs = 1; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index 153af6d3d0..4620fa7e17 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -33,7 +33,7 @@ #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x. Please check the stderr logs for more information." #define ASPNETCORE_EVENT_APP_IN_SHUTDOWN_MSG L"Application shutting down." #define ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG L"Application '%s' was recycled after detecting the app_offline file." -#define ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_REMOVED_MSG L"App_offline.htm has been removed from the application. Application will be recycled." +#define ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR_MSG L"Monitoring app_offline.htm failed for application '%s', ErrorCode '0x%x'. " #define ASPNETCORE_EVENT_RECYCLE_CONFIGURATION_MSG L"Application '%s' was recycled due to configuration change" #define ASPNETCORE_EVENT_RECYCLE_FAILURE_CONFIGURATION_MSG L"Failed to recycle application due to a configuration change at '%s'. Recycling worker process." #define ASPNETCORE_EVENT_MODULE_DISABLED_MSG L"AspNetCore Module is disabled" diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp index 2f3986a0f5..5848f37a2f 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp @@ -7,11 +7,12 @@ hostfxr_main_fn InProcessApplicationBase::s_fMainCallback = NULL; InProcessApplicationBase::InProcessApplicationBase( - IHttpServer *pHttpServer) - : - m_srwLock(), - m_fRecycleCalled(FALSE), - m_pHttpServer(pHttpServer) + IHttpServer& pHttpServer, + IHttpApplication& pHttpApplication) + : AppOfflineTrackingApplication(pHttpApplication), + m_fRecycleCalled(FALSE), + m_srwLock(), + m_pHttpServer(pHttpServer) { InitializeSRWLock(&m_srwLock); } @@ -39,23 +40,19 @@ InProcessApplicationBase::Recycle( m_fRecycleCalled = true; } - if (!m_pHttpServer->IsCommandLineLaunch()) + if (!m_pHttpServer.IsCommandLineLaunch()) { // IIS scenario. // We don't actually handle any shutdown logic here. // Instead, we notify IIS that the process needs to be recycled, which will call // ApplicationManager->Shutdown(). This will call shutdown on the application. - m_pHttpServer->RecycleProcess(L"AspNetCore InProcess Recycle Process on Demand"); + m_pHttpServer.RecycleProcess(L"AspNetCore InProcess Recycle Process on Demand"); } else { - // IISExpress scenario - // Try to graceful shutdown the managed application - // and call exit to terminate current process - ShutDown(); // If we set a static callback, we don't want to kill the current process as // that will kill the test process and means we are running in hostable webcore mode. - if (m_pHttpServer->IsCommandLineLaunch() + if (m_pHttpServer.IsCommandLineLaunch() && s_fMainCallback == NULL) { exit(0); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h index defcf3bdf8..bb312d4a09 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h @@ -5,15 +5,17 @@ #include "precomp.hxx" #include "application.h" -#include "requesthandler_config.h" +#include "AppOfflineTrackingApplication.h" typedef INT(*hostfxr_main_fn) (CONST DWORD argc, CONST PCWSTR argv[]); // TODO these may need to be BSTRs -class InProcessApplicationBase : public APPLICATION +class InProcessApplicationBase : public AppOfflineTrackingApplication { public: - InProcessApplicationBase(IHttpServer* pHttpServer); + InProcessApplicationBase( + IHttpServer& pHttpServer, + IHttpApplication& pHttpApplication); ~InProcessApplicationBase() = default; @@ -22,7 +24,7 @@ public: protected: BOOL m_fRecycleCalled; SRWLOCK m_srwLock; - IHttpServer* const m_pHttpServer; + IHttpServer& m_pHttpServer; // Allows to override call to hostfxr_main with custome callback // used in testing static hostfxr_main_fn s_fMainCallback; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp index 10d6ddb4af..675c639959 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp @@ -1,15 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. +#include "precomp.hxx" + #include "StartupExceptionApplication.h" VOID StartupExceptionApplication::ShutDown() { - exit(0); } -HRESULT StartupExceptionApplication::CreateHandler(IHttpContext *pContext, IREQUEST_HANDLER ** pRequestHandler) +HRESULT StartupExceptionApplication::CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler) { - *pRequestHandler = new StartupExceptionHandler(pContext, m_disableLogs, this); + *pRequestHandler = new StartupExceptionHandler(pHttpContext, m_disableLogs, this); return S_OK; } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h index 52658c8cda..0a2dc4fe58 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h @@ -3,68 +3,58 @@ #pragma once -#include "precomp.hxx" #include "InProcessApplicationBase.h" #include "StartupExceptionHandler.h" -#include "SRWExclusiveLock.h" class StartupExceptionApplication : public InProcessApplicationBase { public: - StartupExceptionApplication(IHttpServer* pServer, BOOL disableLogs) + StartupExceptionApplication( + IHttpServer& pServer, + IHttpApplication& pApplication, + BOOL disableLogs) : m_disableLogs(disableLogs), - m_pHttpServer(pServer), - InProcessApplicationBase(pServer) + InProcessApplicationBase(pServer, pApplication) { - InitializeSRWLock(&m_srwLock); m_status = APPLICATION_STATUS::RUNNING; + html500Page = std::string(" \ + \ + \ + \ + IIS 500.30 Error \ +
\ +

HTTP Error 500.30 - ANCM In-Process Start Failure

\ +
\ +

Common causes of this issue:

\ +
  • The application failed to start
    • \ +
  • The application started but then stopped
    • \ +
  • The application started but threw an exception during startup
\ +
\ +
\ +

Troubleshooting steps:

\ +
  • Check the system event log for error messages
    • \ +
  • Enable logging the application process' stdout messages
    • \ +
  • Attach a debugger to the application process and inspect
\ +

For more information visit: \ + https://go.microsoft.com/fwlink/?LinkID=808681

\ +
\ +
\ +
"); } ~StartupExceptionApplication() = default; - virtual VOID ShutDown() override; - virtual HRESULT CreateHandler(IHttpContext * pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override; + VOID ShutDown() override; + HRESULT CreateHandler(IHttpContext * pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override; std::string& GetStaticHtml500Content() { - { - SRWExclusiveLock lock(m_srwLock); - if (html500Page.empty()) - { - html500Page = std::string(" \ - \ - \ - \ - IIS 500.30 Error \ -
\ -

HTTP Error 500.30 - ANCM In-Process Start Failure

\ -
\ -

Common causes of this issue:

\ -
  • The application failed to start
    • \ -
  • The application started but then stopped
    • \ -
  • The application started but threw an exception during startup
\ -
\ -
\ -

Troubleshooting steps:

\ -
  • Check the system event log for error messages
    • \ -
  • Enable logging the application process' stdout messages
    • \ -
  • Attach a debugger to the application process and inspect
\ -

For more information visit: \ - https://go.microsoft.com/fwlink/?LinkID=808681

\ -
\ -
\ -
"); - } - } - return html500Page; } private: std::string html500Page; - SRWLOCK m_srwLock; BOOL m_disableLogs; - IHttpServer* m_pHttpServer; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp index b0817a4659..af38e7025e 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp @@ -1,6 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. +#include "precomp.hxx" + +#include "StartupExceptionApplication.h" #include "StartupExceptionHandler.h" REQUEST_NOTIFICATION_STATUS StartupExceptionHandler::OnExecuteRequestHandler() @@ -28,15 +31,5 @@ REQUEST_NOTIFICATION_STATUS StartupExceptionHandler::OnExecuteRequestHandler() } return REQUEST_NOTIFICATION_STATUS::RQ_NOTIFICATION_FINISH_REQUEST; - } -REQUEST_NOTIFICATION_STATUS StartupExceptionHandler::OnAsyncCompletion(DWORD , HRESULT ) -{ - return REQUEST_NOTIFICATION_STATUS::RQ_NOTIFICATION_FINISH_REQUEST; -} - -VOID StartupExceptionHandler::TerminateRequest(bool ) -{ - return VOID(); -} diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h index 859f3a73f5..9b5a9ba45d 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h @@ -3,21 +3,13 @@ #pragma once -#include "precomp.hxx" #include "requesthandler.h" -#include "StartupExceptionApplication.h" class StartupExceptionApplication; class StartupExceptionHandler : public REQUEST_HANDLER { public: - virtual REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override; - - virtual REQUEST_NOTIFICATION_STATUS OnAsyncCompletion(DWORD cbCompletion, HRESULT hrCompletionStatus) override; - - virtual VOID TerminateRequest(bool fClientInitiated) override; - StartupExceptionHandler(IHttpContext* pContext, BOOL disableLogs, StartupExceptionApplication* pApplication) : m_pContext(pContext), @@ -26,9 +18,7 @@ public: { } - ~StartupExceptionHandler() - { - } + REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override; private: IHttpContext * m_pContext; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx index 20314d34a4..ac1e1a0ae4 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -4,7 +4,6 @@ // dllmain.cpp : Defines the entry point for the DLL application. #include "precomp.hxx" -#include #include #include "inprocessapplication.h" @@ -39,7 +38,7 @@ InitializeGlobalConfiguration( g_pHttpServer = pServer; RETURN_IF_FAILED(ALLOC_CACHE_HANDLER::StaticInitialize()); RETURN_IF_FAILED(IN_PROCESS_HANDLER::StaticInitialize()); - + if (pServer->IsCommandLineLaunch()) { g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); @@ -89,27 +88,30 @@ CreateApplication( _Out_ IAPPLICATION **ppApplication ) { - REQUESTHANDLER_CONFIG *pConfig = NULL; try { - // Initialze some global variables here RETURN_IF_FAILED(InitializeGlobalConfiguration(pServer)); + + REQUESTHANDLER_CONFIG *pConfig = nullptr; RETURN_IF_FAILED(REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpApplication, &pConfig)); + std::unique_ptr pRequestHandlerConfig(pConfig); + + BOOL disableStartupPage = pConfig->QueryDisableStartUpErrorPage(); - auto config = std::unique_ptr(pConfig); - - const bool disableStartupPage = pConfig->QueryDisableStartUpErrorPage(); - - auto pApplication = std::make_unique(pServer, std::move(config), pParameters, nParameters); - + auto pApplication = std::make_unique(*pServer, *pHttpApplication, std::move(pRequestHandlerConfig), pParameters, nParameters); + if (FAILED_LOG(pApplication->LoadManagedApplication())) { // Set the currently running application to a fake application that returns startup exceptions. - *ppApplication = new StartupExceptionApplication(pServer, disableStartupPage); + auto pErrorApplication = std::make_unique(*pServer, *pHttpApplication, disableStartupPage); + + RETURN_IF_FAILED(pErrorApplication->StartMonitoringAppOffline()); + *ppApplication = pErrorApplication.release(); } else { + RETURN_IF_FAILED(pApplication->StartMonitoringAppOffline()); *ppApplication = pApplication.release(); } } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index a1cf301054..7714d9a9e4 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. +#include "precomp.hxx" #include "inprocessapplication.h" #include "inprocesshandler.h" #include "hostfxroptions.h" @@ -18,17 +19,17 @@ const LPCSTR IN_PROCESS_APPLICATION::s_exeLocationParameterName = "InProcessExeL IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL; IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( - IHttpServer *pHttpServer, + IHttpServer& pHttpServer, + IHttpApplication& pApplication, std::unique_ptr pConfig, APPLICATION_PARAMETER *pParameters, DWORD nParameters) : - InProcessApplicationBase(pHttpServer), + InProcessApplicationBase(pHttpServer, pApplication), m_pHttpServer(pHttpServer), m_ProcessExitCode(0), m_fBlockCallbacksIntoManaged(FALSE), m_fShutdownCalledFromNative(FALSE), m_fShutdownCalledFromManaged(FALSE), - m_fInitialized(FALSE), m_pConfig(std::move(pConfig)) { // is it guaranteed that we have already checked app offline at this point? @@ -664,14 +665,6 @@ IN_PROCESS_APPLICATION::RunDotnetApplication(DWORD argc, CONST PCWSTR* argv, hos return hr; } -// static - -REQUESTHANDLER_CONFIG* -IN_PROCESS_APPLICATION::QueryConfig() const -{ - return m_pConfig.get(); -} - HRESULT IN_PROCESS_APPLICATION::CreateHandler( _In_ IHttpContext *pHttpContext, diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index 034c36fc93..0bcd1cbd48 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -3,7 +3,6 @@ #pragma once -#include "precomp.hxx" #include "InProcessApplicationBase.h" #include "inprocesshandler.h" #include "requesthandler_config.h" @@ -17,7 +16,8 @@ class IN_PROCESS_APPLICATION : public InProcessApplicationBase { public: IN_PROCESS_APPLICATION( - IHttpServer* pHttpServer, + IHttpServer& pHttpServer, + IHttpApplication& pApplication, std::unique_ptr pConfig, APPLICATION_PARAMETER *pParameters, DWORD nParameters); @@ -105,17 +105,21 @@ public: return s_Application; } - REQUESTHANDLER_CONFIG* - QueryConfig() const; - PCWSTR QueryExeLocation() { return m_struExeLocation.QueryStr(); } + REQUESTHANDLER_CONFIG* + QueryConfig() + { + return m_pConfig.get(); + } + private: - IHttpServer* const m_pHttpServer; + + IHttpServer & m_pHttpServer; // Thread executing the .NET Core process HANDLE m_hThread; @@ -144,12 +148,11 @@ private: volatile BOOL m_fShutdownCalledFromManaged; BOOL m_fRecycleCalled; BOOL m_fInitialized; - + std::unique_ptr m_pConfig; static IN_PROCESS_APPLICATION* s_Application; IOutputManager* m_pLoggerProvider; - std::unique_ptr m_pConfig; static const LPCSTR s_exeLocationParameterName; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 5daf8d3604..1494eb158e 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. +#include "precomp.hxx" #include "inprocesshandler.h" #include "inprocessapplication.h" #include "aspnetcore_event.h" @@ -12,9 +13,10 @@ IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( _In_ IHttpContext *pW3Context, _In_ IN_PROCESS_APPLICATION *pApplication ): m_pW3Context(pW3Context), - m_pApplication(pApplication) + m_requestNotificationStatus(RQ_NOTIFICATION_PENDING), + m_pApplication(pApplication), + m_fManagedRequestComplete(FALSE) { - m_fManagedRequestComplete = FALSE; } IN_PROCESS_HANDLER::~IN_PROCESS_HANDLER() diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h index 24a29b737f..a9c068a751 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h @@ -3,7 +3,6 @@ #pragma once -#include "precomp.hxx" #include "requesthandler.h" class IN_PROCESS_APPLICATION; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx index c74f3cacaa..0855ae6566 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx @@ -148,7 +148,7 @@ EnsureOutOfProcessInitializtion() g_hWinHttpModule = GetModuleHandle(TEXT("winhttp.dll")); - g_hAspNetCoreModule = GetModuleHandle(TEXT("aspnetcore.dll")); + g_hAspNetCoreModule = GetModuleHandle(TEXT("aspnetcorev2.dll")); hr = WINHTTP_HELPER::StaticInitialize(); if (FAILED(hr)) @@ -279,42 +279,20 @@ CreateApplication( { UNREFERENCED_PARAMETER(pParameters); UNREFERENCED_PARAMETER(nParameters); - HRESULT hr = S_OK; - IAPPLICATION *pApplication = NULL; - REQUESTHANDLER_CONFIG *pConfig = NULL; - - // Initialze some global variables here + InitializeGlobalConfiguration(pServer); - hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpApplication, &pConfig); - if (FAILED(hr)) - { - return hr; - } + REQUESTHANDLER_CONFIG *pConfig = nullptr; + RETURN_IF_FAILED(REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpApplication, &pConfig)); + std::unique_ptr pRequestHandlerConfig(pConfig); - hr = EnsureOutOfProcessInitializtion(); - if (FAILED(hr)) - { - goto Finished; - } + RETURN_IF_FAILED(EnsureOutOfProcessInitializtion()); - pApplication = new OUT_OF_PROCESS_APPLICATION(pConfig); - if (pApplication == NULL) - { - hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); - goto Finished; - } + std::unique_ptr pApplication = std::make_unique(*pHttpApplication, std::move(pRequestHandlerConfig)); - hr = ((OUT_OF_PROCESS_APPLICATION*)pApplication)->Initialize(); - if (FAILED(hr)) - { - delete pApplication; - pApplication = NULL; - goto Finished; - } + RETURN_IF_FAILED(pApplication->Initialize()); + RETURN_IF_FAILED(pApplication->StartMonitoringAppOffline()); - *ppApplication = pApplication; - -Finished: - return hr; + *ppApplication = pApplication.release(); + return S_OK; } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp index 0457b4d552..ce29fd4745 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp @@ -1,9 +1,12 @@ #include "..\precomp.hxx" +#include "SRWExclusiveLock.h" OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION( - REQUESTHANDLER_CONFIG *pConfig) : + IHttpApplication& pApplication, + std::unique_ptr pConfig) : + AppOfflineTrackingApplication(pApplication), m_fWebSocketSupported(WEBSOCKET_STATUS::WEBSOCKET_UNKNOWN), - m_pConfig(pConfig) + m_pConfig(std::move(pConfig)) { m_status = APPLICATION_STATUS::RUNNING; m_pProcessManager = NULL; @@ -12,18 +15,13 @@ OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION( OUT_OF_PROCESS_APPLICATION::~OUT_OF_PROCESS_APPLICATION() { + SRWExclusiveLock lock(m_srwLock); if (m_pProcessManager != NULL) { - m_pProcessManager->ShutdownAllProcesses(); + m_pProcessManager->Shutdown(); m_pProcessManager->DereferenceProcessManager(); m_pProcessManager = NULL; } - - if (m_pConfig != NULL) - { - delete m_pConfig; - m_pConfig = NULL; - } } HRESULT @@ -56,29 +54,18 @@ OUT_OF_PROCESS_APPLICATION::GetProcess( _Out_ SERVER_PROCESS **ppServerProcess ) { - return m_pProcessManager->GetProcess(m_pConfig, QueryWebsocketStatus(), ppServerProcess); -} - -REQUESTHANDLER_CONFIG* -OUT_OF_PROCESS_APPLICATION::QueryConfig() const -{ - return m_pConfig; + return m_pProcessManager->GetProcess(m_pConfig.get(), QueryWebsocketStatus(), ppServerProcess); } __override VOID OUT_OF_PROCESS_APPLICATION::ShutDown() -{ - AcquireSRWLockExclusive(&m_srwLock); +{ + SRWExclusiveLock lock(m_srwLock); + if (m_pProcessManager != NULL) { - if (m_pProcessManager != NULL) - { - m_pProcessManager->ShutdownAllProcesses(); - m_pProcessManager->DereferenceProcessManager(); - m_pProcessManager = NULL; - } + m_pProcessManager->Shutdown(); } - ReleaseSRWLockExclusive(&m_srwLock); } __override diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.h index 9601178e63..8f51bf4216 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.h @@ -3,7 +3,9 @@ #pragma once -class OUT_OF_PROCESS_APPLICATION : public APPLICATION +#include "AppOfflineTrackingApplication.h" + +class OUT_OF_PROCESS_APPLICATION : public AppOfflineTrackingApplication { enum WEBSOCKET_STATUS { @@ -14,7 +16,8 @@ class OUT_OF_PROCESS_APPLICATION : public APPLICATION public: OUT_OF_PROCESS_APPLICATION( - REQUESTHANDLER_CONFIG *pConfig); + IHttpApplication& pApplication, + std::unique_ptr pConfig); __override ~OUT_OF_PROCESS_APPLICATION() override; @@ -44,14 +47,15 @@ public: _Out_ IREQUEST_HANDLER **pRequestHandler) override; - REQUESTHANDLER_CONFIG* - QueryConfig() - const; - BOOL QueryWebsocketStatus() const; + REQUESTHANDLER_CONFIG* QueryConfig() + { + return m_pConfig.get(); + } + private: VOID SetWebsocketStatus(IHttpContext *pHttpContext); @@ -60,6 +64,6 @@ private: SRWLOCK m_srwLock; IHttpServer *m_pHttpServer; - REQUESTHANDLER_CONFIG* m_pConfig; WEBSOCKET_STATUS m_fWebSocketSupported; + std::unique_ptr m_pConfig; }; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx index 7c75d65a0d..85160dc55b 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx @@ -114,6 +114,11 @@ PROCESS_MANAGER::GetProcess( DWORD dwProcessIndex = 0; SERVER_PROCESS *pSelectedServerProcess = NULL; + if (InterlockedCompareExchange(&m_lStopping, 1L, 1L) == 1L) + { + return hr = E_APPLICATION_EXITING; + } + if (!m_fServerProcessListReady) { AcquireSRWLockExclusive(&m_srwLock); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.h index b15da72486..764e77d595 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.h @@ -88,6 +88,16 @@ public: ReleaseSRWLockExclusive( &m_srwLock ); } + VOID + Shutdown( + ) + { + if (InterlockedCompareExchange(&m_lStopping, 1L, 0L) == 0L) + { + ShutdownAllProcesses(); + } + } + VOID IncrementRapidFailCount( VOID @@ -103,6 +113,7 @@ public: m_dwProcessesPerApplication( 1 ), m_dwRouteToProcessIndex( 0 ), m_fServerProcessListReady(FALSE), + m_lStopping(0), m_cRefs( 1 ) { m_ppServerProcessList = NULL; @@ -193,4 +204,5 @@ private: volatile static BOOL sm_fWSAStartupDone; volatile BOOL m_fServerProcessListReady; + volatile LONG m_lStopping; }; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp new file mode 100644 index 0000000000..7c335ceff1 --- /dev/null +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp @@ -0,0 +1,62 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "AppOfflineTrackingApplication.h" +#include "EventLog.h" +#include "exceptions.h" + +extern HANDLE g_hEventLog; + +HRESULT AppOfflineTrackingApplication::StartMonitoringAppOffline() +{ + LOG_INFOF("Starting app_offline monitoring in application %S", m_applicationPath.c_str()); + HRESULT hr = StartMonitoringAppOflineImpl(); + + if (FAILED_LOG(hr)) + { + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_WARNING_TYPE, + ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR, + ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR_MSG, + m_applicationPath.c_str(), + hr); + } + + return hr; +} + +HRESULT AppOfflineTrackingApplication::StartMonitoringAppOflineImpl() +{ + if (m_fileWatcher) + { + RETURN_IF_FAILED(E_UNEXPECTED); + } + + m_fileWatcher = std::make_unique(); + RETURN_IF_FAILED(m_fileWatcher->Create()); + m_fileWatcherEntry.reset(new FILE_WATCHER_ENTRY(m_fileWatcher.get())); + // FileWatcherCompletionRoutine calls dereference so we need to get ourselves a reference count + m_fileWatcherEntry->ReferenceFileWatcherEntry(); + RETURN_IF_FAILED(m_fileWatcherEntry->Create( + m_applicationPath.c_str(), + L"app_offline.htm", + std::bind(&AppOfflineTrackingApplication::OnAppOffline, this), + NULL)); + + return S_OK; +} + +void AppOfflineTrackingApplication::OnAppOffline() +{ + LOG_INFOF("Received app_offline notification in application %S", m_applicationPath.c_str()); + m_fileWatcherEntry->StopMonitor(); + m_status = APPLICATION_STATUS::RECYCLED; + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_INFORMATION_TYPE, + ASPNETCORE_EVENT_RECYCLE_APPOFFLINE, + ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG, + m_applicationPath.c_str()); + + Recycle(); +} diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h new file mode 100644 index 0000000000..776ae9913c --- /dev/null +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h @@ -0,0 +1,36 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#pragma once + +#include +#include "application.h" +#include "filewatcher.h" + +class AppOfflineTrackingApplication: public APPLICATION +{ +public: + AppOfflineTrackingApplication(const IHttpApplication& application) + : m_applicationPath(application.GetApplicationPhysicalPath()), + m_fileWatcher(nullptr), + m_fileWatcherEntry(nullptr) + { + } + + ~AppOfflineTrackingApplication() override = default; + + HRESULT + StartMonitoringAppOffline(); + + virtual + VOID + OnAppOffline(); + +private: + HRESULT + StartMonitoringAppOflineImpl(); + + std::wstring m_applicationPath; + std::unique_ptr m_fileWatcher; + std::unique_ptr m_fileWatcherEntry; +}; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj index 844328640e..8b1b24631e 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -1,4 +1,4 @@ - + @@ -188,7 +188,9 @@ + + @@ -199,7 +201,9 @@ + + diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp similarity index 97% rename from src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx rename to src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp index 4bb215b4ed..a35d8cb63c 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp @@ -1,11 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. +#include "stdafx.h" #include "filewatcher.h" -#include "ntassert.h" -#include "applicationinfo.h" - FILE_WATCHER::FILE_WATCHER() : m_hCompletionPort(NULL), m_hChangeNotificationThread(NULL), @@ -214,7 +212,7 @@ FILE_WATCHER_ENTRY::FILE_WATCHER_ENTRY(FILE_WATCHER * pFileMonitor) : _pFileMonitor(pFileMonitor), _hDirectory(INVALID_HANDLE_VALUE), _hImpersonationToken(NULL), - _pApplicationInfo(NULL), + _pCallback(), _lStopMonitorCalled(0), _cRefs(1), _fIsValid(TRUE) @@ -225,6 +223,8 @@ FILE_WATCHER_ENTRY::FILE_WATCHER_ENTRY(FILE_WATCHER * pFileMonitor) : FILE_WATCHER_ENTRY::~FILE_WATCHER_ENTRY() { + StopMonitor(); + _dwSignature = FILE_WATCHER_ENTRY_SIGNATURE_FREE; if (_hDirectory != INVALID_HANDLE_VALUE) @@ -330,16 +330,16 @@ HRESULT } } +Finished: + ReleaseSRWLockExclusive(&_srwLock); + if (fFileChanged) { // // so far we only monitoring app_offline // - _pApplicationInfo->UpdateAppOfflineFileHandle(); + _pCallback(); } - -Finished: - ReleaseSRWLockExclusive(&_srwLock); return hr; } @@ -399,7 +399,7 @@ HRESULT FILE_WATCHER_ENTRY::Create( _In_ PCWSTR pszDirectoryToMonitor, _In_ PCWSTR pszFileNameToMonitor, - _In_ APPLICATION_INFO* pApplicationInfo, + _In_ std::function pCallback, _In_ HANDLE hImpersonationToken ) { @@ -408,17 +408,14 @@ FILE_WATCHER_ENTRY::Create( if (pszDirectoryToMonitor == NULL || pszFileNameToMonitor == NULL || - pApplicationInfo == NULL) + pCallback == NULL) { DBG_ASSERT(FALSE); hr = HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); goto Finished; } - // - //remember the application - // - _pApplicationInfo = pApplicationInfo; + _pCallback = pCallback; if (FAILED(hr = _strFileName.Copy(pszFileNameToMonitor))) { diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h similarity index 88% rename from src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h rename to src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h index 8bcd746326..c010caefc0 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h @@ -1,20 +1,18 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. + #pragma once -#include - -#include "stringu.h" +#include +#include #define FILE_WATCHER_SHUTDOWN_KEY (ULONG_PTR)(-1) #define FILE_WATCHER_ENTRY_BUFFER_SIZE 4096 -#define FILE_NOTIFY_VALID_MASK 0x00000fff +#define FILE_NOTIFY_VALID_MASK 0x00000fff #define FILE_WATCHER_ENTRY_SIGNATURE ((DWORD) 'FWES') #define FILE_WATCHER_ENTRY_SIGNATURE_FREE ((DWORD) 'sewf') -class APPLICATION_INFO; - class FILE_WATCHER{ public: @@ -62,7 +60,7 @@ public: Create( _In_ PCWSTR pszDirectoryToMonitor, _In_ PCWSTR pszFileNameToMonitor, - _In_ APPLICATION_INFO* pApplicationInfo, + _In_ std::function pCallback, _In_ HANDLE hImpersonationToken ); @@ -111,11 +109,20 @@ private: HANDLE _hImpersonationToken; HANDLE _hDirectory; FILE_WATCHER* _pFileMonitor; - APPLICATION_INFO* _pApplicationInfo; STRU _strFileName; STRU _strDirectoryName; LONG _lStopMonitorCalled; mutable LONG _cRefs; BOOL _fIsValid; SRWLOCK _srwLock; + std::function _pCallback; +}; + + +struct FILE_WATCHER_ENTRY_DELETER +{ + void operator()(FILE_WATCHER_ENTRY* entry) const + { + entry->DereferenceFileWatcherEntry(); + } }; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h index a7369ca0e7..5ba8959317 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h @@ -54,7 +54,8 @@ enum APP_HOSTING_MODEL class REQUESTHANDLER_CONFIG { public: - virtual + + ~REQUESTHANDLER_CONFIG(); static @@ -217,7 +218,6 @@ protected: REQUESTHANDLER_CONFIG() : m_fStdoutLogEnabled(FALSE), m_pEnvironmentVariables(NULL), - m_cRefs(1), m_hostingModel(HOSTING_UNKNOWN), m_ppStrArguments(NULL) { @@ -229,8 +229,6 @@ protected: IHttpApplication *pHttpApplication ); - mutable LONG m_cRefs; - DWORD m_dwRequestTimeoutInMS; DWORD m_dwStartupTimeLimitInMS; DWORD m_dwShutdownTimeLimitInMS; @@ -254,4 +252,5 @@ protected: STRU m_struHostFxrLocation; PWSTR* m_ppStrArguments; DWORD m_dwArgc; + }; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h b/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h index 96c3ffe6de..fd6382710b 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h @@ -24,5 +24,3 @@ #include "dbgutil.h" #include "ahutil.h" #include "hashfn.h" - - diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 6915d955ec..f4114730b3 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -53,15 +53,20 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } // Defaults to inprocess specific deployment parameters - public static DeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite") + public static DeploymentParameters GetBaseDeploymentParameters(string site = null, HostingModel hostingModel = HostingModel.InProcess, bool publish = false) { + if (site == null) + { + site = hostingModel == HostingModel.InProcess ? "InProcessWebSite" : "OutOfProcessWebSite"; + } + return new DeploymentParameters(Helpers.GetTestWebSitePath(site), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, AncmVersion = AncmVersion.AspNetCoreModuleV2, - HostingModel = HostingModel.InProcess, - PublishApplicationBeforeDeployment = site == "InProcessWebSite", + HostingModel = hostingModel, + PublishApplicationBeforeDeployment = publish, }; } diff --git a/test/CommonLibTests/fakeclasses.h b/test/CommonLibTests/fakeclasses.h index 14c6f8dfee..ba792017c4 100644 --- a/test/CommonLibTests/fakeclasses.h +++ b/test/CommonLibTests/fakeclasses.h @@ -41,7 +41,6 @@ public: class MockElement : public IAppHostElement { public: - MOCK_METHOD2_WITH_CALLTYPE(__stdcall, QueryInterface, HRESULT(REFIID riid, void ** ppvObject)); MOCK_METHOD0_WITH_CALLTYPE(__stdcall, AddRef, ULONG()); MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Release, ULONG()); @@ -167,6 +166,16 @@ class MockHttpServer : public IHttpServer } }; + +class MockHttpApplication: public IHttpApplication +{ +public: + MOCK_CONST_METHOD0(GetApplicationPhysicalPath, PCWSTR ()); + MOCK_CONST_METHOD0(GetApplicationId, PCWSTR ()); + MOCK_CONST_METHOD0(GetAppConfigPath, PCWSTR ()); + MOCK_METHOD0(GetModuleContextContainer, IHttpModuleContextContainer* ()); +}; + class MockRequestHandlerConfig : public REQUESTHANDLER_CONFIG { public: diff --git a/test/CommonLibTests/inprocess_application_tests.cpp b/test/CommonLibTests/inprocess_application_tests.cpp index 3f1f67e457..00c7b01611 100644 --- a/test/CommonLibTests/inprocess_application_tests.cpp +++ b/test/CommonLibTests/inprocess_application_tests.cpp @@ -7,6 +7,9 @@ #include "inprocessapplication.h" #include "fakeclasses.h" +using ::testing::_; +using ::testing::NiceMock; + // Externals defined in inprocess BOOL g_fProcessDetach; HANDLE g_hEventLog; @@ -15,16 +18,22 @@ namespace InprocessTests { TEST(InProcessTest, NoNullRefForExePath) { - auto server = new MockHttpServer(); - auto requestHandlerConfig = MockRequestHandlerConfig::CreateConfig(); - auto config = std::unique_ptr(requestHandlerConfig); + MockHttpServer server; + NiceMock application; + + ON_CALL(application, GetApplicationPhysicalPath()) + .WillByDefault(testing::Return(L"Some path")); + + auto requestHandlerConfig = std::unique_ptr(MockRequestHandlerConfig::CreateConfig()); std::wstring exePath(L"hello"); - std::array parameters { + + std::array parameters{ {"InProcessExeLocation", exePath.data()} }; - IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, std::move(config), parameters.data(), 1); + IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), parameters.data(), 1); + ASSERT_STREQ(app->QueryExeLocation(), L"hello"); } } diff --git a/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs b/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs index 5cfd7fe7c0..87741af201 100644 --- a/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs @@ -19,21 +19,25 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess public class AppOfflineTests : IISFunctionalTestBase { // TODO these will differ between IIS and IISExpress - [ConditionalFact] - public async Task AppOfflineDroppedWhileSiteIsDown_SiteReturns503() + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task AppOfflineDroppedWhileSiteIsDown_SiteReturns503(HostingModel hostingModel) { - var deploymentResult = await DeployApp(); + var deploymentResult = await DeployApp(hostingModel); AddAppOffline(deploymentResult.DeploymentResult.ContentRoot); await AssertAppOffline(deploymentResult); } - [ConditionalFact] - public async Task AppOfflineDroppedWhileSiteIsDown_CustomResponse() + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task AppOfflineDroppedWhileSiteIsDown_CustomResponse(HostingModel hostingModel) { var expectedResponse = "The app is offline."; - var deploymentResult = await DeployApp(); + var deploymentResult = await DeployApp(hostingModel); AddAppOffline(deploymentResult.DeploymentResult.ContentRoot, expectedResponse); @@ -41,9 +45,9 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess } [ConditionalFact] - public async Task AppOfflineDroppedWhileSiteRunning_SiteShutsDown() + public async Task AppOfflineDroppedWhileSiteRunning_SiteShutsDown_InProcess() { - var deploymentResult = await AssertStarts(); + var deploymentResult = await AssertStarts(HostingModel.InProcess); AddAppOffline(deploymentResult.DeploymentResult.ContentRoot); @@ -51,9 +55,26 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess } [ConditionalFact] - public async Task AppOfflineDropped_CanRemoveAppOfflineAfterAddingAndSiteWorks() + public async Task AppOfflineDroppedWhileSiteRunning_SiteShutsDown_OutOfProcess() { - var deploymentResult = await DeployApp(); + var deploymentResult = await AssertStarts(HostingModel.OutOfProcess); + + // Repeat dropping file and restarting multiple times + for (int i = 0; i < 5; i++) + { + AddAppOffline(deploymentResult.DeploymentResult.ContentRoot); + await AssertAppOffline(deploymentResult); + RemoveAppOffline(deploymentResult.DeploymentResult.ContentRoot); + await AssertRunning(deploymentResult); + } + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task AppOfflineDropped_CanRemoveAppOfflineAfterAddingAndSiteWorks(HostingModel hostingModel) + { + var deploymentResult = await DeployApp(hostingModel); AddAppOffline(deploymentResult.DeploymentResult.ContentRoot); @@ -61,13 +82,12 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess RemoveAppOffline(deploymentResult.DeploymentResult.ContentRoot); - var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); - + await AssertRunning(deploymentResult); } - private async Task DeployApp() + private async Task DeployApp(HostingModel hostingModel = HostingModel.InProcess) { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(); + var deploymentParameters = Helpers.GetBaseDeploymentParameters(hostingModel: hostingModel, publish: true); return await DeployAsync(deploymentParameters); } @@ -118,18 +138,21 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess Assert.True(hostShutdownToken.IsCancellationRequested); } - private async Task AssertStarts() + private async Task AssertStarts(HostingModel hostingModel) { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(); + var deploymentResult = await DeployApp(hostingModel); - var deploymentResult = await DeployAsync(deploymentParameters); + await AssertRunning(deploymentResult); + return deploymentResult; + } + + private static async Task AssertRunning(IISDeploymentResult deploymentResult) + { var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal("Hello World", responseText); - - return deploymentResult; } } } diff --git a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs index c3540d51ee..31179b1ecf 100644 --- a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task Authentication_InProcess() { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(); + var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); deploymentParameters.ServerConfigTemplateContent = GetWindowsAuthConfig(); var deploymentResult = await DeployAsync(deploymentParameters); diff --git a/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs b/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs index 856bf1669f..82ea09de64 100644 --- a/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs @@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var tempFile = Path.GetTempFileName(); try { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(); + var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"] = tempFile; var deploymentResult = await DeployAsync(deploymentParameters); diff --git a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs index 69eacfbc43..d43894a2c3 100644 --- a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task ServerShutsDownWhenMainExits() { - var parameters = Helpers.GetBaseDeploymentParameters(); + var parameters = Helpers.GetBaseDeploymentParameters(publish: true); var result = await DeployAsync(parameters); var response = await result.RetryingHttpClient.GetAsync("/Shutdown"); From 86fed4de5fab2dd8c2e2c3ce5e1dfa877fdda36b Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 10 Jul 2018 10:18:32 -0700 Subject: [PATCH 124/363] Fix shutdown race (#1031) --- .../CommonLib/iapplication.h | 16 +++ .../inprocessapplication.cpp | 91 +-------------- .../inprocessapplication.h | 28 ++--- .../inprocesshandler.cpp | 110 ++++++++++-------- .../inprocesshandler.h | 47 ++++---- .../managedexports.cxx | 2 +- 6 files changed, 114 insertions(+), 180 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h index 590fd7e51a..ef5d2bf8d7 100644 --- a/src/AspNetCoreModuleV2/CommonLib/iapplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -3,6 +3,7 @@ #pragma once +#include #include "irequesthandler.h" enum APPLICATION_STATUS @@ -54,3 +55,18 @@ public: _In_ IHttpContext *pHttpContext, _Out_ IREQUEST_HANDLER **pRequestHandler) = 0; }; + +struct IAPPLICATION_DELETER +{ + void operator ()(IAPPLICATION* application) const + { + application->DereferenceApplication(); + } +}; + +template< class APPLICATION > +std::unique_ptr ReferenceApplication(APPLICATION* application) +{ + application->ReferenceApplication(); + return std::unique_ptr(application); +}; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 7714d9a9e4..693ce28068 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -208,98 +208,11 @@ IN_PROCESS_APPLICATION::ShutDownInternal() s_Application = NULL; } -REQUEST_NOTIFICATION_STATUS -IN_PROCESS_APPLICATION::OnAsyncCompletion( - DWORD cbCompletion, - HRESULT hrCompletionStatus, - IN_PROCESS_HANDLER* pInProcessHandler -) -{ - REQUEST_NOTIFICATION_STATUS dwRequestNotificationStatus = RQ_NOTIFICATION_CONTINUE; - - ReferenceApplication(); - - if (pInProcessHandler->QueryIsManagedRequestComplete()) - { - // means PostCompletion has been called and this is the associated callback. - dwRequestNotificationStatus = pInProcessHandler->QueryAsyncCompletionStatus(); - } - else if (m_fBlockCallbacksIntoManaged) - { - // this can potentially happen in ungraceful shutdown. - // Or something really wrong happening with async completions - // At this point, managed is in a shutting down state and we cannot send a request to it. - pInProcessHandler->QueryHttpContext()->GetResponse()->SetStatus(503, - "Server has been shutdown", - 0, - (ULONG)HRESULT_FROM_WIN32(ERROR_SHUTDOWN_IN_PROGRESS)); - dwRequestNotificationStatus = RQ_NOTIFICATION_FINISH_REQUEST; - } - else - { - // Call the managed handler for async completion. - dwRequestNotificationStatus = m_AsyncCompletionHandler(pInProcessHandler->QueryManagedHttpContext(), hrCompletionStatus, cbCompletion); - } - - DereferenceApplication(); - - return dwRequestNotificationStatus; -} - -REQUEST_NOTIFICATION_STATUS -IN_PROCESS_APPLICATION::OnExecuteRequest( - _In_ IHttpContext* pHttpContext, - _In_ IN_PROCESS_HANDLER* pInProcessHandler -) -{ - REQUEST_NOTIFICATION_STATUS dwRequestNotificationStatus = RQ_NOTIFICATION_CONTINUE; - PFN_REQUEST_HANDLER pRequestHandler = NULL; - - ReferenceApplication(); - pRequestHandler = m_RequestHandler; - - if (pRequestHandler == NULL) - { - // - // return error as the application did not register callback - // - if (ANCMEvents::ANCM_EXECUTE_REQUEST_FAIL::IsEnabled(pHttpContext->GetTraceContext())) - { - ANCMEvents::ANCM_EXECUTE_REQUEST_FAIL::RaiseEvent(pHttpContext->GetTraceContext(), - NULL, - (ULONG)E_APPLICATION_ACTIVATION_EXEC_FAILURE); - } - - pHttpContext->GetResponse()->SetStatus(500, - "Internal Server Error", - 0, - (ULONG)E_APPLICATION_ACTIVATION_EXEC_FAILURE); - - dwRequestNotificationStatus = RQ_NOTIFICATION_FINISH_REQUEST; - } - else if (m_status != APPLICATION_STATUS::RUNNING || m_fBlockCallbacksIntoManaged) - { - pHttpContext->GetResponse()->SetStatus(503, - "Server is currently shutting down.", - 0, - (ULONG)HRESULT_FROM_WIN32(ERROR_SHUTDOWN_IN_PROGRESS)); - dwRequestNotificationStatus = RQ_NOTIFICATION_FINISH_REQUEST; - } - else - { - dwRequestNotificationStatus = pRequestHandler(pInProcessHandler, m_RequestHandlerContext); - } - - DereferenceApplication(); - - return dwRequestNotificationStatus; -} - VOID IN_PROCESS_APPLICATION::SetCallbackHandles( _In_ PFN_REQUEST_HANDLER request_handler, _In_ PFN_SHUTDOWN_HANDLER shutdown_handler, - _In_ PFN_MANAGED_CONTEXT_HANDLER async_completion_handler, + _In_ PFN_ASYNC_COMPLETION_HANDLER async_completion_handler, _In_ VOID* pvRequstHandlerContext, _In_ VOID* pvShutdownHandlerContext ) @@ -673,7 +586,7 @@ IN_PROCESS_APPLICATION::CreateHandler( HRESULT hr = S_OK; IREQUEST_HANDLER* pHandler = NULL; - pHandler = new IN_PROCESS_HANDLER(pHttpContext, this); + pHandler = new IN_PROCESS_HANDLER(::ReferenceApplication(this), pHttpContext, m_RequestHandler, m_RequestHandlerContext, m_AsyncCompletionHandler); if (pHandler == NULL) { diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index 0bcd1cbd48..1f6e3da570 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -4,13 +4,13 @@ #pragma once #include "InProcessApplicationBase.h" -#include "inprocesshandler.h" #include "requesthandler_config.h" #include "IOutputManager.h" +class IN_PROCESS_HANDLER; typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_REQUEST_HANDLER) (IN_PROCESS_HANDLER* pInProcessHandler, void* pvRequestHandlerContext); typedef BOOL(WINAPI * PFN_SHUTDOWN_HANDLER) (void* pvShutdownHandlerContext); -typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_MANAGED_CONTEXT_HANDLER)(void *pvManagedHttpContext, HRESULT hrCompletionStatus, DWORD cbCompletion); +typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_ASYNC_COMPLETION_HANDLER)(void *pvManagedHttpContext, HRESULT hrCompletionStatus, DWORD cbCompletion); class IN_PROCESS_APPLICATION : public InProcessApplicationBase { @@ -32,7 +32,7 @@ public: SetCallbackHandles( _In_ PFN_REQUEST_HANDLER request_callback, _In_ PFN_SHUTDOWN_HANDLER shutdown_callback, - _In_ PFN_MANAGED_CONTEXT_HANDLER managed_context_callback, + _In_ PFN_ASYNC_COMPLETION_HANDLER managed_context_callback, _In_ VOID* pvRequstHandlerContext, _In_ VOID* pvShutdownHandlerContext ); @@ -60,20 +60,6 @@ public: HRESULT hr ); - REQUEST_NOTIFICATION_STATUS - OnAsyncCompletion( - DWORD cbCompletion, - HRESULT hrCompletionStatus, - IN_PROCESS_HANDLER* pInProcessHandler - ); - - REQUEST_NOTIFICATION_STATUS - OnExecuteRequest - ( - IHttpContext* pHttpContext, - IN_PROCESS_HANDLER* pInProcessHandler - ); - VOID StopCallsIntoManaged( VOID @@ -117,6 +103,12 @@ public: return m_pConfig.get(); } + bool + QueryBlockCallbacksIntoManaged() const + { + return m_fBlockCallbacksIntoManaged; + } + private: IHttpServer & m_pHttpServer; @@ -132,7 +124,7 @@ private: PFN_SHUTDOWN_HANDLER m_ShutdownHandler; VOID* m_ShutdownHandlerContext; - PFN_MANAGED_CONTEXT_HANDLER m_AsyncCompletionHandler; + PFN_ASYNC_COMPLETION_HANDLER m_AsyncCompletionHandler; // The event that gets triggered when managed initialization is complete HANDLE m_pInitalizeEvent; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 1494eb158e..d658fa957b 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -10,20 +10,22 @@ ALLOC_CACHE_HANDLER * IN_PROCESS_HANDLER::sm_pAlloc = NULL; IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( + _In_ std::unique_ptr pApplication, _In_ IHttpContext *pW3Context, - _In_ IN_PROCESS_APPLICATION *pApplication -): m_pW3Context(pW3Context), - m_requestNotificationStatus(RQ_NOTIFICATION_PENDING), - m_pApplication(pApplication), - m_fManagedRequestComplete(FALSE) + _In_ PFN_REQUEST_HANDLER pRequestHandler, + _In_ void * pRequestHandlerContext, + _In_ PFN_ASYNC_COMPLETION_HANDLER pAsyncCompletion +): m_pManagedHttpContext(nullptr), + m_requestNotificationStatus(RQ_NOTIFICATION_PENDING), + m_fManagedRequestComplete(FALSE), + m_pW3Context(pW3Context), + m_pApplication(std::move(pApplication)), + m_pRequestHandler(pRequestHandler), + m_pRequestHandlerContext(pRequestHandlerContext), + m_pAsyncCompletionHandler(pAsyncCompletion) { } -IN_PROCESS_HANDLER::~IN_PROCESS_HANDLER() -{ - //todo -} - __override REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::OnExecuteRequestHandler() @@ -38,8 +40,32 @@ IN_PROCESS_HANDLER::OnExecuteRequestHandler() L"InProcess Application"); } - //SetHttpSysDisconnectCallback(); - return m_pApplication->OnExecuteRequest(m_pW3Context, this); + if (m_pRequestHandler == NULL) + { + // + // return error as the application did not register callback + // + if (ANCMEvents::ANCM_EXECUTE_REQUEST_FAIL::IsEnabled(m_pW3Context->GetTraceContext())) + { + ANCMEvents::ANCM_EXECUTE_REQUEST_FAIL::RaiseEvent(m_pW3Context->GetTraceContext(), + NULL, + (ULONG)E_APPLICATION_ACTIVATION_EXEC_FAILURE); + } + + m_pW3Context->GetResponse()->SetStatus(500, + "Internal Server Error", + 0, + (ULONG)E_APPLICATION_ACTIVATION_EXEC_FAILURE); + + return RQ_NOTIFICATION_FINISH_REQUEST; + } + else if (m_pApplication->QueryStatus() != APPLICATION_STATUS::RUNNING || m_pApplication-> + QueryBlockCallbacksIntoManaged()) + { + return ServerShutdownMessage(); + } + + return m_pRequestHandler(this, m_pRequestHandlerContext); } __override @@ -49,9 +75,28 @@ IN_PROCESS_HANDLER::OnAsyncCompletion( HRESULT hrCompletionStatus ) { - // OnAsyncCompletion must call into the application if there was a error. We will redo calls - // to Read/Write if we called cancelIo on the IHttpContext. - return m_pApplication->OnAsyncCompletion(cbCompletion, hrCompletionStatus, this); + if (m_fManagedRequestComplete) + { + // means PostCompletion has been called and this is the associated callback. + return m_requestNotificationStatus; + } + if (m_pApplication->QueryBlockCallbacksIntoManaged()) + { + // this can potentially happen in ungraceful shutdown. + // Or something really wrong happening with async completions + // At this point, managed is in a shutting down state and we cannot send a request to it. + return ServerShutdownMessage(); + } + + // Call the managed handler for async completion. + return m_pAsyncCompletionHandler(m_pManagedHttpContext, hrCompletionStatus, cbCompletion); +} + +REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::ServerShutdownMessage() const +{ + m_pW3Context->GetResponse()->SetStatus(503, "Server has been shutdown", 0, + (ULONG)HRESULT_FROM_WIN32(ERROR_SHUTDOWN_IN_PROGRESS)); + return RQ_NOTIFICATION_FINISH_REQUEST; } VOID @@ -60,31 +105,6 @@ IN_PROCESS_HANDLER::TerminateRequest( ) { UNREFERENCED_PARAMETER(fClientInitiated); - //todo -} - -PVOID -IN_PROCESS_HANDLER::QueryManagedHttpContext( - VOID -) -{ - return m_pManagedHttpContext; -} - -BOOL -IN_PROCESS_HANDLER::QueryIsManagedRequestComplete( - VOID -) -{ - return m_fManagedRequestComplete; -} - -IHttpContext* -IN_PROCESS_HANDLER::QueryHttpContext( - VOID -) -{ - return m_pW3Context; } VOID @@ -95,14 +115,6 @@ IN_PROCESS_HANDLER::IndicateManagedRequestComplete( m_fManagedRequestComplete = TRUE; } -REQUEST_NOTIFICATION_STATUS -IN_PROCESS_HANDLER::QueryAsyncCompletionStatus( - VOID -) -{ - return m_requestNotificationStatus; -} - VOID IN_PROCESS_HANDLER::SetAsyncCompletionStatus( REQUEST_NOTIFICATION_STATUS requestNotificationStatus @@ -165,7 +177,7 @@ HRESULT } hr = sm_pAlloc->Initialize(sizeof(IN_PROCESS_HANDLER), - 64); // nThreshold + 64); // nThreshold Finished: if (FAILED(hr)) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h index a9c068a751..3934e2cd92 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h @@ -3,7 +3,11 @@ #pragma once +#include "precomp.hxx" #include "requesthandler.h" +#include +#include "iapplication.h" +#include "inprocessapplication.h" class IN_PROCESS_APPLICATION; @@ -11,10 +15,13 @@ class IN_PROCESS_HANDLER : public REQUEST_HANDLER { public: IN_PROCESS_HANDLER( + _In_ std::unique_ptr pApplication, _In_ IHttpContext *pW3Context, - _In_ IN_PROCESS_APPLICATION *pApplication); + _In_ PFN_REQUEST_HANDLER pRequestHandler, + _In_ void * pRequestHandlerContext, + _In_ PFN_ASYNC_COMPLETION_HANDLER pAsyncCompletion); - ~IN_PROCESS_HANDLER() override; + ~IN_PROCESS_HANDLER() override = default; __override REQUEST_NOTIFICATION_STATUS @@ -32,37 +39,25 @@ public: TerminateRequest( bool fClientInitiated ) override; - - PVOID - QueryManagedHttpContext( + + IHttpContext* + QueryHttpContext( VOID - ); + ) const + { + return m_pW3Context; + } VOID SetManagedHttpContext( PVOID pManagedHttpContext ); - IHttpContext* - QueryHttpContext( - VOID - ); - - BOOL - QueryIsManagedRequestComplete( - VOID - ); - VOID IndicateManagedRequestComplete( VOID ); - REQUEST_NOTIFICATION_STATUS - QueryAsyncCompletionStatus( - VOID - ); - VOID SetAsyncCompletionStatus( REQUEST_NOTIFICATION_STATUS requestNotificationStatus @@ -76,12 +71,18 @@ public: HRESULT StaticInitialize(VOID); - private: + REQUEST_NOTIFICATION_STATUS + ServerShutdownMessage() const; + PVOID m_pManagedHttpContext; BOOL m_fManagedRequestComplete; REQUEST_NOTIFICATION_STATUS m_requestNotificationStatus; IHttpContext* m_pW3Context; - IN_PROCESS_APPLICATION* m_pApplication; + std::unique_ptr m_pApplication; + PFN_REQUEST_HANDLER m_pRequestHandler; + void* m_pRequestHandlerContext; + PFN_ASYNC_COMPLETION_HANDLER m_pAsyncCompletionHandler; + static ALLOC_CACHE_HANDLER * sm_pAlloc; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx index c4860c1acb..1f1590ae75 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx @@ -14,7 +14,7 @@ register_callbacks( _In_ IN_PROCESS_APPLICATION* pInProcessApplication, _In_ PFN_REQUEST_HANDLER request_handler, _In_ PFN_SHUTDOWN_HANDLER shutdown_handler, - _In_ PFN_MANAGED_CONTEXT_HANDLER async_completion_handler, + _In_ PFN_ASYNC_COMPLETION_HANDLER async_completion_handler, _In_ VOID* pvRequstHandlerContext, _In_ VOID* pvShutdownHandlerContext ) From 11b83dc2b3916ffcc17101902ec383257f6cd033 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 10 Jul 2018 10:32:01 -0700 Subject: [PATCH 125/363] Rename reg keys from IIS ANCM V1 to V2 (#1017) --- src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc | 2 +- src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp | 4 ++-- src/AspNetCoreModuleV2/CommonLib/debugutil.cpp | 2 +- src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx | 2 +- test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc b/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc index 39edfaffc4..f9acf89035 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc @@ -10,7 +10,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#define FileDescription "IIS AspNetCore Module. Commit: " CommitHash +#define FileDescription "IIS AspNetCore Module V2. Commit: " CommitHash ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp index 34d96e45d3..03196a316d 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp @@ -11,7 +11,7 @@ #include "resources.h" #include "exceptions.h" -DECLARE_DEBUG_PRINT_OBJECT("aspnetcore.dll"); +DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2.dll"); HTTP_MODULE_ID g_pModuleId = NULL; IHttpServer * g_pHttpServer = NULL; @@ -120,7 +120,7 @@ HRESULT // check whether the feature is disabled due to security reason if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module\\Parameters", + L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters", 0, KEY_READ, &hKey) == NO_ERROR) diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index 189a5097f9..cd8ca3ea05 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -23,7 +23,7 @@ DebugInitialize() HKEY hKey; if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module\\Parameters", + L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters", 0, KEY_READ, &hKey) == NO_ERROR) diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx index 0855ae6566..f08d71de29 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx @@ -54,7 +54,7 @@ InitializeGlobalConfiguration( } if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module\\Parameters", + L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters", 0, KEY_READ, &hKey) == NO_ERROR) diff --git a/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs b/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs index 82ea09de64..6d8e73a15c 100644 --- a/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs @@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); var logContents = File.ReadAllText(tempFile); - Assert.Contains("[aspnetcore.dll]", logContents); + Assert.Contains("[aspnetcorev2.dll]", logContents); Assert.Contains("[aspnetcorev2_inprocess.dll]", logContents); } finally From e1f1705d11d97560c574dbe68a0b560441470f58 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 11 Jul 2018 09:38:40 -0700 Subject: [PATCH 126/363] Reenable tests and forward fixture logs (#1034) --- .../Inprocess/FixtureLoggedTest.cs | 31 +++++++ .../Inprocess/SynchronousReadAndWriteTests.cs | 7 +- .../Utilities/IISTestSiteFixture.cs | 93 ++++++++++++++++++- 3 files changed, 125 insertions(+), 6 deletions(-) create mode 100644 test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs diff --git a/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs b/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs new file mode 100644 index 0000000000..4604687991 --- /dev/null +++ b/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs @@ -0,0 +1,31 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Reflection; +using Microsoft.Extensions.Logging.Testing; +using Xunit.Abstractions; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class FixtureLoggedTest: LoggedTest + { + private readonly IISTestSiteFixture _fixture; + + public FixtureLoggedTest(IISTestSiteFixture fixture) + { + _fixture = fixture; + } + + public override void Initialize(MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper) + { + base.Initialize(methodInfo, testMethodArguments, testOutputHelper); + _fixture.Attach(this); + } + + public override void Dispose() + { + _fixture.Detach(this); + base.Dispose(); + } + } +} diff --git a/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs b/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs index 9b57d4996b..03aa0e16e6 100644 --- a/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs +++ b/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs @@ -6,23 +6,22 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] - public class SynchronousReadAndWriteTests + public class SynchronousReadAndWriteTests: FixtureLoggedTest { private readonly IISTestSiteFixture _fixture; - public SynchronousReadAndWriteTests(IISTestSiteFixture fixture) + public SynchronousReadAndWriteTests(IISTestSiteFixture fixture): base(fixture) { _fixture = fixture; } - [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/766")] + [ConditionalFact] public async Task ReadAndWriteSynchronously() { for (int i = 0; i < 100; i++) diff --git a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs index d19dad36d0..1a60e85246 100644 --- a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -2,10 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Generic; using System.IO; using System.Net.Http; using System.Threading; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Testing; @@ -14,6 +16,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public class IISTestSiteFixture : IDisposable { private readonly ApplicationDeployer _deployer; + private readonly ForwardingProvider _forwardingProvider; public IISTestSiteFixture() { @@ -30,14 +33,17 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests PublishApplicationBeforeDeployment = true, }; + _forwardingProvider = new ForwardingProvider(); + var loggerFactory = logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture)); + loggerFactory.AddProvider(_forwardingProvider); if (deploymentParameters.ServerType == ServerType.IIS) { // Currently hosting throws if the Servertype = IIS. - _deployer = new IISDeployer(deploymentParameters, logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture))); + _deployer = new IISDeployer(deploymentParameters, loggerFactory); } else if (deploymentParameters.ServerType == ServerType.IISExpress) { - _deployer = new IISExpressDeployer(deploymentParameters, logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture))); + _deployer = new IISExpressDeployer(deploymentParameters, loggerFactory); } DeploymentResult = _deployer.DeployAsync().Result; @@ -60,5 +66,88 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { _deployer.Dispose(); } + + public void Attach(LoggedTest test) + { + if (_forwardingProvider.LoggerFactory != null) + { + throw new InvalidOperationException("Test instance is already attached to this fixture"); + } + + _forwardingProvider.LoggerFactory = test.LoggerFactory; + } + + public void Detach(LoggedTest test) + { + if (_forwardingProvider.LoggerFactory != test.LoggerFactory) + { + throw new InvalidOperationException("Different test is attached to this fixture"); + } + + _forwardingProvider.LoggerFactory = null; + } + + private class ForwardingProvider : ILoggerProvider + { + private readonly List _loggers = new List(); + + private ILoggerFactory _loggerFactory; + + public ILoggerFactory LoggerFactory + { + get => _loggerFactory; + set + { + + lock (_loggers) + { + _loggerFactory = value; + foreach (var logger in _loggers) + { + logger.Logger = _loggerFactory?.CreateLogger("FIXTURE:" + logger.Name); + } + } + } + } + + public void Dispose() + { + lock (_loggers) + { + _loggers.Clear(); + } + } + + public ILogger CreateLogger(string categoryName) + { + lock (_loggers) + { + var logger = new ForwardingLogger(categoryName); + _loggers.Add(logger); + return logger; + } + } + } + + internal class ForwardingLogger : ILogger + { + public ForwardingLogger(string name) + { + Name = name; + } + + public ILogger Logger { get; set; } + public string Name { get; set; } + + public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) + { + Logger?.Log(logLevel, eventId, state, exception, formatter); + } + + public bool IsEnabled(LogLevel logLevel) => Logger?.IsEnabled(logLevel) == true; + + public IDisposable BeginScope(TState state) => Logger?.BeginScope(state); + } } + } From 9635d4fd8d5f58c87113d5e861e9866d6a746f17 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 11 Jul 2018 11:47:22 -0700 Subject: [PATCH 127/363] Cleanup compilation warnings and re-enable asserts (#1035) --- build/testsite.props | 2 +- .../AspNetCore/Inc/applicationinfo.h | 10 ++--- .../AspNetCore/Inc/proxymodule.h | 3 +- .../AspNetCore/src/applicationinfo.cpp | 2 +- .../AspNetCore/src/proxymodule.cxx | 44 +++++-------------- .../CommonLib/hostfxr_utility.cpp | 5 +-- .../CommonLib/irequesthandler.h | 10 +++++ src/AspNetCoreModuleV2/IISLib/ntassert.h | 4 ++ .../InProcessApplicationBase.h | 1 - .../InProcessRequestHandler.vcxproj | 26 +++++++++-- .../StartupExceptionApplication.cpp | 2 - .../StartupExceptionHandler.cpp | 2 - .../InProcessRequestHandler/dllmain.cxx | 1 - .../inprocessapplication.cpp | 7 +-- .../inprocesshandler.cpp | 1 - .../inprocesshandler.h | 1 - .../managedexports.cxx | 3 -- .../InProcessRequestHandler/precomp.cpp | 4 ++ .../OutOfProcessRequestHandler.vcxproj | 4 ++ .../OutOfProcessRequestHandler/dllmain.cxx | 2 +- test/CommonLibTests/CommonLibTests.vcxproj | 8 ++-- 21 files changed, 69 insertions(+), 73 deletions(-) create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.cpp diff --git a/build/testsite.props b/build/testsite.props index 42e3cb1d8e..ab74d58d72 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -40,7 +40,7 @@ - /config:"$(IISExpressAppHostConfig)" + /config:"$(IISExpressAppHostConfig)" /systray:false -h "$(IISAppHostConfig)" $(NativePlatform)\aspnetcore.dll diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h index 92b5aaff81..3d4b901755 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h @@ -93,15 +93,11 @@ public: // Caller is responsible for dereference the application. // Otherwise memory leak // - VOID - ExtractApplication(IAPPLICATION** ppApplication) + std::unique_ptr + ExtractApplication() const { SRWSharedLock lock(m_srwLock); - if (m_pApplication != NULL) - { - m_pApplication->ReferenceApplication(); - } - *ppApplication = m_pApplication; + return ReferenceApplication(m_pApplication); } VOID diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h index a0580b39b1..5864dd0c6f 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h @@ -3,6 +3,7 @@ #pragma once +#include #include "applicationinfo.h" #include "irequesthandler.h" @@ -50,7 +51,7 @@ class ASPNET_CORE_PROXY_MODULE : public CHttpModule APPLICATION_INFO *m_pApplicationInfo; IAPPLICATION *m_pApplication; - IREQUEST_HANDLER *m_pHandler; + std::unique_ptr m_pHandler; }; class ASPNET_CORE_PROXY_MODULE_FACTORY : public IHttpModuleFactory diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 112915ba08..2072e33af6 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -328,7 +328,7 @@ APPLICATION_INFO::FindNativeAssemblyFromHostfxr( DWORD dwBufferSize = 1024 * 10; DWORD dwRequiredBufferSize = 0; - DBG_ASSERT(struFileName != NULL); + DBG_ASSERT(struFilename != NULL); FINISHED_LAST_ERROR_IF_NULL(hmHostFxrDll = LoadLibraryW(hostfxrOptions->GetHostFxrLocation())); diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx index 2289143202..f27a1571c3 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx @@ -48,7 +48,7 @@ Return value: } ASPNET_CORE_PROXY_MODULE::ASPNET_CORE_PROXY_MODULE( -) : m_pApplicationInfo(NULL), m_pHandler(NULL) +) : m_pApplicationInfo(nullptr), m_pApplication(nullptr), m_pHandler(nullptr) { } @@ -59,12 +59,6 @@ ASPNET_CORE_PROXY_MODULE::~ASPNET_CORE_PROXY_MODULE() m_pApplicationInfo->DereferenceApplicationInfo(); m_pApplicationInfo = NULL; } - - if (m_pHandler != NULL) - { - m_pHandler->DereferenceRequestHandler(); - m_pHandler = NULL; - } } __override @@ -77,44 +71,33 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( HRESULT hr = S_OK; APPLICATION_MANAGER *pApplicationManager = NULL; REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; - IAPPLICATION* pApplication = NULL; STRU struExeLocation; try { if (g_fInShutdown) { - hr = HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS); - goto Finished; + FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); } pApplicationManager = APPLICATION_MANAGER::GetInstance(); - hr = pApplicationManager->GetOrCreateApplicationInfo( + FINISHED_IF_FAILED(pApplicationManager->GetOrCreateApplicationInfo( g_pHttpServer, pHttpContext, - &m_pApplicationInfo); - if (FAILED(hr)) - { - goto Finished; - } + &m_pApplicationInfo)); if (!m_pApplicationInfo->IsValid()) { // Application cannot be started due to wrong hosting mode // the error should already been logged to window event log for the first request - hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; - goto Finished; + FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); } // make sure assmebly is loaded and application is created - hr = m_pApplicationInfo->EnsureApplicationCreated(pHttpContext); - if (FAILED(hr)) - { - goto Finished; - } + FINISHED_IF_FAILED(m_pApplicationInfo->EnsureApplicationCreated(pHttpContext)); - m_pApplicationInfo->ExtractApplication(&pApplication); + auto pApplication = m_pApplicationInfo->ExtractApplication(); DBG_ASSERT(pHttpContext); @@ -126,13 +109,10 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( goto Finished; } + IREQUEST_HANDLER* pHandler; // Create RequestHandler and process the request - hr = pApplication->CreateHandler(pHttpContext, &m_pHandler); - - if (FAILED(hr)) - { - goto Finished; - } + FINISHED_IF_FAILED(pApplication->CreateHandler(pHttpContext, &pHandler)); + m_pHandler.reset(pHandler); retVal = m_pHandler->OnExecuteRequestHandler(); } @@ -155,10 +135,6 @@ Finished: } } - if (pApplication != NULL) - { - pApplication->DereferenceApplication(); - } return retVal; } diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index cf703d34a0..fd3a65abf8 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -225,8 +225,8 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( { UNREFERENCED_PARAMETER(hEventLog); // TODO use event log to set errors. - DBG_ASSERT(dwArgCount != NULL); - DBG_ASSERT(pwzArgv != NULL); + DBG_ASSERT(pdwArgCount != NULL); + DBG_ASSERT(pbstrArgv != NULL); DBG_ASSERT(pwzExePath != NULL); HRESULT hr = S_OK; @@ -324,7 +324,6 @@ Finished: if (pwzArgs != NULL) { LocalFree(pwzArgs); - DBG_ASSERT(pwzArgs == NULL); } return hr; } diff --git a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h index b2be7ee401..5f9b415794 100644 --- a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h @@ -4,6 +4,7 @@ #pragma once #include +#include // // Pure abstract class @@ -46,3 +47,12 @@ public: VOID ) = 0; }; + + +struct IREQUEST_HANDLER_DELETER +{ + void operator ()(IREQUEST_HANDLER* application) const + { + application->DereferenceRequestHandler(); + } +}; diff --git a/src/AspNetCoreModuleV2/IISLib/ntassert.h b/src/AspNetCoreModuleV2/IISLib/ntassert.h index 6d2f3b9a30..8e19e03239 100644 --- a/src/AspNetCoreModuleV2/IISLib/ntassert.h +++ b/src/AspNetCoreModuleV2/IISLib/ntassert.h @@ -11,6 +11,10 @@ #undef ASSERT #endif +#ifdef DEBUG + #define DBG 1 +#endif + #if defined( DBG ) && DBG #define SX_ASSERT( _x ) ( (VOID)( ( ( _x ) ) ? TRUE : ( __annotation( L"Debug", L"AssertFail", L#_x ), DbgRaiseAssertionFailure(), FALSE ) ) ) #define SX_ASSERTMSG( _m, _x ) ( (VOID)( ( ( _x ) ) ? TRUE : ( __annotation( L"Debug", L"AssertFail", L##_m ), DbgRaiseAssertionFailure(), FALSE ) ) ) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h index bb312d4a09..ca907d67c6 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h @@ -3,7 +3,6 @@ #pragma once -#include "precomp.hxx" #include "application.h" #include "AppOfflineTrackingApplication.h" diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 907726e2b2..c96aaa7000 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -83,7 +83,7 @@ - NotUsing + Use Level4 Disabled WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -104,17 +104,20 @@ CompileAsCpp true stdcpp17 + precomp.hxx + true Windows true kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) Source.def + UseLinkTimeCodeGeneration - NotUsing + Use Level4 Disabled WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -135,18 +138,21 @@ CompileAsCpp true stdcpp17 + precomp.hxx + true Windows true kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) Source.def + UseLinkTimeCodeGeneration Level4 - NotUsing + Use MaxSpeed true true @@ -166,6 +172,8 @@ CompileAsCpp true stdcpp17 + precomp.hxx + true Windows @@ -174,12 +182,13 @@ true Source.def kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) + UseLinkTimeCodeGeneration Level4 - NotUsing + Use MaxSpeed true true @@ -199,6 +208,8 @@ CompileAsCpp true stdcpp17 + precomp.hxx + true Windows @@ -207,6 +218,7 @@ true Source.def kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + UseLinkTimeCodeGeneration @@ -224,6 +236,12 @@ + + Create + Create + Create + Create + diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp index 675c639959..4aa5b9fb31 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "precomp.hxx" - #include "StartupExceptionApplication.h" VOID StartupExceptionApplication::ShutDown() diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp index af38e7025e..f8041a0f13 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "precomp.hxx" - #include "StartupExceptionApplication.h" #include "StartupExceptionHandler.h" diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx index ac1e1a0ae4..e1bc9ac143 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -3,7 +3,6 @@ // dllmain.cpp : Defines the entry point for the DLL application. -#include "precomp.hxx" #include #include "inprocessapplication.h" diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 693ce28068..ad0f6a35a6 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -1,13 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "precomp.hxx" #include "inprocessapplication.h" #include "inprocesshandler.h" #include "hostfxroptions.h" #include "requesthandler_config.h" #include "environmentvariablehelpers.h" -#include "aspnetcore_event.h" #include "utility.h" #include "EventLog.h" #include "SRWExclusiveLock.h" @@ -32,10 +30,7 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( m_fShutdownCalledFromManaged(FALSE), m_pConfig(std::move(pConfig)) { - // is it guaranteed that we have already checked app offline at this point? - // If so, I don't think there is much to do here. - DBG_ASSERT(pHttpServer != NULL); - DBG_ASSERT(pConfig != NULL); + DBG_ASSERT(m_pConfig); for (DWORD i = 0; i < nParameters; i++) { diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index d658fa957b..de806e7f71 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "precomp.hxx" #include "inprocesshandler.h" #include "inprocessapplication.h" #include "aspnetcore_event.h" diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h index 3934e2cd92..fe0331da9b 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h @@ -3,7 +3,6 @@ #pragma once -#include "precomp.hxx" #include "requesthandler.h" #include #include "iapplication.h" diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx index 1f1590ae75..38c4cb6503 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -#include "precomp.hxx" #include "inprocessapplication.h" #include "inprocesshandler.h" #include "requesthandler_config.h" @@ -64,8 +63,6 @@ http_get_server_variable( PCWSTR pszVariableValue; DWORD cbLength; - DBG_ASSERT(pszVariableValue != NULL); - HRESULT hr = pInProcessHandler ->QueryHttpContext() ->GetServerVariable(pszVariableName, &pszVariableValue, &cbLength); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.cpp new file mode 100644 index 0000000000..12fcb1d436 --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.cpp @@ -0,0 +1,4 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +// Do not remove this file. It is used for precompiled header generation diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 3778b906c6..41f2612683 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -111,6 +111,7 @@ true kernel32.lib;user32.lib;nothrownew.obj;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) Source.def + UseLinkTimeCodeGeneration @@ -143,6 +144,7 @@ true kernel32.lib;user32.lib;nothrownew.obj;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) Source.def + UseLinkTimeCodeGeneration @@ -177,6 +179,7 @@ true Source.def kernel32.lib;user32.lib;nothrownew.obj;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) + UseLinkTimeCodeGeneration @@ -211,6 +214,7 @@ true Source.def kernel32.lib;user32.lib;nothrownew.obj;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + UseLinkTimeCodeGeneration diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx index f08d71de29..e2d5c1ec3c 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx @@ -119,7 +119,7 @@ HRESULT EnsureOutOfProcessInitializtion() { - DBG_ASSERT(pServer); + DBG_ASSERT(g_pHttpServer); HRESULT hr = S_OK; BOOL fLocked = FALSE; diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 906518c621..85cc1d39be 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -101,7 +101,7 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;precomp.obj;%(AdditionalDependencies) @@ -127,7 +127,7 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;precomp.obj;%(AdditionalDependencies) @@ -153,7 +153,7 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;precomp.obj;%(AdditionalDependencies) @@ -179,7 +179,7 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;precomp.obj;%(AdditionalDependencies) From 385f647215dd2612433a8320d1b2981200228a62 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 11 Jul 2018 18:29:36 -0700 Subject: [PATCH 128/363] Allow debug log file to be specified in handler settings; move tests from IISExpress to shared. (#1033) --- .../AspNetCore/Inc/applicationmanager.h | 4 +- .../AspNetCore/src/applicationmanager.cxx | 9 ++ .../AspNetCore/src/aspnetcore_shim_config.cpp | 2 +- .../AspNetCore/src/dllmain.cpp | 1 + .../CommonLib/config_utility.h | 33 ++++++- .../CommonLib/debugutil.cpp | 90 +++++++++++++++---- src/AspNetCoreModuleV2/CommonLib/debugutil.h | 10 +++ .../InProcessRequestHandler/dllmain.cxx | 8 +- .../requesthandler_config.cpp | 3 + .../Inprocess}/LoggingTests.cs | 31 +++++++ .../Inprocess}/StartupExceptionTests.cs | 14 +-- .../Utilities/Helpers.cs | 36 ++++++++ .../Utilities/IISApplication.cs | 2 +- .../Utilities/IISDeployer.cs | 4 +- .../Utilities/SkipIISAttribute.cs | 17 ++++ test/CommonLibTests/ConfigUtilityTests.cpp | 37 +++++--- ...STestAttribute.cs => RequiresAttribute.cs} | 0 ...stAttribute.cs => RequiresIISAttribute.cs} | 0 .../StartupExceptionWebSite/web.config | 10 +++ 19 files changed, 267 insertions(+), 44 deletions(-) rename test/{IISExpress.FunctionalTests/InProcess => Common.FunctionalTests/Inprocess}/LoggingTests.cs (73%) rename test/{IISExpress.FunctionalTests/InProcess => Common.FunctionalTests/Inprocess}/StartupExceptionTests.cs (84%) create mode 100644 test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs rename test/IIS.FunctionalTests/{SkipIISTestAttribute.cs => RequiresAttribute.cs} (100%) rename test/IISExpress.FunctionalTests/{SkipIISTestAttribute.cs => RequiresIISAttribute.cs} (100%) create mode 100644 test/WebSites/StartupExceptionWebSite/web.config diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h index 5245af06d5..cd565e2c01 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h +++ b/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h @@ -111,7 +111,8 @@ private: // we currently limit the size of m_pstrErrorInfo to 5000, be careful if you want to change its payload // APPLICATION_MANAGER() : m_pApplicationInfoHash(NULL), - m_hostingModel(HOSTING_UNKNOWN) + m_hostingModel(HOSTING_UNKNOWN), + m_fDebugInitialize(FALSE) { InitializeSRWLock(&m_srwLock); } @@ -120,4 +121,5 @@ private: static APPLICATION_MANAGER *sm_pApplicationManager; SRWLOCK m_srwLock; APP_HOSTING_MODEL m_hostingModel; + BOOL m_fDebugInitialize; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx index 71fb2e464f..c65222b10e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx @@ -38,6 +38,15 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( *ppApplicationInfo = NULL; + if (!m_fDebugInitialize) + { + SRWExclusiveLock lock(m_srwLock); + if (!m_fDebugInitialize) + { + DebugInitializeFromConfig(*pServer, *pHttpContext->GetApplication()); + m_fDebugInitialize = TRUE; + } + } // The configuration path is unique for each application and is used for the // key in the applicationInfoHash. pszApplicationId = pHttpContext->GetApplication()->GetApplicationId(); diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp index 9fb17be078..a857706142 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp @@ -58,7 +58,7 @@ ASPNETCORE_SHIM_CONFIG::Populate( if (m_hostingModel == HOSTING_OUT_PROCESS) { - RETURN_IF_FAILED(ConfigUtility::FindHandlerVersion(pAspNetCoreElement, &m_struHandlerVersion)); + RETURN_IF_FAILED(ConfigUtility::FindHandlerVersion(pAspNetCoreElement, m_struHandlerVersion)); } return S_OK; diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp index 03196a316d..d185ad4be4 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp @@ -25,6 +25,7 @@ BOOL g_fAspnetcoreRHLoadedError = FALSE; BOOL g_fInShutdown = FALSE; DWORD g_dwActiveServerProcesses = 0; SRWLOCK g_srwLock; + PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; VOID diff --git a/src/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/AspNetCoreModuleV2/CommonLib/config_utility.h index 5585d14614..ae4aeb0466 100644 --- a/src/AspNetCoreModuleV2/CommonLib/config_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/config_utility.h @@ -7,24 +7,49 @@ #include "ahutil.h" #include "stringu.h" #include "exceptions.h" +#include "atlbase.h" class ConfigUtility { #define CS_ASPNETCORE_HANDLER_SETTINGS L"handlerSettings" #define CS_ASPNETCORE_HANDLER_VERSION L"handlerVersion" + #define CS_ASPNETCORE_DEBUG_FILE L"debugFile" + #define CS_ASPNETCORE_DEBUG_LEVEL L"debugLevel" #define CS_ASPNETCORE_HANDLER_SETTINGS_NAME L"name" #define CS_ASPNETCORE_HANDLER_SETTINGS_VALUE L"value" public: static HRESULT - FindHandlerVersion(IAppHostElement* pElement, STRU* strHandlerVersionValue) + FindHandlerVersion(IAppHostElement* pElement, STRU& strHandlerVersionValue) + { + return FindKeyValuePair(pElement, CS_ASPNETCORE_HANDLER_VERSION, strHandlerVersionValue); + } + + static + HRESULT + FindDebugFile(IAppHostElement* pElement, STRU& strDebugFile) + { + return FindKeyValuePair(pElement, CS_ASPNETCORE_DEBUG_FILE, strDebugFile); + } + + static + HRESULT + FindDebugLevel(IAppHostElement* pElement, STRU& strDebugFile) + { + return FindKeyValuePair(pElement, CS_ASPNETCORE_DEBUG_LEVEL, strDebugFile); + } + +private: + static + HRESULT + FindKeyValuePair(IAppHostElement* pElement, PCWSTR key, STRU& strHandlerVersionValue) { HRESULT hr; CComPtr pHandlerSettings = nullptr; CComPtr pHandlerSettingsCollection = nullptr; CComPtr pHandlerVar = nullptr; - ENUM_INDEX index {}; + ENUM_INDEX index{}; STRU strHandlerName; STRU strHandlerValue; @@ -43,9 +68,9 @@ public: RETURN_IF_FAILED(GetElementStringProperty(pHandlerVar, CS_ASPNETCORE_HANDLER_SETTINGS_NAME, &strHandlerName)); RETURN_IF_FAILED(GetElementStringProperty(pHandlerVar, CS_ASPNETCORE_HANDLER_SETTINGS_VALUE, &strHandlerValue)); - if (strHandlerName.Equals(CS_ASPNETCORE_HANDLER_VERSION, TRUE)) + if (strHandlerName.Equals(key, TRUE)) { - RETURN_IF_FAILED(strHandlerVersionValue->Copy(strHandlerValue)); + RETURN_IF_FAILED(strHandlerVersionValue.Copy(strHandlerValue)); break; } diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index cd8ca3ea05..09becc9010 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -10,9 +10,12 @@ #include "dbgutil.h" #include "Environment.h" #include "SRWExclusiveLock.h" +#include "exceptions.h" +#include "atlbase.h" +#include "config_utility.h" -inline HANDLE g_hStandardOutput; -inline HANDLE g_logFile; +inline HANDLE g_hStandardOutput = INVALID_HANDLE_VALUE; +inline HANDLE g_logFile = INVALID_HANDLE_VALUE; inline SRWLOCK g_logFileLock; VOID @@ -21,6 +24,8 @@ DebugInitialize() g_hStandardOutput = GetStdHandle(STD_OUTPUT_HANDLE); HKEY hKey; + InitializeSRWLock(&g_logFileLock); + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters", @@ -47,18 +52,9 @@ DebugInitialize() RegCloseKey(hKey); } - // We expect single digit value and a null char - const size_t environmentVariableValueSize = 2; - std::wstring environmentVariableValue(environmentVariableValueSize, '\0'); - try { - const auto value = std::stoi(Environment::GetEnvironmentVariableValue(L"ASPNETCORE_MODULE_DEBUG").value_or(L"0")); - - if (value >= 1) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_ERROR; - if (value >= 2) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_WARNING; - if (value >= 3) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_INFO; - if (value >= 4) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_CONSOLE; + SetDebugFlags(Environment::GetEnvironmentVariableValue(L"ASPNETCORE_MODULE_DEBUG").value_or(L"0")); } catch (...) { @@ -69,9 +65,73 @@ DebugInitialize() { const auto debugOutputFile = Environment::GetEnvironmentVariableValue(L"ASPNETCORE_MODULE_DEBUG_FILE"); - if (debugOutputFile.has_value()) + CreateDebugLogFile(debugOutputFile.value_or(L"")); + } + catch (...) + { + // ignore + } +} + +HRESULT +DebugInitializeFromConfig(IHttpServer& pHttpServer, IHttpApplication& pHttpApplication) +{ + CComPtr pAspNetCoreElement; + + const CComBSTR bstrAspNetCoreSection = L"system.webServer/aspNetCore"; + CComBSTR bstrConfigPath = pHttpApplication.GetAppConfigPath(); + + RETURN_IF_FAILED(pHttpServer.GetAdminManager()->GetAdminSection(bstrAspNetCoreSection, + bstrConfigPath, + &pAspNetCoreElement)); + + STRU debugFile; + RETURN_IF_FAILED(ConfigUtility::FindDebugFile(pAspNetCoreElement, debugFile)); + + STRU debugValue; + RETURN_IF_FAILED(ConfigUtility::FindDebugLevel(pAspNetCoreElement, debugValue)); + + SetDebugFlags(debugFile.QueryStr()); + + CreateDebugLogFile(debugFile.QueryStr()); + + return S_OK; +} + +void SetDebugFlags(const std::wstring &debugValue) +{ + try + { + if (!debugValue.empty()) { - g_logFile = CreateFileW(debugOutputFile.value().c_str(), + const auto value = std::stoi(debugValue.c_str()); + + if (value >= 1) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_ERROR; + if (value >= 2) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_WARNING; + if (value >= 3) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_INFO; + if (value >= 4) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_CONSOLE; + } + } + catch (...) + { + // ignore + } +} + +void CreateDebugLogFile(const std::wstring &debugOutputFile) +{ + try + { + if (!debugOutputFile.empty()) + { + if (g_logFile != INVALID_HANDLE_VALUE) + { + WLOG_INFOF(L"Switching debug log files to %s", debugOutputFile.c_str()); + CloseHandle(g_logFile); + DEBUG_FLAGS_VAR &= ~ASPNETCORE_DEBUG_FLAG_FILE; + + } + g_logFile = CreateFileW(debugOutputFile.c_str(), (GENERIC_READ | GENERIC_WRITE), (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE), nullptr, @@ -81,11 +141,9 @@ DebugInitialize() ); if (g_logFile != INVALID_HANDLE_VALUE) { - InitializeSRWLock(&g_logFileLock); DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_FILE; } } - } catch (...) { diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/AspNetCoreModuleV2/CommonLib/debugutil.h index 0a21a6d51a..b5f4075de2 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.h +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.h @@ -3,6 +3,8 @@ #pragma once +#include "stdafx.h" +#include "stringu.h" #include #include "dbgutil.h" @@ -27,6 +29,14 @@ VOID DebugInitialize(); +VOID +CreateDebugLogFile(const std::wstring &debugOutputFile); + +HRESULT +DebugInitializeFromConfig(IHttpServer& pHttpServer, IHttpApplication& pHttpApplication); + +void SetDebugFlags(const std::wstring &value); + VOID DebugStop(); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx index e1bc9ac143..f7b985aa0b 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -25,7 +25,8 @@ HANDLE g_hEventLog = NULL; HRESULT InitializeGlobalConfiguration( - IHttpServer * pServer + IHttpServer * pServer, + IHttpApplication* pHttpApplication ) { if (!g_fGlobalInitialize) @@ -48,6 +49,8 @@ InitializeGlobalConfiguration( } DebugInitialize(); + DebugInitializeFromConfig(*pServer, *pHttpApplication); + g_fGlobalInitialize = TRUE; } } @@ -87,10 +90,9 @@ CreateApplication( _Out_ IAPPLICATION **ppApplication ) { - try { - RETURN_IF_FAILED(InitializeGlobalConfiguration(pServer)); + RETURN_IF_FAILED(InitializeGlobalConfiguration(pServer, pHttpApplication)); REQUESTHANDLER_CONFIG *pConfig = nullptr; RETURN_IF_FAILED(REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpApplication, &pConfig)); diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp index 4f5a253f9e..0af41d0f1c 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp @@ -5,6 +5,9 @@ #include "requesthandler_config.h" #include "debugutil.h" #include "environmentvariablehash.h" +#include "exceptions.h" +#include "config_utility.h" + REQUESTHANDLER_CONFIG::~REQUESTHANDLER_CONFIG() { diff --git a/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs similarity index 73% rename from test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs rename to test/Common.FunctionalTests/Inprocess/LoggingTests.cs index 6d8e73a15c..1ac8c9e1d8 100644 --- a/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -91,5 +91,36 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } + [ConditionalFact] + [SkipIIS] + public async Task StartupMessagesLogFileSwitchedWhenLogFilePresentInWebConfig() + { + var firstTempFile = Path.GetTempFileName(); + var secondTempFile = Path.GetTempFileName(); + + try + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"] = firstTempFile; + + var deploymentResult = await DeployAsync(deploymentParameters); + Helpers.AddDebugLogToWebConfig(deploymentParameters.PublishedApplicationRootPath, secondTempFile); + + var response = await deploymentResult.RetryingHttpClient.GetAsync("/"); + + StopServer(); + var logContents = File.ReadAllText(firstTempFile); + Assert.Contains("Switching debug log files to", logContents); + + var secondLogContents = File.ReadAllText(secondTempFile); + Assert.Contains("[aspnetcorev2.dll]", logContents); + Assert.Contains("[aspnetcorev2_inprocess.dll]", logContents); + } + finally + { + File.Delete(firstTempFile); + File.Delete(secondTempFile); + } + } } } diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupExceptionTests.cs b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs similarity index 84% rename from test/IISExpress.FunctionalTests/InProcess/StartupExceptionTests.cs rename to test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs index 00b75c3a7c..d39ed68c24 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupExceptionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -10,16 +10,18 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { - public class StartupExceptionTests : IISFunctionalTestBase { - // TODO FileNotFound here. [ConditionalTheory] [InlineData("CheckLogFile")] [InlineData("CheckErrLogFile")] public async Task CheckStdoutWithRandomNumber(string path) { - var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite"); + // Forcing publish for now to have parity between IIS and IISExpress + // Reason is because by default for IISExpress, we expect there to not be a web.config file. + // However, for IIS, we need a web.config file because the default on generated on publish + // doesn't include V2. We can remove the publish flag once IIS supports non-publish running + var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite", publish: true); deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; var randomNumberString = new Random(Guid.NewGuid().GetHashCode()).Next(10000000).ToString(); deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_RANDOM_VALUE"] = randomNumberString; @@ -42,9 +44,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [InlineData("CheckOversizedStdOutWrites")] public async Task CheckStdoutWithLargeWrites(string path) { - // Need a web.config - // Also publish issues. - var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite"); + var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite", publish: true); deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; var deploymentResult = await DeployAsync(deploymentParameters); @@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task Gets500_30_ErrorPage() { - var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite"); + var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite", publish: true); var deploymentResult = await DeployAsync(deploymentParameters); diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index f4114730b3..8ab128e15f 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -52,6 +52,41 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests config.Save(webConfigFile); } + public static void AddDebugLogToWebConfig(string contentRoot, string filename) + { + var path = Path.Combine(contentRoot, "web.config"); + var webconfig = XDocument.Load(path); + var xElement = webconfig.Descendants("aspNetCore").Single(); + + var element = xElement.Descendants("handlerSettings").SingleOrDefault(); + if (element == null) + { + element = new XElement("handlerSettings"); + xElement.Add(element); + } + + CreateOrSetElement(element, "debugLevel", "4"); + + CreateOrSetElement(element, "debugFile", Path.Combine(contentRoot, filename)); + + webconfig.Save(path); + } + + private static void CreateOrSetElement(XElement rootElement, string name, string value) + { + if (rootElement.Descendants() + .Attributes() + .Where(attribute => attribute.Value == name) + .Any()) + { + return; + } + var element = new XElement("handlerSetting"); + element.SetAttributeValue("name", name); + element.SetAttributeValue("value", value); + rootElement.Add(element); + } + // Defaults to inprocess specific deployment parameters public static DeploymentParameters GetBaseDeploymentParameters(string site = null, HostingModel hostingModel = HostingModel.InProcess, bool publish = false) { @@ -72,5 +107,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private static string GetWebConfigFile(IISDeploymentResult deploymentResult) => Path.Combine(deploymentResult.DeploymentResult.ContentRoot, "web.config"); + } } diff --git a/test/Common.FunctionalTests/Utilities/IISApplication.cs b/test/Common.FunctionalTests/Utilities/IISApplication.cs index 662f9315a6..ea8a95b99d 100644 --- a/test/Common.FunctionalTests/Utilities/IISApplication.cs +++ b/test/Common.FunctionalTests/Utilities/IISApplication.cs @@ -221,6 +221,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting var pool = _serverManager.ApplicationPools.Add(AppPoolName); pool.ProcessModel.IdentityType = ProcessModelIdentityType.LocalSystem; pool.ManagedRuntimeVersion = string.Empty; + pool.StartMode = StartMode.AlwaysRunning; AddEnvironmentVariables(contentRoot, pool); @@ -244,7 +245,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting { AddEnvironmentVariableToAppPool(envCollection, tuple.Key, tuple.Value); } - AddEnvironmentVariableToAppPool(envCollection, "ASPNETCORE_MODULE_DEBUG_FILE", $"{WebSiteName}.txt"); } catch (COMException comException) { diff --git a/test/Common.FunctionalTests/Utilities/IISDeployer.cs b/test/Common.FunctionalTests/Utilities/IISDeployer.cs index f3f9d8e7b9..8104a47a1c 100644 --- a/test/Common.FunctionalTests/Utilities/IISDeployer.cs +++ b/test/Common.FunctionalTests/Utilities/IISDeployer.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.IntegrationTesting @@ -58,13 +59,14 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting // For now, only support using published output DeploymentParameters.PublishApplicationBeforeDeployment = true; - if (DeploymentParameters.PublishApplicationBeforeDeployment) { DotnetPublish(); contentRoot = DeploymentParameters.PublishedApplicationRootPath; } + Helpers.AddDebugLogToWebConfig(contentRoot, Path.Combine(contentRoot, $"{_application.WebSiteName}.txt")); + var uri = TestIISUriHelper.BuildTestUri(ServerType.IIS, DeploymentParameters.ApplicationBaseUriHint); // To prevent modifying the IIS setup concurrently. await _application.StartIIS(uri, contentRoot); diff --git a/test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs b/test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs new file mode 100644 index 0000000000..da90b513f8 --- /dev/null +++ b/test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs @@ -0,0 +1,17 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class SkipIISAttribute : Attribute, ITestCondition + { + public bool IsMet => DeployerSelector.ServerType == ServerType.IIS; + + public string SkipReason => "Cannot run test on full IIS."; + } +} diff --git a/test/CommonLibTests/ConfigUtilityTests.cpp b/test/CommonLibTests/ConfigUtilityTests.cpp index dac87240e1..9b5bf6e9e6 100644 --- a/test/CommonLibTests/ConfigUtilityTests.cpp +++ b/test/CommonLibTests/ConfigUtilityTests.cpp @@ -13,7 +13,7 @@ namespace ConfigUtilityTests class ConfigUtilityTest : public Test { protected: - void Test(std::wstring key, std::wstring value, std::wstring expected) + void TestHandlerVersion(std::wstring key, std::wstring value, std::wstring expected, HRESULT(*func)(IAppHostElement*, STRU&)) { IAppHostElement* retElement = NULL; @@ -40,7 +40,7 @@ namespace ConfigUtilityTests .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(key.c_str())), testing::Return(S_OK))) .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(value.c_str())), testing::Return(S_OK))); - HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); + HRESULT hr = func(element.get(), handlerVersion); EXPECT_EQ(hr, S_OK); EXPECT_STREQ(handlerVersion.QueryStr(), expected.c_str()); @@ -49,12 +49,29 @@ namespace ConfigUtilityTests TEST_F(ConfigUtilityTest, CheckHandlerVersionKeysAndValues) { - Test(L"handlerVersion", L"value", L"value"); - Test(L"handlerversion", L"value", L"value"); - Test(L"HandlerversioN", L"value", L"value"); - Test(L"randomvalue", L"value", L""); - Test(L"", L"value", L""); - Test(L"", L"", L""); + auto func = ConfigUtility::FindHandlerVersion; + TestHandlerVersion(L"handlerVersion", L"value", L"value", func); + TestHandlerVersion(L"handlerversion", L"value", L"value", func); + TestHandlerVersion(L"HandlerversioN", L"value", L"value", func); + TestHandlerVersion(L"randomvalue", L"value", L"", func); + TestHandlerVersion(L"", L"value", L"", func); + TestHandlerVersion(L"", L"", L"", func); + } + + TEST_F(ConfigUtilityTest, CheckDebugLogFile) + { + auto func = ConfigUtility::FindDebugFile; + + TestHandlerVersion(L"debugFile", L"value", L"value", func); + TestHandlerVersion(L"debugFILE", L"value", L"value", func); + } + + TEST_F(ConfigUtilityTest, CheckDebugLevel) + { + auto func = ConfigUtility::FindDebugLevel; + + TestHandlerVersion(L"debugLevel", L"value", L"value", func); + TestHandlerVersion(L"debugLEVEL", L"value", L"value", func); } TEST(ConfigUtilityTestSingle, MultipleElements) @@ -84,7 +101,7 @@ namespace ConfigUtilityTests .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"handlerVersion")), testing::Return(S_OK))) .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value2")), testing::Return(S_OK))); - HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); + HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), handlerVersion); EXPECT_EQ(hr, S_OK); EXPECT_STREQ(handlerVersion.QueryStr(), L"value2"); @@ -98,7 +115,7 @@ namespace ConfigUtilityTests ON_CALL(*element, GetElementByName(_, _)) .WillByDefault(DoAll(testing::SetArgPointee<1>(nullptr), testing::Return(HRESULT_FROM_WIN32( ERROR_INVALID_INDEX )))); - HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), &handlerVersion); + HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), handlerVersion); EXPECT_EQ(hr, S_OK); EXPECT_STREQ(handlerVersion.QueryStr(), L""); diff --git a/test/IIS.FunctionalTests/SkipIISTestAttribute.cs b/test/IIS.FunctionalTests/RequiresAttribute.cs similarity index 100% rename from test/IIS.FunctionalTests/SkipIISTestAttribute.cs rename to test/IIS.FunctionalTests/RequiresAttribute.cs diff --git a/test/IISExpress.FunctionalTests/SkipIISTestAttribute.cs b/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs similarity index 100% rename from test/IISExpress.FunctionalTests/SkipIISTestAttribute.cs rename to test/IISExpress.FunctionalTests/RequiresIISAttribute.cs diff --git a/test/WebSites/StartupExceptionWebSite/web.config b/test/WebSites/StartupExceptionWebSite/web.config new file mode 100644 index 0000000000..0c7405e4d1 --- /dev/null +++ b/test/WebSites/StartupExceptionWebSite/web.config @@ -0,0 +1,10 @@ + + + + + + + + + + From 11ca4e46f657fce755006730f1b9511357f7419c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 11 Jul 2018 21:36:50 -0700 Subject: [PATCH 129/363] Remove unused .Sources packages --- build/dependencies.props | 2 -- .../Microsoft.AspNetCore.Server.IIS.csproj | 1 - .../Microsoft.AspNetCore.Server.IISIntegration.csproj | 3 +-- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 7b99d5e296..9e7e524c41 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -22,7 +22,6 @@ 15.6.82 15.6.82 2.2.0-preview1-34640 - 2.2.0-preview1-34640 2.2.0-preview1-34640 2.2.0-preview1-34640 2.2.0-preview1-34640 @@ -32,7 +31,6 @@ 2.2.0-preview1-34640 2.2.0-preview1-34640 2.2.0-preview1-34640 - 2.2.0-preview1-34640 2.0.7 2.1.1 2.2.0-preview1-26618-02 diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index f45796256a..76c3ecfe5c 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -13,7 +13,6 @@ - diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj index f816c8de3f..e64bb17309 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -23,7 +23,6 @@ - - \ No newline at end of file + From c81f379045b8b93974c154d977e68b00e3c472fa Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 12 Jul 2018 09:30:50 -0700 Subject: [PATCH 130/363] Normalize file extensions and project structures (#1038) --- .../AspNetCore/AspNetCore.vcxproj | 42 ++++++------ .../AspNetCore/{src => }/applicationinfo.cpp | 0 .../AspNetCore/{Inc => }/applicationinfo.h | 0 ...tionmanager.cxx => applicationmanager.cpp} | 0 .../AspNetCore/{Inc => }/applicationmanager.h | 0 .../{src => }/aspnetcore_shim_config.cpp | 0 .../{Inc => }/aspnetcore_shim_config.h | 0 .../AspNetCore/{src => }/dllmain.cpp | 0 .../AspNetCore/{src => }/globalmodule.cpp | 0 .../AspNetCore/{Inc => }/globalmodule.h | 0 .../{src/proxymodule.cxx => proxymodule.cpp} | 0 .../AspNetCore/{Inc => }/proxymodule.h | 0 .../{src/precomp.cpp => stdafx.cpp} | 0 .../AspNetCore/{Inc/precomp.hxx => stdafx.h} | 0 .../CommonLib/CommonLib.vcxproj | 4 +- .../CommonLib/{fx_ver.cxx => fx_ver.cpp} | 0 .../CommonLib/{utility.cxx => utility.cpp} | 0 src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj | 4 +- .../IISLib/{acache.cxx => acache.cpp} | 0 .../IISLib/{util.cxx => util.cpp} | 0 .../InProcessRequestHandler.vcxproj | 24 +++---- .../{dllmain.cxx => dllmain.cpp} | 0 ...{managedexports.cxx => managedexports.cpp} | 0 .../{precomp.cpp => stdafx.cpp} | 0 .../{precomp.hxx => stdafx.h} | 0 .../OutOfProcessRequestHandler.vcxproj | 66 +++++++++++-------- .../{dllmain.cxx => dllmain.cpp} | 2 +- ...connection.cxx => forwarderconnection.cpp} | 4 +- .../{outofprocess => }/forwarderconnection.h | 0 .../{outofprocess => }/forwardinghandler.cpp | 5 +- .../{outofprocess => }/forwardinghandler.h | 0 .../outprocessapplication.cpp | 6 +- .../outprocessapplication.h | 0 .../processmanager.cxx => processmanager.cpp} | 2 +- .../{outofprocess => }/processmanager.h | 0 .../protocolconfig.cxx => protocolconfig.cpp} | 4 +- .../{outofprocess => }/protocolconfig.h | 0 ...eheaderhash.cxx => responseheaderhash.cpp} | 2 +- .../{outofprocess => }/responseheaderhash.h | 0 .../serverprocess.cxx => serverprocess.cpp} | 3 +- .../{outofprocess => }/serverprocess.h | 0 .../OutOfProcessRequestHandler/stdafx.cpp | 4 ++ .../{precomp.hxx => stdafx.h} | 18 ++--- ...sockethandler.cxx => websockethandler.cpp} | 2 +- .../{outofprocess => }/websockethandler.h | 0 .../winhttphelper.cxx => winhttphelper.cpp} | 2 +- .../{outofprocess => }/winhttphelper.h | 0 .../environmentvariablehelpers.h | 2 - test/CommonLibTests/CommonLibTests.vcxproj | 12 ++-- 49 files changed, 116 insertions(+), 92 deletions(-) rename src/AspNetCoreModuleV2/AspNetCore/{src => }/applicationinfo.cpp (100%) rename src/AspNetCoreModuleV2/AspNetCore/{Inc => }/applicationinfo.h (100%) rename src/AspNetCoreModuleV2/AspNetCore/{src/applicationmanager.cxx => applicationmanager.cpp} (100%) rename src/AspNetCoreModuleV2/AspNetCore/{Inc => }/applicationmanager.h (100%) rename src/AspNetCoreModuleV2/AspNetCore/{src => }/aspnetcore_shim_config.cpp (100%) rename src/AspNetCoreModuleV2/AspNetCore/{Inc => }/aspnetcore_shim_config.h (100%) rename src/AspNetCoreModuleV2/AspNetCore/{src => }/dllmain.cpp (100%) rename src/AspNetCoreModuleV2/AspNetCore/{src => }/globalmodule.cpp (100%) rename src/AspNetCoreModuleV2/AspNetCore/{Inc => }/globalmodule.h (100%) rename src/AspNetCoreModuleV2/AspNetCore/{src/proxymodule.cxx => proxymodule.cpp} (100%) rename src/AspNetCoreModuleV2/AspNetCore/{Inc => }/proxymodule.h (100%) rename src/AspNetCoreModuleV2/AspNetCore/{src/precomp.cpp => stdafx.cpp} (100%) rename src/AspNetCoreModuleV2/AspNetCore/{Inc/precomp.hxx => stdafx.h} (100%) rename src/AspNetCoreModuleV2/CommonLib/{fx_ver.cxx => fx_ver.cpp} (100%) rename src/AspNetCoreModuleV2/CommonLib/{utility.cxx => utility.cpp} (100%) rename src/AspNetCoreModuleV2/IISLib/{acache.cxx => acache.cpp} (100%) rename src/AspNetCoreModuleV2/IISLib/{util.cxx => util.cpp} (100%) rename src/AspNetCoreModuleV2/InProcessRequestHandler/{dllmain.cxx => dllmain.cpp} (100%) rename src/AspNetCoreModuleV2/InProcessRequestHandler/{managedexports.cxx => managedexports.cpp} (100%) rename src/AspNetCoreModuleV2/InProcessRequestHandler/{precomp.cpp => stdafx.cpp} (100%) rename src/AspNetCoreModuleV2/InProcessRequestHandler/{precomp.hxx => stdafx.h} (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{dllmain.cxx => dllmain.cpp} (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/forwarderconnection.cxx => forwarderconnection.cpp} (97%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/forwarderconnection.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/forwardinghandler.cpp (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/forwardinghandler.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/outprocessapplication.cpp (93%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/outprocessapplication.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/processmanager.cxx => processmanager.cpp} (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/processmanager.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/protocolconfig.cxx => protocolconfig.cpp} (97%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/protocolconfig.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/responseheaderhash.cxx => responseheaderhash.cpp} (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/responseheaderhash.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/serverprocess.cxx => serverprocess.cpp} (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/serverprocess.h (100%) create mode 100644 src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{precomp.hxx => stdafx.h} (86%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/websockethandler.cxx => websockethandler.cpp} (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/websockethandler.h (100%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess/winhttphelper.cxx => winhttphelper.cpp} (99%) rename src/AspNetCoreModuleV2/OutOfProcessRequestHandler/{outofprocess => }/winhttphelper.h (100%) diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index 1a80711d26..c0d926bd35 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -79,7 +79,7 @@ Level4 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h $(IntDir)$(TargetName).pch ..\IISLib;.\Inc;..\CommonLib ProgramDatabase @@ -97,7 +97,7 @@ true true stdcpp17 - precomp.hxx + stdafx.h Windows @@ -115,7 +115,7 @@ Level4 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h $(IntDir)$(TargetName).pch ..\IISLib;.\Inc;..\CommonLib ProgramDatabase @@ -133,7 +133,7 @@ true true stdcpp17 - precomp.hxx + stdafx.h Windows @@ -155,7 +155,7 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) ..\IISLib;.\Inc;..\CommonLib - precomp.hxx + stdafx.h MultiThreaded true true @@ -170,7 +170,7 @@ true true stdcpp17 - precomp.hxx + stdafx.h Windows @@ -193,7 +193,7 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h ..\IISLib;.\Inc;..\CommonLib MultiThreaded true @@ -209,7 +209,7 @@ true true stdcpp17 - precomp.hxx + stdafx.h Windows @@ -225,26 +225,26 @@ - - - - - - + + + + + + - - - - - - + + + + + + Create Create Create Create - + diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp rename to src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h rename to src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx rename to src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h rename to src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/aspnetcore_shim_config.cpp rename to src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Inc/aspnetcore_shim_config.h rename to src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp rename to src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/globalmodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/globalmodule.cpp rename to src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h rename to src/AspNetCoreModuleV2/AspNetCore/globalmodule.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx rename to src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h rename to src/AspNetCoreModuleV2/AspNetCore/proxymodule.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.cpp b/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/src/precomp.cpp rename to src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx b/src/AspNetCoreModuleV2/AspNetCore/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Inc/precomp.hxx rename to src/AspNetCoreModuleV2/AspNetCore/stdafx.h diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index efeb7f1ddc..2be58bcc5c 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -217,7 +217,7 @@ - + @@ -231,7 +231,7 @@ Create Create - + diff --git a/src/AspNetCoreModuleV2/CommonLib/fx_ver.cxx b/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/fx_ver.cxx rename to src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.cxx b/src/AspNetCoreModuleV2/CommonLib/utility.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/utility.cxx rename to src/AspNetCoreModuleV2/CommonLib/utility.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index 6d947fcb58..96b722d328 100644 --- a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -187,7 +187,7 @@ - + @@ -196,7 +196,7 @@ - + diff --git a/src/AspNetCoreModuleV2/IISLib/acache.cxx b/src/AspNetCoreModuleV2/IISLib/acache.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/acache.cxx rename to src/AspNetCoreModuleV2/IISLib/acache.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/util.cxx b/src/AspNetCoreModuleV2/IISLib/util.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/util.cxx rename to src/AspNetCoreModuleV2/IISLib/util.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index c96aaa7000..6531befa35 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -87,7 +87,7 @@ Level4 Disabled WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug @@ -104,7 +104,7 @@ CompileAsCpp true stdcpp17 - precomp.hxx + stdafx.h true @@ -121,7 +121,7 @@ Level4 Disabled WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug @@ -138,7 +138,7 @@ CompileAsCpp true stdcpp17 - precomp.hxx + stdafx.h true @@ -157,7 +157,7 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h MultiThreaded ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true @@ -172,7 +172,7 @@ CompileAsCpp true stdcpp17 - precomp.hxx + stdafx.h true @@ -193,7 +193,7 @@ true true NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h MultiThreaded ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true @@ -208,7 +208,7 @@ CompileAsCpp true stdcpp17 - precomp.hxx + stdafx.h true @@ -226,17 +226,17 @@ - + - + - - + + Create Create Create diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx rename to src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx rename to src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.cpp rename to src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx rename to src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 41f2612683..c34aa8d3a3 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -83,11 +83,11 @@ - NotUsing + Use Level4 Disabled WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug @@ -105,6 +105,7 @@ true true stdcpp17 + stdafx.h Windows @@ -116,11 +117,11 @@ - NotUsing + Use Level4 Disabled WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h $(IntDir)$(TargetName).pch ProgramDatabase MultiThreadedDebug @@ -138,6 +139,7 @@ true true stdcpp17 + stdafx.h Windows @@ -150,12 +152,12 @@ Level4 - NotUsing + Use MaxSpeed true true WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h MultiThreaded ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true @@ -171,6 +173,7 @@ true true stdcpp17 + stdafx.h Windows @@ -185,12 +188,12 @@ Level4 - NotUsing + Use MaxSpeed true true NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - precomp.hxx + stdafx.h MultiThreaded ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib true @@ -206,6 +209,7 @@ true true stdcpp17 + stdafx.h Windows @@ -221,28 +225,34 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + Create + Create + Create + Create + + + diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp index e2d5c1ec3c..710be75262 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp @@ -1,5 +1,5 @@ // dllmain.cpp : Defines the entry point for the DLL application. -#include "precomp.hxx" + #include #include diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp similarity index 97% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp index 99990f938c..0369edcce9 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "..\precomp.hxx" +#include "forwarderconnection.h" FORWARDER_CONNECTION::FORWARDER_CONNECTION( VOID @@ -49,4 +49,4 @@ FORWARDER_CONNECTION::Initialize( Finished: return hr; -} \ No newline at end of file +} diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp index bfe689fe58..8b41b72ee4 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp @@ -1,4 +1,7 @@ -#include "..\precomp.hxx" +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "forwardinghandler.h" // Just to be aware of the FORWARDING_HANDLER object size. C_ASSERT(sizeof(FORWARDING_HANDLER) <= 632); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp similarity index 93% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp index ce29fd4745..90d75b2991 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp @@ -1,4 +1,8 @@ -#include "..\precomp.hxx" +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "outprocessapplication.h" + #include "SRWExclusiveLock.h" OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION( diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp index 85160dc55b..5619319c22 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "..\precomp.hxx" +#include "processmanager.h" volatile BOOL PROCESS_MANAGER::sm_fWSAStartupDone = FALSE; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp similarity index 97% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp index bb59a5ff3d..0f75a9d072 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "..\precomp.hxx" +#include "protocolconfig.h" HRESULT PROTOCOL_CONFIG::Initialize() @@ -45,4 +45,4 @@ PROTOCOL_CONFIG::OverrideConfig( ) { m_msTimeout = pAspNetCoreConfig->QueryRequestTimeoutInMS(); -} \ No newline at end of file +} diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp index f2fae274d5..d8c77eccb0 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "..\precomp.hxx" +#include "responseheaderhash.h" HEADER_RECORD RESPONSE_HEADER_HASH::sm_rgHeaders[] = { diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp index cedbd0ba12..12be084681 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp @@ -1,7 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "..\precomp.hxx" +#include "serverprocess.h" + #include //#include diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp new file mode 100644 index 0000000000..12fcb1d436 --- /dev/null +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp @@ -0,0 +1,4 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +// Do not remove this file. It is used for precompiled header generation diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h similarity index 86% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h index e77b603820..7cdcfa0146 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h @@ -64,15 +64,15 @@ #include "requesthandler_config.h" #include "sttimer.h" -#include ".\outofprocess\websockethandler.h" -#include ".\outofprocess\responseheaderhash.h" -#include ".\outofprocess\protocolconfig.h" -#include ".\outofprocess\forwarderconnection.h" -#include ".\outofprocess\serverprocess.h" -#include ".\outofprocess\processmanager.h" -#include ".\outofprocess\forwardinghandler.h" -#include ".\outofprocess\outprocessapplication.h" -#include ".\outofprocess\winhttphelper.h" +#include "websockethandler.h" +#include "responseheaderhash.h" +#include "protocolconfig.h" +#include "forwarderconnection.h" +#include "serverprocess.h" +#include "processmanager.h" +#include "forwardinghandler.h" +#include "outprocessapplication.h" +#include "winhttphelper.h" #include "environmentvariablehelpers.h" diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp index 4d86fe592e..f58d599f98 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp @@ -27,7 +27,7 @@ This prevents the need for data buffering at the Asp.Net Core Module level. --*/ -#include "..\precomp.hxx" +#include "websockethandler.h" SRWLOCK WEBSOCKET_HANDLER::sm_RequestsListLock; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp similarity index 99% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp index 1796e63081..8d14ffc417 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "..\precomp.hxx" +#include "winhttphelper.h" PFN_WINHTTP_WEBSOCKET_COMPLETE_UPGRADE WINHTTP_HELPER::sm_pfnWinHttpWebSocketCompleteUpgrade; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h b/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h index 35155faedf..b65c32ee29 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h @@ -3,8 +3,6 @@ #pragma once -#include "precomp.hxx" - class ENVIRONMENT_VAR_HELPERS { diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index 85cc1d39be..c3947b45b3 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -101,7 +101,8 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;precomp.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration @@ -127,7 +128,8 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;precomp.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration @@ -153,7 +155,8 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;precomp.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration @@ -179,7 +182,8 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;precomp.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration From ba599c49bbb5756a7de890f1d6994a14714ab444 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 12 Jul 2018 09:45:51 -0700 Subject: [PATCH 131/363] Be more resiliant to apphost.config issues (#1044) --- .../Utilities/IISApplication.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/test/Common.FunctionalTests/Utilities/IISApplication.cs b/test/Common.FunctionalTests/Utilities/IISApplication.cs index ea8a95b99d..fbde500177 100644 --- a/test/Common.FunctionalTests/Utilities/IISApplication.cs +++ b/test/Common.FunctionalTests/Utilities/IISApplication.cs @@ -199,9 +199,20 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting e => _logger.LogWarning($"Failed to delete file : {e.Message}")); } - RetryFileOperation( - () => File.Move(_apphostConfigBackupPath, _apphostConfigPath), - e => _logger.LogError($"Failed to backup apphost.config: {e.Message}")); + if (File.Exists(_apphostConfigBackupPath)) + { + RetryFileOperation( + () => File.Move(_apphostConfigBackupPath, _apphostConfigPath), + e => _logger.LogError($"Failed to backup apphost.config: {e.Message}")); + } + else + { + // Test failed to create backup config file, put a default one from IIS.config there instead. + // An apphost.config file is required to be replaced because we use it for removing the app pool. + RetryFileOperation( + () => File.WriteAllText(_apphostConfigPath, File.ReadAllText("IIS.config")), + e => _logger.LogWarning($"Failed to copy IIS.config to apphost.config: {e.Message}")); + } _logger.LogInformation($"Restored {_apphostConfigPath}."); } From e5dfea5725135d02076864b544d6e4941c31b8b3 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 12 Jul 2018 11:00:01 -0700 Subject: [PATCH 132/363] Adds project properties and project capabilities to IIS and IISIntegration (#969) --- .../Microsoft.AspNetCore.Server.IIS.targets | 6 +++++- .../Microsoft.AspNetCore.Server.IISIntegration.csproj | 1 + .../Microsoft.AspNetCore.Server.IISIntegration.targets | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets index fe0dbb05d5..85d3751b69 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets @@ -3,7 +3,11 @@ Capability that enables Visual Studio support for hosting Asp.Net Core applications in the IIS process --> - + + + V2 + + diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj index e64bb17309..faae91cdbf 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -23,6 +23,7 @@ + diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets new file mode 100644 index 0000000000..67c6152880 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets @@ -0,0 +1,7 @@ + + + + V2 + + + From 6bed0b7206c1553d14a58dd54d2c3e38b802904e Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 12 Jul 2018 11:56:33 -0700 Subject: [PATCH 133/363] Add Microsoft.AspNetCore.Server.IntegrationTesting.IIS package (#1037) --- IISIntegration.NoV1.sln | 15 + IISIntegration.sln | 15 + .../ApplicationDeployerFactory.cs | 44 + .../DotNetCommands.cs | 73 ++ .../Http.config | 1034 +++++++++++++++++ .../IISApplication.cs | 3 +- .../IISDeployer.cs | 11 +- .../IISExpressDeployer.cs | 436 +++++++ ...tCore.Server.IntegrationTesting.IIS.csproj | 21 + .../TestUriHelper.cs | 44 +- .../WebConfigHelpers.cs | 50 + .../Inprocess/LoggingTests.cs | 3 +- .../Utilities/FunctionalTestsBase.cs | 10 +- .../Utilities/Helpers.cs | 35 - .../Utilities/IISTestSiteFixture.cs | 13 +- .../IIS.FunctionalTests.csproj | 3 +- .../IISExpress.FunctionalTests.csproj | 3 +- .../InProcess/StartupTests.cs | 3 +- 18 files changed, 1713 insertions(+), 103 deletions(-) create mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs create mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/DotNetCommands.cs create mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config rename {test/Common.FunctionalTests/Utilities => src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS}/IISApplication.cs (99%) rename {test/Common.FunctionalTests/Utilities => src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS}/IISDeployer.cs (87%) create mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs create mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj rename test/Common.FunctionalTests/Utilities/TestIISUriHelper.cs => src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/TestUriHelper.cs (52%) create mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs diff --git a/IISIntegration.NoV1.sln b/IISIntegration.NoV1.sln index 04bda53889..b9b82faf5a 100644 --- a/IISIntegration.NoV1.sln +++ b/IISIntegration.NoV1.sln @@ -111,6 +111,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\As EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{D182103F-8405-4647-B158-C36F598657EF}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting.IIS", "src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj", "{34135ED7-313D-4E68-860C-D6B51AA28523}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -367,6 +369,18 @@ Global {D182103F-8405-4647-B158-C36F598657EF}.Release|x64.Build.0 = Release|Any CPU {D182103F-8405-4647-B158-C36F598657EF}.Release|x86.ActiveCfg = Release|Any CPU {D182103F-8405-4647-B158-C36F598657EF}.Release|x86.Build.0 = Release|Any CPU + {34135ED7-313D-4E68-860C-D6B51AA28523}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {34135ED7-313D-4E68-860C-D6B51AA28523}.Debug|Any CPU.Build.0 = Debug|Any CPU + {34135ED7-313D-4E68-860C-D6B51AA28523}.Debug|x64.ActiveCfg = Debug|Any CPU + {34135ED7-313D-4E68-860C-D6B51AA28523}.Debug|x64.Build.0 = Debug|Any CPU + {34135ED7-313D-4E68-860C-D6B51AA28523}.Debug|x86.ActiveCfg = Debug|Any CPU + {34135ED7-313D-4E68-860C-D6B51AA28523}.Debug|x86.Build.0 = Debug|Any CPU + {34135ED7-313D-4E68-860C-D6B51AA28523}.Release|Any CPU.ActiveCfg = Release|Any CPU + {34135ED7-313D-4E68-860C-D6B51AA28523}.Release|Any CPU.Build.0 = Release|Any CPU + {34135ED7-313D-4E68-860C-D6B51AA28523}.Release|x64.ActiveCfg = Release|Any CPU + {34135ED7-313D-4E68-860C-D6B51AA28523}.Release|x64.Build.0 = Release|Any CPU + {34135ED7-313D-4E68-860C-D6B51AA28523}.Release|x86.ActiveCfg = Release|Any CPU + {34135ED7-313D-4E68-860C-D6B51AA28523}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -396,6 +410,7 @@ Global {CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {D182103F-8405-4647-B158-C36F598657EF} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {34135ED7-313D-4E68-860C-D6B51AA28523} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/IISIntegration.sln b/IISIntegration.sln index d3e7ca4de0..c21a81482f 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -118,6 +118,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\As EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting.IIS", "src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj", "{CE4FB142-91FB-4B34-BC96-A31120EF4009}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -394,6 +396,18 @@ Global {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x64.Build.0 = Release|Any CPU {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x86.ActiveCfg = Release|Any CPU {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x86.Build.0 = Release|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|x64.ActiveCfg = Debug|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|x64.Build.0 = Debug|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|x86.ActiveCfg = Debug|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|x86.Build.0 = Debug|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|Any CPU.Build.0 = Release|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|x64.ActiveCfg = Release|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|x64.Build.0 = Release|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|x86.ActiveCfg = Release|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -426,6 +440,7 @@ Global {CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {CE4FB142-91FB-4B34-BC96-A31120EF4009} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs new file mode 100644 index 0000000000..aaec90971e --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs @@ -0,0 +1,44 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.Extensions.Logging; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + /// + /// Factory to create an appropriate deployer based on . + /// + public class IISApplicationDeployerFactory + { + /// + /// Creates a deployer instance based on settings in . + /// + /// + /// + /// + public static ApplicationDeployer Create(DeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) + { + if (deploymentParameters == null) + { + throw new ArgumentNullException(nameof(deploymentParameters)); + } + + if (loggerFactory == null) + { + throw new ArgumentNullException(nameof(loggerFactory)); + } + + switch (deploymentParameters.ServerType) + { + case ServerType.IISExpress: + return new IIS.IISExpressDeployer(deploymentParameters, loggerFactory); + case ServerType.IIS: + return new IISDeployer(deploymentParameters, loggerFactory); + default: + return ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory); + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/DotNetCommands.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/DotNetCommands.cs new file mode 100644 index 0000000000..aaa7ade405 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/DotNetCommands.cs @@ -0,0 +1,73 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Runtime.InteropServices; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + // Copied from hosting + // TODO: make public while removing IISExpressDeployer + public static class DotNetCommands + { + private const string _dotnetFolderName = ".dotnet"; + + internal static string DotNetHome { get; } = GetDotNetHome(); + + // Compare to https://github.com/aspnet/BuildTools/blob/314c98e4533217a841ff9767bb38e144eb6c93e4/tools/KoreBuild.Console/Commands/CommandContext.cs#L76 + private static string GetDotNetHome() + { + var dotnetHome = Environment.GetEnvironmentVariable("DOTNET_HOME"); + var userProfile = Environment.GetEnvironmentVariable("USERPROFILE"); + var home = Environment.GetEnvironmentVariable("HOME"); + + var result = Path.Combine(Directory.GetCurrentDirectory(), _dotnetFolderName); + if (!string.IsNullOrEmpty(dotnetHome)) + { + result = dotnetHome; + } + else if (!string.IsNullOrEmpty(userProfile)) + { + result = Path.Combine(userProfile, _dotnetFolderName); + } + else if (!string.IsNullOrEmpty(home)) + { + result = home; + } + + return result; + } + + internal static string GetDotNetInstallDir(RuntimeArchitecture arch) + { + var dotnetDir = DotNetHome; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + dotnetDir = Path.Combine(dotnetDir, arch.ToString()); + } + + return dotnetDir; + } + + public static string GetDotNetExecutable(RuntimeArchitecture arch) + { + var dotnetDir = GetDotNetInstallDir(arch); + + var dotnetFile = "dotnet"; + + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + dotnetFile += ".exe"; + } + + return Path.Combine(dotnetDir, dotnetFile); + } + + internal static bool IsRunningX86OnX64(RuntimeArchitecture arch) + { + return (RuntimeInformation.OSArchitecture == Architecture.X64 || RuntimeInformation.OSArchitecture == Architecture.Arm64) + && arch == RuntimeArchitecture.x86; + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config new file mode 100644 index 0000000000..4508dea843 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config @@ -0,0 +1,1034 @@ + + + + + + + + +
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ + +
+
+
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Common.FunctionalTests/Utilities/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs similarity index 99% rename from test/Common.FunctionalTests/Utilities/IISApplication.cs rename to src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs index fbde500177..3fafd7c8f9 100644 --- a/test/Common.FunctionalTests/Utilities/IISApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs @@ -8,7 +8,6 @@ using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; using System.Xml.Linq; -using Microsoft.Extensions.CommandLineUtils; using Microsoft.Extensions.Logging; using Microsoft.Web.Administration; @@ -72,7 +71,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting if (_deploymentParameters.ApplicationType == ApplicationType.Portable) { - ModifyAspNetCoreSectionInWebConfig("processPath", DotNetMuxer.MuxerPathOrDefault()); + ModifyAspNetCoreSectionInWebConfig("processPath", DotNetCommands.GetDotNetExecutable(_deploymentParameters.RuntimeArchitecture)); } _serverManager.CommitChanges(); diff --git a/test/Common.FunctionalTests/Utilities/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs similarity index 87% rename from test/Common.FunctionalTests/Utilities/IISDeployer.cs rename to src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 8104a47a1c..6df58dd736 100644 --- a/test/Common.FunctionalTests/Utilities/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -1,16 +1,15 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; using System.Xml.Linq; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.IntegrationTesting +namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { /// /// Deployer for IIS. @@ -57,7 +56,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting _application = new IISApplication(DeploymentParameters, Logger); - // For now, only support using published output + // For now, only support using published output DeploymentParameters.PublishApplicationBeforeDeployment = true; if (DeploymentParameters.PublishApplicationBeforeDeployment) { @@ -65,9 +64,9 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting contentRoot = DeploymentParameters.PublishedApplicationRootPath; } - Helpers.AddDebugLogToWebConfig(contentRoot, Path.Combine(contentRoot, $"{_application.WebSiteName}.txt")); + WebConfigHelpers.AddDebugLogToWebConfig(contentRoot, Path.Combine(contentRoot, $"{_application.WebSiteName}.txt")); - var uri = TestIISUriHelper.BuildTestUri(ServerType.IIS, DeploymentParameters.ApplicationBaseUriHint); + var uri = TestUriHelper.BuildTestUri(ServerType.IIS, DeploymentParameters.ApplicationBaseUriHint); // To prevent modifying the IIS setup concurrently. await _application.StartIIS(uri, contentRoot); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs new file mode 100644 index 0000000000..0cd67cc132 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -0,0 +1,436 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Diagnostics; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Text.RegularExpressions; +using System.Threading; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IntegrationTesting.Common; +using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS +{ + /// + /// Deployment helper for IISExpress. + /// + public class IISExpressDeployer : ApplicationDeployer + { + private const string IISExpressRunningMessage = "IIS Express is running."; + private const string FailedToInitializeBindingsMessage = "Failed to initialize site bindings"; + private const string UnableToStartIISExpressMessage = "Unable to start iisexpress."; + private const int MaximumAttempts = 5; + + private static readonly Regex UrlDetectorRegex = new Regex(@"^\s*Successfully registered URL ""(?[^""]+)"" for site.*$"); + + private Process _hostProcess; + + public IISExpressDeployer(DeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) + : base(deploymentParameters, loggerFactory) + { + } + + public override async Task DeployAsync() + { + using (Logger.BeginScope("Deployment")) + { + // Start timer + StartTimer(); + + // For an unpublished application the dllroot points pre-built dlls like projectdir/bin/debug/net461/ + // and contentRoot points to the project directory so you get things like static assets. + // For a published app both point to the publish directory. + var dllRoot = CheckIfPublishIsRequired(); + var contentRoot = string.Empty; + if (DeploymentParameters.PublishApplicationBeforeDeployment) + { + DotnetPublish(); + contentRoot = DeploymentParameters.PublishedApplicationRootPath; + dllRoot = contentRoot; + } + else + { + // Core+Standalone always publishes. This must be Clr+Standalone or Core+Portable. + // Update processPath and arguments for our current scenario + contentRoot = DeploymentParameters.ApplicationPath; + + var executableExtension = DeploymentParameters.ApplicationType == ApplicationType.Portable ? ".dll" : ".exe"; + var entryPoint = Path.Combine(dllRoot, DeploymentParameters.ApplicationName + executableExtension); + + var executableName = string.Empty; + var executableArgs = string.Empty; + + if (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr && DeploymentParameters.ApplicationType == ApplicationType.Portable) + { + executableName = GetDotNetExeForArchitecture(); + executableArgs = entryPoint; + } + else + { + executableName = entryPoint; + } + + Logger.LogInformation("Executing: {exe} {args}", executableName, executableArgs); + DeploymentParameters.EnvironmentVariables["LAUNCHER_PATH"] = executableName; + DeploymentParameters.EnvironmentVariables["LAUNCHER_ARGS"] = executableArgs; + + // CurrentDirectory will point to bin/{config}/{tfm}, but the config and static files aren't copied, point to the app base instead. + Logger.LogInformation("ContentRoot: {path}", DeploymentParameters.ApplicationPath); + DeploymentParameters.EnvironmentVariables["ASPNETCORE_CONTENTROOT"] = DeploymentParameters.ApplicationPath; + } + + var testUri = TestUriHelper.BuildTestUri(ServerType.IISExpress, DeploymentParameters.ApplicationBaseUriHint); + + // Launch the host process. + var (actualUri, hostExitToken) = await StartIISExpressAsync(testUri, contentRoot, dllRoot); + + Logger.LogInformation("Application ready at URL: {appUrl}", actualUri); + + // Right now this works only for urls like http://localhost:5001/. Does not work for http://localhost:5001/subpath. + return new DeploymentResult( + LoggerFactory, + DeploymentParameters, + applicationBaseUri: actualUri.ToString(), + contentRoot: contentRoot, + hostShutdownToken: hostExitToken); + } + } + + private string CheckIfPublishIsRequired() + { + var targetFramework = DeploymentParameters.TargetFramework; + + // IISIntegration uses this layout + var dllRoot = Path.Combine(DeploymentParameters.ApplicationPath, "bin", DeploymentParameters.RuntimeArchitecture.ToString(), + DeploymentParameters.Configuration, targetFramework); + + if (!Directory.Exists(dllRoot)) + { + // Most repos use this layout + dllRoot = Path.Combine(DeploymentParameters.ApplicationPath, "bin", DeploymentParameters.Configuration, targetFramework); + + if (!Directory.Exists(dllRoot)) + { + // The bits we need weren't pre-compiled, compile on publish + DeploymentParameters.PublishApplicationBeforeDeployment = true; + } + else if (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr + && DeploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x86) + { + // x64 is the default. Publish to rebuild for the right bitness + DeploymentParameters.PublishApplicationBeforeDeployment = true; + } + } + + if (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr + && DeploymentParameters.ApplicationType == ApplicationType.Standalone) + { + // Publish is always required to get the correct standalone files in the output directory + DeploymentParameters.PublishApplicationBeforeDeployment = true; + } + + return dllRoot; + } + + private async Task<(Uri url, CancellationToken hostExitToken)> StartIISExpressAsync(Uri uri, string contentRoot, string dllRoot) + { + using (Logger.BeginScope("StartIISExpress")) + { + var port = uri.Port; + if (port == 0) + { + port = (uri.Scheme == "https") ? TestPortHelper.GetNextSSLPort() : TestPortHelper.GetNextPort(); + } + + Logger.LogInformation("Attempting to start IIS Express on port: {port}", port); + PrepareConfig(contentRoot, dllRoot, port); + + var parameters = string.IsNullOrEmpty(DeploymentParameters.ServerConfigLocation) ? + string.Format("/port:{0} /path:\"{1}\" /trace:error /systray:false", uri.Port, contentRoot) : + string.Format("/site:{0} /config:{1} /trace:error /systray:false", DeploymentParameters.SiteName, DeploymentParameters.ServerConfigLocation); + + var iisExpressPath = GetIISExpressPath(); + + for (var attempt = 0; attempt < MaximumAttempts; attempt++) + { + Logger.LogInformation("Executing command : {iisExpress} {parameters}", iisExpressPath, parameters); + + var startInfo = new ProcessStartInfo + { + FileName = iisExpressPath, + Arguments = parameters, + UseShellExecute = false, + CreateNoWindow = true, + RedirectStandardError = true, + RedirectStandardOutput = true + }; + + AddEnvironmentVariablesToProcess(startInfo, DeploymentParameters.EnvironmentVariables); + + Uri url = null; + var started = new TaskCompletionSource(); + + var process = new Process() { StartInfo = startInfo }; + process.OutputDataReceived += (sender, dataArgs) => + { + if (string.Equals(dataArgs.Data, UnableToStartIISExpressMessage)) + { + // We completely failed to start and we don't really know why + started.TrySetException(new InvalidOperationException("Failed to start IIS Express")); + } + else if (string.Equals(dataArgs.Data, FailedToInitializeBindingsMessage)) + { + started.TrySetResult(false); + } + else if (string.Equals(dataArgs.Data, IISExpressRunningMessage)) + { + started.TrySetResult(true); + } + else if (!string.IsNullOrEmpty(dataArgs.Data)) + { + var m = UrlDetectorRegex.Match(dataArgs.Data); + if (m.Success) + { + url = new Uri(m.Groups["url"].Value); + } + } + }; + + process.EnableRaisingEvents = true; + var hostExitTokenSource = new CancellationTokenSource(); + process.Exited += (sender, e) => + { + Logger.LogInformation("iisexpress Process {pid} shut down", process.Id); + + // If TrySetResult was called above, this will just silently fail to set the new state, which is what we want + started.TrySetException(new Exception($"Command exited unexpectedly with exit code: {process.ExitCode}")); + + TriggerHostShutdown(hostExitTokenSource); + }; + process.StartAndCaptureOutAndErrToLogger("iisexpress", Logger); + Logger.LogInformation("iisexpress Process {pid} started", process.Id); + + if (process.HasExited) + { + Logger.LogError("Host process {processName} {pid} exited with code {exitCode} or failed to start.", startInfo.FileName, process.Id, process.ExitCode); + throw new Exception("Failed to start host"); + } + + // Wait for the app to start + // The timeout here is large, because we don't know how long the test could need + // We cover a lot of error cases above, but I want to make sure we eventually give up and don't hang the build + // just in case we missed one -anurse + if (!await started.Task.TimeoutAfter(TimeSpan.FromMinutes(10))) + { + Logger.LogInformation("iisexpress Process {pid} failed to bind to port {port}, trying again", process.Id, port); + + // Wait for the process to exit and try again + process.WaitForExit(30 * 1000); + await Task.Delay(1000); // Wait a second to make sure the socket is completely cleaned up + } + else + { + _hostProcess = process; + Logger.LogInformation("Started iisexpress successfully. Process Id : {processId}, Port: {port}", _hostProcess.Id, port); + return (url: url, hostExitToken: hostExitTokenSource.Token); + } + } + + var message = $"Failed to initialize IIS Express after {MaximumAttempts} attempts to select a port"; + Logger.LogError(message); + throw new TimeoutException(message); + } + } + + private void PrepareConfig(string contentRoot, string dllRoot, int port) + { + // Config is required. If not present then fall back to one we carry with us. + if (string.IsNullOrEmpty(DeploymentParameters.ServerConfigTemplateContent)) + { + using (var stream = GetType().Assembly.GetManifestResourceStream("Microsoft.AspNetCore.Server.IntegrationTesting.IIS.Http.config")) + using (var reader = new StreamReader(stream)) + { + DeploymentParameters.ServerConfigTemplateContent = reader.ReadToEnd(); + } + } + + var serverConfig = DeploymentParameters.ServerConfigTemplateContent; + + // Pass on the applicationhost.config to iis express. With this don't need to pass in the /path /port switches as they are in the applicationHost.config + // We take a copy of the original specified applicationHost.Config to prevent modifying the one in the repo. + serverConfig = ModifyANCMPathInConfig(replaceFlag: "[ANCMPath]", dllName: "aspnetcore.dll", serverConfig, dllRoot); + serverConfig = ModifyANCMPathInConfig(replaceFlag: "[ANCMV2Path]", dllName: "aspnetcorev2.dll", serverConfig, dllRoot); + + serverConfig = ReplacePlaceholder(serverConfig, "[PORT]", port.ToString(CultureInfo.InvariantCulture)); + serverConfig = ReplacePlaceholder(serverConfig, "[ApplicationPhysicalPath]", contentRoot); + + if (DeploymentParameters.PublishApplicationBeforeDeployment) + { + // For published apps, prefer the content in the web.config, but update it. + ModifyAspNetCoreSectionInWebConfig(key: "hostingModel", + value: DeploymentParameters.HostingModel == HostingModel.InProcess ? "inprocess" : ""); + ModifyHandlerSectionInWebConfig(key: "modules", value: DeploymentParameters.AncmVersion.ToString()); + ModifyDotNetExePathInWebConfig(); + serverConfig = RemoveRedundantElements(serverConfig); + } + else + { + // The elements normally in the web.config are in the applicationhost.config for unpublished apps. + serverConfig = ReplacePlaceholder(serverConfig, "[HostingModel]", DeploymentParameters.HostingModel.ToString()); + serverConfig = ReplacePlaceholder(serverConfig, "[AspNetCoreModule]", DeploymentParameters.AncmVersion.ToString()); + } + + DeploymentParameters.ServerConfigLocation = Path.GetTempFileName(); + Logger.LogDebug("Saving Config to {configPath}", DeploymentParameters.ServerConfigLocation); + + File.WriteAllText(DeploymentParameters.ServerConfigLocation, serverConfig); + } + + private string ReplacePlaceholder(string content, string field, string value) + { + if (content.Contains(field)) + { + content = content.Replace(field, value); + Logger.LogDebug("Writing {field} '{value}' to config", field, value); + } + return content; + } + + private string ModifyANCMPathInConfig(string replaceFlag, string dllName, string serverConfig, string dllRoot) + { + if (serverConfig.Contains(replaceFlag)) + { + var arch = DeploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? $@"x64\{dllName}" : $@"x86\{dllName}"; + var ancmFile = Path.Combine(dllRoot, arch); + if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) + { + ancmFile = Path.Combine(dllRoot, dllName); + if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) + { + throw new FileNotFoundException("AspNetCoreModule could not be found.", ancmFile); + } + } + + Logger.LogDebug($"Writing '{replaceFlag}' '{ancmFile}' to config"); + return serverConfig.Replace(replaceFlag, ancmFile); + } + return serverConfig; + } + + private string GetIISExpressPath() + { + var programFiles = "Program Files"; + if (DotNetCommands.IsRunningX86OnX64(DeploymentParameters.RuntimeArchitecture)) + { + programFiles = "Program Files (x86)"; + } + + // Get path to program files + var iisExpressPath = Path.Combine(Environment.GetEnvironmentVariable("SystemDrive") + "\\", programFiles, "IIS Express", "iisexpress.exe"); + + if (!File.Exists(iisExpressPath)) + { + throw new Exception("Unable to find IISExpress on the machine: " + iisExpressPath); + } + + return iisExpressPath; + } + + public override void Dispose() + { + using (Logger.BeginScope("Dispose")) + { + ShutDownIfAnyHostProcess(_hostProcess); + + if (!string.IsNullOrEmpty(DeploymentParameters.ServerConfigLocation) + && File.Exists(DeploymentParameters.ServerConfigLocation)) + { + // Delete the temp applicationHostConfig that we created. + Logger.LogDebug("Deleting applicationHost.config file from {configLocation}", DeploymentParameters.ServerConfigLocation); + try + { + File.Delete(DeploymentParameters.ServerConfigLocation); + } + catch (Exception exception) + { + // Ignore delete failures - just write a log. + Logger.LogWarning("Failed to delete '{config}'. Exception : {exception}", DeploymentParameters.ServerConfigLocation, exception.Message); + } + } + + if (DeploymentParameters.PublishApplicationBeforeDeployment) + { + CleanPublishedOutput(); + } + + InvokeUserApplicationCleanup(); + + StopTimer(); + } + + // If by this point, the host process is still running (somehow), throw an error. + // A test failure is better than a silent hang and unknown failure later on + if (_hostProcess != null && !_hostProcess.HasExited) + { + throw new Exception($"iisexpress Process {_hostProcess.Id} failed to shutdown"); + } + } + + private void ModifyDotNetExePathInWebConfig() + { + // We assume the x64 dotnet.exe is on the path so we need to provide an absolute path for x86 scenarios. + // Only do it for scenarios that rely on dotnet.exe (Core, portable, etc.). + if (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr + && DeploymentParameters.ApplicationType == ApplicationType.Portable + && DotNetCommands.IsRunningX86OnX64(DeploymentParameters.RuntimeArchitecture)) + { + var executableName = DotNetCommands.GetDotNetExecutable(DeploymentParameters.RuntimeArchitecture); + if (!File.Exists(executableName)) + { + throw new Exception($"Unable to find '{executableName}'.'"); + } + ModifyAspNetCoreSectionInWebConfig("processPath", executableName); + } + } + + // Transforms the web.config file to set attributes like hostingModel="inprocess" element + private void ModifyAspNetCoreSectionInWebConfig(string key, string value) + { + var webConfigFile = Path.Combine(DeploymentParameters.PublishedApplicationRootPath, "web.config"); + var config = XDocument.Load(webConfigFile); + var element = config.Descendants("aspNetCore").FirstOrDefault(); + element.SetAttributeValue(key, value); + config.Save(webConfigFile); + } + + private void ModifyHandlerSectionInWebConfig(string key, string value) + { + var webConfigFile = Path.Combine(DeploymentParameters.PublishedApplicationRootPath, "web.config"); + var config = XDocument.Load(webConfigFile); + var element = config.Descendants("handlers").FirstOrDefault().Descendants("add").FirstOrDefault(); + element.SetAttributeValue(key, value); + config.Save(webConfigFile); + } + + // These elements are duplicated in the web.config if you publish. Remove them from the host.config. + private string RemoveRedundantElements(string serverConfig) + { + var hostConfig = XDocument.Parse(serverConfig); + + var coreElement = hostConfig.Descendants("aspNetCore").FirstOrDefault(); + coreElement?.Remove(); + + var handlersElement = hostConfig.Descendants("handlers").First(); + var handlerElement = handlersElement.Descendants("add") + .Where(x => x.Attribute("name").Value == "aspNetCore").FirstOrDefault(); + handlerElement?.Remove(); + + return hostConfig.ToString(); + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj new file mode 100644 index 0000000000..0891a315dc --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -0,0 +1,21 @@ + + + + netstandard2.0 + Microsoft.AspNetCore.Server.IntegrationTesting.IIS + Provides support for integration testing using IIS based servers. + $(NoWarn);CS1591 + true + aspnetcore;iis + + + + + + + + + + + + diff --git a/test/Common.FunctionalTests/Utilities/TestIISUriHelper.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/TestUriHelper.cs similarity index 52% rename from test/Common.FunctionalTests/Utilities/TestIISUriHelper.cs rename to src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/TestUriHelper.cs index b8c37ddd93..fe1b351ba4 100644 --- a/test/Common.FunctionalTests/Utilities/TestIISUriHelper.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/TestUriHelper.cs @@ -2,26 +2,20 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Net; -using System.Net.Sockets; -namespace Microsoft.AspNetCore.Server.IntegrationTesting +namespace Microsoft.AspNetCore.Server.IntegrationTesting.Common { - // Copied from Hosting for now https://github.com/aspnet/Hosting/blob/970bc8a30d66dd6894f8f662e5fdab9e68d57777/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/TestUriHelper.cs - internal static class TestIISUriHelper + internal static class TestUriHelper { - internal static Uri BuildTestUri(ServerType serverType) - { - return BuildTestUri(serverType, hint: null); - } - internal static Uri BuildTestUri(ServerType serverType, string hint) { // Assume status messages are enabled for Kestrel and disabled for all other servers. - return BuildTestUri(serverType, hint, statusMessagesEnabled: serverType == ServerType.Kestrel); + var statusMessagesEnabled = (serverType == ServerType.Kestrel); + + return BuildTestUri(serverType, Uri.UriSchemeHttp, hint, statusMessagesEnabled); } - internal static Uri BuildTestUri(ServerType serverType, string hint, bool statusMessagesEnabled) + internal static Uri BuildTestUri(ServerType serverType, string scheme, string hint, bool statusMessagesEnabled) { if (string.IsNullOrEmpty(hint)) { @@ -32,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting // once and never released. Binding to dynamic port "0" on "localhost" (both IPv4 and IPv6) is not // supported, so the port is only bound on "127.0.0.1" (IPv4). If a test explicitly requires IPv6, // it should provide a hint URL with "localhost" (IPv4 and IPv6) or "[::1]" (IPv6-only). - return new UriBuilder("http", "127.0.0.1", 0).Uri; + return new UriBuilder(scheme, "127.0.0.1", 0).Uri; } else { @@ -40,7 +34,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting // from which to scrape the assigned port, so the less reliable GetNextPort() must be used. The // port is bound on "localhost" (both IPv4 and IPv6), since this is supported when using a specific // (non-zero) port. - return new UriBuilder("http", "localhost", GetNextPort()).Uri; + return new UriBuilder(scheme, "localhost", TestPortHelper.GetNextPort()).Uri; } } else @@ -51,7 +45,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting // Only a few tests use this codepath, so it's fine to use the less reliable GetNextPort() for simplicity. // The tests using this codepath will be reviewed to see if they can be changed to directly bind to dynamic // port "0" on "127.0.0.1" and scrape the assigned port from the status message (the default codepath). - return new UriBuilder(uriHint) { Port = GetNextPort() }.Uri; + return new UriBuilder(uriHint) { Port = TestPortHelper.GetNextPort() }.Uri; } else { @@ -60,25 +54,5 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting } } } - - // Copied from https://github.com/aspnet/KestrelHttpServer/blob/47f1db20e063c2da75d9d89653fad4eafe24446c/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs#L508 - // - // This method is an attempt to safely get a free port from the OS. Most of the time, - // when binding to dynamic port "0" the OS increments the assigned port, so it's safe - // to re-use the assigned port in another process. However, occasionally the OS will reuse - // a recently assigned port instead of incrementing, which causes flaky tests with AddressInUse - // exceptions. This method should only be used when the application itself cannot use - // dynamic port "0" (e.g. IISExpress). Most functional tests using raw Kestrel - // (with status messages enabled) should directly bind to dynamic port "0" and scrape - // the assigned port from the status message, which should be 100% reliable since the port - // is bound once and never released. - internal static int GetNextPort() - { - using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) - { - socket.Bind(new IPEndPoint(IPAddress.Loopback, 0)); - return ((IPEndPoint)socket.LocalEndPoint).Port; - } - } } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs new file mode 100644 index 0000000000..e5c13225b5 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs @@ -0,0 +1,50 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS +{ + public class WebConfigHelpers + { + public static void AddDebugLogToWebConfig(string contentRoot, string filename) + { + var path = Path.Combine(contentRoot, "web.config"); + var webconfig = XDocument.Load(path); + var xElement = webconfig.Descendants("aspNetCore").Single(); + + var element = xElement.Descendants("handlerSettings").SingleOrDefault(); + if (element == null) + { + element = new XElement("handlerSettings"); + xElement.Add(element); + } + + CreateOrSetElement(element, "debugLevel", "4"); + + CreateOrSetElement(element, "debugFile", Path.Combine(contentRoot, filename)); + + webconfig.Save(path); + } + + private static void CreateOrSetElement(XElement rootElement, string name, string value) + { + if (rootElement.Descendants() + .Attributes() + .Where(attribute => attribute.Value == name) + .Any()) + { + return; + } + var element = new XElement("handlerSetting"); + element.SetAttributeValue("name", name); + element.SetAttributeValue("value", value); + rootElement.Add(element); + } + } +} diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index 1ac8c9e1d8..6b4b2278a4 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Xunit; @@ -104,7 +105,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"] = firstTempFile; var deploymentResult = await DeployAsync(deploymentParameters); - Helpers.AddDebugLogToWebConfig(deploymentParameters.PublishedApplicationRootPath, secondTempFile); + WebConfigHelpers.AddDebugLogToWebConfig(deploymentParameters.PublishedApplicationRootPath, secondTempFile); var response = await deploymentResult.RetryingHttpClient.GetAsync("/"); diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index c2a9c3682a..4827fcaecc 100644 --- a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -25,17 +25,13 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting parameters.EnvironmentVariables[DebugEnvironmentVariable] = "4"; } - if (parameters.ServerType == ServerType.IIS) - { - // Currently hosting throws if the Servertype = IIS. - _deployer = new IISDeployer(parameters, LoggerFactory); - } - else if (parameters.ServerType == ServerType.IISExpress) + if (parameters.ServerType == ServerType.IISExpress) { parameters.ServerConfigTemplateContent = parameters.ServerConfigTemplateContent ?? File.ReadAllText("IISExpress.config"); - _deployer = new IISExpressDeployer(parameters, LoggerFactory); } + _deployer = IISApplicationDeployerFactory.Create(parameters, LoggerFactory); + var result = await _deployer.DeployAsync(); return new IISDeploymentResult(result, Logger); diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 8ab128e15f..e68b3c8b67 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -52,41 +52,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests config.Save(webConfigFile); } - public static void AddDebugLogToWebConfig(string contentRoot, string filename) - { - var path = Path.Combine(contentRoot, "web.config"); - var webconfig = XDocument.Load(path); - var xElement = webconfig.Descendants("aspNetCore").Single(); - - var element = xElement.Descendants("handlerSettings").SingleOrDefault(); - if (element == null) - { - element = new XElement("handlerSettings"); - xElement.Add(element); - } - - CreateOrSetElement(element, "debugLevel", "4"); - - CreateOrSetElement(element, "debugFile", Path.Combine(contentRoot, filename)); - - webconfig.Save(path); - } - - private static void CreateOrSetElement(XElement rootElement, string name, string value) - { - if (rootElement.Descendants() - .Attributes() - .Where(attribute => attribute.Value == name) - .Any()) - { - return; - } - var element = new XElement("handlerSetting"); - element.SetAttributeValue("name", name); - element.SetAttributeValue("value", value); - rootElement.Add(element); - } - // Defaults to inprocess specific deployment parameters public static DeploymentParameters GetBaseDeploymentParameters(string site = null, HostingModel hostingModel = HostingModel.InProcess, bool publish = false) { diff --git a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs index 1a60e85246..d8fd3342ed 100644 --- a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -3,12 +3,10 @@ using System; using System.Collections.Generic; -using System.IO; using System.Net.Http; using System.Threading; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Testing; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests @@ -36,15 +34,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _forwardingProvider = new ForwardingProvider(); var loggerFactory = logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture)); loggerFactory.AddProvider(_forwardingProvider); - if (deploymentParameters.ServerType == ServerType.IIS) - { - // Currently hosting throws if the Servertype = IIS. - _deployer = new IISDeployer(deploymentParameters, loggerFactory); - } - else if (deploymentParameters.ServerType == ServerType.IISExpress) - { - _deployer = new IISExpressDeployer(deploymentParameters, loggerFactory); - } + + _deployer = IISApplicationDeployerFactory.Create(deploymentParameters, loggerFactory); DeploymentResult = _deployer.DeployAsync().Result; Client = DeploymentResult.HttpClient; diff --git a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index cc02e6d69e..bbe5ffe049 100644 --- a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -12,6 +12,7 @@ + False @@ -32,10 +33,8 @@ - - diff --git a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index 718053f101..c2e7b815f9 100644 --- a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -11,6 +11,7 @@ + False @@ -31,10 +32,8 @@ - - diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 5fbc821d29..4de6ceba3d 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -9,7 +9,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.CommandLineUtils; using Xunit; using Xunit.Abstractions; @@ -17,7 +16,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class StartupTests : IISFunctionalTestBase { - private readonly string _dotnetLocation = DotNetMuxer.MuxerPathOrDefault(); + private readonly string _dotnetLocation = DotNetCommands.GetDotNetExecutable(RuntimeArchitecture.x64); public StartupTests(ITestOutputHelper output) : base(output) { From 36d7c8ec4257f72507d2688a70b37ce660ef81d8 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 12 Jul 2018 16:03:06 -0700 Subject: [PATCH 134/363] Add startup event log for ANCM inproc (#1047) --- .../CommonLib/aspnetcore_msg.mc | 6 +++++ src/AspNetCoreModuleV2/CommonLib/resources.h | 1 + .../inprocessapplication.cpp | 5 ++++ .../Inprocess/EventLogTests.cs | 24 +++++++++++++++++++ .../Utilities/EventLogHelpers.cs | 18 ++++++++++++++ .../Utilities/Helpers.cs | 12 +++++++++- 6 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 test/Common.FunctionalTests/Inprocess/EventLogTests.cs create mode 100644 test/Common.FunctionalTests/Utilities/EventLogHelpers.cs diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc index 13781f7c82..c15047b235 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc +++ b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc @@ -218,6 +218,12 @@ Language=English %1 . +Messageid=1032 +SymbolicName=ASPNETCORE_EVENT_INPROCESS_START_SUCCESS +Language=English +%1 +. + ; ;#endif // _ASPNETCORE_MODULE_MSG_H_ ; diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index 4620fa7e17..2956cce581 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -51,3 +51,4 @@ #define ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG L"Invalid or unknown processPath provided in web.config: processPath = %s, ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application." #define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for out-of-process application. Please confirm the assembly is installed correctly for IIS or IISExpress." +#define ASPNETCORE_EVENT_INPROCESS_START_SUCCESS_MSG L"Application '%s' started the coreclr in-process successfully." diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index ad0f6a35a6..bb56b01419 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -221,6 +221,11 @@ IN_PROCESS_APPLICATION::SetCallbackHandles( m_pLoggerProvider->NotifyStartupComplete(); // Can't check the std err handle as it isn't a critical error // Initialization complete + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_INFORMATION_TYPE, + ASPNETCORE_EVENT_INPROCESS_START_SUCCESS, + ASPNETCORE_EVENT_INPROCESS_START_SUCCESS_MSG, + m_pConfig->QueryApplicationPhysicalPath()->QueryStr()); SetEvent(m_pInitalizeEvent); m_fInitialized = TRUE; } diff --git a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs new file mode 100644 index 0000000000..1ae8aa5d57 --- /dev/null +++ b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs @@ -0,0 +1,24 @@ +using System; +using System.Net; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class EventLogTests : IISFunctionalTestBase + { + [ConditionalFact] + public async Task CheckStartupEventLogMessage() + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + var deploymentResult = await DeployAsync(deploymentParameters); + await Helpers.AssertStarts(deploymentResult, "/HelloWorld"); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvent(TestSink, "Application '.+' started the coreclr in-process successfully."); + } + } +} diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs new file mode 100644 index 0000000000..1d53ba6843 --- /dev/null +++ b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -0,0 +1,18 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Text.RegularExpressions; +using Microsoft.Extensions.Logging.Testing; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class EventLogHelpers + { + public static void VerifyEventLogEvent(ITestSink testSink, string expectedRegexMatchString) + { + var eventLogRegex = new Regex($"Event Log: {expectedRegexMatchString}"); + Assert.Contains(testSink.Writes, context => eventLogRegex.IsMatch(context.Message)); + } + } +} diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index e68b3c8b67..e512dd6d83 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -4,9 +4,11 @@ using System; using System.IO; using System.Linq; +using System.Threading.Tasks; using System.Xml.Linq; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing; +using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { @@ -60,7 +62,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests site = hostingModel == HostingModel.InProcess ? "InProcessWebSite" : "OutOfProcessWebSite"; } - return new DeploymentParameters(Helpers.GetTestWebSitePath(site), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + return new DeploymentParameters(GetTestWebSitePath(site), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, @@ -73,5 +75,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private static string GetWebConfigFile(IISDeploymentResult deploymentResult) => Path.Combine(deploymentResult.DeploymentResult.ContentRoot, "web.config"); + public static async Task AssertStarts(IISDeploymentResult deploymentResult, string path = "/HelloWorld") + { + var response = await deploymentResult.RetryingHttpClient.GetAsync(path); + + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal("Hello World", responseText); + } } } From b359d6bed106ebead16a26ddc937e1f71f7f9b5c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 13 Jul 2018 11:35:52 -0700 Subject: [PATCH 135/363] Fix CI test failures (#1045) --- .../CommonLib/debugutil.cpp | 2 +- .../IISApplication.cs | 1 - .../IISDeployer.cs | 5 +- .../Inprocess/EventLogTests.cs | 2 +- .../Inprocess/LoggingTests.cs | 6 +- .../Inprocess/StartupExceptionTests.cs | 19 ++- .../Utilities/Helpers.cs | 58 ++++++++ .../Utilities/IISCapability.cs | 16 +++ .../Utilities/SkipIISAttribute.cs | 17 --- test/IIS.FunctionalTests/RequiresAttribute.cs | 73 ---------- .../RequiresIISAttribute.cs | 131 ++++++++++++++++++ .../RequiresIISAttribute.cs | 7 + 12 files changed, 238 insertions(+), 99 deletions(-) create mode 100644 test/Common.FunctionalTests/Utilities/IISCapability.cs delete mode 100644 test/IIS.FunctionalTests/RequiresAttribute.cs create mode 100644 test/IIS.FunctionalTests/RequiresIISAttribute.cs diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index 09becc9010..28bc775dfa 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -91,7 +91,7 @@ DebugInitializeFromConfig(IHttpServer& pHttpServer, IHttpApplication& pHttpAppli STRU debugValue; RETURN_IF_FAILED(ConfigUtility::FindDebugLevel(pAspNetCoreElement, debugValue)); - SetDebugFlags(debugFile.QueryStr()); + SetDebugFlags(debugValue.QueryStr()); CreateDebugLogFile(debugFile.QueryStr()); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs index 3fafd7c8f9..afa28dd4e3 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs @@ -197,7 +197,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting () => File.Delete(_apphostConfigPath), e => _logger.LogWarning($"Failed to delete file : {e.Message}")); } - if (File.Exists(_apphostConfigBackupPath)) { RetryFileOperation( diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 6df58dd736..f1f4922e88 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -34,7 +34,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } GetLogsFromFile($"{_application.WebSiteName}.txt"); - GetLogsFromFile("web.config"); CleanPublishedOutput(); InvokeUserApplicationCleanup(); @@ -88,9 +87,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS var arr = new string[0]; RetryHelper.RetryOperation(() => arr = File.ReadAllLines(Path.Combine(DeploymentParameters.PublishedApplicationRootPath, file)), - (ex) => Logger.LogError("Could not read log file"), + (ex) => Logger.LogWarning("Could not read log file"), 5, 200); + + Logger.LogInformation($"Found debug log file: {file}"); foreach (var line in arr) { Logger.LogInformation(line); diff --git a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs index 1ae8aa5d57..176661189c 100644 --- a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs +++ b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); var deploymentResult = await DeployAsync(deploymentParameters); - await Helpers.AssertStarts(deploymentResult, "/HelloWorld"); + await Helpers.AssertStarts(deploymentResult); StopServer(); diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index 6b4b2278a4..53009a969c 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -69,6 +69,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task StartupMessagesAreLoggedIntoDebugLogFile() { var tempFile = Path.GetTempFileName(); @@ -78,6 +79,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"] = tempFile; var deploymentResult = await DeployAsync(deploymentParameters); + + Helpers.AddDebugLogToWebConfig(deploymentResult.DeploymentResult.ContentRoot, tempFile); + var response = await deploymentResult.RetryingHttpClient.GetAsync("/"); StopServer(); @@ -93,7 +97,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] - [SkipIIS] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task StartupMessagesLogFileSwitchedWhenLogFilePresentInWebConfig() { var firstTempFile = Path.GetTempFileName(); diff --git a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs index d39ed68c24..667c47327c 100644 --- a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Generic; using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; @@ -22,11 +23,17 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // However, for IIS, we need a web.config file because the default on generated on publish // doesn't include V2. We can remove the publish flag once IIS supports non-publish running var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite", publish: true); - deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + var randomNumberString = new Random(Guid.NewGuid().GetHashCode()).Next(10000000).ToString(); - deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_RANDOM_VALUE"] = randomNumberString; + + var environmentVariablesInWebConfig = new Dictionary + { + ["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path, + ["ASPNETCORE_INPROCESS_RANDOM_VALUE"] = randomNumberString + }; var deploymentResult = await DeployAsync(deploymentParameters); + Helpers.AddEnvironmentVariablesToWebConfig(deploymentResult.DeploymentResult.ContentRoot, environmentVariablesInWebConfig); var response = await deploymentResult.RetryingHttpClient.GetAsync(path); @@ -45,10 +52,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CheckStdoutWithLargeWrites(string path) { var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite", publish: true); - deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + + var environmentVariablesInWebConfig = new Dictionary + { + ["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path + }; var deploymentResult = await DeployAsync(deploymentParameters); + Helpers.AddEnvironmentVariablesToWebConfig(deploymentResult.DeploymentResult.ContentRoot, environmentVariablesInWebConfig); + var response = await deploymentResult.RetryingHttpClient.GetAsync(path); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index e512dd6d83..0480351ce1 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -2,6 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -54,6 +56,62 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests config.Save(webConfigFile); } + public static void AddDebugLogToWebConfig(string contentRoot, string filename) + { + var path = Path.Combine(contentRoot, "web.config"); + var webconfig = XDocument.Load(path); + var xElement = webconfig.Descendants("aspNetCore").Single(); + + var element = xElement.Descendants("handlerSettings").SingleOrDefault(); + if (element == null) + { + element = new XElement("handlerSettings"); + xElement.Add(element); + } + + CreateOrSetElement(element, "debugLevel", "4", "handlerSetting"); + + CreateOrSetElement(element, "debugFile", Path.Combine(contentRoot, filename), "handlerSetting"); + + webconfig.Save(path); + } + + public static void AddEnvironmentVariablesToWebConfig(string contentRoot, IDictionary environmentVariables) + { + var path = Path.Combine(contentRoot, "web.config"); + var webconfig = XDocument.Load(path); + var xElement = webconfig.Descendants("aspNetCore").Single(); + + var element = xElement.Descendants("environmentVariables").SingleOrDefault(); + if (element == null) + { + element = new XElement("environmentVariables"); + xElement.Add(element); + } + + foreach (var envVar in environmentVariables) + { + CreateOrSetElement(element, envVar.Key, envVar.Value, "environmentVariable"); + } + + webconfig.Save(path); + } + + public static void CreateOrSetElement(XElement rootElement, string name, string value, string elementName) + { + if (rootElement.Descendants() + .Attributes() + .Where(attribute => attribute.Value == name) + .Any()) + { + return; + } + var element = new XElement(elementName); + element.SetAttributeValue("name", name); + element.SetAttributeValue("value", value); + rootElement.Add(element); + } + // Defaults to inprocess specific deployment parameters public static DeploymentParameters GetBaseDeploymentParameters(string site = null, HostingModel hostingModel = HostingModel.InProcess, bool publish = false) { diff --git a/test/Common.FunctionalTests/Utilities/IISCapability.cs b/test/Common.FunctionalTests/Utilities/IISCapability.cs new file mode 100644 index 0000000000..e3a5bf6c4e --- /dev/null +++ b/test/Common.FunctionalTests/Utilities/IISCapability.cs @@ -0,0 +1,16 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Flags] + public enum IISCapability + { + None = 0, + Websockets = 1, + WindowsAuthentication = 2, + PoolEnvironmentVariables = 4 + } +} diff --git a/test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs b/test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs index da90b513f8..e69de29bb2 100644 --- a/test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs +++ b/test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs @@ -1,17 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Testing.xunit; - -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests -{ - [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] - public sealed class SkipIISAttribute : Attribute, ITestCondition - { - public bool IsMet => DeployerSelector.ServerType == ServerType.IIS; - - public string SkipReason => "Cannot run test on full IIS."; - } -} diff --git a/test/IIS.FunctionalTests/RequiresAttribute.cs b/test/IIS.FunctionalTests/RequiresAttribute.cs deleted file mode 100644 index 6602d1125c..0000000000 --- a/test/IIS.FunctionalTests/RequiresAttribute.cs +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices; -using System.Security.Principal; -using System.Xml.Linq; -using Microsoft.AspNetCore.Testing.xunit; - -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests -{ - [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] - public sealed class RequiresIISAttribute : Attribute, ITestCondition - { - private static readonly bool _isMet; - public static readonly string _skipReason; - - public bool IsMet => _isMet; - public string SkipReason => _skipReason; - - static RequiresIISAttribute() - { - if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - _skipReason = "IIS tests can only be run on Windows"; - return; - } - - var identity = WindowsIdentity.GetCurrent(); - var principal = new WindowsPrincipal(identity); - if (!principal.IsInRole(WindowsBuiltInRole.Administrator)) - { - _skipReason += "The current console is not running as admin."; - return; - } - - if (!File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "w3wp.exe"))) - { - _skipReason += "The machine does not have IIS installed."; - return; - } - - var ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema_v2.xml"); - - if (!File.Exists(ancmConfigPath)) - { - _skipReason = "IIS Schema is not installed."; - return; - } - - XDocument ancmConfig; - - try - { - ancmConfig = XDocument.Load(ancmConfigPath); - } - catch - { - _skipReason = "Could not read ANCM schema configuration"; - return; - } - - _isMet = ancmConfig - .Root - .Descendants("attribute") - .Any(n => "hostingModel".Equals(n.Attribute("name")?.Value, StringComparison.Ordinal)); - - _skipReason = _isMet ? null : "IIS schema needs to be upgraded to support ANCM."; - } - } -} diff --git a/test/IIS.FunctionalTests/RequiresIISAttribute.cs b/test/IIS.FunctionalTests/RequiresIISAttribute.cs new file mode 100644 index 0000000000..f55f397cfa --- /dev/null +++ b/test/IIS.FunctionalTests/RequiresIISAttribute.cs @@ -0,0 +1,131 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; +using System.Security.Principal; +using System.Xml.Linq; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Win32; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class RequiresIISAttribute : Attribute, ITestCondition + { + private static readonly bool _isMetStatic; + private static readonly string _skipReasonStatic; + + private readonly bool _isMet; + private readonly string _skipReason; + + private static readonly bool _websocketsAvailable; + private static readonly bool _windowsAuthAvailable; + private static readonly bool _poolEnvironmentVariablesAvailable; + + static RequiresIISAttribute() + { + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + _skipReasonStatic = "IIS tests can only be run on Windows"; + return; + } + + var identity = WindowsIdentity.GetCurrent(); + var principal = new WindowsPrincipal(identity); + if (!principal.IsInRole(WindowsBuiltInRole.Administrator)) + { + _skipReasonStatic += "The current console is not running as admin."; + return; + } + + if (!File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "w3wp.exe"))) + { + _skipReasonStatic += "The machine does not have IIS installed."; + return; + } + + var ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema_v2.xml"); + + if (!File.Exists(ancmConfigPath)) + { + _skipReasonStatic = "IIS Schema is not installed."; + return; + } + + XDocument ancmConfig; + + try + { + ancmConfig = XDocument.Load(ancmConfigPath); + } + catch + { + _skipReasonStatic = "Could not read ANCM schema configuration"; + return; + } + + _isMetStatic = ancmConfig + .Root + .Descendants("attribute") + .Any(n => "hostingModel".Equals(n.Attribute("name")?.Value, StringComparison.Ordinal)); + + _skipReasonStatic = _isMetStatic ? null : "IIS schema needs to be upgraded to support ANCM."; + + _websocketsAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "iiswsock.dll")); + + _windowsAuthAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "authsspi.dll")); + + var iisRegistryKey = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\InetStp", writable: false); + if (iisRegistryKey == null) + { + _poolEnvironmentVariablesAvailable = false; + } + else + { + var majorVersion = (int)iisRegistryKey.GetValue("MajorVersion", -1); + var minorVersion = (int)iisRegistryKey.GetValue("MinorVersion", -1); + var version = new Version(majorVersion, minorVersion); + _poolEnvironmentVariablesAvailable = version >= new Version(10, 0); + } + } + + public RequiresIISAttribute() { } + + public RequiresIISAttribute(IISCapability capabilities) + { + _isMet = _isMetStatic; + _skipReason = _skipReasonStatic; + if (capabilities.HasFlag(IISCapability.Websockets)) + { + _isMet &= _websocketsAvailable; + if (!_websocketsAvailable) + { + _skipReason += "The machine does not have IIS websockets installed."; + } + } + if (capabilities.HasFlag(IISCapability.WindowsAuthentication)) + { + _isMet &= _windowsAuthAvailable; + + if (!_windowsAuthAvailable) + { + _skipReason += "The machine does not have IIS windows authentication installed."; + } + } + if (capabilities.HasFlag(IISCapability.PoolEnvironmentVariables)) + { + _isMet &= _poolEnvironmentVariablesAvailable; + if (!_poolEnvironmentVariablesAvailable) + { + _skipReason += "The machine does allow for setting environment variables on application pools."; + } + } + } + + public bool IsMet => _isMet; + public string SkipReason => _skipReason; + } +} diff --git a/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs b/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs index 15bbb9c26c..24d656332d 100644 --- a/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs +++ b/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs @@ -13,5 +13,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public bool IsMet => IISExpressAncmSchema.SupportsInProcessHosting; public string SkipReason => IISExpressAncmSchema.SkipReason; + + public RequiresIISAttribute() { } + + public RequiresIISAttribute(IISCapability capabilities) + { + // IISCapabilities aren't pretinent to IISExpress + } } } From 6d62502de45c79fe924d1aa7be6f64f04d543adf Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 13 Jul 2018 12:19:16 -0700 Subject: [PATCH 136/363] Fix CI test failures (#1045) (#1053) --- .../CommonLib/debugutil.cpp | 2 +- .../IISApplication.cs | 1 - .../IISDeployer.cs | 5 +- .../Inprocess/EventLogTests.cs | 2 +- .../Inprocess/LoggingTests.cs | 6 +- .../Inprocess/StartupExceptionTests.cs | 19 ++- .../Utilities/Helpers.cs | 58 ++++++++ .../Utilities/IISCapability.cs | 16 +++ .../Utilities/SkipIISAttribute.cs | 17 --- test/IIS.FunctionalTests/RequiresAttribute.cs | 73 ---------- .../RequiresIISAttribute.cs | 131 ++++++++++++++++++ .../RequiresIISAttribute.cs | 7 + 12 files changed, 238 insertions(+), 99 deletions(-) create mode 100644 test/Common.FunctionalTests/Utilities/IISCapability.cs delete mode 100644 test/IIS.FunctionalTests/RequiresAttribute.cs create mode 100644 test/IIS.FunctionalTests/RequiresIISAttribute.cs diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index 09becc9010..28bc775dfa 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -91,7 +91,7 @@ DebugInitializeFromConfig(IHttpServer& pHttpServer, IHttpApplication& pHttpAppli STRU debugValue; RETURN_IF_FAILED(ConfigUtility::FindDebugLevel(pAspNetCoreElement, debugValue)); - SetDebugFlags(debugFile.QueryStr()); + SetDebugFlags(debugValue.QueryStr()); CreateDebugLogFile(debugFile.QueryStr()); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs index 3fafd7c8f9..afa28dd4e3 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs @@ -197,7 +197,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting () => File.Delete(_apphostConfigPath), e => _logger.LogWarning($"Failed to delete file : {e.Message}")); } - if (File.Exists(_apphostConfigBackupPath)) { RetryFileOperation( diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 6df58dd736..f1f4922e88 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -34,7 +34,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } GetLogsFromFile($"{_application.WebSiteName}.txt"); - GetLogsFromFile("web.config"); CleanPublishedOutput(); InvokeUserApplicationCleanup(); @@ -88,9 +87,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS var arr = new string[0]; RetryHelper.RetryOperation(() => arr = File.ReadAllLines(Path.Combine(DeploymentParameters.PublishedApplicationRootPath, file)), - (ex) => Logger.LogError("Could not read log file"), + (ex) => Logger.LogWarning("Could not read log file"), 5, 200); + + Logger.LogInformation($"Found debug log file: {file}"); foreach (var line in arr) { Logger.LogInformation(line); diff --git a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs index 1ae8aa5d57..176661189c 100644 --- a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs +++ b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); var deploymentResult = await DeployAsync(deploymentParameters); - await Helpers.AssertStarts(deploymentResult, "/HelloWorld"); + await Helpers.AssertStarts(deploymentResult); StopServer(); diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index 6b4b2278a4..53009a969c 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -69,6 +69,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task StartupMessagesAreLoggedIntoDebugLogFile() { var tempFile = Path.GetTempFileName(); @@ -78,6 +79,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"] = tempFile; var deploymentResult = await DeployAsync(deploymentParameters); + + Helpers.AddDebugLogToWebConfig(deploymentResult.DeploymentResult.ContentRoot, tempFile); + var response = await deploymentResult.RetryingHttpClient.GetAsync("/"); StopServer(); @@ -93,7 +97,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] - [SkipIIS] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task StartupMessagesLogFileSwitchedWhenLogFilePresentInWebConfig() { var firstTempFile = Path.GetTempFileName(); diff --git a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs index d39ed68c24..667c47327c 100644 --- a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Generic; using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; @@ -22,11 +23,17 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // However, for IIS, we need a web.config file because the default on generated on publish // doesn't include V2. We can remove the publish flag once IIS supports non-publish running var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite", publish: true); - deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + var randomNumberString = new Random(Guid.NewGuid().GetHashCode()).Next(10000000).ToString(); - deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_RANDOM_VALUE"] = randomNumberString; + + var environmentVariablesInWebConfig = new Dictionary + { + ["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path, + ["ASPNETCORE_INPROCESS_RANDOM_VALUE"] = randomNumberString + }; var deploymentResult = await DeployAsync(deploymentParameters); + Helpers.AddEnvironmentVariablesToWebConfig(deploymentResult.DeploymentResult.ContentRoot, environmentVariablesInWebConfig); var response = await deploymentResult.RetryingHttpClient.GetAsync(path); @@ -45,10 +52,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CheckStdoutWithLargeWrites(string path) { var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite", publish: true); - deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + + var environmentVariablesInWebConfig = new Dictionary + { + ["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path + }; var deploymentResult = await DeployAsync(deploymentParameters); + Helpers.AddEnvironmentVariablesToWebConfig(deploymentResult.DeploymentResult.ContentRoot, environmentVariablesInWebConfig); + var response = await deploymentResult.RetryingHttpClient.GetAsync(path); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index e512dd6d83..0480351ce1 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -2,6 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -54,6 +56,62 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests config.Save(webConfigFile); } + public static void AddDebugLogToWebConfig(string contentRoot, string filename) + { + var path = Path.Combine(contentRoot, "web.config"); + var webconfig = XDocument.Load(path); + var xElement = webconfig.Descendants("aspNetCore").Single(); + + var element = xElement.Descendants("handlerSettings").SingleOrDefault(); + if (element == null) + { + element = new XElement("handlerSettings"); + xElement.Add(element); + } + + CreateOrSetElement(element, "debugLevel", "4", "handlerSetting"); + + CreateOrSetElement(element, "debugFile", Path.Combine(contentRoot, filename), "handlerSetting"); + + webconfig.Save(path); + } + + public static void AddEnvironmentVariablesToWebConfig(string contentRoot, IDictionary environmentVariables) + { + var path = Path.Combine(contentRoot, "web.config"); + var webconfig = XDocument.Load(path); + var xElement = webconfig.Descendants("aspNetCore").Single(); + + var element = xElement.Descendants("environmentVariables").SingleOrDefault(); + if (element == null) + { + element = new XElement("environmentVariables"); + xElement.Add(element); + } + + foreach (var envVar in environmentVariables) + { + CreateOrSetElement(element, envVar.Key, envVar.Value, "environmentVariable"); + } + + webconfig.Save(path); + } + + public static void CreateOrSetElement(XElement rootElement, string name, string value, string elementName) + { + if (rootElement.Descendants() + .Attributes() + .Where(attribute => attribute.Value == name) + .Any()) + { + return; + } + var element = new XElement(elementName); + element.SetAttributeValue("name", name); + element.SetAttributeValue("value", value); + rootElement.Add(element); + } + // Defaults to inprocess specific deployment parameters public static DeploymentParameters GetBaseDeploymentParameters(string site = null, HostingModel hostingModel = HostingModel.InProcess, bool publish = false) { diff --git a/test/Common.FunctionalTests/Utilities/IISCapability.cs b/test/Common.FunctionalTests/Utilities/IISCapability.cs new file mode 100644 index 0000000000..e3a5bf6c4e --- /dev/null +++ b/test/Common.FunctionalTests/Utilities/IISCapability.cs @@ -0,0 +1,16 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Flags] + public enum IISCapability + { + None = 0, + Websockets = 1, + WindowsAuthentication = 2, + PoolEnvironmentVariables = 4 + } +} diff --git a/test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs b/test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs index da90b513f8..e69de29bb2 100644 --- a/test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs +++ b/test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs @@ -1,17 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Testing.xunit; - -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests -{ - [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] - public sealed class SkipIISAttribute : Attribute, ITestCondition - { - public bool IsMet => DeployerSelector.ServerType == ServerType.IIS; - - public string SkipReason => "Cannot run test on full IIS."; - } -} diff --git a/test/IIS.FunctionalTests/RequiresAttribute.cs b/test/IIS.FunctionalTests/RequiresAttribute.cs deleted file mode 100644 index 6602d1125c..0000000000 --- a/test/IIS.FunctionalTests/RequiresAttribute.cs +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices; -using System.Security.Principal; -using System.Xml.Linq; -using Microsoft.AspNetCore.Testing.xunit; - -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests -{ - [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] - public sealed class RequiresIISAttribute : Attribute, ITestCondition - { - private static readonly bool _isMet; - public static readonly string _skipReason; - - public bool IsMet => _isMet; - public string SkipReason => _skipReason; - - static RequiresIISAttribute() - { - if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - _skipReason = "IIS tests can only be run on Windows"; - return; - } - - var identity = WindowsIdentity.GetCurrent(); - var principal = new WindowsPrincipal(identity); - if (!principal.IsInRole(WindowsBuiltInRole.Administrator)) - { - _skipReason += "The current console is not running as admin."; - return; - } - - if (!File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "w3wp.exe"))) - { - _skipReason += "The machine does not have IIS installed."; - return; - } - - var ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema_v2.xml"); - - if (!File.Exists(ancmConfigPath)) - { - _skipReason = "IIS Schema is not installed."; - return; - } - - XDocument ancmConfig; - - try - { - ancmConfig = XDocument.Load(ancmConfigPath); - } - catch - { - _skipReason = "Could not read ANCM schema configuration"; - return; - } - - _isMet = ancmConfig - .Root - .Descendants("attribute") - .Any(n => "hostingModel".Equals(n.Attribute("name")?.Value, StringComparison.Ordinal)); - - _skipReason = _isMet ? null : "IIS schema needs to be upgraded to support ANCM."; - } - } -} diff --git a/test/IIS.FunctionalTests/RequiresIISAttribute.cs b/test/IIS.FunctionalTests/RequiresIISAttribute.cs new file mode 100644 index 0000000000..f55f397cfa --- /dev/null +++ b/test/IIS.FunctionalTests/RequiresIISAttribute.cs @@ -0,0 +1,131 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; +using System.Security.Principal; +using System.Xml.Linq; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Win32; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class RequiresIISAttribute : Attribute, ITestCondition + { + private static readonly bool _isMetStatic; + private static readonly string _skipReasonStatic; + + private readonly bool _isMet; + private readonly string _skipReason; + + private static readonly bool _websocketsAvailable; + private static readonly bool _windowsAuthAvailable; + private static readonly bool _poolEnvironmentVariablesAvailable; + + static RequiresIISAttribute() + { + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + _skipReasonStatic = "IIS tests can only be run on Windows"; + return; + } + + var identity = WindowsIdentity.GetCurrent(); + var principal = new WindowsPrincipal(identity); + if (!principal.IsInRole(WindowsBuiltInRole.Administrator)) + { + _skipReasonStatic += "The current console is not running as admin."; + return; + } + + if (!File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "w3wp.exe"))) + { + _skipReasonStatic += "The machine does not have IIS installed."; + return; + } + + var ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema_v2.xml"); + + if (!File.Exists(ancmConfigPath)) + { + _skipReasonStatic = "IIS Schema is not installed."; + return; + } + + XDocument ancmConfig; + + try + { + ancmConfig = XDocument.Load(ancmConfigPath); + } + catch + { + _skipReasonStatic = "Could not read ANCM schema configuration"; + return; + } + + _isMetStatic = ancmConfig + .Root + .Descendants("attribute") + .Any(n => "hostingModel".Equals(n.Attribute("name")?.Value, StringComparison.Ordinal)); + + _skipReasonStatic = _isMetStatic ? null : "IIS schema needs to be upgraded to support ANCM."; + + _websocketsAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "iiswsock.dll")); + + _windowsAuthAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "authsspi.dll")); + + var iisRegistryKey = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\InetStp", writable: false); + if (iisRegistryKey == null) + { + _poolEnvironmentVariablesAvailable = false; + } + else + { + var majorVersion = (int)iisRegistryKey.GetValue("MajorVersion", -1); + var minorVersion = (int)iisRegistryKey.GetValue("MinorVersion", -1); + var version = new Version(majorVersion, minorVersion); + _poolEnvironmentVariablesAvailable = version >= new Version(10, 0); + } + } + + public RequiresIISAttribute() { } + + public RequiresIISAttribute(IISCapability capabilities) + { + _isMet = _isMetStatic; + _skipReason = _skipReasonStatic; + if (capabilities.HasFlag(IISCapability.Websockets)) + { + _isMet &= _websocketsAvailable; + if (!_websocketsAvailable) + { + _skipReason += "The machine does not have IIS websockets installed."; + } + } + if (capabilities.HasFlag(IISCapability.WindowsAuthentication)) + { + _isMet &= _windowsAuthAvailable; + + if (!_windowsAuthAvailable) + { + _skipReason += "The machine does not have IIS windows authentication installed."; + } + } + if (capabilities.HasFlag(IISCapability.PoolEnvironmentVariables)) + { + _isMet &= _poolEnvironmentVariablesAvailable; + if (!_poolEnvironmentVariablesAvailable) + { + _skipReason += "The machine does allow for setting environment variables on application pools."; + } + } + } + + public bool IsMet => _isMet; + public string SkipReason => _skipReason; + } +} diff --git a/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs b/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs index 15bbb9c26c..24d656332d 100644 --- a/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs +++ b/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs @@ -13,5 +13,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public bool IsMet => IISExpressAncmSchema.SupportsInProcessHosting; public string SkipReason => IISExpressAncmSchema.SkipReason; + + public RequiresIISAttribute() { } + + public RequiresIISAttribute(IISCapability capabilities) + { + // IISCapabilities aren't pretinent to IISExpress + } } } From c657e31b942e8bc612d159231c1deae0e02b4fdc Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 13 Jul 2018 21:32:20 -0700 Subject: [PATCH 137/363] Fix Console invalid handle issues. (#1029) --- .../inprocessapplication.cpp | 5 +- .../managedexports.cpp | 4 +- .../RequestHandlerLib/FileOutputManager.cpp | 16 ++-- .../RequestHandlerLib/FileOutputManager.h | 2 +- .../RequestHandlerLib/PipeOutputManager.cpp | 8 +- .../Core/IISNativeApplication.cs | 35 +++++++- .../NativeMethods.cs | 18 +++- .../IISApplication.cs | 1 - .../Inprocess/LoggingTests.cs | 87 ++++++++++++++----- .../Utilities/Helpers.cs | 16 ++++ test/WebSites/InProcessWebSite/Program.cs | 8 ++ test/WebSites/InProcessWebSite/Startup.cs | 1 - 12 files changed, 155 insertions(+), 46 deletions(-) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index bb56b01419..7e6f0ee433 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -277,10 +277,7 @@ IN_PROCESS_APPLICATION::LoadManagedApplication goto Finished; } - if (FAILED(hr = m_pLoggerProvider->Start())) - { - goto Finished; - } + LOG_IF_FAILED(m_pLoggerProvider->Start()); } if (m_status != APPLICATION_STATUS::STARTING) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp index 38c4cb6503..1db194bdbd 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp @@ -15,7 +15,8 @@ register_callbacks( _In_ PFN_SHUTDOWN_HANDLER shutdown_handler, _In_ PFN_ASYNC_COMPLETION_HANDLER async_completion_handler, _In_ VOID* pvRequstHandlerContext, - _In_ VOID* pvShutdownHandlerContext + _In_ VOID* pvShutdownHandlerContext, + _Out_ BOOL* pfResetStandardStreams ) { if (pInProcessApplication == NULL) @@ -30,6 +31,7 @@ register_callbacks( pvRequstHandlerContext, pvShutdownHandlerContext ); + *pfResetStandardStreams = !pInProcessApplication->QueryConfig()->QueryStdoutLogEnabled(); return S_OK; } diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp index 3242f96227..358d0f79cd 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp @@ -10,8 +10,8 @@ FileOutputManager::FileOutputManager() : m_hLogFileHandle(INVALID_HANDLE_VALUE), - m_fdPreviousStdOut(0), - m_fdPreviousStdErr(0) + m_fdPreviousStdOut(-1), + m_fdPreviousStdErr(-1) { } @@ -40,14 +40,14 @@ FileOutputManager::~FileOutputManager() if (m_fdPreviousStdOut >= 0) { - _dup2(m_fdPreviousStdOut, _fileno(stdout)); - LOG_INFOF("Restoring original stdout of stdout: %d", m_fdPreviousStdOut); + LOG_LAST_ERROR_IF(SetStdHandle(STD_OUTPUT_HANDLE, (HANDLE)_get_osfhandle(m_fdPreviousStdOut))); + LOG_INFOF("Restoring original stdout: %d", m_fdPreviousStdOut); } if (m_fdPreviousStdErr >= 0) { - _dup2(m_fdPreviousStdErr, _fileno(stderr)); - LOG_INFOF("Restoring original stdout of stdout: %d", m_fdPreviousStdOut); + LOG_LAST_ERROR_IF(SetStdHandle(STD_ERROR_HANDLE, (HANDLE)_get_osfhandle(m_fdPreviousStdErr))); + LOG_INFOF("Restoring original stderr: %d", m_fdPreviousStdOut); } } @@ -60,10 +60,6 @@ FileOutputManager::Initialize(PCWSTR pwzStdOutLogFileName, PCWSTR pwzApplication return S_OK; } -void FileOutputManager::NotifyStartupComplete() -{ -} - bool FileOutputManager::GetStdOutContent(STRA* struStdOutput) { // diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h index 7f44d92462..f9a617ccf9 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h @@ -19,7 +19,7 @@ public: virtual bool GetStdOutContent(STRA* struStdOutput) override; virtual HRESULT Start() override; - virtual void NotifyStartupComplete() override; + virtual void NotifyStartupComplete() override {}; private: HandleWrapper m_hLogFileHandle; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp index e8b61a962b..ade993f37b 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp @@ -14,7 +14,9 @@ PipeOutputManager::PipeOutputManager() : m_hErrReadPipe(INVALID_HANDLE_VALUE), m_hErrWritePipe(INVALID_HANDLE_VALUE), m_hErrThread(NULL), - m_fDisposed(FALSE) + m_fDisposed(FALSE), + m_fdPreviousStdOut(-1), + m_fdPreviousStdErr(-1) { InitializeSRWLock(&m_srwLock); } @@ -54,7 +56,7 @@ PipeOutputManager::StopOutputRedirection() if (m_fdPreviousStdOut >= 0) { - LOG_IF_DUPFAIL(_dup2(m_fdPreviousStdOut, _fileno(stdout))); + LOG_LAST_ERROR_IF(SetStdHandle(STD_OUTPUT_HANDLE, (HANDLE)_get_osfhandle(m_fdPreviousStdOut))); } else { @@ -63,7 +65,7 @@ PipeOutputManager::StopOutputRedirection() if (m_fdPreviousStdErr >= 0) { - LOG_IF_DUPFAIL(_dup2(m_fdPreviousStdErr, _fileno(stderr))); + LOG_LAST_ERROR_IF(SetStdHandle(STD_ERROR_HANDLE, (HANDLE)_get_osfhandle(m_fdPreviousStdErr))); } else { diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs index 6d574867b4..44f9b40bef 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO; namespace Microsoft.AspNetCore.Server.IIS.Core { @@ -31,7 +32,39 @@ namespace Microsoft.AspNetCore.Server.IIS.Core IntPtr requestContext, IntPtr shutdownContext) { - NativeMethods.HttpRegisterCallbacks(_nativeApplication, requestHandler, shutdownHandler, onAsyncCompletion, requestContext, shutdownContext); + NativeMethods.HttpRegisterCallbacks( + _nativeApplication, + requestHandler, + shutdownHandler, + onAsyncCompletion, + requestContext, + shutdownContext, + out var resetStandardStreams); + + if (resetStandardStreams) + { + ResetStdOutHandles(); + } + } + + private static void ResetStdOutHandles() + { + // By using the PipeOutputRedirection, after calling RegisterCallbacks, + // stdout and stderr will be redirected to NULL. However, if something wrote + // to stdout before redirecting, (like a Console.WriteLine during startup), + // we need to call Console.Set* to pick up the modified consoles outputs. + Console.SetOut(CreateStreamWriter(Console.OpenStandardOutput())); + Console.SetError(CreateStreamWriter(Console.OpenStandardError())); + } + + private static StreamWriter CreateStreamWriter(Stream stdStream) + { + return new StreamWriter( + stdStream, + encoding: Console.OutputEncoding, + bufferSize: 256, + leaveOpen: true) + { AutoFlush = true }; } public void Dispose() diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs index de7bcb0562..a21ddcbac5 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs @@ -53,7 +53,13 @@ namespace Microsoft.AspNetCore.Server.IIS private static extern void http_indicate_completion(IntPtr pInProcessHandler, REQUEST_NOTIFICATION_STATUS notificationStatus); [DllImport(AspNetCoreModuleDll)] - private static extern int register_callbacks(IntPtr pInProcessApplication, PFN_REQUEST_HANDLER requestCallback, PFN_SHUTDOWN_HANDLER shutdownCallback, PFN_ASYNC_COMPLETION asyncCallback, IntPtr pvRequestContext, IntPtr pvShutdownContext); + private static extern int register_callbacks(IntPtr pInProcessApplication, + PFN_REQUEST_HANDLER requestCallback, + PFN_SHUTDOWN_HANDLER shutdownCallback, + PFN_ASYNC_COMPLETION asyncCallback, + IntPtr pvRequestContext, + IntPtr pvShutdownContext, + out bool resetStandardStreams); [DllImport(AspNetCoreModuleDll)] private static extern unsafe int http_write_response_bytes(IntPtr pInProcessHandler, HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, int nChunks, out bool fCompletionExpected); @@ -135,9 +141,15 @@ namespace Microsoft.AspNetCore.Server.IIS Validate(http_set_completion_status(pInProcessHandler, rquestNotificationStatus)); } - public static void HttpRegisterCallbacks(IntPtr pInProcessApplication, PFN_REQUEST_HANDLER requestCallback, PFN_SHUTDOWN_HANDLER shutdownCallback, PFN_ASYNC_COMPLETION asyncCallback, IntPtr pvRequestContext, IntPtr pvShutdownContext) + public static void HttpRegisterCallbacks(IntPtr pInProcessApplication, + PFN_REQUEST_HANDLER requestCallback, + PFN_SHUTDOWN_HANDLER shutdownCallback, + PFN_ASYNC_COMPLETION asyncCallback, + IntPtr pvRequestContext, + IntPtr pvShutdownContext, + out bool resetStandardStreams) { - Validate(register_callbacks(pInProcessApplication, requestCallback, shutdownCallback, asyncCallback, pvRequestContext, pvShutdownContext)); + Validate(register_callbacks(pInProcessApplication, requestCallback, shutdownCallback, asyncCallback, pvRequestContext, pvShutdownContext, out resetStandardStreams)); } public static unsafe int HttpWriteResponseBytes(IntPtr pInProcessHandler, HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, int nChunks, out bool fCompletionExpected) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs index afa28dd4e3..d0c0bfb153 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs @@ -231,7 +231,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting pool.ProcessModel.IdentityType = ProcessModelIdentityType.LocalSystem; pool.ManagedRuntimeVersion = string.Empty; pool.StartMode = StartMode.AlwaysRunning; - AddEnvironmentVariables(contentRoot, pool); _logger.LogInformation($"Configured AppPool {AppPoolName}"); diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index 53009a969c..6384fd508e 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -19,55 +19,58 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalTheory] [InlineData("CheckErrLogFile")] [InlineData("CheckLogFile")] - public async Task CheckStdoutLogging(string path) + public async Task CheckStdoutLoggingToFile(string path) { var deploymentParameters = Helpers.GetBaseDeploymentParameters(); deploymentParameters.PublishApplicationBeforeDeployment = true; - deploymentParameters.PreservePublishedApplicationForDebugging = true; // workaround for keeping var deploymentResult = await DeployAsync(deploymentParameters); + var pathToLogs = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); try { Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogEnabled", "true"); - Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogFile", @".\logs\stdout"); + Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogFile", Path.Combine(pathToLogs, "std")); - var response = await deploymentResult.RetryingHttpClient.GetAsync(path); - - var responseText = await response.Content.ReadAsStringAsync(); - - Assert.Equal("Hello World", responseText); + await Helpers.AssertStarts(deploymentResult, path); StopServer(); - var folderPath = Path.Combine(deploymentResult.DeploymentResult.ContentRoot, @"logs"); + var fileInDirectory = Directory.GetFiles(pathToLogs).Single(); - var fileInDirectory = Directory.GetFiles(folderPath).Single(); - Assert.NotNull(fileInDirectory); - - string contents = null; - - // RetryOperation doesn't support async lambdas, call synchronous ReadAllText. - RetryHelper.RetryOperation( - () => contents = File.ReadAllText(fileInDirectory), - e => Logger.LogError($"Failed to read file: {e.Message}"), - retryCount: 10, - retryDelayMilliseconds: 100); + var contents = File.ReadAllText(fileInDirectory); Assert.NotNull(contents); Assert.Contains("TEST MESSAGE", contents); + Assert.DoesNotContain(TestSink.Writes, context => context.Message.Contains("TEST MESSAGE")); + // TODO we should check that debug logs are restored during graceful shutdown. + // The IIS Express deployer doesn't support graceful shutdown. + //Assert.Contains(TestSink.Writes, context => context.Message.Contains("Restoring original stdout: ")); } finally { RetryHelper.RetryOperation( - () => Directory.Delete(deploymentParameters.PublishedApplicationRootPath, true), + () => Directory.Delete(pathToLogs, true), e => Logger.LogWarning($"Failed to delete directory : {e.Message}"), retryCount: 3, retryDelayMilliseconds: 100); } } + [ConditionalFact] + public async Task InvalidFilePathForLogs_ServerStillRuns() + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + + var deploymentResult = await DeployAsync(deploymentParameters); + + Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogEnabled", "true"); + Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogFile", Path.Combine("Q:", "std")); + + await Helpers.AssertStarts(deploymentResult, "HelloWorld"); + } + [ConditionalFact] [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task StartupMessagesAreLoggedIntoDebugLogFile() @@ -96,6 +99,48 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } + [ConditionalTheory] + [InlineData("CheckErrLogFile")] + [InlineData("CheckLogFile")] + public async Task CheckStdoutLoggingToPipe_DoesNotCrashProcess(string path) + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + var deploymentResult = await DeployAsync(deploymentParameters); + + await Helpers.AssertStarts(deploymentResult, path); + + StopServer(); + + if (deploymentParameters.ServerType == ServerType.IISExpress) + { + Assert.Contains(TestSink.Writes, context => context.Message.Contains("TEST MESSAGE")); + } + } + + [ConditionalTheory] + [InlineData("CheckErrLogFile")] + [InlineData("CheckLogFile")] + public async Task CheckStdoutLoggingToPipeWithFirstWrite(string path) + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + + var deploymentResult = await DeployAsync(deploymentParameters); + var firstWriteString = path + path; + + Helpers.ModifyEnvironmentVariableCollectionInWebConfig(deploymentResult, "ASPNETCORE_INPROCESS_INITIAL_WRITE", firstWriteString); + + await Helpers.AssertStarts(deploymentResult, path); + + StopServer(); + + if (deploymentParameters.ServerType == ServerType.IISExpress) + { + // We can't read stdout logs from IIS as they aren't redirected. + Assert.Contains(TestSink.Writes, context => context.Message.Contains(firstWriteString)); + Assert.Contains(TestSink.Writes, context => context.Message.Contains("TEST MESSAGE")); + } + } + [ConditionalFact] [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task StartupMessagesLogFileSwitchedWhenLogFilePresentInWebConfig() diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 0480351ce1..878ab06272 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -41,6 +41,22 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests config.Save(webConfigFile); } + public static void ModifyEnvironmentVariableCollectionInWebConfig(IISDeploymentResult deploymentResult, string key, string value) + { + var webConfigFile = GetWebConfigFile(deploymentResult); + var config = XDocument.Load(webConfigFile); + + var envVarElement = new XElement("environmentVariable"); + envVarElement.SetAttributeValue("name", key); + envVarElement.SetAttributeValue("value", value); + + config.Descendants("aspNetCore").Single() + .Descendants("environmentVariables").Single() + .Add(envVarElement); + + config.Save(webConfigFile); + } + public static void ModifyHandlerSectionInWebConfig(IISDeploymentResult deploymentResult, string handlerVersionValue) { var webConfigFile = GetWebConfigFile(deploymentResult); diff --git a/test/WebSites/InProcessWebSite/Program.cs b/test/WebSites/InProcessWebSite/Program.cs index 2e5e8f5d6a..ec9ed04f87 100644 --- a/test/WebSites/InProcessWebSite/Program.cs +++ b/test/WebSites/InProcessWebSite/Program.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Logging; @@ -10,6 +11,13 @@ namespace IISTestSite { public static void Main(string[] args) { + var envVariable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_INITIAL_WRITE"); + if (!string.IsNullOrEmpty(envVariable)) + { + Console.WriteLine(envVariable); + Console.Error.WriteLine(envVariable); + } + var host = new WebHostBuilder() .ConfigureLogging((_, factory) => { diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index 2bf89384f8..f42e220751 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -753,6 +753,5 @@ namespace IISTestSite } await context.Response.WriteAsync("Response End"); } - } } From 5c2df180fcddbbc5c85aa6310931e86620c87afe Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 15 Jul 2018 12:16:08 -0700 Subject: [PATCH 138/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 70 ++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 9e7e524c41..fb4b95edd2 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,47 +5,47 @@ 0.10.13 2.2.0-preview1-17099 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 0.6.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 0.6.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 15.6.82 15.6.82 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.0.7 - 2.1.1 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.0.9 + 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34640 + 2.2.0-preview1-34694 15.6.1 11.1.0 2.0.3 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 + 4.5.0 + 4.5.0 + 4.5.0 + 4.5.1 + 4.5.1 + 4.5.0 + 4.5.1 + 4.5.0 9.0.1 2.3.1 2.4.0-rc.1.build4038 From 2bb68aaa33aedfdf04710aecfee3f0cebfea9b3a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 15 Jul 2018 20:00:01 +0000 Subject: [PATCH 139/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 72 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 289811b4d3..7cf5dbd1b9 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,48 +4,48 @@ 0.10.13 - 3.0.0-alpha1-10005 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 0.7.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 + 3.0.0-alpha1-10009 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 0.7.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 15.6.82 15.6.82 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 3.0.0-alpha1-10044 - 2.0.7 - 2.1.1 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 3.0.0-alpha1-10081 + 2.0.9 + 2.1.2 2.2.0-preview1-26618-02 - 3.0.0-alpha1-10044 + 3.0.0-alpha1-10081 15.6.1 11.1.0 2.0.3 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 - 4.6.0-preview1-26617-01 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 + 4.6.0-preview1-26708-04 9.0.1 2.3.1 2.4.0-rc.1.build4038 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 2395ab5956..c6adb40215 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-10005 -commithash:05570853de976a526462ca140a55b1ac59d9a351 +version:3.0.0-alpha1-10009 +commithash:86be4707e47d2f1930a982f2b59eacfc4196da33 From 074264cd3a1a1558f9a88f3c580df915f086f516 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 17 Jul 2018 08:56:18 -0700 Subject: [PATCH 140/363] Use less global variables (#1064) --- .../AspNetCore/applicationinfo.cpp | 69 +++++++++---------- .../AspNetCore/applicationinfo.h | 23 +++++-- .../AspNetCore/applicationmanager.cpp | 55 +++++---------- .../AspNetCore/applicationmanager.h | 33 +++++---- src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp | 24 +------ .../AspNetCore/globalmodule.cpp | 2 + .../AspNetCore/proxymodule.cpp | 4 +- .../AspNetCore/proxymodule.h | 2 - src/AspNetCoreModuleV2/AspNetCore/stdafx.h | 16 +---- src/AspNetCoreModuleV2/CommonLib/EventLog.h | 2 + 10 files changed, 100 insertions(+), 130 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index 2072e33af6..edfc085f22 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -12,12 +12,21 @@ #include "SRWExclusiveLock.h" #include "GlobalVersionUtility.h" #include "exceptions.h" -#include "HandleWrapper.h" #include "PollingAppOfflineApplication.h" +#include "EventLog.h" + +extern HINSTANCE g_hModule; const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; +SRWLOCK APPLICATION_INFO::s_requestHandlerLoadLock {}; +bool APPLICATION_INFO::s_fAspnetcoreRHAssemblyLoaded = false; +bool APPLICATION_INFO::s_fAspnetcoreRHLoadedError = false; +HMODULE APPLICATION_INFO::s_hAspnetCoreRH = nullptr; + +PFN_ASPNETCORE_CREATE_APPLICATION APPLICATION_INFO::s_pfnAspNetCoreCreateApplication = nullptr; + APPLICATION_INFO::~APPLICATION_INFO() { if (m_pApplication != NULL) @@ -39,23 +48,14 @@ APPLICATION_INFO::~APPLICATION_INFO() HRESULT APPLICATION_INFO::Initialize( - _In_ IHttpServer *pServer, - _In_ IHttpApplication *pApplication + _In_ IHttpApplication &pApplication ) { - HRESULT hr = S_OK; + m_pConfiguration = new ASPNETCORE_SHIM_CONFIG(); + RETURN_IF_FAILED(m_pConfiguration->Populate(&m_pServer, &pApplication)); + RETURN_IF_FAILED(m_struInfoKey.Copy(pApplication.GetApplicationId())); - DBG_ASSERT(pServer); - DBG_ASSERT(pApplication); - - // todo: make sure Initialize should be called only once - m_pServer = pServer; - FINISHED_IF_NULL_ALLOC(m_pConfiguration = new ASPNETCORE_SHIM_CONFIG()); - FINISHED_IF_FAILED(m_pConfiguration->Populate(m_pServer, pApplication)); - FINISHED_IF_FAILED(m_struInfoKey.Copy(pApplication->GetApplicationId())); - -Finished: - return hr; + return S_OK; } @@ -125,7 +125,7 @@ APPLICATION_INFO::EnsureApplicationCreated( }; LOG_INFO("Creating handler application"); FINISHED_IF_FAILED(m_pfnAspNetCoreCreateApplication( - m_pServer, + &m_pServer, pHttpContext->GetApplication(), parameters.data(), static_cast(parameters.size()), @@ -157,19 +157,18 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) PCWSTR pstrHandlerDllName; STACK_STRU(struFileName, 256); - if (g_fAspnetcoreRHLoadedError) + if (s_fAspnetcoreRHLoadedError) { FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); } - else if (!g_fAspnetcoreRHAssemblyLoaded) + else if (!s_fAspnetcoreRHAssemblyLoaded) { - SRWExclusiveLock lock(g_srwLock); - - if (g_fAspnetcoreRHLoadedError) + SRWExclusiveLock lock(s_requestHandlerLoadLock); + if (s_fAspnetcoreRHLoadedError) { FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); } - if (g_fAspnetcoreRHAssemblyLoaded) + if (s_fAspnetcoreRHAssemblyLoaded) { FINISHED(S_OK); } @@ -184,9 +183,9 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) } // Try to see if RH is already loaded - g_hAspnetCoreRH = GetModuleHandle(pstrHandlerDllName); + s_hAspnetCoreRH = GetModuleHandle(pstrHandlerDllName); - if (g_hAspnetCoreRH == NULL) + if (s_hAspnetCoreRH == NULL) { if (m_pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) { @@ -229,22 +228,22 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) WLOG_INFOF(L"Loading request handler: %s", struFileName.QueryStr()); - g_hAspnetCoreRH = LoadLibraryW(struFileName.QueryStr()); + s_hAspnetCoreRH = LoadLibraryW(struFileName.QueryStr()); - if (g_hAspnetCoreRH == NULL) + if (s_hAspnetCoreRH == NULL) { FINISHED(HRESULT_FROM_WIN32(GetLastError())); } } - g_pfnAspNetCoreCreateApplication = (PFN_ASPNETCORE_CREATE_APPLICATION) - GetProcAddress(g_hAspnetCoreRH, "CreateApplication"); - if (g_pfnAspNetCoreCreateApplication == NULL) + s_pfnAspNetCoreCreateApplication = (PFN_ASPNETCORE_CREATE_APPLICATION) + GetProcAddress(s_hAspnetCoreRH, "CreateApplication"); + if (s_pfnAspNetCoreCreateApplication == NULL) { FINISHED(HRESULT_FROM_WIN32(GetLastError())); } - g_fAspnetcoreRHAssemblyLoaded = TRUE; + s_fAspnetcoreRHAssemblyLoaded = TRUE; } Finished: @@ -252,11 +251,11 @@ Finished: // Question: we remember the load failure so that we will not try again. // User needs to check whether the fuction pointer is NULL // - m_pfnAspNetCoreCreateApplication = g_pfnAspNetCoreCreateApplication; + m_pfnAspNetCoreCreateApplication = s_pfnAspNetCoreCreateApplication; - if (!g_fAspnetcoreRHLoadedError && FAILED(hr)) + if (!s_fAspnetcoreRHLoadedError && FAILED(hr)) { - g_fAspnetcoreRHLoadedError = TRUE; + s_fAspnetcoreRHLoadedError = TRUE; } return hr; } @@ -457,7 +456,7 @@ APPLICATION_INFO::RecycleApplication() if (m_pConfiguration->QueryHostingModel() == HOSTING_IN_PROCESS) { // In process application failed to start for whatever reason, need to recycle the work process - m_pServer->RecycleProcess(L"AspNetCore InProcess Recycle Process on Demand"); + m_pServer.RecycleProcess(L"AspNetCore InProcess Recycle Process on Demand"); } } @@ -466,7 +465,7 @@ APPLICATION_INFO::RecycleApplication() if (!g_fRecycleProcessCalled) { g_fRecycleProcessCalled = TRUE; - g_pHttpServer->RecycleProcess(L"On Demand by AspNetCore Module for recycle application failure"); + m_pServer.RecycleProcess(L"On Demand by AspNetCore Module for recycle application failure"); } } else diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h index 3d4b901755..49badd578a 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h @@ -23,14 +23,13 @@ HRESULT ); extern BOOL g_fRecycleProcessCalled; -extern PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; class APPLICATION_INFO { public: - APPLICATION_INFO() : - m_pServer(NULL), + APPLICATION_INFO(_In_ IHttpServer &pServer) : + m_pServer(pServer), m_cRefs(1), m_fValid(FALSE), m_fAppCreationAttempted(FALSE), @@ -48,11 +47,17 @@ public: virtual ~APPLICATION_INFO(); + + static + void + StaticInitialize() + { + InitializeSRWLock(&s_requestHandlerLoadLock); + } HRESULT Initialize( - _In_ IHttpServer *pServer, - _In_ IHttpApplication *pApplication + _In_ IHttpApplication &pApplication ); VOID @@ -125,11 +130,17 @@ private: ASPNETCORE_SHIM_CONFIG *m_pConfiguration; IAPPLICATION *m_pApplication; SRWLOCK m_srwLock; - IHttpServer *m_pServer; + IHttpServer &m_pServer; PFN_ASPNETCORE_CREATE_APPLICATION m_pfnAspNetCoreCreateApplication; static const PCWSTR s_pwzAspnetcoreInProcessRequestHandlerName; static const PCWSTR s_pwzAspnetcoreOutOfProcessRequestHandlerName; + + static SRWLOCK s_requestHandlerLoadLock; + static bool s_fAspnetcoreRHAssemblyLoaded; + static bool s_fAspnetcoreRHLoadedError; + static HMODULE s_hAspnetCoreRH; + static PFN_ASPNETCORE_CREATE_APPLICATION s_pfnAspNetCoreCreateApplication; }; class APPLICATION_INFO_HASH : diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp index c65222b10e..a7f08e5d3e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp @@ -8,6 +8,9 @@ #include "resources.h" #include "SRWExclusiveLock.h" #include "exceptions.h" +#include "EventLog.h" + +extern BOOL g_fInShutdown; // The application manager is a singleton across ANCM. APPLICATION_MANAGER* APPLICATION_MANAGER::sm_pApplicationManager = NULL; @@ -18,7 +21,6 @@ APPLICATION_MANAGER* APPLICATION_MANAGER::sm_pApplicationManager = NULL; // HRESULT APPLICATION_MANAGER::GetOrCreateApplicationInfo( - _In_ IHttpServer* pServer, _In_ IHttpContext* pHttpContext, _Out_ APPLICATION_INFO ** ppApplicationInfo ) @@ -32,56 +34,37 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( STACK_STRU ( strEventMsg, 256 ); - DBG_ASSERT(pServer); DBG_ASSERT(pHttpContext); DBG_ASSERT(ppApplicationInfo); *ppApplicationInfo = NULL; + IHttpApplication &pApplication = *pHttpContext->GetApplication(); - if (!m_fDebugInitialize) - { - SRWExclusiveLock lock(m_srwLock); - if (!m_fDebugInitialize) - { - DebugInitializeFromConfig(*pServer, *pHttpContext->GetApplication()); - m_fDebugInitialize = TRUE; - } - } // The configuration path is unique for each application and is used for the // key in the applicationInfoHash. - pszApplicationId = pHttpContext->GetApplication()->GetApplicationId(); + pszApplicationId = pApplication.GetApplicationId(); // When accessing the m_pApplicationInfoHash, we need to acquire the application manager // lock to avoid races on setting state. + SRWSharedLock lock(m_srwLock); + if (!m_fDebugInitialize) { - SRWSharedLock lock(m_srwLock); - if (g_fInShutdown) - { - FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); - } - m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); + DebugInitializeFromConfig(m_pHttpServer, pApplication); + m_fDebugInitialize = TRUE; } + if (g_fInShutdown) + { + FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); + } + + m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); + if (*ppApplicationInfo == NULL) { - pApplicationInfo = new APPLICATION_INFO(); + pApplicationInfo = new APPLICATION_INFO(m_pHttpServer); - FINISHED_IF_FAILED(pApplicationInfo->Initialize(pServer, pHttpContext->GetApplication())); - - SRWExclusiveLock lock(m_srwLock); - - if (g_fInShutdown) - { - // Already in shuting down. No need to create the application - FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); - } - m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); - - if (*ppApplicationInfo != NULL) - { - // someone else created the application - FINISHED(S_OK); - } + FINISHED_IF_FAILED(pApplicationInfo->Initialize(pApplication)); hostingModel = pApplicationInfo->QueryConfig()->QueryHostingModel(); @@ -309,7 +292,7 @@ Finished: if (!g_fRecycleProcessCalled) { g_fRecycleProcessCalled = TRUE; - g_pHttpServer->RecycleProcess(L"AspNetCore Recycle Process on Demand Due Application Recycle Error"); + m_pHttpServer.RecycleProcess(L"AspNetCore Recycle Process on Demand Due Application Recycle Error"); } } diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h index cd565e2c01..f01df15844 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h @@ -27,15 +27,9 @@ public: static APPLICATION_MANAGER* - GetInstance( - VOID - ) + GetInstance() { - if ( sm_pApplicationManager == NULL ) - { - sm_pApplicationManager = new APPLICATION_MANAGER(); - } - + assert(sm_pApplicationManager); return sm_pApplicationManager; } @@ -68,7 +62,6 @@ public: HRESULT GetOrCreateApplicationInfo( - _In_ IHttpServer* pServer, _In_ IHttpContext* pHttpContext, _Out_ APPLICATION_INFO ** ppApplicationInfo ); @@ -92,6 +85,16 @@ public: } } + static HRESULT StaticInitialize(IHttpServer& pHttpServer) + { + assert(!sm_pApplicationManager); + sm_pApplicationManager = new APPLICATION_MANAGER(pHttpServer); + RETURN_IF_FAILED(sm_pApplicationManager->Initialize()); + + APPLICATION_INFO::StaticInitialize(); + return S_OK; + } + HRESULT Initialize() { if(m_pApplicationInfoHash == NULL) @@ -107,12 +110,11 @@ public: } private: - // - // we currently limit the size of m_pstrErrorInfo to 5000, be careful if you want to change its payload - // - APPLICATION_MANAGER() : m_pApplicationInfoHash(NULL), + APPLICATION_MANAGER(IHttpServer& pHttpServer) : + m_pApplicationInfoHash(NULL), m_hostingModel(HOSTING_UNKNOWN), - m_fDebugInitialize(FALSE) + m_fDebugInitialize(FALSE), + m_pHttpServer(pHttpServer) { InitializeSRWLock(&m_srwLock); } @@ -120,6 +122,7 @@ private: APPLICATION_INFO_HASH *m_pApplicationInfoHash; static APPLICATION_MANAGER *sm_pApplicationManager; SRWLOCK m_srwLock; - APP_HOSTING_MODEL m_hostingModel; + APP_HOSTING_MODEL m_hostingModel; BOOL m_fDebugInitialize; + IHttpServer &m_pHttpServer; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp index d185ad4be4..5369fbc527 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp @@ -13,20 +13,10 @@ DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2.dll"); -HTTP_MODULE_ID g_pModuleId = NULL; -IHttpServer * g_pHttpServer = NULL; HANDLE g_hEventLog = NULL; BOOL g_fRecycleProcessCalled = FALSE; -PCWSTR g_pszModuleName = NULL; HINSTANCE g_hModule; -HMODULE g_hAspnetCoreRH = NULL; -BOOL g_fAspnetcoreRHAssemblyLoaded = FALSE; -BOOL g_fAspnetcoreRHLoadedError = FALSE; BOOL g_fInShutdown = FALSE; -DWORD g_dwActiveServerProcesses = 0; -SRWLOCK g_srwLock; - -PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; VOID StaticCleanup() @@ -100,17 +90,10 @@ HRESULT BOOL fDisableANCM = FALSE; ASPNET_CORE_PROXY_MODULE_FACTORY * pFactory = NULL; ASPNET_CORE_GLOBAL_MODULE * pGlobalModule = NULL; - APPLICATION_MANAGER * pApplicationManager = NULL; UNREFERENCED_PARAMETER(dwServerVersion); - InitializeSRWLock(&g_srwLock); - - g_pModuleId = pModuleInfo->GetId(); - g_pszModuleName = pModuleInfo->GetName(); - g_pHttpServer = pHttpServer; - - if (g_pHttpServer->IsCommandLineLaunch()) + if (pHttpServer->IsCommandLineLaunch()) { g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); } @@ -175,13 +158,12 @@ HRESULT 0)); pFactory = NULL; - pApplicationManager = APPLICATION_MANAGER::GetInstance(); - FINISHED_IF_FAILED(pApplicationManager->Initialize()); + FINISHED_IF_FAILED(APPLICATION_MANAGER::StaticInitialize(*pHttpServer)); pGlobalModule = NULL; - pGlobalModule = new ASPNET_CORE_GLOBAL_MODULE(pApplicationManager); + pGlobalModule = new ASPNET_CORE_GLOBAL_MODULE(APPLICATION_MANAGER::GetInstance()); FINISHED_IF_FAILED(pModuleInfo->SetGlobalNotifications( pGlobalModule, diff --git a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp index 05dee36b15..0ecbba4afb 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp @@ -3,6 +3,8 @@ #include "globalmodule.h" +extern BOOL g_fInShutdown; + ASPNET_CORE_GLOBAL_MODULE::ASPNET_CORE_GLOBAL_MODULE( APPLICATION_MANAGER* pApplicationManager) { diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index f27a1571c3..962d7202d1 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -7,6 +7,9 @@ #include "applicationinfo.h" #include "acache.h" #include "exceptions.h" + +extern BOOL g_fInShutdown; + __override HRESULT ASPNET_CORE_PROXY_MODULE_FACTORY::GetHttpModule( @@ -83,7 +86,6 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( pApplicationManager = APPLICATION_MANAGER::GetInstance(); FINISHED_IF_FAILED(pApplicationManager->GetOrCreateApplicationInfo( - g_pHttpServer, pHttpContext, &m_pApplicationInfo)); diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h index 5864dd0c6f..a66a0fd3e1 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h @@ -8,8 +8,6 @@ #include "irequesthandler.h" extern HTTP_MODULE_ID g_pModuleId; -extern IHttpServer *g_pHttpServer; -extern HMODULE g_hAspnetCoreRH; class ASPNET_CORE_PROXY_MODULE : public CHttpModule { diff --git a/src/AspNetCoreModuleV2/AspNetCore/stdafx.h b/src/AspNetCoreModuleV2/AspNetCore/stdafx.h index 1191022c01..29c485bc9c 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/stdafx.h +++ b/src/AspNetCoreModuleV2/AspNetCore/stdafx.h @@ -9,8 +9,8 @@ // #define WIN32_LEAN_AND_MEAN -#define NTDDI_VERSION 0x06010000 -#define WINVER 0x0601 +#define NTDDI_VERSION NTDDI_WIN7 +#define WINVER _WIN32_WINNT_WIN7 #define _WIN32_WINNT 0x0601 #include @@ -20,16 +20,4 @@ #include "stringu.h" #include "stringa.h" -extern PVOID g_pModuleId; -extern BOOL g_fAspnetcoreRHAssemblyLoaded; -extern BOOL g_fAspnetcoreRHLoadedError; -extern BOOL g_fInShutdown; -extern BOOL g_fEnableReferenceCountTracing; -extern DWORD g_dwActiveServerProcesses; -extern HINSTANCE g_hModule; -extern HMODULE g_hAspnetCoreRH; -extern SRWLOCK g_srwLock; -extern PCWSTR g_pwzAspnetcoreRequestHandlerName; -extern HANDLE g_hEventLog; - #pragma warning( error : 4091) diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.h b/src/AspNetCoreModuleV2/CommonLib/EventLog.h index 8782eff6d4..3efbe38b35 100644 --- a/src/AspNetCoreModuleV2/CommonLib/EventLog.h +++ b/src/AspNetCoreModuleV2/CommonLib/EventLog.h @@ -6,4 +6,6 @@ #include "Utility.h" #include "resources.h" +extern HANDLE g_hEventLog; + #define EVENTLOG(log, name, ...) UTILITY::LogEventF(log, ASPNETCORE_EVENT_ ## name ## _LEVEL, ASPNETCORE_EVENT_ ## name, ASPNETCORE_EVENT_ ## name ## _MSG, __VA_ARGS__) From b741743537abb054bb30e104643c1d92bfed314d Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 17 Jul 2018 13:03:04 -0700 Subject: [PATCH 141/363] Set IsMet and SkipReason with empty constructor (#1070) --- test/IIS.FunctionalTests/RequiresIISAttribute.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/IIS.FunctionalTests/RequiresIISAttribute.cs b/test/IIS.FunctionalTests/RequiresIISAttribute.cs index f55f397cfa..de0e4eb805 100644 --- a/test/IIS.FunctionalTests/RequiresIISAttribute.cs +++ b/test/IIS.FunctionalTests/RequiresIISAttribute.cs @@ -92,7 +92,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } - public RequiresIISAttribute() { } + public RequiresIISAttribute() + : this (IISCapability.None) { } public RequiresIISAttribute(IISCapability capabilities) { From 54471a293030d3dd6d02caeeedaf5542436f3896 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 17 Jul 2018 20:26:57 -0700 Subject: [PATCH 142/363] Add client abort tests (#1051) --- IISIntegration.NoV1.sln | 30 +++ IISIntegration.sln | 30 +++ .../IIS.Performance/IIS.Performance.csproj | 1 + .../AspNetCore/globalmodule.cpp | 4 + .../AspNetCore/globalmodule.h | 1 + .../CommonLib/debugutil.cpp | 6 +- .../inprocessapplication.cpp | 5 + .../RequestHandlerLib/filewatcher.cpp | 4 + .../Core/IISHttpContext.ReadWrite.cs | 9 +- .../Core/IISHttpContext.cs | 11 +- .../Core/IISHttpContextOfT.cs | 3 +- .../Core/IO/AsyncIOOperation.cs | 4 +- .../Core/OutputProducer.cs | 1 + .../NativeMethods.cs | 1 + .../Inprocess/ClientDisconnectTests.cs | 47 +++++ .../Utilities/Helpers.cs | 6 +- test/Common.Tests/Common.Tests.csproj | 23 +++ .../Utilities/LoggingHandler.cs | 0 .../Utilities/RetryHandler.cs | 0 .../Utilities/TestConnections.cs | 0 .../Utilities/TimeoutExtensions.cs | 21 +++ .../IIS.FunctionalTests.csproj | 1 + .../AppHostConfig/HostableWebCore.config | 5 +- test/IIS.Tests/ClientDisconnectTests.cs | 177 ++++++++++++++++++ test/IIS.Tests/IIS.Tests.csproj | 36 ++++ .../InProcess => IIS.Tests}/TestServerTest.cs | 15 +- ...pIfHostableWebCoreNotAvailibleAttribute.cs | 4 +- .../Utilities/TestServer.cs | 30 ++- .../IISExpress.FunctionalTests.csproj | 1 + .../InProcess/AppOfflineTests.cs | 2 +- .../InProcess/ShutdownTests.cs | 3 +- 31 files changed, 444 insertions(+), 37 deletions(-) create mode 100644 test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs create mode 100644 test/Common.Tests/Common.Tests.csproj rename test/{Common.FunctionalTests => Common.Tests}/Utilities/LoggingHandler.cs (100%) rename test/{Common.FunctionalTests => Common.Tests}/Utilities/RetryHandler.cs (100%) rename test/{Common.FunctionalTests => Common.Tests}/Utilities/TestConnections.cs (100%) create mode 100644 test/Common.Tests/Utilities/TimeoutExtensions.cs rename test/{Common.FunctionalTests => IIS.Tests}/AppHostConfig/HostableWebCore.config (97%) create mode 100644 test/IIS.Tests/ClientDisconnectTests.cs create mode 100644 test/IIS.Tests/IIS.Tests.csproj rename test/{IISExpress.FunctionalTests/InProcess => IIS.Tests}/TestServerTest.cs (72%) rename test/{Common.FunctionalTests => IIS.Tests}/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs (82%) rename test/{Common.FunctionalTests => IIS.Tests}/Utilities/TestServer.cs (80%) diff --git a/IISIntegration.NoV1.sln b/IISIntegration.NoV1.sln index b9b82faf5a..09ad7eac29 100644 --- a/IISIntegration.NoV1.sln +++ b/IISIntegration.NoV1.sln @@ -113,6 +113,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "test EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting.IIS", "src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj", "{34135ED7-313D-4E68-860C-D6B51AA28523}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "test\IIS.Tests\IIS.Tests.csproj", "{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "test\Common.Tests\Common.Tests.csproj", "{D17B7B35-5361-4A50-B499-E03E5C3CC095}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -381,6 +385,30 @@ Global {34135ED7-313D-4E68-860C-D6B51AA28523}.Release|x64.Build.0 = Release|Any CPU {34135ED7-313D-4E68-860C-D6B51AA28523}.Release|x86.ActiveCfg = Release|Any CPU {34135ED7-313D-4E68-860C-D6B51AA28523}.Release|x86.Build.0 = Release|Any CPU + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x64.ActiveCfg = Debug|Any CPU + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x64.Build.0 = Debug|Any CPU + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x86.ActiveCfg = Debug|Any CPU + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x86.Build.0 = Debug|Any CPU + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|Any CPU.Build.0 = Release|Any CPU + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x64.ActiveCfg = Release|Any CPU + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x64.Build.0 = Release|Any CPU + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x86.ActiveCfg = Release|Any CPU + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x86.Build.0 = Release|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|x64.ActiveCfg = Debug|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|x64.Build.0 = Debug|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|x86.ActiveCfg = Debug|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|x86.Build.0 = Debug|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|Any CPU.Build.0 = Release|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x64.ActiveCfg = Release|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x64.Build.0 = Release|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x86.ActiveCfg = Release|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -411,6 +439,8 @@ Global {1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {D182103F-8405-4647-B158-C36F598657EF} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {34135ED7-313D-4E68-860C-D6B51AA28523} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {D17B7B35-5361-4A50-B499-E03E5C3CC095} = {EF30B533-D715-421A-92B7-92FEF460AC9C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/IISIntegration.sln b/IISIntegration.sln index c21a81482f..ba7d809f5f 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -120,6 +120,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "test EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting.IIS", "src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj", "{CE4FB142-91FB-4B34-BC96-A31120EF4009}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "test\IIS.Tests\IIS.Tests.csproj", "{A091777D-66B3-42E1-B95C-85322DE40706}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "test\Common.Tests\Common.Tests.csproj", "{A641A208-2974-4E48-BCFF-54E3AAFA4FB9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -408,6 +412,30 @@ Global {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|x64.Build.0 = Release|Any CPU {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|x86.ActiveCfg = Release|Any CPU {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|x86.Build.0 = Release|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|x64.ActiveCfg = Debug|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|x64.Build.0 = Debug|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|x86.ActiveCfg = Debug|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|x86.Build.0 = Debug|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.Release|Any CPU.Build.0 = Release|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.Release|x64.ActiveCfg = Release|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.Release|x64.Build.0 = Release|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.Release|x86.ActiveCfg = Release|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.Release|x86.Build.0 = Release|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|x64.ActiveCfg = Debug|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|x64.Build.0 = Debug|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|x86.ActiveCfg = Debug|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|x86.Build.0 = Debug|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|Any CPU.Build.0 = Release|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x64.ActiveCfg = Release|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x64.Build.0 = Release|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x86.ActiveCfg = Release|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -441,6 +469,8 @@ Global {1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {CE4FB142-91FB-4B34-BC96-A31120EF4009} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} + {A091777D-66B3-42E1-B95C-85322DE40706} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9} = {EF30B533-D715-421A-92B7-92FEF460AC9C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/benchmarks/IIS.Performance/IIS.Performance.csproj b/benchmarks/IIS.Performance/IIS.Performance.csproj index 87102ca7ed..b7aa1dc3ac 100644 --- a/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -25,6 +25,7 @@ + False diff --git a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp index 0ecbba4afb..0a9c0ccf02 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp @@ -22,6 +22,8 @@ ASPNET_CORE_GLOBAL_MODULE::OnGlobalStopListening( { UNREFERENCED_PARAMETER(pProvider); + LOG_INFO("ASPNET_CORE_GLOBAL_MODULE::OnGlobalStopListening"); + if (g_fInShutdown) { // Avoid receiving two shutudown notifications. @@ -54,6 +56,8 @@ ASPNET_CORE_GLOBAL_MODULE::OnGlobalConfigurationChange( // Retrieve the path that has changed. PCWSTR pwszChangePath = pProvider->GetChangePath(); + LOG_INFOF("ASPNET_CORE_GLOBAL_MODULE::OnGlobalConfigurationChange %S", pwszChangePath); + // Test for an error. if (NULL != pwszChangePath && _wcsicmp(pwszChangePath, L"MACHINE") != 0 && diff --git a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h index 0a7b38f0ff..b790ebb0f5 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h @@ -20,6 +20,7 @@ public: VOID Terminate() { + LOG_INFO("ASPNET_CORE_GLOBAL_MODULE::Terminate"); // Remove the class from memory. delete this; } diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index 28bc775dfa..9d7ec40ebb 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -26,7 +26,6 @@ DebugInitialize() HKEY hKey; InitializeSRWLock(&g_logFileLock); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters", 0, @@ -71,6 +70,11 @@ DebugInitialize() { // ignore } + + if (IsDebuggerPresent()) + { + DEBUG_FLAGS_VAR |= DEBUG_FLAGS_INFO; + } } HRESULT diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 7e6f0ee433..baf73ec9c1 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -561,14 +561,19 @@ IN_PROCESS_APPLICATION::RunDotnetApplication(DWORD argc, CONST PCWSTR* argv, hos __try { + LOG_INFO("Starting managed application"); m_ProcessExitCode = pProc(argc, argv); if (m_ProcessExitCode != 0) { hr = HRESULT_FROM_WIN32(GetLastError()); } + + LOG_INFOF("Managed application exited with code %d", m_ProcessExitCode); } __except(GetExceptionCode() != 0) { + + LOG_INFOF("Managed threw an exception %d", GetExceptionCode()); hr = HRESULT_FROM_WIN32(GetLastError()); } diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp index a35d8cb63c..37828b2623 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp @@ -3,6 +3,7 @@ #include "stdafx.h" #include "filewatcher.h" +#include "debugutil.h" FILE_WATCHER::FILE_WATCHER() : m_hCompletionPort(NULL), @@ -123,6 +124,7 @@ Win32 error DWORD dwErrorStatus; ULONG_PTR completionKey; + LOG_INFO("Starting file watcher thread"); pFileMonitor = (FILE_WATCHER*)pvArg; DBG_ASSERT(pFileMonitor != NULL); @@ -156,6 +158,8 @@ Win32 error } pFileMonitor->m_fThreadExit = TRUE; + + LOG_INFO("Stopping file watcher thread"); ExitThread(0); } diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.ReadWrite.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.ReadWrite.cs index 740c2a2d3e..26315971ef 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.ReadWrite.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.ReadWrite.cs @@ -3,6 +3,7 @@ using System; using System.Buffers; +using System.IO; using System.Threading; using System.Threading.Tasks; @@ -25,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core while (true) { - var result = await _bodyInputPipe.Reader.ReadAsync(); + var result = await _bodyInputPipe.Reader.ReadAsync(cancellationToken); var readableBuffer = result.Buffer; try { @@ -158,9 +159,13 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } } } + // We want to swallow IO exception and allow app to finish writing catch (Exception ex) { - _bodyOutput.Reader.Complete(ex); + if (!(ex is IOException)) + { + _bodyOutput.Reader.Complete(ex); + } } finally { diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs index 15c69432ed..ab977c4e82 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs @@ -217,7 +217,16 @@ namespace Microsoft.AspNetCore.Server.IIS.Core if (flushHeaders) { - await AsyncIO.FlushAsync(); + try + { + await AsyncIO.FlushAsync(); + } + // Client might be disconnected at this point + // don't leak the exception + catch (IOException) + { + // ignore + } } _writeBodyTask = WriteBody(!flushHeaders); diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs index f24c4fe93e..8fb2d75363 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs @@ -90,8 +90,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core await _writeBodyTask; } - // Cancell all remaining IO, thre might be reads pending if not entire request body was sent - // by client + // Cancel all remaining IO, there might be reads pending if not entire request body was sent by client AsyncIO.Dispose(); if (_readBodyTask != null) diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs index a7bea2e746..9d3752ef08 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs @@ -2,8 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.ComponentModel; using System.Diagnostics; using System.IO; +using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks.Sources; @@ -101,7 +103,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO _result = bytes; if (hr != NativeMethods.HR_OK) { - _exception = new IOException("IO exception occurred", hr); + _exception = new IOException("Native IO operation failed", Marshal.GetExceptionForHR(hr)); } } else diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs index 4bf1816329..4b90abb006 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs @@ -121,6 +121,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } catch (OperationCanceledException) { + _pipe.Writer.Complete(); _completed = true; throw; } diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs index a21ddcbac5..8a6da21e8a 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs @@ -13,6 +13,7 @@ namespace Microsoft.AspNetCore.Server.IIS internal const int HR_OK = 0; internal const int ERROR_NOT_FOUND = unchecked((int)0x80070490); internal const int ERROR_OPERATION_ABORTED = unchecked((int)0x800703E3); + internal const int COR_E_IO = unchecked((int)0x80131620); private const string KERNEL32 = "kernel32.dll"; diff --git a/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs b/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs new file mode 100644 index 0000000000..fc5f60b26e --- /dev/null +++ b/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs @@ -0,0 +1,47 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// 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.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class ClientDisconnectTests: FixtureLoggedTest + { + private readonly IISTestSiteFixture _fixture; + + public ClientDisconnectTests(IISTestSiteFixture fixture): base(fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task ServerWorksAfterClientDisconnect() + { + using (var connection = _fixture.CreateTestConnection()) + { + var message = "Hello"; + await connection.Send( + "POST /ReadAndWriteSynchronously HTTP/1.1", + $"Content-Length: {100000}", + "Host: localhost", + "Connection: close", + "", + ""); + + await connection.Send(message); + + await connection.Receive( + "HTTP/1.1 200 OK", + ""); + } + + var response = await _fixture.Client.GetAsync("HelloWorld"); + + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("Hello World", responseText); + } + } +} diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 878ab06272..1a905714b8 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -1,8 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; -using System.Collections; using System.Collections.Generic; using System.IO; using System.Linq; @@ -14,10 +12,8 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { - public class Helpers + public static class Helpers { - public static TimeSpan DefaultTimeout = TimeSpan.FromSeconds(3); - public static string GetTestWebSitePath(string name) { return Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"),"test", "WebSites", name); diff --git a/test/Common.Tests/Common.Tests.csproj b/test/Common.Tests/Common.Tests.csproj new file mode 100644 index 0000000000..50b978f517 --- /dev/null +++ b/test/Common.Tests/Common.Tests.csproj @@ -0,0 +1,23 @@ + + + + netcoreapp2.2 + + + + + + + + + + + + + + + + + + + diff --git a/test/Common.FunctionalTests/Utilities/LoggingHandler.cs b/test/Common.Tests/Utilities/LoggingHandler.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/LoggingHandler.cs rename to test/Common.Tests/Utilities/LoggingHandler.cs diff --git a/test/Common.FunctionalTests/Utilities/RetryHandler.cs b/test/Common.Tests/Utilities/RetryHandler.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/RetryHandler.cs rename to test/Common.Tests/Utilities/RetryHandler.cs diff --git a/test/Common.FunctionalTests/Utilities/TestConnections.cs b/test/Common.Tests/Utilities/TestConnections.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/TestConnections.cs rename to test/Common.Tests/Utilities/TestConnections.cs diff --git a/test/Common.Tests/Utilities/TimeoutExtensions.cs b/test/Common.Tests/Utilities/TimeoutExtensions.cs new file mode 100644 index 0000000000..c2d5192dbe --- /dev/null +++ b/test/Common.Tests/Utilities/TimeoutExtensions.cs @@ -0,0 +1,21 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Runtime.CompilerServices; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + + public static class TimeoutExtensions + { + public static TimeSpan DefaultTimeout = TimeSpan.FromSeconds(300); + + public static Task TimeoutAfterDefault(this Task task, [CallerFilePath] string filePath = null, [CallerLineNumber] int lineNumber = -1) + { + return task.TimeoutAfter(DefaultTimeout, filePath, lineNumber); + } + } +} diff --git a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index bbe5ffe049..319a3726b1 100644 --- a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -13,6 +13,7 @@ + False diff --git a/test/Common.FunctionalTests/AppHostConfig/HostableWebCore.config b/test/IIS.Tests/AppHostConfig/HostableWebCore.config similarity index 97% rename from test/Common.FunctionalTests/AppHostConfig/HostableWebCore.config rename to test/IIS.Tests/AppHostConfig/HostableWebCore.config index 1543ebb97c..5e994d2855 100644 --- a/test/Common.FunctionalTests/AppHostConfig/HostableWebCore.config +++ b/test/IIS.Tests/AppHostConfig/HostableWebCore.config @@ -177,8 +177,6 @@ --> - - @@ -193,8 +191,7 @@ - - + diff --git a/test/IIS.Tests/ClientDisconnectTests.cs b/test/IIS.Tests/ClientDisconnectTests.cs new file mode 100644 index 0000000000..3ede262e99 --- /dev/null +++ b/test/IIS.Tests/ClientDisconnectTests.cs @@ -0,0 +1,177 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging.Testing; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [SkipIfHostableWebCoreNotAvailable] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] + public class ClientDisconnectTests : LoggedTest + { + + [ConditionalFact] + public async Task WritesSucceedAfterClientDisconnect() + { + var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var clientDisconnectedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var requestCompletedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + var data = new byte[1024]; + using (var testServer = await TestServer.Create( + async ctx => + { + requestStartedCompletionSource.SetResult(true); + await clientDisconnectedCompletionSource.Task; + for (var i = 0; i < 1000; i++) + { + await ctx.Response.Body.WriteAsync(data); + } + + requestCompletedCompletionSource.SetResult(true); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await requestStartedCompletionSource.Task.TimeoutAfterDefault(); + } + clientDisconnectedCompletionSource.SetResult(true); + + await requestCompletedCompletionSource.Task.TimeoutAfterDefault(); + } + } + + [ConditionalFact] + public async Task ReadThrowsAfterClientDisconnect() + { + var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var requestCompletedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + Exception exception = null; + + var data = new byte[1024]; + using (var testServer = await TestServer.Create(async ctx => + { + requestStartedCompletionSource.SetResult(true); + try + { + await ctx.Request.Body.ReadAsync(data); + } + catch (Exception e) + { + exception = e; + } + + requestCompletedCompletionSource.SetResult(true); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await requestStartedCompletionSource.Task.TimeoutAfterDefault(); + } + + await requestCompletedCompletionSource.Task.TimeoutAfterDefault(); + } + + Assert.IsType(exception); + Assert.Equal("Native IO operation failed", exception.Message); + } + + [ConditionalFact] + public async Task WriterThrowsCancelledException() + { + var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var requestCompletedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + Exception exception = null; + var cancellationTokenSource = new CancellationTokenSource(); + + var data = new byte[1024]; + using (var testServer = await TestServer.Create(async ctx => + { + requestStartedCompletionSource.SetResult(true); + try + { + while (true) + { + await ctx.Response.Body.WriteAsync(data, cancellationTokenSource.Token); + } + } + catch (Exception e) + { + exception = e; + } + + requestCompletedCompletionSource.SetResult(true); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + + await requestStartedCompletionSource.Task.TimeoutAfterDefault(); + cancellationTokenSource.Cancel(); + await requestCompletedCompletionSource.Task.TimeoutAfterDefault(); + } + + Assert.IsType(exception); + } + } + + [ConditionalFact] + public async Task ReaderThrowsCancelledException() + { + var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var requestCompletedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + Exception exception = null; + var cancellationTokenSource = new CancellationTokenSource(); + + var data = new byte[1024]; + using (var testServer = await TestServer.Create(async ctx => + { + requestStartedCompletionSource.SetResult(true); + try + { + await ctx.Request.Body.ReadAsync(data, cancellationTokenSource.Token); + } + catch (Exception e) + { + exception = e; + } + + requestCompletedCompletionSource.SetResult(true); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await requestStartedCompletionSource.Task.TimeoutAfterDefault(); + cancellationTokenSource.Cancel(); + await requestCompletedCompletionSource.Task.TimeoutAfterDefault(); + } + Assert.IsType(exception); + } + } + + private static async Task SendContentLength1Post(TestConnection connection) + { + await connection.Send( + "POST / HTTP/1.1", + "Content-Length: 1", + "Host: localhost", + "Connection: close", + "", + ""); + } + } +} diff --git a/test/IIS.Tests/IIS.Tests.csproj b/test/IIS.Tests/IIS.Tests.csproj new file mode 100644 index 0000000000..1037d93c25 --- /dev/null +++ b/test/IIS.Tests/IIS.Tests.csproj @@ -0,0 +1,36 @@ + + + + netcoreapp2.2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/IISExpress.FunctionalTests/InProcess/TestServerTest.cs b/test/IIS.Tests/TestServerTest.cs similarity index 72% rename from test/IISExpress.FunctionalTests/InProcess/TestServerTest.cs rename to test/IIS.Tests/TestServerTest.cs index a9a7b89fe7..c168af99d8 100644 --- a/test/IISExpress.FunctionalTests/InProcess/TestServerTest.cs +++ b/test/IIS.Tests/TestServerTest.cs @@ -2,31 +2,26 @@ // 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.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging.Testing; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { - [SkipIfHostableWebCoreNotAvailible] - public class TestServerTest: LoggedTest + [SkipIfHostableWebCoreNotAvailable] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] + public class TestServerTest : LoggedTest { - public TestServerTest(ITestOutputHelper output = null) : base(output) - { - } - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] public async Task SingleProcessTestServer_HelloWorld() { var helloWorld = "Hello World"; var expectedPath = "/Path"; string path = null; - using (var testServer = await TestServer.Create(ctx => { + using (var testServer = await TestServer.Create(ctx => + { path = ctx.Request.Path.ToString(); return ctx.Response.WriteAsync(helloWorld); }, LoggerFactory)) diff --git a/test/Common.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs b/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs similarity index 82% rename from test/Common.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs rename to test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs index b21a087321..b63743f106 100644 --- a/test/Common.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs +++ b/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs @@ -8,10 +8,10 @@ using Microsoft.AspNetCore.Testing.xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] - public sealed class SkipIfHostableWebCoreNotAvailibleAttribute : Attribute, ITestCondition + public sealed class SkipIfHostableWebCoreNotAvailableAttribute : Attribute, ITestCondition { public bool IsMet { get; } = File.Exists(TestServer.HostableWebCoreLocation); - public string SkipReason { get; } = $"Hostable Web Core not availible, {TestServer.HostableWebCoreLocation} not found."; + public string SkipReason { get; } = $"Hostable Web Core not available, {TestServer.HostableWebCoreLocation} not found."; } } diff --git a/test/Common.FunctionalTests/Utilities/TestServer.cs b/test/IIS.Tests/Utilities/TestServer.cs similarity index 80% rename from test/Common.FunctionalTests/Utilities/TestServer.cs rename to test/IIS.Tests/Utilities/TestServer.cs index 5eaaaf3440..c64fe4fbe9 100644 --- a/test/Common.FunctionalTests/Utilities/TestServer.cs +++ b/test/IIS.Tests/Utilities/TestServer.cs @@ -6,8 +6,11 @@ using System.IO; using System.Net.Http; using System.Reflection; using System.Runtime.InteropServices; +using System.Runtime.Loader; using System.Threading; using System.Threading.Tasks; +using System.Xml.Linq; +using System.Xml.XPath; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; @@ -24,6 +27,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private const string HWebCoreDll = "hwebcore.dll"; internal static string HostableWebCoreLocation => Environment.ExpandEnvironmentVariables($@"%windir%\system32\inetsrv\{HWebCoreDll}"); + internal static string BasePath => Path.GetDirectoryName(new Uri(typeof(TestServer).Assembly.CodeBase).AbsolutePath); + internal static string InProcessHandlerLocation => Path.Combine(BasePath, InProcessHandlerDll); + + internal static string AspNetCoreModuleLocation => Path.Combine(BasePath, AspNetCoreModuleDll); private static readonly SemaphoreSlim WebCoreLock = new SemaphoreSlim(1, 1); @@ -35,14 +42,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private readonly Action _appBuilder; private readonly ILoggerFactory _loggerFactory; + private readonly hostfxr_main_fn _hostfxrMainFn; public HttpClient HttpClient { get; } public TestConnection CreateConnection() => new TestConnection(BasePort); private IWebHost _host; + private string _appHostConfigPath; + private TestServer(Action appBuilder, ILoggerFactory loggerFactory) { + _hostfxrMainFn = Main; _appBuilder = appBuilder; _loggerFactory = loggerFactory; @@ -57,7 +68,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await WebCoreLock.WaitAsync(); var server = new TestServer(appBuilder, loggerFactory); server.Start(); - await server.HttpClient.GetAsync("/start"); + (await server.HttpClient.GetAsync("/start")).EnsureSuccessStatusCode(); await server._startedTaskCompletionSource.Task; return server; } @@ -70,11 +81,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private void Start() { LoadLibrary(HostableWebCoreLocation); - LoadLibrary(InProcessHandlerDll); - LoadLibrary(AspNetCoreModuleDll); + _appHostConfigPath = Path.GetTempFileName(); - set_main_handler(Main); - var startResult = WebCoreActivate(Path.GetFullPath("HostableWebCore.config"), null, "Instance"); + var webHostConfig = XDocument.Load(Path.GetFullPath("HostableWebCore.config")); + webHostConfig.XPathSelectElement("/configuration/system.webServer/globalModules/add[@name='AspNetCoreModuleV2']") + .SetAttributeValue("image", AspNetCoreModuleLocation); + webHostConfig.Save(_appHostConfigPath); + + set_main_handler(_hostfxrMainFn); + + var startResult = WebCoreActivate(_appHostConfigPath, null, "Instance"); if (startResult != 0) { throw new InvalidOperationException($"Error while running WebCoreActivate: {startResult}"); @@ -87,8 +103,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests .UseIIS() .ConfigureServices(services => { services.AddSingleton(this); - services.AddSingleton(_loggerFactory); - }) + services.AddSingleton(_loggerFactory); + }) .UseSetting(WebHostDefaults.ApplicationKey, typeof(TestServer).GetTypeInfo().Assembly.FullName) .Build(); diff --git a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index c2e7b815f9..cbd3d05b6b 100644 --- a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -12,6 +12,7 @@ + False diff --git a/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs b/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs index 87741af201..b7e850cdb8 100644 --- a/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs @@ -134,7 +134,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess var hostShutdownToken = deploymentResult.DeploymentResult.HostShutdownToken; - Assert.True(hostShutdownToken.WaitHandle.WaitOne(Helpers.DefaultTimeout)); + Assert.True(hostShutdownToken.WaitHandle.WaitOne(TimeoutExtensions.DefaultTimeout)); Assert.True(hostShutdownToken.IsCancellationRequested); } diff --git a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs index d43894a2c3..179c6bd198 100644 --- a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Abstractions; @@ -23,7 +24,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var result = await DeployAsync(parameters); var response = await result.RetryingHttpClient.GetAsync("/Shutdown"); - Assert.True(result.DeploymentResult.HostShutdownToken.WaitHandle.WaitOne(Helpers.DefaultTimeout)); + Assert.True(result.DeploymentResult.HostShutdownToken.WaitHandle.WaitOne(TimeoutExtensions.DefaultTimeout)); } } } From 0634e1183e00350b86e3a3e364252098580dd970 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 17 Jul 2018 21:06:03 -0700 Subject: [PATCH 143/363] React to hosting changes (#1072) --- build/dependencies.props | 2 +- .../DotNetCommands.cs | 73 ------------------- .../TestUriHelper.cs | 58 --------------- 3 files changed, 1 insertion(+), 132 deletions(-) delete mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/DotNetCommands.cs diff --git a/build/dependencies.props b/build/dependencies.props index fb4b95edd2..37cc74caba 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -14,7 +14,7 @@ 2.2.0-preview1-34694 2.2.0-preview1-34694 2.2.0-preview1-34694 - 0.6.0-preview1-34694 + 0.6.0-a-preview1-pk-rem-iis-17083 2.2.0-preview1-34694 2.2.0-preview1-34694 2.2.0-preview1-34694 diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/DotNetCommands.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/DotNetCommands.cs deleted file mode 100644 index aaa7ade405..0000000000 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/DotNetCommands.cs +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Runtime.InteropServices; - -namespace Microsoft.AspNetCore.Server.IntegrationTesting -{ - // Copied from hosting - // TODO: make public while removing IISExpressDeployer - public static class DotNetCommands - { - private const string _dotnetFolderName = ".dotnet"; - - internal static string DotNetHome { get; } = GetDotNetHome(); - - // Compare to https://github.com/aspnet/BuildTools/blob/314c98e4533217a841ff9767bb38e144eb6c93e4/tools/KoreBuild.Console/Commands/CommandContext.cs#L76 - private static string GetDotNetHome() - { - var dotnetHome = Environment.GetEnvironmentVariable("DOTNET_HOME"); - var userProfile = Environment.GetEnvironmentVariable("USERPROFILE"); - var home = Environment.GetEnvironmentVariable("HOME"); - - var result = Path.Combine(Directory.GetCurrentDirectory(), _dotnetFolderName); - if (!string.IsNullOrEmpty(dotnetHome)) - { - result = dotnetHome; - } - else if (!string.IsNullOrEmpty(userProfile)) - { - result = Path.Combine(userProfile, _dotnetFolderName); - } - else if (!string.IsNullOrEmpty(home)) - { - result = home; - } - - return result; - } - - internal static string GetDotNetInstallDir(RuntimeArchitecture arch) - { - var dotnetDir = DotNetHome; - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - dotnetDir = Path.Combine(dotnetDir, arch.ToString()); - } - - return dotnetDir; - } - - public static string GetDotNetExecutable(RuntimeArchitecture arch) - { - var dotnetDir = GetDotNetInstallDir(arch); - - var dotnetFile = "dotnet"; - - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - dotnetFile += ".exe"; - } - - return Path.Combine(dotnetDir, dotnetFile); - } - - internal static bool IsRunningX86OnX64(RuntimeArchitecture arch) - { - return (RuntimeInformation.OSArchitecture == Architecture.X64 || RuntimeInformation.OSArchitecture == Architecture.Arm64) - && arch == RuntimeArchitecture.x86; - } - } -} diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/TestUriHelper.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/TestUriHelper.cs index fe1b351ba4..e69de29bb2 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/TestUriHelper.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/TestUriHelper.cs @@ -1,58 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.AspNetCore.Server.IntegrationTesting.Common -{ - internal static class TestUriHelper - { - internal static Uri BuildTestUri(ServerType serverType, string hint) - { - // Assume status messages are enabled for Kestrel and disabled for all other servers. - var statusMessagesEnabled = (serverType == ServerType.Kestrel); - - return BuildTestUri(serverType, Uri.UriSchemeHttp, hint, statusMessagesEnabled); - } - - internal static Uri BuildTestUri(ServerType serverType, string scheme, string hint, bool statusMessagesEnabled) - { - if (string.IsNullOrEmpty(hint)) - { - if (serverType == ServerType.Kestrel && statusMessagesEnabled) - { - // Most functional tests use this codepath and should directly bind to dynamic port "0" and scrape - // the assigned port from the status message, which should be 100% reliable since the port is bound - // once and never released. Binding to dynamic port "0" on "localhost" (both IPv4 and IPv6) is not - // supported, so the port is only bound on "127.0.0.1" (IPv4). If a test explicitly requires IPv6, - // it should provide a hint URL with "localhost" (IPv4 and IPv6) or "[::1]" (IPv6-only). - return new UriBuilder(scheme, "127.0.0.1", 0).Uri; - } - else - { - // If the server type is not Kestrel, or status messages are disabled, there is no status message - // from which to scrape the assigned port, so the less reliable GetNextPort() must be used. The - // port is bound on "localhost" (both IPv4 and IPv6), since this is supported when using a specific - // (non-zero) port. - return new UriBuilder(scheme, "localhost", TestPortHelper.GetNextPort()).Uri; - } - } - else - { - var uriHint = new Uri(hint); - if (uriHint.Port == 0) - { - // Only a few tests use this codepath, so it's fine to use the less reliable GetNextPort() for simplicity. - // The tests using this codepath will be reviewed to see if they can be changed to directly bind to dynamic - // port "0" on "127.0.0.1" and scrape the assigned port from the status message (the default codepath). - return new UriBuilder(uriHint) { Port = TestPortHelper.GetNextPort() }.Uri; - } - else - { - // If the hint contains a specific port, return it unchanged. - return uriHint; - } - } - } - } -} From 97ebe36b1309871c2767cd72181a10322991a489 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 18 Jul 2018 14:18:42 -0700 Subject: [PATCH 144/363] Disable client disconnect tests (#1076) --- test/IIS.Tests/ClientDisconnectTests.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/IIS.Tests/ClientDisconnectTests.cs b/test/IIS.Tests/ClientDisconnectTests.cs index 3ede262e99..72e7adc5bb 100644 --- a/test/IIS.Tests/ClientDisconnectTests.cs +++ b/test/IIS.Tests/ClientDisconnectTests.cs @@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public class ClientDisconnectTests : LoggedTest { - [ConditionalFact] + [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/1075")] public async Task WritesSucceedAfterClientDisconnect() { var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } - [ConditionalFact] + [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/1075")] public async Task ReadThrowsAfterClientDisconnect() { var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal("Native IO operation failed", exception.Message); } - [ConditionalFact] + [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/1075")] public async Task WriterThrowsCancelledException() { var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -127,7 +127,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } - [ConditionalFact] + [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/1075")] public async Task ReaderThrowsCancelledException() { var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); From 073c6a791dfc53b5423e19fc85afb0fc1691b9f6 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 18 Jul 2018 15:11:03 -0700 Subject: [PATCH 145/363] Merge release/2.2 into master --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 3e5577038a..2d54e68ded 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -14,7 +14,7 @@ 3.0.0-alpha1-10102 3.0.0-alpha1-10102 3.0.0-alpha1-10102 - 0.7.0-alpha1-10102 + 3.0.0-alpha1-10102 3.0.0-alpha1-10102 3.0.0-alpha1-10102 3.0.0-alpha1-10102 From 065daf3d0484bab537e3f76786ef195c21810f5a Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 18 Jul 2018 15:12:13 -0700 Subject: [PATCH 146/363] Revert "Merge release/2.2 into master" This reverts commit 073c6a791dfc53b5423e19fc85afb0fc1691b9f6. --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 2d54e68ded..3e5577038a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -14,7 +14,7 @@ 3.0.0-alpha1-10102 3.0.0-alpha1-10102 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 + 0.7.0-alpha1-10102 3.0.0-alpha1-10102 3.0.0-alpha1-10102 3.0.0-alpha1-10102 From 92e6ed4063dd1b1729837f11596184eee3ed2cdc Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 19 Jul 2018 09:48:44 -0700 Subject: [PATCH 147/363] Temporarily use feature branch of Hosting --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 3e5577038a..a91d88ef23 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -14,7 +14,7 @@ 3.0.0-alpha1-10102 3.0.0-alpha1-10102 3.0.0-alpha1-10102 - 0.7.0-alpha1-10102 + 0.7.0-a-alpha1-hosting-fix-17089 3.0.0-alpha1-10102 3.0.0-alpha1-10102 3.0.0-alpha1-10102 From 89fda83bbd58e9b095bc5cc53193b4b424467ab6 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 19 Jul 2018 11:14:07 -0700 Subject: [PATCH 148/363] Move config operations from helpers to functions on the deployment parameters (#1063) --- build/dependencies.props | 4 +- .../IISDeployer.cs | 18 ++- .../IISDeployerBase.cs | 63 +++++++++ .../IISDeploymentParameterExtensions.cs | 80 ++++++++++++ .../IISDeploymentParameters.cs | 123 ++++++++++++++++++ .../IISExpressDeployer.cs | 36 ++--- .../WebConfigHelpers.cs | 50 ------- .../Inprocess/LoggingTests.cs | 28 ++-- .../Inprocess/StartupExceptionTests.cs | 18 +-- .../OutOfProcess/HelloWorldTest.cs | 3 +- .../Utilities/FunctionalTestsBase.cs | 3 +- .../Utilities/Helpers.cs | 112 +--------------- .../Utilities/IISFunctionalTestBase.cs | 36 ----- .../Utilities/IISTestSiteFixture.cs | 3 +- .../InProcess/AuthenticationTests.cs | 3 +- .../InProcess/StartupTests.cs | 43 +++--- .../OutOfProcess/GlobalVersionTests.cs | 15 +-- .../OutOfProcess/HttpsTest.cs | 13 +- .../OutOfProcess/NtlmAuthentationTest.cs | 8 +- .../OutOfProcess/WindowsAuthTests.cs | 5 +- .../UpgradeFeatureDetectionTests.cs | 5 +- 21 files changed, 375 insertions(+), 294 deletions(-) create mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs create mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs create mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs delete mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs diff --git a/build/dependencies.props b/build/dependencies.props index 37cc74caba..f4a8fd8eff 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) @@ -14,7 +14,7 @@ 2.2.0-preview1-34694 2.2.0-preview1-34694 2.2.0-preview1-34694 - 0.6.0-a-preview1-pk-rem-iis-17083 + 0.6.0-a-preview1-DeploymentParameters-17085 2.2.0-preview1-34694 2.2.0-preview1-34694 2.2.0-preview1-34694 diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index f1f4922e88..bb126a7fa5 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -2,10 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; -using System.Linq; using System.Threading; using System.Threading.Tasks; -using System.Xml.Linq; using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.Extensions.Logging; @@ -14,12 +12,17 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS /// /// Deployer for IIS. /// - public partial class IISDeployer : ApplicationDeployer + public partial class IISDeployer : IISDeployerBase { private IISApplication _application; private CancellationTokenSource _hostShutdownToken = new CancellationTokenSource(); public IISDeployer(DeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) + : base(new IISDeploymentParameters(deploymentParameters), loggerFactory) + { + } + + public IISDeployer(IISDeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) : base(deploymentParameters, loggerFactory) { } @@ -53,18 +56,19 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS DeploymentParameters.ServerConfigTemplateContent = File.ReadAllText("IIS.config"); } - _application = new IISApplication(DeploymentParameters, Logger); + _application = new IISApplication(IISDeploymentParameters, Logger); // For now, only support using published output DeploymentParameters.PublishApplicationBeforeDeployment = true; + if (DeploymentParameters.PublishApplicationBeforeDeployment) { DotnetPublish(); contentRoot = DeploymentParameters.PublishedApplicationRootPath; + IISDeploymentParameters.AddDebugLogToWebConfig(Path.Combine(contentRoot, $"{_application.WebSiteName}.txt")); + RunWebConfigActions(); } - WebConfigHelpers.AddDebugLogToWebConfig(contentRoot, Path.Combine(contentRoot, $"{_application.WebSiteName}.txt")); - var uri = TestUriHelper.BuildTestUri(ServerType.IIS, DeploymentParameters.ApplicationBaseUriHint); // To prevent modifying the IIS setup concurrently. await _application.StartIIS(uri, contentRoot); @@ -74,7 +78,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS return new DeploymentResult( LoggerFactory, - DeploymentParameters, + IISDeploymentParameters, applicationBaseUri: uri.ToString(), contentRoot: contentRoot, hostShutdownToken: _hostShutdownToken.Token diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs new file mode 100644 index 0000000000..85e329b824 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs @@ -0,0 +1,63 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.Extensions.Logging; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS +{ + public abstract class IISDeployerBase : ApplicationDeployer + { + public IISDeploymentParameters IISDeploymentParameters { get; } + + public IISDeployerBase(IISDeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) + : base(deploymentParameters, loggerFactory) + { + IISDeploymentParameters = deploymentParameters; + } + + public void RunWebConfigActions() + { + if (IISDeploymentParameters == null) + { + return; + } + + if (!DeploymentParameters.PublishApplicationBeforeDeployment) + { + throw new InvalidOperationException("Cannot modify web.config file if no published output."); + } + + var path = Path.Combine(DeploymentParameters.PublishedApplicationRootPath, "web.config"); + var webconfig = XDocument.Load(path); + var xElement = webconfig.Descendants("system.webServer").Single(); + foreach (var action in IISDeploymentParameters.WebConfigActionList) + { + action.Invoke(xElement); + } + + webconfig.Save(path); + } + + public string RunServerConfigActions(string serverConfigString) + { + if (IISDeploymentParameters == null) + { + return serverConfigString; + } + + var serverConfig = XDocument.Parse(serverConfigString); + var xElement = serverConfig.Descendants("configuration").FirstOrDefault(); + + foreach (var action in IISDeploymentParameters.ServerConfigActionList) + { + action.Invoke(xElement); + } + return xElement.ToString(); + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs new file mode 100644 index 0000000000..fb154aeefb --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs @@ -0,0 +1,80 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS +{ + public static class IISDeploymentParameterExtensions + { + public static void AddDebugLogToWebConfig(this IISDeploymentParameters parameters, string filename) + { + parameters.HandlerSettings["debugLevel"] = "4"; + parameters.HandlerSettings["debugFile"] = filename; + } + + public static void AddServerConfigAction(this IISDeploymentParameters parameters, Action action) + { + parameters.ServerConfigActionList.Add(action); + } + + public static void ModifyWebConfig(this IISDeploymentParameters parameters, Action transform) + { + parameters.WebConfigActionList.Add(transform); + } + + public static void ModifyAspNetCoreSectionInWebConfig(this IISDeploymentParameters parameters, string key, string value) + => ModifyAttributeInWebConfig(parameters, key, value, section: "aspNetCore"); + + + public static void ModifyAttributeInWebConfig(this IISDeploymentParameters parameters, string key, string value, string section) + { + parameters.WebConfigActionList.Add((element) => + { + element.Descendants(section).SingleOrDefault().SetAttributeValue(key, value); + }); + } + + public static void AddHttpsToServerConfig(this IISDeploymentParameters parameters) + { + parameters.ServerConfigActionList.Add( + element => + { + element.Descendants("binding") + .Single() + .SetAttributeValue("protocol", "https"); + + element.Descendants("access") + .Single() + .SetAttributeValue("sslFlags", "Ssl, SslNegotiateCert"); + }); + } + + public static void AddWindowsAuthToServerConfig(this IISDeploymentParameters parameters) + { + parameters.ServerConfigActionList.Add( + element => + { + element.Descendants("windowsAuthentication") + .Single() + .SetAttributeValue("enabled", "true"); + }); + } + + public static void ModifyHandlerSectionInWebConfig(this IISDeploymentParameters parameters, string key, string value) + { + parameters.WebConfigActionList.Add(element => + { + element.Descendants("handlers") + .FirstOrDefault() + .Descendants("add") + .FirstOrDefault() + .SetAttributeValue(key, value); + }); + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs new file mode 100644 index 0000000000..9459fd7814 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs @@ -0,0 +1,123 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Xml.Linq; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS +{ + public class IISDeploymentParameters : DeploymentParameters + { + public IISDeploymentParameters() : base() + { + WebConfigActionList = CreateDefaultWebConfigActionList(); + } + + public IISDeploymentParameters(TestVariant variant) + : base(variant) + { + WebConfigActionList = CreateDefaultWebConfigActionList(); + } + + public IISDeploymentParameters( + string applicationPath, + ServerType serverType, + RuntimeFlavor runtimeFlavor, + RuntimeArchitecture runtimeArchitecture) + : base(applicationPath, serverType, runtimeFlavor, runtimeArchitecture) + { + WebConfigActionList = CreateDefaultWebConfigActionList(); + } + + public IISDeploymentParameters(DeploymentParameters parameters) + : base(parameters) + { + WebConfigActionList = CreateDefaultWebConfigActionList(); + + if (parameters is IISDeploymentParameters) + { + var tempParameters = (IISDeploymentParameters)parameters; + WebConfigActionList = tempParameters.WebConfigActionList; + ServerConfigActionList = tempParameters.ServerConfigActionList; + WebConfigBasedEnvironmentVariables = tempParameters.WebConfigBasedEnvironmentVariables; + HandlerSettings = tempParameters.HandlerSettings; + } + } + + private IList> CreateDefaultWebConfigActionList() + { + return new List>() { AddWebConfigEnvironmentVariables(), AddHandlerSettings() }; + } + + public IList> WebConfigActionList { get; } + + public IList> ServerConfigActionList { get; } = new List>(); + + public IDictionary WebConfigBasedEnvironmentVariables { get; set; } = new Dictionary(); + + public IDictionary HandlerSettings { get; set; } = new Dictionary(); + + private Action AddWebConfigEnvironmentVariables() + { + return xElement => + { + if (WebConfigBasedEnvironmentVariables.Count == 0) + { + return; + } + + var element = xElement.Descendants("environmentVariables").SingleOrDefault(); + if (element == null) + { + element = new XElement("environmentVariables"); + xElement.Descendants("aspNetCore").SingleOrDefault().Add(element); + } + + foreach (var envVar in WebConfigBasedEnvironmentVariables) + { + CreateOrSetElement(element, envVar.Key, envVar.Value, "environmentVariable"); + } + }; + } + + private Action AddHandlerSettings() + { + return xElement => + { + if (HandlerSettings.Count == 0) + { + return; + } + + var element = xElement.Descendants("handlerSettings").SingleOrDefault(); + if (element == null) + { + element = new XElement("handlerSettings"); + xElement.Descendants("aspNetCore").SingleOrDefault().Add(element); + } + + foreach (var handlerSetting in HandlerSettings) + { + CreateOrSetElement(element, handlerSetting.Key, handlerSetting.Value, "handlerSetting"); + } + }; + } + + private static void CreateOrSetElement(XElement rootElement, string name, string value, string elementName) + { + if (rootElement.Descendants() + .Attributes() + .Where(attribute => attribute.Value == name) + .Any()) + { + return; + } + var element = new XElement(elementName); + element.SetAttributeValue("name", name); + element.SetAttributeValue("value", value); + rootElement.Add(element); + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index 0cd67cc132..ecdd536db5 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS /// /// Deployment helper for IISExpress. /// - public class IISExpressDeployer : ApplicationDeployer + public class IISExpressDeployer : IISDeployerBase { private const string IISExpressRunningMessage = "IIS Express is running."; private const string FailedToInitializeBindingsMessage = "Failed to initialize site bindings"; @@ -31,6 +31,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS private Process _hostProcess; public IISExpressDeployer(DeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) + : base(new IISDeploymentParameters(deploymentParameters), loggerFactory) + { + } + + public IISExpressDeployer(IISDeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) : base(deploymentParameters, loggerFactory) { } @@ -94,7 +99,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS // Right now this works only for urls like http://localhost:5001/. Does not work for http://localhost:5001/subpath. return new DeploymentResult( LoggerFactory, - DeploymentParameters, + IISDeploymentParameters, applicationBaseUri: actualUri.ToString(), contentRoot: contentRoot, hostShutdownToken: hostExitToken); @@ -272,11 +277,12 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS if (DeploymentParameters.PublishApplicationBeforeDeployment) { // For published apps, prefer the content in the web.config, but update it. - ModifyAspNetCoreSectionInWebConfig(key: "hostingModel", + IISDeploymentParameters.ModifyAspNetCoreSectionInWebConfig(key: "hostingModel", value: DeploymentParameters.HostingModel == HostingModel.InProcess ? "inprocess" : ""); - ModifyHandlerSectionInWebConfig(key: "modules", value: DeploymentParameters.AncmVersion.ToString()); + IISDeploymentParameters.ModifyHandlerSectionInWebConfig(key: "modules", value: DeploymentParameters.AncmVersion.ToString()); ModifyDotNetExePathInWebConfig(); serverConfig = RemoveRedundantElements(serverConfig); + RunWebConfigActions(); } else { @@ -284,6 +290,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS serverConfig = ReplacePlaceholder(serverConfig, "[HostingModel]", DeploymentParameters.HostingModel.ToString()); serverConfig = ReplacePlaceholder(serverConfig, "[AspNetCoreModule]", DeploymentParameters.AncmVersion.ToString()); } + serverConfig = RunServerConfigActions(serverConfig); DeploymentParameters.ServerConfigLocation = Path.GetTempFileName(); Logger.LogDebug("Saving Config to {configPath}", DeploymentParameters.ServerConfigLocation); @@ -394,29 +401,10 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { throw new Exception($"Unable to find '{executableName}'.'"); } - ModifyAspNetCoreSectionInWebConfig("processPath", executableName); + IISDeploymentParameters.ModifyAspNetCoreSectionInWebConfig("processPath", executableName); } } - // Transforms the web.config file to set attributes like hostingModel="inprocess" element - private void ModifyAspNetCoreSectionInWebConfig(string key, string value) - { - var webConfigFile = Path.Combine(DeploymentParameters.PublishedApplicationRootPath, "web.config"); - var config = XDocument.Load(webConfigFile); - var element = config.Descendants("aspNetCore").FirstOrDefault(); - element.SetAttributeValue(key, value); - config.Save(webConfigFile); - } - - private void ModifyHandlerSectionInWebConfig(string key, string value) - { - var webConfigFile = Path.Combine(DeploymentParameters.PublishedApplicationRootPath, "web.config"); - var config = XDocument.Load(webConfigFile); - var element = config.Descendants("handlers").FirstOrDefault().Descendants("add").FirstOrDefault(); - element.SetAttributeValue(key, value); - config.Save(webConfigFile); - } - // These elements are duplicated in the web.config if you publish. Remove them from the host.config. private string RemoveRedundantElements(string serverConfig) { diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs deleted file mode 100644 index e5c13225b5..0000000000 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Testing; - -namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS -{ - public class WebConfigHelpers - { - public static void AddDebugLogToWebConfig(string contentRoot, string filename) - { - var path = Path.Combine(contentRoot, "web.config"); - var webconfig = XDocument.Load(path); - var xElement = webconfig.Descendants("aspNetCore").Single(); - - var element = xElement.Descendants("handlerSettings").SingleOrDefault(); - if (element == null) - { - element = new XElement("handlerSettings"); - xElement.Add(element); - } - - CreateOrSetElement(element, "debugLevel", "4"); - - CreateOrSetElement(element, "debugFile", Path.Combine(contentRoot, filename)); - - webconfig.Save(path); - } - - private static void CreateOrSetElement(XElement rootElement, string name, string value) - { - if (rootElement.Descendants() - .Attributes() - .Where(attribute => attribute.Value == name) - .Any()) - { - return; - } - var element = new XElement("handlerSetting"); - element.SetAttributeValue("name", name); - element.SetAttributeValue("value", value); - rootElement.Add(element); - } - } -} diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index 6384fd508e..2b0b0c9ada 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -21,17 +21,17 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [InlineData("CheckLogFile")] public async Task CheckStdoutLoggingToFile(string path) { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(); - deploymentParameters.PublishApplicationBeforeDeployment = true; + var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + + deploymentParameters.ModifyAspNetCoreSectionInWebConfig("stdoutLogEnabled", "true"); + + var pathToLogs = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); + deploymentParameters.ModifyAspNetCoreSectionInWebConfig("stdoutLogFile", Path.Combine(pathToLogs, "std")); var deploymentResult = await DeployAsync(deploymentParameters); - var pathToLogs = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); try { - Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogEnabled", "true"); - Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogFile", Path.Combine(pathToLogs, "std")); - await Helpers.AssertStarts(deploymentResult, path); StopServer(); @@ -63,10 +63,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + deploymentParameters.ModifyAspNetCoreSectionInWebConfig("stdoutLogEnabled", "true"); + deploymentParameters.ModifyAspNetCoreSectionInWebConfig("stdoutLogFile", Path.Combine("Q:", "std")); + var deploymentResult = await DeployAsync(deploymentParameters); - Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogEnabled", "true"); - Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "stdoutLogFile", Path.Combine("Q:", "std")); await Helpers.AssertStarts(deploymentResult, "HelloWorld"); } @@ -80,11 +81,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"] = tempFile; + deploymentParameters.AddDebugLogToWebConfig(tempFile); var deploymentResult = await DeployAsync(deploymentParameters); - Helpers.AddDebugLogToWebConfig(deploymentResult.DeploymentResult.ContentRoot, tempFile); - var response = await deploymentResult.RetryingHttpClient.GetAsync("/"); StopServer(); @@ -123,11 +123,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CheckStdoutLoggingToPipeWithFirstWrite(string path) { var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); - - var deploymentResult = await DeployAsync(deploymentParameters); var firstWriteString = path + path; - Helpers.ModifyEnvironmentVariableCollectionInWebConfig(deploymentResult, "ASPNETCORE_INPROCESS_INITIAL_WRITE", firstWriteString); + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_INITIAL_WRITE"] = firstWriteString; + + var deploymentResult = await DeployAsync(deploymentParameters); await Helpers.AssertStarts(deploymentResult, path); @@ -152,9 +152,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"] = firstTempFile; + deploymentParameters.AddDebugLogToWebConfig(secondTempFile); var deploymentResult = await DeployAsync(deploymentParameters); - WebConfigHelpers.AddDebugLogToWebConfig(deploymentParameters.PublishedApplicationRootPath, secondTempFile); var response = await deploymentResult.RetryingHttpClient.GetAsync("/"); diff --git a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs index 667c47327c..40d5247e01 100644 --- a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; @@ -25,15 +26,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite", publish: true); var randomNumberString = new Random(Guid.NewGuid().GetHashCode()).Next(10000000).ToString(); - - var environmentVariablesInWebConfig = new Dictionary - { - ["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path, - ["ASPNETCORE_INPROCESS_RANDOM_VALUE"] = randomNumberString - }; + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_RANDOM_VALUE"] = randomNumberString; var deploymentResult = await DeployAsync(deploymentParameters); - Helpers.AddEnvironmentVariablesToWebConfig(deploymentResult.DeploymentResult.ContentRoot, environmentVariablesInWebConfig); var response = await deploymentResult.RetryingHttpClient.GetAsync(path); @@ -52,16 +48,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CheckStdoutWithLargeWrites(string path) { var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite", publish: true); - - var environmentVariablesInWebConfig = new Dictionary - { - ["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path - }; + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; var deploymentResult = await DeployAsync(deploymentParameters); - Helpers.AddEnvironmentVariablesToWebConfig(deploymentResult.DeploymentResult.ContentRoot, environmentVariablesInWebConfig); - var response = await deploymentResult.RetryingHttpClient.GetAsync(path); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); diff --git a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 876b8e010f..8ae0c7dc89 100644 --- a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -5,6 +5,7 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Abstractions; @@ -29,7 +30,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { // The default in hosting sets windows auth to true. // Set it to the IISExpress.config file - var deploymentParameters = new DeploymentParameters(variant) + var deploymentParameters = new IISDeploymentParameters(variant) { ApplicationPath = Helpers.GetOutOfProcessTestSitesPath() }; diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index 4827fcaecc..ed493f79ef 100644 --- a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -3,6 +3,7 @@ using System.IO; using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.Logging.Testing; using Xunit.Abstractions; @@ -18,7 +19,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting private ApplicationDeployer _deployer; - protected virtual async Task DeployAsync(DeploymentParameters parameters) + protected virtual async Task DeployAsync(IISDeploymentParameters parameters) { if (!parameters.EnvironmentVariables.ContainsKey(DebugEnvironmentVariable)) { diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 1a905714b8..f4348514d1 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -1,12 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; using System.Xml.Linq; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing; using Xunit; @@ -22,117 +24,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string GetInProcessTestSitesPath() => GetTestWebSitePath("InProcessWebSite"); public static string GetOutOfProcessTestSitesPath() => GetTestWebSitePath("OutOfProcessWebSite"); - - public static void ModifyAspNetCoreSectionInWebConfig(IISDeploymentResult deploymentResult, string key, string value) - => ModifyAttributeInWebConfig(deploymentResult, key, value, section: "aspNetCore"); - - public static void ModifyAttributeInWebConfig(IISDeploymentResult deploymentResult, string key, string value, string section) - { - var webConfigFile = GetWebConfigFile(deploymentResult); - var config = XDocument.Load(webConfigFile); - - var element = config.Descendants(section).Single(); - element.SetAttributeValue(key, value); - - config.Save(webConfigFile); - } - - public static void ModifyEnvironmentVariableCollectionInWebConfig(IISDeploymentResult deploymentResult, string key, string value) - { - var webConfigFile = GetWebConfigFile(deploymentResult); - var config = XDocument.Load(webConfigFile); - - var envVarElement = new XElement("environmentVariable"); - envVarElement.SetAttributeValue("name", key); - envVarElement.SetAttributeValue("value", value); - - config.Descendants("aspNetCore").Single() - .Descendants("environmentVariables").Single() - .Add(envVarElement); - - config.Save(webConfigFile); - } - - public static void ModifyHandlerSectionInWebConfig(IISDeploymentResult deploymentResult, string handlerVersionValue) - { - var webConfigFile = GetWebConfigFile(deploymentResult); - var config = XDocument.Load(webConfigFile); - - var handlerVersionElement = new XElement("handlerSetting"); - handlerVersionElement.SetAttributeValue("name", "handlerVersion"); - handlerVersionElement.SetAttributeValue("value", handlerVersionValue); - - config.Descendants("aspNetCore").Single() - .Add(new XElement("handlerSettings", handlerVersionElement)); - - config.Save(webConfigFile); - } - - public static void AddDebugLogToWebConfig(string contentRoot, string filename) - { - var path = Path.Combine(contentRoot, "web.config"); - var webconfig = XDocument.Load(path); - var xElement = webconfig.Descendants("aspNetCore").Single(); - - var element = xElement.Descendants("handlerSettings").SingleOrDefault(); - if (element == null) - { - element = new XElement("handlerSettings"); - xElement.Add(element); - } - - CreateOrSetElement(element, "debugLevel", "4", "handlerSetting"); - - CreateOrSetElement(element, "debugFile", Path.Combine(contentRoot, filename), "handlerSetting"); - - webconfig.Save(path); - } - - public static void AddEnvironmentVariablesToWebConfig(string contentRoot, IDictionary environmentVariables) - { - var path = Path.Combine(contentRoot, "web.config"); - var webconfig = XDocument.Load(path); - var xElement = webconfig.Descendants("aspNetCore").Single(); - - var element = xElement.Descendants("environmentVariables").SingleOrDefault(); - if (element == null) - { - element = new XElement("environmentVariables"); - xElement.Add(element); - } - - foreach (var envVar in environmentVariables) - { - CreateOrSetElement(element, envVar.Key, envVar.Value, "environmentVariable"); - } - - webconfig.Save(path); - } - - public static void CreateOrSetElement(XElement rootElement, string name, string value, string elementName) - { - if (rootElement.Descendants() - .Attributes() - .Where(attribute => attribute.Value == name) - .Any()) - { - return; - } - var element = new XElement(elementName); - element.SetAttributeValue("name", name); - element.SetAttributeValue("value", value); - rootElement.Add(element); - } - + // Defaults to inprocess specific deployment parameters - public static DeploymentParameters GetBaseDeploymentParameters(string site = null, HostingModel hostingModel = HostingModel.InProcess, bool publish = false) + public static IISDeploymentParameters GetBaseDeploymentParameters(string site = null, HostingModel hostingModel = HostingModel.InProcess, bool publish = false) { if (site == null) { site = hostingModel == HostingModel.InProcess ? "InProcessWebSite" : "OutOfProcessWebSite"; } - return new DeploymentParameters(GetTestWebSitePath(site), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + return new IISDeploymentParameters(GetTestWebSitePath(site), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, @@ -142,9 +43,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests }; } - private static string GetWebConfigFile(IISDeploymentResult deploymentResult) - => Path.Combine(deploymentResult.DeploymentResult.ContentRoot, "web.config"); - public static async Task AssertStarts(IISDeploymentResult deploymentResult, string path = "/HelloWorld") { var response = await deploymentResult.RetryingHttpClient.GetAsync(path); diff --git a/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs b/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs index d4c74c551b..a20a5e2e0e 100644 --- a/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs +++ b/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs @@ -1,11 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; -using System.Linq; -using System.Threading.Tasks; -using System.Xml.Linq; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; using Microsoft.AspNetCore.Server.IntegrationTesting; using Xunit.Abstractions; @@ -16,36 +11,5 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities public IISFunctionalTestBase(ITestOutputHelper output = null) : base(output) { } - - protected string GetServerConfig(Action transform) - { - var doc = XDocument.Load(DeployerSelector.ServerType == ServerType.IIS ? "IIS.config" : "IISExpress.config"); - transform?.Invoke(doc.Root); - return doc.ToString(); - } - - protected string GetHttpsServerConfig() - { - return GetServerConfig( - element => { - element.Descendants("binding") - .Single() - .SetAttributeValue("protocol", "https"); - - element.Descendants("access") - .Single() - .SetAttributeValue("sslFlags", "Ssl, SslNegotiateCert"); - }); - } - - protected string GetWindowsAuthConfig() - { - return GetServerConfig( - element => { - element.Descendants("windowsAuthentication") - .Single() - .SetAttributeValue("enabled", "true"); - }); - } } } diff --git a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs index d8fd3342ed..787276a8fa 100644 --- a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Net.Http; using System.Threading; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; @@ -20,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var logging = AssemblyTestLog.ForAssembly(typeof(IISTestSiteFixture).Assembly); - var deploymentParameters = new DeploymentParameters(Helpers.GetInProcessTestSitesPath(), + var deploymentParameters = new IISDeploymentParameters(Helpers.GetInProcessTestSitesPath(), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) diff --git a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs index 31179b1ecf..0281116218 100644 --- a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs @@ -5,6 +5,7 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; @@ -17,7 +18,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task Authentication_InProcess() { var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); - deploymentParameters.ServerConfigTemplateContent = GetWindowsAuthConfig(); + deploymentParameters.AddWindowsAuthToServerConfig(); var deploymentResult = await DeployAsync(deploymentParameters); diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 4de6ceba3d..9c97e78b2f 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -8,6 +8,7 @@ using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Abstractions; @@ -27,8 +28,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { // Point to dotnet installed in user profile. await AssertStarts( - deploymentResult => Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", "%DotnetPath%"), - deploymentParameters => deploymentParameters.EnvironmentVariables["DotnetPath"] = _dotnetLocation); + deploymentParameters => + { + deploymentParameters.EnvironmentVariables["DotnetPath"] = _dotnetLocation; + deploymentParameters.ModifyAspNetCoreSectionInWebConfig("processPath", "%DotnetPath%"); + } + ); } [ConditionalTheory] @@ -38,11 +43,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task InvalidProcessPath_ExpectServerError(string path) { var deploymentParameters = GetBaseDeploymentParameters(); + deploymentParameters.ModifyAspNetCoreSectionInWebConfig("processPath", path); var deploymentResult = await DeployAsync(deploymentParameters); - Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", path); - var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); @@ -54,16 +58,23 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var dotnetLocationWithoutExtension = _dotnetLocation.Substring(0, _dotnetLocation.LastIndexOf(".")); await AssertStarts( - deploymentResult => Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", dotnetLocationWithoutExtension)); + deploymentParameters => + { + deploymentParameters.ModifyAspNetCoreSectionInWebConfig("processPath", dotnetLocationWithoutExtension); + } + ); } [ConditionalFact] public async Task StartsWithDotnetLocationUppercase() { var dotnetLocationWithoutExtension = _dotnetLocation.Substring(0, _dotnetLocation.LastIndexOf(".")).ToUpperInvariant(); - await AssertStarts( - deploymentResult => Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", dotnetLocationWithoutExtension)); + deploymentParameters => + { + deploymentParameters.ModifyAspNetCoreSectionInWebConfig("processPath", dotnetLocationWithoutExtension); + } + ); } [ConditionalTheory] @@ -72,14 +83,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task StartsWithDotnetOnThePath(string path) { await AssertStarts( - deploymentResult => Helpers.ModifyAspNetCoreSectionInWebConfig(deploymentResult, "processPath", path), - deploymentParameters => deploymentParameters.EnvironmentVariables["PATH"] = Path.GetDirectoryName(_dotnetLocation)); + deploymentParameters => + { + deploymentParameters.EnvironmentVariables["PATH"] = Path.GetDirectoryName(_dotnetLocation); + deploymentParameters.ModifyAspNetCoreSectionInWebConfig("processPath", path); + } + ); // Verify that in this scenario where.exe was invoked only once by shim and request handler uses cached value Assert.Equal(1, TestSink.Writes.Count(w => w.Message.Contains("Invoking where.exe to find dotnet.exe"))); } - private async Task AssertStarts(Action postDeploy, Action preDeploy = null) + private async Task AssertStarts(Action preDeploy = null) { var deploymentParameters = GetBaseDeploymentParameters(); @@ -87,8 +102,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - postDeploy?.Invoke(deploymentResult); - var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); var responseText = await response.Content.ReadAsStringAsync(); @@ -105,7 +118,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [MemberData(nameof(TestVariants))] public async Task HelloWorld(TestVariant variant) { - var deploymentParameters = new DeploymentParameters(variant) + var deploymentParameters = new IISDeploymentParameters(variant) { ApplicationPath = Helpers.GetInProcessTestSitesPath(), PublishApplicationBeforeDeployment = true @@ -132,9 +145,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } // Defaults to inprocess specific deployment parameters - public static DeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite") + public static IISDeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite") { - return new DeploymentParameters(Helpers.GetTestWebSitePath(site), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + return new IISDeploymentParameters(Helpers.GetTestWebSitePath(site), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index fd53c0ffbb..84be58247c 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -1,16 +1,15 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.IO; using System.Linq; using System.Threading.Tasks; using System.Xml.Linq; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { @@ -28,7 +27,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); deploymentParameters.PublishApplicationBeforeDeployment = false; - deploymentParameters.ServerConfigTemplateContent = GetServerConfig( + deploymentParameters.AddServerConfigAction( element => { var handlerVersionElement = new XElement("handlerSetting"); @@ -52,11 +51,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task GlobalVersion_NewVersionNumber_Fails(string version) { var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + deploymentParameters.HandlerSettings["handlerVersion"] = version; var deploymentResult = await DeployAsync(deploymentParameters); - Helpers.ModifyHandlerSectionInWebConfig(deploymentResult, version); - var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); Assert.False(response.IsSuccessStatusCode); } @@ -68,11 +66,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); deploymentParameters.AdditionalPublishParameters = $"{_outOfProcessVersionVariable}{version}"; + deploymentParameters.HandlerSettings["handlerVersion"] = version; var deploymentResult = await DeployAsync(deploymentParameters); - Helpers.ModifyHandlerSectionInWebConfig(deploymentResult, version); - var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(_helloWorldResponse, responseText); @@ -140,9 +137,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests AssertLoadedVersion(version); } - private DeploymentParameters GetGlobalVersionBaseDeploymentParameters() + private IISDeploymentParameters GetGlobalVersionBaseDeploymentParameters() { - return new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + return new IISDeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs index 543481ee14..ff9996c851 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.Common; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Abstractions; @@ -33,13 +34,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task HttpsHelloWorld(TestVariant variant) { var port = TestPortHelper.GetNextSSLPort(); - var deploymentParameters = new DeploymentParameters(variant) + var deploymentParameters = new IISDeploymentParameters(variant) { ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), - ApplicationBaseUriHint = $"https://localhost:{port}/", - ServerConfigTemplateContent = GetHttpsServerConfig() + ApplicationBaseUriHint = $"https://localhost:{port}/" }; + deploymentParameters.AddHttpsToServerConfig(); + var deploymentResult = await DeployAsync(deploymentParameters); var handler = new HttpClientHandler @@ -71,13 +73,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private async Task HttpsHelloWorldCerts(TestVariant variant, bool sendClientCert) { var port = TestPortHelper.GetNextSSLPort(); - var deploymentParameters = new DeploymentParameters(variant) + var deploymentParameters = new IISDeploymentParameters(variant) { ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), ApplicationBaseUriHint = $"https://localhost:{port}/", - ServerConfigTemplateContent = GetHttpsServerConfig() }; + deploymentParameters.AddHttpsToServerConfig(); + var deploymentResult = await DeployAsync(deploymentParameters); var handler = new HttpClientHandler diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index 9aab93a56f..437f019f52 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -6,6 +6,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Abstractions; @@ -31,13 +32,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [MemberData(nameof(TestVariants))] public async Task NtlmAuthentication(TestVariant variant) { - var deploymentParameters = new DeploymentParameters(variant) + var deploymentParameters = new IISDeploymentParameters(variant) { ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), - ApplicationBaseUriHint = $"http://localhost:0/", - ServerConfigTemplateContent = GetWindowsAuthConfig() + ApplicationBaseUriHint = $"http://localhost:0/" }; + deploymentParameters.AddWindowsAuthToServerConfig(); + var result = await DeployAsync(deploymentParameters); var response = await result.RetryingHttpClient.GetAsync("/HelloWorld"); diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs index 83d6a8e20a..038f57029d 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs @@ -5,6 +5,7 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Abstractions; @@ -27,11 +28,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [MemberData(nameof(TestVariants))] public async Task WindowsAuthTest(TestVariant variant) { - var deploymentParameters = new DeploymentParameters(variant) + var deploymentParameters = new IISDeploymentParameters(variant) { ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), - ServerConfigTemplateContent = GetWindowsAuthConfig() }; + deploymentParameters.AddWindowsAuthToServerConfig(); // The default in hosting sets windows auth to true. var deploymentResult = await DeployAsync(deploymentParameters); diff --git a/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs b/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs index dc64262d00..316a87f9b3 100644 --- a/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs +++ b/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Abstractions; @@ -59,7 +60,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private async Task UpgradeFeatureDetectionDeployer(bool disableWebSocket, string sitePath, string expected, HostingModel hostingModel) { - var deploymentParameters = new DeploymentParameters(sitePath, DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + var deploymentParameters = new IISDeploymentParameters(sitePath, DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, @@ -71,7 +72,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests if (disableWebSocket) { // For IIS, we need to modify the apphost.config file - deploymentParameters.ServerConfigTemplateContent = GetServerConfig( + deploymentParameters.AddServerConfigAction( element => element.Descendants("webSocket") .Single() .SetAttributeValue("enabled", "false")); From 256aed83699aea838635aed65d1ec45f615e4533 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 19 Jul 2018 23:20:13 -0700 Subject: [PATCH 149/363] Make IISExpress shutdown gracefully. (#1066) --- build/dependencies.props | 48 ++++++------- .../CommonLib/aspnetcore_msg.mc | 7 ++ src/AspNetCoreModuleV2/CommonLib/resources.h | 1 + .../inprocessapplication.cpp | 8 +++ .../ApplicationDeployerFactory.cs | 2 +- .../IISApplication.cs | 11 +-- .../IISDeployer.cs | 6 +- .../IISDeployerBase.cs | 1 + .../IISDeploymentParameters.cs | 4 ++ .../IISDeploymentResult.cs | 57 +++++++++++++++ .../IISExpressDeployer.cs | 71 +++++++++++++++++-- .../LoggingHandler.cs | 2 +- .../RetryHandler.cs | 2 +- .../TestUriHelper.cs | 0 .../Inprocess/EventLogTests.cs | 13 ++++ .../Inprocess/LoggingTests.cs | 1 - .../Utilities/FunctionalTestsBase.cs | 7 +- .../Utilities/IISDeploymentResult.cs | 42 ----------- test/IIS.Tests/Utilities/TestServer.cs | 1 + .../IISExpress.FunctionalTests.csproj | 1 - .../InProcess/AppOfflineTests.cs | 17 ++--- .../InProcess/AuthenticationTests.cs | 2 +- .../InProcess/ShutdownTests.cs | 25 ++++++- .../OutOfProcess/GlobalVersionTests.cs | 4 +- 24 files changed, 235 insertions(+), 98 deletions(-) create mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs rename {test/Common.Tests/Utilities => src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS}/LoggingHandler.cs (96%) rename {test/Common.Tests/Utilities => src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS}/RetryHandler.cs (96%) delete mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/TestUriHelper.cs delete mode 100644 test/Common.FunctionalTests/Utilities/IISDeploymentResult.cs diff --git a/build/dependencies.props b/build/dependencies.props index f4a8fd8eff..f66a72c941 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,36 +5,36 @@ 0.10.13 2.2.0-preview1-17099 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 0.6.0-a-preview1-DeploymentParameters-17085 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 15.6.82 15.6.82 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 + 2.2.0-preview1-34709 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34694 + 2.2.0-preview1-34709 15.6.1 11.1.0 2.0.3 diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc index c15047b235..96172c6e24 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc +++ b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc @@ -224,6 +224,13 @@ Language=English %1 . + +Messageid=1033 +SymbolicName=ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL +Language=English +%1 +. + ; ;#endif // _ASPNETCORE_MODULE_MSG_H_ ; diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index 2956cce581..861619e5b2 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -26,6 +26,7 @@ #define ASPNETCORE_EVENT_SENT_SHUTDOWN_HTTP_REQUEST_MSG L"Sent shutdown HTTP message to process '%d' and received http status '%d'." #define ASPNETCORE_EVENT_APP_SHUTDOWN_FAILURE_MSG L"Failed to gracefully shutdown application '%s'." #define ASPNETCORE_EVENT_LOAD_CLR_FALIURE_MSG L"Application '%s' with physical root '%s' failed to load clr and managed application, ErrorCode = '0x%x." +#define ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL_MSG L"Application '%s' has shutdown." #define ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG L"Only one inprocess application is allowed per IIS application pool. Please assign the application '%s' to a different IIS application pool." #define ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG L"Mixed hosting model is not supported. Application '%s' configured with different hostingModel value '%d' other than the one of running application(s)." #define ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG L"Failed to start application '%s', ErrorCode '0x%x'." diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index baf73ec9c1..b52b08f833 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -126,6 +126,14 @@ Finished: // exit(hr); } + else + { + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_INFORMATION_TYPE, + ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL, + ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL_MSG, + m_pConfig->QueryConfigPath()->QueryStr()); + } } VOID diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs index aaec90971e..8fddbaede6 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs @@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting switch (deploymentParameters.ServerType) { case ServerType.IISExpress: - return new IIS.IISExpressDeployer(deploymentParameters, loggerFactory); + return new IISExpressDeployer(deploymentParameters, loggerFactory); case ServerType.IIS: return new IISDeployer(deploymentParameters, loggerFactory); default: diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs index d0c0bfb153..c1a26d3181 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting /// internal class IISApplication { - private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(5); + private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(10); private static readonly TimeSpan _retryDelay = TimeSpan.FromMilliseconds(200); private readonly ServerManager _serverManager = new ServerManager(); private readonly DeploymentParameters _deploymentParameters; @@ -32,6 +32,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting "config", "applicationhost.config"); + public Process HostProcess { get; set; } + public IISApplication(DeploymentParameters deploymentParameters, ILogger logger) { _deploymentParameters = deploymentParameters; @@ -63,7 +65,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting } AddTemporaryAppHostConfig(); - ConfigureAppPool(contentRoot); + var apppool = ConfigureAppPool(contentRoot); ConfigureSite(contentRoot, port); @@ -76,7 +78,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting _serverManager.CommitChanges(); - await WaitUntilSiteStarted(); + await WaitUntilSiteStarted(apppool); } } @@ -89,7 +91,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting config.Save(webConfigFile); } - private async Task WaitUntilSiteStarted() + private async Task WaitUntilSiteStarted(ApplicationPool appPool) { var sw = Stopwatch.StartNew(); @@ -98,6 +100,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting try { var site = _serverManager.Sites.FirstOrDefault(s => s.Name.Equals(WebSiteName)); + if (site.State == ObjectState.Started) { _logger.LogInformation($"Site {WebSiteName} has started."); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index bb126a7fa5..c093ae3065 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -75,13 +75,13 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS // Warm up time for IIS setup. Logger.LogInformation("Successfully finished IIS application directory setup."); - - return new DeploymentResult( + return new IISDeploymentResult( LoggerFactory, IISDeploymentParameters, applicationBaseUri: uri.ToString(), contentRoot: contentRoot, - hostShutdownToken: _hostShutdownToken.Token + hostShutdownToken: _hostShutdownToken.Token, + hostProcess: _application.HostProcess ); } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs index 85e329b824..04e8448327 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Diagnostics; using System.IO; using System.Linq; using System.Threading.Tasks; diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs index 9459fd7814..a22116d557 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Xml.Linq; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { @@ -43,6 +44,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS ServerConfigActionList = tempParameters.ServerConfigActionList; WebConfigBasedEnvironmentVariables = tempParameters.WebConfigBasedEnvironmentVariables; HandlerSettings = tempParameters.HandlerSettings; + GracefulShutdown = tempParameters.GracefulShutdown; } } @@ -59,6 +61,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS public IDictionary HandlerSettings { get; set; } = new Dictionary(); + public bool GracefulShutdown { get; set; } + private Action AddWebConfigEnvironmentVariables() { return xElement => diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs new file mode 100644 index 0000000000..4a9d881900 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs @@ -0,0 +1,57 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Diagnostics; +using System.Net.Http; +using System.Threading; +using Microsoft.Extensions.Logging; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS +{ + public class IISDeploymentResult : DeploymentResult + { + public ILogger Logger { get; set; } + public Process HostProcess { get; } + + public IISDeploymentResult(ILoggerFactory loggerFactory, + IISDeploymentParameters deploymentParameters, + string applicationBaseUri, + string contentRoot, + CancellationToken hostShutdownToken, + Process hostProcess) + : base(loggerFactory, + deploymentParameters, + applicationBaseUri, + contentRoot, + hostShutdownToken) + { + HostProcess = hostProcess; + Logger = loggerFactory.CreateLogger(deploymentParameters.SiteName); + // SocketsHttpHandler isn't available in netstandard2.0 + RetryingHttpClient = CreateRetryClient(new HttpClientHandler()); + HttpClient = CreateClient(new HttpClientHandler()); + } + + public HttpClient CreateRetryClient(HttpMessageHandler messageHandler) + { + var loggingHandler = new LoggingHandler(messageHandler, Logger); + var retryHandler = new RetryHandler(loggingHandler, Logger); + return new HttpClient(retryHandler) + { + BaseAddress = base.HttpClient.BaseAddress + }; + } + + public HttpClient CreateClient(HttpMessageHandler messageHandler) + { + return new HttpClient(new LoggingHandler(messageHandler, Logger)) + { + BaseAddress = base.HttpClient.BaseAddress + }; + } + + public HttpClient RetryingHttpClient { get; set; } + + public new HttpClient HttpClient { get; set; } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index ecdd536db5..729c5f870f 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -6,6 +6,7 @@ using System.Diagnostics; using System.Globalization; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; @@ -25,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS private const string FailedToInitializeBindingsMessage = "Failed to initialize site bindings"; private const string UnableToStartIISExpressMessage = "Unable to start iisexpress."; private const int MaximumAttempts = 5; - + private readonly TimeSpan ShutdownTimeSpan = TimeSpan.FromSeconds(60); private static readonly Regex UrlDetectorRegex = new Regex(@"^\s*Successfully registered URL ""(?[^""]+)"" for site.*$"); private Process _hostProcess; @@ -97,12 +98,14 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS Logger.LogInformation("Application ready at URL: {appUrl}", actualUri); // Right now this works only for urls like http://localhost:5001/. Does not work for http://localhost:5001/subpath. - return new DeploymentResult( + + return new IISDeploymentResult( LoggerFactory, IISDeploymentParameters, applicationBaseUri: actualUri.ToString(), contentRoot: contentRoot, - hostShutdownToken: hostExitToken); + hostShutdownToken: hostExitToken, + hostProcess: _hostProcess); } } @@ -352,7 +355,14 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { using (Logger.BeginScope("Dispose")) { - ShutDownIfAnyHostProcess(_hostProcess); + if (IISDeploymentParameters.GracefulShutdown) + { + GracefullyShutdownProcess(_hostProcess); + } + else + { + ShutDownIfAnyHostProcess(_hostProcess); + } if (!string.IsNullOrEmpty(DeploymentParameters.ServerConfigLocation) && File.Exists(DeploymentParameters.ServerConfigLocation)) @@ -388,6 +398,59 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } } + private class WindowsNativeMethods + { + [DllImport("user32.dll")] + internal static extern IntPtr GetTopWindow(IntPtr hWnd); + [DllImport("user32.dll")] + internal static extern IntPtr GetWindow(IntPtr hWnd, uint uCmd); + [DllImport("user32.dll")] + internal static extern uint GetWindowThreadProcessId(IntPtr hwnd, out uint lpdwProcessId); + [DllImport("user32.dll")] + internal static extern bool PostMessage(HandleRef hWnd, uint Msg, IntPtr wParam, IntPtr lParam); + } + + private static void SendStopMessageToProcess(int pid) + { + for (var ptr = WindowsNativeMethods.GetTopWindow(IntPtr.Zero); ptr != IntPtr.Zero; ptr = WindowsNativeMethods.GetWindow(ptr, 2)) + { + uint num; + WindowsNativeMethods.GetWindowThreadProcessId(ptr, out num); + if (pid == num) + { + var hWnd = new HandleRef(null, ptr); + WindowsNativeMethods.PostMessage(hWnd, 0x12, IntPtr.Zero, IntPtr.Zero); + return; + } + } + } + + private void GracefullyShutdownProcess(Process hostProcess) + { + if (hostProcess != null && !hostProcess.HasExited) + { + // Calling hostProcess.StandardInput.WriteLine("q") with StandardInput redirected + // for the process does not work when stopping IISExpress + // Also, hostProcess.CloseMainWindow() doesn't work either. + // Instead we have to send WM_QUIT to the iisexpress process via pInvokes. + // See: https://stackoverflow.com/questions/4772092/starting-and-stopping-iis-express-programmatically + + SendStopMessageToProcess(hostProcess.Id); + if (!hostProcess.WaitForExit((int)ShutdownTimeSpan.TotalMilliseconds)) + { + throw new InvalidOperationException($"iisexpress Process {hostProcess.Id} failed to gracefully shutdown."); + } + if (hostProcess.ExitCode != 0) + { + Logger.LogWarning($"IISExpress exit code is non-zero after graceful shutdown. Exit code: {hostProcess.ExitCode}"); + } + } + else + { + throw new InvalidOperationException($"iisexpress Process {hostProcess.Id} crashed before shutdown was triggered."); + } + } + private void ModifyDotNetExePathInWebConfig() { // We assume the x64 dotnet.exe is on the path so we need to provide an absolute path for x86 scenarios. diff --git a/test/Common.Tests/Utilities/LoggingHandler.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs similarity index 96% rename from test/Common.Tests/Utilities/LoggingHandler.cs rename to src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs index 9559d8106c..241991f62d 100644 --- a/test/Common.Tests/Utilities/LoggingHandler.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs @@ -4,7 +4,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.IntegrationTesting +namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { public class LoggingHandler: DelegatingHandler { diff --git a/test/Common.Tests/Utilities/RetryHandler.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs similarity index 96% rename from test/Common.Tests/Utilities/RetryHandler.cs rename to src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs index 00e1174c7a..4282c3afca 100644 --- a/test/Common.Tests/Utilities/RetryHandler.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.IntegrationTesting +namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { public class RetryHandler : DelegatingHandler { diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/TestUriHelper.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/TestUriHelper.cs deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs index 176661189c..67483b0663 100644 --- a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs +++ b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs @@ -20,5 +20,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EventLogHelpers.VerifyEventLogEvent(TestSink, "Application '.+' started the coreclr in-process successfully."); } + + [ConditionalFact] + public async Task CheckShutdownEventLogMessage() + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + deploymentParameters.GracefulShutdown = true; + var deploymentResult = await DeployAsync(deploymentParameters); + await Helpers.AssertStarts(deploymentResult); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvent(TestSink, "Application '.+' has shutdown."); + } } } diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index 2b0b0c9ada..e8e303b429 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -68,7 +68,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - await Helpers.AssertStarts(deploymentResult, "HelloWorld"); } diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index ed493f79ef..d23b7836e5 100644 --- a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting { } - private ApplicationDeployer _deployer; + protected ApplicationDeployer _deployer; protected virtual async Task DeployAsync(IISDeploymentParameters parameters) { @@ -31,11 +31,10 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting parameters.ServerConfigTemplateContent = parameters.ServerConfigTemplateContent ?? File.ReadAllText("IISExpress.config"); } + _deployer = IISApplicationDeployerFactory.Create(parameters, LoggerFactory); - var result = await _deployer.DeployAsync(); - - return new IISDeploymentResult(result, Logger); + return (IISDeploymentResult)await _deployer.DeployAsync(); } public override void Dispose() diff --git a/test/Common.FunctionalTests/Utilities/IISDeploymentResult.cs b/test/Common.FunctionalTests/Utilities/IISDeploymentResult.cs deleted file mode 100644 index 8e39634f2b..0000000000 --- a/test/Common.FunctionalTests/Utilities/IISDeploymentResult.cs +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Net.Http; -using Microsoft.Extensions.Logging; - -namespace Microsoft.AspNetCore.Server.IntegrationTesting -{ - public class IISDeploymentResult - { - public DeploymentResult DeploymentResult { get; } - public ILogger Logger { get; } - - public IISDeploymentResult(DeploymentResult deploymentResult, ILogger logger) - { - DeploymentResult = deploymentResult; - Logger = logger; - - RetryingHttpClient = CreateRetryClient(new SocketsHttpHandler()); - HttpClient = CreateClient(new SocketsHttpHandler()); - } - - public HttpClient CreateRetryClient(HttpMessageHandler messageHandler) - { - return new HttpClient(new RetryHandler(new LoggingHandler(messageHandler, Logger), Logger)) - { - BaseAddress = DeploymentResult.HttpClient.BaseAddress - }; - } - - public HttpClient CreateClient(HttpMessageHandler messageHandler) - { - return new HttpClient(new LoggingHandler(messageHandler, Logger)) - { - BaseAddress = DeploymentResult.HttpClient.BaseAddress - }; - } - - public HttpClient HttpClient { get; set; } - public HttpClient RetryingHttpClient { get; set; } - } -} diff --git a/test/IIS.Tests/Utilities/TestServer.cs b/test/IIS.Tests/Utilities/TestServer.cs index c64fe4fbe9..4adaaff776 100644 --- a/test/IIS.Tests/Utilities/TestServer.cs +++ b/test/IIS.Tests/Utilities/TestServer.cs @@ -15,6 +15,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index cbd3d05b6b..3ae8fcffe8 100644 --- a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -29,7 +29,6 @@ - diff --git a/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs b/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs index b7e850cdb8..265907542f 100644 --- a/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs @@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Xunit; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess { @@ -26,7 +27,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess { var deploymentResult = await DeployApp(hostingModel); - AddAppOffline(deploymentResult.DeploymentResult.ContentRoot); + AddAppOffline(deploymentResult.ContentRoot); await AssertAppOffline(deploymentResult); } @@ -39,7 +40,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess var expectedResponse = "The app is offline."; var deploymentResult = await DeployApp(hostingModel); - AddAppOffline(deploymentResult.DeploymentResult.ContentRoot, expectedResponse); + AddAppOffline(deploymentResult.ContentRoot, expectedResponse); await AssertAppOffline(deploymentResult, expectedResponse); } @@ -49,7 +50,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess { var deploymentResult = await AssertStarts(HostingModel.InProcess); - AddAppOffline(deploymentResult.DeploymentResult.ContentRoot); + AddAppOffline(deploymentResult.ContentRoot); await AssertStopsProcess(deploymentResult); } @@ -62,9 +63,9 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess // Repeat dropping file and restarting multiple times for (int i = 0; i < 5; i++) { - AddAppOffline(deploymentResult.DeploymentResult.ContentRoot); + AddAppOffline(deploymentResult.ContentRoot); await AssertAppOffline(deploymentResult); - RemoveAppOffline(deploymentResult.DeploymentResult.ContentRoot); + RemoveAppOffline(deploymentResult.ContentRoot); await AssertRunning(deploymentResult); } } @@ -76,11 +77,11 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess { var deploymentResult = await DeployApp(hostingModel); - AddAppOffline(deploymentResult.DeploymentResult.ContentRoot); + AddAppOffline(deploymentResult.ContentRoot); await AssertAppOffline(deploymentResult); - RemoveAppOffline(deploymentResult.DeploymentResult.ContentRoot); + RemoveAppOffline(deploymentResult.ContentRoot); await AssertRunning(deploymentResult); } @@ -132,7 +133,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess // dropping app_offline will kill the process } - var hostShutdownToken = deploymentResult.DeploymentResult.HostShutdownToken; + var hostShutdownToken = deploymentResult.HostShutdownToken; Assert.True(hostShutdownToken.WaitHandle.WaitOne(TimeoutExtensions.DefaultTimeout)); Assert.True(hostShutdownToken.IsCancellationRequested); diff --git a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs index 0281116218..5105b753c8 100644 --- a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs @@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); var httpClientHandler = new HttpClientHandler() { UseDefaultCredentials = true }; - var httpClient = deploymentResult.DeploymentResult.CreateHttpClient(httpClientHandler); + var httpClient = deploymentResult.CreateHttpClient(httpClientHandler); response = await httpClient.GetAsync("/AuthenticationAnonymous"); responseText = await response.Content.ReadAsStringAsync(); diff --git a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs index 179c6bd198..b1ab071c5d 100644 --- a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs @@ -24,7 +24,30 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var result = await DeployAsync(parameters); var response = await result.RetryingHttpClient.GetAsync("/Shutdown"); - Assert.True(result.DeploymentResult.HostShutdownToken.WaitHandle.WaitOne(TimeoutExtensions.DefaultTimeout)); + Assert.True(result.HostShutdownToken.WaitHandle.WaitOne(TimeoutExtensions.DefaultTimeout)); + } + + [ConditionalFact] + public async Task GracefulShutdown_DoesNotCrashProcess() + { + var parameters = Helpers.GetBaseDeploymentParameters(publish: true); + parameters.GracefulShutdown = true; + var result = await DeployAsync(parameters); + + var response = await result.RetryingHttpClient.GetAsync("/HelloWorld"); + StopServer(); + Assert.True(result.HostProcess.ExitCode == 0); + } + + [ConditionalFact] + public async Task ForcefulShutdown_DoesrashProcess() + { + var parameters = Helpers.GetBaseDeploymentParameters(publish: true); + var result = await DeployAsync(parameters); + + var response = await result.RetryingHttpClient.GetAsync("/HelloWorld"); + StopServer(); + Assert.True(result.HostProcess.ExitCode == 1); } } } diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index 84be58247c..8ad7a70665 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -152,8 +152,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private string GetANCMRequestHandlerPath(IISDeploymentResult deploymentResult, string version) { - return Path.Combine(deploymentResult.DeploymentResult.ContentRoot, - deploymentResult.DeploymentResult.DeploymentParameters.RuntimeArchitecture.ToString(), + return Path.Combine(deploymentResult.ContentRoot, + deploymentResult.DeploymentParameters.RuntimeArchitecture.ToString(), version, _aspNetCoreDll); } From c3545c18eb6d16431f881461a0e704be9bd9620c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 20 Jul 2018 17:32:57 -0700 Subject: [PATCH 150/363] Add api sets to IntegrationTesting.IIS (#1083) --- build/dependencies.props | 1 + .../Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/build/dependencies.props b/build/dependencies.props index f66a72c941..f529c45beb 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -34,6 +34,7 @@ 2.0.9 2.1.2 2.2.0-preview1-26618-02 + 1.0.1 2.2.0-preview1-34709 15.6.1 11.1.0 diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index 0891a315dc..363de4e34f 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -15,6 +15,7 @@ + From f09c508f7d8f53fc913138adfee4ca3c67c9b2da Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 22 Jul 2018 12:15:38 -0700 Subject: [PATCH 151/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 52 ++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index f529c45beb..665c81f665 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,41 +1,41 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 0.10.13 2.2.0-preview1-17099 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 0.6.0-a-preview1-DeploymentParameters-17085 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 0.6.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 15.6.82 15.6.82 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 - 2.2.0-preview1-34709 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 2.0.9 2.1.2 2.2.0-preview1-26618-02 1.0.1 - 2.2.0-preview1-34709 + 2.2.0-preview1-34755 15.6.1 11.1.0 2.0.3 From 5f12936438f0ef32afd64d7ad8cd3ef37abbd5c8 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 22 Jul 2018 13:01:00 -0700 Subject: [PATCH 152/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 52 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 ++-- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index a91d88ef23..8e4a0a815d 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,37 +4,37 @@ 0.10.13 - 3.0.0-alpha1-10009 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 0.7.0-a-alpha1-hosting-fix-17089 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 + 3.0.0-alpha1-10011 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 0.7.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 15.6.82 15.6.82 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 - 3.0.0-alpha1-10102 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 + 3.0.0-alpha1-10123 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 3.0.0-alpha1-10102 + 3.0.0-alpha1-10123 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index c6adb40215..4cfdfb010e 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-10009 -commithash:86be4707e47d2f1930a982f2b59eacfc4196da33 +version:3.0.0-alpha1-10011 +commithash:717c2eb1f91dafd2580c1a9b8e5064d12dd8c054 From fba4e3ec4e312cdc2308995b9a55196740181fb4 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 23 Jul 2018 08:57:43 -0700 Subject: [PATCH 153/363] Switch to non-experimental filesystem (#1082) --- src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp | 2 +- .../CommonLib/PollingAppOfflineApplication.cpp | 2 +- src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h | 2 +- src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h | 2 +- src/AspNetCoreModuleV2/CommonLib/stdafx.h | 2 +- src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h | 2 +- test/CommonLibTests/stdafx.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp index 396a69ff31..b2c6b69871 100644 --- a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. #include -#include +#include #include "GlobalVersionUtility.h" diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp index 3b07cf8645..dff673fee3 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp @@ -3,7 +3,7 @@ #include "PollingAppOfflineApplication.h" -#include +#include #include "SRWExclusiveLock.h" #include "HandleWrapper.h" diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h index e66f5f46c8..592cdb2dc8 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. #pragma once -#include +#include #include "application.h" #include "requesthandler.h" diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index dfdeb08b3a..1315865803 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include "stringu.h" diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/AspNetCoreModuleV2/CommonLib/stdafx.h index d5407df316..b17ae43485 100644 --- a/src/AspNetCoreModuleV2/CommonLib/stdafx.h +++ b/src/AspNetCoreModuleV2/CommonLib/stdafx.h @@ -14,4 +14,4 @@ #include #include #include -#include +#include diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h b/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h index fd6382710b..78a02ce72b 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include "Shlwapi.h" #include diff --git a/test/CommonLibTests/stdafx.h b/test/CommonLibTests/stdafx.h index 33d3008f40..93dffac456 100644 --- a/test/CommonLibTests/stdafx.h +++ b/test/CommonLibTests/stdafx.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include From 538d76cc200e03ab23b9687e6254998f26c5dfca Mon Sep 17 00:00:00 2001 From: Eilon Lipton Date: Tue, 24 Jul 2018 10:51:19 -0700 Subject: [PATCH 154/363] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 64ff041d5c..eac4268e4c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ Contributing ====== -Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo. +Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) in the Home repo. From 5bd475ef906ba68567be9f7f32439f5118e67bdc Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 24 Jul 2018 13:17:05 -0700 Subject: [PATCH 155/363] Add event logs for some startup failure cases (#1081) --- .../AspNetCore/aspnetcore_shim_config.cpp | 2 ++ .../CommonLib/CommonLib.vcxproj | 1 + .../CommonLib/aspnetcore_msg.mc | 6 ++++ .../CommonLib/hostfxr_utility.cpp | 9 +++-- src/AspNetCoreModuleV2/CommonLib/resources.h | 4 ++- .../IISApplication.cs | 14 -------- .../IISDeployer.cs | 9 +++++ .../IISDeployerBase.cs | 10 ++++++ .../IISDeploymentParameterExtensions.cs | 31 ---------------- .../IISExpressDeployer.cs | 13 ++++--- .../WebConfigHelpers.cs | 35 +++++++++++++++++++ .../Inprocess/EventLogTests.cs | 4 ++- .../Inprocess/LoggingTests.cs | 12 ++++--- .../Inprocess/StartupExceptionTests.cs | 2 -- .../InProcess/StartupTests.cs | 28 ++++++++++++--- 15 files changed, 116 insertions(+), 64 deletions(-) create mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp index a857706142..4cb6b222cf 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp @@ -3,6 +3,7 @@ #include "aspnetcore_shim_config.h" +#include "EventLog.h" #include "config_utility.h" #include "hostfxr_utility.h" #include "ahutil.h" @@ -49,6 +50,7 @@ ASPNETCORE_SHIM_CONFIG::Populate( else { // block unknown hosting value + EVENTLOG(g_hEventLog, UNKNOWN_HOSTING_MODEL_ERROR, strHostingModel.QueryStr()); RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED)); } diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 2be58bcc5c..5ff3e0103f 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -195,6 +195,7 @@ + diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc index 96172c6e24..477c1a0d0a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc +++ b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc @@ -231,6 +231,12 @@ Language=English %1 . +Messageid=1034 +SymbolicName=ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR +Language=English +%1 +. + ; ;#endif // _ASPNETCORE_MODULE_MSG_H_ ; diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index fd3a65abf8..ab827460bf 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -141,7 +141,9 @@ HOSTFXR_UTILITY::GetHostFxrParameters( auto fullProcessPath = GetAbsolutePathToDotnet(applicationPhysicalPath, processPath); if (!fullProcessPath.has_value()) { - return E_FAIL; + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + EVENTLOG(hEventLog, INVALID_PROCESS_PATH, processPath.c_str(), hr); + return hr; } processPath = fullProcessPath.value(); @@ -149,7 +151,8 @@ HOSTFXR_UTILITY::GetHostFxrParameters( auto hostFxrPath = GetAbsolutePathToHostFxr(processPath, hEventLog); if (!hostFxrPath.has_value()) { - return E_FAIL; + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + return hr; } RETURN_IF_FAILED(HOSTFXR_UTILITY::ParseHostfxrArguments( @@ -368,6 +371,8 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( // Only do it if no path is specified if (requestedPath.has_parent_path()) { + WLOG_INFOF(L"Absolute path to dotnet.exe was not found at %s", requestedPath.c_str()); + return std::nullopt; } diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index 861619e5b2..ae26e9777f 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -29,6 +29,8 @@ #define ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL_MSG L"Application '%s' has shutdown." #define ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG L"Only one inprocess application is allowed per IIS application pool. Please assign the application '%s' to a different IIS application pool." #define ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG L"Mixed hosting model is not supported. Application '%s' configured with different hostingModel value '%d' other than the one of running application(s)." +#define ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR_MSG L"Unknown hosting model '%s'. Please specify either hostingModel=\"inprocess\" or hostingModel=\"outofprocess\" in the web.config file." +#define ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR_LEVEL EVENTLOG_ERROR_TYPE #define ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG L"Failed to start application '%s', ErrorCode '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x. Last 4KB characters of captured stdout and stderr logs:\r\n%s" #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x. Please check the stderr logs for more information." @@ -49,7 +51,7 @@ #define ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_MSG L"Could not find application executable in '%s'. ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, ErrorCode = '0x%x. Please check the stderr logs for more information." #define ASPNETCORE_EVENT_INVALID_PROCESS_PATH_LEVEL EVENTLOG_ERROR_TYPE -#define ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG L"Invalid or unknown processPath provided in web.config: processPath = %s, ErrorCode = '0x%x'." +#define ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG L"Invalid or unknown processPath provided in web.config: processPath = '%s', ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application." #define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for out-of-process application. Please confirm the assembly is installed correctly for IIS or IISExpress." #define ASPNETCORE_EVENT_INPROCESS_START_SUCCESS_MSG L"Application '%s' started the coreclr in-process successfully." diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs index c1a26d3181..b83e7aa4df 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs @@ -71,26 +71,12 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting ConfigureAppHostConfig(contentRoot); - if (_deploymentParameters.ApplicationType == ApplicationType.Portable) - { - ModifyAspNetCoreSectionInWebConfig("processPath", DotNetCommands.GetDotNetExecutable(_deploymentParameters.RuntimeArchitecture)); - } - _serverManager.CommitChanges(); await WaitUntilSiteStarted(apppool); } } - private void ModifyAspNetCoreSectionInWebConfig(string key, string value) - { - var webConfigFile = Path.Combine(_deploymentParameters.PublishedApplicationRootPath, "web.config"); - var config = XDocument.Load(webConfigFile); - var element = config.Descendants("aspNetCore").FirstOrDefault(); - element.SetAttributeValue(key, value); - config.Save(webConfigFile); - } - private async Task WaitUntilSiteStarted(ApplicationPool appPool) { var sw = Stopwatch.StartNew(); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index c093ae3065..3f7425fce6 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -61,6 +61,15 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS // For now, only support using published output DeploymentParameters.PublishApplicationBeforeDeployment = true; + + if (DeploymentParameters.ApplicationType == ApplicationType.Portable) + { + DefaultWebConfigActions.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection( + "processPath", + DotNetCommands.GetDotNetExecutable(DeploymentParameters.RuntimeArchitecture))); + } + if (DeploymentParameters.PublishApplicationBeforeDeployment) { DotnetPublish(); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs index 04e8448327..5042a192e3 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; @@ -15,6 +16,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { public IISDeploymentParameters IISDeploymentParameters { get; } + protected List> DefaultWebConfigActions { get; } = new List>(); + public IISDeployerBase(IISDeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) : base(deploymentParameters, loggerFactory) { @@ -36,6 +39,12 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS var path = Path.Combine(DeploymentParameters.PublishedApplicationRootPath, "web.config"); var webconfig = XDocument.Load(path); var xElement = webconfig.Descendants("system.webServer").Single(); + + foreach (var action in DefaultWebConfigActions) + { + action.Invoke(xElement); + } + foreach (var action in IISDeploymentParameters.WebConfigActionList) { action.Invoke(xElement); @@ -44,6 +53,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS webconfig.Save(path); } + public string RunServerConfigActions(string serverConfigString) { if (IISDeploymentParameters == null) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs index fb154aeefb..ff2365a82a 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs @@ -2,8 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections.Generic; -using System.IO; using System.Linq; using System.Xml.Linq; @@ -22,23 +20,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS parameters.ServerConfigActionList.Add(action); } - public static void ModifyWebConfig(this IISDeploymentParameters parameters, Action transform) - { - parameters.WebConfigActionList.Add(transform); - } - - public static void ModifyAspNetCoreSectionInWebConfig(this IISDeploymentParameters parameters, string key, string value) - => ModifyAttributeInWebConfig(parameters, key, value, section: "aspNetCore"); - - - public static void ModifyAttributeInWebConfig(this IISDeploymentParameters parameters, string key, string value, string section) - { - parameters.WebConfigActionList.Add((element) => - { - element.Descendants(section).SingleOrDefault().SetAttributeValue(key, value); - }); - } - public static void AddHttpsToServerConfig(this IISDeploymentParameters parameters) { parameters.ServerConfigActionList.Add( @@ -64,17 +45,5 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS .SetAttributeValue("enabled", "true"); }); } - - public static void ModifyHandlerSectionInWebConfig(this IISDeploymentParameters parameters, string key, string value) - { - parameters.WebConfigActionList.Add(element => - { - element.Descendants("handlers") - .FirstOrDefault() - .Descendants("add") - .FirstOrDefault() - .SetAttributeValue(key, value); - }); - } } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index 729c5f870f..0fea5fa391 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -280,9 +280,13 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS if (DeploymentParameters.PublishApplicationBeforeDeployment) { // For published apps, prefer the content in the web.config, but update it. - IISDeploymentParameters.ModifyAspNetCoreSectionInWebConfig(key: "hostingModel", - value: DeploymentParameters.HostingModel == HostingModel.InProcess ? "inprocess" : ""); - IISDeploymentParameters.ModifyHandlerSectionInWebConfig(key: "modules", value: DeploymentParameters.AncmVersion.ToString()); + DefaultWebConfigActions.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection( + key: "hostingModel", + value: DeploymentParameters.HostingModel == HostingModel.InProcess ? "inprocess" : "")); + + DefaultWebConfigActions.Add(WebConfigHelpers.AddOrModifyHandlerSection( + key: "modules", + value: DeploymentParameters.AncmVersion.ToString())); ModifyDotNetExePathInWebConfig(); serverConfig = RemoveRedundantElements(serverConfig); RunWebConfigActions(); @@ -464,7 +468,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { throw new Exception($"Unable to find '{executableName}'.'"); } - IISDeploymentParameters.ModifyAspNetCoreSectionInWebConfig("processPath", executableName); + DefaultWebConfigActions.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", executableName)); } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs new file mode 100644 index 0000000000..8d2af5eb1d --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs @@ -0,0 +1,35 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Linq; +using System.Xml.Linq; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS +{ + public static class WebConfigHelpers + { + public static Action AddOrModifyAspNetCoreSection(string key, string value) + => AddAction(key, value, section: "aspNetCore"); + + public static Action AddAction(string key, string value, string section) + { + return (element) => + { + element.Descendants(section).SingleOrDefault().SetAttributeValue(key, value); + }; + } + + public static Action AddOrModifyHandlerSection(string key, string value) + { + return element => + { + element.Descendants("handlers") + .FirstOrDefault() + .Descendants("add") + .FirstOrDefault() + .SetAttributeValue(key, value); + }; + } + } +} diff --git a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs index 67483b0663..a2476cea1b 100644 --- a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs +++ b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs @@ -1,4 +1,6 @@ -using System; +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index e8e303b429..eb3294a537 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -23,10 +23,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); - deploymentParameters.ModifyAspNetCoreSectionInWebConfig("stdoutLogEnabled", "true"); + deploymentParameters.WebConfigActionList.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogEnabled", "true")); var pathToLogs = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); - deploymentParameters.ModifyAspNetCoreSectionInWebConfig("stdoutLogFile", Path.Combine(pathToLogs, "std")); + deploymentParameters.WebConfigActionList.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogFile", Path.Combine(pathToLogs, "std"))); var deploymentResult = await DeployAsync(deploymentParameters); @@ -63,8 +65,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); - deploymentParameters.ModifyAspNetCoreSectionInWebConfig("stdoutLogEnabled", "true"); - deploymentParameters.ModifyAspNetCoreSectionInWebConfig("stdoutLogFile", Path.Combine("Q:", "std")); + deploymentParameters.WebConfigActionList.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogEnabled", "true")); + deploymentParameters.WebConfigActionList.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogFile", Path.Combine("Q:", "std"))); var deploymentResult = await DeployAsync(deploymentParameters); diff --git a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs index 40d5247e01..93683b8a78 100644 --- a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -2,11 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections.Generic; using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; -using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 9c97e78b2f..36812d3f2e 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests deploymentParameters => { deploymentParameters.EnvironmentVariables["DotnetPath"] = _dotnetLocation; - deploymentParameters.ModifyAspNetCoreSectionInWebConfig("processPath", "%DotnetPath%"); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", "%DotnetPath%")); } ); } @@ -43,13 +43,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task InvalidProcessPath_ExpectServerError(string path) { var deploymentParameters = GetBaseDeploymentParameters(); - deploymentParameters.ModifyAspNetCoreSectionInWebConfig("processPath", path); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", path)); + var deploymentResult = await DeployAsync(deploymentParameters); var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + EventLogHelpers.VerifyEventLogEvent(TestSink, @"Invalid or unknown processPath provided in web\.config: processPath = '.+', ErrorCode = '0x80070002'\."); } [ConditionalFact] @@ -60,7 +63,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await AssertStarts( deploymentParameters => { - deploymentParameters.ModifyAspNetCoreSectionInWebConfig("processPath", dotnetLocationWithoutExtension); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", dotnetLocationWithoutExtension)); } ); } @@ -72,7 +75,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await AssertStarts( deploymentParameters => { - deploymentParameters.ModifyAspNetCoreSectionInWebConfig("processPath", dotnetLocationWithoutExtension); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", dotnetLocationWithoutExtension)); } ); } @@ -86,7 +89,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests deploymentParameters => { deploymentParameters.EnvironmentVariables["PATH"] = Path.GetDirectoryName(_dotnetLocation); - deploymentParameters.ModifyAspNetCoreSectionInWebConfig("processPath", path); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", path)); } ); @@ -144,6 +147,21 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Contains(TestSink.Writes, context => context.Message.Contains("Application is running inside IIS process but is not configured to use IIS server")); } + [ConditionalFact] + public async Task CheckInvalidHostingModelParameter() + { + var deploymentParameters = GetBaseDeploymentParameters(); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("hostingModel", "bogus")); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + EventLogHelpers.VerifyEventLogEvent(TestSink, "Unknown hosting model 'bogus'. Please specify either hostingModel=\"inprocess\" or hostingModel=\"outofprocess\" in the web.config file."); + } + // Defaults to inprocess specific deployment parameters public static IISDeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite") { From aa8a8b7471f71c10e697e6ad8cf9e2e0f52eca0b Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 25 Jul 2018 13:11:40 -0700 Subject: [PATCH 156/363] Skip IIS Jenkins (#1094) --- build/buildpipeline/windows.groovy | 2 +- test/IIS.FunctionalTests/RequiresIISAttribute.cs | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy index 3aa3d99283..dcd6894cb7 100644 --- a/build/buildpipeline/windows.groovy +++ b/build/buildpipeline/windows.groovy @@ -9,7 +9,7 @@ simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { } stage ('Build') { def logFolder = getLogFolder() - def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" + def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}';\$env:ASPNETCORE_TEST_SKIP_IIS='true';" bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"&.\\tools\\update_schema.ps1;${environment};&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\"" } } diff --git a/test/IIS.FunctionalTests/RequiresIISAttribute.cs b/test/IIS.FunctionalTests/RequiresIISAttribute.cs index de0e4eb805..9befaeba96 100644 --- a/test/IIS.FunctionalTests/RequiresIISAttribute.cs +++ b/test/IIS.FunctionalTests/RequiresIISAttribute.cs @@ -27,6 +27,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests static RequiresIISAttribute() { + if (Environment.GetEnvironmentVariable("ASPNETCORE_TEST_SKIP_IIS") == "true") + { + _skipReasonStatic = "Test skipped using ASPNETCORE_TEST_SKIP_IIS environment variable"; + return; + } + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { _skipReasonStatic = "IIS tests can only be run on Windows"; From ba18129d7929cd0e60897e1c1f3025cea2a0b5c5 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 25 Jul 2018 15:26:01 -0700 Subject: [PATCH 157/363] Skip win7 tests (#1096) --- test/IIS.FunctionalTests/Properties/AssemblyInfo.cs | 11 +++++++++++ .../Properties/AssemblyInfo.cs | 0 2 files changed, 11 insertions(+) create mode 100644 test/IIS.FunctionalTests/Properties/AssemblyInfo.cs rename test/{Common.FunctionalTests => IISExpress.FunctionalTests}/Properties/AssemblyInfo.cs (100%) diff --git a/test/IIS.FunctionalTests/Properties/AssemblyInfo.cs b/test/IIS.FunctionalTests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..c6007ab5fe --- /dev/null +++ b/test/IIS.FunctionalTests/Properties/AssemblyInfo.cs @@ -0,0 +1,11 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +[assembly: CollectionBehavior(DisableTestParallelization = true)] +[assembly: RequiresIIS] +[assembly: OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "https://github.com/aspnet/IISIntegration/issues/1069")] + diff --git a/test/Common.FunctionalTests/Properties/AssemblyInfo.cs b/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs similarity index 100% rename from test/Common.FunctionalTests/Properties/AssemblyInfo.cs rename to test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs From 61b4473abe95f2f53aad35202a32bff5ab32c053 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 26 Jul 2018 08:12:08 -0700 Subject: [PATCH 158/363] Fix another shutdown race and appofline race (#1071) --- .../AspNetCore/AspNetCore.vcxproj | 2 + .../AspNetCore/ServerErrorApplication.h | 31 ++ .../AspNetCore/ServerErrorHandler.h | 23 ++ .../AspNetCore/applicationinfo.cpp | 177 +++-------- .../AspNetCore/applicationinfo.h | 35 +-- .../AspNetCore/applicationmanager.cpp | 1 - .../AspNetCore/proxymodule.cpp | 22 +- .../CommonLib/AppOfflineApplication.cpp | 61 ++++ .../CommonLib/AppOfflineApplication.h | 27 ++ .../CommonLib/AppOfflineHandler.cpp | 30 ++ .../CommonLib/AppOfflineHandler.h | 23 ++ .../CommonLib/CommonLib.vcxproj | 4 + .../PollingAppOfflineApplication.cpp | 95 +----- .../CommonLib/PollingAppOfflineApplication.h | 48 ++- .../CommonLib/application.h | 4 +- .../CommonLib/iapplication.h | 7 +- .../InProcessApplicationBase.cpp | 18 +- .../InProcessApplicationBase.h | 2 +- .../InProcessRequestHandler.vcxproj | 1 + .../ShuttingDownApplication.h | 45 +++ .../StartupExceptionApplication.cpp | 4 - .../StartupExceptionApplication.h | 1 - .../InProcessRequestHandler/dllmain.cpp | 14 +- .../inprocessapplication.cpp | 22 +- .../inprocessapplication.h | 4 +- .../inprocesshandler.cpp | 5 +- .../managedexports.cpp | 5 + .../outprocessapplication.cpp | 11 +- .../outprocessapplication.h | 7 +- .../AppOfflineTrackingApplication.cpp | 3 +- .../AppOfflineTrackingApplication.h | 8 +- .../RequestHandlerLib/filewatcher.cpp | 17 +- .../RequestHandlerLib/filewatcher.h | 1 + .../Common.FunctionalTests/AppOfflineTests.cs | 278 ++++++++++++++++++ .../Inprocess/ServerVariablesTest.cs | 24 +- .../Utilities/Helpers.cs | 23 ++ .../Utilities/IISCapability.cs | 3 +- .../RequiresIISAttribute.cs | 6 + test/IIS.Tests/TestServerTest.cs | 22 +- .../InProcess/AppOfflineTests.cs | 159 ---------- 40 files changed, 733 insertions(+), 540 deletions(-) create mode 100644 src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h create mode 100644 src/AspNetCoreModuleV2/AspNetCore/ServerErrorHandler.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/AppOfflineHandler.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/AppOfflineHandler.h create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h create mode 100644 test/Common.FunctionalTests/AppOfflineTests.cs delete mode 100644 test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index c0d926bd35..4895850cbc 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -230,6 +230,8 @@ + + diff --git a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h new file mode 100644 index 0000000000..1872675656 --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h @@ -0,0 +1,31 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +#include "PollingAppOfflineApplication.h" +#include "requesthandler.h" +#include "ServerErrorHandler.h" + +class ServerErrorApplication : public PollingAppOfflineApplication +{ +public: + ServerErrorApplication(IHttpApplication& pApplication, HRESULT hr) + : m_HR(hr), + PollingAppOfflineApplication(pApplication, PollingAppOfflineApplicationMode::StopWhenAdded) + { + m_status = APPLICATION_STATUS::RUNNING; + } + + ~ServerErrorApplication() = default; + + HRESULT CreateHandler(IHttpContext * pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override + { + *pRequestHandler = new ServerErrorHandler(pHttpContext, m_HR); + return S_OK; + } + + HRESULT OnAppOfflineFound() override { return S_OK; } +private: + HRESULT m_HR; +}; + diff --git a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorHandler.h b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorHandler.h new file mode 100644 index 0000000000..b3d917039d --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorHandler.h @@ -0,0 +1,23 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +#include "requesthandler.h" + +class ServerErrorHandler : public REQUEST_HANDLER +{ +public: + ServerErrorHandler(IHttpContext* pContext, HRESULT hr) : m_pContext(pContext), m_HR(hr) + { + } + + REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override + { + m_pContext->GetResponse()->SetStatus(500, "Internal Server Error", 0, m_HR); + return RQ_NOTIFICATION_FINISH_REQUEST; + } + +private: + IHttpContext * m_pContext; + HRESULT m_HR; +}; diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index edfc085f22..a65af02467 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -12,8 +12,10 @@ #include "SRWExclusiveLock.h" #include "GlobalVersionUtility.h" #include "exceptions.h" -#include "PollingAppOfflineApplication.h" #include "EventLog.h" +#include "HandleWrapper.h" +#include "ServerErrorApplication.h" +#include "AppOfflineApplication.h" extern HINSTANCE g_hModule; @@ -29,21 +31,7 @@ PFN_ASPNETCORE_CREATE_APPLICATION APPLICATION_INFO::s_pfnAspNetCoreCreateApplica APPLICATION_INFO::~APPLICATION_INFO() { - if (m_pApplication != NULL) - { - // shutdown the application - m_pApplication->ShutDown(); - m_pApplication->DereferenceApplication(); - m_pApplication = NULL; - } - - // configuration should be dereferenced after application shutdown - // since the former will use it during shutdown - if (m_pConfiguration != NULL) - { - delete m_pConfiguration; - m_pConfiguration = NULL; - } + ShutDownApplication(); } HRESULT @@ -51,7 +39,7 @@ APPLICATION_INFO::Initialize( _In_ IHttpApplication &pApplication ) { - m_pConfiguration = new ASPNETCORE_SHIM_CONFIG(); + m_pConfiguration.reset(new ASPNETCORE_SHIM_CONFIG()); RETURN_IF_FAILED(m_pConfiguration->Populate(&m_pServer, &pApplication)); RETURN_IF_FAILED(m_struInfoKey.Copy(pApplication.GetApplicationId())); @@ -60,22 +48,16 @@ APPLICATION_INFO::Initialize( HRESULT -APPLICATION_INFO::EnsureApplicationCreated( - IHttpContext *pHttpContext +APPLICATION_INFO::GetOrCreateApplication( + IHttpContext *pHttpContext, + std::unique_ptr& pApplication ) { HRESULT hr = S_OK; - IAPPLICATION *pApplication = NULL; - STRU struExeLocation; - STRU struHostFxrDllLocation; - STACK_STRU(struFileName, 300); // >MAX_PATH + + SRWExclusiveLock lock(m_applicationLock); - if (m_pApplication != nullptr && m_pApplication->QueryStatus() != RECYCLED) - { - return S_OK; - } - - SRWExclusiveLock lock(m_srwLock); + auto& httpApplication = *pHttpContext->GetApplication(); if (m_pApplication != nullptr) { @@ -84,7 +66,6 @@ APPLICATION_INFO::EnsureApplicationCreated( LOG_INFO("Application went offline"); // Application that went offline // are supposed to recycle themselves - m_pApplication->DereferenceApplication(); m_pApplication = nullptr; } else @@ -93,26 +74,15 @@ APPLICATION_INFO::EnsureApplicationCreated( FINISHED(S_OK); } } - else if (m_fAppCreationAttempted) - { - // previous CreateApplication failed - FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); - } - auto& httpApplication = *pHttpContext->GetApplication(); - if (PollingAppOfflineApplication::ShouldBeStarted(httpApplication)) + if (AppOfflineApplication::ShouldBeStarted(httpApplication)) { - LOG_INFO("Detected app_ofline file, creating polling application"); - m_pApplication = new PollingAppOfflineApplication(httpApplication); + LOG_INFO("Detected app_offline file, creating polling application"); + m_pApplication.reset(new AppOfflineApplication(httpApplication)); } else { - // Move the request handler check inside of the lock - // such that only one request finds and loads it. - // FindRequestHandlerAssembly obtains a global lock, but after releasing the lock, - // there is a period where we could call - - m_fAppCreationAttempted = TRUE; + STRU struExeLocation; FINISHED_IF_FAILED(FindRequestHandlerAssembly(struExeLocation)); if (m_pfnAspNetCoreCreateApplication == NULL) @@ -123,15 +93,17 @@ APPLICATION_INFO::EnsureApplicationCreated( std::array parameters { {"InProcessExeLocation", struExeLocation.QueryStr()} }; + LOG_INFO("Creating handler application"); + IAPPLICATION * newApplication; FINISHED_IF_FAILED(m_pfnAspNetCoreCreateApplication( &m_pServer, - pHttpContext->GetApplication(), + &httpApplication, parameters.data(), static_cast(parameters.size()), - &pApplication)); + &newApplication)); - m_pApplication = pApplication; + m_pApplication.reset(newApplication); } Finished: @@ -143,8 +115,15 @@ Finished: EVENTLOG_ERROR_TYPE, ASPNETCORE_EVENT_ADD_APPLICATION_ERROR, ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG, - pHttpContext->GetApplication()->GetApplicationId(), + httpApplication.GetApplicationId(), hr); + + m_pApplication.reset(new ServerErrorApplication(httpApplication, hr)); + } + + if (m_pApplication) + { + pApplication = ReferenceApplication(m_pApplication.get()); } return hr; @@ -413,107 +392,47 @@ Finished: VOID APPLICATION_INFO::RecycleApplication() { - IAPPLICATION* pApplication; - HANDLE hThread = INVALID_HANDLE_VALUE; + SRWExclusiveLock lock(m_applicationLock); - if (m_pApplication != NULL) + if (m_pApplication) { - SRWExclusiveLock lock(m_srwLock); + const auto pApplication = m_pApplication.release(); - if (m_pApplication != NULL) - { - pApplication = m_pApplication; - if (m_pConfiguration->QueryHostingModel() == HOSTING_OUT_PROCESS) - { - // - // For inprocess, need to set m_pApplication to NULL first to - // avoid mapping new request to the recycled application. - // Outofprocess application instance will be created for new request - // For inprocess, as recycle will lead to shutdown later, leave m_pApplication - // to not block incoming requests till worker process shutdown - // - m_pApplication = NULL; - } - else - { - // - // For inprocess, need hold the application till shutdown is called - // Bump the reference counter as DoRecycleApplication will do dereference - // - pApplication->ReferenceApplication(); - } - - hThread = CreateThread( - NULL, // default security attributes - 0, // default stack size - (LPTHREAD_START_ROUTINE)DoRecycleApplication, - pApplication, // thread function arguments - 0, // default creation flags - NULL); // receive thread identifier - } - else - { - if (m_pConfiguration->QueryHostingModel() == HOSTING_IN_PROCESS) - { - // In process application failed to start for whatever reason, need to recycle the work process - m_pServer.RecycleProcess(L"AspNetCore InProcess Recycle Process on Demand"); - } - } - - if (hThread == NULL) - { - if (!g_fRecycleProcessCalled) - { - g_fRecycleProcessCalled = TRUE; - m_pServer.RecycleProcess(L"On Demand by AspNetCore Module for recycle application failure"); - } - } - else - { - // Closing a thread handle does not terminate the associated thread or remove the thread object. - CloseHandle(hThread); - } + HandleWrapper hThread = CreateThread( + NULL, // default security attributes + 0, // default stack size + (LPTHREAD_START_ROUTINE)DoRecycleApplication, + pApplication, // thread function arguments + 0, // default creation flags + NULL); // receive thread identifier } } -VOID +DWORD WINAPI APPLICATION_INFO::DoRecycleApplication( LPVOID lpParam) { - IAPPLICATION* pApplication = static_cast(lpParam); + auto pApplication = std::unique_ptr(static_cast(lpParam)); - // No lock required - - if (pApplication != NULL) + if (pApplication) { // Recycle will call shutdown for out of process - pApplication->Recycle(); - - // Decrement the ref count as we reference it in RecycleApplication. - pApplication->DereferenceApplication(); + pApplication->Stop(/*fServerInitiated*/ false); } + + return 0; } VOID APPLICATION_INFO::ShutDownApplication() { - IAPPLICATION* pApplication = NULL; + SRWExclusiveLock lock(m_applicationLock); - // pApplication can be NULL due to app_offline - if (m_pApplication != NULL) + if (m_pApplication) { - SRWExclusiveLock lock(m_srwLock); - - if (m_pApplication != NULL) - { - pApplication = m_pApplication; - - // Set m_pApplication to NULL first to prevent anyone from using it - m_pApplication = NULL; - pApplication->ShutDown(); - pApplication->DereferenceApplication(); - } + m_pApplication ->Stop(/* fServerInitiated */ true); + m_pApplication = nullptr; } } diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h index 49badd578a..989120a538 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h @@ -32,11 +32,10 @@ public: m_pServer(pServer), m_cRefs(1), m_fValid(FALSE), - m_fAppCreationAttempted(FALSE), - m_pConfiguration(NULL), + m_pConfiguration(nullptr), m_pfnAspNetCoreCreateApplication(NULL) { - InitializeSRWLock(&m_srwLock); + InitializeSRWLock(&m_applicationLock); } PCWSTR @@ -90,19 +89,7 @@ public: ASPNETCORE_SHIM_CONFIG* QueryConfig() { - return m_pConfiguration; - } - - // - // ExtractApplication will increase the reference counter of the application - // Caller is responsible for dereference the application. - // Otherwise memory leak - // - std::unique_ptr - ExtractApplication() const - { - SRWSharedLock lock(m_srwLock); - return ReferenceApplication(m_pApplication); + return m_pConfiguration.get(); } VOID @@ -112,8 +99,9 @@ public: ShutDownApplication(); HRESULT - EnsureApplicationCreated( - IHttpContext *pHttpContext + GetOrCreateApplication( + IHttpContext *pHttpContext, + std::unique_ptr& pApplication ); private: @@ -121,17 +109,18 @@ private: HRESULT FindNativeAssemblyFromGlobalLocation(PCWSTR libraryName, STRU* location); HRESULT FindNativeAssemblyFromHostfxr(HOSTFXR_OPTIONS* hostfxrOptions, PCWSTR libraryName, STRU* location); - static VOID DoRecycleApplication(LPVOID lpParam); + static DWORD WINAPI DoRecycleApplication(LPVOID lpParam); mutable LONG m_cRefs; STRU m_struInfoKey; BOOL m_fValid; - BOOL m_fAppCreationAttempted; - ASPNETCORE_SHIM_CONFIG *m_pConfiguration; - IAPPLICATION *m_pApplication; - SRWLOCK m_srwLock; + SRWLOCK m_applicationLock; IHttpServer &m_pServer; PFN_ASPNETCORE_CREATE_APPLICATION m_pfnAspNetCoreCreateApplication; + + std::unique_ptr m_pConfiguration; + std::unique_ptr m_pApplication; + static const PCWSTR s_pwzAspnetcoreInProcessRequestHandlerName; static const PCWSTR s_pwzAspnetcoreOutOfProcessRequestHandlerName; diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp index a7f08e5d3e..9de2901be5 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp @@ -97,7 +97,6 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( *ppApplicationInfo = pApplicationInfo; pApplicationInfo = NULL; } - Finished: // log the error diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index 962d7202d1..0ed100fd47 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -95,20 +95,18 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( // the error should already been logged to window event log for the first request FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); } - - // make sure assmebly is loaded and application is created - FINISHED_IF_FAILED(m_pApplicationInfo->EnsureApplicationCreated(pHttpContext)); - - auto pApplication = m_pApplicationInfo->ExtractApplication(); - - DBG_ASSERT(pHttpContext); - // We allow OFFLINE application to serve pages + DBG_ASSERT(pHttpContext); + + std::unique_ptr pApplication; + FINISHED_IF_FAILED(m_pApplicationInfo->GetOrCreateApplication(pHttpContext, pApplication)); + + // We allow RECYCLED application to serve pages if (pApplication->QueryStatus() != APPLICATION_STATUS::RUNNING && - pApplication->QueryStatus() != APPLICATION_STATUS::STARTING) + pApplication->QueryStatus() != APPLICATION_STATUS::STARTING && + pApplication->QueryStatus() != APPLICATION_STATUS::RECYCLED) { - hr = HRESULT_FROM_WIN32(ERROR_SERVER_DISABLED); - goto Finished; + FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_DISABLED)); } IREQUEST_HANDLER* pHandler; @@ -124,7 +122,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( } Finished: - if (FAILED(hr)) + if (LOG_IF_FAILED(hr)) { retVal = RQ_NOTIFICATION_FINISH_REQUEST; if (hr == HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)) diff --git a/src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.cpp b/src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.cpp new file mode 100644 index 0000000000..e42c6ca8e6 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.cpp @@ -0,0 +1,61 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "AppOfflineApplication.h" + +#include +#include "HandleWrapper.h" +#include "AppOfflineHandler.h" + +HRESULT AppOfflineApplication::CreateHandler(IHttpContext* pHttpContext, IREQUEST_HANDLER** pRequestHandler) +{ + try + { + *pRequestHandler = new AppOfflineHandler(pHttpContext, m_strAppOfflineContent); + } + CATCH_RETURN(); + + return S_OK; +} + +HRESULT AppOfflineApplication::OnAppOfflineFound() +{ + LARGE_INTEGER li = {}; + + HandleWrapper handle = CreateFile(m_appOfflineLocation.c_str(), + GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + nullptr, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + nullptr); + + RETURN_LAST_ERROR_IF(handle == INVALID_HANDLE_VALUE); + + RETURN_LAST_ERROR_IF(!GetFileSizeEx(handle, &li)); + + if (li.HighPart != 0) + { + // > 4gb file size not supported + // todo: log a warning at event log + return E_INVALIDARG; + } + + if (li.LowPart > 0) + { + DWORD bytesRead = 0; + std::string pszBuff(li.LowPart + 1, '\0'); + + RETURN_LAST_ERROR_IF(!ReadFile(handle, pszBuff.data(), li.LowPart, &bytesRead, NULL)); + pszBuff.resize(bytesRead); + + m_strAppOfflineContent = pszBuff; + } + + return S_OK; +} + +bool AppOfflineApplication::ShouldBeStarted(IHttpApplication& pApplication) +{ + return is_regular_file(GetAppOfflineLocation(pApplication)); +} diff --git a/src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.h b/src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.h new file mode 100644 index 0000000000..f6ec00cab0 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.h @@ -0,0 +1,27 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#pragma once + +#include "application.h" +#include "requesthandler.h" +#include "PollingAppOfflineApplication.h" + +class AppOfflineApplication: public PollingAppOfflineApplication +{ +public: + AppOfflineApplication(IHttpApplication& pApplication) + : PollingAppOfflineApplication(pApplication, PollingAppOfflineApplicationMode::StopWhenRemoved) + { + } + + HRESULT CreateHandler(IHttpContext* pHttpContext, IREQUEST_HANDLER** pRequestHandler) override; + + HRESULT OnAppOfflineFound() override; + + static bool ShouldBeStarted(IHttpApplication& pApplication); + +private: + std::string m_strAppOfflineContent; +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/AppOfflineHandler.cpp b/src/AspNetCoreModuleV2/CommonLib/AppOfflineHandler.cpp new file mode 100644 index 0000000000..3efeb74463 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/AppOfflineHandler.cpp @@ -0,0 +1,30 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "AppOfflineHandler.h" + +#include "HandleWrapper.h" + +REQUEST_NOTIFICATION_STATUS AppOfflineHandler::OnExecuteRequestHandler() +{ + HTTP_DATA_CHUNK DataChunk; + IHttpResponse* pResponse = m_pContext->GetResponse(); + + DBG_ASSERT(pResponse); + + // Ignore failure hresults as nothing we can do + // Set fTrySkipCustomErrors to true as we want client see the offline content + pResponse->SetStatus(503, "Service Unavailable", 0, S_OK, nullptr, TRUE); + pResponse->SetHeader("Content-Type", + "text/html", + static_cast(strlen("text/html")), + FALSE + ); + + DataChunk.DataChunkType = HttpDataChunkFromMemory; + DataChunk.FromMemory.pBuffer = m_strAppOfflineContent.data(); + DataChunk.FromMemory.BufferLength = static_cast(m_strAppOfflineContent.size()); + pResponse->WriteEntityChunkByReference(&DataChunk); + + return REQUEST_NOTIFICATION_STATUS::RQ_NOTIFICATION_FINISH_REQUEST; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/AppOfflineHandler.h b/src/AspNetCoreModuleV2/CommonLib/AppOfflineHandler.h new file mode 100644 index 0000000000..e9fd4b99da --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/AppOfflineHandler.h @@ -0,0 +1,23 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#pragma once + +#include "application.h" +#include "requesthandler.h" + +class AppOfflineHandler: public REQUEST_HANDLER +{ +public: + AppOfflineHandler(IHttpContext* pContext, const std::string appOfflineContent) + : m_pContext(pContext), + m_strAppOfflineContent(appOfflineContent) + { + } + + REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override; + +private: + IHttpContext* m_pContext; + std::string m_strAppOfflineContent; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 5ff3e0103f..e905714bfa 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -193,6 +193,8 @@ + + @@ -216,6 +218,8 @@ + + diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp index dff673fee3..1468c7ee37 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp @@ -7,25 +7,9 @@ #include "SRWExclusiveLock.h" #include "HandleWrapper.h" -HRESULT PollingAppOfflineApplication::CreateHandler(IHttpContext* pHttpContext, IREQUEST_HANDLER** pRequestHandler) -{ - try - { - *pRequestHandler = new PollingAppOfflineHandler(pHttpContext, m_strAppOfflineContent); - } - CATCH_RETURN(); - - return S_OK; -} - APPLICATION_STATUS PollingAppOfflineApplication::QueryStatus() { - if (AppOfflineExists()) - { - return APPLICATION_STATUS::RUNNING; - } - - return APPLICATION_STATUS::RECYCLED; + return (AppOfflineExists() == (m_mode == StopWhenRemoved)) ? APPLICATION_STATUS::RUNNING : APPLICATION_STATUS::RECYCLED; } bool @@ -35,7 +19,7 @@ PollingAppOfflineApplication::AppOfflineExists() // // we only care about app offline presented. If not, it means the application has started // and is monitoring the app offline file - // we cache the file exist check result for 1 second + // we cache the file exist check result for 200 ms // if (ulCurrentTime - m_ulLastCheckTime > c_appOfflineRefreshIntervalMS) { @@ -45,7 +29,7 @@ PollingAppOfflineApplication::AppOfflineExists() m_fAppOfflineFound = is_regular_file(m_appOfflineLocation); if(m_fAppOfflineFound) { - LOG_IF_FAILED(LoadAppOfflineContent()); + LOG_IF_FAILED(OnAppOfflineFound()); } m_ulLastCheckTime = ulCurrentTime; } @@ -53,81 +37,8 @@ PollingAppOfflineApplication::AppOfflineExists() return m_fAppOfflineFound; } -HRESULT PollingAppOfflineApplication::LoadAppOfflineContent() -{ - LARGE_INTEGER li = {}; - - HandleWrapper handle = CreateFile(m_appOfflineLocation.c_str(), - GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - nullptr, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - nullptr); - - RETURN_LAST_ERROR_IF(handle == INVALID_HANDLE_VALUE); - - RETURN_LAST_ERROR_IF (!GetFileSizeEx(handle, &li)); - - if (li.HighPart != 0) - { - // > 4gb file size not supported - // todo: log a warning at event log - return TRUE; - } - - if (li.LowPart > 0) - { - DWORD bytesRead = 0; - std::string pszBuff(li.LowPart + 1, '\0'); - - RETURN_LAST_ERROR_IF(!ReadFile(handle, pszBuff.data(), li.LowPart, &bytesRead, NULL)); - pszBuff.resize(bytesRead); - - m_strAppOfflineContent = pszBuff; - } - - return S_OK; -} - -bool PollingAppOfflineApplication::ShouldBeStarted(IHttpApplication& pApplication) -{ - return is_regular_file(GetAppOfflineLocation(pApplication)); -} std::experimental::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpApplication& pApplication) { return std::experimental::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm"; } - -void PollingAppOfflineApplication::ShutDown() -{ -} - -void PollingAppOfflineApplication::Recycle() -{ -} - -REQUEST_NOTIFICATION_STATUS PollingAppOfflineHandler::OnExecuteRequestHandler() -{ - HTTP_DATA_CHUNK DataChunk; - IHttpResponse* pResponse = m_pContext->GetResponse(); - - DBG_ASSERT(pResponse); - - // Ignore failure hresults as nothing we can do - // Set fTrySkipCustomErrors to true as we want client see the offline content - pResponse->SetStatus(503, "Service Unavailable", 0, S_OK, nullptr, TRUE); - pResponse->SetHeader("Content-Type", - "text/html", - static_cast(strlen("text/html")), - FALSE - ); - - DataChunk.DataChunkType = HttpDataChunkFromMemory; - DataChunk.FromMemory.pBuffer = m_strAppOfflineContent.data(); - DataChunk.FromMemory.BufferLength = static_cast(m_strAppOfflineContent.size()); - pResponse->WriteEntityChunkByReference(&DataChunk); - - return REQUEST_NOTIFICATION_STATUS::RQ_NOTIFICATION_FINISH_REQUEST; -} diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h index 592cdb2dc8..48e71f6641 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h @@ -4,54 +4,40 @@ #pragma once #include #include "application.h" -#include "requesthandler.h" + +enum PollingAppOfflineApplicationMode +{ + StopWhenAdded, + StopWhenRemoved +}; class PollingAppOfflineApplication: public APPLICATION { public: - PollingAppOfflineApplication(IHttpApplication& pApplication) + PollingAppOfflineApplication(IHttpApplication& pApplication, PollingAppOfflineApplicationMode mode) : m_ulLastCheckTime(0), m_appOfflineLocation(GetAppOfflineLocation(pApplication)), - m_fAppOfflineFound(false) + m_fAppOfflineFound(false), + m_mode(mode) { InitializeSRWLock(&m_statusLock); } - HRESULT CreateHandler(IHttpContext* pHttpContext, IREQUEST_HANDLER** pRequestHandler) override; - APPLICATION_STATUS QueryStatus() override; bool AppOfflineExists(); - HRESULT LoadAppOfflineContent(); - static bool ShouldBeStarted(IHttpApplication& pApplication); - void ShutDown() override; - void Recycle() override; + virtual HRESULT OnAppOfflineFound() = 0; + void Stop(bool fServerInitiated) override { UNREFERENCED_PARAMETER(fServerInitiated); } + +protected: + std::experimental::filesystem::path m_appOfflineLocation; + static std::experimental::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication); private: static const int c_appOfflineRefreshIntervalMS = 200; - static std::experimental::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication); std::string m_strAppOfflineContent; - ULONGLONG m_ulLastCheckTime; - std::experimental::filesystem::path m_appOfflineLocation; + ULONGLONG m_ulLastCheckTime; bool m_fAppOfflineFound; SRWLOCK m_statusLock {}; + PollingAppOfflineApplicationMode m_mode; }; - - -class PollingAppOfflineHandler: public REQUEST_HANDLER -{ -public: - PollingAppOfflineHandler(IHttpContext* pContext, const std::string appOfflineContent) - : m_pContext(pContext), - m_strAppOfflineContent(appOfflineContent) - { - } - - REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override; - -private: - IHttpContext* m_pContext; - std::string m_strAppOfflineContent; -}; - - diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index 56cf5ce2ac..9761851002 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -31,13 +31,15 @@ public: VOID ReferenceApplication() override { + DBG_ASSERT(m_cRefs > 0); + InterlockedIncrement(&m_cRefs); } VOID DereferenceApplication() override { - DBG_ASSERT(m_cRefs != 0); + DBG_ASSERT(m_cRefs > 0); if (InterlockedDecrement(&m_cRefs) == 0) { diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h index ef5d2bf8d7..cdfd17ec03 100644 --- a/src/AspNetCoreModuleV2/CommonLib/iapplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -25,14 +25,9 @@ struct APPLICATION_PARAMETER class IAPPLICATION { public: - virtual VOID - ShutDown() = 0; - - virtual - VOID - Recycle() = 0; + Stop(bool fServerInitiated) = 0; virtual ~IAPPLICATION() = 0 { }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp index 5848f37a2f..d271a3a30a 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp @@ -18,9 +18,7 @@ InProcessApplicationBase::InProcessApplicationBase( } VOID -InProcessApplicationBase::Recycle( - VOID -) +InProcessApplicationBase::Stop(bool fServerInitiated) { // We need to guarantee that recycle is only called once, as calling pHttpServer->RecycleProcess // multiple times can lead to AVs. @@ -40,6 +38,12 @@ InProcessApplicationBase::Recycle( m_fRecycleCalled = true; } + // Stop was initiated by server no need to do anything, server would stop on it's own + if (fServerInitiated) + { + return; + } + if (!m_pHttpServer.IsCommandLineLaunch()) { // IIS scenario. @@ -50,13 +54,7 @@ InProcessApplicationBase::Recycle( } else { - // If we set a static callback, we don't want to kill the current process as - // that will kill the test process and means we are running in hostable webcore mode. - if (m_pHttpServer.IsCommandLineLaunch() - && s_fMainCallback == NULL) - { - exit(0); - } + exit(0); } } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h index ca907d67c6..c189095ffa 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h @@ -18,7 +18,7 @@ public: ~InProcessApplicationBase() = default; - VOID Recycle(VOID) override; + VOID Stop(bool fServerInitiated) override; protected: BOOL m_fRecycleCalled; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 6531befa35..addfb56214 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -226,6 +226,7 @@ + diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h new file mode 100644 index 0000000000..4528a3f2b4 --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h @@ -0,0 +1,45 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include "InProcessApplicationBase.h" + +class ShuttingDownHandler : public REQUEST_HANDLER +{ +public: + ShuttingDownHandler(IHttpContext* pContext) : m_pContext(pContext) + { + } + + REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override + { + return ServerShutdownMessage(m_pContext); + } + + static REQUEST_NOTIFICATION_STATUS ServerShutdownMessage(IHttpContext * pContext) + { + pContext->GetResponse()->SetStatus(503, "Server has been shutdown", 0, HRESULT_FROM_WIN32(ERROR_SHUTDOWN_IN_PROGRESS)); + return RQ_NOTIFICATION_FINISH_REQUEST; + } +private: + IHttpContext * m_pContext; +}; + +class ShuttingDownApplication : public InProcessApplicationBase +{ +public: + ShuttingDownApplication(IHttpServer& pHttpServer, IHttpApplication& pHttpApplication) + : InProcessApplicationBase(pHttpServer, pHttpApplication) + { + m_status = APPLICATION_STATUS::RUNNING; + } + + ~ShuttingDownApplication() = default; + + HRESULT CreateHandler(IHttpContext * pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override + { + *pRequestHandler = new ShuttingDownHandler(pHttpContext); + return S_OK; + } +}; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp index 4aa5b9fb31..fbb5350d62 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp @@ -3,10 +3,6 @@ #include "StartupExceptionApplication.h" -VOID StartupExceptionApplication::ShutDown() -{ -} - HRESULT StartupExceptionApplication::CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler) { *pRequestHandler = new StartupExceptionHandler(pHttpContext, m_disableLogs, this); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h index 0a2dc4fe58..14d26bf3a4 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h @@ -44,7 +44,6 @@ public: ~StartupExceptionApplication() = default; - VOID ShutDown() override; HRESULT CreateHandler(IHttpContext * pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override; std::string& diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp index f7b985aa0b..e0ed004a67 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp @@ -12,6 +12,7 @@ #include "debugutil.h" #include "resources.h" #include "exceptions.h" +#include "ShuttingDownApplication.h" DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_inprocess.dll"); @@ -22,6 +23,7 @@ IHttpServer * g_pHttpServer = NULL; HINSTANCE g_hWinHttpModule; HINSTANCE g_hAspNetCoreModule; HANDLE g_hEventLog = NULL; +bool g_fInProcessApplicationCreated = false; HRESULT InitializeGlobalConfiguration( @@ -93,7 +95,15 @@ CreateApplication( try { RETURN_IF_FAILED(InitializeGlobalConfiguration(pServer, pHttpApplication)); - + + // In process application was already created so another call to CreateApplication + // means that server is shutting does and request arrived in the meantime + if (g_fInProcessApplicationCreated) + { + *ppApplication = new ShuttingDownApplication(*pServer, *pHttpApplication); + return S_OK; + } + REQUESTHANDLER_CONFIG *pConfig = nullptr; RETURN_IF_FAILED(REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpApplication, &pConfig)); std::unique_ptr pRequestHandlerConfig(pConfig); @@ -102,6 +112,8 @@ CreateApplication( auto pApplication = std::make_unique(*pServer, *pHttpApplication, std::move(pRequestHandlerConfig), pParameters, nParameters); + // never create two inprocess applications in one process + g_fInProcessApplicationCreated = true; if (FAILED_LOG(pApplication->LoadManagedApplication())) { // Set the currently running application to a fake application that returns startup exceptions. diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index b52b08f833..756d78954c 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -50,7 +50,7 @@ IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION() } //static -DWORD +DWORD WINAPI IN_PROCESS_APPLICATION::DoShutDown( LPVOID lpParam ) @@ -63,10 +63,9 @@ IN_PROCESS_APPLICATION::DoShutDown( __override VOID -IN_PROCESS_APPLICATION::ShutDown( - VOID -) +IN_PROCESS_APPLICATION::Stop(bool fServerInitiated) { + UNREFERENCED_PARAMETER(fServerInitiated); HRESULT hr = S_OK; CHandle hThread; DWORD dwThreadStatus = 0; @@ -118,15 +117,8 @@ Finished: ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE, ASPNETCORE_EVENT_APP_SHUTDOWN_FAILURE_MSG, m_pConfig->QueryConfigPath()->QueryStr()); - - // - // Managed layer may block the shutdown and lead to shutdown timeout - // Assumption: only one inprocess application is hosted. - // Call process exit to force shutdown - // - exit(hr); } - else + else { UTILITY::LogEventF(g_hEventLog, EVENTLOG_INFORMATION_TYPE, @@ -134,6 +126,8 @@ Finished: ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL_MSG, m_pConfig->QueryConfigPath()->QueryStr()); } + + InProcessApplicationBase::Stop(fServerInitiated); } VOID @@ -169,7 +163,7 @@ IN_PROCESS_APPLICATION::ShutDownInternal() // managed. We still need to wait on main exiting no matter what. m_fShutdownCalledFromNative // is used for detecting redundant calls and blocking more requests to OnExecuteRequestHandler. m_fShutdownCalledFromNative = TRUE; - m_status = APPLICATION_STATUS::SHUTDOWN; + m_status = APPLICATION_STATUS::RECYCLED; if (!m_fShutdownCalledFromManaged) { @@ -515,7 +509,7 @@ Finished: // // If the inprocess server was initialized, we need to cause recycle to be called on the worker process. // - Recycle(); + Stop(/*fServerInitiated*/ false); } } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index 1f6e3da570..e23cf6b83a 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -26,7 +26,7 @@ public: __override VOID - ShutDown(); + Stop(bool fServerInitiated) override; VOID SetCallbackHandles( @@ -167,7 +167,7 @@ private: ); static - DWORD + DWORD WINAPI DoShutDown( LPVOID lpParam ); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index de806e7f71..90b3bd9d53 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -5,6 +5,7 @@ #include "inprocessapplication.h" #include "aspnetcore_event.h" #include "IOutputManager.h" +#include "ShuttingDownApplication.h" ALLOC_CACHE_HANDLER * IN_PROCESS_HANDLER::sm_pAlloc = NULL; @@ -93,9 +94,7 @@ IN_PROCESS_HANDLER::OnAsyncCompletion( REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::ServerShutdownMessage() const { - m_pW3Context->GetResponse()->SetStatus(503, "Server has been shutdown", 0, - (ULONG)HRESULT_FROM_WIN32(ERROR_SHUTDOWN_IN_PROGRESS)); - return RQ_NOTIFICATION_FINISH_REQUEST; + return ShuttingDownHandler::ServerShutdownMessage(m_pW3Context); } VOID diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp index 1db194bdbd..6e03ebd859 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp @@ -4,6 +4,9 @@ #include "inprocessapplication.h" #include "inprocesshandler.h" #include "requesthandler_config.h" + +extern bool g_fInProcessApplicationCreated; + // // Initialization export // @@ -469,6 +472,8 @@ EXTERN_C __MIDL_DECLSPEC_DLLEXPORT VOID set_main_handler(_In_ hostfxr_main_fn main) { + // Allow inprocess application to be recreated as we reuse the same CLR + g_fInProcessApplicationCreated = false; IN_PROCESS_APPLICATION::SetMainCallback(main); } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp index 90d75b2991..5f5877edac 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp @@ -63,8 +63,10 @@ OUT_OF_PROCESS_APPLICATION::GetProcess( __override VOID -OUT_OF_PROCESS_APPLICATION::ShutDown() +OUT_OF_PROCESS_APPLICATION::Stop(bool fServerInitiated) { + UNREFERENCED_PARAMETER(fServerInitiated); + SRWExclusiveLock lock(m_srwLock); if (m_pProcessManager != NULL) { @@ -72,13 +74,6 @@ OUT_OF_PROCESS_APPLICATION::ShutDown() } } -__override -VOID -OUT_OF_PROCESS_APPLICATION::Recycle() -{ - ShutDown(); -} - HRESULT OUT_OF_PROCESS_APPLICATION::CreateHandler( _In_ IHttpContext *pHttpContext, diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h index 8f51bf4216..1667069c09 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h @@ -32,12 +32,7 @@ public: __override VOID - ShutDown() - override; - - __override - VOID - Recycle() + Stop(bool fServerInitiated) override; __override diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp index 7c335ceff1..17c004b693 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp @@ -51,6 +51,7 @@ void AppOfflineTrackingApplication::OnAppOffline() { LOG_INFOF("Received app_offline notification in application %S", m_applicationPath.c_str()); m_fileWatcherEntry->StopMonitor(); + m_fileWatcherEntry.reset(nullptr); m_status = APPLICATION_STATUS::RECYCLED; UTILITY::LogEventF(g_hEventLog, EVENTLOG_INFORMATION_TYPE, @@ -58,5 +59,5 @@ void AppOfflineTrackingApplication::OnAppOffline() ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG, m_applicationPath.c_str()); - Recycle(); + Stop(/*fServerInitiated*/ false); } diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h index 776ae9913c..2b6c36ccfa 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h @@ -17,7 +17,13 @@ public: { } - ~AppOfflineTrackingApplication() override = default; + ~AppOfflineTrackingApplication() override + { + if (m_fileWatcherEntry) + { + m_fileWatcherEntry->StopMonitor(); + } + }; HRESULT StartMonitoringAppOffline(); diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp index 37828b2623..721e248220 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp @@ -227,7 +227,7 @@ FILE_WATCHER_ENTRY::FILE_WATCHER_ENTRY(FILE_WATCHER * pFileMonitor) : FILE_WATCHER_ENTRY::~FILE_WATCHER_ENTRY() { - StopMonitor(); + DBG_ASSERT(_cRefs == 0); _dwSignature = FILE_WATCHER_ENTRY_SIGNATURE_FREE; @@ -354,7 +354,6 @@ FILE_WATCHER_ENTRY::Monitor(VOID) { HRESULT hr = S_OK; DWORD cbRead; - AcquireSRWLockExclusive(&_srwLock); ReferenceFileWatcherEntry(); ZeroMemory(&_overlapped, sizeof(_overlapped)); @@ -372,6 +371,12 @@ FILE_WATCHER_ENTRY::Monitor(VOID) DereferenceFileWatcherEntry(); } + // Check if file exist because ReadDirectoryChangesW would not fire events for existing files + if (GetFileAttributes(_strFullName.QueryStr()) != INVALID_FILE_ATTRIBUTES) + { + PostQueuedCompletionStatus(_pFileMonitor->QueryCompletionPort(), 0, 0, &_overlapped); + } + ReleaseSRWLockExclusive(&_srwLock); return hr; } @@ -385,7 +390,7 @@ FILE_WATCHER_ENTRY::StopMonitor(VOID) // can be ignored // InterlockedExchange(&_lStopMonitorCalled, 1); - + MarkEntryInValid(); if (_hDirectory != INVALID_HANDLE_VALUE) { AcquireSRWLockExclusive(&_srwLock); @@ -431,6 +436,12 @@ FILE_WATCHER_ENTRY::Create( goto Finished; } + if (FAILED(hr = _strFullName.Append(_strDirectoryName)) || + FAILED(hr = _strFullName.Append(_strFileName))) + { + goto Finished; + } + // // Resize change buffer to something "reasonable" // diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h index c010caefc0..4e37600c69 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h @@ -111,6 +111,7 @@ private: FILE_WATCHER* _pFileMonitor; STRU _strFileName; STRU _strDirectoryName; + STRU _strFullName; LONG _lStopMonitorCalled; mutable LONG _cRefs; BOOL _fIsValid; diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/test/Common.FunctionalTests/AppOfflineTests.cs new file mode 100644 index 0000000000..b2c30663a9 --- /dev/null +++ b/test/Common.FunctionalTests/AppOfflineTests.cs @@ -0,0 +1,278 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.IO; +using System.Net; +using System.Net.Http; +using System.Net.Sockets; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; +using Xunit; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; + +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess +{ + public class AppOfflineTests : IISFunctionalTestBase + { + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task AppOfflineDroppedWhileSiteIsDown_SiteReturns503(HostingModel hostingModel) + { + var deploymentResult = await DeployApp(hostingModel); + + AddAppOffline(deploymentResult.ContentRoot); + + await AssertAppOffline(deploymentResult); + DeletePublishOutput(deploymentResult); + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess, 500, "500.0")] + [InlineData(HostingModel.OutOfProcess, 502, "502.5")] + public async Task AppOfflineDroppedWhileSiteFailedToStartInShim_AppOfflineServed(HostingModel hostingModel, int statusCode, string content) + { + + var deploymentParameters = Helpers.GetBaseDeploymentParameters(hostingModel: hostingModel, publish: true); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", "nonexistent")); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var result = await deploymentResult.HttpClient.GetAsync("/"); + Assert.Equal(statusCode, (int)result.StatusCode); + Assert.Contains(content, await result.Content.ReadAsStringAsync()); + + AddAppOffline(deploymentResult.ContentRoot); + + await AssertAppOffline(deploymentResult); + DeletePublishOutput(deploymentResult); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.ShutdownToken)] + public async Task AppOfflineDroppedWhileSiteFailedToStartInRequestHandler_SiteStops_InProcess() + { + var deploymentResult = await DeployApp(HostingModel.InProcess); + + // Set file content to empty so it fails at runtime + File.WriteAllText(Path.Combine(deploymentResult.ContentRoot, "Microsoft.AspNetCore.Server.IIS.dll"), ""); + + var result = await deploymentResult.HttpClient.GetAsync("/"); + Assert.Equal(500, (int)result.StatusCode); + Assert.Contains("500.30", await result.Content.ReadAsStringAsync()); + + AddAppOffline(deploymentResult.ContentRoot); + AssertStopsProcess(deploymentResult); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.ShutdownToken)] + public async Task AppOfflineDroppedWhileSiteStarting_SiteShutsDown_InProcess() + { + var deploymentResult = await DeployApp(HostingModel.InProcess); + + for (int i = 0; i < 10; i++) + { + + // send first request and add app_offline while app is starting + var runningTask = AssertAppOffline(deploymentResult); + + // This test tries to hit a race where we drop app_offline file while + // in process application is starting, application start takes at least 400ms + // so we back off for 100ms to allow request to reach request handler + // Test itself is racy and can result in two scenarios + // 1. ANCM detects app_offline before it starts the request - if AssertAppOffline succeeds we've hit it + // 2. Intended scenario where app starts and then shuts down + // In first case we remove app_offline and try again + await Task.Delay(100); + + AddAppOffline(deploymentResult.ContentRoot); + + try + { + await runningTask.TimeoutAfterDefault(); + + // if AssertAppOffline succeeded ANCM have picked up app_offline before starting the app + // try again + RemoveAppOffline(deploymentResult.ContentRoot); + } + catch + { + AssertStopsProcess(deploymentResult); + return; + } + } + + Assert.True(false); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.ShutdownToken)] + public async Task AppOfflineDroppedWhileSiteRunning_SiteShutsDown_InProcess() + { + var deploymentResult = await AssertStarts(HostingModel.InProcess); + + AddAppOffline(deploymentResult.ContentRoot); + + AssertStopsProcess(deploymentResult); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.ShutdownToken)] + public async Task AppOfflineDroppedWhileSiteRunning_SiteShutsDown_OutOfProcess() + { + var deploymentResult = await AssertStarts(HostingModel.OutOfProcess); + + // Repeat dropping file and restarting multiple times + for (int i = 0; i < 5; i++) + { + AddAppOffline(deploymentResult.ContentRoot); + await AssertAppOffline(deploymentResult); + RemoveAppOffline(deploymentResult.ContentRoot); + await AssertRunning(deploymentResult); + } + + AddAppOffline(deploymentResult.ContentRoot); + await AssertAppOffline(deploymentResult); + DeletePublishOutput(deploymentResult); + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task AppOfflineDropped_CanRemoveAppOfflineAfterAddingAndSiteWorks(HostingModel hostingModel) + { + var deploymentResult = await DeployApp(hostingModel); + + AddAppOffline(deploymentResult.ContentRoot); + + await AssertAppOffline(deploymentResult); + + RemoveAppOffline(deploymentResult.ContentRoot); + + await AssertRunning(deploymentResult); + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task AppOfflineAddedAndRemovedStress(HostingModel hostingModel) + { + var deploymentResult = await AssertStarts(hostingModel); + + var load = Helpers.StressLoad(deploymentResult.HttpClient, "/HelloWorld", response => { + var statusCode = (int)response.StatusCode; + Assert.True(statusCode == 200 || statusCode == 503, "Status code was " + statusCode); + }); + + for (int i = 0; i < 100; i++) + { + // AddAppOffline might fail if app_offline is being read by ANCM and deleted at the same time + RetryHelper.RetryOperation( + () => AddAppOffline(deploymentResult.ContentRoot), + e => Logger.LogError($"Failed to create app_offline : {e.Message}"), + retryCount: 3, + retryDelayMilliseconds: 100); + RemoveAppOffline(deploymentResult.ContentRoot); + } + + try + { + await load; + } + catch (HttpRequestException ex) when (ex.InnerException is IOException | ex.InnerException is SocketException) + { + // IOException in InProcess is fine, just means process stopped + if (hostingModel != HostingModel.InProcess) + { + throw; + } + } + } + + + private async Task DeployApp(HostingModel hostingModel = HostingModel.InProcess) + { + var deploymentParameters = Helpers.GetBaseDeploymentParameters(hostingModel: hostingModel, publish: true); + + return await DeployAsync(deploymentParameters); + } + + private void AddAppOffline(string appPath, string content = "The app is offline.") + { + File.WriteAllText(Path.Combine(appPath, "app_offline.htm"), content); + } + + private void RemoveAppOffline(string appPath) + { + RetryHelper.RetryOperation( + () => File.Delete(Path.Combine(appPath, "app_offline.htm")), + e => Logger.LogError($"Failed to remove app_offline : {e.Message}"), + retryCount: 3, + retryDelayMilliseconds: 100); + } + + private async Task AssertAppOffline(IISDeploymentResult deploymentResult, string expectedResponse = "The app is offline.") + { + HttpResponseMessage response = null; + + for (var i = 0; i < 5; i++) + { + // Keep retrying until app_offline is present. + response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + if (!response.IsSuccessStatusCode) + { + break; + } + } + + Assert.Equal(HttpStatusCode.ServiceUnavailable, response.StatusCode); + + Assert.Equal(expectedResponse, await response.Content.ReadAsStringAsync()); + } + + private void AssertStopsProcess(IISDeploymentResult deploymentResult) + { + var hostShutdownToken = deploymentResult.HostShutdownToken; + + Assert.True(hostShutdownToken.WaitHandle.WaitOne(TimeoutExtensions.DefaultTimeout)); + Assert.True(hostShutdownToken.IsCancellationRequested); + } + + private async Task AssertStarts(HostingModel hostingModel) + { + var deploymentResult = await DeployApp(hostingModel); + + await AssertRunning(deploymentResult); + + return deploymentResult; + } + + private static async Task AssertRunning(IISDeploymentResult deploymentResult) + { + var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); + + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("Hello World", responseText); + } + + private void DeletePublishOutput(IISDeploymentResult deploymentResult) + { + foreach (var file in Directory.GetFiles(deploymentResult.ContentRoot, "*", SearchOption.AllDirectories)) + { + // Out of process module dll is allowed to be locked + var name = Path.GetFileName(file); + if (name == "aspnetcore.dll" || name == "aspnetcorev2.dll" || name == "aspnetcorev2_outofprocess.dll") + { + continue; + } + File.Delete(file); + } + } + + } +} diff --git a/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs b/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs index 74af2e00cb..aa79727e19 100644 --- a/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs +++ b/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs @@ -43,25 +43,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task GetServerVariableDoesNotCrash() { - async Task RunRequests() - { - var client = new HttpClient() { BaseAddress = _fixture.Client.BaseAddress }; - - for (int j = 0; j < 10; j++) - { - var response = await client.GetStringAsync("/GetServerVariableStress"); - Assert.StartsWith("Response Begin", response); - Assert.EndsWith("Response End", response); - } - } - - List tasks = new List(); - for (int i = 0; i < 10; i++) - { - tasks.Add(Task.Run(RunRequests)); - } - - await Task.WhenAll(tasks); + await Helpers.StressLoad(_fixture.Client, "/GetServerVariableStress", response => { + var text = response.Content.ReadAsStringAsync().Result; + Assert.StartsWith("Response Begin", text); + Assert.EndsWith("Response End", text); + }); } } } diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index f4348514d1..c067ff46e6 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Net.Http; using System.Threading.Tasks; using System.Xml.Linq; using Microsoft.AspNetCore.Server.IntegrationTesting; @@ -51,5 +52,27 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal("Hello World", responseText); } + + public static async Task StressLoad(HttpClient httpClient, string path, Action action) + { + async Task RunRequests() + { + var connection = new HttpClient() { BaseAddress = httpClient.BaseAddress }; + + for (int j = 0; j < 10; j++) + { + var response = await connection.GetAsync(path); + action(response); + } + } + + List tasks = new List(); + for (int i = 0; i < 10; i++) + { + tasks.Add(Task.Run(RunRequests)); + } + + await Task.WhenAll(tasks); + } } } diff --git a/test/Common.FunctionalTests/Utilities/IISCapability.cs b/test/Common.FunctionalTests/Utilities/IISCapability.cs index e3a5bf6c4e..d62716db09 100644 --- a/test/Common.FunctionalTests/Utilities/IISCapability.cs +++ b/test/Common.FunctionalTests/Utilities/IISCapability.cs @@ -11,6 +11,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests None = 0, Websockets = 1, WindowsAuthentication = 2, - PoolEnvironmentVariables = 4 + PoolEnvironmentVariables = 4, + ShutdownToken = 8 } } diff --git a/test/IIS.FunctionalTests/RequiresIISAttribute.cs b/test/IIS.FunctionalTests/RequiresIISAttribute.cs index 9befaeba96..f94459fd8f 100644 --- a/test/IIS.FunctionalTests/RequiresIISAttribute.cs +++ b/test/IIS.FunctionalTests/RequiresIISAttribute.cs @@ -130,6 +130,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _skipReason += "The machine does allow for setting environment variables on application pools."; } } + + if (capabilities.HasFlag(IISCapability.ShutdownToken)) + { + _isMet = false; + _skipReason += "https://github.com/aspnet/IISIntegration/issues/1074"; + } } public bool IsMet => _isMet; diff --git a/test/IIS.Tests/TestServerTest.cs b/test/IIS.Tests/TestServerTest.cs index c168af99d8..79b1c42113 100644 --- a/test/IIS.Tests/TestServerTest.cs +++ b/test/IIS.Tests/TestServerTest.cs @@ -19,17 +19,17 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var helloWorld = "Hello World"; var expectedPath = "/Path"; - string path = null; - using (var testServer = await TestServer.Create(ctx => - { - path = ctx.Request.Path.ToString(); - return ctx.Response.WriteAsync(helloWorld); - }, LoggerFactory)) - { - var result = await testServer.HttpClient.GetAsync(expectedPath); - Assert.Equal(helloWorld, await result.Content.ReadAsStringAsync()); - Assert.Equal(expectedPath, path); + string path = null; + using (var testServer = await TestServer.Create(ctx => + { + path = ctx.Request.Path.ToString(); + return ctx.Response.WriteAsync(helloWorld); + }, LoggerFactory)) + { + var result = await testServer.HttpClient.GetAsync(expectedPath); + Assert.Equal(helloWorld, await result.Content.ReadAsStringAsync()); + Assert.Equal(expectedPath, path); + } } } - } } diff --git a/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs b/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs deleted file mode 100644 index 265907542f..0000000000 --- a/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs +++ /dev/null @@ -1,159 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Net; -using System.Net.Http; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging; -using Xunit; -using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; - -namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess -{ - public class AppOfflineTests : IISFunctionalTestBase - { - // TODO these will differ between IIS and IISExpress - [ConditionalTheory] - [InlineData(HostingModel.InProcess)] - [InlineData(HostingModel.OutOfProcess)] - public async Task AppOfflineDroppedWhileSiteIsDown_SiteReturns503(HostingModel hostingModel) - { - var deploymentResult = await DeployApp(hostingModel); - - AddAppOffline(deploymentResult.ContentRoot); - - await AssertAppOffline(deploymentResult); - } - - [ConditionalTheory] - [InlineData(HostingModel.InProcess)] - [InlineData(HostingModel.OutOfProcess)] - public async Task AppOfflineDroppedWhileSiteIsDown_CustomResponse(HostingModel hostingModel) - { - var expectedResponse = "The app is offline."; - var deploymentResult = await DeployApp(hostingModel); - - AddAppOffline(deploymentResult.ContentRoot, expectedResponse); - - await AssertAppOffline(deploymentResult, expectedResponse); - } - - [ConditionalFact] - public async Task AppOfflineDroppedWhileSiteRunning_SiteShutsDown_InProcess() - { - var deploymentResult = await AssertStarts(HostingModel.InProcess); - - AddAppOffline(deploymentResult.ContentRoot); - - await AssertStopsProcess(deploymentResult); - } - - [ConditionalFact] - public async Task AppOfflineDroppedWhileSiteRunning_SiteShutsDown_OutOfProcess() - { - var deploymentResult = await AssertStarts(HostingModel.OutOfProcess); - - // Repeat dropping file and restarting multiple times - for (int i = 0; i < 5; i++) - { - AddAppOffline(deploymentResult.ContentRoot); - await AssertAppOffline(deploymentResult); - RemoveAppOffline(deploymentResult.ContentRoot); - await AssertRunning(deploymentResult); - } - } - - [ConditionalTheory] - [InlineData(HostingModel.InProcess)] - [InlineData(HostingModel.OutOfProcess)] - public async Task AppOfflineDropped_CanRemoveAppOfflineAfterAddingAndSiteWorks(HostingModel hostingModel) - { - var deploymentResult = await DeployApp(hostingModel); - - AddAppOffline(deploymentResult.ContentRoot); - - await AssertAppOffline(deploymentResult); - - RemoveAppOffline(deploymentResult.ContentRoot); - - await AssertRunning(deploymentResult); - } - - private async Task DeployApp(HostingModel hostingModel = HostingModel.InProcess) - { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(hostingModel: hostingModel, publish: true); - - return await DeployAsync(deploymentParameters); - } - - private void AddAppOffline(string appPath, string content = "") - { - File.WriteAllText(Path.Combine(appPath, "app_offline.htm"), content); - } - - private void RemoveAppOffline(string appPath) - { - RetryHelper.RetryOperation( - () => File.Delete(Path.Combine(appPath, "app_offline.htm")), - e => Logger.LogError($"Failed to remove app_offline : {e.Message}"), - retryCount: 3, - retryDelayMilliseconds: 100); - } - - private async Task AssertAppOffline(IISDeploymentResult deploymentResult, string expectedResponse = "") - { - var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); - - for (var i = 0; response.IsSuccessStatusCode && i < 5; i++) - { - // Keep retrying until app_offline is present. - response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); - } - - Assert.Equal(HttpStatusCode.ServiceUnavailable, response.StatusCode); - - Assert.Equal(expectedResponse, await response.Content.ReadAsStringAsync()); - } - - private async Task AssertStopsProcess(IISDeploymentResult deploymentResult) - { - try - { - var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); - } - catch (HttpRequestException) - { - // dropping app_offline will kill the process - } - - var hostShutdownToken = deploymentResult.HostShutdownToken; - - Assert.True(hostShutdownToken.WaitHandle.WaitOne(TimeoutExtensions.DefaultTimeout)); - Assert.True(hostShutdownToken.IsCancellationRequested); - } - - private async Task AssertStarts(HostingModel hostingModel) - { - var deploymentResult = await DeployApp(hostingModel); - - await AssertRunning(deploymentResult); - - return deploymentResult; - } - - private static async Task AssertRunning(IISDeploymentResult deploymentResult) - { - var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); - - var responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal("Hello World", responseText); - } - } -} From afa5d60821eef1731482bafd1134a4cfbc05eb48 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 26 Jul 2018 12:12:12 -0700 Subject: [PATCH 159/363] Add content/webroot and currect directory tests (#1103) --- .../WebHostBuilderIISExtensions.cs | 5 ++- .../IISExpressDeployer.cs | 4 ++- .../LoggingHandler.cs | 1 + .../Inprocess/HostingEnvironmentTests.cs | 33 +++++++++++++++++++ .../OutOfProcess/HelloWorldTest.cs | 7 ++++ .../Utilities/IISTestSiteFixture.cs | 4 +-- .../InProcessWebSite/InProcessWebSite.csproj | 6 +++- test/WebSites/InProcessWebSite/Startup.cs | 9 +++++ .../InProcessWebSite/wwwroot/static.txt | 0 .../OutOfProcessWebSite.csproj | 4 +++ test/WebSites/OutOfProcessWebSite/Program.cs | 2 ++ test/WebSites/OutOfProcessWebSite/Startup.cs | 10 ++++++ .../OutOfProcessWebSite/wwwroot/static.txt | 0 13 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs create mode 100644 test/WebSites/InProcessWebSite/wwwroot/static.txt create mode 100644 test/WebSites/OutOfProcessWebSite/wwwroot/static.txt diff --git a/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs b/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs index 6ce99f7832..146f9a50f5 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO; using System.Runtime.InteropServices; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; @@ -32,7 +33,9 @@ namespace Microsoft.AspNetCore.Hosting hostBuilder.CaptureStartupErrors(true); var iisConfigData = NativeMethods.HttpGetApplicationProperties(); - hostBuilder.UseContentRoot(iisConfigData.pwzFullApplicationPath); + // Trim trailing slash to be consistent with other servers + var contentRoot = iisConfigData.pwzFullApplicationPath.TrimEnd(Path.DirectorySeparatorChar); + hostBuilder.UseContentRoot(contentRoot); return hostBuilder.ConfigureServices( services => { services.AddSingleton(new IISNativeApplication(iisConfigData.pNativeApplication)); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index 0fea5fa391..6d99edf0fd 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -175,7 +175,9 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS UseShellExecute = false, CreateNoWindow = true, RedirectStandardError = true, - RedirectStandardOutput = true + RedirectStandardOutput = true, + // VS sets current directory to C:\Program Files\IIS Express + WorkingDirectory = Path.GetDirectoryName(iisExpressPath) }; AddEnvironmentVariablesToProcess(startInfo, DeploymentParameters.EnvironmentVariables); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs index 241991f62d..d9067c038e 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs @@ -44,6 +44,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS offset += count; } while (count != 0 && offset != buffer.Length); + readAsStreamAsync.Position = 0; _logger.Log(logLevel, Encoding.ASCII.GetString(buffer, 0, offset)); } } diff --git a/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs b/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs new file mode 100644 index 0000000000..061b828a6c --- /dev/null +++ b/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs @@ -0,0 +1,33 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class HostingEnvironmentTests: FixtureLoggedTest + { + private readonly IISTestSiteFixture _fixture; + + public HostingEnvironmentTests(IISTestSiteFixture fixture): base(fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + [RequiresIIS(IISCapability.ShutdownToken)] + public async Task HostingEnvironmentIsCorrect() + { + Assert.Equal( + $"ContentRootPath {_fixture.DeploymentResult.ContentRoot}" + Environment.NewLine + + $"WebRootPath {_fixture.DeploymentResult.ContentRoot}\\wwwroot" + Environment.NewLine + + $"CurrentDirectory {Path.GetDirectoryName(_fixture.DeploymentResult.HostProcess.MainModule.FileName)}", + await _fixture.Client.GetStringAsync("/HostingEnvironment")); + } + } +} diff --git a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 8ae0c7dc89..e868207bb8 100644 --- a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; @@ -58,6 +59,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests responseText = await response.Content.ReadAsStringAsync(); Assert.True("backcompat;Windows".Equals(responseText) || "latest;null".Equals(responseText), "Auth"); + + Assert.Equal( + $"ContentRootPath {deploymentResult.ContentRoot}" + Environment.NewLine + + $"WebRootPath {deploymentResult.ContentRoot}\\wwwroot" + Environment.NewLine + + $"CurrentDirectory {deploymentResult.ContentRoot}", + await deploymentResult.HttpClient.GetStringAsync("/HostingEnvironment")); } } } diff --git a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs index 787276a8fa..fc5a3b6df1 100644 --- a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _deployer = IISApplicationDeployerFactory.Create(deploymentParameters, loggerFactory); - DeploymentResult = _deployer.DeployAsync().Result; + DeploymentResult = (IISDeploymentResult)_deployer.DeployAsync().Result; Client = DeploymentResult.HttpClient; BaseUri = DeploymentResult.ApplicationBaseUri; ShutdownToken = DeploymentResult.HostShutdownToken; @@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public string BaseUri { get; } public HttpClient Client { get; } public CancellationToken ShutdownToken { get; } - public DeploymentResult DeploymentResult { get; } + public IISDeploymentResult DeploymentResult { get; } public TestConnection CreateTestConnection() { diff --git a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj index e5158c8cad..b6d09409c1 100644 --- a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj +++ b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj @@ -1,4 +1,4 @@ - + @@ -13,6 +13,10 @@ + + + + diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index f42e220751..7142f627d3 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -43,6 +43,15 @@ namespace IISTestSite }); } + private async Task HostingEnvironment(HttpContext context) + { + var hostingEnv = context.RequestServices.GetService(); + + await context.Response.WriteAsync("ContentRootPath "+hostingEnv.ContentRootPath + Environment.NewLine); + await context.Response.WriteAsync("WebRootPath "+hostingEnv.WebRootPath + Environment.NewLine); + await context.Response.WriteAsync("CurrentDirectory "+Environment.CurrentDirectory); + } + private void AuthenticationRestricted(IApplicationBuilder app) { app.Run(async ctx => diff --git a/test/WebSites/InProcessWebSite/wwwroot/static.txt b/test/WebSites/InProcessWebSite/wwwroot/static.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj index 399a22e279..36ca6e2b54 100644 --- a/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj +++ b/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj @@ -14,6 +14,10 @@ + + + + diff --git a/test/WebSites/OutOfProcessWebSite/Program.cs b/test/WebSites/OutOfProcessWebSite/Program.cs index 52be26b80c..a5943f5f00 100644 --- a/test/WebSites/OutOfProcessWebSite/Program.cs +++ b/test/WebSites/OutOfProcessWebSite/Program.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Logging; @@ -16,6 +17,7 @@ namespace TestSites factory.AddConsole(); factory.AddFilter("Console", level => level >= LogLevel.Information); }) + .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() .UseStartup() .UseKestrel() diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/test/WebSites/OutOfProcessWebSite/Startup.cs index 185aecb7f4..be44480891 100644 --- a/test/WebSites/OutOfProcessWebSite/Startup.cs +++ b/test/WebSites/OutOfProcessWebSite/Startup.cs @@ -9,6 +9,7 @@ using System.Security.Principal; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.IISIntegration.FunctionalTests; @@ -104,5 +105,14 @@ namespace TestSites return context.Response.WriteAsync(context.Request.Headers["ANCMRHPath"]); } + + private async Task HostingEnvironment(HttpContext context) + { + var hostingEnv = context.RequestServices.GetService(); + + await context.Response.WriteAsync("ContentRootPath "+hostingEnv.ContentRootPath + Environment.NewLine); + await context.Response.WriteAsync("WebRootPath "+hostingEnv.WebRootPath + Environment.NewLine); + await context.Response.WriteAsync("CurrentDirectory "+Environment.CurrentDirectory); + } } } diff --git a/test/WebSites/OutOfProcessWebSite/wwwroot/static.txt b/test/WebSites/OutOfProcessWebSite/wwwroot/static.txt new file mode 100644 index 0000000000..e69de29bb2 From 7067d92c75feaaec4abe8e98162b715588b65c3e Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 26 Jul 2018 14:15:50 -0700 Subject: [PATCH 160/363] Limit RH native assets to netcoreapp2.2 (#1105) --- .../Microsoft.AspNetCore.Server.IIS.csproj | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index 76c3ecfe5c..c2fa16aa42 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -9,6 +9,7 @@ aspnetcore;iis true true + netcoreapp2.2 @@ -23,11 +24,11 @@ - - + + - - + + From f901bca8a7183d7c0d93262fb597bddafc535557 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 27 Jul 2018 15:00:04 -0700 Subject: [PATCH 161/363] Fixing jenkins agents. (#1106) --- build/buildpipeline/windows.groovy | 2 +- build/dependencies.props | 4 ++-- .../IISDeployer.cs | 4 +++- test/Common.FunctionalTests/AppHostConfig/IIS.config | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy index dcd6894cb7..3aa3d99283 100644 --- a/build/buildpipeline/windows.groovy +++ b/build/buildpipeline/windows.groovy @@ -9,7 +9,7 @@ simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { } stage ('Build') { def logFolder = getLogFolder() - def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}';\$env:ASPNETCORE_TEST_SKIP_IIS='true';" + def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"&.\\tools\\update_schema.ps1;${environment};&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\"" } } diff --git a/build/dependencies.props b/build/dependencies.props index 665c81f665..9dc782a008 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) @@ -14,7 +14,7 @@ 2.2.0-preview1-34755 2.2.0-preview1-34755 2.2.0-preview1-34755 - 0.6.0-preview1-34755 + 0.6.0-a-preview1-IISVariants-17101 2.2.0-preview1-34755 2.2.0-preview1-34755 2.2.0-preview1-34755 diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 3f7425fce6..18b8e5d2ea 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -61,7 +61,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS // For now, only support using published output DeploymentParameters.PublishApplicationBeforeDeployment = true; - if (DeploymentParameters.ApplicationType == ApplicationType.Portable) { DefaultWebConfigActions.Add( @@ -75,6 +74,9 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS DotnetPublish(); contentRoot = DeploymentParameters.PublishedApplicationRootPath; IISDeploymentParameters.AddDebugLogToWebConfig(Path.Combine(contentRoot, $"{_application.WebSiteName}.txt")); + DefaultWebConfigActions.Add(WebConfigHelpers.AddOrModifyHandlerSection( + key: "modules", + value: DeploymentParameters.AncmVersion.ToString())); RunWebConfigActions(); } diff --git a/test/Common.FunctionalTests/AppHostConfig/IIS.config b/test/Common.FunctionalTests/AppHostConfig/IIS.config index 4d30d2ad0f..c8c4848e25 100644 --- a/test/Common.FunctionalTests/AppHostConfig/IIS.config +++ b/test/Common.FunctionalTests/AppHostConfig/IIS.config @@ -225,7 +225,6 @@ - @@ -282,7 +281,6 @@ - From 12011b3809ad078eff4c76398b13a44ff0a8e179 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 27 Jul 2018 16:11:17 -0700 Subject: [PATCH 162/363] Cleanup testsite module locations (#1110) --- build/applicationhost.config | 2 +- build/applicationhost.iis.config | 2 +- build/launchSettings.json | 6 ++++-- samples/NativeIISSample/Properties/launchSettings.json | 6 ++++-- .../InProcessWebSite/Properties/launchSettings.json | 6 ++++-- .../OutOfProcessWebSite/Properties/launchSettings.json | 6 ++++-- .../OverriddenServerWebSite/Properties/launchSettings.json | 6 ++++-- .../StartupExceptionWebSite/Properties/launchSettings.json | 6 ++++-- .../StressTestWebSite/Properties/launchSettings.json | 6 ++++-- 9 files changed, 30 insertions(+), 16 deletions(-) diff --git a/build/applicationhost.config b/build/applicationhost.config index 8c7429db8d..ce00a887b4 100644 --- a/build/applicationhost.config +++ b/build/applicationhost.config @@ -233,7 +233,7 @@ - + diff --git a/build/applicationhost.iis.config b/build/applicationhost.iis.config index e7771484cb..34a4da59e6 100644 --- a/build/applicationhost.iis.config +++ b/build/applicationhost.iis.config @@ -226,7 +226,7 @@ - + diff --git a/build/launchSettings.json b/build/launchSettings.json index 0ef9e81546..943d2ad712 100644 --- a/build/launchSettings.json +++ b/build/launchSettings.json @@ -15,7 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -28,7 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/samples/NativeIISSample/Properties/launchSettings.json b/samples/NativeIISSample/Properties/launchSettings.json index 0ef9e81546..943d2ad712 100644 --- a/samples/NativeIISSample/Properties/launchSettings.json +++ b/samples/NativeIISSample/Properties/launchSettings.json @@ -15,7 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -28,7 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/InProcessWebSite/Properties/launchSettings.json b/test/WebSites/InProcessWebSite/Properties/launchSettings.json index 0ef9e81546..943d2ad712 100644 --- a/test/WebSites/InProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/InProcessWebSite/Properties/launchSettings.json @@ -15,7 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -28,7 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json index 0ef9e81546..943d2ad712 100644 --- a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json @@ -15,7 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -28,7 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json index 0ef9e81546..943d2ad712 100644 --- a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json +++ b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json @@ -15,7 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -28,7 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json index 0ef9e81546..943d2ad712 100644 --- a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json +++ b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json @@ -15,7 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -28,7 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/StressTestWebSite/Properties/launchSettings.json b/test/WebSites/StressTestWebSite/Properties/launchSettings.json index 0ef9e81546..943d2ad712 100644 --- a/test/WebSites/StressTestWebSite/Properties/launchSettings.json +++ b/test/WebSites/StressTestWebSite/Properties/launchSettings.json @@ -15,7 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -28,7 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", From c6ba21efc14a145532fef8887ef6c81e9f071830 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 27 Jul 2018 16:34:21 -0700 Subject: [PATCH 163/363] Add VSTS ci pipeline (#893) --- .vsts-pipelines/builds/ci-internal.yml | 13 +++++++++++++ .vsts-pipelines/builds/ci-public.yml | 15 +++++++++++++++ .vsts-pipelines/templates/build-steps.yml | 17 +++++++++++++++++ test/Common.Tests/Common.Tests.csproj | 3 +-- 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 .vsts-pipelines/builds/ci-internal.yml create mode 100644 .vsts-pipelines/builds/ci-public.yml create mode 100644 .vsts-pipelines/templates/build-steps.yml diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml new file mode 100644 index 0000000000..260baf4536 --- /dev/null +++ b/.vsts-pipelines/builds/ci-internal.yml @@ -0,0 +1,13 @@ +trigger: +- master +- release/* + +resources: + repositories: + - repository: buildtools + type: git + name: aspnet-BuildTools + ref: refs/heads/release/2.2 + +phases: +- template: ../templates/build-steps.yml diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml new file mode 100644 index 0000000000..0ed1a241ab --- /dev/null +++ b/.vsts-pipelines/builds/ci-public.yml @@ -0,0 +1,15 @@ +trigger: +- master +- release/* + +# See https://github.com/aspnet/BuildTools +resources: + repositories: + - repository: buildtools + type: github + endpoint: DotNet-Bot GitHub Connection + name: aspnet/BuildTools + ref: refs/heads/release/2.2 + +phases: +- template: ../templates/build-steps.yml diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml new file mode 100644 index 0000000000..40843183ea --- /dev/null +++ b/.vsts-pipelines/templates/build-steps.yml @@ -0,0 +1,17 @@ +phases: +- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools + parameters: + agentOs: Windows + beforeBuild: + - powershell: "& ./tools/update_schema.ps1" + displayName: Update ANCM schema + - powershell: Restart-Service w3svc + displayName: Restart IIS + +- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools + parameters: + agentOs: macOS + +- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools + parameters: + agentOs: Linux diff --git a/test/Common.Tests/Common.Tests.csproj b/test/Common.Tests/Common.Tests.csproj index 50b978f517..ede80732ee 100644 --- a/test/Common.Tests/Common.Tests.csproj +++ b/test/Common.Tests/Common.Tests.csproj @@ -2,6 +2,7 @@ netcoreapp2.2 + false @@ -13,11 +14,9 @@ - - From 0af3bef0fe75c7ff1b98680a9b568ba488b011b9 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 27 Jul 2018 17:32:01 -0700 Subject: [PATCH 164/363] Fix win7 test failures. (#1109) --- .../IISApplication.cs | 3 +-- test/Common.FunctionalTests/AppHostConfig/IIS.config | 1 - test/IIS.FunctionalTests/Properties/AssemblyInfo.cs | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs index b83e7aa4df..bf0c338efc 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs @@ -99,7 +99,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting _logger.LogInformation($"Tried to start site, state: {state.ToString()}"); } } - catch (COMException comException) + catch (Exception ex) when (ex is DllNotFoundException || (ex is COMException && (uint)ex.HResult == 0x800710D8) ) { // Accessing the site.State property while the site // is starting up returns the COMException @@ -107,7 +107,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting // (Exception from HRESULT: 0x800710D8) // This also means the site is not started yet, so catch and retry // after waiting. - _logger.LogWarning($"ComException: {comException.Message}"); } await Task.Delay(_retryDelay); diff --git a/test/Common.FunctionalTests/AppHostConfig/IIS.config b/test/Common.FunctionalTests/AppHostConfig/IIS.config index c8c4848e25..624edf91ca 100644 --- a/test/Common.FunctionalTests/AppHostConfig/IIS.config +++ b/test/Common.FunctionalTests/AppHostConfig/IIS.config @@ -68,7 +68,6 @@
-
diff --git a/test/IIS.FunctionalTests/Properties/AssemblyInfo.cs b/test/IIS.FunctionalTests/Properties/AssemblyInfo.cs index c6007ab5fe..9941a6b5a5 100644 --- a/test/IIS.FunctionalTests/Properties/AssemblyInfo.cs +++ b/test/IIS.FunctionalTests/Properties/AssemblyInfo.cs @@ -7,5 +7,4 @@ using Xunit; [assembly: CollectionBehavior(DisableTestParallelization = true)] [assembly: RequiresIIS] -[assembly: OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "https://github.com/aspnet/IISIntegration/issues/1069")] From b7e26fed9983b4ab5b60e76a7ae76c7a4f251a78 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 29 Jul 2018 12:15:13 -0700 Subject: [PATCH 165/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 57 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 9dc782a008..fe40c919f6 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,41 +1,41 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 0.10.13 - 2.2.0-preview1-17099 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 0.6.0-a-preview1-IISVariants-17101 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 + 2.2.0-preview1-17102 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 0.6.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 15.6.82 15.6.82 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 2.0.9 2.1.2 2.2.0-preview1-26618-02 1.0.1 - 2.2.0-preview1-34755 + 2.2.0-preview1-34823 15.6.1 11.1.0 2.0.3 @@ -49,7 +49,8 @@ 4.5.0 9.0.1 2.3.1 - 2.4.0-rc.1.build4038 + 2.4.0 + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 8b9d17825f..28cd6a5b03 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17099 -commithash:263ed1db9866b6b419b1f5d5189a712aa218acb3 +version:2.2.0-preview1-17102 +commithash:e7e2b5a97ca92cfc6acc4def534cb0901a6d1eb9 From 763f6599516a3a9dee312e64bc207db9e062295d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 29 Jul 2018 19:58:36 +0000 Subject: [PATCH 166/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 71 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index a1e8c3f738..b23adbabd4 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,52 +4,53 @@ 0.10.13 - 3.0.0-alpha1-10011 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 0.7.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 + 3.0.0-alpha1-10015 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 0.7.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 15.6.82 15.6.82 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 - 3.0.0-alpha1-10123 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 + 3.0.0-alpha1-10173 2.0.9 2.1.2 2.2.0-preview1-26618-02 1.0.1 - 3.0.0-alpha1-10123 + 3.0.0-alpha1-10173 15.6.1 11.1.0 2.0.3 - 4.6.0-preview1-26708-04 - 4.6.0-preview1-26708-04 - 4.6.0-preview1-26708-04 - 4.6.0-preview1-26708-04 - 4.6.0-preview1-26708-04 - 4.6.0-preview1-26708-04 - 4.6.0-preview1-26708-04 - 4.6.0-preview1-26708-04 + 4.6.0-preview1-26727-04 + 4.6.0-preview1-26727-04 + 4.6.0-preview1-26727-04 + 4.6.0-preview1-26717-04 + 4.6.0-preview1-26727-04 + 4.6.0-preview1-26727-04 + 4.6.0-preview1-26727-04 + 4.6.0-preview1-26727-04 9.0.1 2.3.1 - 2.4.0-rc.1.build4038 + 2.4.0 + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 4cfdfb010e..8c70cbad9f 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-10011 -commithash:717c2eb1f91dafd2580c1a9b8e5064d12dd8c054 +version:3.0.0-alpha1-10015 +commithash:3f36e5c2f061712f76f2766c435d2555681d5c55 From 41493f01e31c9bd9ed39cc8acbbb99ca5193a379 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Sun, 29 Jul 2018 23:25:32 -0700 Subject: [PATCH 167/363] Don't stop redirect stdout/stderr after startup is done. (#1067) --- .../CommonLib/aspnetcore_msg.mc | 7 ++ .../inprocessapplication.cpp | 8 +- .../managedexports.cpp | 4 +- .../RequestHandlerLib/FileOutputManager.cpp | 89 ++++++++------ .../RequestHandlerLib/FileOutputManager.h | 4 +- .../RequestHandlerLib/IOutputManager.h | 8 +- .../RequestHandlerLib/NullOutputManager.h | 4 +- .../RequestHandlerLib/PipeOutputManager.cpp | 112 ++++++++++-------- .../RequestHandlerLib/PipeOutputManager.h | 10 +- .../Core/IISNativeApplication.cs | 28 +---- .../NativeMethods.cs | 8 +- .../Inprocess/LoggingTests.cs | 3 + .../CommonLibTests/PipeOutputManagerTests.cpp | 5 - .../IIS.FunctionalTests.csproj | 1 - 14 files changed, 144 insertions(+), 147 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc index 477c1a0d0a..c71cbfeee2 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc +++ b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc @@ -237,6 +237,13 @@ Language=English %1 . +Messageid=1035 +SymbolicName=ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT +Language=English +%1 +. + + ; ;#endif // _ASPNETCORE_MODULE_MSG_H_ ; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 756d78954c..2cbcc4d6f3 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -7,10 +7,10 @@ #include "requesthandler_config.h" #include "environmentvariablehelpers.h" #include "utility.h" -#include "EventLog.h" #include "SRWExclusiveLock.h" #include "exceptions.h" #include "LoggingHelpers.h" +#include "resources.h" const LPCSTR IN_PROCESS_APPLICATION::s_exeLocationParameterName = "InProcessExeLocation"; @@ -220,7 +220,6 @@ IN_PROCESS_APPLICATION::SetCallbackHandles( m_ShutdownHandlerContext = pvShutdownHandlerContext; m_AsyncCompletionHandler = async_completion_handler; - m_pLoggerProvider->NotifyStartupComplete(); // Can't check the std err handle as it isn't a critical error // Initialization complete UTILITY::LogEventF(g_hEventLog, @@ -498,11 +497,10 @@ Finished: m_status = APPLICATION_STATUS::SHUTDOWN; m_fShutdownCalledFromManaged = TRUE; FreeLibrary(hModule); + m_pLoggerProvider->Stop(); if (!m_fShutdownCalledFromNative) { - m_pLoggerProvider->NotifyStartupComplete(); - LogErrorsOnMainExit(hr); if (m_fInitialized) { @@ -533,7 +531,7 @@ IN_PROCESS_APPLICATION::LogErrorsOnMainExit( if (SUCCEEDED(struStdMsg.CopyA(straStdErrOutput.QueryStr()))) { UTILITY::LogEventF(g_hEventLog, EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT, + ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT, ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG, m_pConfig->QueryApplicationPath()->QueryStr(), m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp index 6e03ebd859..af0035be11 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp @@ -18,8 +18,7 @@ register_callbacks( _In_ PFN_SHUTDOWN_HANDLER shutdown_handler, _In_ PFN_ASYNC_COMPLETION_HANDLER async_completion_handler, _In_ VOID* pvRequstHandlerContext, - _In_ VOID* pvShutdownHandlerContext, - _Out_ BOOL* pfResetStandardStreams + _In_ VOID* pvShutdownHandlerContext ) { if (pInProcessApplication == NULL) @@ -34,7 +33,6 @@ register_callbacks( pvRequstHandlerContext, pvShutdownHandlerContext ); - *pfResetStandardStreams = !pInProcessApplication->QueryConfig()->QueryStdoutLogEnabled(); return S_OK; } diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp index 358d0f79cd..c5734eeb46 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp @@ -7,48 +7,20 @@ #include "utility.h" #include "exceptions.h" #include "debugutil.h" +#include "SRWExclusiveLock.h" FileOutputManager::FileOutputManager() : m_hLogFileHandle(INVALID_HANDLE_VALUE), m_fdPreviousStdOut(-1), - m_fdPreviousStdErr(-1) + m_fdPreviousStdErr(-1), + m_disposed(false) { + InitializeSRWLock(&m_srwLock); } FileOutputManager::~FileOutputManager() { - HANDLE handle = NULL; - WIN32_FIND_DATA fileData; - - if (m_hLogFileHandle != INVALID_HANDLE_VALUE) - { - m_Timer.CancelTimer(); - } - - // delete empty log file - handle = FindFirstFile(m_struLogFilePath.QueryStr(), &fileData); - if (handle != INVALID_HANDLE_VALUE && - handle != NULL && - fileData.nFileSizeHigh == 0 && - fileData.nFileSizeLow == 0) // skip check of nFileSizeHigh - { - FindClose(handle); - // no need to check whether the deletion succeeds - // as nothing can be done - DeleteFile(m_struLogFilePath.QueryStr()); - } - - if (m_fdPreviousStdOut >= 0) - { - LOG_LAST_ERROR_IF(SetStdHandle(STD_OUTPUT_HANDLE, (HANDLE)_get_osfhandle(m_fdPreviousStdOut))); - LOG_INFOF("Restoring original stdout: %d", m_fdPreviousStdOut); - } - - if (m_fdPreviousStdErr >= 0) - { - LOG_LAST_ERROR_IF(SetStdHandle(STD_ERROR_HANDLE, (HANDLE)_get_osfhandle(m_fdPreviousStdErr))); - LOG_INFOF("Restoring original stderr: %d", m_fdPreviousStdOut); - } + Stop(); } HRESULT @@ -100,8 +72,6 @@ bool FileOutputManager::GetStdOutContent(STRA* struStdOutput) } } - LOG_INFOF("First 4KB captured by stdout: %s", pzFileContents); - return fLogged; } @@ -174,3 +144,52 @@ FileOutputManager::Start() return S_OK; } + + +HRESULT +FileOutputManager::Stop() +{ + if (m_disposed) + { + return S_OK; + } + SRWExclusiveLock lock(m_srwLock); + if (m_disposed) + { + return S_OK; + } + m_disposed = true; + + HANDLE handle = NULL; + WIN32_FIND_DATA fileData; + + if (m_hLogFileHandle != INVALID_HANDLE_VALUE) + { + m_Timer.CancelTimer(); + } + + // delete empty log file + handle = FindFirstFile(m_struLogFilePath.QueryStr(), &fileData); + if (handle != INVALID_HANDLE_VALUE && + handle != NULL && + fileData.nFileSizeHigh == 0 && + fileData.nFileSizeLow == 0) // skip check of nFileSizeHigh + { + FindClose(handle); + LOG_LAST_ERROR_IF(!DeleteFile(m_struLogFilePath.QueryStr())); + } + + if (m_fdPreviousStdOut >= 0) + { + LOG_LAST_ERROR_IF(!SetStdHandle(STD_OUTPUT_HANDLE, (HANDLE)_get_osfhandle(m_fdPreviousStdOut))); + LOG_INFOF("Restoring original stdout: %d", m_fdPreviousStdOut); + } + + if (m_fdPreviousStdErr >= 0) + { + LOG_LAST_ERROR_IF(!SetStdHandle(STD_ERROR_HANDLE, (HANDLE)_get_osfhandle(m_fdPreviousStdErr))); + LOG_INFOF("Restoring original stderr: %d", m_fdPreviousStdOut); + } + + return S_OK; +} diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h index f9a617ccf9..b1a43e6b0d 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h @@ -19,7 +19,7 @@ public: virtual bool GetStdOutContent(STRA* struStdOutput) override; virtual HRESULT Start() override; - virtual void NotifyStartupComplete() override {}; + virtual HRESULT Stop() override; private: HandleWrapper m_hLogFileHandle; @@ -29,5 +29,7 @@ private: STRU m_struLogFilePath; int m_fdPreviousStdOut; int m_fdPreviousStdErr; + BOOL m_disposed; + SRWLOCK m_srwLock; }; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/IOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/IOutputManager.h index 386e6d1a4f..b7e04df059 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/IOutputManager.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/IOutputManager.h @@ -14,12 +14,12 @@ public: virtual ~IOutputManager() {}; - virtual - void - NotifyStartupComplete() = 0; - virtual bool GetStdOutContent(STRA* struStdOutput) = 0; + + virtual + HRESULT + Stop() = 0; }; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/NullOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/NullOutputManager.h index e2cec68179..389f967b69 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/NullOutputManager.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/NullOutputManager.h @@ -15,12 +15,12 @@ public: HRESULT Start() { - // The process has console, e.g., IIS Express scenario return S_OK; } - void NotifyStartupComplete() + HRESULT Stop() { + return S_OK; } bool GetStdOutContent(STRA*) diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp index ade993f37b..6fdcdb078b 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp @@ -14,7 +14,7 @@ PipeOutputManager::PipeOutputManager() : m_hErrReadPipe(INVALID_HANDLE_VALUE), m_hErrWritePipe(INVALID_HANDLE_VALUE), m_hErrThread(NULL), - m_fDisposed(FALSE), + m_disposed(FALSE), m_fdPreviousStdOut(-1), m_fdPreviousStdErr(-1) { @@ -23,26 +23,61 @@ PipeOutputManager::PipeOutputManager() : PipeOutputManager::~PipeOutputManager() { - StopOutputRedirection(); + Stop(); } -VOID -PipeOutputManager::StopOutputRedirection() +HRESULT PipeOutputManager::Start() +{ + SECURITY_ATTRIBUTES saAttr = { 0 }; + HANDLE hStdErrReadPipe; + HANDLE hStdErrWritePipe; + + m_fdPreviousStdOut = _dup(_fileno(stdout)); + LOG_IF_DUPFAIL(m_fdPreviousStdOut); + + m_fdPreviousStdErr = _dup(_fileno(stderr)); + LOG_IF_DUPFAIL(m_fdPreviousStdErr); + + RETURN_LAST_ERROR_IF(!CreatePipe(&hStdErrReadPipe, &hStdErrWritePipe, &saAttr, 0 /*nSize*/)); + + // TODO this still doesn't redirect calls in native, like wprintf + RETURN_LAST_ERROR_IF(!SetStdHandle(STD_ERROR_HANDLE, hStdErrWritePipe)); + + RETURN_LAST_ERROR_IF(!SetStdHandle(STD_OUTPUT_HANDLE, hStdErrWritePipe)); + + m_hErrReadPipe = hStdErrReadPipe; + m_hErrWritePipe = hStdErrWritePipe; + + // Read the stderr handle on a separate thread until we get 4096 bytes. + m_hErrThread = CreateThread( + NULL, // default security attributes + 0, // default stack size + (LPTHREAD_START_ROUTINE)ReadStdErrHandle, + this, // thread function arguments + 0, // default creation flags + NULL); // receive thread identifier + + RETURN_LAST_ERROR_IF_NULL(m_hErrThread); + + return S_OK; +} + +HRESULT PipeOutputManager::Stop() { DWORD dwThreadStatus = 0; STRA straStdOutput; - if (m_fDisposed) + if (m_disposed) { - return; + return S_OK; } SRWExclusiveLock lock(m_srwLock); - if (m_fDisposed) + if (m_disposed) { - return; + return S_OK; } - m_fDisposed = true; + m_disposed = true; fflush(stdout); fflush(stderr); @@ -115,40 +150,6 @@ PipeOutputManager::StopOutputRedirection() // Need to flush contents for the new stdout and stderr _flushall(); } -} - -HRESULT PipeOutputManager::Start() -{ - SECURITY_ATTRIBUTES saAttr = { 0 }; - HANDLE hStdErrReadPipe; - HANDLE hStdErrWritePipe; - - m_fdPreviousStdOut = _dup(_fileno(stdout)); - LOG_IF_DUPFAIL(m_fdPreviousStdOut); - - m_fdPreviousStdErr = _dup(_fileno(stderr)); - LOG_IF_DUPFAIL(m_fdPreviousStdErr); - - RETURN_LAST_ERROR_IF(!CreatePipe(&hStdErrReadPipe, &hStdErrWritePipe, &saAttr, 0 /*nSize*/)); - - // TODO this still doesn't redirect calls in native, like wprintf - RETURN_LAST_ERROR_IF(!SetStdHandle(STD_ERROR_HANDLE, hStdErrWritePipe)); - - RETURN_LAST_ERROR_IF(!SetStdHandle(STD_OUTPUT_HANDLE, hStdErrWritePipe)); - - m_hErrReadPipe = hStdErrReadPipe; - m_hErrWritePipe = hStdErrWritePipe; - - // Read the stderr handle on a separate thread until we get 4096 bytes. - m_hErrThread = CreateThread( - NULL, // default security attributes - 0, // default stack size - (LPTHREAD_START_ROUTINE)ReadStdErrHandle, - this, // thread function arguments - 0, // default creation flags - NULL); // receive thread identifier - - RETURN_LAST_ERROR_IF_NULL(m_hErrThread); return S_OK; } @@ -163,16 +164,17 @@ PipeOutputManager::ReadStdErrHandle( pLoggingProvider->ReadStdErrHandleInternal(); } -bool PipeOutputManager::GetStdOutContent(STRA* struStdOutput) +bool PipeOutputManager::GetStdOutContent(STRA* straStdOutput) { bool fLogged = false; if (m_dwStdErrReadTotal > 0) { - if (SUCCEEDED(struStdOutput->Copy(m_pzFileContents, m_dwStdErrReadTotal))) + if (SUCCEEDED(straStdOutput->Copy(m_pzFileContents, m_dwStdErrReadTotal))) { fLogged = TRUE; } } + return fLogged; } @@ -194,13 +196,19 @@ PipeOutputManager::ReadStdErrHandleInternal( } else if (GetLastError() == ERROR_BROKEN_PIPE) { - break; + return; + } + } + + char tempBuffer[MAX_PIPE_READ_SIZE]; + while (true) + { + if (ReadFile(m_hErrReadPipe, tempBuffer, MAX_PIPE_READ_SIZE, &dwNumBytesRead, NULL)) + { + } + else if (GetLastError() == ERROR_BROKEN_PIPE) + { + return; } } } - -VOID -PipeOutputManager::NotifyStartupComplete() -{ - StopOutputRedirection(); -} diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h index 9a9b306700..3a15c2e68e 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h @@ -13,30 +13,26 @@ public: PipeOutputManager(); ~PipeOutputManager(); - // Inherited via ILoggerProvider virtual HRESULT Start() override; - virtual void NotifyStartupComplete() override; - - // Inherited via IOutputManager + virtual HRESULT Stop() override; virtual bool GetStdOutContent(STRA* struStdOutput) override; + // Thread functions VOID ReadStdErrHandleInternal(VOID); static VOID ReadStdErrHandle(LPVOID pContext); private: - VOID StopOutputRedirection(); - HANDLE m_hErrReadPipe; HANDLE m_hErrWritePipe; STRU m_struLogFilePath; HANDLE m_hErrThread; CHAR m_pzFileContents[MAX_PIPE_READ_SIZE] = { 0 }; DWORD m_dwStdErrReadTotal; - BOOL m_fDisposed; SRWLOCK m_srwLock; int m_fdPreviousStdOut; int m_fdPreviousStdErr; + BOOL m_disposed; }; diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs index 44f9b40bef..d8544239c5 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs @@ -38,33 +38,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core shutdownHandler, onAsyncCompletion, requestContext, - shutdownContext, - out var resetStandardStreams); - - if (resetStandardStreams) - { - ResetStdOutHandles(); - } - } - - private static void ResetStdOutHandles() - { - // By using the PipeOutputRedirection, after calling RegisterCallbacks, - // stdout and stderr will be redirected to NULL. However, if something wrote - // to stdout before redirecting, (like a Console.WriteLine during startup), - // we need to call Console.Set* to pick up the modified consoles outputs. - Console.SetOut(CreateStreamWriter(Console.OpenStandardOutput())); - Console.SetError(CreateStreamWriter(Console.OpenStandardError())); - } - - private static StreamWriter CreateStreamWriter(Stream stdStream) - { - return new StreamWriter( - stdStream, - encoding: Console.OutputEncoding, - bufferSize: 256, - leaveOpen: true) - { AutoFlush = true }; + shutdownContext); } public void Dispose() diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs index 8a6da21e8a..e8aa17a430 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs @@ -59,8 +59,7 @@ namespace Microsoft.AspNetCore.Server.IIS PFN_SHUTDOWN_HANDLER shutdownCallback, PFN_ASYNC_COMPLETION asyncCallback, IntPtr pvRequestContext, - IntPtr pvShutdownContext, - out bool resetStandardStreams); + IntPtr pvShutdownContext); [DllImport(AspNetCoreModuleDll)] private static extern unsafe int http_write_response_bytes(IntPtr pInProcessHandler, HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, int nChunks, out bool fCompletionExpected); @@ -147,10 +146,9 @@ namespace Microsoft.AspNetCore.Server.IIS PFN_SHUTDOWN_HANDLER shutdownCallback, PFN_ASYNC_COMPLETION asyncCallback, IntPtr pvRequestContext, - IntPtr pvShutdownContext, - out bool resetStandardStreams) + IntPtr pvShutdownContext) { - Validate(register_callbacks(pInProcessApplication, requestCallback, shutdownCallback, asyncCallback, pvRequestContext, pvShutdownContext, out resetStandardStreams)); + Validate(register_callbacks(pInProcessApplication, requestCallback, shutdownCallback, asyncCallback, pvRequestContext, pvShutdownContext)); } public static unsafe int HttpWriteResponseBytes(IntPtr pInProcessHandler, HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, int nChunks, out bool fCompletionExpected) diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index eb3294a537..15e9c8c1d9 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -108,6 +108,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CheckStdoutLoggingToPipe_DoesNotCrashProcess(string path) { var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + deploymentParameters.GracefulShutdown = true; var deploymentResult = await DeployAsync(deploymentParameters); await Helpers.AssertStarts(deploymentResult, path); @@ -126,6 +127,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CheckStdoutLoggingToPipeWithFirstWrite(string path) { var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + deploymentParameters.GracefulShutdown = true; + var firstWriteString = path + path; deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_INITIAL_WRITE"] = firstWriteString; diff --git a/test/CommonLibTests/PipeOutputManagerTests.cpp b/test/CommonLibTests/PipeOutputManagerTests.cpp index 67ce9f2f04..6cc09e7678 100644 --- a/test/CommonLibTests/PipeOutputManagerTests.cpp +++ b/test/CommonLibTests/PipeOutputManagerTests.cpp @@ -29,9 +29,6 @@ namespace PipeOutputManagerTests PipeOutputManager* pManager = new PipeOutputManager(); ASSERT_EQ(S_OK, pManager->Start()); - - pManager->NotifyStartupComplete(); - } TEST(PipeManagerOutputTest, SetInvalidHandlesForErrAndOut) @@ -47,8 +44,6 @@ namespace PipeOutputManagerTests PipeOutputManager* pManager = new PipeOutputManager(); ASSERT_EQ(S_OK, pManager->Start()); - pManager->NotifyStartupComplete(); - _dup2(m_fdPreviousStdOut, _fileno(stdout)); _dup2(m_fdPreviousStdErr, _fileno(stderr)); diff --git a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index 319a3726b1..73c2d11f70 100644 --- a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -30,7 +30,6 @@ - From 7d641f87969be1ce160a8f3f504e5a1d2fb512cb Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 30 Jul 2018 08:27:06 -0700 Subject: [PATCH 168/363] Skip VSTS attribute (#1115) --- .vsts-pipelines/templates/build-steps.yml | 2 ++ .../Common.FunctionalTests/SkipVSTSAttribute.cs | 17 +++++++++++++++++ .../Utilities/SkipIISAttribute.cs | 0 .../OutOfProcess/HttpsTest.cs | 1 + 4 files changed, 20 insertions(+) create mode 100644 test/Common.FunctionalTests/SkipVSTSAttribute.cs delete mode 100644 test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml index 40843183ea..33d1e65180 100644 --- a/.vsts-pipelines/templates/build-steps.yml +++ b/.vsts-pipelines/templates/build-steps.yml @@ -3,6 +3,8 @@ phases: parameters: agentOs: Windows beforeBuild: + - powershell: "git submodule update --init" + displayName: Update submodules - powershell: "& ./tools/update_schema.ps1" displayName: Update ANCM schema - powershell: Restart-Service w3svc diff --git a/test/Common.FunctionalTests/SkipVSTSAttribute.cs b/test/Common.FunctionalTests/SkipVSTSAttribute.cs new file mode 100644 index 0000000000..8e88fc8c26 --- /dev/null +++ b/test/Common.FunctionalTests/SkipVSTSAttribute.cs @@ -0,0 +1,17 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class SkipInVSTSAttribute : Attribute, ITestCondition + { + public bool IsMet => string.IsNullOrEmpty(Environment.GetEnvironmentVariable("SYSTEM_TASKDEFINITIONSURI")); + + public string SkipReason => "Running in VSTS"; + } +} diff --git a/test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs b/test/Common.FunctionalTests/Utilities/SkipIISAttribute.cs deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs index ff9996c851..4f0c93b400 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -18,6 +18,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // So these tests always have to use ports in this range, and we can't rely on OS-allocated ports without a whole lot of ceremony around // creating self-signed certificates and registering SSL bindings with HTTP.sys // Test specific to IISExpress + [SkipInVSTS] public class HttpsTest : IISFunctionalTestBase { public HttpsTest(ITestOutputHelper output) : base(output) From 6a29b5296b040ed86f49ca212b7f4ba35b181992 Mon Sep 17 00:00:00 2001 From: Sourabh Shirhatti Date: Mon, 30 Jul 2018 09:50:14 -0700 Subject: [PATCH 169/363] Update Microsoft.AspNetCore.Server.IIS.targets --- .../Microsoft.AspNetCore.Server.IIS.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets index 85d3751b69..a25bbf3b4f 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets @@ -7,7 +7,7 @@ - V2 + AspNetCoreModuleV2 From 132a3828386aaae87bf0369549dcd3ee30fccd37 Mon Sep 17 00:00:00 2001 From: Sourabh Shirhatti Date: Mon, 30 Jul 2018 09:51:17 -0700 Subject: [PATCH 170/363] Update Microsoft.AspNetCore.Server.IISIntegration.targets --- .../Microsoft.AspNetCore.Server.IISIntegration.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets index 67c6152880..a5f7fc6088 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets @@ -1,7 +1,7 @@ - V2 + AspNetCoreModuleV2 From 7a4a945fd65e442265c44150800b5f2e3e8349c8 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 30 Jul 2018 12:58:48 -0700 Subject: [PATCH 171/363] Stop site and app pool before restoring config (#1112) --- .../IISApplication.cs | 46 +++++++++++++++---- .../IISDeployer.cs | 6 ++- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs index bf0c338efc..ce1f3e426e 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs @@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting } AddTemporaryAppHostConfig(); - var apppool = ConfigureAppPool(contentRoot); + ConfigureAppPool(contentRoot); ConfigureSite(contentRoot, port); @@ -73,11 +73,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting _serverManager.CommitChanges(); - await WaitUntilSiteStarted(apppool); + await WaitUntilSiteStarted(); } } - private async Task WaitUntilSiteStarted(ApplicationPool appPool) + private async Task WaitUntilSiteStarted() { var sw = Stopwatch.StartNew(); @@ -85,12 +85,19 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting { try { - var site = _serverManager.Sites.FirstOrDefault(s => s.Name.Equals(WebSiteName)); + var serverManager = new ServerManager(); + var appPool = serverManager.ApplicationPools.FirstOrDefault(s => s.Name.Equals(AppPoolName)); + var site = serverManager.Sites.FirstOrDefault(s => s.Name.Equals(WebSiteName)); if (site.State == ObjectState.Started) { - _logger.LogInformation($"Site {WebSiteName} has started."); - return; + var workerProcess = appPool.WorkerProcesses.SingleOrDefault(); + if (workerProcess != null) + { + HostProcess = Process.GetProcessById(workerProcess.ProcessId); + _logger.LogInformation($"Site {WebSiteName} has started."); + return; + } } else if (site.State != ObjectState.Starting) { @@ -122,11 +129,15 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting return; } - RestoreAppHostConfig(); + StopSite(); + + StopAppPool(); _serverManager.CommitChanges(); await WaitUntilSiteStopped(); + + RestoreAppHostConfig(); } private async Task WaitUntilSiteStopped() @@ -145,8 +156,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting { if (site.State == ObjectState.Stopped) { - _logger.LogInformation($"Site {WebSiteName} has stopped successfully."); - return; + if (HostProcess.HasExited) + { + _logger.LogInformation($"Site {WebSiteName} has stopped successfully."); + return; + } } } catch (COMException) @@ -275,6 +289,20 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting return config; } + private void StopSite() + { + var site = _serverManager.Sites.Where(sites => sites.Name == WebSiteName).SingleOrDefault(); + + site.Stop(); + } + + private void StopAppPool() + { + var appPool = _serverManager.ApplicationPools.Where(pool => pool.Name == AppPoolName).SingleOrDefault(); + + appPool.Stop(); + } + private void SetGlobalModuleSection(Configuration config, string dllRoot) { var ancmFile = GetAncmLocation(dllRoot); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 18b8e5d2ea..ffbc8ba034 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -106,7 +106,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS 5, 200); - Logger.LogInformation($"Found debug log file: {file}"); + if (arr.Length == 0) + { + Logger.LogWarning($"{file} is empty."); + } + foreach (var line in arr) { Logger.LogInformation(line); From 5d4fedaeac71916d59110b3aab0054c8b0bb96b4 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 30 Jul 2018 14:37:33 -0700 Subject: [PATCH 172/363] Remove extra logic from file watcher (#1107) --- .../AspNetCore/applicationinfo.cpp | 5 +- .../CommonLib/application.h | 14 + .../InProcessApplicationBase.cpp | 21 +- .../InProcessApplicationBase.h | 1 - .../inprocessapplication.cpp | 16 +- .../inprocessapplication.h | 2 - .../outprocessapplication.cpp | 13 +- .../outprocessapplication.h | 1 - .../AppOfflineTrackingApplication.cpp | 31 +- .../AppOfflineTrackingApplication.h | 12 +- .../RequestHandlerLib/filewatcher.cpp | 364 +++++------------- .../RequestHandlerLib/filewatcher.h | 112 +----- .../IISApplication.cs | 4 +- .../Common.FunctionalTests/AppOfflineTests.cs | 7 +- 14 files changed, 180 insertions(+), 423 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index a65af02467..307d669dbf 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -64,8 +64,9 @@ APPLICATION_INFO::GetOrCreateApplication( if (m_pApplication->QueryStatus() == RECYCLED) { LOG_INFO("Application went offline"); - // Application that went offline - // are supposed to recycle themselves + + // Call to wait for application to complete stopping + m_pApplication->Stop(/* fServerInitiated */ false); m_pApplication = nullptr; } else diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index 9761851002..1bc3d02f37 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -26,8 +26,19 @@ public: APPLICATION() : m_cRefs(1) { + InitializeSRWLock(&m_stateLock); } + + VOID + Stop(bool fServerInitiated) override + { + UNREFERENCED_PARAMETER(fServerInitiated); + + m_fStopCalled = true; + } + + VOID ReferenceApplication() override { @@ -49,6 +60,9 @@ public: protected: volatile APPLICATION_STATUS m_status = APPLICATION_STATUS::UNKNOWN; + SRWLOCK m_stateLock; + bool m_fStopCalled; + private: mutable LONG m_cRefs; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp index d271a3a30a..3152b75cca 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "InProcessApplicationBase.h" -#include "SRWExclusiveLock.h" hostfxr_main_fn InProcessApplicationBase::s_fMainCallback = NULL; @@ -11,32 +10,14 @@ InProcessApplicationBase::InProcessApplicationBase( IHttpApplication& pHttpApplication) : AppOfflineTrackingApplication(pHttpApplication), m_fRecycleCalled(FALSE), - m_srwLock(), m_pHttpServer(pHttpServer) { - InitializeSRWLock(&m_srwLock); } VOID InProcessApplicationBase::Stop(bool fServerInitiated) { - // We need to guarantee that recycle is only called once, as calling pHttpServer->RecycleProcess - // multiple times can lead to AVs. - if (m_fRecycleCalled) - { - return; - } - - { - SRWExclusiveLock lock(m_srwLock); - - if (m_fRecycleCalled) - { - return; - } - - m_fRecycleCalled = true; - } + AppOfflineTrackingApplication::Stop(fServerInitiated); // Stop was initiated by server no need to do anything, server would stop on it's own if (fServerInitiated) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h index c189095ffa..5df37d34b6 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h @@ -22,7 +22,6 @@ public: protected: BOOL m_fRecycleCalled; - SRWLOCK m_srwLock; IHttpServer& m_pHttpServer; // Allows to override call to hostfxr_main with custome callback // used in testing diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 2cbcc4d6f3..575d9180e4 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -69,6 +69,16 @@ IN_PROCESS_APPLICATION::Stop(bool fServerInitiated) HRESULT hr = S_OK; CHandle hThread; DWORD dwThreadStatus = 0; + + SRWExclusiveLock stopLock(m_stateLock); + + if (m_fStopCalled) + { + return; + } + + AppOfflineTrackingApplication::Stop(fServerInitiated); + DWORD dwTimeout = m_pConfig->QueryShutdownTimeLimitInMS(); if (IsDebuggerPresent()) @@ -149,8 +159,6 @@ IN_PROCESS_APPLICATION::ShutDownInternal() } { - SRWExclusiveLock lock(m_srwLock); - if (m_fShutdownCalledFromNative || m_status == APPLICATION_STATUS::STARTING || m_status == APPLICATION_STATUS::FAIL) @@ -241,7 +249,7 @@ IN_PROCESS_APPLICATION::LoadManagedApplication HRESULT hr = S_OK; DWORD dwTimeout; DWORD dwResult; - + ReferenceApplication(); if (m_status != APPLICATION_STATUS::STARTING) @@ -263,7 +271,7 @@ IN_PROCESS_APPLICATION::LoadManagedApplication { // Set up stdout redirect - SRWExclusiveLock lock(m_srwLock); + SRWExclusiveLock lock(m_stateLock); if (m_pLoggerProvider == NULL) { diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index e23cf6b83a..a18d85a617 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -134,11 +134,9 @@ private: // The exit code of the .NET Core process INT m_ProcessExitCode; - BOOL m_fIsWebSocketsConnection; volatile BOOL m_fBlockCallbacksIntoManaged; volatile BOOL m_fShutdownCalledFromNative; volatile BOOL m_fShutdownCalledFromManaged; - BOOL m_fRecycleCalled; BOOL m_fInitialized; std::unique_ptr m_pConfig; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp index 5f5877edac..41835538a9 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp @@ -14,12 +14,11 @@ OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION( { m_status = APPLICATION_STATUS::RUNNING; m_pProcessManager = NULL; - InitializeSRWLock(&m_srwLock); } OUT_OF_PROCESS_APPLICATION::~OUT_OF_PROCESS_APPLICATION() { - SRWExclusiveLock lock(m_srwLock); + SRWExclusiveLock lock(m_stateLock); if (m_pProcessManager != NULL) { m_pProcessManager->Shutdown(); @@ -65,9 +64,15 @@ __override VOID OUT_OF_PROCESS_APPLICATION::Stop(bool fServerInitiated) { - UNREFERENCED_PARAMETER(fServerInitiated); + SRWExclusiveLock lock(m_stateLock); + + if (m_fStopCalled) + { + return; + } + + AppOfflineTrackingApplication::Stop(fServerInitiated); - SRWExclusiveLock lock(m_srwLock); if (m_pProcessManager != NULL) { m_pProcessManager->Shutdown(); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h index 1667069c09..6ac813f6a7 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h @@ -56,7 +56,6 @@ private: VOID SetWebsocketStatus(IHttpContext *pHttpContext); PROCESS_MANAGER * m_pProcessManager; - SRWLOCK m_srwLock; IHttpServer *m_pHttpServer; WEBSOCKET_STATUS m_fWebSocketSupported; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp index 17c004b693..ed465eb7c1 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp @@ -26,6 +26,19 @@ HRESULT AppOfflineTrackingApplication::StartMonitoringAppOffline() return hr; } +void AppOfflineTrackingApplication::Stop(bool fServerInitiated) +{ + APPLICATION::Stop(fServerInitiated); + + m_status = APPLICATION_STATUS::RECYCLED; + + if (m_fileWatcher) + { + m_fileWatcher->StopMonitor(); + m_fileWatcher = nullptr; + } +} + HRESULT AppOfflineTrackingApplication::StartMonitoringAppOflineImpl() { if (m_fileWatcher) @@ -34,25 +47,21 @@ HRESULT AppOfflineTrackingApplication::StartMonitoringAppOflineImpl() } m_fileWatcher = std::make_unique(); - RETURN_IF_FAILED(m_fileWatcher->Create()); - m_fileWatcherEntry.reset(new FILE_WATCHER_ENTRY(m_fileWatcher.get())); - // FileWatcherCompletionRoutine calls dereference so we need to get ourselves a reference count - m_fileWatcherEntry->ReferenceFileWatcherEntry(); - RETURN_IF_FAILED(m_fileWatcherEntry->Create( - m_applicationPath.c_str(), + RETURN_IF_FAILED(m_fileWatcher->Create(m_applicationPath.c_str(), L"app_offline.htm", - std::bind(&AppOfflineTrackingApplication::OnAppOffline, this), - NULL)); + this)); return S_OK; } void AppOfflineTrackingApplication::OnAppOffline() { + if (m_fAppOfflineProcessed.exchange(true)) + { + return; + } + LOG_INFOF("Received app_offline notification in application %S", m_applicationPath.c_str()); - m_fileWatcherEntry->StopMonitor(); - m_fileWatcherEntry.reset(nullptr); - m_status = APPLICATION_STATUS::RECYCLED; UTILITY::LogEventF(g_hEventLog, EVENTLOG_INFORMATION_TYPE, ASPNETCORE_EVENT_RECYCLE_APPOFFLINE, diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h index 2b6c36ccfa..f104370c72 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h @@ -6,6 +6,7 @@ #include #include "application.h" #include "filewatcher.h" +#include class AppOfflineTrackingApplication: public APPLICATION { @@ -13,20 +14,23 @@ public: AppOfflineTrackingApplication(const IHttpApplication& application) : m_applicationPath(application.GetApplicationPhysicalPath()), m_fileWatcher(nullptr), - m_fileWatcherEntry(nullptr) + m_fAppOfflineProcessed(false) { } ~AppOfflineTrackingApplication() override { - if (m_fileWatcherEntry) + if (m_fileWatcher) { - m_fileWatcherEntry->StopMonitor(); + m_fileWatcher->StopMonitor(); } }; HRESULT StartMonitoringAppOffline(); + + VOID + Stop(bool fServerInitiated) override; virtual VOID @@ -38,5 +42,5 @@ private: std::wstring m_applicationPath; std::unique_ptr m_fileWatcher; - std::unique_ptr m_fileWatcherEntry; + std::atomic_bool m_fAppOfflineProcessed; }; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp index 721e248220..a4d7a0c57e 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp @@ -4,6 +4,7 @@ #include "stdafx.h" #include "filewatcher.h" #include "debugutil.h" +#include "AppOfflineTrackingApplication.h" FILE_WATCHER::FILE_WATCHER() : m_hCompletionPort(NULL), @@ -14,13 +15,13 @@ FILE_WATCHER::FILE_WATCHER() : FILE_WATCHER::~FILE_WATCHER() { + StopMonitor(); + if (m_hChangeNotificationThread != NULL) { DWORD dwRetryCounter = 20; // totally wait for 1s DWORD dwExitCode = STILL_ACTIVE; - // signal the file watch thread to exit - PostQueuedCompletionStatus(m_hCompletionPort, 0, FILE_WATCHER_SHUTDOWN_KEY, NULL); while (!m_fThreadExit && dwRetryCounter > 0) { if (GetExitCodeThread(m_hChangeNotificationThread, &dwExitCode)) @@ -45,55 +46,66 @@ FILE_WATCHER::~FILE_WATCHER() { TerminateThread(m_hChangeNotificationThread, 1); } - - CloseHandle(m_hChangeNotificationThread); - m_hChangeNotificationThread = NULL; - } - - if (NULL != m_hCompletionPort) - { - CloseHandle(m_hCompletionPort); - m_hCompletionPort = NULL; } } HRESULT FILE_WATCHER::Create( - VOID + _In_ PCWSTR pszDirectoryToMonitor, + _In_ PCWSTR pszFileNameToMonitor, + _In_ AppOfflineTrackingApplication *pApplication ) { - HRESULT hr = S_OK; - m_hCompletionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, - NULL, - 0, - 0); + RETURN_LAST_ERROR_IF_NULL(m_hCompletionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0)); - if (m_hCompletionPort == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - m_hChangeNotificationThread = CreateThread(NULL, + RETURN_LAST_ERROR_IF_NULL(m_hChangeNotificationThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)ChangeNotificationThread, this, 0, - NULL); + NULL)); - if (m_hChangeNotificationThread == NULL) + if (pszDirectoryToMonitor == NULL || + pszFileNameToMonitor == NULL || + pApplication == NULL) { - hr = HRESULT_FROM_WIN32(GetLastError()); - - CloseHandle(m_hCompletionPort); - m_hCompletionPort = NULL; - - goto Finished; + DBG_ASSERT(FALSE); + return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); } -Finished: - return hr; + _pApplication = ReferenceApplication(pApplication); + + RETURN_IF_FAILED(_strFileName.Copy(pszFileNameToMonitor)); + RETURN_IF_FAILED(_strDirectoryName.Copy(pszDirectoryToMonitor)); + RETURN_IF_FAILED(_strFullName.Append(_strDirectoryName)); + RETURN_IF_FAILED(_strFullName.Append(_strFileName)); + + // + // Resize change buffer to something "reasonable" + // + RETURN_LAST_ERROR_IF(!_buffDirectoryChanges.Resize(FILE_WATCHER_ENTRY_BUFFER_SIZE)); + + _hDirectory = CreateFileW( + _strDirectoryName.QueryStr(), + FILE_LIST_DIRECTORY, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, + OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, + NULL); + + RETURN_LAST_ERROR_IF_NULL(_hDirectory); + + RETURN_LAST_ERROR_IF_NULL(CreateIoCompletionPort( + _hDirectory, + m_hCompletionPort, + NULL, + 0)); + + RETURN_IF_FAILED(Monitor()); + + return S_OK; } DWORD @@ -148,107 +160,29 @@ Win32 error DBG_ASSERT(pOverlapped != NULL); if (pOverlapped != NULL) { - FileWatcherCompletionRoutine( - dwErrorStatus, - cbCompletion, - pOverlapped); + pFileMonitor->HandleChangeCompletion(cbCompletion); + + if (!pFileMonitor->_lStopMonitorCalled) + { + // + // Continue monitoring + // + pFileMonitor->Monitor(); + } } pOverlapped = NULL; cbCompletion = 0; } pFileMonitor->m_fThreadExit = TRUE; - + LOG_INFO("Stopping file watcher thread"); ExitThread(0); } -VOID -WINAPI -FILE_WATCHER::FileWatcherCompletionRoutine( - DWORD dwCompletionStatus, - DWORD cbCompletion, - OVERLAPPED * pOverlapped -) -/*++ - -Routine Description: - -Called when ReadDirectoryChangesW() completes - -Arguments: - -dwCompletionStatus - Error of completion -cbCompletion - Bytes of completion -pOverlapped - State of completion - -Return Value: - -None - ---*/ -{ - FILE_WATCHER_ENTRY * pMonitorEntry; - pMonitorEntry = CONTAINING_RECORD(pOverlapped, FILE_WATCHER_ENTRY, _overlapped); - - DBG_ASSERT(pMonitorEntry != NULL); - - pMonitorEntry->HandleChangeCompletion(dwCompletionStatus, cbCompletion); - - if (pMonitorEntry->QueryIsValid()) - { - // - // Continue monitoring - // - pMonitorEntry->Monitor(); - } - // - // Deference the counter not matter whether the monitor is valid - // Valid: Monitor increases the counter, need to reduce one - // InValid: Reduce the counter to free the entry - // - pMonitorEntry->DereferenceFileWatcherEntry(); - -} - - -FILE_WATCHER_ENTRY::FILE_WATCHER_ENTRY(FILE_WATCHER * pFileMonitor) : - _pFileMonitor(pFileMonitor), - _hDirectory(INVALID_HANDLE_VALUE), - _hImpersonationToken(NULL), - _pCallback(), - _lStopMonitorCalled(0), - _cRefs(1), - _fIsValid(TRUE) -{ - _dwSignature = FILE_WATCHER_ENTRY_SIGNATURE; - InitializeSRWLock(&_srwLock); -} - -FILE_WATCHER_ENTRY::~FILE_WATCHER_ENTRY() -{ - DBG_ASSERT(_cRefs == 0); - - _dwSignature = FILE_WATCHER_ENTRY_SIGNATURE_FREE; - - if (_hDirectory != INVALID_HANDLE_VALUE) - { - CloseHandle(_hDirectory); - _hDirectory = INVALID_HANDLE_VALUE; - } - - if (_hImpersonationToken != NULL) - { - CloseHandle(_hImpersonationToken); - _hImpersonationToken = NULL; - } -} - -#pragma warning(disable:4100) HRESULT -FILE_WATCHER_ENTRY::HandleChangeCompletion( - _In_ DWORD dwCompletionStatus, +FILE_WATCHER::HandleChangeCompletion( _In_ DWORD cbCompletion ) /*++ @@ -269,16 +203,8 @@ HRESULT --*/ { - HRESULT hr = S_OK; - FILE_NOTIFY_INFORMATION * pNotificationInfo; BOOL fFileChanged = FALSE; - AcquireSRWLockExclusive(&_srwLock); - if (!_fIsValid) - { - goto Finished; - } - // When directory handle is closed then HandleChangeCompletion // happens with cbCompletion = 0 and dwCompletionStatus = 0 // From documentation it is not clear if that combination @@ -289,7 +215,7 @@ HRESULT // if (_lStopMonitorCalled) { - goto Finished; + return S_OK; } // @@ -303,7 +229,7 @@ HRESULT } else { - pNotificationInfo = (FILE_NOTIFY_INFORMATION*)_buffDirectoryChanges.QueryPtr(); + auto pNotificationInfo = (FILE_NOTIFY_INFORMATION*)_buffDirectoryChanges.QueryPtr(); DBG_ASSERT(pNotificationInfo != NULL); while (pNotificationInfo != NULL) @@ -334,55 +260,58 @@ HRESULT } } -Finished: - ReleaseSRWLockExclusive(&_srwLock); - - if (fFileChanged) + if (fFileChanged && !_lStopMonitorCalled) { - // - // so far we only monitoring app_offline - // - _pCallback(); + // Reference application before + _pApplication->ReferenceApplication(); + RETURN_LAST_ERROR_IF(!QueueUserWorkItem(RunNotificationCallback, _pApplication.get(), WT_EXECUTEDEFAULT)); } - return hr; + + return S_OK; } -#pragma warning( error : 4100 ) +DWORD +WINAPI +FILE_WATCHER::RunNotificationCallback( + LPVOID pvArg +) +{ + // Recapture application instance into unique_ptr + auto pApplication = std::unique_ptr(static_cast(pvArg)); + DBG_ASSERT(pFileMonitor != NULL); + pApplication->OnAppOffline(); + + return 0; +} HRESULT -FILE_WATCHER_ENTRY::Monitor(VOID) +FILE_WATCHER::Monitor(VOID) { HRESULT hr = S_OK; DWORD cbRead; - AcquireSRWLockExclusive(&_srwLock); - ReferenceFileWatcherEntry(); + ZeroMemory(&_overlapped, sizeof(_overlapped)); - if (!ReadDirectoryChangesW(_hDirectory, + RETURN_LAST_ERROR_IF(!ReadDirectoryChangesW(_hDirectory, _buffDirectoryChanges.QueryPtr(), _buffDirectoryChanges.QuerySize(), FALSE, // Watching sub dirs. Set to False now as only monitoring app_offline FILE_NOTIFY_VALID_MASK & ~FILE_NOTIFY_CHANGE_LAST_ACCESS, &cbRead, &_overlapped, - NULL)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - DereferenceFileWatcherEntry(); - } + NULL)); // Check if file exist because ReadDirectoryChangesW would not fire events for existing files if (GetFileAttributes(_strFullName.QueryStr()) != INVALID_FILE_ATTRIBUTES) { - PostQueuedCompletionStatus(_pFileMonitor->QueryCompletionPort(), 0, 0, &_overlapped); + PostQueuedCompletionStatus(m_hCompletionPort, 0, 0, &_overlapped); } - - ReleaseSRWLockExclusive(&_srwLock); + return hr; } VOID -FILE_WATCHER_ENTRY::StopMonitor(VOID) +FILE_WATCHER::StopMonitor() { // // Flag that monitoring is being stopped so that @@ -390,123 +319,8 @@ FILE_WATCHER_ENTRY::StopMonitor(VOID) // can be ignored // InterlockedExchange(&_lStopMonitorCalled, 1); - MarkEntryInValid(); - if (_hDirectory != INVALID_HANDLE_VALUE) - { - AcquireSRWLockExclusive(&_srwLock); - if (_hDirectory != INVALID_HANDLE_VALUE) - { - CloseHandle(_hDirectory); - _hDirectory = INVALID_HANDLE_VALUE; - DereferenceFileWatcherEntry(); - } - ReleaseSRWLockExclusive(&_srwLock); - } -} - -HRESULT -FILE_WATCHER_ENTRY::Create( - _In_ PCWSTR pszDirectoryToMonitor, - _In_ PCWSTR pszFileNameToMonitor, - _In_ std::function pCallback, - _In_ HANDLE hImpersonationToken -) -{ - HRESULT hr = S_OK; - BOOL fRet = FALSE; - - if (pszDirectoryToMonitor == NULL || - pszFileNameToMonitor == NULL || - pCallback == NULL) - { - DBG_ASSERT(FALSE); - hr = HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); - goto Finished; - } - - _pCallback = pCallback; - - if (FAILED(hr = _strFileName.Copy(pszFileNameToMonitor))) - { - goto Finished; - } - - if (FAILED(hr = _strDirectoryName.Copy(pszDirectoryToMonitor))) - { - goto Finished; - } - - if (FAILED(hr = _strFullName.Append(_strDirectoryName)) || - FAILED(hr = _strFullName.Append(_strFileName))) - { - goto Finished; - } - - // - // Resize change buffer to something "reasonable" - // - if (!_buffDirectoryChanges.Resize(FILE_WATCHER_ENTRY_BUFFER_SIZE)) - { - hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); - goto Finished; - } - - if (hImpersonationToken != NULL) - { - fRet = DuplicateHandle(GetCurrentProcess(), - hImpersonationToken, - GetCurrentProcess(), - &_hImpersonationToken, - 0, - FALSE, - DUPLICATE_SAME_ACCESS); - - if (!fRet) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - } - else - { - if (_hImpersonationToken != NULL) - { - CloseHandle(_hImpersonationToken); - _hImpersonationToken = NULL; - } - } - - _hDirectory = CreateFileW( - _strDirectoryName.QueryStr(), - FILE_LIST_DIRECTORY, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - NULL, - OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, - NULL); - - if (_hDirectory == INVALID_HANDLE_VALUE) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - if (CreateIoCompletionPort( - _hDirectory, - _pFileMonitor->QueryCompletionPort(), - NULL, - 0) == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - // - // Start monitoring - // - hr = Monitor(); - -Finished: - - return hr; + // signal the file watch thread to exit + PostQueuedCompletionStatus(m_hCompletionPort, 0, FILE_WATCHER_SHUTDOWN_KEY, NULL); + // Release application reference + _pApplication.reset(nullptr); } diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h index 4e37600c69..46ea744533 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h @@ -6,12 +6,14 @@ #include #include +#include "iapplication.h" +#include "HandleWrapper.h" #define FILE_WATCHER_SHUTDOWN_KEY (ULONG_PTR)(-1) #define FILE_WATCHER_ENTRY_BUFFER_SIZE 4096 #define FILE_NOTIFY_VALID_MASK 0x00000fff -#define FILE_WATCHER_ENTRY_SIGNATURE ((DWORD) 'FWES') -#define FILE_WATCHER_ENTRY_SIGNATURE_FREE ((DWORD) 'sewf') + +class AppOfflineTrackingApplication; class FILE_WATCHER{ public: @@ -20,110 +22,36 @@ public: ~FILE_WATCHER(); - HRESULT Create(); - - HANDLE - QueryCompletionPort( - VOID - ) const - { - return m_hCompletionPort; - } + HRESULT Create( + _In_ PCWSTR pszDirectoryToMonitor, + _In_ PCWSTR pszFileNameToMonitor, + _In_ AppOfflineTrackingApplication *pApplication + ); static DWORD WINAPI ChangeNotificationThread(LPVOID); static - void - WINAPI FileWatcherCompletionRoutine - ( - DWORD dwCompletionStatus, - DWORD cbCompletion, - OVERLAPPED * pOverlapped - ); + DWORD + WINAPI RunNotificationCallback(LPVOID); -private: - HANDLE m_hCompletionPort; - HANDLE m_hChangeNotificationThread; - volatile BOOL m_fThreadExit; -}; - -class FILE_WATCHER_ENTRY -{ -public: - FILE_WATCHER_ENTRY(FILE_WATCHER * pFileMonitor); - - OVERLAPPED _overlapped; - - HRESULT - Create( - _In_ PCWSTR pszDirectoryToMonitor, - _In_ PCWSTR pszFileNameToMonitor, - _In_ std::function pCallback, - _In_ HANDLE hImpersonationToken - ); - - VOID - ReferenceFileWatcherEntry() const - { - InterlockedIncrement(&_cRefs); - } - - VOID - DereferenceFileWatcherEntry() const - { - if (InterlockedDecrement(&_cRefs) == 0) - { - delete this; - } - } - - BOOL - QueryIsValid() const - { - return _fIsValid; - } - - VOID - MarkEntryInValid() - { - _fIsValid = FALSE; - } + HRESULT HandleChangeCompletion(DWORD cbCompletion); HRESULT Monitor(); - - VOID StopMonitor(); - - HRESULT - HandleChangeCompletion( - _In_ DWORD dwCompletionStatus, - _In_ DWORD cbCompletion - ); + void StopMonitor(); private: - virtual ~FILE_WATCHER_ENTRY(); + HandleWrapper m_hCompletionPort; + HandleWrapper m_hChangeNotificationThread; + HandleWrapper _hDirectory; + volatile BOOL m_fThreadExit; - DWORD _dwSignature; BUFFER _buffDirectoryChanges; - HANDLE _hImpersonationToken; - HANDLE _hDirectory; - FILE_WATCHER* _pFileMonitor; STRU _strFileName; STRU _strDirectoryName; STRU _strFullName; - LONG _lStopMonitorCalled; - mutable LONG _cRefs; - BOOL _fIsValid; - SRWLOCK _srwLock; - std::function _pCallback; -}; - - -struct FILE_WATCHER_ENTRY_DELETER -{ - void operator()(FILE_WATCHER_ENTRY* entry) const - { - entry->DereferenceFileWatcherEntry(); - } + LONG _lStopMonitorCalled {}; + OVERLAPPED _overlapped; + std::unique_ptr _pApplication; }; diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs index ce1f3e426e..aa35ac92da 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs @@ -18,6 +18,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting /// internal class IISApplication { + internal const int ERROR_OBJECT_NOT_FOUND = unchecked((int)0x800710D8); + private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(10); private static readonly TimeSpan _retryDelay = TimeSpan.FromMilliseconds(200); private readonly ServerManager _serverManager = new ServerManager(); @@ -106,7 +108,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting _logger.LogInformation($"Tried to start site, state: {state.ToString()}"); } } - catch (Exception ex) when (ex is DllNotFoundException || (ex is COMException && (uint)ex.HResult == 0x800710D8) ) + catch (Exception ex) when (ex is DllNotFoundException || (ex is COMException && ex.HResult == ERROR_OBJECT_NOT_FOUND) ) { // Accessing the site.State property while the site // is starting up returns the COMException diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/test/Common.FunctionalTests/AppOfflineTests.cs index b2c30663a9..169be93035 100644 --- a/test/Common.FunctionalTests/AppOfflineTests.cs +++ b/test/Common.FunctionalTests/AppOfflineTests.cs @@ -77,7 +77,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess for (int i = 0; i < 10; i++) { - // send first request and add app_offline while app is starting var runningTask = AssertAppOffline(deploymentResult); @@ -220,14 +219,10 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess { HttpResponseMessage response = null; - for (var i = 0; i < 5; i++) + for (var i = 0; i < 5 && response?.StatusCode != HttpStatusCode.ServiceUnavailable; i++) { // Keep retrying until app_offline is present. response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); - if (!response.IsSuccessStatusCode) - { - break; - } } Assert.Equal(HttpStatusCode.ServiceUnavailable, response.StatusCode); From 652c529f8f0baa2c4504c377bf0d17a1c7ca69cf Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 30 Jul 2018 14:52:04 -0700 Subject: [PATCH 173/363] Fix ServerShutsDownWhenMainExits test (#1120) --- .../InProcess/ShutdownTests.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs index b1ab071c5d..45c9e080aa 100644 --- a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs @@ -1,6 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; +using System.IO; +using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; @@ -22,8 +25,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var parameters = Helpers.GetBaseDeploymentParameters(publish: true); var result = await DeployAsync(parameters); - - var response = await result.RetryingHttpClient.GetAsync("/Shutdown"); + try + { + await result.HttpClient.GetAsync("/Shutdown"); + } + catch (HttpRequestException ex) when (ex.InnerException is IOException) + { + // Server might close a connection before request completes + } Assert.True(result.HostShutdownToken.WaitHandle.WaitOne(TimeoutExtensions.DefaultTimeout)); } From 75316cc0a493f9e602ea05bc0d7672f6a3349994 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 30 Jul 2018 15:33:05 -0700 Subject: [PATCH 174/363] [automated] Merge branch 'release/2.2' => 'master' (#1122) * Remove extra logic from file watcher (#1107) * Fix ServerShutsDownWhenMainExits test (#1120) --- .../AspNetCore/applicationinfo.cpp | 5 +- .../CommonLib/application.h | 14 + .../InProcessApplicationBase.cpp | 21 +- .../InProcessApplicationBase.h | 1 - .../inprocessapplication.cpp | 16 +- .../inprocessapplication.h | 2 - .../outprocessapplication.cpp | 13 +- .../outprocessapplication.h | 1 - .../AppOfflineTrackingApplication.cpp | 31 +- .../AppOfflineTrackingApplication.h | 12 +- .../RequestHandlerLib/filewatcher.cpp | 364 +++++------------- .../RequestHandlerLib/filewatcher.h | 112 +----- .../IISApplication.cs | 4 +- .../Common.FunctionalTests/AppOfflineTests.cs | 7 +- .../InProcess/ShutdownTests.cs | 13 +- 15 files changed, 191 insertions(+), 425 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index a65af02467..307d669dbf 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -64,8 +64,9 @@ APPLICATION_INFO::GetOrCreateApplication( if (m_pApplication->QueryStatus() == RECYCLED) { LOG_INFO("Application went offline"); - // Application that went offline - // are supposed to recycle themselves + + // Call to wait for application to complete stopping + m_pApplication->Stop(/* fServerInitiated */ false); m_pApplication = nullptr; } else diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index 9761851002..1bc3d02f37 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -26,8 +26,19 @@ public: APPLICATION() : m_cRefs(1) { + InitializeSRWLock(&m_stateLock); } + + VOID + Stop(bool fServerInitiated) override + { + UNREFERENCED_PARAMETER(fServerInitiated); + + m_fStopCalled = true; + } + + VOID ReferenceApplication() override { @@ -49,6 +60,9 @@ public: protected: volatile APPLICATION_STATUS m_status = APPLICATION_STATUS::UNKNOWN; + SRWLOCK m_stateLock; + bool m_fStopCalled; + private: mutable LONG m_cRefs; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp index d271a3a30a..3152b75cca 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp @@ -2,7 +2,6 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "InProcessApplicationBase.h" -#include "SRWExclusiveLock.h" hostfxr_main_fn InProcessApplicationBase::s_fMainCallback = NULL; @@ -11,32 +10,14 @@ InProcessApplicationBase::InProcessApplicationBase( IHttpApplication& pHttpApplication) : AppOfflineTrackingApplication(pHttpApplication), m_fRecycleCalled(FALSE), - m_srwLock(), m_pHttpServer(pHttpServer) { - InitializeSRWLock(&m_srwLock); } VOID InProcessApplicationBase::Stop(bool fServerInitiated) { - // We need to guarantee that recycle is only called once, as calling pHttpServer->RecycleProcess - // multiple times can lead to AVs. - if (m_fRecycleCalled) - { - return; - } - - { - SRWExclusiveLock lock(m_srwLock); - - if (m_fRecycleCalled) - { - return; - } - - m_fRecycleCalled = true; - } + AppOfflineTrackingApplication::Stop(fServerInitiated); // Stop was initiated by server no need to do anything, server would stop on it's own if (fServerInitiated) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h index c189095ffa..5df37d34b6 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h @@ -22,7 +22,6 @@ public: protected: BOOL m_fRecycleCalled; - SRWLOCK m_srwLock; IHttpServer& m_pHttpServer; // Allows to override call to hostfxr_main with custome callback // used in testing diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 2cbcc4d6f3..575d9180e4 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -69,6 +69,16 @@ IN_PROCESS_APPLICATION::Stop(bool fServerInitiated) HRESULT hr = S_OK; CHandle hThread; DWORD dwThreadStatus = 0; + + SRWExclusiveLock stopLock(m_stateLock); + + if (m_fStopCalled) + { + return; + } + + AppOfflineTrackingApplication::Stop(fServerInitiated); + DWORD dwTimeout = m_pConfig->QueryShutdownTimeLimitInMS(); if (IsDebuggerPresent()) @@ -149,8 +159,6 @@ IN_PROCESS_APPLICATION::ShutDownInternal() } { - SRWExclusiveLock lock(m_srwLock); - if (m_fShutdownCalledFromNative || m_status == APPLICATION_STATUS::STARTING || m_status == APPLICATION_STATUS::FAIL) @@ -241,7 +249,7 @@ IN_PROCESS_APPLICATION::LoadManagedApplication HRESULT hr = S_OK; DWORD dwTimeout; DWORD dwResult; - + ReferenceApplication(); if (m_status != APPLICATION_STATUS::STARTING) @@ -263,7 +271,7 @@ IN_PROCESS_APPLICATION::LoadManagedApplication { // Set up stdout redirect - SRWExclusiveLock lock(m_srwLock); + SRWExclusiveLock lock(m_stateLock); if (m_pLoggerProvider == NULL) { diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index e23cf6b83a..a18d85a617 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -134,11 +134,9 @@ private: // The exit code of the .NET Core process INT m_ProcessExitCode; - BOOL m_fIsWebSocketsConnection; volatile BOOL m_fBlockCallbacksIntoManaged; volatile BOOL m_fShutdownCalledFromNative; volatile BOOL m_fShutdownCalledFromManaged; - BOOL m_fRecycleCalled; BOOL m_fInitialized; std::unique_ptr m_pConfig; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp index 5f5877edac..41835538a9 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp @@ -14,12 +14,11 @@ OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION( { m_status = APPLICATION_STATUS::RUNNING; m_pProcessManager = NULL; - InitializeSRWLock(&m_srwLock); } OUT_OF_PROCESS_APPLICATION::~OUT_OF_PROCESS_APPLICATION() { - SRWExclusiveLock lock(m_srwLock); + SRWExclusiveLock lock(m_stateLock); if (m_pProcessManager != NULL) { m_pProcessManager->Shutdown(); @@ -65,9 +64,15 @@ __override VOID OUT_OF_PROCESS_APPLICATION::Stop(bool fServerInitiated) { - UNREFERENCED_PARAMETER(fServerInitiated); + SRWExclusiveLock lock(m_stateLock); + + if (m_fStopCalled) + { + return; + } + + AppOfflineTrackingApplication::Stop(fServerInitiated); - SRWExclusiveLock lock(m_srwLock); if (m_pProcessManager != NULL) { m_pProcessManager->Shutdown(); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h index 1667069c09..6ac813f6a7 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h @@ -56,7 +56,6 @@ private: VOID SetWebsocketStatus(IHttpContext *pHttpContext); PROCESS_MANAGER * m_pProcessManager; - SRWLOCK m_srwLock; IHttpServer *m_pHttpServer; WEBSOCKET_STATUS m_fWebSocketSupported; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp index 17c004b693..ed465eb7c1 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp @@ -26,6 +26,19 @@ HRESULT AppOfflineTrackingApplication::StartMonitoringAppOffline() return hr; } +void AppOfflineTrackingApplication::Stop(bool fServerInitiated) +{ + APPLICATION::Stop(fServerInitiated); + + m_status = APPLICATION_STATUS::RECYCLED; + + if (m_fileWatcher) + { + m_fileWatcher->StopMonitor(); + m_fileWatcher = nullptr; + } +} + HRESULT AppOfflineTrackingApplication::StartMonitoringAppOflineImpl() { if (m_fileWatcher) @@ -34,25 +47,21 @@ HRESULT AppOfflineTrackingApplication::StartMonitoringAppOflineImpl() } m_fileWatcher = std::make_unique(); - RETURN_IF_FAILED(m_fileWatcher->Create()); - m_fileWatcherEntry.reset(new FILE_WATCHER_ENTRY(m_fileWatcher.get())); - // FileWatcherCompletionRoutine calls dereference so we need to get ourselves a reference count - m_fileWatcherEntry->ReferenceFileWatcherEntry(); - RETURN_IF_FAILED(m_fileWatcherEntry->Create( - m_applicationPath.c_str(), + RETURN_IF_FAILED(m_fileWatcher->Create(m_applicationPath.c_str(), L"app_offline.htm", - std::bind(&AppOfflineTrackingApplication::OnAppOffline, this), - NULL)); + this)); return S_OK; } void AppOfflineTrackingApplication::OnAppOffline() { + if (m_fAppOfflineProcessed.exchange(true)) + { + return; + } + LOG_INFOF("Received app_offline notification in application %S", m_applicationPath.c_str()); - m_fileWatcherEntry->StopMonitor(); - m_fileWatcherEntry.reset(nullptr); - m_status = APPLICATION_STATUS::RECYCLED; UTILITY::LogEventF(g_hEventLog, EVENTLOG_INFORMATION_TYPE, ASPNETCORE_EVENT_RECYCLE_APPOFFLINE, diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h index 2b6c36ccfa..f104370c72 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h @@ -6,6 +6,7 @@ #include #include "application.h" #include "filewatcher.h" +#include class AppOfflineTrackingApplication: public APPLICATION { @@ -13,20 +14,23 @@ public: AppOfflineTrackingApplication(const IHttpApplication& application) : m_applicationPath(application.GetApplicationPhysicalPath()), m_fileWatcher(nullptr), - m_fileWatcherEntry(nullptr) + m_fAppOfflineProcessed(false) { } ~AppOfflineTrackingApplication() override { - if (m_fileWatcherEntry) + if (m_fileWatcher) { - m_fileWatcherEntry->StopMonitor(); + m_fileWatcher->StopMonitor(); } }; HRESULT StartMonitoringAppOffline(); + + VOID + Stop(bool fServerInitiated) override; virtual VOID @@ -38,5 +42,5 @@ private: std::wstring m_applicationPath; std::unique_ptr m_fileWatcher; - std::unique_ptr m_fileWatcherEntry; + std::atomic_bool m_fAppOfflineProcessed; }; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp index 721e248220..a4d7a0c57e 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp @@ -4,6 +4,7 @@ #include "stdafx.h" #include "filewatcher.h" #include "debugutil.h" +#include "AppOfflineTrackingApplication.h" FILE_WATCHER::FILE_WATCHER() : m_hCompletionPort(NULL), @@ -14,13 +15,13 @@ FILE_WATCHER::FILE_WATCHER() : FILE_WATCHER::~FILE_WATCHER() { + StopMonitor(); + if (m_hChangeNotificationThread != NULL) { DWORD dwRetryCounter = 20; // totally wait for 1s DWORD dwExitCode = STILL_ACTIVE; - // signal the file watch thread to exit - PostQueuedCompletionStatus(m_hCompletionPort, 0, FILE_WATCHER_SHUTDOWN_KEY, NULL); while (!m_fThreadExit && dwRetryCounter > 0) { if (GetExitCodeThread(m_hChangeNotificationThread, &dwExitCode)) @@ -45,55 +46,66 @@ FILE_WATCHER::~FILE_WATCHER() { TerminateThread(m_hChangeNotificationThread, 1); } - - CloseHandle(m_hChangeNotificationThread); - m_hChangeNotificationThread = NULL; - } - - if (NULL != m_hCompletionPort) - { - CloseHandle(m_hCompletionPort); - m_hCompletionPort = NULL; } } HRESULT FILE_WATCHER::Create( - VOID + _In_ PCWSTR pszDirectoryToMonitor, + _In_ PCWSTR pszFileNameToMonitor, + _In_ AppOfflineTrackingApplication *pApplication ) { - HRESULT hr = S_OK; - m_hCompletionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, - NULL, - 0, - 0); + RETURN_LAST_ERROR_IF_NULL(m_hCompletionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0)); - if (m_hCompletionPort == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - m_hChangeNotificationThread = CreateThread(NULL, + RETURN_LAST_ERROR_IF_NULL(m_hChangeNotificationThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)ChangeNotificationThread, this, 0, - NULL); + NULL)); - if (m_hChangeNotificationThread == NULL) + if (pszDirectoryToMonitor == NULL || + pszFileNameToMonitor == NULL || + pApplication == NULL) { - hr = HRESULT_FROM_WIN32(GetLastError()); - - CloseHandle(m_hCompletionPort); - m_hCompletionPort = NULL; - - goto Finished; + DBG_ASSERT(FALSE); + return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); } -Finished: - return hr; + _pApplication = ReferenceApplication(pApplication); + + RETURN_IF_FAILED(_strFileName.Copy(pszFileNameToMonitor)); + RETURN_IF_FAILED(_strDirectoryName.Copy(pszDirectoryToMonitor)); + RETURN_IF_FAILED(_strFullName.Append(_strDirectoryName)); + RETURN_IF_FAILED(_strFullName.Append(_strFileName)); + + // + // Resize change buffer to something "reasonable" + // + RETURN_LAST_ERROR_IF(!_buffDirectoryChanges.Resize(FILE_WATCHER_ENTRY_BUFFER_SIZE)); + + _hDirectory = CreateFileW( + _strDirectoryName.QueryStr(), + FILE_LIST_DIRECTORY, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, + OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, + NULL); + + RETURN_LAST_ERROR_IF_NULL(_hDirectory); + + RETURN_LAST_ERROR_IF_NULL(CreateIoCompletionPort( + _hDirectory, + m_hCompletionPort, + NULL, + 0)); + + RETURN_IF_FAILED(Monitor()); + + return S_OK; } DWORD @@ -148,107 +160,29 @@ Win32 error DBG_ASSERT(pOverlapped != NULL); if (pOverlapped != NULL) { - FileWatcherCompletionRoutine( - dwErrorStatus, - cbCompletion, - pOverlapped); + pFileMonitor->HandleChangeCompletion(cbCompletion); + + if (!pFileMonitor->_lStopMonitorCalled) + { + // + // Continue monitoring + // + pFileMonitor->Monitor(); + } } pOverlapped = NULL; cbCompletion = 0; } pFileMonitor->m_fThreadExit = TRUE; - + LOG_INFO("Stopping file watcher thread"); ExitThread(0); } -VOID -WINAPI -FILE_WATCHER::FileWatcherCompletionRoutine( - DWORD dwCompletionStatus, - DWORD cbCompletion, - OVERLAPPED * pOverlapped -) -/*++ - -Routine Description: - -Called when ReadDirectoryChangesW() completes - -Arguments: - -dwCompletionStatus - Error of completion -cbCompletion - Bytes of completion -pOverlapped - State of completion - -Return Value: - -None - ---*/ -{ - FILE_WATCHER_ENTRY * pMonitorEntry; - pMonitorEntry = CONTAINING_RECORD(pOverlapped, FILE_WATCHER_ENTRY, _overlapped); - - DBG_ASSERT(pMonitorEntry != NULL); - - pMonitorEntry->HandleChangeCompletion(dwCompletionStatus, cbCompletion); - - if (pMonitorEntry->QueryIsValid()) - { - // - // Continue monitoring - // - pMonitorEntry->Monitor(); - } - // - // Deference the counter not matter whether the monitor is valid - // Valid: Monitor increases the counter, need to reduce one - // InValid: Reduce the counter to free the entry - // - pMonitorEntry->DereferenceFileWatcherEntry(); - -} - - -FILE_WATCHER_ENTRY::FILE_WATCHER_ENTRY(FILE_WATCHER * pFileMonitor) : - _pFileMonitor(pFileMonitor), - _hDirectory(INVALID_HANDLE_VALUE), - _hImpersonationToken(NULL), - _pCallback(), - _lStopMonitorCalled(0), - _cRefs(1), - _fIsValid(TRUE) -{ - _dwSignature = FILE_WATCHER_ENTRY_SIGNATURE; - InitializeSRWLock(&_srwLock); -} - -FILE_WATCHER_ENTRY::~FILE_WATCHER_ENTRY() -{ - DBG_ASSERT(_cRefs == 0); - - _dwSignature = FILE_WATCHER_ENTRY_SIGNATURE_FREE; - - if (_hDirectory != INVALID_HANDLE_VALUE) - { - CloseHandle(_hDirectory); - _hDirectory = INVALID_HANDLE_VALUE; - } - - if (_hImpersonationToken != NULL) - { - CloseHandle(_hImpersonationToken); - _hImpersonationToken = NULL; - } -} - -#pragma warning(disable:4100) HRESULT -FILE_WATCHER_ENTRY::HandleChangeCompletion( - _In_ DWORD dwCompletionStatus, +FILE_WATCHER::HandleChangeCompletion( _In_ DWORD cbCompletion ) /*++ @@ -269,16 +203,8 @@ HRESULT --*/ { - HRESULT hr = S_OK; - FILE_NOTIFY_INFORMATION * pNotificationInfo; BOOL fFileChanged = FALSE; - AcquireSRWLockExclusive(&_srwLock); - if (!_fIsValid) - { - goto Finished; - } - // When directory handle is closed then HandleChangeCompletion // happens with cbCompletion = 0 and dwCompletionStatus = 0 // From documentation it is not clear if that combination @@ -289,7 +215,7 @@ HRESULT // if (_lStopMonitorCalled) { - goto Finished; + return S_OK; } // @@ -303,7 +229,7 @@ HRESULT } else { - pNotificationInfo = (FILE_NOTIFY_INFORMATION*)_buffDirectoryChanges.QueryPtr(); + auto pNotificationInfo = (FILE_NOTIFY_INFORMATION*)_buffDirectoryChanges.QueryPtr(); DBG_ASSERT(pNotificationInfo != NULL); while (pNotificationInfo != NULL) @@ -334,55 +260,58 @@ HRESULT } } -Finished: - ReleaseSRWLockExclusive(&_srwLock); - - if (fFileChanged) + if (fFileChanged && !_lStopMonitorCalled) { - // - // so far we only monitoring app_offline - // - _pCallback(); + // Reference application before + _pApplication->ReferenceApplication(); + RETURN_LAST_ERROR_IF(!QueueUserWorkItem(RunNotificationCallback, _pApplication.get(), WT_EXECUTEDEFAULT)); } - return hr; + + return S_OK; } -#pragma warning( error : 4100 ) +DWORD +WINAPI +FILE_WATCHER::RunNotificationCallback( + LPVOID pvArg +) +{ + // Recapture application instance into unique_ptr + auto pApplication = std::unique_ptr(static_cast(pvArg)); + DBG_ASSERT(pFileMonitor != NULL); + pApplication->OnAppOffline(); + + return 0; +} HRESULT -FILE_WATCHER_ENTRY::Monitor(VOID) +FILE_WATCHER::Monitor(VOID) { HRESULT hr = S_OK; DWORD cbRead; - AcquireSRWLockExclusive(&_srwLock); - ReferenceFileWatcherEntry(); + ZeroMemory(&_overlapped, sizeof(_overlapped)); - if (!ReadDirectoryChangesW(_hDirectory, + RETURN_LAST_ERROR_IF(!ReadDirectoryChangesW(_hDirectory, _buffDirectoryChanges.QueryPtr(), _buffDirectoryChanges.QuerySize(), FALSE, // Watching sub dirs. Set to False now as only monitoring app_offline FILE_NOTIFY_VALID_MASK & ~FILE_NOTIFY_CHANGE_LAST_ACCESS, &cbRead, &_overlapped, - NULL)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - DereferenceFileWatcherEntry(); - } + NULL)); // Check if file exist because ReadDirectoryChangesW would not fire events for existing files if (GetFileAttributes(_strFullName.QueryStr()) != INVALID_FILE_ATTRIBUTES) { - PostQueuedCompletionStatus(_pFileMonitor->QueryCompletionPort(), 0, 0, &_overlapped); + PostQueuedCompletionStatus(m_hCompletionPort, 0, 0, &_overlapped); } - - ReleaseSRWLockExclusive(&_srwLock); + return hr; } VOID -FILE_WATCHER_ENTRY::StopMonitor(VOID) +FILE_WATCHER::StopMonitor() { // // Flag that monitoring is being stopped so that @@ -390,123 +319,8 @@ FILE_WATCHER_ENTRY::StopMonitor(VOID) // can be ignored // InterlockedExchange(&_lStopMonitorCalled, 1); - MarkEntryInValid(); - if (_hDirectory != INVALID_HANDLE_VALUE) - { - AcquireSRWLockExclusive(&_srwLock); - if (_hDirectory != INVALID_HANDLE_VALUE) - { - CloseHandle(_hDirectory); - _hDirectory = INVALID_HANDLE_VALUE; - DereferenceFileWatcherEntry(); - } - ReleaseSRWLockExclusive(&_srwLock); - } -} - -HRESULT -FILE_WATCHER_ENTRY::Create( - _In_ PCWSTR pszDirectoryToMonitor, - _In_ PCWSTR pszFileNameToMonitor, - _In_ std::function pCallback, - _In_ HANDLE hImpersonationToken -) -{ - HRESULT hr = S_OK; - BOOL fRet = FALSE; - - if (pszDirectoryToMonitor == NULL || - pszFileNameToMonitor == NULL || - pCallback == NULL) - { - DBG_ASSERT(FALSE); - hr = HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); - goto Finished; - } - - _pCallback = pCallback; - - if (FAILED(hr = _strFileName.Copy(pszFileNameToMonitor))) - { - goto Finished; - } - - if (FAILED(hr = _strDirectoryName.Copy(pszDirectoryToMonitor))) - { - goto Finished; - } - - if (FAILED(hr = _strFullName.Append(_strDirectoryName)) || - FAILED(hr = _strFullName.Append(_strFileName))) - { - goto Finished; - } - - // - // Resize change buffer to something "reasonable" - // - if (!_buffDirectoryChanges.Resize(FILE_WATCHER_ENTRY_BUFFER_SIZE)) - { - hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); - goto Finished; - } - - if (hImpersonationToken != NULL) - { - fRet = DuplicateHandle(GetCurrentProcess(), - hImpersonationToken, - GetCurrentProcess(), - &_hImpersonationToken, - 0, - FALSE, - DUPLICATE_SAME_ACCESS); - - if (!fRet) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - } - else - { - if (_hImpersonationToken != NULL) - { - CloseHandle(_hImpersonationToken); - _hImpersonationToken = NULL; - } - } - - _hDirectory = CreateFileW( - _strDirectoryName.QueryStr(), - FILE_LIST_DIRECTORY, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - NULL, - OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, - NULL); - - if (_hDirectory == INVALID_HANDLE_VALUE) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - if (CreateIoCompletionPort( - _hDirectory, - _pFileMonitor->QueryCompletionPort(), - NULL, - 0) == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - // - // Start monitoring - // - hr = Monitor(); - -Finished: - - return hr; + // signal the file watch thread to exit + PostQueuedCompletionStatus(m_hCompletionPort, 0, FILE_WATCHER_SHUTDOWN_KEY, NULL); + // Release application reference + _pApplication.reset(nullptr); } diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h index 4e37600c69..46ea744533 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h @@ -6,12 +6,14 @@ #include #include +#include "iapplication.h" +#include "HandleWrapper.h" #define FILE_WATCHER_SHUTDOWN_KEY (ULONG_PTR)(-1) #define FILE_WATCHER_ENTRY_BUFFER_SIZE 4096 #define FILE_NOTIFY_VALID_MASK 0x00000fff -#define FILE_WATCHER_ENTRY_SIGNATURE ((DWORD) 'FWES') -#define FILE_WATCHER_ENTRY_SIGNATURE_FREE ((DWORD) 'sewf') + +class AppOfflineTrackingApplication; class FILE_WATCHER{ public: @@ -20,110 +22,36 @@ public: ~FILE_WATCHER(); - HRESULT Create(); - - HANDLE - QueryCompletionPort( - VOID - ) const - { - return m_hCompletionPort; - } + HRESULT Create( + _In_ PCWSTR pszDirectoryToMonitor, + _In_ PCWSTR pszFileNameToMonitor, + _In_ AppOfflineTrackingApplication *pApplication + ); static DWORD WINAPI ChangeNotificationThread(LPVOID); static - void - WINAPI FileWatcherCompletionRoutine - ( - DWORD dwCompletionStatus, - DWORD cbCompletion, - OVERLAPPED * pOverlapped - ); + DWORD + WINAPI RunNotificationCallback(LPVOID); -private: - HANDLE m_hCompletionPort; - HANDLE m_hChangeNotificationThread; - volatile BOOL m_fThreadExit; -}; - -class FILE_WATCHER_ENTRY -{ -public: - FILE_WATCHER_ENTRY(FILE_WATCHER * pFileMonitor); - - OVERLAPPED _overlapped; - - HRESULT - Create( - _In_ PCWSTR pszDirectoryToMonitor, - _In_ PCWSTR pszFileNameToMonitor, - _In_ std::function pCallback, - _In_ HANDLE hImpersonationToken - ); - - VOID - ReferenceFileWatcherEntry() const - { - InterlockedIncrement(&_cRefs); - } - - VOID - DereferenceFileWatcherEntry() const - { - if (InterlockedDecrement(&_cRefs) == 0) - { - delete this; - } - } - - BOOL - QueryIsValid() const - { - return _fIsValid; - } - - VOID - MarkEntryInValid() - { - _fIsValid = FALSE; - } + HRESULT HandleChangeCompletion(DWORD cbCompletion); HRESULT Monitor(); - - VOID StopMonitor(); - - HRESULT - HandleChangeCompletion( - _In_ DWORD dwCompletionStatus, - _In_ DWORD cbCompletion - ); + void StopMonitor(); private: - virtual ~FILE_WATCHER_ENTRY(); + HandleWrapper m_hCompletionPort; + HandleWrapper m_hChangeNotificationThread; + HandleWrapper _hDirectory; + volatile BOOL m_fThreadExit; - DWORD _dwSignature; BUFFER _buffDirectoryChanges; - HANDLE _hImpersonationToken; - HANDLE _hDirectory; - FILE_WATCHER* _pFileMonitor; STRU _strFileName; STRU _strDirectoryName; STRU _strFullName; - LONG _lStopMonitorCalled; - mutable LONG _cRefs; - BOOL _fIsValid; - SRWLOCK _srwLock; - std::function _pCallback; -}; - - -struct FILE_WATCHER_ENTRY_DELETER -{ - void operator()(FILE_WATCHER_ENTRY* entry) const - { - entry->DereferenceFileWatcherEntry(); - } + LONG _lStopMonitorCalled {}; + OVERLAPPED _overlapped; + std::unique_ptr _pApplication; }; diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs index ce1f3e426e..aa35ac92da 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs @@ -18,6 +18,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting /// internal class IISApplication { + internal const int ERROR_OBJECT_NOT_FOUND = unchecked((int)0x800710D8); + private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(10); private static readonly TimeSpan _retryDelay = TimeSpan.FromMilliseconds(200); private readonly ServerManager _serverManager = new ServerManager(); @@ -106,7 +108,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting _logger.LogInformation($"Tried to start site, state: {state.ToString()}"); } } - catch (Exception ex) when (ex is DllNotFoundException || (ex is COMException && (uint)ex.HResult == 0x800710D8) ) + catch (Exception ex) when (ex is DllNotFoundException || (ex is COMException && ex.HResult == ERROR_OBJECT_NOT_FOUND) ) { // Accessing the site.State property while the site // is starting up returns the COMException diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/test/Common.FunctionalTests/AppOfflineTests.cs index b2c30663a9..169be93035 100644 --- a/test/Common.FunctionalTests/AppOfflineTests.cs +++ b/test/Common.FunctionalTests/AppOfflineTests.cs @@ -77,7 +77,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess for (int i = 0; i < 10; i++) { - // send first request and add app_offline while app is starting var runningTask = AssertAppOffline(deploymentResult); @@ -220,14 +219,10 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess { HttpResponseMessage response = null; - for (var i = 0; i < 5; i++) + for (var i = 0; i < 5 && response?.StatusCode != HttpStatusCode.ServiceUnavailable; i++) { // Keep retrying until app_offline is present. response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); - if (!response.IsSuccessStatusCode) - { - break; - } } Assert.Equal(HttpStatusCode.ServiceUnavailable, response.StatusCode); diff --git a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs index b1ab071c5d..45c9e080aa 100644 --- a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs @@ -1,6 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; +using System.IO; +using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; @@ -22,8 +25,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var parameters = Helpers.GetBaseDeploymentParameters(publish: true); var result = await DeployAsync(parameters); - - var response = await result.RetryingHttpClient.GetAsync("/Shutdown"); + try + { + await result.HttpClient.GetAsync("/Shutdown"); + } + catch (HttpRequestException ex) when (ex.InnerException is IOException) + { + // Server might close a connection before request completes + } Assert.True(result.HostShutdownToken.WaitHandle.WaitOne(TimeoutExtensions.DefaultTimeout)); } From d99d2d881c464879f7e7a4dcf8282c0215d31a79 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 31 Jul 2018 16:35:34 -0700 Subject: [PATCH 175/363] Fix HTTPS certs on VSTS (#1123) --- .vsts-pipelines/templates/build-steps.yml | 8 ++------ .../OutOfProcess/HttpsTest.cs | 1 - tools/UpdateIISExpressCertificate.ps1 | 20 +++++++++++++++++++ 3 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 tools/UpdateIISExpressCertificate.ps1 diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml index 33d1e65180..949093b338 100644 --- a/.vsts-pipelines/templates/build-steps.yml +++ b/.vsts-pipelines/templates/build-steps.yml @@ -3,12 +3,8 @@ phases: parameters: agentOs: Windows beforeBuild: - - powershell: "git submodule update --init" - displayName: Update submodules - - powershell: "& ./tools/update_schema.ps1" - displayName: Update ANCM schema - - powershell: Restart-Service w3svc - displayName: Restart IIS + - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; Restart-Service w3svc" + displayName: Prepare repo - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools parameters: diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs index 4f0c93b400..ff9996c851 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -18,7 +18,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // So these tests always have to use ports in this range, and we can't rely on OS-allocated ports without a whole lot of ceremony around // creating self-signed certificates and registering SSL bindings with HTTP.sys // Test specific to IISExpress - [SkipInVSTS] public class HttpsTest : IISFunctionalTestBase { public HttpsTest(ITestOutputHelper output) : base(output) diff --git a/tools/UpdateIISExpressCertificate.ps1 b/tools/UpdateIISExpressCertificate.ps1 new file mode 100644 index 0000000000..9034cf8f75 --- /dev/null +++ b/tools/UpdateIISExpressCertificate.ps1 @@ -0,0 +1,20 @@ +$cert = New-SelfSignedCertificate -DnsName "localhost", "localhost" -CertStoreLocation "cert:\LocalMachine\My" -NotAfter (Get-Date).AddYears(5) +$thumb = $cert.GetCertHashString() + +$Store = New-Object -TypeName System.Security.Cryptography.X509Certificates.X509Store -ArgumentList 'root', 'LocalMachine' +$Store.Open([System.Security.Cryptography.X509Certificates.OpenFlags]::ReadWrite) +$Store.Add($cert) +$Store.Close() + +$tempFile = [System.IO.Path]::GetTempFileName(); +$content = ""; + +for ($i=44300; $i -le 44399; $i++) { + $content += "http delete sslcert ipport=0.0.0.0:$i`n"; + $content += "http add sslcert ipport=0.0.0.0:$i certhash=$thumb appid=`{214124cd-d05b-4309-9af9-9caa44b2b74a`}`n"; +} + +[IO.File]::WriteAllLines($tempFile, $content) + +netsh -f $tempFile +Remove-Item $tempFile; \ No newline at end of file From ff0a5bbbdf6898cd650fbdb6c8aab2fb64bbc87f Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 31 Jul 2018 19:21:32 -0700 Subject: [PATCH 176/363] Update resources.h (#1134) --- src/AspNetCoreModuleV2/CommonLib/resources.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index ae26e9777f..b1e8264941 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -15,7 +15,7 @@ #define ASPNETCORE_EVENT_PROCESS_START_SUCCESS_MSG L"Application '%s' started process '%d' successfully and process '%d' is listening on port '%d'." #define ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED_MSG L"Maximum rapid fail count per minute of '%d' exceeded." #define ASPNETCORE_EVENT_PROCESS_START_ERROR_MSG L"Application '%s' with physical root '%s' failed to start process with commandline '%s' at stage '%s', ErrorCode = '0x%x', assigned port %d, retryCounter '%d'." -#define ASPNETCORE_EVENT_PROCESS_START_FAILURE_MSG L"Application '%s' with physical root '%s' failed to start process with commandline '%s' with multiple retries. The last try of listening port is '%d'. See pervious warnings for details." +#define ASPNETCORE_EVENT_PROCESS_START_FAILURE_MSG L"Application '%s' with physical root '%s' failed to start process with commandline '%s' with multiple retries. The last try of listening port is '%d'. See previous warnings for details." #define ASPNETCORE_EVENT_PROCESS_START_STATUS_ERROR_MSG L"Application '%s' with physical root '%s' failed to start process with commandline '%s' , ErrorCode = '0x%x', processId '%d', processStatus '%d'." #define ASPNETCORE_EVENT_PROCESS_START_PORTSETUP_ERROR_MSG L"Application '%s' with physical root '%s' failed to choose listen port '%d' given port rang '%d - %d', EorrorCode = '0x%x'. If environment variable 'ASPNETCORE_PORT' was set, try removing it such that a random port is selected instead." #define ASPNETCORE_EVENT_PROCESS_START_WRONGPORT_ERROR_MSG L"Application '%s' with physical root '%s' created process with commandline '%s' but failed to listen on the given port '%d'" From 4b5a32d3b95299445163137b3443fb8f89389e27 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 31 Jul 2018 19:32:48 -0700 Subject: [PATCH 177/363] Use TestApplication (#1118) --- build/dependencies.props | 52 +++++++------- build/testsite.props | 3 +- .../Common.FunctionalTests/AppOfflineTests.cs | 16 +++-- .../Inprocess/EventLogTests.cs | 12 +++- .../Inprocess/LoggingTests.cs | 20 ++++-- .../Inprocess/StartupExceptionTests.cs | 14 +++- .../OutOfProcess/HelloWorldTest.cs | 14 ++-- .../PublishedSitesFixture.cs | 70 +++++++++++++++++++ .../Utilities/FunctionalTestsBase.cs | 5 ++ .../Utilities/Helpers.cs | 19 +---- .../InProcess/AuthenticationTests.cs | 9 ++- .../InProcess/ShutdownTests.cs | 12 ++-- .../InProcess/StartupTests.cs | 36 +++------- .../OutOfProcess/GlobalVersionTests.cs | 44 +++++++----- .../OutOfProcess/HttpsTest.cs | 22 +++--- .../OutOfProcess/NtlmAuthentationTest.cs | 14 ++-- .../OutOfProcess/WindowsAuthTests.cs | 11 +-- .../UpgradeFeatureDetectionTests.cs | 15 ++-- 18 files changed, 236 insertions(+), 152 deletions(-) create mode 100644 test/Common.FunctionalTests/PublishedSitesFixture.cs diff --git a/build/dependencies.props b/build/dependencies.props index fe40c919f6..a181793011 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,38 +4,38 @@ 0.10.13 - 2.2.0-preview1-17102 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 0.6.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 + 2.2.0-preview1-17099 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 0.6.0-a-preview1-test-application-17108 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 15.6.82 15.6.82 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 + 2.2.0-preview1-34825 2.0.9 2.1.2 2.2.0-preview1-26618-02 1.0.1 - 2.2.0-preview1-34823 + 2.2.0-preview1-34825 15.6.1 11.1.0 2.0.3 diff --git a/build/testsite.props b/build/testsite.props index ab74d58d72..3f84d67f31 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -7,6 +7,7 @@ $(MSBuildThisFileDirectory)applicationhost.iis.config x64 $(Platform) + false @@ -51,7 +52,7 @@ - + diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/test/Common.FunctionalTests/AppOfflineTests.cs index 169be93035..d8d0861d3a 100644 --- a/test/Common.FunctionalTests/AppOfflineTests.cs +++ b/test/Common.FunctionalTests/AppOfflineTests.cs @@ -14,10 +14,18 @@ using Microsoft.Extensions.Logging; using Xunit; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; -namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { + [Collection(PublishedSitesCollection.Name)] public class AppOfflineTests : IISFunctionalTestBase { + private readonly PublishedSitesFixture _fixture; + + public AppOfflineTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + [ConditionalTheory] [InlineData(HostingModel.InProcess)] [InlineData(HostingModel.OutOfProcess)] @@ -36,8 +44,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess [InlineData(HostingModel.OutOfProcess, 502, "502.5")] public async Task AppOfflineDroppedWhileSiteFailedToStartInShim_AppOfflineServed(HostingModel hostingModel, int statusCode, string content) { - - var deploymentParameters = Helpers.GetBaseDeploymentParameters(hostingModel: hostingModel, publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel: hostingModel, publish: true); deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", "nonexistent")); var deploymentResult = await DeployAsync(deploymentParameters); @@ -193,10 +200,9 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess } } - private async Task DeployApp(HostingModel hostingModel = HostingModel.InProcess) { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(hostingModel: hostingModel, publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel: hostingModel, publish: true); return await DeployAsync(deploymentParameters); } diff --git a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs index a2476cea1b..d8353181d3 100644 --- a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs +++ b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs @@ -9,12 +9,20 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + [Collection(PublishedSitesCollection.Name)] public class EventLogTests : IISFunctionalTestBase { + private readonly PublishedSitesFixture _fixture; + + public EventLogTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + [ConditionalFact] public async Task CheckStartupEventLogMessage() { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); var deploymentResult = await DeployAsync(deploymentParameters); await Helpers.AssertStarts(deploymentResult); @@ -26,7 +34,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task CheckShutdownEventLogMessage() { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); deploymentParameters.GracefulShutdown = true; var deploymentResult = await DeployAsync(deploymentParameters); await Helpers.AssertStarts(deploymentResult); diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index 15e9c8c1d9..0ff23a392f 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -14,14 +14,22 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + [Collection(PublishedSitesCollection.Name)] public class LoggingTests : IISFunctionalTestBase { + private readonly PublishedSitesFixture _fixture; + + public LoggingTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + [ConditionalTheory] [InlineData("CheckErrLogFile")] [InlineData("CheckLogFile")] public async Task CheckStdoutLoggingToFile(string path) { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); deploymentParameters.WebConfigActionList.Add( WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogEnabled", "true")); @@ -63,7 +71,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task InvalidFilePathForLogs_ServerStillRuns() { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); deploymentParameters.WebConfigActionList.Add( WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogEnabled", "true")); @@ -82,7 +90,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var tempFile = Path.GetTempFileName(); try { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"] = tempFile; deploymentParameters.AddDebugLogToWebConfig(tempFile); @@ -107,7 +115,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [InlineData("CheckLogFile")] public async Task CheckStdoutLoggingToPipe_DoesNotCrashProcess(string path) { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); deploymentParameters.GracefulShutdown = true; var deploymentResult = await DeployAsync(deploymentParameters); @@ -126,7 +134,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [InlineData("CheckLogFile")] public async Task CheckStdoutLoggingToPipeWithFirstWrite(string path) { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); deploymentParameters.GracefulShutdown = true; var firstWriteString = path + path; @@ -156,7 +164,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests try { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"] = firstTempFile; deploymentParameters.AddDebugLogToWebConfig(secondTempFile); diff --git a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs index 93683b8a78..980341dbc4 100644 --- a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -10,8 +10,16 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + [Collection(PublishedSitesCollection.Name)] public class StartupExceptionTests : IISFunctionalTestBase { + private readonly PublishedSitesFixture _fixture; + + public StartupExceptionTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + [ConditionalTheory] [InlineData("CheckLogFile")] [InlineData("CheckErrLogFile")] @@ -21,7 +29,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // Reason is because by default for IISExpress, we expect there to not be a web.config file. // However, for IIS, we need a web.config file because the default on generated on publish // doesn't include V2. We can remove the publish flag once IIS supports non-publish running - var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite", publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); var randomNumberString = new Random(Guid.NewGuid().GetHashCode()).Next(10000000).ToString(); deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; @@ -45,7 +53,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [InlineData("CheckOversizedStdOutWrites")] public async Task CheckStdoutWithLargeWrites(string path) { - var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite", publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; var deploymentResult = await DeployAsync(deploymentParameters); @@ -62,7 +70,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task Gets500_30_ErrorPage() { - var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite", publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); var deploymentResult = await DeployAsync(deploymentParameters); diff --git a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs index e868207bb8..d2a56caea5 100644 --- a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -2,21 +2,22 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + [Collection(PublishedSitesCollection.Name)] public class HelloWorldTests : IISFunctionalTestBase { - public HelloWorldTests(ITestOutputHelper output = null) : base(output) + private readonly PublishedSitesFixture _fixture; + + public HelloWorldTests(PublishedSitesFixture fixture) { + _fixture = fixture; } public static TestMatrix TestVariants @@ -31,10 +32,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { // The default in hosting sets windows auth to true. // Set it to the IISExpress.config file - var deploymentParameters = new IISDeploymentParameters(variant) - { - ApplicationPath = Helpers.GetOutOfProcessTestSitesPath() - }; + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); var deploymentResult = await DeployAsync(deploymentParameters); diff --git a/test/Common.FunctionalTests/PublishedSitesFixture.cs b/test/Common.FunctionalTests/PublishedSitesFixture.cs new file mode 100644 index 0000000000..90104f6652 --- /dev/null +++ b/test/Common.FunctionalTests/PublishedSitesFixture.cs @@ -0,0 +1,70 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + /// + /// This type just maps collection names to available fixtures + /// + [CollectionDefinition(Name)] + public class PublishedSitesCollection : ICollectionFixture + { + public const string Name = nameof(PublishedSitesCollection); + } + + public class PublishedSitesFixture : IDisposable + { + public CachingApplicationPublisher InProcessTestSite { get; } = new CachingApplicationPublisher(Helpers.GetInProcessTestSitesPath()); + public CachingApplicationPublisher OutOfProcessTestSite { get; } = new CachingApplicationPublisher(Helpers.GetOutOfProcessTestSitesPath()); + public CachingApplicationPublisher StartupExceptionWebsite { get; } = new CachingApplicationPublisher(Helpers.GetTestWebSitePath("StartupExceptionWebsite")); + public CachingApplicationPublisher OverriddenServerWebSite { get; } = new CachingApplicationPublisher(Helpers.GetTestWebSitePath("OverriddenServerWebSite")); + + public void Dispose() + { + InProcessTestSite.Dispose(); + OutOfProcessTestSite.Dispose(); + StartupExceptionWebsite.Dispose(); + OverriddenServerWebSite.Dispose(); + } + + public IISDeploymentParameters GetBaseDeploymentParameters(HostingModel hostingModel = HostingModel.InProcess, bool publish = false) + { + var publisher = hostingModel == HostingModel.InProcess ? InProcessTestSite : OutOfProcessTestSite; + return GetBaseDeploymentParameters(publisher, hostingModel, publish); + } + public IISDeploymentParameters GetBaseDeploymentParameters(TestVariant variant, bool publish = false) + { + var publisher = variant.HostingModel == HostingModel.InProcess ? InProcessTestSite : OutOfProcessTestSite; + return GetBaseDeploymentParameters(publisher, new DeploymentParameters(variant), publish); + } + + public IISDeploymentParameters GetBaseDeploymentParameters(ApplicationPublisher publisher, HostingModel hostingModel = HostingModel.InProcess, bool publish = false) + { + return GetBaseDeploymentParameters( + publisher, + new DeploymentParameters(publisher.ApplicationPath, DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + { + HostingModel = hostingModel + }, + publish); + } + + public IISDeploymentParameters GetBaseDeploymentParameters(ApplicationPublisher publisher, DeploymentParameters baseParameters, bool publish = false) + { + return new IISDeploymentParameters(baseParameters) + { + ApplicationPublisher = publisher, + ApplicationPath = publisher.ApplicationPath, + TargetFramework = Tfm.NetCoreApp22, + ApplicationType = ApplicationType.Portable, + AncmVersion = AncmVersion.AspNetCoreModuleV2, + PublishApplicationBeforeDeployment = publish, + }; + } + } +} diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index d23b7836e5..171bbbf22f 100644 --- a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; @@ -31,6 +32,10 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting parameters.ServerConfigTemplateContent = parameters.ServerConfigTemplateContent ?? File.ReadAllText("IISExpress.config"); } + if (parameters.ApplicationPublisher == null) + { + throw new InvalidOperationException("All tests should use ApplicationPublisher"); + } _deployer = IISApplicationDeployerFactory.Create(parameters, LoggerFactory); diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index c067ff46e6..77eb37d524 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -25,24 +25,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string GetInProcessTestSitesPath() => GetTestWebSitePath("InProcessWebSite"); public static string GetOutOfProcessTestSitesPath() => GetTestWebSitePath("OutOfProcessWebSite"); - - // Defaults to inprocess specific deployment parameters - public static IISDeploymentParameters GetBaseDeploymentParameters(string site = null, HostingModel hostingModel = HostingModel.InProcess, bool publish = false) - { - if (site == null) - { - site = hostingModel == HostingModel.InProcess ? "InProcessWebSite" : "OutOfProcessWebSite"; - } - - return new IISDeploymentParameters(GetTestWebSitePath(site), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) - { - TargetFramework = Tfm.NetCoreApp22, - ApplicationType = ApplicationType.Portable, - AncmVersion = AncmVersion.AspNetCoreModuleV2, - HostingModel = hostingModel, - PublishApplicationBeforeDeployment = publish, - }; - } + public static async Task AssertStarts(IISDeploymentResult deploymentResult, string path = "/HelloWorld") { diff --git a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs index 5105b753c8..af442c4521 100644 --- a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs @@ -11,13 +11,20 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + [Collection(PublishedSitesCollection.Name)] public class AuthenticationTests : IISFunctionalTestBase { + private readonly PublishedSitesFixture _fixture; + + public AuthenticationTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } [ConditionalFact] public async Task Authentication_InProcess() { - var deploymentParameters = Helpers.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); deploymentParameters.AddWindowsAuthToServerConfig(); var deploymentResult = await DeployAsync(deploymentParameters); diff --git a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs index 45c9e080aa..1e397731e7 100644 --- a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs @@ -9,21 +9,23 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + [Collection(PublishedSitesCollection.Name)] public class ShutdownTests : IISFunctionalTestBase { + private readonly PublishedSitesFixture _fixture; - public ShutdownTests(ITestOutputHelper output) : base(output) + public ShutdownTests(PublishedSitesFixture fixture) { + _fixture = fixture; } [ConditionalFact] public async Task ServerShutsDownWhenMainExits() { - var parameters = Helpers.GetBaseDeploymentParameters(publish: true); + var parameters = _fixture.GetBaseDeploymentParameters(publish: true); var result = await DeployAsync(parameters); try { @@ -39,7 +41,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task GracefulShutdown_DoesNotCrashProcess() { - var parameters = Helpers.GetBaseDeploymentParameters(publish: true); + var parameters = _fixture.GetBaseDeploymentParameters(publish: true); parameters.GracefulShutdown = true; var result = await DeployAsync(parameters); @@ -51,7 +53,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task ForcefulShutdown_DoesrashProcess() { - var parameters = Helpers.GetBaseDeploymentParameters(publish: true); + var parameters = _fixture.GetBaseDeploymentParameters(publish: true); var result = await DeployAsync(parameters); var response = await result.RetryingHttpClient.GetAsync("/HelloWorld"); diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 36812d3f2e..218cb4b174 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -11,18 +11,21 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + [Collection(PublishedSitesCollection.Name)] public class StartupTests : IISFunctionalTestBase { - private readonly string _dotnetLocation = DotNetCommands.GetDotNetExecutable(RuntimeArchitecture.x64); + private readonly PublishedSitesFixture _fixture; - public StartupTests(ITestOutputHelper output) : base(output) + public StartupTests(PublishedSitesFixture fixture) { + _fixture = fixture; } + private readonly string _dotnetLocation = DotNetCommands.GetDotNetExecutable(RuntimeArchitecture.x64); + [ConditionalFact] public async Task ExpandEnvironmentVariableInWebConfig() { @@ -42,7 +45,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [InlineData(".\\dotnet.exe")] public async Task InvalidProcessPath_ExpectServerError(string path) { - var deploymentParameters = GetBaseDeploymentParameters(); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", path)); @@ -99,7 +102,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private async Task AssertStarts(Action preDeploy = null) { - var deploymentParameters = GetBaseDeploymentParameters(); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); preDeploy?.Invoke(deploymentParameters); @@ -121,11 +124,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [MemberData(nameof(TestVariants))] public async Task HelloWorld(TestVariant variant) { - var deploymentParameters = new IISDeploymentParameters(variant) - { - ApplicationPath = Helpers.GetInProcessTestSitesPath(), - PublishApplicationBeforeDeployment = true - }; + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); var deploymentResult = await DeployAsync(deploymentParameters); @@ -138,7 +137,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task DetectsOveriddenServer() { - var deploymentResult = await DeployAsync(GetBaseDeploymentParameters("OverriddenServerWebSite")); + var deploymentResult = await DeployAsync(_fixture.GetBaseDeploymentParameters(_fixture.OverriddenServerWebSite, publish: true)); var response = await deploymentResult.HttpClient.GetAsync("/"); Assert.False(response.IsSuccessStatusCode); @@ -150,7 +149,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task CheckInvalidHostingModelParameter() { - var deploymentParameters = GetBaseDeploymentParameters(); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("hostingModel", "bogus")); var deploymentResult = await DeployAsync(deploymentParameters); @@ -161,18 +160,5 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EventLogHelpers.VerifyEventLogEvent(TestSink, "Unknown hosting model 'bogus'. Please specify either hostingModel=\"inprocess\" or hostingModel=\"outofprocess\" in the web.config file."); } - - // Defaults to inprocess specific deployment parameters - public static IISDeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite") - { - return new IISDeploymentParameters(Helpers.GetTestWebSitePath(site), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) - { - TargetFramework = Tfm.NetCoreApp22, - ApplicationType = ApplicationType.Portable, - AncmVersion = AncmVersion.AspNetCoreModuleV2, - HostingModel = HostingModel.InProcess, - PublishApplicationBeforeDeployment = site == "InProcessWebSite", - }; - } } } diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index 8ad7a70665..3ab5918753 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -13,13 +13,20 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + [Collection(PublishedSitesCollection.Name)] public class GlobalVersionTests : IISFunctionalTestBase { + private readonly PublishedSitesFixture _fixture; + + public GlobalVersionTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + private const string _aspNetCoreDll = "aspnetcorev2_outofprocess.dll"; private const string _handlerVersion20 = "2.0.0"; private const string _helloWorldRequest = "HelloWorld"; private const string _helloWorldResponse = "Hello World"; - private const string _outOfProcessVersionVariable = "/p:AspNetCoreModuleOutOfProcessVersion="; [ConditionalFact] public async Task GlobalVersion_DefaultWorks() @@ -65,11 +72,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task GlobalVersion_NewVersionNumber(string version) { var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); - deploymentParameters.AdditionalPublishParameters = $"{_outOfProcessVersionVariable}{version}"; deploymentParameters.HandlerSettings["handlerVersion"] = version; var deploymentResult = await DeployAsync(deploymentParameters); + var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); + var newANCMPath = GetANCMRequestHandlerPath(deploymentResult, version); + Directory.Move(originalANCMPath, newANCMPath); + var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(_helloWorldResponse, responseText); @@ -89,9 +99,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var newANCMPath = GetANCMRequestHandlerPath(deploymentResult, version); - var di = Directory.CreateDirectory(Path.GetDirectoryName(newANCMPath)); - - File.Copy(originalANCMPath, newANCMPath, true); + CopyDirectory(originalANCMPath, newANCMPath); deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); var response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); @@ -125,9 +133,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var newANCMPath = GetANCMRequestHandlerPath(deploymentResult, version); - var di = Directory.CreateDirectory(Path.GetDirectoryName(newANCMPath)); - - File.Copy(originalANCMPath, newANCMPath, true); + CopyDirectory(originalANCMPath, newANCMPath); deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); @@ -139,23 +145,25 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private IISDeploymentParameters GetGlobalVersionBaseDeploymentParameters() { - return new IISDeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + return _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); + } + + private void CopyDirectory(string from, string to) + { + var toInfo = new DirectoryInfo(to); + toInfo.Create(); + + foreach (var file in new DirectoryInfo(from).GetFiles()) { - TargetFramework = Tfm.NetCoreApp22, - ApplicationType = ApplicationType.Portable, - AncmVersion = AncmVersion.AspNetCoreModuleV2, - HostingModel = HostingModel.OutOfProcess, - PublishApplicationBeforeDeployment = true, - AdditionalPublishParameters = $"{_outOfProcessVersionVariable}{_handlerVersion20}" - }; + file.CopyTo(Path.Combine(toInfo.FullName, file.Name)); + } } private string GetANCMRequestHandlerPath(IISDeploymentResult deploymentResult, string version) { return Path.Combine(deploymentResult.ContentRoot, deploymentResult.DeploymentParameters.RuntimeArchitecture.ToString(), - version, - _aspNetCoreDll); + version); } private void AssertLoadedVersion(string version) diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs index ff9996c851..91c5291b0a 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -18,10 +18,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // So these tests always have to use ports in this range, and we can't rely on OS-allocated ports without a whole lot of ceremony around // creating self-signed certificates and registering SSL bindings with HTTP.sys // Test specific to IISExpress + [Collection(PublishedSitesCollection.Name)] public class HttpsTest : IISFunctionalTestBase { - public HttpsTest(ITestOutputHelper output) : base(output) + private readonly PublishedSitesFixture _fixture; + + public HttpsTest(PublishedSitesFixture fixture) { + _fixture = fixture; } public static TestMatrix TestVariants @@ -34,12 +38,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task HttpsHelloWorld(TestVariant variant) { var port = TestPortHelper.GetNextSSLPort(); - var deploymentParameters = new IISDeploymentParameters(variant) - { - ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), - ApplicationBaseUriHint = $"https://localhost:{port}/" - }; - + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); + deploymentParameters.ApplicationBaseUriHint = $"https://localhost:{port}/"; deploymentParameters.AddHttpsToServerConfig(); var deploymentResult = await DeployAsync(deploymentParameters); @@ -73,12 +73,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private async Task HttpsHelloWorldCerts(TestVariant variant, bool sendClientCert) { var port = TestPortHelper.GetNextSSLPort(); - var deploymentParameters = new IISDeploymentParameters(variant) - { - ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), - ApplicationBaseUriHint = $"https://localhost:{port}/", - }; - + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); + deploymentParameters.ApplicationBaseUriHint = $"https://localhost:{port}/"; deploymentParameters.AddHttpsToServerConfig(); var deploymentResult = await DeployAsync(deploymentParameters); diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index 437f019f52..b67b3b103a 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -13,14 +13,19 @@ using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + [Collection(PublishedSitesCollection.Name)] public class NtlmAuthenticationTests : IISFunctionalTestBase { // Test only runs on IISExpress today as our CI machines do not have // Windows auth installed globally. // TODO either enable windows auth on our CI or use containers to test this // behavior - public NtlmAuthenticationTests(ITestOutputHelper output) : base(output) + + private readonly PublishedSitesFixture _fixture; + + public NtlmAuthenticationTests(PublishedSitesFixture fixture) { + _fixture = fixture; } public static TestMatrix TestVariants @@ -32,11 +37,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [MemberData(nameof(TestVariants))] public async Task NtlmAuthentication(TestVariant variant) { - var deploymentParameters = new IISDeploymentParameters(variant) - { - ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), - ApplicationBaseUriHint = $"http://localhost:0/" - }; + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); + deploymentParameters.ApplicationBaseUriHint = $"https://localhost:0/"; deploymentParameters.AddWindowsAuthToServerConfig(); diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs index 038f57029d..b46b314d08 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs @@ -12,10 +12,14 @@ using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + [Collection(PublishedSitesCollection.Name)] public class WindowsAuthTests : IISFunctionalTestBase { - public WindowsAuthTests(ITestOutputHelper output = null) : base(output) + private readonly PublishedSitesFixture _fixture; + + public WindowsAuthTests(PublishedSitesFixture fixture) { + _fixture = fixture; } public static TestMatrix TestVariants @@ -28,10 +32,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [MemberData(nameof(TestVariants))] public async Task WindowsAuthTest(TestVariant variant) { - var deploymentParameters = new IISDeploymentParameters(variant) - { - ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(), - }; + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); deploymentParameters.AddWindowsAuthToServerConfig(); // The default in hosting sets windows auth to true. diff --git a/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs b/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs index 316a87f9b3..492ae8db87 100644 --- a/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs +++ b/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs @@ -9,16 +9,18 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + [Collection(PublishedSitesCollection.Name)] public class UpgradeFeatureDetectionTests : IISFunctionalTestBase { private readonly string _isWebsocketsSupported = Environment.OSVersion.Version >= new Version(6, 2) ? "Enabled" : "Disabled"; + private readonly PublishedSitesFixture _fixture; - public UpgradeFeatureDetectionTests(ITestOutputHelper output) : base(output) + public UpgradeFeatureDetectionTests(PublishedSitesFixture fixture) { + _fixture = fixture; } [ConditionalFact] @@ -60,14 +62,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private async Task UpgradeFeatureDetectionDeployer(bool disableWebSocket, string sitePath, string expected, HostingModel hostingModel) { - var deploymentParameters = new IISDeploymentParameters(sitePath, DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) - { - TargetFramework = Tfm.NetCoreApp22, - ApplicationType = ApplicationType.Portable, - AncmVersion = AncmVersion.AspNetCoreModuleV2, - HostingModel = hostingModel, - PublishApplicationBeforeDeployment = hostingModel == HostingModel.InProcess - }; + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); if (disableWebSocket) { From f4c71da99602c046cc7be8438bdd7f43a8a21557 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 1 Aug 2018 14:37:23 -0700 Subject: [PATCH 178/363] Reduce msbuild invocations while building native (#1135) --- IISIntegration.sln | 240 +++++++++++++++++++++++++++++++++++++++++++++ build/repo.targets | 7 +- 2 files changed, 245 insertions(+), 2 deletions(-) diff --git a/IISIntegration.sln b/IISIntegration.sln index ba7d809f5f..549f17f75b 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -129,6 +129,12 @@ Global Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + NativeDebug|Any CPU = NativeDebug|Any CPU + NativeDebug|x64 = NativeDebug|x64 + NativeDebug|x86 = NativeDebug|x86 + NativeRelease|Any CPU = NativeRelease|Any CPU + NativeRelease|x64 = NativeRelease|x64 + NativeRelease|x86 = NativeRelease|x86 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 @@ -140,6 +146,14 @@ Global {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x64.Build.0 = Debug|Any CPU {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.ActiveCfg = Debug|Any CPU {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Debug|x86.Build.0 = Debug|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeDebug|x64.ActiveCfg = Debug|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeDebug|x86.ActiveCfg = Debug|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeRelease|Any CPU.Build.0 = Release|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeRelease|x64.ActiveCfg = Release|Any CPU + {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.NativeRelease|x86.ActiveCfg = Release|Any CPU {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.ActiveCfg = Release|Any CPU {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|Any CPU.Build.0 = Release|Any CPU {E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64}.Release|x64.ActiveCfg = Release|Any CPU @@ -152,6 +166,14 @@ Global {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x64.Build.0 = Debug|Any CPU {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x86.ActiveCfg = Debug|Any CPU {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x86.Build.0 = Debug|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeDebug|x64.ActiveCfg = Debug|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeDebug|x86.ActiveCfg = Debug|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeRelease|Any CPU.Build.0 = Release|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeRelease|x64.ActiveCfg = Release|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.NativeRelease|x86.ActiveCfg = Release|Any CPU {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.ActiveCfg = Release|Any CPU {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.Build.0 = Release|Any CPU {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.ActiveCfg = Release|Any CPU @@ -164,6 +186,14 @@ Global {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x64.Build.0 = Debug|Any CPU {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.ActiveCfg = Debug|Any CPU {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.Build.0 = Debug|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeDebug|x64.ActiveCfg = Debug|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeDebug|x86.ActiveCfg = Debug|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeRelease|Any CPU.Build.0 = Release|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeRelease|x64.ActiveCfg = Release|Any CPU + {4106DB10-E09F-480E-9CE6-B39235512EE6}.NativeRelease|x86.ActiveCfg = Release|Any CPU {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.ActiveCfg = Release|Any CPU {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.Build.0 = Release|Any CPU {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.ActiveCfg = Release|Any CPU @@ -176,6 +206,14 @@ Global {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x64.Build.0 = Debug|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x86.ActiveCfg = Debug|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x86.Build.0 = Debug|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeDebug|x64.ActiveCfg = Debug|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeDebug|x86.ActiveCfg = Debug|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeRelease|Any CPU.Build.0 = Release|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeRelease|x64.ActiveCfg = Release|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.NativeRelease|x86.ActiveCfg = Release|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.ActiveCfg = Release|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.Build.0 = Release|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x64.ActiveCfg = Release|Any CPU @@ -188,6 +226,14 @@ Global {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x64.Build.0 = Debug|x64 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x86.ActiveCfg = Debug|x86 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x86.Build.0 = Debug|x86 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeDebug|Any CPU.ActiveCfg = Debug|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeDebug|Any CPU.Build.0 = Debug|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeDebug|x64.ActiveCfg = Debug|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeDebug|x86.ActiveCfg = Debug|x86 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeRelease|Any CPU.ActiveCfg = Release|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeRelease|Any CPU.Build.0 = Release|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeRelease|x64.ActiveCfg = Release|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.NativeRelease|x86.ActiveCfg = Release|x86 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|Any CPU.ActiveCfg = Release|x64 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|Any CPU.Build.0 = Release|x64 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x64.ActiveCfg = Release|x64 @@ -200,6 +246,14 @@ Global {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x64.Build.0 = Debug|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.ActiveCfg = Debug|x86 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.Build.0 = Debug|x86 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeDebug|Any CPU.ActiveCfg = Debug|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeDebug|Any CPU.Build.0 = Debug|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeDebug|x64.ActiveCfg = Debug|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeDebug|x86.ActiveCfg = Debug|x86 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeRelease|Any CPU.ActiveCfg = Release|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeRelease|Any CPU.Build.0 = Release|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeRelease|x64.ActiveCfg = Release|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.NativeRelease|x86.ActiveCfg = Release|x86 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.ActiveCfg = Release|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.Build.0 = Release|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.ActiveCfg = Release|x64 @@ -212,6 +266,14 @@ Global {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x64.Build.0 = Debug|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.ActiveCfg = Debug|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.Build.0 = Debug|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeDebug|x64.ActiveCfg = Debug|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeDebug|x86.ActiveCfg = Debug|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeRelease|Any CPU.Build.0 = Release|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeRelease|x64.ActiveCfg = Release|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.NativeRelease|x86.ActiveCfg = Release|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.ActiveCfg = Release|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.Build.0 = Release|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.ActiveCfg = Release|Any CPU @@ -224,6 +286,14 @@ Global {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.Build.0 = Debug|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.ActiveCfg = Debug|x86 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.Build.0 = Debug|x86 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeDebug|Any CPU.ActiveCfg = Debug|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeDebug|Any CPU.Build.0 = Debug|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeDebug|x64.ActiveCfg = Debug|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeDebug|x86.ActiveCfg = Debug|x86 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeRelease|Any CPU.ActiveCfg = Release|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeRelease|Any CPU.Build.0 = Release|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeRelease|x64.ActiveCfg = Release|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.NativeRelease|x86.ActiveCfg = Release|x86 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.ActiveCfg = Release|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.Build.0 = Release|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x64.ActiveCfg = Release|x64 @@ -236,6 +306,14 @@ Global {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|x64.Build.0 = Debug|Any CPU {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|x86.ActiveCfg = Debug|Any CPU {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Debug|x86.Build.0 = Debug|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeDebug|x64.ActiveCfg = Debug|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeDebug|x86.ActiveCfg = Debug|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeRelease|Any CPU.Build.0 = Release|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeRelease|x64.ActiveCfg = Release|Any CPU + {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.NativeRelease|x86.ActiveCfg = Release|Any CPU {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|Any CPU.ActiveCfg = Release|Any CPU {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|Any CPU.Build.0 = Release|Any CPU {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x64.ActiveCfg = Release|Any CPU @@ -248,6 +326,14 @@ Global {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x64.Build.0 = Debug|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x86.ActiveCfg = Debug|x86 {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x86.Build.0 = Debug|x86 + {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeDebug|Any CPU.ActiveCfg = Debug|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeDebug|Any CPU.Build.0 = Debug|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeDebug|x64.ActiveCfg = Debug|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeDebug|x86.ActiveCfg = Debug|x86 + {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeRelease|Any CPU.ActiveCfg = Release|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeRelease|Any CPU.Build.0 = Release|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeRelease|x64.ActiveCfg = Release|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeRelease|x86.ActiveCfg = Release|x86 {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.ActiveCfg = Release|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.Build.0 = Release|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x64.ActiveCfg = Release|x64 @@ -259,6 +345,16 @@ Global {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.ActiveCfg = Debug|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.Build.0 = Debug|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeDebug|x64.ActiveCfg = Debug|x64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeDebug|x64.Build.0 = Debug|x64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeDebug|x86.ActiveCfg = Debug|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeDebug|x86.Build.0 = Debug|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeRelease|x64.ActiveCfg = Release|x64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeRelease|x64.Build.0 = Release|x64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeRelease|x86.ActiveCfg = Release|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.NativeRelease|x86.Build.0 = Release|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|Any CPU.ActiveCfg = Release|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.ActiveCfg = Release|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.Build.0 = Release|x64 @@ -269,6 +365,16 @@ Global {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x64.Build.0 = Debug|x64 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.ActiveCfg = Debug|Win32 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Debug|x86.Build.0 = Debug|Win32 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeDebug|x64.ActiveCfg = Debug|x64 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeDebug|x64.Build.0 = Debug|x64 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeDebug|x86.ActiveCfg = Debug|Win32 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeDebug|x86.Build.0 = Debug|Win32 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeRelease|x64.ActiveCfg = Release|x64 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeRelease|x64.Build.0 = Release|x64 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeRelease|x86.ActiveCfg = Release|Win32 + {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.NativeRelease|x86.Build.0 = Release|Win32 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|Any CPU.ActiveCfg = Release|Win32 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.ActiveCfg = Release|x64 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.Build.0 = Release|x64 @@ -279,6 +385,16 @@ Global {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x64.Build.0 = Debug|x64 {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x86.ActiveCfg = Debug|Win32 {439824F9-1455-4CC4-BD79-B44FA0A16552}.Debug|x86.Build.0 = Debug|Win32 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeDebug|x64.ActiveCfg = Debug|x64 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeDebug|x64.Build.0 = Debug|x64 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeDebug|x86.ActiveCfg = Debug|Win32 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeDebug|x86.Build.0 = Debug|Win32 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeRelease|x64.ActiveCfg = Release|x64 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeRelease|x64.Build.0 = Release|x64 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeRelease|x86.ActiveCfg = Release|Win32 + {439824F9-1455-4CC4-BD79-B44FA0A16552}.NativeRelease|x86.Build.0 = Release|Win32 {439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|Any CPU.ActiveCfg = Release|Win32 {439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.ActiveCfg = Release|x64 {439824F9-1455-4CC4-BD79-B44FA0A16552}.Release|x64.Build.0 = Release|x64 @@ -289,6 +405,16 @@ Global {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.Build.0 = Debug|x64 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.ActiveCfg = Debug|Win32 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.Build.0 = Debug|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeDebug|x64.ActiveCfg = Debug|x64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeDebug|x64.Build.0 = Debug|x64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeDebug|x86.ActiveCfg = Debug|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeDebug|x86.Build.0 = Debug|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeRelease|x64.ActiveCfg = Release|x64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeRelease|x64.Build.0 = Release|x64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeRelease|x86.ActiveCfg = Release|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.NativeRelease|x86.Build.0 = Release|Win32 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|Any CPU.ActiveCfg = Release|Win32 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.ActiveCfg = Release|x64 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.Build.0 = Release|x64 @@ -299,6 +425,16 @@ Global {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.Build.0 = Debug|x64 {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.ActiveCfg = Debug|Win32 {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.Build.0 = Debug|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeDebug|x64.ActiveCfg = Debug|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeDebug|x64.Build.0 = Debug|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeDebug|x86.ActiveCfg = Debug|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeDebug|x86.Build.0 = Debug|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeRelease|x64.ActiveCfg = Release|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeRelease|x64.Build.0 = Release|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeRelease|x86.ActiveCfg = Release|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.NativeRelease|x86.Build.0 = Release|Win32 {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|Any CPU.ActiveCfg = Release|Win32 {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.ActiveCfg = Release|x64 {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.Build.0 = Release|x64 @@ -309,6 +445,16 @@ Global {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x64.Build.0 = Debug|x64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.ActiveCfg = Debug|Win32 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.Build.0 = Debug|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeDebug|x64.ActiveCfg = Debug|x64 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeDebug|x64.Build.0 = Debug|x64 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeDebug|x86.ActiveCfg = Debug|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeDebug|x86.Build.0 = Debug|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeRelease|x64.ActiveCfg = Release|x64 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeRelease|x64.Build.0 = Release|x64 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeRelease|x86.ActiveCfg = Release|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.NativeRelease|x86.Build.0 = Release|Win32 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|Any CPU.ActiveCfg = Release|Win32 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.ActiveCfg = Release|x64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.Build.0 = Release|x64 @@ -320,6 +466,14 @@ Global {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.Build.0 = Debug|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.ActiveCfg = Debug|x86 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.Build.0 = Debug|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeDebug|Any CPU.ActiveCfg = Debug|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeDebug|Any CPU.Build.0 = Debug|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeDebug|x64.ActiveCfg = Debug|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeDebug|x86.ActiveCfg = Debug|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeRelease|Any CPU.ActiveCfg = Release|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeRelease|Any CPU.Build.0 = Release|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeRelease|x64.ActiveCfg = Release|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.NativeRelease|x86.ActiveCfg = Release|x86 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.ActiveCfg = Release|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.Build.0 = Release|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.ActiveCfg = Release|x64 @@ -332,6 +486,14 @@ Global {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x64.Build.0 = Debug|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x86.ActiveCfg = Debug|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x86.Build.0 = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeDebug|x64.ActiveCfg = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeDebug|x86.ActiveCfg = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeRelease|Any CPU.Build.0 = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeRelease|x64.ActiveCfg = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.NativeRelease|x86.ActiveCfg = Release|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.Build.0 = Release|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x64.ActiveCfg = Release|Any CPU @@ -343,6 +505,16 @@ Global {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64 {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.ActiveCfg = Debug|Win32 {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.Build.0 = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeDebug|x64.ActiveCfg = Debug|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeDebug|x64.Build.0 = Debug|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeDebug|x86.ActiveCfg = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeDebug|x86.Build.0 = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeRelease|x64.ActiveCfg = Release|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeRelease|x64.Build.0 = Release|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeRelease|x86.ActiveCfg = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.NativeRelease|x86.Build.0 = Release|Win32 {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.ActiveCfg = Release|Win32 {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.ActiveCfg = Release|x64 {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64 @@ -353,6 +525,16 @@ Global {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.Build.0 = Debug|x64 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.ActiveCfg = Debug|Win32 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.Build.0 = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeDebug|x64.ActiveCfg = Debug|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeDebug|x64.Build.0 = Debug|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeDebug|x86.ActiveCfg = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeDebug|x86.Build.0 = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeRelease|x64.ActiveCfg = Release|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeRelease|x64.Build.0 = Release|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeRelease|x86.ActiveCfg = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.NativeRelease|x86.Build.0 = Release|Win32 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|Any CPU.ActiveCfg = Release|Win32 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.ActiveCfg = Release|x64 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.Build.0 = Release|x64 @@ -363,6 +545,12 @@ Global {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x64.Build.0 = Debug|x64 {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x86.ActiveCfg = Debug|x86 {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x86.Build.0 = Debug|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.NativeDebug|Any CPU.ActiveCfg = Debug|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.NativeDebug|x64.ActiveCfg = Debug|x64 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.NativeDebug|x86.ActiveCfg = Debug|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.NativeRelease|Any CPU.ActiveCfg = Release|x86 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.NativeRelease|x64.ActiveCfg = Release|x64 + {340C59FC-C682-4CBA-81F8-791821EC8EDE}.NativeRelease|x86.ActiveCfg = Release|x86 {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|Any CPU.ActiveCfg = Release|x86 {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x64.ActiveCfg = Release|x64 {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x64.Build.0 = Release|x64 @@ -373,6 +561,16 @@ Global {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.Build.0 = Debug|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.ActiveCfg = Debug|Win32 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.Build.0 = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeDebug|x64.ActiveCfg = Debug|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeDebug|x64.Build.0 = Debug|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeDebug|x86.ActiveCfg = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeDebug|x86.Build.0 = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeRelease|x64.ActiveCfg = Release|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeRelease|x64.Build.0 = Release|x64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeRelease|x86.ActiveCfg = Release|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.NativeRelease|x86.Build.0 = Release|Win32 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|Any CPU.ActiveCfg = Release|Win32 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.ActiveCfg = Release|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.Build.0 = Release|x64 @@ -383,6 +581,16 @@ Global {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.Build.0 = Debug|x64 {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.ActiveCfg = Debug|Win32 {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.Build.0 = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeDebug|Any CPU.ActiveCfg = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeDebug|x64.ActiveCfg = Debug|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeDebug|x64.Build.0 = Debug|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeDebug|x86.ActiveCfg = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeDebug|x86.Build.0 = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeRelease|Any CPU.ActiveCfg = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeRelease|x64.ActiveCfg = Release|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeRelease|x64.Build.0 = Release|x64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeRelease|x86.ActiveCfg = Release|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.NativeRelease|x86.Build.0 = Release|Win32 {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|Any CPU.ActiveCfg = Release|Win32 {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.ActiveCfg = Release|x64 {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.Build.0 = Release|x64 @@ -394,6 +602,14 @@ Global {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x64.Build.0 = Debug|Any CPU {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x86.ActiveCfg = Debug|Any CPU {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x86.Build.0 = Debug|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeDebug|x64.ActiveCfg = Debug|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeDebug|x86.ActiveCfg = Debug|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeRelease|Any CPU.Build.0 = Release|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeRelease|x64.ActiveCfg = Release|Any CPU + {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.NativeRelease|x86.ActiveCfg = Release|Any CPU {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|Any CPU.ActiveCfg = Release|Any CPU {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|Any CPU.Build.0 = Release|Any CPU {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x64.ActiveCfg = Release|Any CPU @@ -406,6 +622,14 @@ Global {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|x64.Build.0 = Debug|Any CPU {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|x86.ActiveCfg = Debug|Any CPU {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Debug|x86.Build.0 = Debug|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeDebug|x64.ActiveCfg = Debug|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeDebug|x86.ActiveCfg = Debug|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeRelease|Any CPU.Build.0 = Release|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeRelease|x64.ActiveCfg = Release|Any CPU + {CE4FB142-91FB-4B34-BC96-A31120EF4009}.NativeRelease|x86.ActiveCfg = Release|Any CPU {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|Any CPU.ActiveCfg = Release|Any CPU {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|Any CPU.Build.0 = Release|Any CPU {CE4FB142-91FB-4B34-BC96-A31120EF4009}.Release|x64.ActiveCfg = Release|Any CPU @@ -418,6 +642,14 @@ Global {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|x64.Build.0 = Debug|Any CPU {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|x86.ActiveCfg = Debug|Any CPU {A091777D-66B3-42E1-B95C-85322DE40706}.Debug|x86.Build.0 = Debug|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.NativeDebug|x64.ActiveCfg = Debug|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.NativeDebug|x86.ActiveCfg = Debug|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.NativeRelease|Any CPU.Build.0 = Release|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.NativeRelease|x64.ActiveCfg = Release|Any CPU + {A091777D-66B3-42E1-B95C-85322DE40706}.NativeRelease|x86.ActiveCfg = Release|Any CPU {A091777D-66B3-42E1-B95C-85322DE40706}.Release|Any CPU.ActiveCfg = Release|Any CPU {A091777D-66B3-42E1-B95C-85322DE40706}.Release|Any CPU.Build.0 = Release|Any CPU {A091777D-66B3-42E1-B95C-85322DE40706}.Release|x64.ActiveCfg = Release|Any CPU @@ -430,6 +662,14 @@ Global {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|x64.Build.0 = Debug|Any CPU {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|x86.ActiveCfg = Debug|Any CPU {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Debug|x86.Build.0 = Debug|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeDebug|x64.ActiveCfg = Debug|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeDebug|x86.ActiveCfg = Debug|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeRelease|Any CPU.Build.0 = Release|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeRelease|x64.ActiveCfg = Release|Any CPU + {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.NativeRelease|x86.ActiveCfg = Release|Any CPU {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|Any CPU.Build.0 = Release|Any CPU {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x64.ActiveCfg = Release|Any CPU diff --git a/build/repo.targets b/build/repo.targets index 27117d706f..5fe12660fe 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -47,11 +47,11 @@ - -p:Configuration=$(Configuration) -v:m -nologo -clp:NoSummary -p:CommitHash=$(CommitHash) + -p:Configuration=Native$(Configuration) -v:m -nologo -clp:NoSummary -p:CommitHash=$(CommitHash) -m - + + + -p:Configuration=$(Configuration) -v:m -nologo -clp:NoSummary + From 8ea2cd90819bdf9ac11fac5ce41bd3fa73fb0ea0 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 1 Aug 2018 15:40:45 -0700 Subject: [PATCH 179/363] Ship shim with integration testing (#1129) --- build/assets.props | 269 ++++++++++++++++++ build/launchSettings.json | 8 +- build/repo.targets | 40 +-- build/testsite.props | 36 +-- .../Properties/launchSettings.json | 8 +- .../Microsoft.AspNetCore.Server.IIS.csproj | 42 ++- .../IISApplication.cs | 14 +- .../IISDeployer.cs | 2 +- .../IISDeployerBase.cs | 12 +- .../IISDeploymentParameterExtensions.cs | 9 +- .../IISDeploymentParameters.cs | 16 +- .../IISExpressDeployer.cs | 21 +- ...tCore.Server.IntegrationTesting.IIS.csproj | 32 ++- .../WebConfigHelpers.cs | 10 +- .../IIS.FunctionalTests.csproj | 11 +- test/IIS.Tests/IIS.Tests.csproj | 11 +- .../IISExpress.FunctionalTests.csproj | 11 +- .../OutOfProcess/GlobalVersionTests.cs | 43 ++- .../InProcessWebSite/InProcessWebSite.csproj | 6 +- .../Properties/launchSettings.json | 8 +- .../Properties/launchSettings.json | 8 +- .../OverriddenServerWebSite.csproj | 5 +- .../Properties/launchSettings.json | 8 +- .../Properties/launchSettings.json | 8 +- .../StartupExceptionWebSite.csproj | 5 +- .../Properties/launchSettings.json | 8 +- .../StressTestWebSite.csproj | 1 + tools/GenerateNativeAssets.ps1 | 150 ++++++++++ 28 files changed, 636 insertions(+), 166 deletions(-) create mode 100644 build/assets.props create mode 100644 tools/GenerateNativeAssets.ps1 diff --git a/build/assets.props b/build/assets.props new file mode 100644 index 0000000000..13b30556bd --- /dev/null +++ b/build/assets.props @@ -0,0 +1,269 @@ + + + + true + x64 + $(Platform) + Win32 + $(NativePlatform) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.dll + $(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll + $(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll + $(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.dll + + diff --git a/build/launchSettings.json b/build/launchSettings.json index 943d2ad712..8cd1df05e6 100644 --- a/build/launchSettings.json +++ b/build/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -29,8 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/build/repo.targets b/build/repo.targets index 5fe12660fe..5a2620ec75 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -1,7 +1,7 @@ - InitializeComponents;$(PrepareDependsOn) + $(PrepareDependsOn) $(GetArtifactInfoDependsOn);GetNativeArtifactsInfo BuildNativeAssets;$(CompileDependsOn) $(PackageDependsOn);PackageNativeProjects @@ -14,36 +14,8 @@ - - - - - - - - - - - - - - - + + @@ -62,7 +34,7 @@ Condition="'$(VisualStudioMSBuildx86Path)' != ''" /> - + NuGetPackage @@ -116,8 +88,8 @@ BasePath="$(RepositoryRoot)" /> - - + + diff --git a/build/testsite.props b/build/testsite.props index 3f84d67f31..d412ac84b3 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -5,11 +5,11 @@ x64;x86 $(MSBuildThisFileDirectory)applicationhost.config $(MSBuildThisFileDirectory)applicationhost.iis.config - x64 - $(Platform) false - + + + $(MSBuildProgramFiles32)\IIS Express\iisexpress.exe $(SystemRoot)\SysWOW64\inetsrv\w3wp.exe @@ -22,30 +22,21 @@ x64 + - $(NativePlatform)\ - + - - - - - - - - - - - + /config:"$(IISExpressAppHostConfig)" /systray:false -h "$(IISAppHostConfig)" - $(NativePlatform)\aspnetcore.dll - $(NativePlatform)\aspnetcorev2.dll + $(AspNetCoreModuleV1ShimDll) + $(AspNetCoreModuleV2ShimDll) $(NativePlatform)\aspnetcorev2_inprocess.dll $(userprofile)\.dotnet\$(NativePlatform)\dotnet.exe @@ -62,8 +53,7 @@ - - + $(MSBuildThisFileDirectory)..\test\TestTasks\bin\$(Configuration)\$(TargetFramework)\TestTasks $(InjectDepsAssembly) @@ -82,11 +72,11 @@ - + - + diff --git a/samples/NativeIISSample/Properties/launchSettings.json b/samples/NativeIISSample/Properties/launchSettings.json index 943d2ad712..8cd1df05e6 100644 --- a/samples/NativeIISSample/Properties/launchSettings.json +++ b/samples/NativeIISSample/Properties/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -29,8 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index c2fa16aa42..6025b459fb 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -12,6 +12,8 @@ netcoreapp2.2 + + @@ -23,12 +25,40 @@ - - - - + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs index aa35ac92da..4a3caadd8e 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs @@ -5,6 +5,7 @@ using System; using System.Diagnostics; using System.IO; using System.Linq; +using System.Reflection; using System.Runtime.InteropServices; using System.Threading.Tasks; using System.Xml.Linq; @@ -71,7 +72,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting ConfigureSite(contentRoot, port); - ConfigureAppHostConfig(contentRoot); + ConfigureAppHostConfig(); _serverManager.CommitChanges(); @@ -280,11 +281,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting return site; } - private Configuration ConfigureAppHostConfig(string dllRoot) + private Configuration ConfigureAppHostConfig() { var config = _serverManager.GetApplicationHostConfiguration(); - SetGlobalModuleSection(config, dllRoot); + SetGlobalModuleSection(config); SetModulesSection(config); @@ -305,9 +306,9 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting appPool.Stop(); } - private void SetGlobalModuleSection(Configuration config, string dllRoot) + private void SetGlobalModuleSection(Configuration config) { - var ancmFile = GetAncmLocation(dllRoot); + var ancmFile = GetAncmLocation(); var globalModulesSection = config.GetSection("system.webServer/globalModules"); var globalConfigElement = globalModulesSection @@ -355,8 +356,9 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting } } - private string GetAncmLocation(string dllRoot) + private string GetAncmLocation() { + var dllRoot = AppContext.BaseDirectory; var arch = _deploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? $@"x64\{_ancmDllName}" : $@"x86\{_ancmDllName}"; var ancmFile = Path.Combine(dllRoot, arch); if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index ffbc8ba034..4e6c71c1c4 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS DefaultWebConfigActions.Add(WebConfigHelpers.AddOrModifyHandlerSection( key: "modules", value: DeploymentParameters.AncmVersion.ToString())); - RunWebConfigActions(); + RunWebConfigActions(contentRoot); } var uri = TestUriHelper.BuildTestUri(ServerType.IIS, DeploymentParameters.ApplicationBaseUriHint); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs index 5042a192e3..8dcc3e135e 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { public IISDeploymentParameters IISDeploymentParameters { get; } - protected List> DefaultWebConfigActions { get; } = new List>(); + protected List> DefaultWebConfigActions { get; } = new List>(); public IISDeployerBase(IISDeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) : base(deploymentParameters, loggerFactory) @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS IISDeploymentParameters = deploymentParameters; } - public void RunWebConfigActions() + public void RunWebConfigActions(string contentRoot) { if (IISDeploymentParameters == null) { @@ -42,19 +42,19 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS foreach (var action in DefaultWebConfigActions) { - action.Invoke(xElement); + action.Invoke(xElement, contentRoot); } foreach (var action in IISDeploymentParameters.WebConfigActionList) { - action.Invoke(xElement); + action.Invoke(xElement, contentRoot); } webconfig.Save(path); } - public string RunServerConfigActions(string serverConfigString) + public string RunServerConfigActions(string serverConfigString, string contentRoot) { if (IISDeploymentParameters == null) { @@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS foreach (var action in IISDeploymentParameters.ServerConfigActionList) { - action.Invoke(xElement); + action.Invoke(xElement, contentRoot); } return xElement.ToString(); } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs index ff2365a82a..f1e90f1a24 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs @@ -16,13 +16,18 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } public static void AddServerConfigAction(this IISDeploymentParameters parameters, Action action) + { + parameters.ServerConfigActionList.Add((config, _) => action(config)); + } + + public static void AddServerConfigAction(this IISDeploymentParameters parameters, Action action) { parameters.ServerConfigActionList.Add(action); } public static void AddHttpsToServerConfig(this IISDeploymentParameters parameters) { - parameters.ServerConfigActionList.Add( + parameters.AddServerConfigAction( element => { element.Descendants("binding") @@ -37,7 +42,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS public static void AddWindowsAuthToServerConfig(this IISDeploymentParameters parameters) { - parameters.ServerConfigActionList.Add( + parameters.AddServerConfigAction( element => { element.Descendants("windowsAuthentication") diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs index a22116d557..8d96236295 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs @@ -48,14 +48,14 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } } - private IList> CreateDefaultWebConfigActionList() + private IList> CreateDefaultWebConfigActionList() { - return new List>() { AddWebConfigEnvironmentVariables(), AddHandlerSettings() }; + return new List>() { AddWebConfigEnvironmentVariables(), AddHandlerSettings() }; } - public IList> WebConfigActionList { get; } + public IList> WebConfigActionList { get; } - public IList> ServerConfigActionList { get; } = new List>(); + public IList> ServerConfigActionList { get; } = new List>(); public IDictionary WebConfigBasedEnvironmentVariables { get; set; } = new Dictionary(); @@ -63,9 +63,9 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS public bool GracefulShutdown { get; set; } - private Action AddWebConfigEnvironmentVariables() + private Action AddWebConfigEnvironmentVariables() { - return xElement => + return (xElement, _) => { if (WebConfigBasedEnvironmentVariables.Count == 0) { @@ -86,9 +86,9 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS }; } - private Action AddHandlerSettings() + private Action AddHandlerSettings() { - return xElement => + return (xElement, _) => { if (HandlerSettings.Count == 0) { diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index 6d99edf0fd..ff02771ec0 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -6,6 +6,7 @@ using System.Diagnostics; using System.Globalization; using System.IO; using System.Linq; +using System.Reflection; using System.Runtime.InteropServices; using System.Text.RegularExpressions; using System.Threading; @@ -57,7 +58,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { DotnetPublish(); contentRoot = DeploymentParameters.PublishedApplicationRootPath; - dllRoot = contentRoot; } else { @@ -93,7 +93,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS var testUri = TestUriHelper.BuildTestUri(ServerType.IISExpress, DeploymentParameters.ApplicationBaseUriHint); // Launch the host process. - var (actualUri, hostExitToken) = await StartIISExpressAsync(testUri, contentRoot, dllRoot); + var (actualUri, hostExitToken) = await StartIISExpressAsync(testUri, contentRoot); Logger.LogInformation("Application ready at URL: {appUrl}", actualUri); @@ -145,7 +145,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS return dllRoot; } - private async Task<(Uri url, CancellationToken hostExitToken)> StartIISExpressAsync(Uri uri, string contentRoot, string dllRoot) + private async Task<(Uri url, CancellationToken hostExitToken)> StartIISExpressAsync(Uri uri, string contentRoot) { using (Logger.BeginScope("StartIISExpress")) { @@ -156,7 +156,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } Logger.LogInformation("Attempting to start IIS Express on port: {port}", port); - PrepareConfig(contentRoot, dllRoot, port); + PrepareConfig(contentRoot, port); var parameters = string.IsNullOrEmpty(DeploymentParameters.ServerConfigLocation) ? string.Format("/port:{0} /path:\"{1}\" /trace:error /systray:false", uri.Port, contentRoot) : @@ -257,7 +257,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } } - private void PrepareConfig(string contentRoot, string dllRoot, int port) + private void PrepareConfig(string contentRoot, int port) { // Config is required. If not present then fall back to one we carry with us. if (string.IsNullOrEmpty(DeploymentParameters.ServerConfigTemplateContent)) @@ -273,8 +273,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS // Pass on the applicationhost.config to iis express. With this don't need to pass in the /path /port switches as they are in the applicationHost.config // We take a copy of the original specified applicationHost.Config to prevent modifying the one in the repo. - serverConfig = ModifyANCMPathInConfig(replaceFlag: "[ANCMPath]", dllName: "aspnetcore.dll", serverConfig, dllRoot); - serverConfig = ModifyANCMPathInConfig(replaceFlag: "[ANCMV2Path]", dllName: "aspnetcorev2.dll", serverConfig, dllRoot); + serverConfig = ModifyANCMPathInConfig(replaceFlag: "[ANCMPath]", dllName: "aspnetcore.dll", serverConfig); + serverConfig = ModifyANCMPathInConfig(replaceFlag: "[ANCMV2Path]", dllName: "aspnetcorev2.dll", serverConfig); serverConfig = ReplacePlaceholder(serverConfig, "[PORT]", port.ToString(CultureInfo.InvariantCulture)); serverConfig = ReplacePlaceholder(serverConfig, "[ApplicationPhysicalPath]", contentRoot); @@ -291,7 +291,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS value: DeploymentParameters.AncmVersion.ToString())); ModifyDotNetExePathInWebConfig(); serverConfig = RemoveRedundantElements(serverConfig); - RunWebConfigActions(); + RunWebConfigActions(contentRoot); } else { @@ -299,7 +299,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS serverConfig = ReplacePlaceholder(serverConfig, "[HostingModel]", DeploymentParameters.HostingModel.ToString()); serverConfig = ReplacePlaceholder(serverConfig, "[AspNetCoreModule]", DeploymentParameters.AncmVersion.ToString()); } - serverConfig = RunServerConfigActions(serverConfig); + serverConfig = RunServerConfigActions(serverConfig, contentRoot); DeploymentParameters.ServerConfigLocation = Path.GetTempFileName(); Logger.LogDebug("Saving Config to {configPath}", DeploymentParameters.ServerConfigLocation); @@ -317,8 +317,9 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS return content; } - private string ModifyANCMPathInConfig(string replaceFlag, string dllName, string serverConfig, string dllRoot) + private string ModifyANCMPathInConfig(string replaceFlag, string dllName, string serverConfig) { + var dllRoot = AppContext.BaseDirectory; if (serverConfig.Contains(replaceFlag)) { var arch = DeploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? $@"x64\{dllName}" : $@"x86\{dllName}"; diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index 363de4e34f..766b470a50 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -9,14 +9,44 @@ aspnetcore;iis + + - + + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs index 8d2af5eb1d..31f103fee2 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs @@ -9,20 +9,20 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { public static class WebConfigHelpers { - public static Action AddOrModifyAspNetCoreSection(string key, string value) + public static Action AddOrModifyAspNetCoreSection(string key, string value) => AddAction(key, value, section: "aspNetCore"); - public static Action AddAction(string key, string value, string section) + public static Action AddAction(string key, string value, string section) { - return (element) => + return (element, _) => { element.Descendants(section).SingleOrDefault().SetAttributeValue(key, value); }; } - public static Action AddOrModifyHandlerSection(string key, string value) + public static Action AddOrModifyHandlerSection(string key, string value) { - return element => + return (element, _) => { element.Descendants("handlers") .FirstOrDefault() diff --git a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index 73c2d11f70..dfe65f9b56 100644 --- a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -10,8 +10,6 @@ - - @@ -23,13 +21,6 @@ - - - - - - - @@ -45,7 +36,7 @@ - + PreserveNewest diff --git a/test/IIS.Tests/IIS.Tests.csproj b/test/IIS.Tests/IIS.Tests.csproj index 1037d93c25..614a286626 100644 --- a/test/IIS.Tests/IIS.Tests.csproj +++ b/test/IIS.Tests/IIS.Tests.csproj @@ -1,22 +1,16 @@ - + netcoreapp2.2 + - - - - - - - @@ -31,6 +25,7 @@ + diff --git a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index 3ae8fcffe8..455f453431 100644 --- a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -9,8 +9,6 @@ - - @@ -22,13 +20,6 @@ - - - - - - - @@ -44,7 +35,7 @@ - + PreserveNewest diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index 3ab5918753..7ad5d9c9f6 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -23,7 +23,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _fixture = fixture; } - private const string _aspNetCoreDll = "aspnetcorev2_outofprocess.dll"; private const string _handlerVersion20 = "2.0.0"; private const string _helloWorldRequest = "HelloWorld"; private const string _helloWorldResponse = "Hello World"; @@ -72,6 +71,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task GlobalVersion_NewVersionNumber(string version) { var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + CopyShimToOutput(deploymentParameters); deploymentParameters.HandlerSettings["handlerVersion"] = version; var deploymentResult = await DeployAsync(deploymentParameters); @@ -92,7 +92,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task GlobalVersion_MultipleRequestHandlers_PicksHighestOne(string version) { var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); - + CopyShimToOutput(deploymentParameters); var deploymentResult = await DeployAsync(deploymentParameters); var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); @@ -115,6 +115,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task GlobalVersion_MultipleRequestHandlers_UpgradeWorks(string version) { var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + CopyShimToOutput(deploymentParameters); var deploymentResult = await DeployAsync(deploymentParameters); var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); @@ -170,5 +171,43 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { Assert.Contains(TestSink.Writes, context => context.Message.Contains(version + @"\aspnetcorev2_outofprocess.dll")); } + + private static void CopyShimToOutput(IISDeploymentParameters parameters) + { + parameters.AddServerConfigAction( + (config, contentRoot) => { + var moduleNodes = config.DescendantNodesAndSelf() + .OfType() + .Where(element => + element.Name == "add" && + element.Attribute("name")?.Value.StartsWith("AspNetCoreModule") == true && + element.Attribute("image") != null); + + var sourceDirectory = new DirectoryInfo(Path.GetDirectoryName(moduleNodes.First().Attribute("image").Value)); + var destinationDirectory = new DirectoryInfo(Path.Combine(contentRoot, sourceDirectory.Name)); + destinationDirectory.Create(); + foreach (var element in moduleNodes) + { + var imageAttribute = element.Attribute("image"); + imageAttribute.Value = imageAttribute.Value.Replace(sourceDirectory.FullName, destinationDirectory.FullName); + } + CopyFiles(sourceDirectory, destinationDirectory); + }); + } + + private static void CopyFiles(DirectoryInfo source, DirectoryInfo target) + { + foreach (DirectoryInfo directoryInfo in source.GetDirectories()) + { + CopyFiles(directoryInfo, target.CreateSubdirectory(directoryInfo.Name)); + } + + foreach (FileInfo fileInfo in source.GetFiles()) + { + var destFileName = Path.Combine(target.FullName, fileInfo.Name); + fileInfo.CopyTo(destFileName); + } + } + } } diff --git a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj index b6d09409c1..393574d9c8 100644 --- a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj +++ b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj @@ -1,10 +1,12 @@ - - + netcoreapp2.2 + true + + diff --git a/test/WebSites/InProcessWebSite/Properties/launchSettings.json b/test/WebSites/InProcessWebSite/Properties/launchSettings.json index 943d2ad712..8cd1df05e6 100644 --- a/test/WebSites/InProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/InProcessWebSite/Properties/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -29,8 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json index 943d2ad712..8cd1df05e6 100644 --- a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -29,8 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj b/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj index 2b9db3ce4a..f7108dadc4 100644 --- a/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj +++ b/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj @@ -1,11 +1,12 @@ - - netcoreapp2.2 + true + + diff --git a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json index 943d2ad712..8cd1df05e6 100644 --- a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json +++ b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -29,8 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json index 943d2ad712..8cd1df05e6 100644 --- a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json +++ b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -29,8 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj b/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj index d279ce41b4..922196815f 100644 --- a/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj +++ b/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj @@ -1,11 +1,12 @@  - - netcoreapp2.2 + true + + diff --git a/test/WebSites/StressTestWebSite/Properties/launchSettings.json b/test/WebSites/StressTestWebSite/Properties/launchSettings.json index 943d2ad712..8cd1df05e6 100644 --- a/test/WebSites/StressTestWebSite/Properties/launchSettings.json +++ b/test/WebSites/StressTestWebSite/Properties/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -29,8 +29,8 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/StressTestWebSite/StressTestWebSite.csproj b/test/WebSites/StressTestWebSite/StressTestWebSite.csproj index 8c1b6b08e7..9a1ed0692f 100644 --- a/test/WebSites/StressTestWebSite/StressTestWebSite.csproj +++ b/test/WebSites/StressTestWebSite/StressTestWebSite.csproj @@ -4,6 +4,7 @@ $(StandardTestTfms) + true diff --git a/tools/GenerateNativeAssets.ps1 b/tools/GenerateNativeAssets.ps1 new file mode 100644 index 0000000000..f4b98959ed --- /dev/null +++ b/tools/GenerateNativeAssets.ps1 @@ -0,0 +1,150 @@ +$targetFile = Join-Path (Split-Path -parent $PSCommandPath) "..\build\assets.props"; + +$platforms = @( + @{ + Platform = "x64"; + VCPlatform = "x64"; + }, + @{ + Platform = "x86"; + VCPlatform = "Win32"; + } +); +$srcDir = "`$(MSBuildThisFileDirectory)..\src"; +$projects = @( + @{ + ProjectDirectory = "$srcDir\AspNetCoreModuleV1\AspNetCore"; + ProjectName = "AspNetCore.vcxproj"; + NativeAsset = "aspnetcore"; + BaseOutputPath = "AspNetCoreModuleV1" + PropetyName = "AspNetCoreModuleV1Shim" + }, + @{ + ProjectDirectory = "$srcDir\AspNetCoreModuleV2\AspNetCore"; + ProjectName = "`AspNetCore.vcxproj"; + NativeAsset = "aspnetcorev2"; + BaseOutputPath = "AspNetCoreModuleV2" + PropetyName = "AspNetCoreModuleV2Shim" + }, + @{ + ProjectDirectory = "$srcDir\AspNetCoreModuleV2\InProcessRequestHandler"; + ProjectName = "InProcessRequestHandler.vcxproj"; + NativeAsset = "aspnetcorev2_inprocess"; + BaseOutputPath = "AspNetCoreModuleV2"; + PropetyName = "AspNetCoreModuleV2InProcessHandler" + }, + @{ + ProjectDirectory = "$srcDir\AspNetCoreModuleV2\OutOfProcessRequestHandler"; + ProjectName = "OutOfProcessRequestHandler.vcxproj"; + NativeAsset = "aspnetcorev2_outofprocess"; + BaseOutputPath = "AspNetCoreModuleV2"; + PackageSubPath = "`$(AspNetCoreModuleOutOfProcessVersion)\"; + PropetyName = "AspNetCoreModuleV2OutOfProcessHandler" + } +); +$currentPlatform = @{ + Platform = "`$(NativePlatform)"; + VCPlatform = "`$(NativeVCPlatform)"; +}; +$components = @(); +$shimComponents = @(); +$inProcessComponents = @(); +$runShimComponents = @(); +$runInProcessComponents = @(); +$properties = @(); + +function CopyProperties($from, $to) +{ + foreach ($key in $from.Keys) + { + $to.Add($key, $from.$key); + } +} + +function Write-Group($group, $name) +{ + return $( + foreach ($item in $group){ + " <$name$(foreach ($pair in $item.GetEnumerator()) { + "`n $($pair.Key)=`"`"$($pair.Value)`"`""}) + />`n"}); +} +function Write-Properties($group) +{ + return $( + foreach ($item in $group){ + "`n <$($item.Name)>$($item.Value)"}); +} + +function New-Component($project, $platform) +{ + $component = [ordered]@{}; + CopyProperties -from $platform -to $component; + CopyProperties -from $project -to $component; + CopyProperties -from @{ + Include = "$($project.ProjectDirectory)\$($project.ProjectName)"; + DllLocation = "$($project.ProjectDirectory)\bin\`$(Configuration)\$($platform.VCPlatform)\$($project.NativeAsset).dll"; + PdbLocation = "$($project.ProjectDirectory)\bin\`$(Configuration)\$($platform.VCPlatform)\$($project.NativeAsset).pdb"; + } -to $component; + + return $component; +} + +foreach ($project in $projects) +{ + foreach ($platform in $platforms) + { + $component = New-Component $project $platform; + $components += $component; + + if ($project.ProjectName.Contains("InProcess")) + { + $inProcessComponents += $component; + } + else + { + $shimComponents += $component; + } + } + + $properties += @{ + Name = "$($project.PropetyName)Dll"; + Value = "$($project.ProjectDirectory)\bin\`$(Configuration)\`$(NativeVCPlatform)\$($project.NativeAsset).dll"; + }; + + $runComponent = New-Component $project $currentPlatform; + + if ($project.ProjectName.Contains("InProcess")) + { + $runInProcessComponents += $runComponent; + } + else + { + $runShimComponents += $runComponent; + } +} + +$content = @" + + + + true + x64 + `$(Platform) + Win32 + `$(NativePlatform) + + +$(Write-Group $components "Components" ) +$(Write-Group $shimComponents "ShimComponents") +$(Write-Group $inProcessComponents "InProcessComponents") +$(Write-Group $runShimComponents "RunShimComponents") +$(Write-Group $runInProcessComponents "RunInProcessComponents") + + +$(Write-Properties $properties) + + +"@; + +[IO.File]::WriteAllLines($targetFile, $content) From 9cec10e3053b931921f33caef2a08533d689857a Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 2 Aug 2018 08:20:21 -0700 Subject: [PATCH 180/363] Update deps --- build/dependencies.props | 50 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index b23adbabd4..1fec602126 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,37 +5,37 @@ 0.10.13 3.0.0-alpha1-10015 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 0.7.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 0.7.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 15.6.82 15.6.82 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 - 3.0.0-alpha1-10173 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 + 3.0.0-alpha1-10207 2.0.9 2.1.2 2.2.0-preview1-26618-02 1.0.1 - 3.0.0-alpha1-10173 + 3.0.0-alpha1-10207 15.6.1 11.1.0 2.0.3 From 477fd1d90d29cb6a2cc43920b2bebc12e61d7e3b Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 2 Aug 2018 13:17:17 -0700 Subject: [PATCH 181/363] Aquire exclusive lock when creating application info (#1142) --- .../NativeIISSample/NativeIISSample.csproj | 1 + .../AspNetCore/applicationmanager.cpp | 42 +++++++++++----- .../CommonStartupTests.cs | 48 +++++++++++++++++++ 3 files changed, 78 insertions(+), 13 deletions(-) create mode 100644 test/Common.FunctionalTests/CommonStartupTests.cs diff --git a/samples/NativeIISSample/NativeIISSample.csproj b/samples/NativeIISSample/NativeIISSample.csproj index d3c6d51b75..c1f4b88c89 100644 --- a/samples/NativeIISSample/NativeIISSample.csproj +++ b/samples/NativeIISSample/NativeIISSample.csproj @@ -4,6 +4,7 @@ netcoreapp2.2 + true diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp index 9de2901be5..be4d124437 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp @@ -44,24 +44,40 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( // key in the applicationInfoHash. pszApplicationId = pApplication.GetApplicationId(); - // When accessing the m_pApplicationInfoHash, we need to acquire the application manager - // lock to avoid races on setting state. - SRWSharedLock lock(m_srwLock); - if (!m_fDebugInitialize) { - DebugInitializeFromConfig(m_pHttpServer, pApplication); - m_fDebugInitialize = TRUE; - } + // When accessing the m_pApplicationInfoHash, we need to acquire the application manager + // lock to avoid races on setting state. + SRWSharedLock readLock(m_srwLock); + if (!m_fDebugInitialize) + { + DebugInitializeFromConfig(m_pHttpServer, pApplication); + m_fDebugInitialize = TRUE; + } - if (g_fInShutdown) - { - FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); - } + if (g_fInShutdown) + { + FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); + } - m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); + m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); + + // It's important to release read lock here so exclusive lock + // can be reacquired later as SRW lock doesn't allow upgrades + } if (*ppApplicationInfo == NULL) { + // Take exclusive lock before creating the application + SRWExclusiveLock writeLock(m_srwLock); + + // Check if other thread created the application + + m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); + if (*ppApplicationInfo != NULL) + { + FINISHED(S_OK); + } + pApplicationInfo = new APPLICATION_INFO(m_pHttpServer); FINISHED_IF_FAILED(pApplicationInfo->Initialize(pApplication)); @@ -187,7 +203,7 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( DWORD dwPreviousCounter = 0; APPLICATION_INFO_HASH* table = NULL; CONFIG_CHANGE_CONTEXT context; - + if (g_fInShutdown) { // We are already shutting down, ignore this event as a global configuration change event diff --git a/test/Common.FunctionalTests/CommonStartupTests.cs b/test/Common.FunctionalTests/CommonStartupTests.cs new file mode 100644 index 0000000000..760c1ad04b --- /dev/null +++ b/test/Common.FunctionalTests/CommonStartupTests.cs @@ -0,0 +1,48 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Net; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class CommonStartupTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public CommonStartupTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22) + .WithAllApplicationTypes() + .WithAllAncmVersions() + .WithAllHostingModels(); + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task StartupStress(TestVariant variant) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + + var deploymentResult = await DeployAsync(deploymentParameters); + + await Helpers.StressLoad(deploymentResult.HttpClient, "/HelloWorld", response => { + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal("Hello World", response.Content.ReadAsStringAsync().GetAwaiter().GetResult()); + }); + } + } +} From 4eb2e416013e462259d03b24a968b0ed4331194e Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 2 Aug 2018 15:03:50 -0700 Subject: [PATCH 182/363] Wait between requests while checking app_offline (#1144) --- test/Common.FunctionalTests/AppOfflineTests.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/test/Common.FunctionalTests/AppOfflineTests.cs index d8d0861d3a..c191eea4c7 100644 --- a/test/Common.FunctionalTests/AppOfflineTests.cs +++ b/test/Common.FunctionalTests/AppOfflineTests.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.IO; using System.Net; using System.Net.Http; @@ -19,6 +20,8 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests [Collection(PublishedSitesCollection.Name)] public class AppOfflineTests : IISFunctionalTestBase { + private static readonly TimeSpan RetryDelay = TimeSpan.FromMilliseconds(100); + private readonly PublishedSitesFixture _fixture; public AppOfflineTests(PublishedSitesFixture fixture) @@ -94,7 +97,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests // 1. ANCM detects app_offline before it starts the request - if AssertAppOffline succeeds we've hit it // 2. Intended scenario where app starts and then shuts down // In first case we remove app_offline and try again - await Task.Delay(100); + await Task.Delay(RetryDelay); AddAppOffline(deploymentResult.ContentRoot); @@ -182,7 +185,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests () => AddAppOffline(deploymentResult.ContentRoot), e => Logger.LogError($"Failed to create app_offline : {e.Message}"), retryCount: 3, - retryDelayMilliseconds: 100); + retryDelayMilliseconds: RetryDelay.Milliseconds); RemoveAppOffline(deploymentResult.ContentRoot); } @@ -218,7 +221,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests () => File.Delete(Path.Combine(appPath, "app_offline.htm")), e => Logger.LogError($"Failed to remove app_offline : {e.Message}"), retryCount: 3, - retryDelayMilliseconds: 100); + retryDelayMilliseconds: RetryDelay.Milliseconds); } private async Task AssertAppOffline(IISDeploymentResult deploymentResult, string expectedResponse = "The app is offline.") @@ -229,6 +232,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { // Keep retrying until app_offline is present. response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + await Task.Delay(RetryDelay); } Assert.Equal(HttpStatusCode.ServiceUnavailable, response.StatusCode); From 05eb6a7f7c72bfec63f3c65f63a2f020fe22e705 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 2 Aug 2018 16:51:00 -0700 Subject: [PATCH 183/363] Add ERROR_SHARING_VIOLATION to retry list for IISDeployer.Start (#1147) --- .../IISApplication.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs index 4a3caadd8e..81cebf1568 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs @@ -20,6 +20,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting internal class IISApplication { internal const int ERROR_OBJECT_NOT_FOUND = unchecked((int)0x800710D8); + internal const int ERROR_SHARING_VIOLATION = unchecked((int)0x80070020); private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(10); private static readonly TimeSpan _retryDelay = TimeSpan.FromMilliseconds(200); @@ -109,7 +110,10 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting _logger.LogInformation($"Tried to start site, state: {state.ToString()}"); } } - catch (Exception ex) when (ex is DllNotFoundException || (ex is COMException && ex.HResult == ERROR_OBJECT_NOT_FOUND) ) + catch (Exception ex) when ( + ex is DllNotFoundException || + ex is COMException && + (ex.HResult == ERROR_OBJECT_NOT_FOUND || ex.HResult == ERROR_SHARING_VIOLATION)) { // Accessing the site.State property while the site // is starting up returns the COMException From f867367b56162166d67e8ec636917bf0bbf5bdff Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 3 Aug 2018 13:55:25 -0700 Subject: [PATCH 184/363] Use V2 schema for V1 outputs, do not pack pdb's (#1152) --- build/repo.targets | 2 +- ...crosoft.AspNetCore.AspNetCoreModule.nuspec | 2 +- .../AspNetCore/AspNetCore.vcxproj | 8 ---- .../AspNetCore/aspnetcore_schema.xml | 39 ------------------- .../Microsoft.AspNetCore.Server.IIS.csproj | 4 +- ...tCore.Server.IntegrationTesting.IIS.csproj | 4 -- tools/update_schema.ps1 | 7 +--- 7 files changed, 5 insertions(+), 61 deletions(-) delete mode 100644 src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml diff --git a/build/repo.targets b/build/repo.targets index 5a2620ec75..4415123011 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -92,7 +92,7 @@ - + diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec b/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec index 80d9490328..f05fcbbdd8 100644 --- a/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec +++ b/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec @@ -25,7 +25,7 @@ - + diff --git a/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj index e1c11dddb6..169c79e503 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj @@ -213,14 +213,6 @@ - - - PreserveNewest - - - - - diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml b/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml deleted file mode 100644 index c1590816b7..0000000000 --- a/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index 6025b459fb..0580c14e85 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -34,9 +34,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index 766b470a50..c13eb6214b 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -27,10 +27,6 @@ PackageCopyToOutput="true" PackagePath="contentFiles/any/any/%(ShimComponents.Platform)/%(ShimComponents.PackageSubPath)"/> - - diff --git a/tools/update_schema.ps1 b/tools/update_schema.ps1 index 64f8248af4..2a45a3152c 100644 --- a/tools/update_schema.ps1 +++ b/tools/update_schema.ps1 @@ -15,10 +15,7 @@ $ancmSchemaFiles = @( "aspnetcore_schema_v2.xml" ) -$ancmSchemaFileLocations = @( - @(Resolve-Path "$PSScriptRoot\..\src\AspNetCoreModuleV1\AspNetCore\aspnetcore_schema.xml"), - @(Resolve-Path "$PSScriptRoot\..\src\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml") -) +$ancmSchemaFileLocation = Resolve-Path "$PSScriptRoot\..\src\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml"; [bool]$isAdmin = ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator") @@ -46,7 +43,7 @@ if (-not $isAdmin -and -not $WhatIfPreference) { for ($i=0; $i -lt $ancmSchemaFiles.Length; $i++) { $schemaFile = $ancmSchemaFiles[$i] - $schemaSource = $ancmSchemaFileLocations[$i] + $schemaSource = $ancmSchemaFileLocation $destinations = @( "${env:ProgramFiles(x86)}\IIS Express\config\schema\", From 9ff001d57cf9def3136db3de4aeeb918cef03f3a Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 3 Aug 2018 13:55:33 -0700 Subject: [PATCH 185/363] Capture global logs on VSTS (#1151) --- .vsts-pipelines/templates/build-steps.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml index 949093b338..2ebd7b36d1 100644 --- a/.vsts-pipelines/templates/build-steps.yml +++ b/.vsts-pipelines/templates/build-steps.yml @@ -5,6 +5,14 @@ phases: beforeBuild: - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; Restart-Service w3svc" displayName: Prepare repo + afterBuild: + - task: PublishBuildArtifacts@1 + displayName: Upload binlog + condition: always() + inputs: + artifactName: logs + artifactType: Container + pathtoPublish: artifacts/logs/ - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools parameters: From 2a761d635ccfe9f96370ba6b21439687a1c60acd Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Fri, 3 Aug 2018 14:04:32 -0700 Subject: [PATCH 186/363] Replace "std::experimental::filesystem" with "std::filesystem" (#1153) * Continuation of #1082 --- .../CommonLib/GlobalVersionUtility.cpp | 2 +- .../CommonLib/PollingAppOfflineApplication.cpp | 4 ++-- .../CommonLib/PollingAppOfflineApplication.h | 4 ++-- .../CommonLib/hostfxr_utility.cpp | 4 ++-- .../CommonLib/hostfxr_utility.h | 16 ++++++++-------- test/CommonLibTests/FileOutputManagerTests.cpp | 2 +- test/CommonLibTests/GlobalVersionTests.cpp | 2 +- test/CommonLibTests/Helpers.cpp | 4 ++-- test/CommonLibTests/Helpers.h | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp index b2c6b69871..7cb185b0c3 100644 --- a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp @@ -6,7 +6,7 @@ #include "GlobalVersionUtility.h" -namespace fs = std::experimental::filesystem; +namespace fs = std::filesystem; // throws runtime error if no request handler versions are installed. // Throw invalid_argument if any argument is null diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp index 1468c7ee37..2e552679e0 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp @@ -38,7 +38,7 @@ PollingAppOfflineApplication::AppOfflineExists() } -std::experimental::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpApplication& pApplication) +std::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpApplication& pApplication) { - return std::experimental::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm"; + return std::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm"; } diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h index 48e71f6641..516e72b79f 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h @@ -30,8 +30,8 @@ public: void Stop(bool fServerInitiated) override { UNREFERENCED_PARAMETER(fServerInitiated); } protected: - std::experimental::filesystem::path m_appOfflineLocation; - static std::experimental::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication); + std::filesystem::path m_appOfflineLocation; + static std::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication); private: static const int c_appOfflineRefreshIntervalMS = 200; diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index ab827460bf..57644819be 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -13,7 +13,7 @@ #include "HandleWrapper.h" #include "Environment.h" -namespace fs = std::experimental::filesystem; +namespace fs = std::filesystem; // // Runs a standalone appliction. @@ -98,7 +98,7 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( } BOOL -HOSTFXR_UTILITY::IsDotnetExecutable(const std::experimental::filesystem::path & dotnetPath) +HOSTFXR_UTILITY::IsDotnetExecutable(const std::filesystem::path & dotnetPath) { auto name = dotnetPath.filename(); name.replace_extension(""); diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index 1315865803..9e56fb4e28 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -44,7 +44,7 @@ public: static BOOL IsDotnetExecutable( - _In_ const std::experimental::filesystem::path & dotnetPath + _In_ const std::filesystem::path & dotnetPath ); static @@ -74,25 +74,25 @@ public: ); static - std::optional + std::optional GetAbsolutePathToHostFxr( - _In_ const std::experimental::filesystem::path & dotnetPath, + _In_ const std::filesystem::path & dotnetPath, _In_ HANDLE hEventLog ); static - std::optional + std::optional GetAbsolutePathToDotnetFromProgramFiles(); static - std::optional + std::optional InvokeWhereToFindDotnet(); static - std::optional + std::optional GetAbsolutePathToDotnet( - _In_ const std::experimental::filesystem::path & applicationPath, - _In_ const std::experimental::filesystem::path & requestedPath + _In_ const std::filesystem::path & applicationPath, + _In_ const std::filesystem::path & requestedPath ); }; diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/test/CommonLibTests/FileOutputManagerTests.cpp index d0caa524a8..ae1085408c 100644 --- a/test/CommonLibTests/FileOutputManagerTests.cpp +++ b/test/CommonLibTests/FileOutputManagerTests.cpp @@ -41,7 +41,7 @@ namespace FileOutManagerStartupTests wprintf(expected, out); } - for (auto & p : std::experimental::filesystem::directory_iterator(tempDirectory.path())) + for (auto & p : std::filesystem::directory_iterator(tempDirectory.path())) { std::wstring filename(p.path().filename()); ASSERT_EQ(filename.substr(0, fileNamePrefix.size()), fileNamePrefix); diff --git a/test/CommonLibTests/GlobalVersionTests.cpp b/test/CommonLibTests/GlobalVersionTests.cpp index 9c74b6720e..f38c9361d2 100644 --- a/test/CommonLibTests/GlobalVersionTests.cpp +++ b/test/CommonLibTests/GlobalVersionTests.cpp @@ -7,7 +7,7 @@ namespace GlobalVersionTests { using ::testing::Test; - namespace fs = std::experimental::filesystem; + namespace fs = std::filesystem; class GlobalVersionTest : public Test { diff --git a/test/CommonLibTests/Helpers.cpp b/test/CommonLibTests/Helpers.cpp index 3e429a6665..ccca6cad5b 100644 --- a/test/CommonLibTests/Helpers.cpp +++ b/test/CommonLibTests/Helpers.cpp @@ -28,7 +28,7 @@ TempDirectory::TempDirectory() RPC_CSTR szUuid = NULL; if (UuidToStringA(&uuid, &szUuid) == RPC_S_OK) { - m_path = std::experimental::filesystem::temp_directory_path() / szUuid; + m_path = std::filesystem::temp_directory_path() / reinterpret_cast(szUuid); RpcStringFreeA(&szUuid); return; } @@ -37,5 +37,5 @@ TempDirectory::TempDirectory() TempDirectory::~TempDirectory() { - std::experimental::filesystem::remove_all(m_path); + std::filesystem::remove_all(m_path); } diff --git a/test/CommonLibTests/Helpers.h b/test/CommonLibTests/Helpers.h index 657766dd43..67256966bb 100644 --- a/test/CommonLibTests/Helpers.h +++ b/test/CommonLibTests/Helpers.h @@ -18,11 +18,11 @@ public: ~TempDirectory(); - std::experimental::filesystem::path path() const + std::filesystem::path path() const { return m_path; } private: - std::experimental::filesystem::path m_path; + std::filesystem::path m_path; }; From d199de2c80af654e80885202dd72f2c4cbe24729 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Fri, 3 Aug 2018 15:44:35 -0700 Subject: [PATCH 187/363] Revert "Replace "std::experimental::filesystem" with "std::filesystem" (#1153)" This reverts commit 2a761d635ccfe9f96370ba6b21439687a1c60acd. --- .../CommonLib/GlobalVersionUtility.cpp | 2 +- .../CommonLib/PollingAppOfflineApplication.cpp | 4 ++-- .../CommonLib/PollingAppOfflineApplication.h | 4 ++-- .../CommonLib/hostfxr_utility.cpp | 4 ++-- .../CommonLib/hostfxr_utility.h | 16 ++++++++-------- test/CommonLibTests/FileOutputManagerTests.cpp | 2 +- test/CommonLibTests/GlobalVersionTests.cpp | 2 +- test/CommonLibTests/Helpers.cpp | 4 ++-- test/CommonLibTests/Helpers.h | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp index 7cb185b0c3..b2c6b69871 100644 --- a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp @@ -6,7 +6,7 @@ #include "GlobalVersionUtility.h" -namespace fs = std::filesystem; +namespace fs = std::experimental::filesystem; // throws runtime error if no request handler versions are installed. // Throw invalid_argument if any argument is null diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp index 2e552679e0..1468c7ee37 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp @@ -38,7 +38,7 @@ PollingAppOfflineApplication::AppOfflineExists() } -std::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpApplication& pApplication) +std::experimental::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpApplication& pApplication) { - return std::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm"; + return std::experimental::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm"; } diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h index 516e72b79f..48e71f6641 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h @@ -30,8 +30,8 @@ public: void Stop(bool fServerInitiated) override { UNREFERENCED_PARAMETER(fServerInitiated); } protected: - std::filesystem::path m_appOfflineLocation; - static std::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication); + std::experimental::filesystem::path m_appOfflineLocation; + static std::experimental::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication); private: static const int c_appOfflineRefreshIntervalMS = 200; diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index 57644819be..ab827460bf 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -13,7 +13,7 @@ #include "HandleWrapper.h" #include "Environment.h" -namespace fs = std::filesystem; +namespace fs = std::experimental::filesystem; // // Runs a standalone appliction. @@ -98,7 +98,7 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( } BOOL -HOSTFXR_UTILITY::IsDotnetExecutable(const std::filesystem::path & dotnetPath) +HOSTFXR_UTILITY::IsDotnetExecutable(const std::experimental::filesystem::path & dotnetPath) { auto name = dotnetPath.filename(); name.replace_extension(""); diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index 9e56fb4e28..1315865803 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -44,7 +44,7 @@ public: static BOOL IsDotnetExecutable( - _In_ const std::filesystem::path & dotnetPath + _In_ const std::experimental::filesystem::path & dotnetPath ); static @@ -74,25 +74,25 @@ public: ); static - std::optional + std::optional GetAbsolutePathToHostFxr( - _In_ const std::filesystem::path & dotnetPath, + _In_ const std::experimental::filesystem::path & dotnetPath, _In_ HANDLE hEventLog ); static - std::optional + std::optional GetAbsolutePathToDotnetFromProgramFiles(); static - std::optional + std::optional InvokeWhereToFindDotnet(); static - std::optional + std::optional GetAbsolutePathToDotnet( - _In_ const std::filesystem::path & applicationPath, - _In_ const std::filesystem::path & requestedPath + _In_ const std::experimental::filesystem::path & applicationPath, + _In_ const std::experimental::filesystem::path & requestedPath ); }; diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/test/CommonLibTests/FileOutputManagerTests.cpp index ae1085408c..d0caa524a8 100644 --- a/test/CommonLibTests/FileOutputManagerTests.cpp +++ b/test/CommonLibTests/FileOutputManagerTests.cpp @@ -41,7 +41,7 @@ namespace FileOutManagerStartupTests wprintf(expected, out); } - for (auto & p : std::filesystem::directory_iterator(tempDirectory.path())) + for (auto & p : std::experimental::filesystem::directory_iterator(tempDirectory.path())) { std::wstring filename(p.path().filename()); ASSERT_EQ(filename.substr(0, fileNamePrefix.size()), fileNamePrefix); diff --git a/test/CommonLibTests/GlobalVersionTests.cpp b/test/CommonLibTests/GlobalVersionTests.cpp index f38c9361d2..9c74b6720e 100644 --- a/test/CommonLibTests/GlobalVersionTests.cpp +++ b/test/CommonLibTests/GlobalVersionTests.cpp @@ -7,7 +7,7 @@ namespace GlobalVersionTests { using ::testing::Test; - namespace fs = std::filesystem; + namespace fs = std::experimental::filesystem; class GlobalVersionTest : public Test { diff --git a/test/CommonLibTests/Helpers.cpp b/test/CommonLibTests/Helpers.cpp index ccca6cad5b..3e429a6665 100644 --- a/test/CommonLibTests/Helpers.cpp +++ b/test/CommonLibTests/Helpers.cpp @@ -28,7 +28,7 @@ TempDirectory::TempDirectory() RPC_CSTR szUuid = NULL; if (UuidToStringA(&uuid, &szUuid) == RPC_S_OK) { - m_path = std::filesystem::temp_directory_path() / reinterpret_cast(szUuid); + m_path = std::experimental::filesystem::temp_directory_path() / szUuid; RpcStringFreeA(&szUuid); return; } @@ -37,5 +37,5 @@ TempDirectory::TempDirectory() TempDirectory::~TempDirectory() { - std::filesystem::remove_all(m_path); + std::experimental::filesystem::remove_all(m_path); } diff --git a/test/CommonLibTests/Helpers.h b/test/CommonLibTests/Helpers.h index 67256966bb..657766dd43 100644 --- a/test/CommonLibTests/Helpers.h +++ b/test/CommonLibTests/Helpers.h @@ -18,11 +18,11 @@ public: ~TempDirectory(); - std::filesystem::path path() const + std::experimental::filesystem::path path() const { return m_path; } private: - std::filesystem::path m_path; + std::experimental::filesystem::path m_path; }; From 3f6288e14149e820c06048c3419404040ec8839d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 5 Aug 2018 19:16:42 +0000 Subject: [PATCH 188/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 52 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 ++-- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index a181793011..d0e6d6faa4 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,38 +4,38 @@ 0.10.13 - 2.2.0-preview1-17099 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 0.6.0-a-preview1-test-application-17108 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 + 2.2.0-preview1-20180731.1 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 0.6.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 15.6.82 15.6.82 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 - 2.2.0-preview1-34825 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 2.0.9 2.1.2 2.2.0-preview1-26618-02 1.0.1 - 2.2.0-preview1-34825 + 2.2.0-preview1-34882 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 28cd6a5b03..b6efc7cfcb 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17102 -commithash:e7e2b5a97ca92cfc6acc4def534cb0901a6d1eb9 +version:2.2.0-preview1-20180731.1 +commithash:29fde58465439f4bb9df40830635ed758e063daf From c2f5101b7387140ce0bdc60ef534564b9b96c741 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 6 Aug 2018 09:41:56 -0700 Subject: [PATCH 189/363] Split managed application status and IApplication status (#1148) Split managed application status and IApplication status --- .../AspNetCore/ServerErrorApplication.h | 1 - .../AspNetCore/applicationinfo.cpp | 8 +-- .../AspNetCore/proxymodule.cpp | 10 +--- .../CommonLib/AppOfflineApplication.h | 1 + .../PollingAppOfflineApplication.cpp | 15 ++++-- .../CommonLib/PollingAppOfflineApplication.h | 6 +-- .../CommonLib/application.h | 33 ++++++++---- .../CommonLib/iapplication.h | 4 -- .../InProcessApplicationBase.cpp | 4 +- .../InProcessApplicationBase.h | 2 +- .../ShuttingDownApplication.h | 1 - .../StartupExceptionApplication.h | 1 - .../inprocessapplication.cpp | 52 ++++++++----------- .../inprocessapplication.h | 12 ++++- .../outprocessapplication.cpp | 14 ++--- .../outprocessapplication.h | 2 +- .../AppOfflineTrackingApplication.cpp | 8 +-- .../AppOfflineTrackingApplication.h | 9 ++-- 18 files changed, 86 insertions(+), 97 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h index 1872675656..2162075950 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h +++ b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h @@ -13,7 +13,6 @@ public: : m_HR(hr), PollingAppOfflineApplication(pApplication, PollingAppOfflineApplicationMode::StopWhenAdded) { - m_status = APPLICATION_STATUS::RUNNING; } ~ServerErrorApplication() = default; diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index 307d669dbf..8f94f23b08 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -54,7 +54,7 @@ APPLICATION_INFO::GetOrCreateApplication( ) { HRESULT hr = S_OK; - + SRWExclusiveLock lock(m_applicationLock); auto& httpApplication = *pHttpContext->GetApplication(); @@ -72,7 +72,7 @@ APPLICATION_INFO::GetOrCreateApplication( else { // another thread created the application - FINISHED(S_OK); + FINISHED(S_OK); } } @@ -124,7 +124,7 @@ Finished: if (m_pApplication) { - pApplication = ReferenceApplication(m_pApplication.get()); + pApplication = ReferenceApplication(m_pApplication.get()); } return hr; @@ -410,7 +410,7 @@ APPLICATION_INFO::RecycleApplication() } -DWORD WINAPI +DWORD WINAPI APPLICATION_INFO::DoRecycleApplication( LPVOID lpParam) { diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index 0ed100fd47..1f0ed72db1 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -95,20 +95,12 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( // the error should already been logged to window event log for the first request FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); } - + DBG_ASSERT(pHttpContext); std::unique_ptr pApplication; FINISHED_IF_FAILED(m_pApplicationInfo->GetOrCreateApplication(pHttpContext, pApplication)); - // We allow RECYCLED application to serve pages - if (pApplication->QueryStatus() != APPLICATION_STATUS::RUNNING && - pApplication->QueryStatus() != APPLICATION_STATUS::STARTING && - pApplication->QueryStatus() != APPLICATION_STATUS::RECYCLED) - { - FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_DISABLED)); - } - IREQUEST_HANDLER* pHandler; // Create RequestHandler and process the request FINISHED_IF_FAILED(pApplication->CreateHandler(pHttpContext, &pHandler)); diff --git a/src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.h b/src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.h index f6ec00cab0..71f79e5294 100644 --- a/src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.h @@ -13,6 +13,7 @@ public: AppOfflineApplication(IHttpApplication& pApplication) : PollingAppOfflineApplication(pApplication, PollingAppOfflineApplicationMode::StopWhenRemoved) { + CheckAppOffline(); } HRESULT CreateHandler(IHttpContext* pHttpContext, IREQUEST_HANDLER** pRequestHandler) override; diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp index 1468c7ee37..08491b0d76 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp @@ -9,11 +9,12 @@ APPLICATION_STATUS PollingAppOfflineApplication::QueryStatus() { - return (AppOfflineExists() == (m_mode == StopWhenRemoved)) ? APPLICATION_STATUS::RUNNING : APPLICATION_STATUS::RECYCLED; + CheckAppOffline(); + return APPLICATION::QueryStatus(); } -bool -PollingAppOfflineApplication::AppOfflineExists() +void +PollingAppOfflineApplication::CheckAppOffline() { const auto ulCurrentTime = GetTickCount64(); // @@ -29,12 +30,16 @@ PollingAppOfflineApplication::AppOfflineExists() m_fAppOfflineFound = is_regular_file(m_appOfflineLocation); if(m_fAppOfflineFound) { - LOG_IF_FAILED(OnAppOfflineFound()); + LOG_IF_FAILED(OnAppOfflineFound()); } m_ulLastCheckTime = ulCurrentTime; } } - return m_fAppOfflineFound; + + if (m_fAppOfflineFound != (m_mode == StopWhenRemoved)) + { + Stop(/* fServerInitiated */ false); + } } diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h index 48e71f6641..98d32ae8d3 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h @@ -25,9 +25,9 @@ public: } APPLICATION_STATUS QueryStatus() override; - bool AppOfflineExists(); + void CheckAppOffline(); virtual HRESULT OnAppOfflineFound() = 0; - void Stop(bool fServerInitiated) override { UNREFERENCED_PARAMETER(fServerInitiated); } + void StopInternal(bool fServerInitiated) override { UNREFERENCED_PARAMETER(fServerInitiated); } protected: std::experimental::filesystem::path m_appOfflineLocation; @@ -36,7 +36,7 @@ protected: private: static const int c_appOfflineRefreshIntervalMS = 200; std::string m_strAppOfflineContent; - ULONGLONG m_ulLastCheckTime; + ULONGLONG m_ulLastCheckTime; bool m_fAppOfflineFound; SRWLOCK m_statusLock {}; PollingAppOfflineApplicationMode m_mode; diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index 1bc3d02f37..1167602327 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -7,11 +7,10 @@ #include "exceptions.h" #include "utility.h" #include "ntassert.h" - +#include "SRWExclusiveLock.h" class APPLICATION : public IAPPLICATION { - public: // Non-copyable APPLICATION(const APPLICATION&) = delete; @@ -20,24 +19,38 @@ public: APPLICATION_STATUS QueryStatus() override { - return m_status; + return m_fStopCalled ? APPLICATION_STATUS::RECYCLED : APPLICATION_STATUS::RUNNING; } APPLICATION() - : m_cRefs(1) + : m_fStopCalled(false), + m_cRefs(1) { InitializeSRWLock(&m_stateLock); } - + VOID Stop(bool fServerInitiated) override { - UNREFERENCED_PARAMETER(fServerInitiated); + SRWExclusiveLock stopLock(m_stateLock); + + if (m_fStopCalled) + { + return; + } m_fStopCalled = true; + + StopInternal(fServerInitiated); + } + + virtual + VOID + StopInternal(bool fServerInitiated) + { + UNREFERENCED_PARAMETER(fServerInitiated); } - VOID ReferenceApplication() override @@ -59,11 +72,9 @@ public: } protected: - volatile APPLICATION_STATUS m_status = APPLICATION_STATUS::UNKNOWN; SRWLOCK m_stateLock; - bool m_fStopCalled; + bool m_fStopCalled; private: - - mutable LONG m_cRefs; + mutable LONG m_cRefs; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h index cdfd17ec03..1f69a39bbb 100644 --- a/src/AspNetCoreModuleV2/CommonLib/iapplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -8,12 +8,8 @@ enum APPLICATION_STATUS { - UNKNOWN = 0, - STARTING, RUNNING, - SHUTDOWN, RECYCLED, - FAIL }; struct APPLICATION_PARAMETER diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp index 3152b75cca..0abdc42025 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp @@ -15,9 +15,9 @@ InProcessApplicationBase::InProcessApplicationBase( } VOID -InProcessApplicationBase::Stop(bool fServerInitiated) +InProcessApplicationBase::StopInternal(bool fServerInitiated) { - AppOfflineTrackingApplication::Stop(fServerInitiated); + AppOfflineTrackingApplication::StopInternal(fServerInitiated); // Stop was initiated by server no need to do anything, server would stop on it's own if (fServerInitiated) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h index 5df37d34b6..bb343725f5 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h @@ -18,7 +18,7 @@ public: ~InProcessApplicationBase() = default; - VOID Stop(bool fServerInitiated) override; + VOID StopInternal(bool fServerInitiated) override; protected: BOOL m_fRecycleCalled; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h index 4528a3f2b4..6195877234 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h @@ -32,7 +32,6 @@ public: ShuttingDownApplication(IHttpServer& pHttpServer, IHttpApplication& pHttpApplication) : InProcessApplicationBase(pHttpServer, pHttpApplication) { - m_status = APPLICATION_STATUS::RUNNING; } ~ShuttingDownApplication() = default; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h index 14d26bf3a4..369c57adfe 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h @@ -16,7 +16,6 @@ public: : m_disableLogs(disableLogs), InProcessApplicationBase(pServer, pApplication) { - m_status = APPLICATION_STATUS::RUNNING; html500Page = std::string(" \ \ \ diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 575d9180e4..7207f745c3 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -23,7 +23,6 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( APPLICATION_PARAMETER *pParameters, DWORD nParameters) : InProcessApplicationBase(pHttpServer, pApplication), - m_pHttpServer(pHttpServer), m_ProcessExitCode(0), m_fBlockCallbacksIntoManaged(FALSE), m_fShutdownCalledFromNative(FALSE), @@ -40,7 +39,7 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( } } - m_status = APPLICATION_STATUS::STARTING; + m_status = MANAGED_APPLICATION_STATUS::STARTING; } IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION() @@ -63,22 +62,13 @@ IN_PROCESS_APPLICATION::DoShutDown( __override VOID -IN_PROCESS_APPLICATION::Stop(bool fServerInitiated) +IN_PROCESS_APPLICATION::StopInternal(bool fServerInitiated) { UNREFERENCED_PARAMETER(fServerInitiated); HRESULT hr = S_OK; CHandle hThread; DWORD dwThreadStatus = 0; - SRWExclusiveLock stopLock(m_stateLock); - - if (m_fStopCalled) - { - return; - } - - AppOfflineTrackingApplication::Stop(fServerInitiated); - DWORD dwTimeout = m_pConfig->QueryShutdownTimeLimitInMS(); if (IsDebuggerPresent()) @@ -137,7 +127,7 @@ Finished: m_pConfig->QueryConfigPath()->QueryStr()); } - InProcessApplicationBase::Stop(fServerInitiated); + InProcessApplicationBase::StopInternal(fServerInitiated); } VOID @@ -152,16 +142,16 @@ IN_PROCESS_APPLICATION::ShutDownInternal() } if (m_fShutdownCalledFromNative || - m_status == APPLICATION_STATUS::STARTING || - m_status == APPLICATION_STATUS::FAIL) + m_status == MANAGED_APPLICATION_STATUS::STARTING || + m_status == MANAGED_APPLICATION_STATUS::FAIL) { return; } { if (m_fShutdownCalledFromNative || - m_status == APPLICATION_STATUS::STARTING || - m_status == APPLICATION_STATUS::FAIL) + m_status == MANAGED_APPLICATION_STATUS::STARTING || + m_status == MANAGED_APPLICATION_STATUS::FAIL) { return; } @@ -171,7 +161,7 @@ IN_PROCESS_APPLICATION::ShutDownInternal() // managed. We still need to wait on main exiting no matter what. m_fShutdownCalledFromNative // is used for detecting redundant calls and blocking more requests to OnExecuteRequestHandler. m_fShutdownCalledFromNative = TRUE; - m_status = APPLICATION_STATUS::RECYCLED; + m_status = MANAGED_APPLICATION_STATUS::SHUTDOWN; if (!m_fShutdownCalledFromManaged) { @@ -249,18 +239,18 @@ IN_PROCESS_APPLICATION::LoadManagedApplication HRESULT hr = S_OK; DWORD dwTimeout; DWORD dwResult; - + ReferenceApplication(); - if (m_status != APPLICATION_STATUS::STARTING) + if (m_status != MANAGED_APPLICATION_STATUS::STARTING) { // Core CLR has already been loaded. // Cannot load more than once even there was a failure - if (m_status == APPLICATION_STATUS::FAIL) + if (m_status == MANAGED_APPLICATION_STATUS::FAIL) { hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; } - else if (m_status == APPLICATION_STATUS::SHUTDOWN) + else if (m_status == MANAGED_APPLICATION_STATUS::SHUTDOWN) { hr = HRESULT_FROM_WIN32(ERROR_SHUTDOWN_IS_SCHEDULED); } @@ -289,13 +279,13 @@ IN_PROCESS_APPLICATION::LoadManagedApplication LOG_IF_FAILED(m_pLoggerProvider->Start()); } - if (m_status != APPLICATION_STATUS::STARTING) + if (m_status != MANAGED_APPLICATION_STATUS::STARTING) { - if (m_status == APPLICATION_STATUS::FAIL) + if (m_status == MANAGED_APPLICATION_STATUS::FAIL) { hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; } - else if (m_status == APPLICATION_STATUS::SHUTDOWN) + else if (m_status == MANAGED_APPLICATION_STATUS::SHUTDOWN) { hr = HRESULT_FROM_WIN32(ERROR_SHUTDOWN_IS_SCHEDULED); } @@ -363,13 +353,13 @@ IN_PROCESS_APPLICATION::LoadManagedApplication goto Finished; } - m_status = APPLICATION_STATUS::RUNNING; + m_status = MANAGED_APPLICATION_STATUS::RUNNING_MANAGED; } Finished: if (FAILED(hr)) { - m_status = APPLICATION_STATUS::FAIL; + m_status = MANAGED_APPLICATION_STATUS::FAIL; UTILITY::LogEventF(g_hEventLog, EVENTLOG_ERROR_TYPE, @@ -444,7 +434,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication( hostfxr_main_fn pProc; std::unique_ptr hostFxrOptions = NULL; - DBG_ASSERT(m_status == APPLICATION_STATUS::STARTING); + DBG_ASSERT(m_status == MANAGED_APPLICATION_STATUS::STARTING); pProc = s_fMainCallback; if (pProc == nullptr) @@ -502,7 +492,7 @@ Finished: // Don't bother locking here as there will always be a race between receiving a native shutdown // notification and unexpected managed exit. // - m_status = APPLICATION_STATUS::SHUTDOWN; + m_status = MANAGED_APPLICATION_STATUS::SHUTDOWN; m_fShutdownCalledFromManaged = TRUE; FreeLibrary(hModule); m_pLoggerProvider->Stop(); @@ -575,12 +565,12 @@ IN_PROCESS_APPLICATION::RunDotnetApplication(DWORD argc, CONST PCWSTR* argv, hos { hr = HRESULT_FROM_WIN32(GetLastError()); } - + LOG_INFOF("Managed application exited with code %d", m_ProcessExitCode); } __except(GetExceptionCode() != 0) { - + LOG_INFOF("Managed threw an exception %d", GetExceptionCode()); hr = HRESULT_FROM_WIN32(GetLastError()); } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index a18d85a617..8993d7fc8e 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -26,7 +26,7 @@ public: __override VOID - Stop(bool fServerInitiated) override; + StopInternal(bool fServerInitiated) override; VOID SetCallbackHandles( @@ -111,7 +111,14 @@ public: private: - IHttpServer & m_pHttpServer; + enum MANAGED_APPLICATION_STATUS + { + UNKNOWN = 0, + STARTING, + RUNNING_MANAGED, + SHUTDOWN, + FAIL + }; // Thread executing the .NET Core process HANDLE m_hThread; @@ -138,6 +145,7 @@ private: volatile BOOL m_fShutdownCalledFromNative; volatile BOOL m_fShutdownCalledFromManaged; BOOL m_fInitialized; + MANAGED_APPLICATION_STATUS m_status; std::unique_ptr m_pConfig; static IN_PROCESS_APPLICATION* s_Application; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp index 41835538a9..564adea383 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp @@ -12,7 +12,6 @@ OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION( m_fWebSocketSupported(WEBSOCKET_STATUS::WEBSOCKET_UNKNOWN), m_pConfig(std::move(pConfig)) { - m_status = APPLICATION_STATUS::RUNNING; m_pProcessManager = NULL; } @@ -62,16 +61,9 @@ OUT_OF_PROCESS_APPLICATION::GetProcess( __override VOID -OUT_OF_PROCESS_APPLICATION::Stop(bool fServerInitiated) -{ - SRWExclusiveLock lock(m_stateLock); - - if (m_fStopCalled) - { - return; - } - - AppOfflineTrackingApplication::Stop(fServerInitiated); +OUT_OF_PROCESS_APPLICATION::StopInternal(bool fServerInitiated) +{ + AppOfflineTrackingApplication::StopInternal(fServerInitiated); if (m_pProcessManager != NULL) { diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h index 6ac813f6a7..43eca31f95 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h @@ -32,7 +32,7 @@ public: __override VOID - Stop(bool fServerInitiated) + StopInternal(bool fServerInitiated) override; __override diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp index ed465eb7c1..47a92d3daa 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp @@ -6,8 +6,6 @@ #include "EventLog.h" #include "exceptions.h" -extern HANDLE g_hEventLog; - HRESULT AppOfflineTrackingApplication::StartMonitoringAppOffline() { LOG_INFOF("Starting app_offline monitoring in application %S", m_applicationPath.c_str()); @@ -26,11 +24,9 @@ HRESULT AppOfflineTrackingApplication::StartMonitoringAppOffline() return hr; } -void AppOfflineTrackingApplication::Stop(bool fServerInitiated) +void AppOfflineTrackingApplication::StopInternal(bool fServerInitiated) { - APPLICATION::Stop(fServerInitiated); - - m_status = APPLICATION_STATUS::RECYCLED; + APPLICATION::StopInternal(fServerInitiated); if (m_fileWatcher) { diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h index f104370c72..f2ce7a5c20 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h @@ -12,7 +12,8 @@ class AppOfflineTrackingApplication: public APPLICATION { public: AppOfflineTrackingApplication(const IHttpApplication& application) - : m_applicationPath(application.GetApplicationPhysicalPath()), + : APPLICATION(), + m_applicationPath(application.GetApplicationPhysicalPath()), m_fileWatcher(nullptr), m_fAppOfflineProcessed(false) { @@ -23,15 +24,15 @@ public: if (m_fileWatcher) { m_fileWatcher->StopMonitor(); - } + } }; HRESULT StartMonitoringAppOffline(); VOID - Stop(bool fServerInitiated) override; - + StopInternal(bool fServerInitiated) override; + virtual VOID OnAppOffline(); From 959771e73a0a1f69919361ec03fc2bc723a94438 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 6 Aug 2018 09:46:40 -0700 Subject: [PATCH 190/363] Fix incrementality checks for test projects (#1145) --- build/testsite.props | 2 +- .../Microsoft.AspNetCore.Server.IIS.csproj | 15 +++++++-------- ...spNetCore.Server.IntegrationTesting.IIS.csproj | 13 +++++++++++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/build/testsite.props b/build/testsite.props index d412ac84b3..9a9e2cdf76 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -37,7 +37,7 @@ $(AspNetCoreModuleV1ShimDll) $(AspNetCoreModuleV2ShimDll) - $(NativePlatform)\aspnetcorev2_inprocess.dll + aspnetcorev2_inprocess.dll $(userprofile)\.dotnet\$(NativePlatform)\dotnet.exe diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index 0580c14e85..f9c6fbbd6f 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -10,6 +10,7 @@ true true netcoreapp2.2 + True @@ -25,6 +26,12 @@ + + + False + + + @@ -43,14 +50,6 @@ - - - - diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index c13eb6214b..3678730c7e 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -7,6 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;iis + True @@ -21,6 +22,18 @@ + + + False + + + False + + + False + + + Date: Mon, 6 Aug 2018 12:30:58 -0700 Subject: [PATCH 191/363] Initialize logging under exclusive lock (#1161) --- .../AspNetCore/applicationmanager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp index be4d124437..20030594fb 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp @@ -48,11 +48,6 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( // When accessing the m_pApplicationInfoHash, we need to acquire the application manager // lock to avoid races on setting state. SRWSharedLock readLock(m_srwLock); - if (!m_fDebugInitialize) - { - DebugInitializeFromConfig(m_pHttpServer, pApplication); - m_fDebugInitialize = TRUE; - } if (g_fInShutdown) { @@ -70,8 +65,13 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( // Take exclusive lock before creating the application SRWExclusiveLock writeLock(m_srwLock); - // Check if other thread created the application + if (!m_fDebugInitialize) + { + DebugInitializeFromConfig(m_pHttpServer, pApplication); + m_fDebugInitialize = TRUE; + } + // Check if other thread created the application m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); if (*ppApplicationInfo != NULL) { From 8f3513b9ec1f998c6b10a2eb475bceb275a8aa0b Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 6 Aug 2018 20:39:09 +0000 Subject: [PATCH 192/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 50 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index d0e6d6faa4..38a8c11d2e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,37 +5,37 @@ 0.10.13 2.2.0-preview1-20180731.1 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 0.6.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 0.6.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 15.6.82 15.6.82 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 2.0.9 2.1.2 2.2.0-preview1-26618-02 1.0.1 - 2.2.0-preview1-34882 + 2.2.0-preview1-34896 15.6.1 11.1.0 2.0.3 From 60a559719f1c813693f0dd7c82f113c5014ddb37 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Mon, 6 Aug 2018 14:41:11 -0700 Subject: [PATCH 193/363] Reduce probability of startup port collisions (#1136) - GetTickCount() is limited to the resolution of the system timer, which is typically 10-16 ms. If two apps in separate app pools are started within this time window, it's possible GetTickCount() will return the same value, which causes the apps to try the same random port(s). - Addresses #1124 --- .../AspNetCore/Inc/serverprocess.h | 6 +- .../AspNetCore/src/serverprocess.cxx | 10 +-- .../serverprocess.cpp | 10 +-- .../serverprocess.h | 4 ++ .../Utilities/FunctionalTestsBase.cs | 8 ++- test/Common.Tests/Utilities/DisposableList.cs | 25 +++++++ .../OutOfProcess/MultipleAppTests.cs | 66 +++++++++++++++++++ 7 files changed, 118 insertions(+), 11 deletions(-) create mode 100644 test/Common.Tests/Utilities/DisposableList.cs create mode 100644 test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h b/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h index 0a721c1544..94b65bad54 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h +++ b/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h @@ -3,6 +3,8 @@ #pragma once +#include + #define MIN_PORT 1025 #define MAX_PORT 48000 #define MAX_RETRY 10 @@ -303,6 +305,8 @@ private: volatile BOOL m_fReady; mutable LONG m_cRefs; + std::mt19937 m_randomGenerator; + DWORD m_dwPort; DWORD m_dwStartupTimeLimitInMS; DWORD m_dwShutdownTimeLimitInMS; @@ -331,4 +335,4 @@ private: PROCESS_MANAGER *m_pProcessManager; ENVIRONMENT_VAR_HASH *m_pEnvironmentVarTable ; -}; \ No newline at end of file +}; diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx b/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx index 8b5e6f47e2..4caf8cd3a3 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx +++ b/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx @@ -89,13 +89,15 @@ SERVER_PROCESS::GetRandomPort BOOL fPortInUse = FALSE; DWORD dwActualProcessId = 0; + std::uniform_int_distribution<> dist(MIN_PORT, MAX_PORT); + if (g_fNsiApiNotSupported) { // // the default value for optional parameter dwExcludedPort is 0 which is reserved // a random number between MIN_PORT and MAX_PORT // - while ((*pdwPickedPort = (rand() % (MAX_PORT - MIN_PORT)) + MIN_PORT + 1) == dwExcludedPort); + while ((*pdwPickedPort = dist(m_randomGenerator)) == dwExcludedPort); } else { @@ -107,7 +109,7 @@ SERVER_PROCESS::GetRandomPort // determing whether the randomly generated port is // in use by any other process. // - while ((*pdwPickedPort = (rand() % (MAX_PORT - MIN_PORT)) + MIN_PORT + 1) == dwExcludedPort); + while ((*pdwPickedPort = dist(m_randomGenerator)) == dwExcludedPort); hr = CheckIfServerIsUp(*pdwPickedPort, &dwActualProcessId, &fPortInUse); } while (fPortInUse && ++cRetry < MAX_RETRY); @@ -1909,10 +1911,10 @@ SERVER_PROCESS::SERVER_PROCESS() : m_pForwarderConnection( NULL ), m_dwListeningProcessId( 0 ), m_hListeningProcessHandle( NULL ), - m_hShutdownHandle( NULL ) + m_hShutdownHandle( NULL ), + m_randomGenerator( std::random_device()() ) { InterlockedIncrement(&g_dwActiveServerProcesses); - srand(GetTickCount()); for(INT i=0;i dist(MIN_PORT, MAX_PORT); + if (g_fNsiApiNotSupported) { // // the default value for optional parameter dwExcludedPort is 0 which is reserved // a random number between MIN_PORT and MAX_PORT // - while ((*pdwPickedPort = (rand() % (MAX_PORT - MIN_PORT)) + MIN_PORT + 1) == dwExcludedPort); + while ((*pdwPickedPort = dist(m_randomGenerator)) == dwExcludedPort); } else { @@ -125,7 +127,7 @@ SERVER_PROCESS::GetRandomPort // determing whether the randomly generated port is // in use by any other process. // - while ((*pdwPickedPort = (rand() % (MAX_PORT - MIN_PORT)) + MIN_PORT + 1) == dwExcludedPort); + while ((*pdwPickedPort = dist(m_randomGenerator)) == dwExcludedPort); hr = CheckIfServerIsUp(*pdwPickedPort, &dwActualProcessId, &fPortInUse); } while (fPortInUse && ++cRetry < MAX_RETRY); @@ -1705,10 +1707,10 @@ SERVER_PROCESS::SERVER_PROCESS() : m_pForwarderConnection(NULL), m_dwListeningProcessId(0), m_hListeningProcessHandle(NULL), - m_hShutdownHandle(NULL) + m_hShutdownHandle(NULL), + m_randomGenerator(std::random_device()()) { //InterlockedIncrement(&g_dwActiveServerProcesses); - srand(GetTickCount()); for (INT i=0; i + #define MIN_PORT 1025 #define MAX_PORT 48000 #define MAX_RETRY 10 @@ -257,6 +259,8 @@ private: volatile BOOL m_fReady; mutable LONG m_cRefs; + std::mt19937 m_randomGenerator; + DWORD m_dwPort; DWORD m_dwStartupTimeLimitInMS; DWORD m_dwShutdownTimeLimitInMS; diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index 171bbbf22f..108e8ca84d 100644 --- a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting protected ApplicationDeployer _deployer; - protected virtual async Task DeployAsync(IISDeploymentParameters parameters) + protected ApplicationDeployer CreateDeployer(IISDeploymentParameters parameters) { if (!parameters.EnvironmentVariables.ContainsKey(DebugEnvironmentVariable)) { @@ -37,8 +37,12 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting throw new InvalidOperationException("All tests should use ApplicationPublisher"); } - _deployer = IISApplicationDeployerFactory.Create(parameters, LoggerFactory); + return IISApplicationDeployerFactory.Create(parameters, LoggerFactory); + } + protected virtual async Task DeployAsync(IISDeploymentParameters parameters) + { + _deployer = CreateDeployer(parameters); return (IISDeploymentResult)await _deployer.DeployAsync(); } diff --git a/test/Common.Tests/Utilities/DisposableList.cs b/test/Common.Tests/Utilities/DisposableList.cs new file mode 100644 index 0000000000..78f76e41c2 --- /dev/null +++ b/test/Common.Tests/Utilities/DisposableList.cs @@ -0,0 +1,25 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + public class DisposableList : List, IDisposable where T : IDisposable + { + public DisposableList() : base() { } + + public DisposableList(IEnumerable collection) : base(collection) { } + + public DisposableList(int capacity) : base(capacity) { } + + public void Dispose() + { + foreach (var item in this) + { + item?.Dispose(); + } + } + } +} diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs new file mode 100644 index 0000000000..cf647f46e7 --- /dev/null +++ b/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs @@ -0,0 +1,66 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class MultipleAppTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public MultipleAppTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [InlineData(AncmVersion.AspNetCoreModule)] + [InlineData(AncmVersion.AspNetCoreModuleV2)] + public async Task Startup(AncmVersion ancmVersion) + { + const int numApps = 10; + + using (var deployers = new DisposableList()) + { + var deploymentResults = new List(); + + // Deploy all apps + for (var i = 0; i < numApps; i++) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel: IntegrationTesting.HostingModel.OutOfProcess); + deploymentParameters.AncmVersion = ancmVersion; + + var deployer = CreateDeployer(deploymentParameters); + deployers.Add(deployer); + deploymentResults.Add(await deployer.DeployAsync()); + } + + // Start all requests as quickly as possible, so apps are started as quickly as possible, + // to test possible race conditions when multiple apps start at the same time. + var requestTasks = new List>(); + foreach (var deploymentResult in deploymentResults) + { + requestTasks.Add(deploymentResult.HttpClient.GetAsync("/HelloWorld")); + } + + // Verify all apps started and return expected response + foreach (var requestTask in requestTasks) + { + var response = await requestTask; + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("Hello World", responseText); + } + } + } + } +} From c6830afa55f1da9021679a2a36179399a5d21caa Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 6 Aug 2018 17:20:44 -0700 Subject: [PATCH 194/363] Add default debug log file name and dll information to debug log (#1149) --- build/launchSettings.json | 4 +- .../Properties/launchSettings.json | 4 +- .../AspNetCore/AspNetCore.vcxproj | 8 +- .../AspNetCore/applicationinfo.cpp | 2 +- src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp | 4 +- .../CommonLib/Environment.cpp | 2 + .../CommonLib/debugutil.cpp | 246 +++++++++++------- src/AspNetCoreModuleV2/CommonLib/debugutil.h | 21 +- .../CommonLib/hostfxr_utility.cpp | 46 ++-- src/AspNetCoreModuleV2/CommonLib/utility.cpp | 2 +- src/AspNetCoreModuleV2/IISLib/dbgutil.h | 2 +- .../InProcessRequestHandler.vcxproj | 8 +- .../InProcessRequestHandler/dllmain.cpp | 10 +- .../OutOfProcessRequestHandler.vcxproj | 8 +- .../OutOfProcessRequestHandler/dllmain.cpp | 5 +- .../RequestHandlerLib/FileOutputManager.cpp | 2 +- .../IISDeployer.cs | 10 +- .../Inprocess/LoggingTests.cs | 69 +++-- .../Utilities/FunctionalTestsBase.cs | 2 +- test/CommonLibTests/CommonLibTests.vcxproj | 8 +- test/CommonLibTests/utility_tests.cpp | 19 ++ .../Properties/launchSettings.json | 4 +- .../Properties/launchSettings.json | 4 +- .../Properties/launchSettings.json | 4 +- .../Properties/launchSettings.json | 4 +- .../Properties/launchSettings.json | 4 +- 26 files changed, 300 insertions(+), 202 deletions(-) diff --git a/build/launchSettings.json b/build/launchSettings.json index 8cd1df05e6..38ae6c9d32 100644 --- a/build/launchSettings.json +++ b/build/launchSettings.json @@ -20,7 +20,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } }, "ANCM IIS": { @@ -34,7 +34,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } } } diff --git a/samples/NativeIISSample/Properties/launchSettings.json b/samples/NativeIISSample/Properties/launchSettings.json index 8cd1df05e6..38ae6c9d32 100644 --- a/samples/NativeIISSample/Properties/launchSettings.json +++ b/samples/NativeIISSample/Properties/launchSettings.json @@ -20,7 +20,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } }, "ANCM IIS": { @@ -34,7 +34,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } } } diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index 4895850cbc..3c64a0dee2 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -102,7 +102,7 @@ Windows true - kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib Source.def UseLinkTimeCodeGeneration @@ -138,7 +138,7 @@ Windows true - kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib Source.def UseLinkTimeCodeGeneration @@ -178,7 +178,7 @@ true true Source.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib UseLinkTimeCodeGeneration @@ -217,7 +217,7 @@ true true Source.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib UseLinkTimeCodeGeneration diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index 8f94f23b08..3ac7246ca9 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -206,7 +206,7 @@ APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) } } - WLOG_INFOF(L"Loading request handler: %s", struFileName.QueryStr()); + LOG_INFOF("Loading request handler: %S", struFileName.QueryStr()); s_hAspnetCoreRH = LoadLibraryW(struFileName.QueryStr()); diff --git a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp index 5369fbc527..0526d1ccab 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp @@ -15,7 +15,6 @@ DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2.dll"); HANDLE g_hEventLog = NULL; BOOL g_fRecycleProcessCalled = FALSE; -HINSTANCE g_hModule; BOOL g_fInShutdown = FALSE; VOID @@ -41,9 +40,8 @@ BOOL WINAPI DllMain(HMODULE hModule, switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: - g_hModule = hModule; DisableThreadLibraryCalls(hModule); - DebugInitialize(); + DebugInitialize(hModule); break; case DLL_PROCESS_DETACH: // IIS can cause dll detach to occur before we receive global notifications diff --git a/src/AspNetCoreModuleV2/CommonLib/Environment.cpp b/src/AspNetCoreModuleV2/CommonLib/Environment.cpp index 316319207c..5e71216ce5 100644 --- a/src/AspNetCoreModuleV2/CommonLib/Environment.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/Environment.cpp @@ -56,5 +56,7 @@ Environment::GetEnvironmentVariableValue(const std::wstring & str) } } while (expandedStr.size() != requestedSize + 1); + expandedStr.resize(requestedSize); + return expandedStr; } diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index 9d7ec40ebb..4e9e73a936 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -16,11 +16,138 @@ inline HANDLE g_hStandardOutput = INVALID_HANDLE_VALUE; inline HANDLE g_logFile = INVALID_HANDLE_VALUE; +inline HMODULE g_hModule; inline SRWLOCK g_logFileLock; -VOID -DebugInitialize() +HRESULT +PrintDebugHeader() { + DWORD verHandle = 0; + UINT size = 0; + LPVOID lpBuffer = NULL; + + WCHAR path[MAX_PATH]; + RETURN_LAST_ERROR_IF(!GetModuleFileName(g_hModule, path, sizeof(path))); + + DWORD verSize = GetFileVersionInfoSize(path, &verHandle); + RETURN_LAST_ERROR_IF(verSize == 0); + + // Allocate memory to hold data structure returned by GetFileVersionInfo + std::vector verData(verSize); + + RETURN_LAST_ERROR_IF(!GetFileVersionInfo(path, verHandle, verSize, verData.data())); + RETURN_LAST_ERROR_IF(!VerQueryValue(verData.data(), L"\\", &lpBuffer, &size)); + + auto verInfo = reinterpret_cast(lpBuffer); + // Check result signature + if (verInfo->dwSignature == VS_FFI_SIGNATURE) + { + LPVOID pvProductName = NULL; + unsigned int iProductNameLen = 0; + RETURN_LAST_ERROR_IF(!VerQueryValue(verData.data(), _T("\\StringFileInfo\\040904b0\\FileDescription"), &pvProductName, &iProductNameLen)); + + // Major, minor are stored in dwFileVersionMS field and patch, build in dwFileVersionLS field as pair of 32 bit numbers + DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, "Initializing logs for %S. File Version: %d.%d.%d.%d. Description: %S", + path, + ( verInfo->dwFileVersionMS >> 16 ) & 0xffff, + ( verInfo->dwFileVersionMS >> 0 ) & 0xffff, + ( verInfo->dwFileVersionLS >> 16 ) & 0xffff, + ( verInfo->dwFileVersionLS >> 0 ) & 0xffff, + pvProductName + ); + } + + return S_OK; +} + +void SetDebugFlags(const std::wstring &debugValue) +{ + try + { + if (!debugValue.empty()) + { + const auto value = std::stoi(debugValue); + + if (value >= 1) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_ERROR; + if (value >= 2) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_WARNING; + if (value >= 3) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_INFO; + if (value >= 4) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_CONSOLE; + if (value >= 5) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_FILE; + + return; + } + } + catch (...) + { + // ignore + } + + try + { + std::wstringstream stringStream(debugValue); + std::wstring flag; + + while (std::getline(stringStream, flag, L',')) + { + if (_wcsnicmp(flag.c_str(), L"error", wcslen(L"error")) == 0) DEBUG_FLAGS_VAR |= DEBUG_FLAGS_ERROR; + if (_wcsnicmp(flag.c_str(), L"warning", wcslen(L"warning")) == 0) DEBUG_FLAGS_VAR |= DEBUG_FLAGS_WARN; + if (_wcsnicmp(flag.c_str(), L"info", wcslen(L"info")) == 0) DEBUG_FLAGS_VAR |= DEBUG_FLAGS_INFO; + if (_wcsnicmp(flag.c_str(), L"console", wcslen(L"console")) == 0) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_CONSOLE; + if (_wcsnicmp(flag.c_str(), L"file", wcslen(L"file")) == 0) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_FILE; + } + + // If file or console is enabled but level is not set, enable all levels + if (DEBUG_FLAGS_VAR != 0 && (DEBUG_FLAGS_VAR & DEBUG_FLAGS_ANY) == 0) + { + DEBUG_FLAGS_VAR |= DEBUG_FLAGS_ANY; + } + } + catch (...) + { + // ignore + } +} + +bool CreateDebugLogFile(const std::wstring &debugOutputFile) +{ + try + { + if (!debugOutputFile.empty()) + { + if (g_logFile != INVALID_HANDLE_VALUE) + { + LOG_INFOF("Switching debug log files to %S", debugOutputFile.c_str()); + } + + SRWExclusiveLock lock(g_logFileLock); + if (g_logFile != INVALID_HANDLE_VALUE) + { + CloseHandle(g_logFile); + g_logFile = INVALID_HANDLE_VALUE; + } + g_logFile = CreateFileW(debugOutputFile.c_str(), + (GENERIC_READ | GENERIC_WRITE), + (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE), + nullptr, + OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + nullptr + ); + return true; + } + } + catch (...) + { + // ignore + } + + return false; +} + +VOID +DebugInitialize(HMODULE hModule) +{ + g_hModule = hModule; g_hStandardOutput = GetStdHandle(STD_OUTPUT_HANDLE); HKEY hKey; @@ -75,11 +202,15 @@ DebugInitialize() { DEBUG_FLAGS_VAR |= DEBUG_FLAGS_INFO; } + + PrintDebugHeader(); } HRESULT DebugInitializeFromConfig(IHttpServer& pHttpServer, IHttpApplication& pHttpApplication) { + auto oldFlags = DEBUG_FLAGS_VAR; + CComPtr pAspNetCoreElement; const CComBSTR bstrAspNetCoreSection = L"system.webServer/aspNetCore"; @@ -97,68 +228,32 @@ DebugInitializeFromConfig(IHttpServer& pHttpServer, IHttpApplication& pHttpAppli SetDebugFlags(debugValue.QueryStr()); - CreateDebugLogFile(debugFile.QueryStr()); + if (debugFile.QueryCCH() == 0 && IsEnabled(ASPNETCORE_DEBUG_FLAG_FILE)) + { + debugFile.Append(L".\\aspnetcore-debug.log"); + } + + std::filesystem::path filePath = std::filesystem::path(debugFile.QueryStr()); + if (!filePath.empty() && filePath.is_relative()) + { + filePath = std::filesystem::path(pHttpApplication.GetApplicationPhysicalPath()) / filePath; + } + + const auto reopenedFile = CreateDebugLogFile(filePath); + + // Print header if flags changed + if (oldFlags != DEBUG_FLAGS_VAR || reopenedFile) + { + PrintDebugHeader(); + } return S_OK; } -void SetDebugFlags(const std::wstring &debugValue) -{ - try - { - if (!debugValue.empty()) - { - const auto value = std::stoi(debugValue.c_str()); - - if (value >= 1) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_ERROR; - if (value >= 2) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_WARNING; - if (value >= 3) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_INFO; - if (value >= 4) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_CONSOLE; - } - } - catch (...) - { - // ignore - } -} - -void CreateDebugLogFile(const std::wstring &debugOutputFile) -{ - try - { - if (!debugOutputFile.empty()) - { - if (g_logFile != INVALID_HANDLE_VALUE) - { - WLOG_INFOF(L"Switching debug log files to %s", debugOutputFile.c_str()); - CloseHandle(g_logFile); - DEBUG_FLAGS_VAR &= ~ASPNETCORE_DEBUG_FLAG_FILE; - - } - g_logFile = CreateFileW(debugOutputFile.c_str(), - (GENERIC_READ | GENERIC_WRITE), - (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE), - nullptr, - OPEN_ALWAYS, - FILE_ATTRIBUTE_NORMAL, - nullptr - ); - if (g_logFile != INVALID_HANDLE_VALUE) - { - DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_FILE; - } - } - } - catch (...) - { - // ignore - } -} - VOID DebugStop() { - if (IsEnabled(ASPNETCORE_DEBUG_FLAG_FILE)) + if (g_logFile != INVALID_HANDLE_VALUE) { CloseHandle(g_logFile); } @@ -200,7 +295,7 @@ DebugPrint( WriteFile(g_hStandardOutput, strOutput.QueryStr(), strOutput.QueryCB(), &nBytesWritten, nullptr); } - if (IsEnabled(ASPNETCORE_DEBUG_FLAG_FILE)) + if (g_logFile != INVALID_HANDLE_VALUE) { SRWExclusiveLock lock(g_logFileLock); @@ -239,38 +334,3 @@ DebugPrintf( DebugPrint( dwFlag, strCooked.QueryStr() ); } } - -VOID -WDebugPrintf( - DWORD dwFlag, - LPCWSTR szFormat, - ... - ) -{ - va_list args; - HRESULT hr = S_OK; - - if ( IsEnabled( dwFlag ) ) - { - STACK_STRU (formatted,256); - - va_start( args, szFormat ); - - hr = formatted.SafeVsnwprintf(szFormat, args ); - - va_end( args ); - - if (FAILED (hr)) - { - return; - } - - STACK_STRA (converted, 256); - if (FAILED ( converted.CopyW(formatted.QueryStr(), formatted.QueryCCH()) )) - { - return; - } - - DebugPrint( dwFlag, converted.QueryStr() ); - } -} diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/AspNetCoreModuleV2/CommonLib/debugutil.h index b5f4075de2..b070794d0a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.h +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.h @@ -12,31 +12,23 @@ #define ASPNETCORE_DEBUG_FLAG_WARNING DEBUG_FLAG_WARN #define ASPNETCORE_DEBUG_FLAG_ERROR DEBUG_FLAG_ERROR #define ASPNETCORE_DEBUG_FLAG_CONSOLE 0x00000008 -#define ASPNETCORE_DEBUG_FLAG_FILE 0x00000008 +#define ASPNETCORE_DEBUG_FLAG_FILE 0x00000010 #define LOG_INFO(...) DebugPrint(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) #define LOG_INFOF(...) DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) -#define WLOG_INFOF(...) WDebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) #define LOG_WARN(...) DebugPrint(ASPNETCORE_DEBUG_FLAG_WARNING, __VA_ARGS__) #define LOG_WARNF(...) DebugPrintf(ASPNETCORE_DEBUG_FLAG_WARNING, __VA_ARGS__) -#define WLOG_WARNF(...) WDebugPrintf(ASPNETCORE_DEBUG_FLAG_WARNING, __VA_ARGS__) #define LOG_ERROR(...) DebugPrint(ASPNETCORE_DEBUG_FLAG_ERROR, __VA_ARGS__) #define LOG_ERRORF(...) DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, __VA_ARGS__) -#define WLOG_ERRORF(...) WDebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, __VA_ARGS__) VOID -DebugInitialize(); +DebugInitialize(HMODULE hModule); -VOID -CreateDebugLogFile(const std::wstring &debugOutputFile); - -HRESULT +HRESULT DebugInitializeFromConfig(IHttpServer& pHttpServer, IHttpApplication& pHttpApplication); -void SetDebugFlags(const std::wstring &value); - VOID DebugStop(); @@ -57,10 +49,3 @@ DebugPrintf( LPCSTR szFormat, ... ); - -VOID -WDebugPrintf( - DWORD dwFlag, - LPCWSTR szFormat, - ... - ); diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index ab827460bf..d0cb70dbb2 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -38,7 +38,7 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( _Out_ BSTR** ppwzArgv ) { - WLOG_INFOF(L"Resolving standalone hostfxr parameters for application: %s arguments: %s path: %s", + LOG_INFOF("Resolving standalone hostfxr parameters for application: %S arguments: %S path: %S", pwzExeAbsolutePath, pcwzArguments, pwzExeAbsolutePath); @@ -47,7 +47,7 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( if (!exePath.has_extension()) { - WLOG_INFOF(L"Exe path has not extension, returning"); + LOG_INFOF("Exe path has not extension, returning"); return false; } @@ -55,14 +55,14 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( const fs::path physicalPath(pcwzApplicationPhysicalPath); const fs::path hostFxrLocation = physicalPath / "hostfxr.dll"; - WLOG_INFOF(L"Checking hostfxr.dll at %s", hostFxrLocation.c_str()); + LOG_INFOF("Checking hostfxr.dll at %S", hostFxrLocation.c_str()); if (!is_regular_file(hostFxrLocation)) { fs::path runtimeConfigLocation = exePath; runtimeConfigLocation.replace_extension(L".runtimeconfig.json"); - WLOG_INFOF(L"Checking runtimeconfig.json at %s", runtimeConfigLocation.c_str()); + LOG_INFOF("Checking runtimeconfig.json at %S", runtimeConfigLocation.c_str()); if (!is_regular_file(runtimeConfigLocation)) { EVENTLOG(hEventLog, INPROCESS_FULL_FRAMEWORK_APP, pcwzApplicationPhysicalPath, 0); @@ -78,7 +78,7 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( if (!is_regular_file(dllPath)) { - WLOG_INFOF(L"Application dll at %s was not found", dllPath.c_str()); + LOG_INFOF("Application dll at %S was not found", dllPath.c_str()); return E_FAIL; } @@ -119,7 +119,7 @@ HOSTFXR_UTILITY::GetHostFxrParameters( { HRESULT hr = S_OK; - WLOG_INFOF(L"Resolving hostfxr parameters for application: %s arguments: %s path: %s", + LOG_INFOF("Resolving hostfxr parameters for application: %S arguments: %S path: %S", pcwzProcessPath, pcwzArguments, pcwzApplicationPhysicalPath); @@ -131,7 +131,7 @@ HOSTFXR_UTILITY::GetHostFxrParameters( // Check if the absolute path is to dotnet or not. if (IsDotnetExecutable(processPath)) { - WLOG_INFOF(L"Process path %s is dotnet, treating application as portable", processPath.c_str()); + LOG_INFOF("Process path %S is dotnet, treating application as portable", processPath.c_str()); // // The processPath ends with dotnet.exe or dotnet // like: C:\Program Files\dotnet\dotnet.exe, C:\Program Files\dotnet\dotnet, dotnet.exe, or dotnet. @@ -168,7 +168,7 @@ HOSTFXR_UTILITY::GetHostFxrParameters( } else { - WLOG_INFOF(L"Process path %s is not dotnet, treating application as standalone", processPath.c_str()); + LOG_INFOF("Process path %S is not dotnet, treating application as standalone", processPath.c_str()); if (processPath.is_relative()) { @@ -239,7 +239,7 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( STRU struTempPath; INT intArgsProcessed = 0; - WLOG_INFOF(L"Resolving hostfxr_main arguments application: %s arguments: %s path: %s", + LOG_INFOF("Resolving hostfxr_main arguments application: %S arguments: %S path: %S", pwzExePath, pwzArgumentsFromConfig, pcwzApplicationPhysicalPath); @@ -300,7 +300,7 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( } } - WLOG_INFOF(L"Argument[%d] = %s", + LOG_INFOF("Argument[%d] = %S", intArgsProcessed + 1, argv[intArgsProcessed + 1]); } @@ -337,7 +337,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( const fs::path & requestedPath ) { - WLOG_INFOF(L"Resolving absolute path to dotnet.exe from %s", requestedPath.c_str()); + LOG_INFOF("Resolving absolute path to dotnet.exe from %S", requestedPath.c_str()); auto processPath = requestedPath; if (processPath.is_relative()) @@ -350,7 +350,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( // if (is_regular_file(requestedPath)) { - WLOG_INFOF(L"Found dotnet.exe at %s", requestedPath.c_str()); + LOG_INFOF("Found dotnet.exe at %S", requestedPath.c_str()); return std::make_optional(requestedPath); } @@ -360,7 +360,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( if (is_regular_file(pathWithExe)) { - WLOG_INFOF(L"Found dotnet.exe at %s", pathWithExe.c_str()); + LOG_INFOF("Found dotnet.exe at %S", pathWithExe.c_str()); return std::make_optional(pathWithExe); } @@ -371,7 +371,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( // Only do it if no path is specified if (requestedPath.has_parent_path()) { - WLOG_INFOF(L"Absolute path to dotnet.exe was not found at %s", requestedPath.c_str()); + LOG_INFOF("Absolute path to dotnet.exe was not found at %S", requestedPath.c_str()); return std::nullopt; } @@ -379,7 +379,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( const auto dotnetViaWhere = InvokeWhereToFindDotnet(); if (dotnetViaWhere.has_value()) { - WLOG_INFOF(L"Found dotnet.exe via where.exe invocation at %s", dotnetViaWhere.value().c_str()); + LOG_INFOF("Found dotnet.exe via where.exe invocation at %S", dotnetViaWhere.value().c_str()); return dotnetViaWhere; } @@ -387,12 +387,12 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( const auto programFilesLocation = GetAbsolutePathToDotnetFromProgramFiles(); if (programFilesLocation.has_value()) { - WLOG_INFOF(L"Found dotnet.exe in Program Files at %s", programFilesLocation.value().c_str()); + LOG_INFOF("Found dotnet.exe in Program Files at %S", programFilesLocation.value().c_str()); return programFilesLocation; } - WLOG_INFOF(L"dotnet.exe not found"); + LOG_INFOF("dotnet.exe not found"); return std::nullopt; } @@ -405,7 +405,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( std::vector versionFolders; const auto hostFxrBase = dotnetPath.parent_path() / "host" / "fxr"; - WLOG_INFOF(L"Resolving absolute path to hostfxr.dll from %s", dotnetPath.c_str()); + LOG_INFOF("Resolving absolute path to hostfxr.dll from %S", dotnetPath.c_str()); if (!is_directory(hostFxrBase)) { @@ -434,7 +434,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( return std::nullopt; } - WLOG_INFOF(L"hostfxr.dll located at %s", hostFxrPath.c_str()); + LOG_INFOF("hostfxr.dll located at %S", hostFxrPath.c_str()); return std::make_optional(hostFxrPath); } @@ -551,7 +551,7 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() FINISHED_IF_FAILED(struDotnetLocationsString.CopyA(pzFileContents, dwNumBytesRead)); - WLOG_INFOF(L"where.exe invocation returned: %s", struDotnetLocationsString.QueryStr()); + LOG_INFOF("where.exe invocation returned: %S", struDotnetLocationsString.QueryStr()); // Check the bitness of the currently running process // matches the dotnet.exe found. @@ -570,7 +570,7 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() fIsCurrentProcess64Bit = systemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64; } - WLOG_INFOF(L"Current process bitness type detected as isX64=%d", fIsCurrentProcess64Bit); + LOG_INFOF("Current process bitness type detected as isX64=%d", fIsCurrentProcess64Bit); while (TRUE) { @@ -584,14 +584,14 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() // \r\n is two wchars, so add 2 here. prevIndex = index + 2; - WLOG_INFOF(L"Processing entry %s", struDotnetSubstring.QueryStr()); + LOG_INFOF("Processing entry %S", struDotnetSubstring.QueryStr()); if (LOG_LAST_ERROR_IF(!GetBinaryTypeW(struDotnetSubstring.QueryStr(), &dwBinaryType))) { continue; } - WLOG_INFOF(L"Binary type %d", dwBinaryType); + LOG_INFOF("Binary type %d", dwBinaryType); if (fIsCurrentProcess64Bit == (dwBinaryType == SCS_64BIT_BINARY)) { diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.cpp b/src/AspNetCoreModuleV2/CommonLib/utility.cpp index a82a7d18b3..2f8c25378c 100644 --- a/src/AspNetCoreModuleV2/CommonLib/utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/utility.cpp @@ -572,7 +572,7 @@ UTILITY::LogEvent( ); } - WDebugPrintf(dwEventInfoType == EVENTLOG_ERROR_TYPE ? ASPNETCORE_DEBUG_FLAG_ERROR : ASPNETCORE_DEBUG_FLAG_INFO, L"Event Log: %s", pstrMsg); + DebugPrintf(dwEventInfoType == EVENTLOG_ERROR_TYPE ? ASPNETCORE_DEBUG_FLAG_ERROR : ASPNETCORE_DEBUG_FLAG_INFO, "Event Log: %S", pstrMsg); } VOID diff --git a/src/AspNetCoreModuleV2/IISLib/dbgutil.h b/src/AspNetCoreModuleV2/IISLib/dbgutil.h index bf745bfcd9..60365faad2 100644 --- a/src/AspNetCoreModuleV2/IISLib/dbgutil.h +++ b/src/AspNetCoreModuleV2/IISLib/dbgutil.h @@ -56,7 +56,7 @@ extern DWORD DEBUG_FLAGS_VAR; #define DECLARE_DEBUG_PRINT_OBJECT( _pszLabel_ ) \ PCSTR DEBUG_LABEL_VAR = _pszLabel_; \ - DWORD DEBUG_FLAGS_VAR = DEBUG_FLAGS_WARN; \ + DWORD DEBUG_FLAGS_VAR = 0; \ #define DECLARE_DEBUG_PRINT_OBJECT2( _pszLabel_, _dwLevel_ ) \ PCSTR DEBUG_LABEL_VAR = _pszLabel_; \ diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index addfb56214..0365f219d9 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -110,7 +110,7 @@ Windows true - kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib Source.def UseLinkTimeCodeGeneration @@ -144,7 +144,7 @@ Windows true - kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib Source.def UseLinkTimeCodeGeneration @@ -181,7 +181,7 @@ true true Source.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib UseLinkTimeCodeGeneration @@ -217,7 +217,7 @@ true true Source.def - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib UseLinkTimeCodeGeneration diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp index e0ed004a67..ca40d04e36 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp @@ -40,7 +40,7 @@ InitializeGlobalConfiguration( g_pHttpServer = pServer; RETURN_IF_FAILED(ALLOC_CACHE_HANDLER::StaticInitialize()); RETURN_IF_FAILED(IN_PROCESS_HANDLER::StaticInitialize()); - + if (pServer->IsCommandLineLaunch()) { g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); @@ -50,7 +50,6 @@ InitializeGlobalConfiguration( g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_EVENT_PROVIDER); } - DebugInitialize(); DebugInitializeFromConfig(*pServer, *pHttpApplication); g_fGlobalInitialize = TRUE; @@ -72,6 +71,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hModule); InitializeSRWLock(&g_srwLockRH); + DebugInitialize(hModule); break; case DLL_PROCESS_DETACH: g_fProcessDetach = TRUE; @@ -107,18 +107,18 @@ CreateApplication( REQUESTHANDLER_CONFIG *pConfig = nullptr; RETURN_IF_FAILED(REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpApplication, &pConfig)); std::unique_ptr pRequestHandlerConfig(pConfig); - + BOOL disableStartupPage = pConfig->QueryDisableStartUpErrorPage(); auto pApplication = std::make_unique(*pServer, *pHttpApplication, std::move(pRequestHandlerConfig), pParameters, nParameters); - + // never create two inprocess applications in one process g_fInProcessApplicationCreated = true; if (FAILED_LOG(pApplication->LoadManagedApplication())) { // Set the currently running application to a fake application that returns startup exceptions. auto pErrorApplication = std::make_unique(*pServer, *pHttpApplication, disableStartupPage); - + RETURN_IF_FAILED(pErrorApplication->StartMonitoringAppOffline()); *ppApplication = pErrorApplication.release(); } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index c34aa8d3a3..4fc4809b7f 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -110,7 +110,7 @@ Windows true - kernel32.lib;user32.lib;nothrownew.obj;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib Source.def UseLinkTimeCodeGeneration @@ -144,7 +144,7 @@ Windows true - kernel32.lib;user32.lib;nothrownew.obj;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib Source.def UseLinkTimeCodeGeneration @@ -181,7 +181,7 @@ true true Source.def - kernel32.lib;user32.lib;nothrownew.obj;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib UseLinkTimeCodeGeneration @@ -217,7 +217,7 @@ true true Source.def - kernel32.lib;user32.lib;nothrownew.obj;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib UseLinkTimeCodeGeneration diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp index 710be75262..7df01e1ab1 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp @@ -88,8 +88,6 @@ InitializeGlobalConfiguration( } } - DebugInitialize(); - dwResult = GetExtendedTcpTable(NULL, &dwSize, FALSE, @@ -257,6 +255,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hModule); InitializeSRWLock(&g_srwLockRH); + DebugInitialize(hModule); break; case DLL_PROCESS_DETACH: g_fProcessDetach = TRUE; @@ -279,7 +278,7 @@ CreateApplication( { UNREFERENCED_PARAMETER(pParameters); UNREFERENCED_PARAMETER(nParameters); - + InitializeGlobalConfiguration(pServer); REQUESTHANDLER_CONFIG *pConfig = nullptr; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp index c5734eeb46..65e70757ab 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp @@ -139,7 +139,7 @@ FileOutputManager::Start() // Periodically flush the log content to file m_Timer.InitializeTimer(STTIMER::TimerCallback, &m_struLogFilePath, 3000, 3000); - WLOG_INFOF(L"Created log file for inprocess application: %s", + LOG_INFOF("Created log file for inprocess application: %S", m_struLogFilePath.QueryStr()); return S_OK; diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 4e6c71c1c4..acc4ae4cfb 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -73,7 +73,15 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { DotnetPublish(); contentRoot = DeploymentParameters.PublishedApplicationRootPath; - IISDeploymentParameters.AddDebugLogToWebConfig(Path.Combine(contentRoot, $"{_application.WebSiteName}.txt")); + // Do not override settings set on parameters + if (!IISDeploymentParameters.HandlerSettings.ContainsKey("debugLevel") && + !IISDeploymentParameters.HandlerSettings.ContainsKey("debugFile")) + { + var logFile = Path.Combine(contentRoot, $"{_application.WebSiteName}.txt"); + IISDeploymentParameters.HandlerSettings["debugLevel"] = "4"; + IISDeploymentParameters.HandlerSettings["debugFile"] = logFile; + } + DefaultWebConfigActions.Add(WebConfigHelpers.AddOrModifyHandlerSection( key: "modules", value: DeploymentParameters.AncmVersion.ToString())); diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index 0ff23a392f..6710fb7f47 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -84,30 +85,45 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] - [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task StartupMessagesAreLoggedIntoDebugLogFile() { - var tempFile = Path.GetTempFileName(); - try - { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); - deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"] = tempFile; - deploymentParameters.AddDebugLogToWebConfig(tempFile); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + deploymentParameters.HandlerSettings["debugLevel"] = "file"; + deploymentParameters.HandlerSettings["debugFile"] = "debug.txt"; - var deploymentResult = await DeployAsync(deploymentParameters); + var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.RetryingHttpClient.GetAsync("/"); + await deploymentResult.RetryingHttpClient.GetAsync("/"); - StopServer(); + AssertLogs(Path.Combine(deploymentResult.ContentRoot, "debug.txt")); + } - var logContents = File.ReadAllText(tempFile); - Assert.Contains("[aspnetcorev2.dll]", logContents); - Assert.Contains("[aspnetcorev2_inprocess.dll]", logContents); - } - finally - { - File.Delete(tempFile); - } + [ConditionalFact] + public async Task StartupMessagesAreLoggedIntoDefaultDebugLogFile() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + deploymentParameters.HandlerSettings["debugLevel"] = "file"; + + var deploymentResult = await DeployAsync(deploymentParameters); + + await deploymentResult.RetryingHttpClient.GetAsync("/"); + + AssertLogs(Path.Combine(deploymentResult.ContentRoot, "aspnetcore-debug.log")); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public async Task StartupMessagesAreLoggedIntoDefaultDebugLogFileWhenEnabledWithEnvVar() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG"] = "file"; + // Add empty debugFile handler setting to prevent IIS deployer from overriding debug settings + deploymentParameters.HandlerSettings["debugFile"] = ""; + var deploymentResult = await DeployAsync(deploymentParameters); + + await deploymentResult.RetryingHttpClient.GetAsync("/"); + + AssertLogs(Path.Combine(deploymentResult.ContentRoot, "aspnetcore-debug.log")); } [ConditionalTheory] @@ -176,9 +192,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var logContents = File.ReadAllText(firstTempFile); Assert.Contains("Switching debug log files to", logContents); - var secondLogContents = File.ReadAllText(secondTempFile); - Assert.Contains("[aspnetcorev2.dll]", logContents); - Assert.Contains("[aspnetcorev2_inprocess.dll]", logContents); + AssertLogs(secondTempFile); } finally { @@ -186,5 +200,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests File.Delete(secondTempFile); } } + + private static void AssertLogs(string logPath) + { + using (var stream = File.Open(logPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) + using (var streamReader = new StreamReader(stream)) + { + var logContents = streamReader.ReadToEnd(); + Assert.Contains("[aspnetcorev2.dll]", logContents); + Assert.Contains("[aspnetcorev2_inprocess.dll]", logContents); + Assert.Contains("Description: IIS AspNetCore Module V2. Commit:", logContents); + Assert.Contains("Description: IIS ASP.NET Core Module Request Handler. Commit:", logContents); + } + } } } diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index 108e8ca84d..14b78a0d6e 100644 --- a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting { if (!parameters.EnvironmentVariables.ContainsKey(DebugEnvironmentVariable)) { - parameters.EnvironmentVariables[DebugEnvironmentVariable] = "4"; + parameters.EnvironmentVariables[DebugEnvironmentVariable] = "console"; } if (parameters.ServerType == ServerType.IISExpress) diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index c3947b45b3..d549a5679d 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -101,7 +101,7 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;%(AdditionalDependencies) UseLinkTimeCodeGeneration @@ -128,7 +128,7 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;%(AdditionalDependencies) UseLinkTimeCodeGeneration @@ -155,7 +155,7 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;%(AdditionalDependencies) UseLinkTimeCodeGeneration @@ -182,7 +182,7 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;%(AdditionalDependencies) UseLinkTimeCodeGeneration diff --git a/test/CommonLibTests/utility_tests.cpp b/test/CommonLibTests/utility_tests.cpp index 0632543999..567e47762b 100644 --- a/test/CommonLibTests/utility_tests.cpp +++ b/test/CommonLibTests/utility_tests.cpp @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. #include "stdafx.h" +#include "Environment.h" TEST(PassUnexpandedEnvString, ExpandsResult) { @@ -39,3 +40,21 @@ TEST(PassUnexpandedEnvString, LongStringExpandsResults) //EXPECT_EQ(struStringValue.QueryStr(), struExpandedString.QueryStr()); EXPECT_STREQ(struStringValue.QueryStr(), struExpandedString.QueryStr()); } + + +TEST(GetEnvironmentVariableValue, ReturnsCorrectLenght) +{ + SetEnvironmentVariable(L"RANDOM_ENV_VAR_1", L"test"); + + auto result = Environment::GetEnvironmentVariableValue(L"RANDOM_ENV_VAR_1"); + EXPECT_TRUE(result.has_value()); + EXPECT_EQ(result.value().length(), 4); + EXPECT_STREQ(result.value().c_str(), L"test"); +} + + +TEST(GetEnvironmentVariableValue, ReturnsNulloptWhenNotFound) +{ + auto result = Environment::GetEnvironmentVariableValue(L"RANDOM_ENV_VAR_2"); + EXPECT_FALSE(result.has_value()); +} diff --git a/test/WebSites/InProcessWebSite/Properties/launchSettings.json b/test/WebSites/InProcessWebSite/Properties/launchSettings.json index 8cd1df05e6..38ae6c9d32 100644 --- a/test/WebSites/InProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/InProcessWebSite/Properties/launchSettings.json @@ -20,7 +20,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } }, "ANCM IIS": { @@ -34,7 +34,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } } } diff --git a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json index 8cd1df05e6..38ae6c9d32 100644 --- a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json @@ -20,7 +20,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } }, "ANCM IIS": { @@ -34,7 +34,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } } } diff --git a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json index 8cd1df05e6..38ae6c9d32 100644 --- a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json +++ b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json @@ -20,7 +20,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } }, "ANCM IIS": { @@ -34,7 +34,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } } } diff --git a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json index 8cd1df05e6..38ae6c9d32 100644 --- a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json +++ b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json @@ -20,7 +20,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } }, "ANCM IIS": { @@ -34,7 +34,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } } } diff --git a/test/WebSites/StressTestWebSite/Properties/launchSettings.json b/test/WebSites/StressTestWebSite/Properties/launchSettings.json index 8cd1df05e6..38ae6c9d32 100644 --- a/test/WebSites/StressTestWebSite/Properties/launchSettings.json +++ b/test/WebSites/StressTestWebSite/Properties/launchSettings.json @@ -20,7 +20,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } }, "ANCM IIS": { @@ -34,7 +34,7 @@ "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "4" + "ASPNETCORE_MODULE_DEBUG": "console" } } } From 8c26579016c3a8e942c371a62717b87a0dde0e3b Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 7 Aug 2018 16:04:33 -0700 Subject: [PATCH 195/363] Don't push artifacts in forks (#1168) --- .vsts-pipelines/templates/build-steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml index 2ebd7b36d1..a5983be46b 100644 --- a/.vsts-pipelines/templates/build-steps.yml +++ b/.vsts-pipelines/templates/build-steps.yml @@ -8,7 +8,7 @@ phases: afterBuild: - task: PublishBuildArtifacts@1 displayName: Upload binlog - condition: always() + condition: eq(variables['system.pullrequest.isfork'], false) inputs: artifactName: logs artifactType: Container From 7431892e6483e777492ad22828ab366532a688ef Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 7 Aug 2018 16:37:11 -0700 Subject: [PATCH 196/363] Replace "std::experimental::filesystem" with "std::filesystem" (#1153) * Continuation of #1082 --- .../CommonLib/GlobalVersionUtility.cpp | 2 +- .../CommonLib/PollingAppOfflineApplication.cpp | 4 ++-- .../CommonLib/PollingAppOfflineApplication.h | 4 ++-- .../CommonLib/hostfxr_utility.cpp | 4 ++-- .../CommonLib/hostfxr_utility.h | 16 ++++++++-------- test/CommonLibTests/FileOutputManagerTests.cpp | 2 +- test/CommonLibTests/GlobalVersionTests.cpp | 2 +- test/CommonLibTests/Helpers.cpp | 4 ++-- test/CommonLibTests/Helpers.h | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp index b2c6b69871..7cb185b0c3 100644 --- a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp @@ -6,7 +6,7 @@ #include "GlobalVersionUtility.h" -namespace fs = std::experimental::filesystem; +namespace fs = std::filesystem; // throws runtime error if no request handler versions are installed. // Throw invalid_argument if any argument is null diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp index 08491b0d76..e9bbb42383 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp @@ -43,7 +43,7 @@ PollingAppOfflineApplication::CheckAppOffline() } -std::experimental::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpApplication& pApplication) +std::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpApplication& pApplication) { - return std::experimental::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm"; + return std::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm"; } diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h index 98d32ae8d3..95097bb3ac 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h @@ -30,8 +30,8 @@ public: void StopInternal(bool fServerInitiated) override { UNREFERENCED_PARAMETER(fServerInitiated); } protected: - std::experimental::filesystem::path m_appOfflineLocation; - static std::experimental::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication); + std::filesystem::path m_appOfflineLocation; + static std::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication); private: static const int c_appOfflineRefreshIntervalMS = 200; diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index d0cb70dbb2..792cd4e411 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -13,7 +13,7 @@ #include "HandleWrapper.h" #include "Environment.h" -namespace fs = std::experimental::filesystem; +namespace fs = std::filesystem; // // Runs a standalone appliction. @@ -98,7 +98,7 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( } BOOL -HOSTFXR_UTILITY::IsDotnetExecutable(const std::experimental::filesystem::path & dotnetPath) +HOSTFXR_UTILITY::IsDotnetExecutable(const std::filesystem::path & dotnetPath) { auto name = dotnetPath.filename(); name.replace_extension(""); diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index 1315865803..9e56fb4e28 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -44,7 +44,7 @@ public: static BOOL IsDotnetExecutable( - _In_ const std::experimental::filesystem::path & dotnetPath + _In_ const std::filesystem::path & dotnetPath ); static @@ -74,25 +74,25 @@ public: ); static - std::optional + std::optional GetAbsolutePathToHostFxr( - _In_ const std::experimental::filesystem::path & dotnetPath, + _In_ const std::filesystem::path & dotnetPath, _In_ HANDLE hEventLog ); static - std::optional + std::optional GetAbsolutePathToDotnetFromProgramFiles(); static - std::optional + std::optional InvokeWhereToFindDotnet(); static - std::optional + std::optional GetAbsolutePathToDotnet( - _In_ const std::experimental::filesystem::path & applicationPath, - _In_ const std::experimental::filesystem::path & requestedPath + _In_ const std::filesystem::path & applicationPath, + _In_ const std::filesystem::path & requestedPath ); }; diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/test/CommonLibTests/FileOutputManagerTests.cpp index d0caa524a8..ae1085408c 100644 --- a/test/CommonLibTests/FileOutputManagerTests.cpp +++ b/test/CommonLibTests/FileOutputManagerTests.cpp @@ -41,7 +41,7 @@ namespace FileOutManagerStartupTests wprintf(expected, out); } - for (auto & p : std::experimental::filesystem::directory_iterator(tempDirectory.path())) + for (auto & p : std::filesystem::directory_iterator(tempDirectory.path())) { std::wstring filename(p.path().filename()); ASSERT_EQ(filename.substr(0, fileNamePrefix.size()), fileNamePrefix); diff --git a/test/CommonLibTests/GlobalVersionTests.cpp b/test/CommonLibTests/GlobalVersionTests.cpp index 9c74b6720e..f38c9361d2 100644 --- a/test/CommonLibTests/GlobalVersionTests.cpp +++ b/test/CommonLibTests/GlobalVersionTests.cpp @@ -7,7 +7,7 @@ namespace GlobalVersionTests { using ::testing::Test; - namespace fs = std::experimental::filesystem; + namespace fs = std::filesystem; class GlobalVersionTest : public Test { diff --git a/test/CommonLibTests/Helpers.cpp b/test/CommonLibTests/Helpers.cpp index 3e429a6665..ccca6cad5b 100644 --- a/test/CommonLibTests/Helpers.cpp +++ b/test/CommonLibTests/Helpers.cpp @@ -28,7 +28,7 @@ TempDirectory::TempDirectory() RPC_CSTR szUuid = NULL; if (UuidToStringA(&uuid, &szUuid) == RPC_S_OK) { - m_path = std::experimental::filesystem::temp_directory_path() / szUuid; + m_path = std::filesystem::temp_directory_path() / reinterpret_cast(szUuid); RpcStringFreeA(&szUuid); return; } @@ -37,5 +37,5 @@ TempDirectory::TempDirectory() TempDirectory::~TempDirectory() { - std::experimental::filesystem::remove_all(m_path); + std::filesystem::remove_all(m_path); } diff --git a/test/CommonLibTests/Helpers.h b/test/CommonLibTests/Helpers.h index 657766dd43..67256966bb 100644 --- a/test/CommonLibTests/Helpers.h +++ b/test/CommonLibTests/Helpers.h @@ -18,11 +18,11 @@ public: ~TempDirectory(); - std::experimental::filesystem::path path() const + std::filesystem::path path() const { return m_path; } private: - std::experimental::filesystem::path m_path; + std::filesystem::path m_path; }; From d153bab4a1df6b68ff5909a7232cf1842f836048 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 8 Aug 2018 11:25:44 -0700 Subject: [PATCH 197/363] Use configurationRedirection for IIS Deployer (#1170) --- .../IISApplication.cs | 380 ------------------ .../IISDeployer.cs | 312 ++++++++++++-- .../IISDeployerBase.cs | 51 ++- .../IISDeploymentParameters.cs | 48 +-- .../IISExpressDeployer.cs | 23 +- .../WebConfigHelpers.cs | 22 +- .../XElementExtensions.cs | 47 +++ .../AppHostConfig/IIS.config | 14 +- 8 files changed, 395 insertions(+), 502 deletions(-) delete mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs create mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs deleted file mode 100644 index 81cebf1568..0000000000 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs +++ /dev/null @@ -1,380 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Runtime.InteropServices; -using System.Threading.Tasks; -using System.Xml.Linq; -using Microsoft.Extensions.Logging; -using Microsoft.Web.Administration; - -namespace Microsoft.AspNetCore.Server.IntegrationTesting -{ - /// - /// Represents the IIS website registered in the global applicationHost.config - /// - internal class IISApplication - { - internal const int ERROR_OBJECT_NOT_FOUND = unchecked((int)0x800710D8); - internal const int ERROR_SHARING_VIOLATION = unchecked((int)0x80070020); - - private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(10); - private static readonly TimeSpan _retryDelay = TimeSpan.FromMilliseconds(200); - private readonly ServerManager _serverManager = new ServerManager(); - private readonly DeploymentParameters _deploymentParameters; - private readonly ILogger _logger; - private readonly string _ancmVersion; - private readonly string _ancmDllName; - private readonly string _apphostConfigBackupPath; - private static readonly string _apphostConfigPath = Path.Combine( - Environment.SystemDirectory, - "inetsrv", - "config", - "applicationhost.config"); - - public Process HostProcess { get; set; } - - public IISApplication(DeploymentParameters deploymentParameters, ILogger logger) - { - _deploymentParameters = deploymentParameters; - _logger = logger; - _ancmVersion = deploymentParameters.AncmVersion.ToString(); - _ancmDllName = deploymentParameters.AncmVersion == AncmVersion.AspNetCoreModuleV2 ? "aspnetcorev2.dll" : "aspnetcore.dll"; - WebSiteName = CreateTestSiteName(); - AppPoolName = $"{WebSiteName}Pool"; - _apphostConfigBackupPath = Path.Combine( - Environment.SystemDirectory, - "inetsrv", - "config", - $"applicationhost.config.{WebSiteName}backup"); - } - - public string WebSiteName { get; } - - public string AppPoolName { get; } - - public async Task StartIIS(Uri uri, string contentRoot) - { - // Backup currently deployed apphost.config file - using (_logger.BeginScope("StartIIS")) - { - var port = uri.Port; - if (port == 0) - { - throw new NotSupportedException("Cannot set port 0 for IIS."); - } - AddTemporaryAppHostConfig(); - - ConfigureAppPool(contentRoot); - - ConfigureSite(contentRoot, port); - - ConfigureAppHostConfig(); - - _serverManager.CommitChanges(); - - await WaitUntilSiteStarted(); - } - } - - private async Task WaitUntilSiteStarted() - { - var sw = Stopwatch.StartNew(); - - while (sw.Elapsed < _timeout) - { - try - { - var serverManager = new ServerManager(); - var appPool = serverManager.ApplicationPools.FirstOrDefault(s => s.Name.Equals(AppPoolName)); - var site = serverManager.Sites.FirstOrDefault(s => s.Name.Equals(WebSiteName)); - - if (site.State == ObjectState.Started) - { - var workerProcess = appPool.WorkerProcesses.SingleOrDefault(); - if (workerProcess != null) - { - HostProcess = Process.GetProcessById(workerProcess.ProcessId); - _logger.LogInformation($"Site {WebSiteName} has started."); - return; - } - } - else if (site.State != ObjectState.Starting) - { - _logger.LogInformation($"Site hasn't started with state: {site.State.ToString()}"); - var state = site.Start(); - _logger.LogInformation($"Tried to start site, state: {state.ToString()}"); - } - } - catch (Exception ex) when ( - ex is DllNotFoundException || - ex is COMException && - (ex.HResult == ERROR_OBJECT_NOT_FOUND || ex.HResult == ERROR_SHARING_VIOLATION)) - { - // Accessing the site.State property while the site - // is starting up returns the COMException - // The object identifier does not represent a valid object. - // (Exception from HRESULT: 0x800710D8) - // This also means the site is not started yet, so catch and retry - // after waiting. - } - - await Task.Delay(_retryDelay); - } - - throw new TimeoutException($"IIS failed to start site."); - } - - public async Task StopAndDeleteAppPool() - { - if (string.IsNullOrEmpty(WebSiteName)) - { - return; - } - - StopSite(); - - StopAppPool(); - - _serverManager.CommitChanges(); - - await WaitUntilSiteStopped(); - - RestoreAppHostConfig(); - } - - private async Task WaitUntilSiteStopped() - { - var site = _serverManager.Sites.Where(element => element.Name == WebSiteName).FirstOrDefault(); - if (site == null) - { - return; - } - - var sw = Stopwatch.StartNew(); - - while (sw.Elapsed < _timeout) - { - try - { - if (site.State == ObjectState.Stopped) - { - if (HostProcess.HasExited) - { - _logger.LogInformation($"Site {WebSiteName} has stopped successfully."); - return; - } - } - } - catch (COMException) - { - // Accessing the site.State property while the site - // is shutdown down returns the COMException - return; - } - - _logger.LogWarning($"IIS has not stopped after {sw.Elapsed.TotalMilliseconds}"); - await Task.Delay(_retryDelay); - } - - throw new TimeoutException($"IIS failed to stop site {site}."); - } - - private void AddTemporaryAppHostConfig() - { - RetryFileOperation(() => File.Move(_apphostConfigPath, _apphostConfigBackupPath), - e => _logger.LogWarning($"Failed to backup apphost.config: {e.Message}")); - - _logger.LogInformation($"Backed up {_apphostConfigPath} to {_apphostConfigBackupPath}"); - - RetryFileOperation( - () => File.WriteAllText(_apphostConfigPath, _deploymentParameters.ServerConfigTemplateContent ?? File.ReadAllText("IIS.config")), - e => _logger.LogWarning($"Failed to copy IIS.config to apphost.config: {e.Message}")); - - _logger.LogInformation($"Copied contents of IIS.config to {_apphostConfigPath}"); - } - - private void RestoreAppHostConfig() - { - if (File.Exists(_apphostConfigPath)) - { - RetryFileOperation( - () => File.Delete(_apphostConfigPath), - e => _logger.LogWarning($"Failed to delete file : {e.Message}")); - } - if (File.Exists(_apphostConfigBackupPath)) - { - RetryFileOperation( - () => File.Move(_apphostConfigBackupPath, _apphostConfigPath), - e => _logger.LogError($"Failed to backup apphost.config: {e.Message}")); - } - else - { - // Test failed to create backup config file, put a default one from IIS.config there instead. - // An apphost.config file is required to be replaced because we use it for removing the app pool. - RetryFileOperation( - () => File.WriteAllText(_apphostConfigPath, File.ReadAllText("IIS.config")), - e => _logger.LogWarning($"Failed to copy IIS.config to apphost.config: {e.Message}")); - } - - _logger.LogInformation($"Restored {_apphostConfigPath}."); - } - - private void RetryFileOperation(Action retryBlock, Action exceptionBlock) - { - RetryHelper.RetryOperation(retryBlock, - exceptionBlock, - retryCount: 10, - retryDelayMilliseconds: 100); - } - - private ApplicationPool ConfigureAppPool(string contentRoot) - { - try - { - var pool = _serverManager.ApplicationPools.Add(AppPoolName); - pool.ProcessModel.IdentityType = ProcessModelIdentityType.LocalSystem; - pool.ManagedRuntimeVersion = string.Empty; - pool.StartMode = StartMode.AlwaysRunning; - AddEnvironmentVariables(contentRoot, pool); - - _logger.LogInformation($"Configured AppPool {AppPoolName}"); - return pool; - } - catch (COMException comException) - { - _logger.LogError(File.ReadAllText(_apphostConfigPath)); - throw comException; - } - } - - private void AddEnvironmentVariables(string contentRoot, ApplicationPool pool) - { - try - { - var envCollection = pool.GetCollection("environmentVariables"); - - foreach (var tuple in _deploymentParameters.EnvironmentVariables) - { - AddEnvironmentVariableToAppPool(envCollection, tuple.Key, tuple.Value); - } - } - catch (COMException comException) - { - _logger.LogInformation($"Could not add environment variables to worker process: {comException.Message}"); - } - } - - private static void AddEnvironmentVariableToAppPool(ConfigurationElementCollection envCollection, string key, string value) - { - var addElement = envCollection.CreateElement("add"); - addElement["name"] = key; - addElement["value"] = value; - envCollection.Add(addElement); - } - - private Site ConfigureSite(string contentRoot, int port) - { - var site = _serverManager.Sites.Add(WebSiteName, contentRoot, port); - site.Applications.Single().ApplicationPoolName = AppPoolName; - _logger.LogInformation($"Configured Site {WebSiteName} with AppPool {AppPoolName}"); - return site; - } - - private Configuration ConfigureAppHostConfig() - { - var config = _serverManager.GetApplicationHostConfiguration(); - - SetGlobalModuleSection(config); - - SetModulesSection(config); - - return config; - } - - private void StopSite() - { - var site = _serverManager.Sites.Where(sites => sites.Name == WebSiteName).SingleOrDefault(); - - site.Stop(); - } - - private void StopAppPool() - { - var appPool = _serverManager.ApplicationPools.Where(pool => pool.Name == AppPoolName).SingleOrDefault(); - - appPool.Stop(); - } - - private void SetGlobalModuleSection(Configuration config) - { - var ancmFile = GetAncmLocation(); - - var globalModulesSection = config.GetSection("system.webServer/globalModules"); - var globalConfigElement = globalModulesSection - .GetCollection() - .Where(element => (string)element["name"] == _ancmVersion) - .FirstOrDefault(); - - if (globalConfigElement == null) - { - _logger.LogInformation($"Could not find {_ancmVersion} section in global modules; creating section."); - var addElement = globalModulesSection.GetCollection().CreateElement("add"); - addElement["name"] = _ancmVersion; - addElement["image"] = ancmFile; - globalModulesSection.GetCollection().Add(addElement); - } - else - { - _logger.LogInformation($"Replacing {_ancmVersion} section in global modules with {ancmFile}"); - globalConfigElement["image"] = ancmFile; - } - } - - private void SetModulesSection(Configuration config) - { - var modulesSection = config.GetSection("system.webServer/modules"); - var moduleConfigElement = modulesSection.GetCollection().Where(element => (string)element["name"] == _ancmVersion).FirstOrDefault(); - if (moduleConfigElement == null) - { - _logger.LogInformation($"Could not find {_ancmVersion} section in modules; creating section."); - var moduleElement = modulesSection.GetCollection().CreateElement("add"); - moduleElement["name"] = _ancmVersion; - modulesSection.GetCollection().Add(moduleElement); - } - } - - private string CreateTestSiteName() - { - if (!string.IsNullOrEmpty(_deploymentParameters.SiteName)) - { - return $"{_deploymentParameters.SiteName}{DateTime.Now.ToString("yyyyMMddHHmmss")}"; - } - else - { - return $"testsite{DateTime.Now.ToString("yyyyMMddHHmmss")}"; - } - } - - private string GetAncmLocation() - { - var dllRoot = AppContext.BaseDirectory; - var arch = _deploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? $@"x64\{_ancmDllName}" : $@"x86\{_ancmDllName}"; - var ancmFile = Path.Combine(dllRoot, arch); - if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) - { - ancmFile = Path.Combine(dllRoot, _ancmDllName); - if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) - { - throw new FileNotFoundException("AspNetCoreModule could not be found.", ancmFile); - } - } - - return ancmFile; - } - } -} diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index acc4ae4cfb..d76f5f48d7 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -1,22 +1,39 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; +using System.Diagnostics; using System.IO; +using System.Linq; +using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; +using System.Xml.Linq; using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.Extensions.Logging; +using Microsoft.Web.Administration; namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { /// /// Deployer for IIS. /// - public partial class IISDeployer : IISDeployerBase + public class IISDeployer : IISDeployerBase { - private IISApplication _application; + internal const int ERROR_OBJECT_NOT_FOUND = unchecked((int)0x800710D8); + internal const int ERROR_SHARING_VIOLATION = unchecked((int)0x80070020); + internal const int ERROR_SERVICE_CANNOT_ACCEPT_CTRL = unchecked((int)0x80070425); + + private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(10); + private static readonly TimeSpan _retryDelay = TimeSpan.FromMilliseconds(200); + private CancellationTokenSource _hostShutdownToken = new CancellationTokenSource(); + private string _configPath; + private string _debugLogFile; + + public Process HostProcess { get; set; } + public IISDeployer(DeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) : base(new IISDeploymentParameters(deploymentParameters), loggerFactory) { @@ -29,14 +46,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS public override void Dispose() { - if (_application != null) - { - _application.StopAndDeleteAppPool().GetAwaiter().GetResult(); + StopAndDeleteAppPool().GetAwaiter().GetResult(); - TriggerHostShutdown(_hostShutdownToken); - } + TriggerHostShutdown(_hostShutdownToken); - GetLogsFromFile($"{_application.WebSiteName}.txt"); + GetLogsFromFile(); CleanPublishedOutput(); InvokeUserApplicationCleanup(); @@ -50,17 +64,23 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { StartTimer(); - var contentRoot = string.Empty; if (string.IsNullOrEmpty(DeploymentParameters.ServerConfigTemplateContent)) { DeploymentParameters.ServerConfigTemplateContent = File.ReadAllText("IIS.config"); } - _application = new IISApplication(IISDeploymentParameters, Logger); - // For now, only support using published output DeploymentParameters.PublishApplicationBeforeDeployment = true; + // Do not override settings set on parameters + if (!IISDeploymentParameters.HandlerSettings.ContainsKey("debugLevel") && + !IISDeploymentParameters.HandlerSettings.ContainsKey("debugFile")) + { + _debugLogFile = Path.GetTempFileName(); + IISDeploymentParameters.HandlerSettings["debugLevel"] = "4"; + IISDeploymentParameters.HandlerSettings["debugFile"] = _debugLogFile; + } + if (DeploymentParameters.ApplicationType == ApplicationType.Portable) { DefaultWebConfigActions.Add( @@ -69,28 +89,19 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS DotNetCommands.GetDotNetExecutable(DeploymentParameters.RuntimeArchitecture))); } - if (DeploymentParameters.PublishApplicationBeforeDeployment) - { - DotnetPublish(); - contentRoot = DeploymentParameters.PublishedApplicationRootPath; - // Do not override settings set on parameters - if (!IISDeploymentParameters.HandlerSettings.ContainsKey("debugLevel") && - !IISDeploymentParameters.HandlerSettings.ContainsKey("debugFile")) - { - var logFile = Path.Combine(contentRoot, $"{_application.WebSiteName}.txt"); - IISDeploymentParameters.HandlerSettings["debugLevel"] = "4"; - IISDeploymentParameters.HandlerSettings["debugFile"] = logFile; - } - DefaultWebConfigActions.Add(WebConfigHelpers.AddOrModifyHandlerSection( - key: "modules", - value: DeploymentParameters.AncmVersion.ToString())); - RunWebConfigActions(contentRoot); - } + DotnetPublish(); + var contentRoot = DeploymentParameters.PublishedApplicationRootPath; + + DefaultWebConfigActions.Add(WebConfigHelpers.AddOrModifyHandlerSection( + key: "modules", + value: DeploymentParameters.AncmVersion.ToString())); + + RunWebConfigActions(contentRoot); var uri = TestUriHelper.BuildTestUri(ServerType.IIS, DeploymentParameters.ApplicationBaseUriHint); // To prevent modifying the IIS setup concurrently. - await _application.StartIIS(uri, contentRoot); + await StartIIS(uri, contentRoot); // Warm up time for IIS setup. Logger.LogInformation("Successfully finished IIS application directory setup."); @@ -100,29 +111,254 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS applicationBaseUri: uri.ToString(), contentRoot: contentRoot, hostShutdownToken: _hostShutdownToken.Token, - hostProcess: _application.HostProcess + hostProcess: HostProcess ); } } - private void GetLogsFromFile(string file) + private void GetLogsFromFile() { var arr = new string[0]; - RetryHelper.RetryOperation(() => arr = File.ReadAllLines(Path.Combine(DeploymentParameters.PublishedApplicationRootPath, file)), - (ex) => Logger.LogWarning("Could not read log file"), + RetryHelper.RetryOperation(() => arr = File.ReadAllLines(Path.Combine(DeploymentParameters.PublishedApplicationRootPath, _debugLogFile)), + (ex) => Logger.LogWarning(ex, "Could not read log file"), 5, 200); - if (arr.Length == 0) - { - Logger.LogWarning($"{file} is empty."); - } - foreach (var line in arr) { Logger.LogInformation(line); } + + if (File.Exists(_debugLogFile)) + { + File.Delete(_debugLogFile); + } + } + + public async Task StartIIS(Uri uri, string contentRoot) + { + // Backup currently deployed apphost.config file + using (Logger.BeginScope("StartIIS")) + { + var port = uri.Port; + if (port == 0) + { + throw new NotSupportedException("Cannot set port 0 for IIS."); + } + + AddTemporaryAppHostConfig(contentRoot, port); + + await WaitUntilSiteStarted(); + } + } + + private async Task WaitUntilSiteStarted() + { + var sw = Stopwatch.StartNew(); + + while (sw.Elapsed < _timeout) + { + try + { + using (var serverManager = new ServerManager()) + { + var site = serverManager.Sites.Single(); + var appPool = serverManager.ApplicationPools.Single(); + + if (site.State == ObjectState.Started) + { + var workerProcess = appPool.WorkerProcesses.SingleOrDefault(); + if (workerProcess != null) + { + HostProcess = Process.GetProcessById(workerProcess.ProcessId); + Logger.LogInformation("Site has started."); + return; + } + } + else + { + if (appPool.State != ObjectState.Started && appPool.State != ObjectState.Starting) + { + var state = appPool.Start(); + Logger.LogInformation($"Starting pool, state: {state.ToString()}"); + } + if (site.State != ObjectState.Starting) + { + var state = site.Start(); + Logger.LogInformation($"Starting site, state: {state.ToString()}"); + } + } + } + + } + catch (Exception ex) when (IsExpectedException(ex)) + { + // Accessing the site.State property while the site + // is starting up returns the COMException + // The object identifier does not represent a valid object. + // (Exception from HRESULT: 0x800710D8) + // This also means the site is not started yet, so catch and retry + // after waiting. + } + + await Task.Delay(_retryDelay); + } + + throw new TimeoutException($"IIS failed to start site."); + } + + public async Task StopAndDeleteAppPool() + { + Stop(); + + await WaitUntilSiteStopped(); + + RestoreAppHostConfig(); + } + + private async Task WaitUntilSiteStopped() + { + using (var serverManager = new ServerManager()) + { + var site = serverManager.Sites.SingleOrDefault(); + if (site == null) + { + return; + } + + var sw = Stopwatch.StartNew(); + + while (sw.Elapsed < _timeout) + { + try + { + if (site.State == ObjectState.Stopped) + { + if (HostProcess.HasExited) + { + Logger.LogInformation($"Site has stopped successfully."); + return; + } + } + } + catch (Exception ex) when (IsExpectedException(ex)) + { + // Accessing the site.State property while the site + // is shutdown down returns the COMException + return; + } + + Logger.LogWarning($"IIS has not stopped after {sw.Elapsed.TotalMilliseconds}"); + await Task.Delay(_retryDelay); + } + + throw new TimeoutException($"IIS failed to stop site {site}."); + } + } + + private static bool IsExpectedException(Exception ex) + { + return ex is DllNotFoundException || + ex is COMException && + (ex.HResult == ERROR_OBJECT_NOT_FOUND || ex.HResult == ERROR_SHARING_VIOLATION || ex.HResult == ERROR_SERVICE_CANNOT_ACCEPT_CTRL); + } + + private void AddTemporaryAppHostConfig(string contentRoot, int port) + { + _configPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("D")); + var appHostConfigPath = Path.Combine(_configPath, "applicationHost.config"); + Directory.CreateDirectory(_configPath); + var config = XDocument.Parse(DeploymentParameters.ServerConfigTemplateContent ?? File.ReadAllText("IIS.config")); + + ConfigureAppHostConfig(config.Root, contentRoot, port); + + config.Save(appHostConfigPath); + + using (var serverManager = new ServerManager()) + { + var redirectionConfiguration = serverManager.GetRedirectionConfiguration(); + var redirectionSection = redirectionConfiguration.GetSection("configurationRedirection"); + + redirectionSection.Attributes["enabled"].Value = true; + redirectionSection.Attributes["path"].Value = _configPath; + + serverManager.CommitChanges(); + } + } + + private void RestoreAppHostConfig() + { + using (var serverManager = new ServerManager()) + { + var redirectionConfiguration = serverManager.GetRedirectionConfiguration(); + var redirectionSection = redirectionConfiguration.GetSection("configurationRedirection"); + + redirectionSection.Attributes["enabled"].Value = false; + + serverManager.CommitChanges(); + + Directory.Delete(_configPath, true); + } + } + + private void ConfigureAppHostConfig(XElement config, string contentRoot, int port) + { + var siteElement = config + .RequiredElement("system.applicationHost") + .RequiredElement("sites") + .RequiredElement("site"); + + siteElement + .RequiredElement("application") + .RequiredElement("virtualDirectory") + .SetAttributeValue("physicalPath", contentRoot); + + siteElement + .RequiredElement("bindings") + .RequiredElement("binding") + .SetAttributeValue("bindingInformation", $"*:{port}:"); + + var ancmVersion = DeploymentParameters.AncmVersion.ToString(); + config + .RequiredElement("system.webServer") + .RequiredElement("globalModules") + .GetOrAdd("add", "name", ancmVersion) + .SetAttributeValue("image", GetAncmLocation(DeploymentParameters.AncmVersion)); + + config + .RequiredElement("system.webServer") + .RequiredElement("modules") + .GetOrAdd("add", "name", ancmVersion); + + var pool = config + .RequiredElement("system.applicationHost") + .RequiredElement("applicationPools") + .RequiredElement("add"); + + var environmentVariables = pool + .GetOrAdd("environmentVariables"); + + foreach (var tuple in DeploymentParameters.EnvironmentVariables) + { + environmentVariables + .GetOrAdd("add", "name", tuple.Key) + .SetAttributeValue("value", tuple.Value); + } + + RunServerConfigActions(config, contentRoot); + } + + private void Stop() + { + using (var serverManager = new ServerManager()) + { + var site = serverManager.Sites.SingleOrDefault(); + site.Stop(); + var appPool = serverManager.ApplicationPools.SingleOrDefault(); + appPool.Stop(); + serverManager.CommitChanges(); + } } } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs index 8dcc3e135e..f511f9f5f1 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs @@ -18,6 +18,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS protected List> DefaultWebConfigActions { get; } = new List>(); + protected List> DefaultServerConfigActions { get; } = new List>(); + public IISDeployerBase(IISDeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) : base(deploymentParameters, loggerFactory) { @@ -26,11 +28,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS public void RunWebConfigActions(string contentRoot) { - if (IISDeploymentParameters == null) - { - return; - } - if (!DeploymentParameters.PublishApplicationBeforeDeployment) { throw new InvalidOperationException("Cannot modify web.config file if no published output."); @@ -38,37 +35,55 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS var path = Path.Combine(DeploymentParameters.PublishedApplicationRootPath, "web.config"); var webconfig = XDocument.Load(path); - var xElement = webconfig.Descendants("system.webServer").Single(); foreach (var action in DefaultWebConfigActions) { - action.Invoke(xElement, contentRoot); + action.Invoke(webconfig.Root, contentRoot); } - foreach (var action in IISDeploymentParameters.WebConfigActionList) + if (IISDeploymentParameters != null) { - action.Invoke(xElement, contentRoot); + foreach (var action in IISDeploymentParameters.WebConfigActionList) + { + action.Invoke(webconfig.Root, contentRoot); + } } webconfig.Save(path); } - public string RunServerConfigActions(string serverConfigString, string contentRoot) + public void RunServerConfigActions(XElement config, string contentRoot) { - if (IISDeploymentParameters == null) + foreach (var action in DefaultServerConfigActions) { - return serverConfigString; + action.Invoke(config, contentRoot); } - var serverConfig = XDocument.Parse(serverConfigString); - var xElement = serverConfig.Descendants("configuration").FirstOrDefault(); - - foreach (var action in IISDeploymentParameters.ServerConfigActionList) + if (IISDeploymentParameters != null) { - action.Invoke(xElement, contentRoot); + foreach (var action in IISDeploymentParameters.ServerConfigActionList) + { + action.Invoke(config, contentRoot); + } } - return xElement.ToString(); + } + + protected string GetAncmLocation(AncmVersion version) + { + var ancmDllName = version == AncmVersion.AspNetCoreModuleV2 ? "aspnetcorev2.dll" : "aspnetcore.dll"; + var arch = DeploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? $@"x64\{ancmDllName}" : $@"x86\{ancmDllName}"; + var ancmFile = Path.Combine(AppContext.BaseDirectory, arch); + if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) + { + ancmFile = Path.Combine(AppContext.BaseDirectory, ancmDllName); + if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) + { + throw new FileNotFoundException("AspNetCoreModule could not be found.", ancmFile); + } + } + + return ancmFile; } } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs index 8d96236295..fc8fd99efc 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs @@ -3,9 +3,7 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Xml.Linq; -using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { @@ -65,63 +63,47 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS private Action AddWebConfigEnvironmentVariables() { - return (xElement, _) => + return (element, _) => { if (WebConfigBasedEnvironmentVariables.Count == 0) { return; } - var element = xElement.Descendants("environmentVariables").SingleOrDefault(); - if (element == null) - { - element = new XElement("environmentVariables"); - xElement.Descendants("aspNetCore").SingleOrDefault().Add(element); - } + var environmentVariables = element + .RequiredElement("system.webServer") + .RequiredElement("aspNetCore") + .GetOrAdd("environmentVariables"); + foreach (var envVar in WebConfigBasedEnvironmentVariables) { - CreateOrSetElement(element, envVar.Key, envVar.Value, "environmentVariable"); + environmentVariables.GetOrAdd("environmentVariable", "name", envVar.Key) + .SetAttributeValue("value", envVar.Value); } }; } private Action AddHandlerSettings() { - return (xElement, _) => + return (element, _) => { if (HandlerSettings.Count == 0) { return; } - var element = xElement.Descendants("handlerSettings").SingleOrDefault(); - if (element == null) - { - element = new XElement("handlerSettings"); - xElement.Descendants("aspNetCore").SingleOrDefault().Add(element); - } + var handlerSettings = element + .RequiredElement("system.webServer") + .RequiredElement("aspNetCore") + .GetOrAdd("handlerSettings"); foreach (var handlerSetting in HandlerSettings) { - CreateOrSetElement(element, handlerSetting.Key, handlerSetting.Value, "handlerSetting"); + handlerSettings.GetOrAdd("handlerSetting", "name", handlerSetting.Key) + .SetAttributeValue("value", handlerSetting.Value); } }; } - - private static void CreateOrSetElement(XElement rootElement, string name, string value, string elementName) - { - if (rootElement.Descendants() - .Attributes() - .Where(attribute => attribute.Value == name) - .Any()) - { - return; - } - var element = new XElement(elementName); - element.SetAttributeValue("name", name); - element.SetAttributeValue("value", value); - rootElement.Add(element); - } } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index ff02771ec0..cd1fbc69f2 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -273,8 +273,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS // Pass on the applicationhost.config to iis express. With this don't need to pass in the /path /port switches as they are in the applicationHost.config // We take a copy of the original specified applicationHost.Config to prevent modifying the one in the repo. - serverConfig = ModifyANCMPathInConfig(replaceFlag: "[ANCMPath]", dllName: "aspnetcore.dll", serverConfig); - serverConfig = ModifyANCMPathInConfig(replaceFlag: "[ANCMV2Path]", dllName: "aspnetcorev2.dll", serverConfig); + serverConfig = ModifyANCMPathInConfig(replaceFlag: "[ANCMPath]", AncmVersion.AspNetCoreModule, serverConfig); + serverConfig = ModifyANCMPathInConfig(replaceFlag: "[ANCMV2Path]", AncmVersion.AspNetCoreModuleV2, serverConfig); serverConfig = ReplacePlaceholder(serverConfig, "[PORT]", port.ToString(CultureInfo.InvariantCulture)); serverConfig = ReplacePlaceholder(serverConfig, "[ApplicationPhysicalPath]", contentRoot); @@ -299,7 +299,10 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS serverConfig = ReplacePlaceholder(serverConfig, "[HostingModel]", DeploymentParameters.HostingModel.ToString()); serverConfig = ReplacePlaceholder(serverConfig, "[AspNetCoreModule]", DeploymentParameters.AncmVersion.ToString()); } - serverConfig = RunServerConfigActions(serverConfig, contentRoot); + + var config = XDocument.Parse(serverConfig); + RunServerConfigActions(config.Root, contentRoot); + serverConfig = config.ToString(); DeploymentParameters.ServerConfigLocation = Path.GetTempFileName(); Logger.LogDebug("Saving Config to {configPath}", DeploymentParameters.ServerConfigLocation); @@ -317,21 +320,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS return content; } - private string ModifyANCMPathInConfig(string replaceFlag, string dllName, string serverConfig) + private string ModifyANCMPathInConfig(string replaceFlag, AncmVersion version, string serverConfig) { - var dllRoot = AppContext.BaseDirectory; if (serverConfig.Contains(replaceFlag)) { - var arch = DeploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? $@"x64\{dllName}" : $@"x86\{dllName}"; - var ancmFile = Path.Combine(dllRoot, arch); - if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) - { - ancmFile = Path.Combine(dllRoot, dllName); - if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) - { - throw new FileNotFoundException("AspNetCoreModule could not be found.", ancmFile); - } - } + var ancmFile = GetAncmLocation(version); Logger.LogDebug($"Writing '{replaceFlag}' '{ancmFile}' to config"); return serverConfig.Replace(replaceFlag, ancmFile); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs index 31f103fee2..589907657f 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Linq; using System.Xml.Linq; namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS @@ -10,13 +9,12 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS public static class WebConfigHelpers { public static Action AddOrModifyAspNetCoreSection(string key, string value) - => AddAction(key, value, section: "aspNetCore"); - - public static Action AddAction(string key, string value, string section) { - return (element, _) => - { - element.Descendants(section).SingleOrDefault().SetAttributeValue(key, value); + return (element, _) => { + element + .GetOrAdd("system.webServer") + .GetOrAdd("aspNetCore") + .SetAttributeValue(key, value); }; } @@ -24,11 +22,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { return (element, _) => { - element.Descendants("handlers") - .FirstOrDefault() - .Descendants("add") - .FirstOrDefault() - .SetAttributeValue(key, value); + element + .GetOrAdd("system.webServer") + .GetOrAdd("handlers") + .GetOrAdd("add") + .SetAttributeValue(key, value); }; } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs new file mode 100644 index 0000000000..45ed897019 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs @@ -0,0 +1,47 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Linq; +using System.Xml.Linq; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS +{ + internal static class XElementExtensions + { + public static XElement RequiredElement(this XElement element, string name) + { + var existing = element.Element(name); + if (existing == null) + { + throw new InvalidOperationException($"Element with name {name} not found in {element}"); + } + + return existing; + } + + public static XElement GetOrAdd(this XElement element, string name) + { + var existing = element.Element(name); + if (existing == null) + { + existing = new XElement(name); + element.Add(existing); + } + + return existing; + } + + public static XElement GetOrAdd(this XElement element, string name, string attribute, string attributeValue) + { + var existing = element.Elements(name).FirstOrDefault(e => e.Attribute(attribute)?.Value == attributeValue); + if (existing == null) + { + existing = new XElement(name, new XAttribute(attribute, attributeValue)); + element.Add(existing); + } + + return existing; + } + } +} diff --git a/test/Common.FunctionalTests/AppHostConfig/IIS.config b/test/Common.FunctionalTests/AppHostConfig/IIS.config index 624edf91ca..bc24ef9639 100644 --- a/test/Common.FunctionalTests/AppHostConfig/IIS.config +++ b/test/Common.FunctionalTests/AppHostConfig/IIS.config @@ -5,7 +5,7 @@ For schema documentation, see %windir%\system32\inetsrv\config\schema\IIS_schema.xml. - + Please make a backup of this file before making any changes to it. --> @@ -17,20 +17,20 @@ The section controls the registration of sections. Section is the basic unit of deployment, locking, searching and containment for configuration settings. - + Every section belongs to one section group. A section group is a container of logically-related sections. - + Sections cannot be nested. Section groups may be nested. - +
- + The recommended way to unlock sections is by using a location tag: @@ -131,7 +131,9 @@ - + + + From 433dd42909d823a10bd2adea005ee630e0a3fdea Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 8 Aug 2018 17:14:46 -0700 Subject: [PATCH 198/363] Use web.config for ASPNETCORE_DETAILEDERRORS --- .../IISDeployer.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index d76f5f48d7..1030823b3a 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -24,6 +24,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS internal const int ERROR_SHARING_VIOLATION = unchecked((int)0x80070020); internal const int ERROR_SERVICE_CANNOT_ACCEPT_CTRL = unchecked((int)0x80070425); + private const string DetailedErrorsEnvironmentVariable = "ASPNETCORE_DETAILEDERRORS"; + private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(10); private static readonly TimeSpan _retryDelay = TimeSpan.FromMilliseconds(200); @@ -71,7 +73,14 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS // For now, only support using published output DeploymentParameters.PublishApplicationBeforeDeployment = true; + // Move ASPNETCORE_DETAILEDERRORS to web config env variables + if (IISDeploymentParameters.EnvironmentVariables.ContainsKey(DetailedErrorsEnvironmentVariable)) + { + IISDeploymentParameters.WebConfigBasedEnvironmentVariables[DetailedErrorsEnvironmentVariable] = + IISDeploymentParameters.EnvironmentVariables[DetailedErrorsEnvironmentVariable]; + IISDeploymentParameters.EnvironmentVariables.Remove(DetailedErrorsEnvironmentVariable); + } // Do not override settings set on parameters if (!IISDeploymentParameters.HandlerSettings.ContainsKey("debugLevel") && !IISDeploymentParameters.HandlerSettings.ContainsKey("debugFile")) From d6f410bf42e898d742bf6d146917706357f1ae4f Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 9 Aug 2018 09:21:02 -0700 Subject: [PATCH 199/363] Add locked app_oflline file test and remove retrying client (#1178) * Add locked app_oflline file test and remove retrying client * Write bytes to file --- .../IISDeploymentResult.cs | 14 ---------- .../Common.FunctionalTests/AppOfflineTests.cs | 27 ++++++++++++++++++- .../Inprocess/LoggingTests.cs | 8 +++--- .../Inprocess/StartupExceptionTests.cs | 4 +-- .../OutOfProcess/HelloWorldTest.cs | 2 +- .../Utilities/Helpers.cs | 4 +-- .../InProcess/AuthenticationTests.cs | 8 +++--- .../InProcess/ShutdownTests.cs | 4 +-- .../InProcess/StartupTests.cs | 8 +++--- .../OutOfProcess/GlobalVersionTests.cs | 18 ++++++------- .../OutOfProcess/HttpsTest.cs | 4 +-- .../OutOfProcess/NtlmAuthentationTest.cs | 2 +- .../UpgradeFeatureDetectionTests.cs | 2 +- 13 files changed, 58 insertions(+), 47 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs index 4a9d881900..814a778c16 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs @@ -27,21 +27,9 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { HostProcess = hostProcess; Logger = loggerFactory.CreateLogger(deploymentParameters.SiteName); - // SocketsHttpHandler isn't available in netstandard2.0 - RetryingHttpClient = CreateRetryClient(new HttpClientHandler()); HttpClient = CreateClient(new HttpClientHandler()); } - public HttpClient CreateRetryClient(HttpMessageHandler messageHandler) - { - var loggingHandler = new LoggingHandler(messageHandler, Logger); - var retryHandler = new RetryHandler(loggingHandler, Logger); - return new HttpClient(retryHandler) - { - BaseAddress = base.HttpClient.BaseAddress - }; - } - public HttpClient CreateClient(HttpMessageHandler messageHandler) { return new HttpClient(new LoggingHandler(messageHandler, Logger)) @@ -50,8 +38,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS }; } - public HttpClient RetryingHttpClient { get; set; } - public new HttpClient HttpClient { get; set; } } } diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/test/Common.FunctionalTests/AppOfflineTests.cs index c191eea4c7..3e1580fcb9 100644 --- a/test/Common.FunctionalTests/AppOfflineTests.cs +++ b/test/Common.FunctionalTests/AppOfflineTests.cs @@ -42,6 +42,25 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests DeletePublishOutput(deploymentResult); } + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task LockedAppOfflineDroppedWhileSiteIsDown_SiteReturns503(HostingModel hostingModel) + { + var deploymentResult = await DeployApp(hostingModel); + + // Add app_offline without shared access + using (var stream = File.Open(Path.Combine(deploymentResult.ContentRoot, "app_offline.htm"), FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None)) + using (var writer = new StreamWriter(stream)) + { + await writer.WriteLineAsync("App if offline but you wouldn't see this message"); + await writer.FlushAsync(); + await AssertAppOffline(deploymentResult, ""); + } + + DeletePublishOutput(deploymentResult); + } + [ConditionalTheory] [InlineData(HostingModel.InProcess, 500, "500.0")] [InlineData(HostingModel.OutOfProcess, 502, "502.5")] @@ -259,7 +278,13 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests private static async Task AssertRunning(IISDeploymentResult deploymentResult) { - var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); + HttpResponseMessage response = null; + + for (var i = 0; i < 5 && response?.IsSuccessStatusCode != true; i++) + { + response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + await Task.Delay(RetryDelay); + } var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal("Hello World", responseText); diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index 6710fb7f47..0a19a90133 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -93,7 +93,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - await deploymentResult.RetryingHttpClient.GetAsync("/"); + await deploymentResult.HttpClient.GetAsync("/"); AssertLogs(Path.Combine(deploymentResult.ContentRoot, "debug.txt")); } @@ -106,7 +106,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - await deploymentResult.RetryingHttpClient.GetAsync("/"); + await deploymentResult.HttpClient.GetAsync("/"); AssertLogs(Path.Combine(deploymentResult.ContentRoot, "aspnetcore-debug.log")); } @@ -121,7 +121,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests deploymentParameters.HandlerSettings["debugFile"] = ""; var deploymentResult = await DeployAsync(deploymentParameters); - await deploymentResult.RetryingHttpClient.GetAsync("/"); + await deploymentResult.HttpClient.GetAsync("/"); AssertLogs(Path.Combine(deploymentResult.ContentRoot, "aspnetcore-debug.log")); } @@ -186,7 +186,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.RetryingHttpClient.GetAsync("/"); + var response = await deploymentResult.HttpClient.GetAsync("/"); StopServer(); var logContents = File.ReadAllText(firstTempFile); diff --git a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs index 980341dbc4..1234d368fc 100644 --- a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.RetryingHttpClient.GetAsync(path); + var response = await deploymentResult.HttpClient.GetAsync(path); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.RetryingHttpClient.GetAsync(path); + var response = await deploymentResult.HttpClient.GetAsync(path); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); diff --git a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs index d2a56caea5..0b05ff54db 100644 --- a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.RetryingHttpClient.GetAsync("/HelloWorld"); + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal("Hello World", responseText); diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 77eb37d524..73d48fd6ca 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -25,11 +25,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string GetInProcessTestSitesPath() => GetTestWebSitePath("InProcessWebSite"); public static string GetOutOfProcessTestSitesPath() => GetTestWebSitePath("OutOfProcessWebSite"); - + public static async Task AssertStarts(IISDeploymentResult deploymentResult, string path = "/HelloWorld") { - var response = await deploymentResult.RetryingHttpClient.GetAsync(path); + var response = await deploymentResult.HttpClient.GetAsync(path); var responseText = await response.Content.ReadAsStringAsync(); diff --git a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs index af442c4521..333a7a055b 100644 --- a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs @@ -29,26 +29,26 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.RetryingHttpClient.GetAsync("/AuthenticationAnonymous"); + var response = await deploymentResult.HttpClient.GetAsync("/AuthenticationAnonymous"); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.Equal("Anonymous?True", responseText); - response = await deploymentResult.RetryingHttpClient.GetAsync("/AuthenticationRestricted"); + response = await deploymentResult.HttpClient.GetAsync("/AuthenticationRestricted"); responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString()); Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString()); - response = await deploymentResult.RetryingHttpClient.GetAsync("/AuthenticationRestrictedNTLM"); + response = await deploymentResult.HttpClient.GetAsync("/AuthenticationRestrictedNTLM"); responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString()); // Note we can't restrict a challenge to a specific auth type, the native auth modules always add themselves. Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString()); - response = await deploymentResult.RetryingHttpClient.GetAsync("/AuthenticationForbidden"); + response = await deploymentResult.HttpClient.GetAsync("/AuthenticationForbidden"); responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); diff --git a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs index 1e397731e7..d9dbcd2b6e 100644 --- a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs @@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests parameters.GracefulShutdown = true; var result = await DeployAsync(parameters); - var response = await result.RetryingHttpClient.GetAsync("/HelloWorld"); + var response = await result.HttpClient.GetAsync("/HelloWorld"); StopServer(); Assert.True(result.HostProcess.ExitCode == 0); } @@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var parameters = _fixture.GetBaseDeploymentParameters(publish: true); var result = await DeployAsync(parameters); - var response = await result.RetryingHttpClient.GetAsync("/HelloWorld"); + var response = await result.HttpClient.GetAsync("/HelloWorld"); StopServer(); Assert.True(result.HostProcess.ExitCode == 1); } diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 218cb4b174..89c17d8492 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); + var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); @@ -108,7 +108,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); + var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal("Hello World", responseText); @@ -128,7 +128,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.RetryingHttpClient.GetAsync("/HelloWorld"); + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal("Hello World", responseText); @@ -154,7 +154,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld"); + var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index 7ad5d9c9f6..fa859d614a 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); + var response = await deploymentResult.HttpClient.GetAsync(_helloWorldRequest); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(_helloWorldResponse, responseText); } @@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); + var response = await deploymentResult.HttpClient.GetAsync(_helloWorldRequest); Assert.False(response.IsSuccessStatusCode); } @@ -80,7 +80,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var newANCMPath = GetANCMRequestHandlerPath(deploymentResult, version); Directory.Move(originalANCMPath, newANCMPath); - var response = await deploymentResult.RetryingHttpClient.GetAsync(_helloWorldRequest); + var response = await deploymentResult.HttpClient.GetAsync(_helloWorldRequest); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(_helloWorldResponse, responseText); AssertLoadedVersion(version); @@ -101,8 +101,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests CopyDirectory(originalANCMPath, newANCMPath); - deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); - var response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); + deploymentResult.HttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); + var response = await deploymentResult.HttpClient.GetAsync("CheckRequestHandlerVersion"); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(_helloWorldResponse, responseText); @@ -120,8 +120,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); - deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", originalANCMPath); - var response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); + deploymentResult.HttpClient.DefaultRequestHeaders.Add("ANCMRHPath", originalANCMPath); + var response = await deploymentResult.HttpClient.GetAsync("CheckRequestHandlerVersion"); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(_helloWorldResponse, responseText); @@ -136,8 +136,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests CopyDirectory(originalANCMPath, newANCMPath); - deploymentResult.RetryingHttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); - response = await deploymentResult.RetryingHttpClient.GetAsync("CheckRequestHandlerVersion"); + deploymentResult.HttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); + response = await deploymentResult.HttpClient.GetAsync("CheckRequestHandlerVersion"); responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(_helloWorldResponse, responseText); diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs index 91c5291b0a..5735393c57 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { ServerCertificateCustomValidationCallback = (a, b, c, d) => true }; - var client = deploymentResult.CreateRetryClient(handler); + var client = deploymentResult.CreateClient(handler); var response = await client.GetAsync("HttpsHelloWorld"); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal("Scheme:https; Original:http", responseText); @@ -92,7 +92,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests handler.ClientCertificates.Add(clientCert); } - var client = deploymentResult.CreateRetryClient(handler); + var client = deploymentResult.CreateClient(handler); // Request to base address and check if various parts of the body are rendered & measure the cold startup time. var response = await client.GetAsync("checkclientcert"); diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index b67b3b103a..49365998a0 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests deploymentParameters.AddWindowsAuthToServerConfig(); var result = await DeployAsync(deploymentParameters); - var response = await result.RetryingHttpClient.GetAsync("/HelloWorld"); + var response = await result.HttpClient.GetAsync("/HelloWorld"); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.OK, response.StatusCode); diff --git a/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs b/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs index 492ae8db87..62d07c5fd9 100644 --- a/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs +++ b/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs @@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.RetryingHttpClient.GetAsync("UpgradeFeatureDetection"); + var response = await deploymentResult.HttpClient.GetAsync("UpgradeFeatureDetection"); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(expected, responseText); } From dd429e9597993e3b2cb78b4ccce543884794a32a Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 9 Aug 2018 09:45:28 -0700 Subject: [PATCH 200/363] Catch exceptions thrown by is_regular_file (#1179) --- .../CommonLib/PollingAppOfflineApplication.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp index e9bbb42383..14629ebe10 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp @@ -27,12 +27,20 @@ PollingAppOfflineApplication::CheckAppOffline() SRWExclusiveLock lock(m_statusLock); if (ulCurrentTime - m_ulLastCheckTime > c_appOfflineRefreshIntervalMS) { - m_fAppOfflineFound = is_regular_file(m_appOfflineLocation); - if(m_fAppOfflineFound) + try { - LOG_IF_FAILED(OnAppOfflineFound()); + m_fAppOfflineFound = is_regular_file(m_appOfflineLocation); + if(m_fAppOfflineFound) + { + LOG_IF_FAILED(OnAppOfflineFound()); + } + m_ulLastCheckTime = ulCurrentTime; + } + catch (...) + { + // is_regular_file might throw in very rare cases + OBSERVE_CAUGHT_EXCEPTION(); } - m_ulLastCheckTime = ulCurrentTime; } } From d7ad4c79eecb10e158ce6b4ef1ccb6d49bc52c7d Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 9 Aug 2018 10:03:03 -0700 Subject: [PATCH 201/363] Fix incremental checks for test projects (#1186) --- build/testsite.props | 1 + test/IIS.FunctionalTests/IIS.FunctionalTests.csproj | 1 + .../IISExpress.FunctionalTests.csproj | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/testsite.props b/build/testsite.props index 9a9e2cdf76..03aa0c9cff 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -6,6 +6,7 @@ $(MSBuildThisFileDirectory)applicationhost.config $(MSBuildThisFileDirectory)applicationhost.iis.config false + True diff --git a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index dfe65f9b56..723433b707 100644 --- a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -3,6 +3,7 @@ netcoreapp2.2 IIS.FunctionalTests + True diff --git a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index 455f453431..e62095f98f 100644 --- a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -1,7 +1,8 @@ - + netcoreapp2.2 + True From e6330ab19bdf058953b7547ef04aae7034b21658 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 9 Aug 2018 10:08:44 -0700 Subject: [PATCH 202/363] Fix win7 test again (#1187) --- .../IISDeployer.cs | 18 +++++++++++------- .../Utilities/FunctionalTestsBase.cs | 3 ++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 1030823b3a..f677632485 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -345,14 +345,18 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS .RequiredElement("applicationPools") .RequiredElement("add"); - var environmentVariables = pool - .GetOrAdd("environmentVariables"); - - foreach (var tuple in DeploymentParameters.EnvironmentVariables) + if (DeploymentParameters.EnvironmentVariables.Any()) { - environmentVariables - .GetOrAdd("add", "name", tuple.Key) - .SetAttributeValue("value", tuple.Value); + var environmentVariables = pool + .GetOrAdd("environmentVariables"); + + foreach (var tuple in DeploymentParameters.EnvironmentVariables) + { + environmentVariables + .GetOrAdd("add", "name", tuple.Key) + .SetAttributeValue("value", tuple.Value); + } + } RunServerConfigActions(config, contentRoot); diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index 14b78a0d6e..79919e5753 100644 --- a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -22,7 +22,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting protected ApplicationDeployer CreateDeployer(IISDeploymentParameters parameters) { - if (!parameters.EnvironmentVariables.ContainsKey(DebugEnvironmentVariable)) + if (parameters.ServerType == ServerType.IISExpress && + !parameters.EnvironmentVariables.ContainsKey(DebugEnvironmentVariable)) { parameters.EnvironmentVariables[DebugEnvironmentVariable] = "console"; } From 8361b8cfa91ff9c77128003912854eb0cedbc29f Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 9 Aug 2018 11:32:51 -0700 Subject: [PATCH 203/363] Split handler resolution from application info (#1177) --- .../AspNetCore/AspNetCore.vcxproj | 2 + .../AspNetCore/HandlerResolver.cpp | 271 ++++++++++++++++ .../AspNetCore/HandlerResolver.h | 49 +++ .../AspNetCore/applicationinfo.cpp | 291 +----------------- .../AspNetCore/applicationinfo.h | 69 +---- .../AspNetCore/applicationmanager.cpp | 54 +--- .../AspNetCore/applicationmanager.h | 12 +- .../AspNetCore/aspnetcore_shim_config.cpp | 5 +- .../AspNetCore/aspnetcore_shim_config.h | 7 - src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp | 4 +- .../AspNetCore/proxymodule.cpp | 7 - .../CommonLib/HandleWrapper.h | 7 + .../XElementExtensions.cs | 2 +- .../MultiApplicationTests.cs | 141 +++++++++ .../Utilities/EventLogHelpers.cs | 11 +- .../Utilities/Helpers.cs | 18 +- test/WebSites/OutOfProcessWebSite/Startup.cs | 8 +- 17 files changed, 543 insertions(+), 415 deletions(-) create mode 100644 src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp create mode 100644 src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h create mode 100644 test/Common.FunctionalTests/MultiApplicationTests.cs diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index 3c64a0dee2..10633c1854 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -229,6 +229,7 @@ + @@ -240,6 +241,7 @@ + Create Create diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp new file mode 100644 index 0000000000..d01d944c5c --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -0,0 +1,271 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "HandlerResolver.h" +#include "exceptions.h" +#include "utility.h" +#include "SRWExclusiveLock.h" +#include "applicationinfo.h" +#include "EventLog.h" +#include "hostfxr_utility.h" +#include "GlobalVersionUtility.h" +#include "HandleWrapper.h" + +const PCWSTR HandlerResolver::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; +const PCWSTR HandlerResolver::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; + +HandlerResolver::HandlerResolver(HMODULE hModule, IHttpServer &pServer) + : m_hModule(hModule), + m_pServer(pServer), + m_fAspnetcoreRHLoadResult(S_FALSE), + m_loadedApplicationHostingModel(HOSTING_UNKNOWN), + m_hRequestHandlerDll(nullptr), + m_pfnAspNetCoreCreateApplication(nullptr) +{ + InitializeSRWLock(&m_requestHandlerLoadLock); +} + +HRESULT +HandlerResolver::LoadRequestHandlerAssembly(STRU& location, ASPNETCORE_SHIM_CONFIG * pConfiguration) +{ + HRESULT hr; + STACK_STRU(struFileName, MAX_PATH); + PCWSTR pstrHandlerDllName; + if (pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) + { + pstrHandlerDllName = s_pwzAspnetcoreInProcessRequestHandlerName; + } + else + { + pstrHandlerDllName = s_pwzAspnetcoreOutOfProcessRequestHandlerName; + } + + // Try to see if RH is already loaded, use GetModuleHandleEx to increment ref count + if (!GetModuleHandleEx(0, pstrHandlerDllName, &m_hRequestHandlerDll)) + { + if (pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) + { + std::unique_ptr options; + + RETURN_IF_FAILED(HOSTFXR_OPTIONS::Create( + NULL, + pConfiguration->QueryProcessPath()->QueryStr(), + pConfiguration->QueryApplicationPhysicalPath()->QueryStr(), + pConfiguration->QueryArguments()->QueryStr(), + g_hEventLog, + options)); + + RETURN_IF_FAILED(location.Copy(options->GetExeLocation())); + + if (FAILED_LOG(hr = FindNativeAssemblyFromHostfxr(options.get(), pstrHandlerDllName, &struFileName))) + { + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_ERROR_TYPE, + ASPNETCORE_EVENT_INPROCESS_RH_MISSING, + ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG, + struFileName.IsEmpty() ? s_pwzAspnetcoreInProcessRequestHandlerName : struFileName.QueryStr()); + + return hr; + } + } + else + { + if (FAILED_LOG(hr = FindNativeAssemblyFromGlobalLocation(pConfiguration, pstrHandlerDllName, &struFileName))) + { + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_ERROR_TYPE, + ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, + ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG, + struFileName.IsEmpty() ? s_pwzAspnetcoreOutOfProcessRequestHandlerName : struFileName.QueryStr()); + + return hr; + } + } + + LOG_INFOF("Loading request handler: %S", struFileName.QueryStr()); + + m_hRequestHandlerDll = LoadLibraryW(struFileName.QueryStr()); + RETURN_LAST_ERROR_IF_NULL(m_hRequestHandlerDll); + } + + m_pfnAspNetCoreCreateApplication = reinterpret_cast(GetProcAddress(m_hRequestHandlerDll, "CreateApplication")); + + RETURN_LAST_ERROR_IF_NULL(m_pfnAspNetCoreCreateApplication); + + return S_OK; +} + +HRESULT +HandlerResolver::GetApplicationFactory(IHttpApplication &pApplication, STRU& location, PFN_ASPNETCORE_CREATE_APPLICATION * pfnCreateApplication) +{ + ASPNETCORE_SHIM_CONFIG pConfiguration; + RETURN_IF_FAILED(pConfiguration.Populate(&m_pServer, &pApplication)); + + if (m_fAspnetcoreRHLoadResult == S_FALSE) + { + SRWExclusiveLock lock(m_requestHandlerLoadLock); + if (m_fAspnetcoreRHLoadResult == S_FALSE) + { + m_loadedApplicationHostingModel = pConfiguration.QueryHostingModel(); + m_loadedApplicationId = pApplication.GetApplicationId(); + LOG_IF_FAILED(m_fAspnetcoreRHLoadResult = LoadRequestHandlerAssembly(location, &pConfiguration)); + } + } + + // Mixed hosting models + if (m_loadedApplicationHostingModel != pConfiguration.QueryHostingModel()) + { + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_ERROR_TYPE, + ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR, + ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG, + pApplication.GetApplicationId(), + pConfiguration.QueryHostingModel()); + + return E_FAIL; + } + // Multiple in-process apps + else if (m_loadedApplicationHostingModel == HOSTING_IN_PROCESS && m_loadedApplicationId != pApplication.GetApplicationId()) + { + UTILITY::LogEventF(g_hEventLog, + EVENTLOG_ERROR_TYPE, + ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP, + ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG, + pApplication.GetApplicationId()); + + return E_FAIL; + } + + *pfnCreateApplication = m_pfnAspNetCoreCreateApplication; + return m_fAspnetcoreRHLoadResult; +} + +HRESULT +HandlerResolver::FindNativeAssemblyFromGlobalLocation( + ASPNETCORE_SHIM_CONFIG * pConfiguration, + PCWSTR pstrHandlerDllName, + STRU* struFilename +) +{ + try + { + std::wstring modulePath = GlobalVersionUtility::GetModuleName(m_hModule); + + modulePath = GlobalVersionUtility::RemoveFileNameFromFolderPath(modulePath); + + std::wstring retval = GlobalVersionUtility::GetGlobalRequestHandlerPath(modulePath.c_str(), + pConfiguration->QueryHandlerVersion()->QueryStr(), + pstrHandlerDllName + ); + + RETURN_IF_FAILED(struFilename->Copy(retval.c_str())); + } + catch (...) + { + STRU struEvent; + if (SUCCEEDED(struEvent.Copy(ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG))) + { + UTILITY::LogEvent(g_hEventLog, + EVENTLOG_INFORMATION_TYPE, + ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, + struEvent.QueryStr()); + } + + return OBSERVE_CAUGHT_EXCEPTION(); + } + + return S_OK; +} + +// +// Tries to find aspnetcorerh.dll from the application +// Calls into hostfxr.dll to find it. +// Will leave hostfxr.dll loaded as it will be used again to call hostfxr_main. +// +HRESULT +HandlerResolver::FindNativeAssemblyFromHostfxr( + HOSTFXR_OPTIONS* hostfxrOptions, + PCWSTR libraryName, + STRU* struFilename +) +{ + STRU struApplicationFullPath; + STRU struNativeSearchPaths; + STRU struNativeDllLocation; + INT intIndex = -1; + INT intPrevIndex = 0; + BOOL fFound = FALSE; + DWORD dwBufferSize = 1024 * 10; + DWORD dwRequiredBufferSize = 0; + + DBG_ASSERT(struFilename != NULL); + + RETURN_LAST_ERROR_IF_NULL(m_hHostFxrDll = LoadLibraryW(hostfxrOptions->GetHostFxrLocation())); + + auto pFnHostFxrSearchDirectories = reinterpret_cast(GetProcAddress(m_hHostFxrDll, "hostfxr_get_native_search_directories")); + + RETURN_LAST_ERROR_IF_NULL(pFnHostFxrSearchDirectories); + RETURN_IF_FAILED(struNativeSearchPaths.Resize(dwBufferSize)); + + while (TRUE) + { + auto intHostFxrExitCode = pFnHostFxrSearchDirectories( + hostfxrOptions->GetArgc(), + hostfxrOptions->GetArgv(), + struNativeSearchPaths.QueryStr(), + dwBufferSize, + &dwRequiredBufferSize + ); + + if (intHostFxrExitCode == 0) + { + break; + } + else if (dwRequiredBufferSize > dwBufferSize) + { + dwBufferSize = dwRequiredBufferSize + 1; // for null terminator + + RETURN_IF_FAILED(struNativeSearchPaths.Resize(dwBufferSize)); + } + else + { + // Log "Error finding native search directories from aspnetcore application. + return E_UNEXPECTED; + } + } + + RETURN_IF_FAILED(struNativeSearchPaths.SyncWithBuffer()); + + fFound = FALSE; + + // The native search directories are semicolon delimited. + // Split on semicolons, append aspnetcorerh.dll, and check if the file exists. + while ((intIndex = struNativeSearchPaths.IndexOf(L";", intPrevIndex)) != -1) + { + RETURN_IF_FAILED(struNativeDllLocation.Copy(&struNativeSearchPaths.QueryStr()[intPrevIndex], intIndex - intPrevIndex)); + + if (!struNativeDllLocation.EndsWith(L"\\")) + { + RETURN_IF_FAILED(struNativeDllLocation.Append(L"\\")); + } + + RETURN_IF_FAILED(struNativeDllLocation.Append(libraryName)); + + if (UTILITY::CheckIfFileExists(struNativeDllLocation.QueryStr())) + { + RETURN_IF_FAILED(struFilename->Copy(struNativeDllLocation)); + fFound = TRUE; + break; + } + + intPrevIndex = intIndex + 1; + } + + if (!fFound) + { + return HRESULT_FROM_WIN32(ERROR_DLL_NOT_FOUND); + } + + return S_OK; +} + diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h new file mode 100644 index 0000000000..ad257afef4 --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h @@ -0,0 +1,49 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +#include "aspnetcore_shim_config.h" +#include "hostfxroptions.h" +#include +#include "iapplication.h" +#include +#include "HandleWrapper.h" + +typedef +HRESULT +(WINAPI * PFN_ASPNETCORE_CREATE_APPLICATION)( + _In_ IHttpServer *pServer, + _In_ IHttpApplication *pHttpApplication, + _In_ APPLICATION_PARAMETER *pParameters, + _In_ DWORD nParameters, + _Out_ IAPPLICATION **pApplication + ); + +class HandlerResolver +{ +public: + HandlerResolver(HMODULE hModule, IHttpServer &pServer); + HRESULT GetApplicationFactory(IHttpApplication &pApplication, STRU& location, PFN_ASPNETCORE_CREATE_APPLICATION *pfnCreateApplication); + +private: + HRESULT LoadRequestHandlerAssembly(STRU& location, ASPNETCORE_SHIM_CONFIG * pConfiguration); + HRESULT FindNativeAssemblyFromGlobalLocation(ASPNETCORE_SHIM_CONFIG * pConfiguration, PCWSTR libraryName, STRU* location); + HRESULT FindNativeAssemblyFromHostfxr(HOSTFXR_OPTIONS* hostfxrOptions, PCWSTR libraryName, STRU* location); + + HMODULE m_hModule; + IHttpServer &m_pServer; + + SRWLOCK m_requestHandlerLoadLock {}; + // S_FALSE - not loaded, S_OK - loaded, everything else - error + HRESULT m_fAspnetcoreRHLoadResult; + std::wstring m_loadedApplicationId; + APP_HOSTING_MODEL m_loadedApplicationHostingModel; + HandleWrapper m_hRequestHandlerDll; + HandleWrapper m_hHostFxrDll; + + PFN_ASPNETCORE_CREATE_APPLICATION m_pfnAspNetCoreCreateApplication; + + static const PCWSTR s_pwzAspnetcoreInProcessRequestHandlerName; + static const PCWSTR s_pwzAspnetcoreOutOfProcessRequestHandlerName; +}; + diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index 3ac7246ca9..bad9c25e4b 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -17,18 +17,6 @@ #include "ServerErrorApplication.h" #include "AppOfflineApplication.h" -extern HINSTANCE g_hModule; - -const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; -const PCWSTR APPLICATION_INFO::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; - -SRWLOCK APPLICATION_INFO::s_requestHandlerLoadLock {}; -bool APPLICATION_INFO::s_fAspnetcoreRHAssemblyLoaded = false; -bool APPLICATION_INFO::s_fAspnetcoreRHLoadedError = false; -HMODULE APPLICATION_INFO::s_hAspnetCoreRH = nullptr; - -PFN_ASPNETCORE_CREATE_APPLICATION APPLICATION_INFO::s_pfnAspNetCoreCreateApplication = nullptr; - APPLICATION_INFO::~APPLICATION_INFO() { ShutDownApplication(); @@ -36,13 +24,13 @@ APPLICATION_INFO::~APPLICATION_INFO() HRESULT APPLICATION_INFO::Initialize( - _In_ IHttpApplication &pApplication + _In_ IHttpApplication &pApplication, + HandlerResolver * pHandlerResolver ) { - m_pConfiguration.reset(new ASPNETCORE_SHIM_CONFIG()); - RETURN_IF_FAILED(m_pConfiguration->Populate(&m_pServer, &pApplication)); + m_handlerResolver = pHandlerResolver; + RETURN_IF_FAILED(m_struConfigPath.Copy(pApplication.GetAppConfigPath())); RETURN_IF_FAILED(m_struInfoKey.Copy(pApplication.GetApplicationId())); - return S_OK; } @@ -84,20 +72,15 @@ APPLICATION_INFO::GetOrCreateApplication( else { STRU struExeLocation; - FINISHED_IF_FAILED(FindRequestHandlerAssembly(struExeLocation)); - - if (m_pfnAspNetCoreCreateApplication == NULL) - { - FINISHED(HRESULT_FROM_WIN32(ERROR_INVALID_FUNCTION)); - } - + PFN_ASPNETCORE_CREATE_APPLICATION pfnAspNetCoreCreateApplication; + FINISHED_IF_FAILED(m_handlerResolver->GetApplicationFactory(httpApplication, struExeLocation, &pfnAspNetCoreCreateApplication)); std::array parameters { {"InProcessExeLocation", struExeLocation.QueryStr()} }; LOG_INFO("Creating handler application"); IAPPLICATION * newApplication; - FINISHED_IF_FAILED(m_pfnAspNetCoreCreateApplication( + FINISHED_IF_FAILED(pfnAspNetCoreCreateApplication( &m_pServer, &httpApplication, parameters.data(), @@ -130,266 +113,6 @@ Finished: return hr; } -HRESULT -APPLICATION_INFO::FindRequestHandlerAssembly(STRU& location) -{ - HRESULT hr = S_OK; - PCWSTR pstrHandlerDllName; - STACK_STRU(struFileName, 256); - - if (s_fAspnetcoreRHLoadedError) - { - FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); - } - else if (!s_fAspnetcoreRHAssemblyLoaded) - { - SRWExclusiveLock lock(s_requestHandlerLoadLock); - if (s_fAspnetcoreRHLoadedError) - { - FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); - } - if (s_fAspnetcoreRHAssemblyLoaded) - { - FINISHED(S_OK); - } - - if (m_pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) - { - pstrHandlerDllName = s_pwzAspnetcoreInProcessRequestHandlerName; - } - else - { - pstrHandlerDllName = s_pwzAspnetcoreOutOfProcessRequestHandlerName; - } - - // Try to see if RH is already loaded - s_hAspnetCoreRH = GetModuleHandle(pstrHandlerDllName); - - if (s_hAspnetCoreRH == NULL) - { - if (m_pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) - { - std::unique_ptr options; - - FINISHED_IF_FAILED(HOSTFXR_OPTIONS::Create( - NULL, - m_pConfiguration->QueryProcessPath()->QueryStr(), - m_pConfiguration->QueryApplicationPhysicalPath()->QueryStr(), - m_pConfiguration->QueryArguments()->QueryStr(), - g_hEventLog, - options)); - - FINISHED_IF_FAILED(location.Copy(options->GetExeLocation())); - - if (FAILED_LOG(hr = FindNativeAssemblyFromHostfxr(options.get(), pstrHandlerDllName, &struFileName))) - { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_INPROCESS_RH_MISSING, - ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG, - struFileName.IsEmpty() ? s_pwzAspnetcoreInProcessRequestHandlerName : struFileName.QueryStr()); - - FINISHED(hr); - } - } - else - { - if (FAILED_LOG(hr = FindNativeAssemblyFromGlobalLocation(pstrHandlerDllName, &struFileName))) - { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, - ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG, - struFileName.IsEmpty() ? s_pwzAspnetcoreOutOfProcessRequestHandlerName : struFileName.QueryStr()); - - FINISHED(hr); - } - } - - LOG_INFOF("Loading request handler: %S", struFileName.QueryStr()); - - s_hAspnetCoreRH = LoadLibraryW(struFileName.QueryStr()); - - if (s_hAspnetCoreRH == NULL) - { - FINISHED(HRESULT_FROM_WIN32(GetLastError())); - } - } - - s_pfnAspNetCoreCreateApplication = (PFN_ASPNETCORE_CREATE_APPLICATION) - GetProcAddress(s_hAspnetCoreRH, "CreateApplication"); - if (s_pfnAspNetCoreCreateApplication == NULL) - { - FINISHED(HRESULT_FROM_WIN32(GetLastError())); - } - - s_fAspnetcoreRHAssemblyLoaded = TRUE; - } - -Finished: - // - // Question: we remember the load failure so that we will not try again. - // User needs to check whether the fuction pointer is NULL - // - m_pfnAspNetCoreCreateApplication = s_pfnAspNetCoreCreateApplication; - - if (!s_fAspnetcoreRHLoadedError && FAILED(hr)) - { - s_fAspnetcoreRHLoadedError = TRUE; - } - return hr; -} - -HRESULT -APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation( - PCWSTR pstrHandlerDllName, - STRU* struFilename -) -{ - HRESULT hr = S_OK; - - try - { - std::wstring modulePath = GlobalVersionUtility::GetModuleName(g_hModule); - - modulePath = GlobalVersionUtility::RemoveFileNameFromFolderPath(modulePath); - - std::wstring retval = GlobalVersionUtility::GetGlobalRequestHandlerPath(modulePath.c_str(), - m_pConfiguration->QueryHandlerVersion()->QueryStr(), - pstrHandlerDllName - ); - - RETURN_IF_FAILED(struFilename->Copy(retval.c_str())); - } - catch (std::exception& e) - { - STRU struEvent; - if (SUCCEEDED(struEvent.Copy(ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG)) - && SUCCEEDED(struEvent.AppendA(e.what()))) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, - ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, - struEvent.QueryStr()); - } - - hr = E_FAIL; - } - catch (...) - { - hr = E_FAIL; - } - - return hr; -} - -// -// Tries to find aspnetcorerh.dll from the application -// Calls into hostfxr.dll to find it. -// Will leave hostfxr.dll loaded as it will be used again to call hostfxr_main. -// -HRESULT -APPLICATION_INFO::FindNativeAssemblyFromHostfxr( - HOSTFXR_OPTIONS* hostfxrOptions, - PCWSTR libraryName, - STRU* struFilename -) -{ - HRESULT hr = S_OK; - STRU struApplicationFullPath; - STRU struNativeSearchPaths; - STRU struNativeDllLocation; - HMODULE hmHostFxrDll = NULL; - INT intHostFxrExitCode = 0; - INT intIndex = -1; - INT intPrevIndex = 0; - BOOL fFound = FALSE; - DWORD dwBufferSize = 1024 * 10; - DWORD dwRequiredBufferSize = 0; - - DBG_ASSERT(struFilename != NULL); - - FINISHED_LAST_ERROR_IF_NULL(hmHostFxrDll = LoadLibraryW(hostfxrOptions->GetHostFxrLocation())); - - hostfxr_get_native_search_directories_fn pFnHostFxrSearchDirectories = (hostfxr_get_native_search_directories_fn) - GetProcAddress(hmHostFxrDll, "hostfxr_get_native_search_directories"); - - if (pFnHostFxrSearchDirectories == NULL) - { - // Host fxr version is incorrect (need a higher version). - // TODO log error - FINISHED(E_FAIL); - } - - FINISHED_IF_FAILED(hr = struNativeSearchPaths.Resize(dwBufferSize)); - - while (TRUE) - { - intHostFxrExitCode = pFnHostFxrSearchDirectories( - hostfxrOptions->GetArgc(), - hostfxrOptions->GetArgv(), - struNativeSearchPaths.QueryStr(), - dwBufferSize, - &dwRequiredBufferSize - ); - - if (intHostFxrExitCode == 0) - { - break; - } - else if (dwRequiredBufferSize > dwBufferSize) - { - dwBufferSize = dwRequiredBufferSize + 1; // for null terminator - - FINISHED_IF_FAILED(struNativeSearchPaths.Resize(dwBufferSize)); - } - else - { - // Log "Error finding native search directories from aspnetcore application. - FINISHED(E_FAIL); - } - } - - FINISHED_IF_FAILED(struNativeSearchPaths.SyncWithBuffer()); - - fFound = FALSE; - - // The native search directories are semicolon delimited. - // Split on semicolons, append aspnetcorerh.dll, and check if the file exists. - while ((intIndex = struNativeSearchPaths.IndexOf(L";", intPrevIndex)) != -1) - { - FINISHED_IF_FAILED(struNativeDllLocation.Copy(&struNativeSearchPaths.QueryStr()[intPrevIndex], intIndex - intPrevIndex)); - - if (!struNativeDllLocation.EndsWith(L"\\")) - { - FINISHED_IF_FAILED(struNativeDllLocation.Append(L"\\")); - } - - FINISHED_IF_FAILED(struNativeDllLocation.Append(libraryName)); - - if (UTILITY::CheckIfFileExists(struNativeDllLocation.QueryStr())) - { - FINISHED_IF_FAILED(struFilename->Copy(struNativeDllLocation)); - fFound = TRUE; - break; - } - - intPrevIndex = intIndex + 1; - } - - if (!fFound) - { - FINISHED(E_FAIL); - } - -Finished: - if (FAILED(hr) && hmHostFxrDll != NULL) - { - FreeLibrary(hmHostFxrDll); - } - return hr; -} - VOID APPLICATION_INFO::RecycleApplication() { diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h index 989120a538..ddf3e23aaa 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h @@ -9,31 +9,20 @@ #include "aspnetcore_shim_config.h" #include "iapplication.h" #include "SRWSharedLock.h" +#include "HandlerResolver.h" #define API_BUFFER_TOO_SMALL 0x80008098 -typedef -HRESULT -(WINAPI * PFN_ASPNETCORE_CREATE_APPLICATION)( - _In_ IHttpServer *pServer, - _In_ IHttpApplication *pHttpApplication, - _In_ APPLICATION_PARAMETER *pParameters, - _In_ DWORD nParameters, - _Out_ IAPPLICATION **pApplication - ); - extern BOOL g_fRecycleProcessCalled; class APPLICATION_INFO { public: - APPLICATION_INFO(_In_ IHttpServer &pServer) : + APPLICATION_INFO(IHttpServer &pServer) : m_pServer(pServer), m_cRefs(1), - m_fValid(FALSE), - m_pConfiguration(nullptr), - m_pfnAspNetCoreCreateApplication(NULL) + m_handlerResolver(nullptr) { InitializeSRWLock(&m_applicationLock); } @@ -44,19 +33,25 @@ public: return m_struInfoKey.QueryStr(); } + STRU* + QueryConfigPath() + { + return &m_struConfigPath; + } + virtual ~APPLICATION_INFO(); - - static + + static void StaticInitialize() { - InitializeSRWLock(&s_requestHandlerLoadLock); } HRESULT Initialize( - _In_ IHttpApplication &pApplication + IHttpApplication &pApplication, + HandlerResolver *pHandlerResolver ); VOID @@ -74,24 +69,6 @@ public: } } - BOOL - IsValid() - { - return m_fValid; - } - - VOID - MarkValid() - { - m_fValid = TRUE; - } - - ASPNETCORE_SHIM_CONFIG* - QueryConfig() - { - return m_pConfiguration.get(); - } - VOID RecycleApplication(); @@ -105,31 +82,17 @@ public: ); private: - HRESULT FindRequestHandlerAssembly(STRU& location); - HRESULT FindNativeAssemblyFromGlobalLocation(PCWSTR libraryName, STRU* location); - HRESULT FindNativeAssemblyFromHostfxr(HOSTFXR_OPTIONS* hostfxrOptions, PCWSTR libraryName, STRU* location); static DWORD WINAPI DoRecycleApplication(LPVOID lpParam); mutable LONG m_cRefs; + STRU m_struConfigPath; STRU m_struInfoKey; - BOOL m_fValid; SRWLOCK m_applicationLock; IHttpServer &m_pServer; - PFN_ASPNETCORE_CREATE_APPLICATION m_pfnAspNetCoreCreateApplication; - - std::unique_ptr m_pConfiguration; + HandlerResolver *m_handlerResolver; + std::unique_ptr m_pApplication; - - - static const PCWSTR s_pwzAspnetcoreInProcessRequestHandlerName; - static const PCWSTR s_pwzAspnetcoreOutOfProcessRequestHandlerName; - - static SRWLOCK s_requestHandlerLoadLock; - static bool s_fAspnetcoreRHAssemblyLoaded; - static bool s_fAspnetcoreRHLoadedError; - static HMODULE s_hAspnetCoreRH; - static PFN_ASPNETCORE_CREATE_APPLICATION s_pfnAspNetCoreCreateApplication; }; class APPLICATION_INFO_HASH : diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp index 20030594fb..1c5862a339 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp @@ -27,10 +27,7 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( { HRESULT hr = S_OK; APPLICATION_INFO *pApplicationInfo = NULL; - BOOL fMixedHostingModelError = FALSE; - BOOL fDuplicatedInProcessApp = FALSE; PCWSTR pszApplicationId = NULL; - APP_HOSTING_MODEL hostingModel = HOSTING_UNKNOWN; STACK_STRU ( strEventMsg, 256 ); @@ -80,34 +77,7 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( pApplicationInfo = new APPLICATION_INFO(m_pHttpServer); - FINISHED_IF_FAILED(pApplicationInfo->Initialize(pApplication)); - - hostingModel = pApplicationInfo->QueryConfig()->QueryHostingModel(); - - if (m_pApplicationInfoHash->Count() == 0) - { - m_hostingModel = hostingModel; - pApplicationInfo->MarkValid(); - } - else - { - if (hostingModel == HOSTING_OUT_PROCESS && hostingModel == m_hostingModel) - { - pApplicationInfo->MarkValid(); - } - else - { - if (hostingModel != m_hostingModel) - { - fMixedHostingModelError = TRUE; - } - else - { - fDuplicatedInProcessApp = TRUE; - } - } - } - + FINISHED_IF_FAILED(pApplicationInfo->Initialize(pApplication, &m_handlerResolver)); FINISHED_IF_FAILED(m_pApplicationInfoHash->InsertRecord(pApplicationInfo)); *ppApplicationInfo = pApplicationInfo; @@ -115,26 +85,6 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( } Finished: - // log the error - if (fDuplicatedInProcessApp) - { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP, - ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG, - pszApplicationId); - - } - else if (fMixedHostingModelError) - { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR, - ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG, - pszApplicationId, - hostingModel); - } - if (pApplicationInfo != NULL) { pApplicationInfo->DereferenceApplicationInfo(); @@ -160,7 +110,7 @@ APPLICATION_MANAGER::FindConfigChangedApplication( // Config Change context contains the original config path that changed // and a multiStr containing CONFIG_CHANGE_CONTEXT* pContext = static_cast(pvContext); - STRU* pstruConfigPath = pEntry->QueryConfig()->QueryConfigPath(); + STRU* pstruConfigPath = pEntry->QueryConfigPath(); // check if the application path contains our app/subapp by seeing if the config path // starts with the notification path. diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h index f01df15844..165f3c9d3e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h @@ -85,10 +85,10 @@ public: } } - static HRESULT StaticInitialize(IHttpServer& pHttpServer) + static HRESULT StaticInitialize(HMODULE hModule, IHttpServer& pHttpServer) { assert(!sm_pApplicationManager); - sm_pApplicationManager = new APPLICATION_MANAGER(pHttpServer); + sm_pApplicationManager = new APPLICATION_MANAGER(hModule, pHttpServer); RETURN_IF_FAILED(sm_pApplicationManager->Initialize()); APPLICATION_INFO::StaticInitialize(); @@ -110,19 +110,21 @@ public: } private: - APPLICATION_MANAGER(IHttpServer& pHttpServer) : + APPLICATION_MANAGER(HMODULE hModule, IHttpServer& pHttpServer) : m_pApplicationInfoHash(NULL), m_hostingModel(HOSTING_UNKNOWN), m_fDebugInitialize(FALSE), - m_pHttpServer(pHttpServer) + m_pHttpServer(pHttpServer), + m_handlerResolver(hModule, pHttpServer) { InitializeSRWLock(&m_srwLock); } APPLICATION_INFO_HASH *m_pApplicationInfoHash; static APPLICATION_MANAGER *sm_pApplicationManager; - SRWLOCK m_srwLock; + SRWLOCK m_srwLock {}; APP_HOSTING_MODEL m_hostingModel; BOOL m_fDebugInitialize; IHttpServer &m_pHttpServer; + HandlerResolver m_handlerResolver; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp index 4cb6b222cf..6785bac95a 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp @@ -20,13 +20,14 @@ ASPNETCORE_SHIM_CONFIG::Populate( CComPtr pAspNetCoreElement; pAdminManager = pHttpServer->GetAdminManager(); - RETURN_IF_FAILED(m_struConfigPath.Copy(pHttpApplication->GetAppConfigPath())); RETURN_IF_FAILED(m_struApplicationPhysicalPath.Copy(pHttpApplication->GetApplicationPhysicalPath())); const CComBSTR bstrAspNetCoreSection = CS_ASPNETCORE_SECTION; + const CComBSTR applicationConfigPath = pHttpApplication->GetAppConfigPath(); + RETURN_IF_FAILED(pAdminManager->GetAdminSection(bstrAspNetCoreSection, - m_struConfigPath.QueryStr(), + applicationConfigPath, &pAspNetCoreElement)); RETURN_IF_FAILED(GetElementStringProperty(pAspNetCoreElement, diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h index 5229f95b79..a8f96db425 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h @@ -38,12 +38,6 @@ public: return &m_struApplicationPhysicalPath; } - STRU* - QueryConfigPath() - { - return &m_struConfigPath; - } - STRU* QueryProcessPath() { @@ -78,7 +72,6 @@ private: STRU m_struArguments; STRU m_struProcessPath; STRU m_struApplicationPhysicalPath; - STRU m_struConfigPath; APP_HOSTING_MODEL m_hostingModel; STRU m_struHostFxrLocation; STRU m_struHandlerVersion; diff --git a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp index 0526d1ccab..10f178ae70 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp @@ -16,6 +16,7 @@ DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2.dll"); HANDLE g_hEventLog = NULL; BOOL g_fRecycleProcessCalled = FALSE; BOOL g_fInShutdown = FALSE; +HINSTANCE g_hServerModule; VOID StaticCleanup() @@ -40,6 +41,7 @@ BOOL WINAPI DllMain(HMODULE hModule, switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: + g_hServerModule = hModule; DisableThreadLibraryCalls(hModule); DebugInitialize(hModule); break; @@ -157,7 +159,7 @@ HRESULT pFactory = NULL; - FINISHED_IF_FAILED(APPLICATION_MANAGER::StaticInitialize(*pHttpServer)); + FINISHED_IF_FAILED(APPLICATION_MANAGER::StaticInitialize(g_hServerModule, *pHttpServer)); pGlobalModule = NULL; diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index 1f0ed72db1..2d9fe9150c 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -89,13 +89,6 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( pHttpContext, &m_pApplicationInfo)); - if (!m_pApplicationInfo->IsValid()) - { - // Application cannot be started due to wrong hosting mode - // the error should already been logged to window event log for the first request - FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE); - } - DBG_ASSERT(pHttpContext); std::unique_ptr pApplication; diff --git a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h index 67f980dfd4..6764f4c14d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h +++ b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h @@ -19,6 +19,13 @@ struct NullHandleTraits static void Close(HANDLE handle) { CloseHandle(handle); } }; +struct ModuleHandleTraits +{ + using HandleType = HMODULE; + static constexpr HMODULE DefaultHandle = NULL; + static void Close(HMODULE handle) { FreeModule(handle); } +}; + template class HandleWrapper { diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs index 45ed897019..35d1b013cd 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs @@ -7,7 +7,7 @@ using System.Xml.Linq; namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { - internal static class XElementExtensions + public static class XElementExtensions { public static XElement RequiredElement(this XElement element, string name) { diff --git a/test/Common.FunctionalTests/MultiApplicationTests.cs b/test/Common.FunctionalTests/MultiApplicationTests.cs new file mode 100644 index 0000000000..df9bb035f9 --- /dev/null +++ b/test/Common.FunctionalTests/MultiApplicationTests.cs @@ -0,0 +1,141 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class MultiApplicationTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + private PublishedApplication _publishedApplication; + private PublishedApplication _rootApplication; + + public MultiApplicationTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task RunsTwoOutOfProcessApps() + { + var parameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); + parameters.ServerConfigActionList.Add(DuplicateApplication); + var result = await DeployAsync(parameters); + var id1 = await result.HttpClient.GetStringAsync("/app1/ProcessId"); + var id2 = await result.HttpClient.GetStringAsync("/app2/ProcessId"); + Assert.NotEqual(id2, id1); + } + + [ConditionalFact] + public async Task FailsAndLogsWhenRunningTwoInProcessApps() + { + var parameters = _fixture.GetBaseDeploymentParameters(HostingModel.InProcess, publish: true); + parameters.ServerConfigActionList.Add(DuplicateApplication); + var result = await DeployAsync(parameters); + var result1 = await result.HttpClient.GetAsync("/app1/HelloWorld"); + var result2 = await result.HttpClient.GetAsync("/app2/HelloWorld"); + Assert.Equal(200, (int)result1.StatusCode); + Assert.Equal(500, (int)result2.StatusCode); + StopServer(); + EventLogHelpers.VerifyEventLogEvent(TestSink, "Only one inprocess application is allowed per IIS application pool"); + } + + [ConditionalTheory] + [InlineData(HostingModel.OutOfProcess)] + [InlineData(HostingModel.InProcess)] + public async Task FailsAndLogsEventLogForMixedHostingModel(HostingModel firstApp) + { + var parameters = _fixture.GetBaseDeploymentParameters(firstApp, publish: true); + parameters.ServerConfigActionList.Add(DuplicateApplication); + var result = await DeployAsync(parameters); + + // Modify hosting model of other app to be the opposite + var otherApp = firstApp == HostingModel.InProcess ? HostingModel.OutOfProcess : HostingModel.InProcess; + SetHostingModel(_publishedApplication.Path, otherApp); + + var result1 = await result.HttpClient.GetAsync("/app1/HelloWorld"); + var result2 = await result.HttpClient.GetAsync("/app2/HelloWorld"); + Assert.Equal(200, (int)result1.StatusCode); + Assert.Equal(500, (int)result2.StatusCode); + StopServer(); + EventLogHelpers.VerifyEventLogEvent(TestSink, "Mixed hosting model is not supported."); + } + + private void SetHostingModel(string directory, HostingModel model) + { + var webConfigLocation = GetWebConfigLocation(directory); + XDocument webConfig = XDocument.Load(webConfigLocation); + webConfig.Root + .GetOrAdd("system.webServer") + .GetOrAdd("aspNetCore") + .SetAttributeValue("hostingModel", model.ToString()); + webConfig.Save(webConfigLocation); + } + + private void DuplicateApplication(XElement config, string contentRoot) + { + var siteElement = config + .RequiredElement("system.applicationHost") + .RequiredElement("sites") + .RequiredElement("site"); + + var application = siteElement + .RequiredElement("application"); + + application.SetAttributeValue("path", "/app1"); + + var source = new DirectoryInfo(contentRoot); + + var destination = new DirectoryInfo(contentRoot + "anotherApp"); + destination.Create(); + Helpers.CopyFiles(source, destination, Logger); + + _publishedApplication = new PublishedApplication(destination.FullName, Logger); + + var newApplication = new XElement(application); + newApplication.SetAttributeValue("path", "/app2"); + newApplication.RequiredElement("virtualDirectory") + .SetAttributeValue("physicalPath", destination.FullName); + + siteElement.Add(newApplication); + + // IIS Express requires root application to exist + var rootApplicationDirectory = new DirectoryInfo(contentRoot + "rootApp"); + rootApplicationDirectory.Create(); + + _rootApplication = new PublishedApplication(rootApplicationDirectory.FullName, Logger); + File.WriteAllText(GetWebConfigLocation(rootApplicationDirectory.FullName), ""); + + var rootApplication = new XElement(application); + rootApplication.SetAttributeValue("path", "/"); + rootApplication.RequiredElement("virtualDirectory") + .SetAttributeValue("physicalPath", rootApplicationDirectory.FullName); + + siteElement.Add(rootApplication); + } + + private static string GetWebConfigLocation(string siteRoot) + { + return Path.Combine(siteRoot, "web.config"); + } + + public override void Dispose() + { + base.Dispose(); + _rootApplication.Dispose(); + _publishedApplication.Dispose(); + } + } +} diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index 1d53ba6843..7729b4359b 100644 --- a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -12,7 +12,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static void VerifyEventLogEvent(ITestSink testSink, string expectedRegexMatchString) { var eventLogRegex = new Regex($"Event Log: {expectedRegexMatchString}"); - Assert.Contains(testSink.Writes, context => eventLogRegex.IsMatch(context.Message)); + + int count = 0; + foreach (var context in testSink.Writes) + { + if (eventLogRegex.IsMatch(context.Message)) + { + count++; + } + } + Assert.Equal(1, count); } } } diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 73d48fd6ca..2781da1944 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -11,6 +11,7 @@ using System.Xml.Linq; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests @@ -25,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string GetInProcessTestSitesPath() => GetTestWebSitePath("InProcessWebSite"); public static string GetOutOfProcessTestSitesPath() => GetTestWebSitePath("OutOfProcessWebSite"); - + public static async Task AssertStarts(IISDeploymentResult deploymentResult, string path = "/HelloWorld") { @@ -57,5 +58,20 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await Task.WhenAll(tasks); } + + public static void CopyFiles(DirectoryInfo source, DirectoryInfo target, ILogger logger) + { + foreach (DirectoryInfo directoryInfo in source.GetDirectories()) + { + CopyFiles(directoryInfo, target.CreateSubdirectory(directoryInfo.Name), logger); + } + logger.LogDebug($"Processing {target.FullName}"); + foreach (FileInfo fileInfo in source.GetFiles()) + { + logger.LogDebug($" Copying {fileInfo.Name}"); + var destFileName = Path.Combine(target.FullName, fileInfo.Name); + fileInfo.CopyTo(destFileName); + } + } } } diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/test/WebSites/OutOfProcessWebSite/Startup.cs index be44480891..059b5a1264 100644 --- a/test/WebSites/OutOfProcessWebSite/Startup.cs +++ b/test/WebSites/OutOfProcessWebSite/Startup.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Diagnostics; using System.IO; using System.Linq; using System.Runtime.InteropServices; @@ -109,10 +110,15 @@ namespace TestSites private async Task HostingEnvironment(HttpContext context) { var hostingEnv = context.RequestServices.GetService(); - + await context.Response.WriteAsync("ContentRootPath "+hostingEnv.ContentRootPath + Environment.NewLine); await context.Response.WriteAsync("WebRootPath "+hostingEnv.WebRootPath + Environment.NewLine); await context.Response.WriteAsync("CurrentDirectory "+Environment.CurrentDirectory); } + + private async Task ProcessId(HttpContext context) + { + await context.Response.WriteAsync(Process.GetCurrentProcess().Id.ToString()); + } } } From 46285253018e1086cf4e9ba272c0efb86120c486 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 9 Aug 2018 17:30:26 -0700 Subject: [PATCH 204/363] Start W3SVC if it is stopped (#1197) --- .vsts-pipelines/templates/build-steps.yml | 2 +- build/dependencies.props | 3 ++- .../IISDeployer.cs | 14 ++++++++++++++ ...AspNetCore.Server.IntegrationTesting.IIS.csproj | 3 ++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml index a5983be46b..dbc03620b5 100644 --- a/.vsts-pipelines/templates/build-steps.yml +++ b/.vsts-pipelines/templates/build-steps.yml @@ -3,7 +3,7 @@ phases: parameters: agentOs: Windows beforeBuild: - - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; Restart-Service w3svc" + - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1" displayName: Prepare repo afterBuild: - task: PublishBuildArtifacts@1 diff --git a/build/dependencies.props b/build/dependencies.props index 38a8c11d2e..92fd8c35be 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) @@ -47,6 +47,7 @@ 4.5.0 4.5.1 4.5.0 + 4.5.0 9.0.1 2.3.1 2.4.0 diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index f677632485..583eb23d38 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -6,12 +6,14 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Runtime.InteropServices; +using System.ServiceProcess; using System.Threading; using System.Threading.Tasks; using System.Xml.Linq; using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.Extensions.Logging; using Microsoft.Web.Administration; +using TimeoutException = System.TimeoutException; namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { @@ -164,6 +166,18 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS private async Task WaitUntilSiteStarted() { + ServiceController serviceController = new ServiceController("w3svc"); + Logger.LogInformation("W3SVC status " + serviceController.Status); + + if (serviceController.Status != ServiceControllerStatus.Running && + serviceController.Status != ServiceControllerStatus.StartPending) + { + Logger.LogInformation("Starting W3SVC"); + + serviceController.Start(); + serviceController.WaitForStatus(ServiceControllerStatus.Running, _timeout); + } + var sw = Stopwatch.StartNew(); while (sw.Elapsed < _timeout) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index 3678730c7e..d91d5c5a04 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -20,6 +20,7 @@ + From a8be2bf25b8ff748eba2660107ff9e2fb1945dcc Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 10 Aug 2018 14:52:29 -0700 Subject: [PATCH 205/363] Add common retry helper for SeverManager (#1207) --- .../IISDeployer.cs | 298 +++++++++--------- 1 file changed, 154 insertions(+), 144 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 583eb23d38..e257ed00a7 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using System.Runtime.InteropServices; using System.ServiceProcess; using System.Threading; using System.Threading.Tasks; @@ -13,7 +13,6 @@ using System.Xml.Linq; using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.Extensions.Logging; using Microsoft.Web.Administration; -using TimeoutException = System.TimeoutException; namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { @@ -22,10 +21,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS /// public class IISDeployer : IISDeployerBase { - internal const int ERROR_OBJECT_NOT_FOUND = unchecked((int)0x800710D8); - internal const int ERROR_SHARING_VIOLATION = unchecked((int)0x80070020); - internal const int ERROR_SERVICE_CANNOT_ACCEPT_CTRL = unchecked((int)0x80070425); - private const string DetailedErrorsEnvironmentVariable = "ASPNETCORE_DETAILEDERRORS"; private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(10); @@ -50,7 +45,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS public override void Dispose() { - StopAndDeleteAppPool().GetAwaiter().GetResult(); + Stop(); TriggerHostShutdown(_hostShutdownToken); @@ -62,7 +57,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS StopTimer(); } - public override async Task DeployAsync() + public override Task DeployAsync() { using (Logger.BeginScope("Deployment")) { @@ -111,43 +106,67 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS RunWebConfigActions(contentRoot); var uri = TestUriHelper.BuildTestUri(ServerType.IIS, DeploymentParameters.ApplicationBaseUriHint); - // To prevent modifying the IIS setup concurrently. - await StartIIS(uri, contentRoot); + StartIIS(uri, contentRoot); // Warm up time for IIS setup. Logger.LogInformation("Successfully finished IIS application directory setup."); - return new IISDeploymentResult( + return Task.FromResult(new IISDeploymentResult( LoggerFactory, IISDeploymentParameters, applicationBaseUri: uri.ToString(), contentRoot: contentRoot, hostShutdownToken: _hostShutdownToken.Token, hostProcess: HostProcess - ); + )); } } private void GetLogsFromFile() { - var arr = new string[0]; - - RetryHelper.RetryOperation(() => arr = File.ReadAllLines(Path.Combine(DeploymentParameters.PublishedApplicationRootPath, _debugLogFile)), - (ex) => Logger.LogWarning(ex, "Could not read log file"), - 5, - 200); - - foreach (var line in arr) + // Handle cases where debug file is redirected by test + var debugLogLocations = new List(); + if (IISDeploymentParameters.HandlerSettings.ContainsKey("debugFile")) { - Logger.LogInformation(line); + debugLogLocations.Add(IISDeploymentParameters.HandlerSettings["debugFile"]); } - if (File.Exists(_debugLogFile)) + if (DeploymentParameters.EnvironmentVariables.ContainsKey("ASPNETCORE_MODULE_DEBUG_FILE")) { - File.Delete(_debugLogFile); + debugLogLocations.Add(DeploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"]); } + + // default debug file name + debugLogLocations.Add("aspnetcore-debug.log"); + + foreach (var debugLogLocation in debugLogLocations) + { + if (string.IsNullOrEmpty(debugLogLocation)) + { + continue; + } + + var file = Path.Combine(DeploymentParameters.PublishedApplicationRootPath, debugLogLocation); + if (File.Exists(file)) + { + var lines = File.ReadAllLines(file); + if (!lines.Any()) + { + Logger.LogInformation("Debug log file found but was empty"); + continue; + } + + foreach (var line in lines) + { + Logger.LogInformation(line); + } + return; + } + } + + throw new InvalidOperationException($"Not able to find non-empty debug log files. Tried: {string.Join(", ", debugLogLocations)}"); } - public async Task StartIIS(Uri uri, string contentRoot) + public void StartIIS(Uri uri, string contentRoot) { // Backup currently deployed apphost.config file using (Logger.BeginScope("StartIIS")) @@ -160,11 +179,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS AddTemporaryAppHostConfig(contentRoot, port); - await WaitUntilSiteStarted(); + WaitUntilSiteStarted(); } } - private async Task WaitUntilSiteStarted() + private void WaitUntilSiteStarted() { ServiceController serviceController = new ServiceController("w3svc"); Logger.LogInformation("W3SVC status " + serviceController.Status); @@ -178,113 +197,37 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS serviceController.WaitForStatus(ServiceControllerStatus.Running, _timeout); } - var sw = Stopwatch.StartNew(); - - while (sw.Elapsed < _timeout) + RetryServerManagerAction(serverManager => { - try - { - using (var serverManager = new ServerManager()) - { - var site = serverManager.Sites.Single(); - var appPool = serverManager.ApplicationPools.Single(); + var site = serverManager.Sites.Single(); + var appPool = serverManager.ApplicationPools.Single(); - if (site.State == ObjectState.Started) - { - var workerProcess = appPool.WorkerProcesses.SingleOrDefault(); - if (workerProcess != null) - { - HostProcess = Process.GetProcessById(workerProcess.ProcessId); - Logger.LogInformation("Site has started."); - return; - } - } - else - { - if (appPool.State != ObjectState.Started && appPool.State != ObjectState.Starting) - { - var state = appPool.Start(); - Logger.LogInformation($"Starting pool, state: {state.ToString()}"); - } - if (site.State != ObjectState.Starting) - { - var state = site.Start(); - Logger.LogInformation($"Starting site, state: {state.ToString()}"); - } - } - } - - } - catch (Exception ex) when (IsExpectedException(ex)) + if (appPool.State != ObjectState.Started && appPool.State != ObjectState.Starting) { - // Accessing the site.State property while the site - // is starting up returns the COMException - // The object identifier does not represent a valid object. - // (Exception from HRESULT: 0x800710D8) - // This also means the site is not started yet, so catch and retry - // after waiting. + var state = appPool.Start(); + Logger.LogInformation($"Starting pool, state: {state.ToString()}"); } - await Task.Delay(_retryDelay); - } - - throw new TimeoutException($"IIS failed to start site."); - } - - public async Task StopAndDeleteAppPool() - { - Stop(); - - await WaitUntilSiteStopped(); - - RestoreAppHostConfig(); - } - - private async Task WaitUntilSiteStopped() - { - using (var serverManager = new ServerManager()) - { - var site = serverManager.Sites.SingleOrDefault(); - if (site == null) + if (site.State != ObjectState.Started && site.State != ObjectState.Starting) { - return; + var state = site.Start(); + Logger.LogInformation($"Starting site, state: {state.ToString()}"); } - var sw = Stopwatch.StartNew(); - - while (sw.Elapsed < _timeout) + if (site.State != ObjectState.Started) { - try - { - if (site.State == ObjectState.Stopped) - { - if (HostProcess.HasExited) - { - Logger.LogInformation($"Site has stopped successfully."); - return; - } - } - } - catch (Exception ex) when (IsExpectedException(ex)) - { - // Accessing the site.State property while the site - // is shutdown down returns the COMException - return; - } - - Logger.LogWarning($"IIS has not stopped after {sw.Elapsed.TotalMilliseconds}"); - await Task.Delay(_retryDelay); + throw new InvalidOperationException("Site not started yet"); } - throw new TimeoutException($"IIS failed to stop site {site}."); - } - } + var workerProcess = appPool.WorkerProcesses.SingleOrDefault(); + if (workerProcess == null) + { + throw new InvalidOperationException("Site is started but no worked process found"); + } - private static bool IsExpectedException(Exception ex) - { - return ex is DllNotFoundException || - ex is COMException && - (ex.HResult == ERROR_OBJECT_NOT_FOUND || ex.HResult == ERROR_SHARING_VIOLATION || ex.HResult == ERROR_SERVICE_CANNOT_ACCEPT_CTRL); + HostProcess = Process.GetProcessById(workerProcess.ProcessId); + Logger.LogInformation("Site has started."); + }); } private void AddTemporaryAppHostConfig(string contentRoot, int port) @@ -298,7 +241,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS config.Save(appHostConfigPath); - using (var serverManager = new ServerManager()) + RetryServerManagerAction(serverManager => { var redirectionConfiguration = serverManager.GetRedirectionConfiguration(); var redirectionSection = redirectionConfiguration.GetSection("configurationRedirection"); @@ -307,22 +250,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS redirectionSection.Attributes["path"].Value = _configPath; serverManager.CommitChanges(); - } - } - - private void RestoreAppHostConfig() - { - using (var serverManager = new ServerManager()) - { - var redirectionConfiguration = serverManager.GetRedirectionConfiguration(); - var redirectionSection = redirectionConfiguration.GetSection("configurationRedirection"); - - redirectionSection.Attributes["enabled"].Value = false; - - serverManager.CommitChanges(); - - Directory.Delete(_configPath, true); - } + }); } private void ConfigureAppHostConfig(XElement config, string contentRoot, int port) @@ -378,14 +306,96 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS private void Stop() { - using (var serverManager = new ServerManager()) + try { - var site = serverManager.Sites.SingleOrDefault(); - site.Stop(); - var appPool = serverManager.ApplicationPools.SingleOrDefault(); - appPool.Stop(); - serverManager.CommitChanges(); + RetryServerManagerAction(serverManager => + { + var site = serverManager.Sites.SingleOrDefault(); + if (site == null) + { + throw new InvalidOperationException("Site not found"); + } + + if (site.State != ObjectState.Stopped && site.State != ObjectState.Stopping) + { + var state = site.Stop(); + Logger.LogInformation($"Stopping site, state: {state.ToString()}"); + } + + var appPool = serverManager.ApplicationPools.SingleOrDefault(); + if (appPool == null) + { + throw new InvalidOperationException("Application pool not found"); + } + + if (appPool.State != ObjectState.Stopped && appPool.State != ObjectState.Stopping) + { + var state = appPool.Stop(); + Logger.LogInformation($"Stopping pool, state: {state.ToString()}"); + } + + if (site.State != ObjectState.Stopped) + { + throw new InvalidOperationException("Site not stopped yet"); + } + + if (!HostProcess.HasExited) + { + throw new InvalidOperationException("Site is stopped but host process is not"); + } + + Logger.LogInformation($"Site has stopped successfully."); + }); } + finally + { + // Undo redirection.config changes unconditionally + RetryServerManagerAction(serverManager => + { + var redirectionConfiguration = serverManager.GetRedirectionConfiguration(); + var redirectionSection = redirectionConfiguration.GetSection("configurationRedirection"); + + redirectionSection.Attributes["enabled"].Value = false; + + serverManager.CommitChanges(); + + Directory.Delete(_configPath, true); + }); + } + } + + private void RetryServerManagerAction(Action action) + { + List exceptions = null; + var sw = Stopwatch.StartNew(); + int retryCount = 0; + + while (sw.Elapsed < _timeout) + { + try + { + using (var serverManager = new ServerManager()) + { + action(serverManager); + } + + return; + } + catch (Exception ex) + { + if (exceptions == null) + { + exceptions = new List(); + } + + exceptions.Add(ex); + } + + retryCount++; + Thread.Sleep(_retryDelay); + } + + throw new AggregateException($"Operation did not succeed after {retryCount} retries", exceptions.ToArray()); } } } From 0665ab90450a131541e429909caa423401fb0254 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 12 Aug 2018 19:15:59 +0000 Subject: [PATCH 206/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 92fd8c35be..78d4a271f7 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,41 +1,41 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 0.10.13 - 2.2.0-preview1-20180731.1 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 0.6.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-preview1-20180807.2 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 0.6.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 15.6.82 15.6.82 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 2.0.9 2.1.2 2.2.0-preview1-26618-02 1.0.1 - 2.2.0-preview1-34896 + 2.2.0-preview1-34967 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index b6efc7cfcb..29a57027f1 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180731.1 -commithash:29fde58465439f4bb9df40830635ed758e063daf +version:2.2.0-preview1-20180807.2 +commithash:11495dbd236104434e08cb1152fcb58cf2a20923 From cd645faf69d84c517720a371cb9489fd3bdd84d7 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 12 Aug 2018 20:02:24 +0000 Subject: [PATCH 207/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 68 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index da230474f9..542334e671 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,50 +4,50 @@ 0.10.13 - 3.0.0-alpha1-10015 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 0.7.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 + 3.0.0-alpha1-20180810.1 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 0.7.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 15.6.82 15.6.82 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 - 3.0.0-alpha1-10207 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 + 3.0.0-alpha1-10275 2.0.9 2.1.2 2.2.0-preview1-26618-02 1.0.1 - 3.0.0-alpha1-10207 + 3.0.0-alpha1-10275 15.6.1 11.1.0 2.0.3 - 4.6.0-preview1-26727-04 - 4.6.0-preview1-26727-04 - 4.6.0-preview1-26727-04 + 4.6.0-preview1-26807-04 + 4.6.0-preview1-26807-04 + 4.6.0-preview1-26807-04 4.6.0-preview1-26717-04 - 4.6.0-preview1-26727-04 - 4.6.0-preview1-26727-04 - 4.6.0-preview1-26727-04 - 4.6.0-preview1-26727-04 - 4.6.0-preview1-26727-04 + 4.6.0-preview1-26807-04 + 4.6.0-preview1-26807-04 + 4.6.0-preview1-26807-04 + 4.6.0-preview1-26807-04 + 4.6.0-preview1-26807-04 9.0.1 2.3.1 2.4.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 8c70cbad9f..c53be3fca9 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-10015 -commithash:3f36e5c2f061712f76f2766c435d2555681d5c55 +version:3.0.0-alpha1-20180810.1 +commithash:45c32b4f020e14a9295be31866051a18d293309d From 36add746d799c587a270e54fc8015424d446b1fe Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Sun, 12 Aug 2018 21:21:38 -0700 Subject: [PATCH 208/363] General cleanup --- .../AppOfflineApplication.cpp | 2 +- .../AppOfflineApplication.h | 0 .../AppOfflineHandler.cpp | 0 .../AppOfflineHandler.h | 2 +- .../AspNetCore/AspNetCore.vcxproj | 6 + .../AspNetCore/HandlerResolver.cpp | 32 +- .../AspNetCore/HandlerResolver.h | 2 +- .../PollingAppOfflineApplication.cpp | 1 + .../PollingAppOfflineApplication.h | 0 .../AspNetCore/applicationinfo.cpp | 5 +- .../AspNetCore/applicationmanager.cpp | 7 +- .../AspNetCore/aspnetcore_shim_config.cpp | 12 +- .../AspNetCore/aspnetcore_shim_config.h | 8 - src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp | 14 +- .../CommonLib/CommonLib.vcxproj | 12 +- src/AspNetCoreModuleV2/CommonLib/EventLog.cpp | 52 ++ src/AspNetCoreModuleV2/CommonLib/EventLog.h | 62 +- .../CommonLib/application.h | 4 +- .../CommonLib/file_utility.cpp | 198 ++++++ .../CommonLib/file_utility.h | 42 ++ .../CommonLib/hostfxr_utility.cpp | 54 +- .../CommonLib/hostfxr_utility.h | 6 +- .../CommonLib/hostfxroptions.cpp | 4 - .../CommonLib/hostfxroptions.h | 1 - src/AspNetCoreModuleV2/CommonLib/resources.h | 6 - src/AspNetCoreModuleV2/CommonLib/utility.cpp | 603 ------------------ src/AspNetCoreModuleV2/CommonLib/utility.h | 130 ---- .../inprocessapplication.cpp | 21 +- .../OutOfProcessRequestHandler.vcxproj | 2 + .../disconnectcontext.h | 0 .../OutOfProcessRequestHandler/dllmain.cpp | 1 + .../forwardinghandler.cpp | 7 +- .../processmanager.cpp | 4 +- .../serverprocess.cpp | 35 +- .../OutOfProcessRequestHandler/stdafx.h | 1 - .../url_utility.cpp | 135 ++++ .../OutOfProcessRequestHandler/url_utility.h | 30 + .../AppOfflineTrackingApplication.cpp | 20 +- .../RequestHandlerLib/FileOutputManager.cpp | 6 +- .../RequestHandlerLib/filewatcher.cpp | 1 + test/CommonLibTests/hostfxr_utility_tests.cpp | 12 +- test/CommonLibTests/stdafx.h | 1 - 42 files changed, 637 insertions(+), 904 deletions(-) rename src/AspNetCoreModuleV2/{CommonLib => AspNetCore}/AppOfflineApplication.cpp (97%) rename src/AspNetCoreModuleV2/{CommonLib => AspNetCore}/AppOfflineApplication.h (100%) rename src/AspNetCoreModuleV2/{CommonLib => AspNetCore}/AppOfflineHandler.cpp (100%) rename src/AspNetCoreModuleV2/{CommonLib => AspNetCore}/AppOfflineHandler.h (96%) rename src/AspNetCoreModuleV2/{CommonLib => AspNetCore}/PollingAppOfflineApplication.cpp (98%) rename src/AspNetCoreModuleV2/{CommonLib => AspNetCore}/PollingAppOfflineApplication.h (100%) create mode 100644 src/AspNetCoreModuleV2/CommonLib/EventLog.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/file_utility.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/file_utility.h delete mode 100644 src/AspNetCoreModuleV2/CommonLib/utility.cpp delete mode 100644 src/AspNetCoreModuleV2/CommonLib/utility.h rename src/AspNetCoreModuleV2/{CommonLib => OutOfProcessRequestHandler}/disconnectcontext.h (100%) create mode 100644 src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp create mode 100644 src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h diff --git a/src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.cpp b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp similarity index 97% rename from src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.cpp rename to src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp index e42c6ca8e6..738199725e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp @@ -3,9 +3,9 @@ #include "AppOfflineApplication.h" -#include #include "HandleWrapper.h" #include "AppOfflineHandler.h" +#include "exceptions.h" HRESULT AppOfflineApplication::CreateHandler(IHttpContext* pHttpContext, IREQUEST_HANDLER** pRequestHandler) { diff --git a/src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.h b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/AppOfflineApplication.h rename to src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h diff --git a/src/AspNetCoreModuleV2/CommonLib/AppOfflineHandler.cpp b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/AppOfflineHandler.cpp rename to src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/AppOfflineHandler.h b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h similarity index 96% rename from src/AspNetCoreModuleV2/CommonLib/AppOfflineHandler.h rename to src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h index e9fd4b99da..784a470915 100644 --- a/src/AspNetCoreModuleV2/CommonLib/AppOfflineHandler.h +++ b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h @@ -3,7 +3,7 @@ #pragma once -#include "application.h" +#include #include "requesthandler.h" class AppOfflineHandler: public REQUEST_HANDLER diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index 10633c1854..ef86d5ed6b 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -226,10 +226,13 @@ + + + @@ -238,10 +241,13 @@ + + + Create Create diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index d01d944c5c..1f5ede9f0e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -3,13 +3,13 @@ #include "HandlerResolver.h" #include "exceptions.h" -#include "utility.h" #include "SRWExclusiveLock.h" #include "applicationinfo.h" #include "EventLog.h" #include "hostfxr_utility.h" #include "GlobalVersionUtility.h" #include "HandleWrapper.h" +#include "file_utility.h" const PCWSTR HandlerResolver::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; const PCWSTR HandlerResolver::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; @@ -26,7 +26,7 @@ HandlerResolver::HandlerResolver(HMODULE hModule, IHttpServer &pServer) } HRESULT -HandlerResolver::LoadRequestHandlerAssembly(STRU& location, ASPNETCORE_SHIM_CONFIG * pConfiguration) +HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, STRU& location, ASPNETCORE_SHIM_CONFIG * pConfiguration) { HRESULT hr; STACK_STRU(struFileName, MAX_PATH); @@ -50,20 +50,18 @@ HandlerResolver::LoadRequestHandlerAssembly(STRU& location, ASPNETCORE_SHIM_CONF RETURN_IF_FAILED(HOSTFXR_OPTIONS::Create( NULL, pConfiguration->QueryProcessPath()->QueryStr(), - pConfiguration->QueryApplicationPhysicalPath()->QueryStr(), + pApplication.GetApplicationPhysicalPath(), pConfiguration->QueryArguments()->QueryStr(), - g_hEventLog, options)); RETURN_IF_FAILED(location.Copy(options->GetExeLocation())); if (FAILED_LOG(hr = FindNativeAssemblyFromHostfxr(options.get(), pstrHandlerDllName, &struFileName))) { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, - ASPNETCORE_EVENT_INPROCESS_RH_MISSING, - ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG, - struFileName.IsEmpty() ? s_pwzAspnetcoreInProcessRequestHandlerName : struFileName.QueryStr()); + EventLog::Error( + ASPNETCORE_EVENT_INPROCESS_RH_MISSING, + ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG, + struFileName.IsEmpty() ? s_pwzAspnetcoreInProcessRequestHandlerName : struFileName.QueryStr()); return hr; } @@ -72,8 +70,7 @@ HandlerResolver::LoadRequestHandlerAssembly(STRU& location, ASPNETCORE_SHIM_CONF { if (FAILED_LOG(hr = FindNativeAssemblyFromGlobalLocation(pConfiguration, pstrHandlerDllName, &struFileName))) { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, + EventLog::Error( ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG, struFileName.IsEmpty() ? s_pwzAspnetcoreOutOfProcessRequestHandlerName : struFileName.QueryStr()); @@ -108,15 +105,14 @@ HandlerResolver::GetApplicationFactory(IHttpApplication &pApplication, STRU& loc { m_loadedApplicationHostingModel = pConfiguration.QueryHostingModel(); m_loadedApplicationId = pApplication.GetApplicationId(); - LOG_IF_FAILED(m_fAspnetcoreRHLoadResult = LoadRequestHandlerAssembly(location, &pConfiguration)); + LOG_IF_FAILED(m_fAspnetcoreRHLoadResult = LoadRequestHandlerAssembly(pApplication, location, &pConfiguration)); } } // Mixed hosting models if (m_loadedApplicationHostingModel != pConfiguration.QueryHostingModel()) { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, + EventLog::Error( ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR, ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG, pApplication.GetApplicationId(), @@ -127,8 +123,7 @@ HandlerResolver::GetApplicationFactory(IHttpApplication &pApplication, STRU& loc // Multiple in-process apps else if (m_loadedApplicationHostingModel == HOSTING_IN_PROCESS && m_loadedApplicationId != pApplication.GetApplicationId()) { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, + EventLog::Error( ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP, ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG, pApplication.GetApplicationId()); @@ -165,8 +160,7 @@ HandlerResolver::FindNativeAssemblyFromGlobalLocation( STRU struEvent; if (SUCCEEDED(struEvent.Copy(ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG))) { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, + EventLog::Info( ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, struEvent.QueryStr()); } @@ -251,7 +245,7 @@ HandlerResolver::FindNativeAssemblyFromHostfxr( RETURN_IF_FAILED(struNativeDllLocation.Append(libraryName)); - if (UTILITY::CheckIfFileExists(struNativeDllLocation.QueryStr())) + if (FILE_UTILITY::CheckIfFileExists(struNativeDllLocation.QueryStr())) { RETURN_IF_FAILED(struFilename->Copy(struNativeDllLocation)); fFound = TRUE; diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h index ad257afef4..847d664956 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h @@ -26,7 +26,7 @@ public: HRESULT GetApplicationFactory(IHttpApplication &pApplication, STRU& location, PFN_ASPNETCORE_CREATE_APPLICATION *pfnCreateApplication); private: - HRESULT LoadRequestHandlerAssembly(STRU& location, ASPNETCORE_SHIM_CONFIG * pConfiguration); + HRESULT LoadRequestHandlerAssembly(IHttpApplication &pApplication,STRU& location, ASPNETCORE_SHIM_CONFIG * pConfiguration); HRESULT FindNativeAssemblyFromGlobalLocation(ASPNETCORE_SHIM_CONFIG * pConfiguration, PCWSTR libraryName, STRU* location); HRESULT FindNativeAssemblyFromHostfxr(HOSTFXR_OPTIONS* hostfxrOptions, PCWSTR libraryName, STRU* location); diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp similarity index 98% rename from src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp rename to src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp index 14629ebe10..b448a89d7a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp @@ -6,6 +6,7 @@ #include #include "SRWExclusiveLock.h" #include "HandleWrapper.h" +#include "exceptions.h" APPLICATION_STATUS PollingAppOfflineApplication::QueryStatus() { diff --git a/src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h rename to src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index bad9c25e4b..2a00d3c82c 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -6,11 +6,9 @@ #include #include "proxymodule.h" #include "hostfxr_utility.h" -#include "utility.h" #include "debugutil.h" #include "resources.h" #include "SRWExclusiveLock.h" -#include "GlobalVersionUtility.h" #include "exceptions.h" #include "EventLog.h" #include "HandleWrapper.h" @@ -95,8 +93,7 @@ Finished: if (FAILED(hr)) { // Log the failure and update application info to not try again - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, + EventLog::Error( ASPNETCORE_EVENT_ADD_APPLICATION_ERROR, ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG, httpApplication.GetApplicationId(), diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp index 1c5862a339..8e62d9ef68 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp @@ -4,7 +4,6 @@ #include "applicationmanager.h" #include "proxymodule.h" -#include "utility.h" #include "resources.h" #include "SRWExclusiveLock.h" #include "exceptions.h" @@ -217,8 +216,7 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( ASPNETCORE_EVENT_RECYCLE_CONFIGURATION_MSG, path))) { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, + EventLog::Info( ASPNETCORE_EVENT_RECYCLE_CONFIGURATION, strEventMsg.QueryStr()); } @@ -248,8 +246,7 @@ Finished: ASPNETCORE_EVENT_RECYCLE_FAILURE_CONFIGURATION_MSG, pszApplicationId))) { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_ERROR_TYPE, + EventLog::Error( ASPNETCORE_EVENT_RECYCLE_APP_FAILURE, strEventMsg.QueryStr()); } diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp index 6785bac95a..10adc6e2b4 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp @@ -5,7 +5,6 @@ #include "EventLog.h" #include "config_utility.h" -#include "hostfxr_utility.h" #include "ahutil.h" HRESULT @@ -16,14 +15,10 @@ ASPNETCORE_SHIM_CONFIG::Populate( { STACK_STRU(strHostingModel, 12); STRU strApplicationFullPath; - IAppHostAdminManager *pAdminManager = NULL; CComPtr pAspNetCoreElement; - pAdminManager = pHttpServer->GetAdminManager(); - RETURN_IF_FAILED(m_struApplicationPhysicalPath.Copy(pHttpApplication->GetApplicationPhysicalPath())); - + IAppHostAdminManager *pAdminManager = pHttpServer->GetAdminManager(); const CComBSTR bstrAspNetCoreSection = CS_ASPNETCORE_SECTION; - const CComBSTR applicationConfigPath = pHttpApplication->GetAppConfigPath(); RETURN_IF_FAILED(pAdminManager->GetAdminSection(bstrAspNetCoreSection, @@ -51,7 +46,10 @@ ASPNETCORE_SHIM_CONFIG::Populate( else { // block unknown hosting value - EVENTLOG(g_hEventLog, UNKNOWN_HOSTING_MODEL_ERROR, strHostingModel.QueryStr()); + EventLog::Error( + ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR, + ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR_MSG, + strHostingModel.QueryStr()); RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED)); } diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h index a8f96db425..1ae97f79af 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h @@ -32,12 +32,6 @@ public: IHttpApplication *pHttpApplication ); - STRU* - QueryApplicationPhysicalPath() - { - return &m_struApplicationPhysicalPath; - } - STRU* QueryProcessPath() { @@ -71,9 +65,7 @@ private: STRU m_struArguments; STRU m_struProcessPath; - STRU m_struApplicationPhysicalPath; APP_HOSTING_MODEL m_hostingModel; - STRU m_struHostFxrLocation; STRU m_struHandlerVersion; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp index 10f178ae70..b20ca03b97 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp @@ -6,10 +6,10 @@ #include "proxymodule.h" #include "globalmodule.h" #include "acache.h" -#include "utility.h" #include "debugutil.h" #include "resources.h" #include "exceptions.h" +#include "EventLog.h" DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2.dll"); @@ -131,15 +131,9 @@ HRESULT if (fDisableANCM) { // Logging - STACK_STRU(strEventMsg, 256); - if (SUCCEEDED(strEventMsg.SafeSnwprintf( - ASPNETCORE_EVENT_MODULE_DISABLED_MSG))) - { - UTILITY::LogEvent(g_hEventLog, - EVENTLOG_WARNING_TYPE, - ASPNETCORE_EVENT_MODULE_DISABLED, - strEventMsg.QueryStr()); - } + EventLog::Warn( + ASPNETCORE_EVENT_MODULE_DISABLED, + ASPNETCORE_EVENT_MODULE_DISABLED_MSG); // this will return 500 error to client // as we did not register the module goto Finished; diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index e905714bfa..f9903b2d38 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -193,12 +193,11 @@ - - + @@ -206,28 +205,24 @@ - - - - - + + - @@ -236,7 +231,6 @@ Create Create - diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp b/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp new file mode 100644 index 0000000000..7d10a8abf9 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp @@ -0,0 +1,52 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "EventLog.h" +#include "debugutil.h" + +extern HANDLE g_hEventLog; + +VOID +EventLog::LogEvent( + _In_ WORD dwEventInfoType, + _In_ DWORD dwEventId, + _In_ LPCWSTR pstrMsg +) +{ + if (g_hEventLog != NULL) + { + ReportEventW(g_hEventLog, + dwEventInfoType, + 0, // wCategory + dwEventId, + NULL, // lpUserSid + 1, // wNumStrings + 0, // dwDataSize, + &pstrMsg, + NULL // lpRawData + ); + } + + DebugPrintf(dwEventInfoType == EVENTLOG_ERROR_TYPE ? ASPNETCORE_DEBUG_FLAG_ERROR : ASPNETCORE_DEBUG_FLAG_INFO, "Event Log: %S", pstrMsg); +} + +VOID +EventLog::LogEventF( + _In_ WORD dwEventInfoType, + _In_ DWORD dwEventId, + _In_ LPCWSTR pstrMsg, + va_list argsList +) +{ + STACK_STRU ( strEventMsg, 256 ); + + if (SUCCEEDED(strEventMsg.SafeVsnwprintf( + pstrMsg, + argsList))) + { + EventLog::LogEvent( + dwEventInfoType, + dwEventId, + strEventMsg.QueryStr()); + } +} diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.h b/src/AspNetCoreModuleV2/CommonLib/EventLog.h index 3efbe38b35..cdc330300f 100644 --- a/src/AspNetCoreModuleV2/CommonLib/EventLog.h +++ b/src/AspNetCoreModuleV2/CommonLib/EventLog.h @@ -3,9 +3,65 @@ #pragma once -#include "Utility.h" #include "resources.h" -extern HANDLE g_hEventLog; +class EventLog +{ +public: + static + VOID + Error( + _In_ DWORD dwEventId, + _In_ PCWSTR pstrMsg, + ...) + { + va_list args; + va_start(args, pstrMsg); + LogEventF(EVENTLOG_ERROR_TYPE, dwEventId, pstrMsg, args); + va_end(args); + } -#define EVENTLOG(log, name, ...) UTILITY::LogEventF(log, ASPNETCORE_EVENT_ ## name ## _LEVEL, ASPNETCORE_EVENT_ ## name, ASPNETCORE_EVENT_ ## name ## _MSG, __VA_ARGS__) + static + VOID + Info( + _In_ DWORD dwEventId, + _In_ PCWSTR pstrMsg, + ...) + { + va_list args; + va_start(args, pstrMsg); + LogEventF(EVENTLOG_INFORMATION_TYPE, dwEventId, pstrMsg, args); + va_end(args); + } + + static + VOID + Warn( + _In_ DWORD dwEventId, + _In_ PCWSTR pstrMsg, + ...) + { + va_list args; + va_start(args, pstrMsg); + LogEventF(EVENTLOG_WARNING_TYPE, dwEventId, pstrMsg, args); + va_end(args); + } + +private: + static + VOID + LogEvent( + _In_ WORD dwEventInfoType, + _In_ DWORD dwEventId, + _In_ LPCWSTR pstrMsg + ); + + static + VOID + LogEventF( + _In_ WORD dwEventInfoType, + _In_ DWORD dwEventId, + __in PCWSTR pstrMsg, + va_list argsList + ); +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index 1167602327..9c02484b1a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -4,8 +4,6 @@ #pragma once #include "iapplication.h" -#include "exceptions.h" -#include "utility.h" #include "ntassert.h" #include "SRWExclusiveLock.h" @@ -73,7 +71,7 @@ public: protected: SRWLOCK m_stateLock; - bool m_fStopCalled; + bool m_fStopCalled; private: mutable LONG m_cRefs; diff --git a/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp new file mode 100644 index 0000000000..0d12c32259 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp @@ -0,0 +1,198 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "file_utility.h" + +#include +#include "debugutil.h" + +HRESULT +FILE_UTILITY::IsPathUnc( + __in LPCWSTR pszPath, + __out BOOL * pfIsUnc +) +{ + HRESULT hr = S_OK; + STRU strTempPath; + + if ( pszPath == NULL || pfIsUnc == NULL ) + { + hr = E_INVALIDARG; + goto Finished; + } + + hr = MakePathCanonicalizationProof( (LPWSTR) pszPath, &strTempPath ); + if ( FAILED(hr) ) + { + goto Finished; + } + + // + // MakePathCanonicalizationProof will map \\?\UNC, \\.\UNC and \\ to \\?\UNC + // + (*pfIsUnc) = ( _wcsnicmp( strTempPath.QueryStr(), L"\\\\?\\UNC\\", 8 /* sizeof \\?\UNC\ */) == 0 ); + +Finished: + + return hr; +} + +HRESULT +FILE_UTILITY::ConvertPathToFullPath( + _In_ LPCWSTR pszPath, + _In_ LPCWSTR pszRootPath, + _Out_ STRU* pStruFullPath +) +{ + HRESULT hr = S_OK; + STRU strFileFullPath; + LPWSTR pszFullPath = NULL; + + // if relative path, prefix with root path and then convert to absolute path. + if ( PathIsRelative(pszPath) ) + { + hr = strFileFullPath.Copy(pszRootPath); + if(FAILED(hr)) + { + goto Finished; + } + + if(!strFileFullPath.EndsWith(L"\\")) + { + hr = strFileFullPath.Append(L"\\"); + if(FAILED(hr)) + { + goto Finished; + } + } + } + + hr = strFileFullPath.Append( pszPath ); + if (FAILED(hr)) + { + goto Finished; + } + + pszFullPath = new WCHAR[ strFileFullPath.QueryCCH() + 1]; + + if(_wfullpath( pszFullPath, + strFileFullPath.QueryStr(), + strFileFullPath.QueryCCH() + 1 ) == NULL ) + { + hr = HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER ); + goto Finished; + } + + // convert to canonical path + hr = MakePathCanonicalizationProof( pszFullPath, pStruFullPath ); + if (FAILED(hr)) + { + goto Finished; + } + +Finished: + + if ( pszFullPath != NULL ) + { + delete[] pszFullPath; + pszFullPath = NULL; + } + + return hr; +} + +HRESULT +FILE_UTILITY::EnsureDirectoryPathExist( + _In_ LPCWSTR pszPath +) +{ + HRESULT hr = S_OK; + STRU struPath; + DWORD dwPosition = 0; + BOOL fDone = FALSE; + BOOL fUnc = FALSE; + + struPath.Copy(pszPath); + hr = IsPathUnc(pszPath, &fUnc); + if (FAILED(hr)) + { + goto Finished; + } + if (fUnc) + { + // "\\?\UNC\" + dwPosition = 8; + } + else if (struPath.IndexOf(L'?', 0) != -1) + { + // sceanrio "\\?\" + dwPosition = 4; + } + while (!fDone) + { + dwPosition = struPath.IndexOf(L'\\', dwPosition + 1); + if (dwPosition == -1) + { + // not found '/' + fDone = TRUE; + goto Finished; + } + else if (dwPosition ==0) + { + hr = ERROR_INTERNAL_ERROR; + goto Finished; + } + else if (struPath.QueryStr()[dwPosition-1] == L':') + { + // skip volume case + continue; + } + else + { + struPath.QueryStr()[dwPosition] = L'\0'; + } + + if (!CreateDirectory(struPath.QueryStr(), NULL) && + ERROR_ALREADY_EXISTS != GetLastError()) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + fDone = TRUE; + goto Finished; + } + struPath.QueryStr()[dwPosition] = L'\\'; + } + +Finished: + return hr; +} + +BOOL +FILE_UTILITY::CheckIfFileExists( + _In_ PCWSTR pszFilePath +) +{ + HANDLE hFileHandle = INVALID_HANDLE_VALUE; + SECURITY_ATTRIBUTES saAttr; + BOOL fFileExists = FALSE; + + saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); + saAttr.bInheritHandle = TRUE; + saAttr.lpSecurityDescriptor = NULL; + + hFileHandle = CreateFile(pszFilePath, + GENERIC_READ, + FILE_SHARE_READ, + &saAttr, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + + fFileExists = hFileHandle != INVALID_HANDLE_VALUE || GetLastError() == ERROR_SHARING_VIOLATION; + + if (fFileExists) + { + CloseHandle(hFileHandle); + } + + return fFileExists; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/file_utility.h b/src/AspNetCoreModuleV2/CommonLib/file_utility.h new file mode 100644 index 0000000000..900e787cd7 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/file_utility.h @@ -0,0 +1,42 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include "stdafx.h" + +#include +#include "stringu.h" + +class FILE_UTILITY +{ +public: + + static + HRESULT + ConvertPathToFullPath( + _In_ LPCWSTR pszPath, + _In_ LPCWSTR pszRootPath, + _Out_ STRU* pStrFullPath + ); + + static + HRESULT + EnsureDirectoryPathExist( + _In_ LPCWSTR pszPath + ); + + static + BOOL + CheckIfFileExists( + PCWSTR pszFilePath + ); +private: + static + HRESULT + IsPathUnc( + __in LPCWSTR pszPath, + __out BOOL * pfIsUnc + ); +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index 792cd4e411..3d360b324d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -12,6 +12,7 @@ #include "exceptions.h" #include "HandleWrapper.h" #include "Environment.h" +#include "file_utility.h" namespace fs = std::filesystem; @@ -32,7 +33,6 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( PCWSTR pwzExeAbsolutePath, // includes .exe file extension. PCWSTR pcwzApplicationPhysicalPath, PCWSTR pcwzArguments, - HANDLE hEventLog, _Inout_ STRU* pStruHostFxrDllLocation, _Out_ DWORD* pdwArgCount, _Out_ BSTR** ppwzArgv @@ -65,11 +65,19 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( LOG_INFOF("Checking runtimeconfig.json at %S", runtimeConfigLocation.c_str()); if (!is_regular_file(runtimeConfigLocation)) { - EVENTLOG(hEventLog, INPROCESS_FULL_FRAMEWORK_APP, pcwzApplicationPhysicalPath, 0); + EventLog::Error( + ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP, + ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP_MSG, + pcwzApplicationPhysicalPath, + 0); return E_FAIL; } - EVENTLOG(hEventLog, APPLICATION_EXE_NOT_FOUND, pcwzApplicationPhysicalPath, 0); + EventLog::Error( + ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND, + ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_MSG, + pcwzApplicationPhysicalPath, + 0); return E_FAIL; } @@ -90,7 +98,6 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( arguments.c_str(), pwzExeAbsolutePath, pcwzApplicationPhysicalPath, - hEventLog, pdwArgCount, ppwzArgv)); @@ -107,7 +114,6 @@ HOSTFXR_UTILITY::IsDotnetExecutable(const std::filesystem::path & dotnetPath) HRESULT HOSTFXR_UTILITY::GetHostFxrParameters( - _In_ HANDLE hEventLog, _In_ PCWSTR pcwzProcessPath, _In_ PCWSTR pcwzApplicationPhysicalPath, _In_ PCWSTR pcwzArguments, @@ -142,13 +148,17 @@ HOSTFXR_UTILITY::GetHostFxrParameters( if (!fullProcessPath.has_value()) { hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - EVENTLOG(hEventLog, INVALID_PROCESS_PATH, processPath.c_str(), hr); + EventLog::Error( + ASPNETCORE_EVENT_INVALID_PROCESS_PATH, + ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG, + processPath.c_str(), + hr); return hr; } processPath = fullProcessPath.value(); - auto hostFxrPath = GetAbsolutePathToHostFxr(processPath, hEventLog); + auto hostFxrPath = GetAbsolutePathToHostFxr(processPath); if (!hostFxrPath.has_value()) { hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); @@ -159,7 +169,6 @@ HOSTFXR_UTILITY::GetHostFxrParameters( arguments.c_str(), processPath.c_str(), pcwzApplicationPhysicalPath, - hEventLog, pdwArgCount, pbstrArgv)); @@ -186,7 +195,6 @@ HOSTFXR_UTILITY::GetHostFxrParameters( processPath.c_str(), pcwzApplicationPhysicalPath, arguments.c_str(), - hEventLog, pStruHostFxrDllLocation, pdwArgCount, pbstrArgv)); @@ -200,7 +208,11 @@ HOSTFXR_UTILITY::GetHostFxrParameters( // then it is an invalid argument. // hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - EVENTLOG(hEventLog, INVALID_PROCESS_PATH, processPath.c_str(), hr); + EventLog::Error( + ASPNETCORE_EVENT_INVALID_PROCESS_PATH, + ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG, + processPath.c_str(), + hr); return hr; } } @@ -221,13 +233,10 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( PCWSTR pwzArgumentsFromConfig, PCWSTR pwzExePath, PCWSTR pcwzApplicationPhysicalPath, - HANDLE hEventLog, _Out_ DWORD* pdwArgCount, _Out_ BSTR** pbstrArgv ) { - UNREFERENCED_PARAMETER(hEventLog); // TODO use event log to set errors. - DBG_ASSERT(pdwArgCount != NULL); DBG_ASSERT(pbstrArgv != NULL); DBG_ASSERT(pwzExePath != NULL); @@ -276,7 +285,7 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( struTempPath.Copy(pwzArgs[intArgsProcessed]); if (struTempPath.EndsWith(L".dll")) { - if (SUCCEEDED(UTILITY::ConvertPathToFullPath(pwzArgs[intArgsProcessed], pcwzApplicationPhysicalPath, &struTempPath))) + if (SUCCEEDED(FILE_UTILITY::ConvertPathToFullPath(pwzArgs[intArgsProcessed], pcwzApplicationPhysicalPath, &struTempPath))) { argv[intArgsProcessed + 1] = SysAllocString(struTempPath.QueryStr()); } @@ -398,8 +407,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( std::optional HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( - const fs::path & dotnetPath, - HANDLE hEventLog + const fs::path & dotnetPath ) { std::vector versionFolders; @@ -409,7 +417,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( if (!is_directory(hostFxrBase)) { - EVENTLOG(hEventLog, HOSTFXR_DIRECTORY_NOT_FOUND, hostFxrBase.c_str(), HRESULT_FROM_WIN32(ERROR_BAD_ENVIRONMENT)); + EventLog::Error(ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND, ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND_MSG, hostFxrBase.c_str(), HRESULT_FROM_WIN32(ERROR_BAD_ENVIRONMENT)); return std::nullopt; } @@ -419,7 +427,11 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( if (versionFolders.empty()) { - EVENTLOG(hEventLog, HOSTFXR_DIRECTORY_NOT_FOUND, hostFxrBase.c_str(), HRESULT_FROM_WIN32(ERROR_BAD_ENVIRONMENT)); + EventLog::Error( + ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND, + ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND_MSG, + hostFxrBase.c_str(), + HRESULT_FROM_WIN32(ERROR_BAD_ENVIRONMENT)); return std::nullopt; } @@ -429,7 +441,11 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( if (!is_regular_file(hostFxrPath)) { - EVENTLOG(hEventLog, HOSTFXR_DLL_NOT_FOUND, hostFxrPath.c_str(), HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + EventLog::Error( + ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND, + ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND_MSG, + hostFxrPath.c_str(), + HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); return std::nullopt; } diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index 9e56fb4e28..126867a865 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -24,7 +24,6 @@ public: PCWSTR pwzExeAbsolutePath, // includes .exe file extension. PCWSTR pcwzApplicationPhysicalPath, PCWSTR pcwzArguments, - HANDLE hEventLog, _Inout_ STRU* pStruHostFxrDllLocation, _Out_ DWORD* pdwArgCount, _Out_ BSTR** ppwzArgv @@ -36,7 +35,6 @@ public: PCWSTR pwzArgumentsFromConfig, PCWSTR pwzExePath, PCWSTR pcwzApplicationPhysicalPath, - HANDLE hEventLog, _Out_ DWORD* pdwArgCount, _Out_ BSTR** pbstrArgv ); @@ -50,7 +48,6 @@ public: static HRESULT GetHostFxrParameters( - _In_ HANDLE hEventLog, _In_ PCWSTR pcwzProcessPath, _In_ PCWSTR pcwzApplicationPhysicalPath, _In_ PCWSTR pcwzArguments, @@ -76,8 +73,7 @@ public: static std::optional GetAbsolutePathToHostFxr( - _In_ const std::filesystem::path & dotnetPath, - _In_ HANDLE hEventLog + _In_ const std::filesystem::path & dotnetPath ); static diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp index fb65edf710..e8f2983028 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp @@ -12,7 +12,6 @@ HRESULT HOSTFXR_OPTIONS::Create( _In_ PCWSTR pcwzProcessPath, _In_ PCWSTR pcwzApplicationPhysicalPath, _In_ PCWSTR pcwzArguments, - _In_ HANDLE hEventLog, _Out_ std::unique_ptr& ppWrapper) { STRU struHostFxrDllLocation; @@ -30,7 +29,6 @@ HRESULT HOSTFXR_OPTIONS::Create( if (struExeLocation.IsEmpty()) { RETURN_IF_FAILED(HOSTFXR_UTILITY::GetHostFxrParameters( - hEventLog, pcwzProcessPath, pcwzApplicationPhysicalPath, pcwzArguments, @@ -45,7 +43,6 @@ HRESULT HOSTFXR_OPTIONS::Create( pcwzArguments, pcwzExeLocation, pcwzApplicationPhysicalPath, - hEventLog, &dwArgCount, &pwzArgv)); } @@ -55,7 +52,6 @@ HRESULT HOSTFXR_OPTIONS::Create( pcwzExeLocation, pcwzApplicationPhysicalPath, pcwzArguments, - hEventLog, &struHostFxrDllLocation, &dwArgCount, &pwzArgv)); diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h index 0529de4e62..99b972cde8 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h @@ -48,7 +48,6 @@ public: _In_ PCWSTR pcwzProcessPath, _In_ PCWSTR pcwzApplicationPhysicalPath, _In_ PCWSTR pcwzArguments, - _In_ HANDLE hEventLog, _Out_ std::unique_ptr& ppWrapper); private: diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index b1e8264941..63e0e9b163 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -30,7 +30,6 @@ #define ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG L"Only one inprocess application is allowed per IIS application pool. Please assign the application '%s' to a different IIS application pool." #define ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG L"Mixed hosting model is not supported. Application '%s' configured with different hostingModel value '%d' other than the one of running application(s)." #define ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR_MSG L"Unknown hosting model '%s'. Please specify either hostingModel=\"inprocess\" or hostingModel=\"outofprocess\" in the web.config file." -#define ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR_LEVEL EVENTLOG_ERROR_TYPE #define ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG L"Failed to start application '%s', ErrorCode '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x. Last 4KB characters of captured stdout and stderr logs:\r\n%s" #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x. Please check the stderr logs for more information." @@ -40,17 +39,12 @@ #define ASPNETCORE_EVENT_RECYCLE_CONFIGURATION_MSG L"Application '%s' was recycled due to configuration change" #define ASPNETCORE_EVENT_RECYCLE_FAILURE_CONFIGURATION_MSG L"Failed to recycle application due to a configuration change at '%s'. Recycling worker process." #define ASPNETCORE_EVENT_MODULE_DISABLED_MSG L"AspNetCore Module is disabled" -#define ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP_LEVEL EVENTLOG_ERROR_TYPE #define ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP_MSG L"Application '%s' was compiled for .NET Framework. Please compile for .NET core to run the inprocess application or change the process mode to out of process. ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_PORTABLE_APP_DOTNET_MISSING_MSG L"Could not find dotnet.exe on the system PATH environment variable for portable application '%s'. Check that a valid path to dotnet is on the PATH and the bitness of dotnet matches the bitness of the IIS worker process. ErrorCode = '0x%x'." -#define ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND_LEVEL EVENTLOG_ERROR_TYPE #define ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND_MSG L"Could not find the hostfxr directory '%s' in the dotnet directory. ErrorCode = '0x%x'." -#define ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND_LEVEL EVENTLOG_ERROR_TYPE #define ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND_MSG L"Could not find hostfxr.dll in '%s'. ErrorCode = '0x%x'." -#define ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_LEVEL EVENTLOG_ERROR_TYPE #define ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_MSG L"Could not find application executable in '%s'. ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, ErrorCode = '0x%x. Please check the stderr logs for more information." -#define ASPNETCORE_EVENT_INVALID_PROCESS_PATH_LEVEL EVENTLOG_ERROR_TYPE #define ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG L"Invalid or unknown processPath provided in web.config: processPath = '%s', ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application." #define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for out-of-process application. Please confirm the assembly is installed correctly for IIS or IISExpress." diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.cpp b/src/AspNetCoreModuleV2/CommonLib/utility.cpp deleted file mode 100644 index 2f8c25378c..0000000000 --- a/src/AspNetCoreModuleV2/CommonLib/utility.cpp +++ /dev/null @@ -1,603 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#include "utility.h" - -#include -#include "debugutil.h" - -// static -HRESULT -UTILITY::SplitUrl( - PCWSTR pszDestinationUrl, - BOOL *pfSecure, - STRU *pstrDestination, - STRU *pstrUrl -) -/*++ - -Routine Description: - - Split the URL specified for forwarding into its specific components - The format of the URL looks like - http[s]://destination[:port]/path - when port is omitted, the default port for that specific protocol is used - when host is omitted, it gets the same value as the destination - -Arguments: - - pszDestinationUrl - the url to be split up - pfSecure - SSL to be used in forwarding? - pstrDestination - destination - pDestinationPort - port - pstrUrl - URL - -Return Value: - - HRESULT - ---*/ -{ - HRESULT hr; - - // - // First determine if the target is secure - // - if (_wcsnicmp(pszDestinationUrl, L"http://", 7) == 0) - { - *pfSecure = FALSE; - pszDestinationUrl += 7; - } - else if (_wcsnicmp(pszDestinationUrl, L"https://", 8) == 0) - { - *pfSecure = TRUE; - pszDestinationUrl += 8; - } - else - { - return HRESULT_FROM_WIN32(ERROR_INVALID_DATA); - } - - if (*pszDestinationUrl == L'\0') - { - return HRESULT_FROM_WIN32(ERROR_INVALID_DATA); - } - - // - // Find the 3rd slash corresponding to the url - // - LPCWSTR pszSlash = wcschr(pszDestinationUrl, L'/'); - if (pszSlash == NULL) - { - if (FAILED(hr = pstrUrl->Copy(L"/", 1)) || - FAILED(hr = pstrDestination->Copy(pszDestinationUrl))) - { - return hr; - } - } - else - { - if (FAILED(hr = pstrUrl->Copy(pszSlash)) || - FAILED(hr = pstrDestination->Copy(pszDestinationUrl, - (DWORD)(pszSlash - pszDestinationUrl)))) - { - return hr; - } - } - - return S_OK; -} - -// Change a hexadecimal digit to its numerical equivalent -#define TOHEX( ch ) \ - ((ch) > L'9' ? \ - (ch) >= L'a' ? \ - (ch) - L'a' + 10 : \ - (ch) - L'A' + 10 \ - : (ch) - L'0') - -// static -HRESULT -UTILITY::UnEscapeUrl( - PCWSTR pszUrl, - DWORD cchUrl, - bool fCopyQuery, - STRA * pstrResult -) -{ - HRESULT hr; - CHAR pch[2]; - pch[1] = '\0'; - DWORD cchStart = 0; - DWORD index = 0; - - while (index < cchUrl && - (fCopyQuery || pszUrl[index] != L'?')) - { - switch (pszUrl[index]) - { - case L'%': - if (iswxdigit(pszUrl[index+1]) && iswxdigit(pszUrl[index+2])) - { - if (index > cchStart && - FAILED(hr = pstrResult->AppendW(pszUrl + cchStart, - index - cchStart))) - { - return hr; - } - cchStart = index+3; - - pch[0] = static_cast(TOHEX(pszUrl[index+1]) * 16 + - TOHEX(pszUrl[index+2])); - if (FAILED(hr = pstrResult->Append(pch, 1))) - { - return hr; - } - index += 3; - break; - } - - __fallthrough; - default: - index++; - } - } - - if (index > cchStart) - { - return pstrResult->AppendW(pszUrl + cchStart, - index - cchStart); - } - - return S_OK; -} - -// static -HRESULT -UTILITY::UnEscapeUrl( - PCWSTR pszUrl, - DWORD cchUrl, - STRU * pstrResult -) -{ - HRESULT hr; - WCHAR pch[2]; - pch[1] = L'\0'; - DWORD cchStart = 0; - DWORD index = 0; - bool fInQuery = FALSE; - - while (index < cchUrl) - { - switch (pszUrl[index]) - { - case L'%': - if (iswxdigit(pszUrl[index+1]) && iswxdigit(pszUrl[index+2])) - { - if (index > cchStart && - FAILED(hr = pstrResult->Append(pszUrl + cchStart, - index - cchStart))) - { - return hr; - } - cchStart = index+3; - - pch[0] = static_cast(TOHEX(pszUrl[index+1]) * 16 + - TOHEX(pszUrl[index+2])); - if (FAILED(hr = pstrResult->Append(pch, 1))) - { - return hr; - } - index += 3; - if (pch[0] == L'?') - { - fInQuery = TRUE; - } - break; - } - - index++; - break; - - case L'/': - if (fInQuery) - { - if (index > cchStart && - FAILED(hr = pstrResult->Append(pszUrl + cchStart, - index - cchStart))) - { - return hr; - } - cchStart = index+1; - - if (FAILED(hr = pstrResult->Append(L"\\", 1))) - { - return hr; - } - index += 1; - break; - } - - __fallthrough; - default: - index++; - } - } - - if (index > cchStart) - { - return pstrResult->Append(pszUrl + cchStart, - index - cchStart); - } - - return S_OK; -} - -HRESULT -UTILITY::EscapeAbsPath( - IHttpRequest * pRequest, - STRU * strEscapedUrl -) -{ - HRESULT hr = S_OK; - STRU strAbsPath; - LPCWSTR pszAbsPath = NULL; - LPCWSTR pszFindStr = NULL; - - hr = strAbsPath.Copy( pRequest->GetRawHttpRequest()->CookedUrl.pAbsPath, - pRequest->GetRawHttpRequest()->CookedUrl.AbsPathLength / sizeof(WCHAR) ); - if(FAILED(hr)) - { - goto Finished; - } - - pszAbsPath = strAbsPath.QueryStr(); - pszFindStr = wcschr(pszAbsPath, L'?'); - - while(pszFindStr != NULL) - { - strEscapedUrl->Append( pszAbsPath, pszFindStr - pszAbsPath); - strEscapedUrl->Append(L"%3F"); - pszAbsPath = pszFindStr + 1; - pszFindStr = wcschr(pszAbsPath, L'?'); - } - - strEscapedUrl->Append(pszAbsPath); - strEscapedUrl->Append(pRequest->GetRawHttpRequest()->CookedUrl.pQueryString, - pRequest->GetRawHttpRequest()->CookedUrl.QueryStringLength / sizeof(WCHAR)); - -Finished: - return hr; -} - -// static -bool -UTILITY::IsValidAttributeNameChar( - WCHAR ch -) -{ - // - // Values based on ASP.NET rendering for cookie names. RFC 2965 is not clear - // what the non-special characters are. - // - return ch == L'\t' || (ch > 31 && ch < 127); -} - -// static -bool -UTILITY::FindInMultiString( - PCWSTR pszMultiString, - PCWSTR pszStringToFind -) -{ - while (*pszMultiString != L'\0') - { - if (wcscmp(pszMultiString, pszStringToFind) == 0) - { - return TRUE; - } - pszMultiString += wcslen(pszMultiString) + 1; - } - - return FALSE; -} - -// static -bool -UTILITY::IsValidQueryStringName( - PCWSTR pszName -) -{ - while (*pszName != L'\0') - { - WCHAR c = *pszName; - if (c != L'-' && c != L'_' && c != L'+' && - c != L'.' && c != L'*' && c != L'$' && c != L'%' && c != L',' && - !iswalnum(c)) - { - return FALSE; - } - pszName++; - } - - return TRUE; -} - -// static -bool -UTILITY::IsValidHeaderName( - PCWSTR pszName -) -{ - while (*pszName != L'\0') - { - WCHAR c = *pszName; - if (c != L'-' && c != L'_' && c != L'+' && - c != L'.' && c != L'*' && c != L'$' && c != L'%' - && !iswalnum(c)) - { - return FALSE; - } - pszName++; - } - - return TRUE; -} - -HRESULT -UTILITY::IsPathUnc( - __in LPCWSTR pszPath, - __out BOOL * pfIsUnc -) -{ - HRESULT hr = S_OK; - STRU strTempPath; - - if ( pszPath == NULL || pfIsUnc == NULL ) - { - hr = E_INVALIDARG; - goto Finished; - } - - hr = MakePathCanonicalizationProof( (LPWSTR) pszPath, &strTempPath ); - if ( FAILED(hr) ) - { - goto Finished; - } - - // - // MakePathCanonicalizationProof will map \\?\UNC, \\.\UNC and \\ to \\?\UNC - // - (*pfIsUnc) = ( _wcsnicmp( strTempPath.QueryStr(), L"\\\\?\\UNC\\", 8 /* sizeof \\?\UNC\ */) == 0 ); - -Finished: - - return hr; -} - -HRESULT -UTILITY::ConvertPathToFullPath( - _In_ LPCWSTR pszPath, - _In_ LPCWSTR pszRootPath, - _Out_ STRU* pStruFullPath -) -{ - HRESULT hr = S_OK; - STRU strFileFullPath; - LPWSTR pszFullPath = NULL; - - // if relative path, prefix with root path and then convert to absolute path. - if ( PathIsRelative(pszPath) ) - { - hr = strFileFullPath.Copy(pszRootPath); - if(FAILED(hr)) - { - goto Finished; - } - - if(!strFileFullPath.EndsWith(L"\\")) - { - hr = strFileFullPath.Append(L"\\"); - if(FAILED(hr)) - { - goto Finished; - } - } - } - - hr = strFileFullPath.Append( pszPath ); - if (FAILED(hr)) - { - goto Finished; - } - - pszFullPath = new WCHAR[ strFileFullPath.QueryCCH() + 1]; - - if(_wfullpath( pszFullPath, - strFileFullPath.QueryStr(), - strFileFullPath.QueryCCH() + 1 ) == NULL ) - { - hr = HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER ); - goto Finished; - } - - // convert to canonical path - hr = MakePathCanonicalizationProof( pszFullPath, pStruFullPath ); - if (FAILED(hr)) - { - goto Finished; - } - -Finished: - - if ( pszFullPath != NULL ) - { - delete[] pszFullPath; - pszFullPath = NULL; - } - - return hr; -} - -HRESULT -UTILITY::EnsureDirectoryPathExist( - _In_ LPCWSTR pszPath -) -{ - HRESULT hr = S_OK; - STRU struPath; - DWORD dwPosition = 0; - BOOL fDone = FALSE; - BOOL fUnc = FALSE; - - struPath.Copy(pszPath); - hr = IsPathUnc(pszPath, &fUnc); - if (FAILED(hr)) - { - goto Finished; - } - if (fUnc) - { - // "\\?\UNC\" - dwPosition = 8; - } - else if (struPath.IndexOf(L'?', 0) != -1) - { - // sceanrio "\\?\" - dwPosition = 4; - } - while (!fDone) - { - dwPosition = struPath.IndexOf(L'\\', dwPosition + 1); - if (dwPosition == -1) - { - // not found '/' - fDone = TRUE; - goto Finished; - } - else if (dwPosition ==0) - { - hr = ERROR_INTERNAL_ERROR; - goto Finished; - } - else if (struPath.QueryStr()[dwPosition-1] == L':') - { - // skip volume case - continue; - } - else - { - struPath.QueryStr()[dwPosition] = L'\0'; - } - - if (!CreateDirectory(struPath.QueryStr(), NULL) && - ERROR_ALREADY_EXISTS != GetLastError()) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - fDone = TRUE; - goto Finished; - } - struPath.QueryStr()[dwPosition] = L'\\'; - } - -Finished: - return hr; -} - -BOOL -UTILITY::DirectoryExists( - _In_ STRU *pstrPath -) -{ - WIN32_FILE_ATTRIBUTE_DATA data; - - if (pstrPath->IsEmpty()) - { - return false; - } - - return GetFileAttributesExW(pstrPath->QueryStr(), GetFileExInfoStandard, &data); -} - -BOOL -UTILITY::CheckIfFileExists( - _In_ PCWSTR pszFilePath -) -{ - HANDLE hFileHandle = INVALID_HANDLE_VALUE; - SECURITY_ATTRIBUTES saAttr; - BOOL fFileExists = FALSE; - - saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); - saAttr.bInheritHandle = TRUE; - saAttr.lpSecurityDescriptor = NULL; - - hFileHandle = CreateFile(pszFilePath, - GENERIC_READ, - FILE_SHARE_READ, - &saAttr, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - - fFileExists = hFileHandle != INVALID_HANDLE_VALUE || GetLastError() == ERROR_SHARING_VIOLATION; - - if (fFileExists) - { - CloseHandle(hFileHandle); - } - - return fFileExists; -} - -VOID -UTILITY::LogEvent( - _In_ HANDLE hEventLog, - _In_ WORD dwEventInfoType, - _In_ DWORD dwEventId, - _In_ LPCWSTR pstrMsg -) -{ - if (hEventLog != NULL) - { - ReportEventW(hEventLog, - dwEventInfoType, - 0, // wCategory - dwEventId, - NULL, // lpUserSid - 1, // wNumStrings - 0, // dwDataSize, - &pstrMsg, - NULL // lpRawData - ); - } - - DebugPrintf(dwEventInfoType == EVENTLOG_ERROR_TYPE ? ASPNETCORE_DEBUG_FLAG_ERROR : ASPNETCORE_DEBUG_FLAG_INFO, "Event Log: %S", pstrMsg); -} - -VOID -UTILITY::LogEventF( - _In_ HANDLE hEventLog, - _In_ WORD dwEventInfoType, - _In_ DWORD dwEventId, - _In_ LPCWSTR pstrMsg, - ... -) -{ - va_list argsList; - va_start(argsList, pstrMsg); - - STACK_STRU ( strEventMsg, 256 ); - - if (SUCCEEDED(strEventMsg.SafeVsnwprintf( - pstrMsg, - argsList))) - { - UTILITY::LogEvent(hEventLog, - dwEventInfoType, - dwEventId, - strEventMsg.QueryStr()); - } - - va_end( argsList ); -} diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.h b/src/AspNetCoreModuleV2/CommonLib/utility.h deleted file mode 100644 index 998d8fb3d6..0000000000 --- a/src/AspNetCoreModuleV2/CommonLib/utility.h +++ /dev/null @@ -1,130 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#pragma once - -#include "stdafx.h" - -#include -#include "stringa.h" -#include "stringu.h" - -class UTILITY -{ -public: - - static - HRESULT - SplitUrl( - PCWSTR pszDestinationUrl, - BOOL *pfSecure, - STRU *pstrDestination, - STRU *pstrUrl - ); - - static - HRESULT - UnEscapeUrl( - PCWSTR pszUrl, - DWORD cchUrl, - bool fCopyQuery, - STRA * pstrResult - ); - - static - HRESULT - UnEscapeUrl( - PCWSTR pszUrl, - DWORD cchUrl, - STRU * pstrResult - ); - - static HRESULT - EscapeAbsPath( - IHttpRequest * pRequest, - STRU * strEscapedUrl - ); - - static - bool - IsValidAttributeNameChar( - WCHAR ch - ); - - static - bool - IsValidQueryStringName( - PCWSTR pszName - ); - - static - bool - IsValidHeaderName( - PCWSTR pszName - ); - - static - bool - FindInMultiString( - PCWSTR pszMultiString, - PCWSTR pszStringToFind - ); - - static - HRESULT - IsPathUnc( - __in LPCWSTR pszPath, - __out BOOL * pfIsUnc - ); - - static - HRESULT - ConvertPathToFullPath( - _In_ LPCWSTR pszPath, - _In_ LPCWSTR pszRootPath, - _Out_ STRU* pStrFullPath - ); - - static - HRESULT - EnsureDirectoryPathExist( - _In_ LPCWSTR pszPath - ); - - static - BOOL - DirectoryExists( - _In_ STRU *pstrPath - ); - - static - BOOL - CheckIfFileExists( - PCWSTR pszFilePath - ); - - static - VOID - LogEvent( - _In_ HANDLE hEventLog, - _In_ WORD dwEventInfoType, - _In_ DWORD dwEventId, - _In_ LPCWSTR pstrMsg - ); - - static - VOID - LogEventF( - _In_ HANDLE hEventLog, - _In_ WORD dwEventInfoType, - _In_ DWORD dwEventId, - __in PCWSTR pstrMsg, - ... - ); - -private: - - UTILITY() {} - ~UTILITY() {} -}; - diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 7207f745c3..b9746ff204 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -6,11 +6,11 @@ #include "hostfxroptions.h" #include "requesthandler_config.h" #include "environmentvariablehelpers.h" -#include "utility.h" #include "SRWExclusiveLock.h" #include "exceptions.h" #include "LoggingHelpers.h" #include "resources.h" +#include "EventLog.h" const LPCSTR IN_PROCESS_APPLICATION::s_exeLocationParameterName = "InProcessExeLocation"; @@ -112,16 +112,14 @@ Finished: if (FAILED(hr)) { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_WARNING_TYPE, + EventLog::Warn( ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE, ASPNETCORE_EVENT_APP_SHUTDOWN_FAILURE_MSG, m_pConfig->QueryConfigPath()->QueryStr()); } else { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, + EventLog::Info( ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL, ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL_MSG, m_pConfig->QueryConfigPath()->QueryStr()); @@ -220,8 +218,7 @@ IN_PROCESS_APPLICATION::SetCallbackHandles( // Can't check the std err handle as it isn't a critical error // Initialization complete - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, + EventLog::Info( ASPNETCORE_EVENT_INPROCESS_START_SUCCESS, ASPNETCORE_EVENT_INPROCESS_START_SUCCESS_MSG, m_pConfig->QueryApplicationPhysicalPath()->QueryStr()); @@ -361,8 +358,7 @@ Finished: { m_status = MANAGED_APPLICATION_STATUS::FAIL; - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, + EventLog::Error( ASPNETCORE_EVENT_LOAD_CLR_FALIURE, ASPNETCORE_EVENT_LOAD_CLR_FALIURE_MSG, m_pConfig->QueryApplicationPath()->QueryStr(), @@ -463,7 +459,6 @@ IN_PROCESS_APPLICATION::ExecuteApplication( m_pConfig->QueryProcessPath()->QueryStr(), m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), m_pConfig->QueryArguments()->QueryStr(), - g_hEventLog, hostFxrOptions )); @@ -527,8 +522,7 @@ IN_PROCESS_APPLICATION::LogErrorsOnMainExit( if (m_pLoggerProvider->GetStdOutContent(&straStdErrOutput)) { if (SUCCEEDED(struStdMsg.CopyA(straStdErrOutput.QueryStr()))) { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, + EventLog::Error( ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT, ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG, m_pConfig->QueryApplicationPath()->QueryStr(), @@ -539,8 +533,7 @@ IN_PROCESS_APPLICATION::LogErrorsOnMainExit( } else { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, + EventLog::Error( ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT, ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG, m_pConfig->QueryApplicationPath()->QueryStr(), diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 4fc4809b7f..781eda827c 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -231,6 +231,7 @@ + @@ -251,6 +252,7 @@ Create Create + diff --git a/src/AspNetCoreModuleV2/CommonLib/disconnectcontext.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/disconnectcontext.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/disconnectcontext.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/disconnectcontext.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp index 7df01e1ab1..d74571e953 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp @@ -2,6 +2,7 @@ #include #include +#include "exceptions.h" DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_outofprocess.dll"); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp index 8b41b72ee4..f1bcb7a2cc 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp @@ -2,6 +2,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "forwardinghandler.h" +#include "url_utility.h" // Just to be aware of the FORWARDING_HANDLER object size. C_ASSERT(sizeof(FORWARDING_HANDLER) <= 632); @@ -164,7 +165,7 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() // // parse original url // - if (FAILED(hr = UTILITY::SplitUrl(pRequest->GetRawHttpRequest()->CookedUrl.pFullUrl, + if (FAILED(hr = URL_UTILITY::SplitUrl(pRequest->GetRawHttpRequest()->CookedUrl.pFullUrl, &fSecure, &strDestination, &strUrl))) @@ -172,7 +173,7 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() goto Failure; } - if (FAILED(hr = UTILITY::EscapeAbsPath(pRequest, &struEscapedUrl))) + if (FAILED(hr = URL_UTILITY::EscapeAbsPath(pRequest, &struEscapedUrl))) { goto Failure; } @@ -870,7 +871,7 @@ FORWARDING_HANDLER::GetHeaders( // if (!pProtocol->QueryPreserveHostHeader()) { - if (FAILED(hr = UTILITY::SplitUrl(pRequest->GetRawHttpRequest()->CookedUrl.pFullUrl, + if (FAILED(hr = URL_UTILITY::SplitUrl(pRequest->GetRawHttpRequest()->CookedUrl.pFullUrl, &fSecure, &struDestination, &struUrl)) || diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp index 5619319c22..b0dd2991e2 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp @@ -2,6 +2,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "processmanager.h" +#include "EventLog.h" volatile BOOL PROCESS_MANAGER::sm_fWSAStartupDone = FALSE; @@ -194,8 +195,7 @@ PROCESS_MANAGER::GetProcess( // // rapid fails per minute exceeded, do not create new process. // - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, + EventLog::Info( ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED, ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED_MSG, pConfig->QueryRapidFailsPerMinute()); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp index 74a29edc26..03abd7fd23 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp @@ -4,6 +4,8 @@ #include "serverprocess.h" #include +#include "EventLog.h" +#include "file_utility.h" //#include //extern BOOL g_fNsiApiNotSupported; @@ -212,8 +214,7 @@ Finished: if (FAILED(hr)) { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, + EventLog::Error( ASPNETCORE_EVENT_PROCESS_START_SUCCESS, ASPNETCORE_EVENT_PROCESS_START_PORTSETUP_ERROR_MSG, m_struAppFullPath.QueryStr(), @@ -735,9 +736,7 @@ Finished: if (!strEventMsg.IsEmpty()) { - UTILITY::LogEvent( - g_hEventLog, - EVENTLOG_WARNING_TYPE, + EventLog::Warn( ASPNETCORE_EVENT_PROCESS_START_ERROR, strEventMsg.QueryStr()); } @@ -900,8 +899,7 @@ SERVER_PROCESS::StartProcess( // Backend process starts successfully. Set retry counter to 0 dwRetryCount = 0; - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, + EventLog::Info( ASPNETCORE_EVENT_PROCESS_START_SUCCESS, ASPNETCORE_EVENT_PROCESS_START_SUCCESS_MSG, m_struAppFullPath.QueryStr(), @@ -918,8 +916,7 @@ SERVER_PROCESS::StartProcess( dwRetryCount = 0; } - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_WARNING_TYPE, + EventLog::Warn( ASPNETCORE_EVENT_PROCESS_START_ERROR, ASPNETCORE_EVENT_PROCESS_START_ERROR_MSG, m_struAppFullPath.QueryStr(), @@ -963,8 +960,7 @@ Finished: m_Timer.CancelTimer(); } - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_ERROR_TYPE, + EventLog::Error( ASPNETCORE_EVENT_PROCESS_START_FAILURE, ASPNETCORE_EVENT_PROCESS_START_FAILURE_MSG, m_struAppFullPath.QueryStr(), @@ -1034,7 +1030,7 @@ SERVER_PROCESS::SetupStdHandles( m_hStdoutHandle = NULL; } - hr = UTILITY::ConvertPathToFullPath( + hr = FILE_UTILITY::ConvertPathToFullPath( m_struLogFile.QueryStr(), m_struPhysicalPath.QueryStr(), &struPath); @@ -1058,7 +1054,7 @@ SERVER_PROCESS::SetupStdHandles( goto Finished; } - hr = UTILITY::EnsureDirectoryPathExist(struPath.QueryStr()); + hr = FILE_UTILITY::EnsureDirectoryPathExist(struPath.QueryStr()); if (FAILED(hr)) { goto Finished; @@ -1100,8 +1096,7 @@ Finished: if (m_fStdoutLogEnabled) { // Log the error - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_WARNING_TYPE, + EventLog::Warn( ASPNETCORE_EVENT_CONFIG_ERROR, ASPNETCORE_EVENT_INVALID_STDOUT_LOG_FILE_MSG, m_struFullLogFile.IsEmpty()? m_struLogFile.QueryStr() : m_struFullLogFile.QueryStr(), @@ -1900,9 +1895,7 @@ SERVER_PROCESS::HandleProcessExit( VOID ) if (!fReady) { - UTILITY::LogEventF( - g_hEventLog, - EVENTLOG_INFORMATION_TYPE, + EventLog::Info( ASPNETCORE_EVENT_PROCESS_SHUTDOWN, ASPNETCORE_EVENT_PROCESS_SHUTDOWN_MSG, m_struAppFullPath.QueryStr(), @@ -2032,8 +2025,7 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID ) } // log - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, + EventLog::Info( ASPNETCORE_EVENT_SENT_SHUTDOWN_HTTP_REQUEST, ASPNETCORE_EVENT_SENT_SHUTDOWN_HTTP_REQUEST_MSG, m_dwProcessId, @@ -2150,8 +2142,7 @@ SERVER_PROCESS::TerminateBackendProcess( } // log a warning for ungraceful shutdown - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_WARNING_TYPE, + EventLog::Warn( ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE, ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE_MSG, m_dwProcessId); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h index 7cdcfa0146..83498f3057 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h @@ -55,7 +55,6 @@ // Common lib #include "requesthandler.h" -#include "utility.h" #include "application.h" #include "resources.h" #include "aspnetcore_event.h" diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp new file mode 100644 index 0000000000..c5b3a06e86 --- /dev/null +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp @@ -0,0 +1,135 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "url_utility.h" + +#include +#include "debugutil.h" + +// static +HRESULT +URL_UTILITY::SplitUrl( + PCWSTR pszDestinationUrl, + BOOL *pfSecure, + STRU *pstrDestination, + STRU *pstrUrl +) +/*++ + +Routine Description: + + Split the URL specified for forwarding into its specific components + The format of the URL looks like + http[s]://destination[:port]/path + when port is omitted, the default port for that specific protocol is used + when host is omitted, it gets the same value as the destination + +Arguments: + + pszDestinationUrl - the url to be split up + pfSecure - SSL to be used in forwarding? + pstrDestination - destination + pDestinationPort - port + pstrUrl - URL + +Return Value: + + HRESULT + +--*/ +{ + HRESULT hr; + + // + // First determine if the target is secure + // + if (_wcsnicmp(pszDestinationUrl, L"http://", 7) == 0) + { + *pfSecure = FALSE; + pszDestinationUrl += 7; + } + else if (_wcsnicmp(pszDestinationUrl, L"https://", 8) == 0) + { + *pfSecure = TRUE; + pszDestinationUrl += 8; + } + else + { + return HRESULT_FROM_WIN32(ERROR_INVALID_DATA); + } + + if (*pszDestinationUrl == L'\0') + { + return HRESULT_FROM_WIN32(ERROR_INVALID_DATA); + } + + // + // Find the 3rd slash corresponding to the url + // + LPCWSTR pszSlash = wcschr(pszDestinationUrl, L'/'); + if (pszSlash == NULL) + { + if (FAILED(hr = pstrUrl->Copy(L"/", 1)) || + FAILED(hr = pstrDestination->Copy(pszDestinationUrl))) + { + return hr; + } + } + else + { + if (FAILED(hr = pstrUrl->Copy(pszSlash)) || + FAILED(hr = pstrDestination->Copy(pszDestinationUrl, + (DWORD)(pszSlash - pszDestinationUrl)))) + { + return hr; + } + } + + return S_OK; +} + +// Change a hexadecimal digit to its numerical equivalent +#define TOHEX( ch ) \ + ((ch) > L'9' ? \ + (ch) >= L'a' ? \ + (ch) - L'a' + 10 : \ + (ch) - L'A' + 10 \ + : (ch) - L'0') + +HRESULT +URL_UTILITY::EscapeAbsPath( + IHttpRequest * pRequest, + STRU * strEscapedUrl +) +{ + HRESULT hr = S_OK; + STRU strAbsPath; + LPCWSTR pszAbsPath = NULL; + LPCWSTR pszFindStr = NULL; + + hr = strAbsPath.Copy( pRequest->GetRawHttpRequest()->CookedUrl.pAbsPath, + pRequest->GetRawHttpRequest()->CookedUrl.AbsPathLength / sizeof(WCHAR) ); + if(FAILED(hr)) + { + goto Finished; + } + + pszAbsPath = strAbsPath.QueryStr(); + pszFindStr = wcschr(pszAbsPath, L'?'); + + while(pszFindStr != NULL) + { + strEscapedUrl->Append( pszAbsPath, pszFindStr - pszAbsPath); + strEscapedUrl->Append(L"%3F"); + pszAbsPath = pszFindStr + 1; + pszFindStr = wcschr(pszAbsPath, L'?'); + } + + strEscapedUrl->Append(pszAbsPath); + strEscapedUrl->Append(pRequest->GetRawHttpRequest()->CookedUrl.pQueryString, + pRequest->GetRawHttpRequest()->CookedUrl.QueryStringLength / sizeof(WCHAR)); + +Finished: + return hr; +} + diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h new file mode 100644 index 0000000000..a096a96cf0 --- /dev/null +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h @@ -0,0 +1,30 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include "stdafx.h" + +#include +#include "stringu.h" + +class URL_UTILITY +{ +public: + + static + HRESULT + SplitUrl( + PCWSTR pszDestinationUrl, + BOOL *pfSecure, + STRU *pstrDestination, + STRU *pstrUrl + ); + + static HRESULT + EscapeAbsPath( + IHttpRequest * pRequest, + STRU * strEscapedUrl + ); +}; + diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp index 47a92d3daa..f156ec1fbc 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp @@ -13,12 +13,11 @@ HRESULT AppOfflineTrackingApplication::StartMonitoringAppOffline() if (FAILED_LOG(hr)) { - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_WARNING_TYPE, - ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR, - ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR_MSG, - m_applicationPath.c_str(), - hr); + EventLog::Warn( + ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR, + ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR_MSG, + m_applicationPath.c_str(), + hr); } return hr; @@ -58,11 +57,10 @@ void AppOfflineTrackingApplication::OnAppOffline() } LOG_INFOF("Received app_offline notification in application %S", m_applicationPath.c_str()); - UTILITY::LogEventF(g_hEventLog, - EVENTLOG_INFORMATION_TYPE, - ASPNETCORE_EVENT_RECYCLE_APPOFFLINE, - ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG, - m_applicationPath.c_str()); + EventLog::Info( + ASPNETCORE_EVENT_RECYCLE_APPOFFLINE, + ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG, + m_applicationPath.c_str()); Stop(/*fServerInitiated*/ false); } diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp index 65e70757ab..29041f7ab5 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp @@ -4,10 +4,10 @@ #include "stdafx.h" #include "FileOutputManager.h" #include "sttimer.h" -#include "utility.h" #include "exceptions.h" #include "debugutil.h" #include "SRWExclusiveLock.h" +#include "file_utility.h" FileOutputManager::FileOutputManager() : m_hLogFileHandle(INVALID_HANDLE_VALUE), @@ -82,12 +82,12 @@ FileOutputManager::Start() SECURITY_ATTRIBUTES saAttr = { 0 }; STRU struPath; - RETURN_IF_FAILED(UTILITY::ConvertPathToFullPath( + RETURN_IF_FAILED(FILE_UTILITY::ConvertPathToFullPath( m_wsStdOutLogFileName.QueryStr(), m_wsApplicationPath.QueryStr(), &struPath)); - RETURN_IF_FAILED(UTILITY::EnsureDirectoryPathExist(struPath.QueryStr())); + RETURN_IF_FAILED(FILE_UTILITY::EnsureDirectoryPathExist(struPath.QueryStr())); GetSystemTime(&systemTime); diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp index a4d7a0c57e..7c0aaccefa 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp @@ -5,6 +5,7 @@ #include "filewatcher.h" #include "debugutil.h" #include "AppOfflineTrackingApplication.h" +#include "exceptions.h" FILE_WATCHER::FILE_WATCHER() : m_hCompletionPort(NULL), diff --git a/test/CommonLibTests/hostfxr_utility_tests.cpp b/test/CommonLibTests/hostfxr_utility_tests.cpp index a8cd554ec0..7997220726 100644 --- a/test/CommonLibTests/hostfxr_utility_tests.cpp +++ b/test/CommonLibTests/hostfxr_utility_tests.cpp @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. #include "stdafx.h" +#include "file_utility.h" TEST(ParseHostFxrArguments, BasicHostFxrArguments) { @@ -12,7 +13,6 @@ TEST(ParseHostFxrArguments, BasicHostFxrArguments) L"exec \"test.dll\"", // args exeStr, // exe path L"invalid", // physical path to application - NULL, // event log &retVal, // arg count &bstrArray); // args array. @@ -33,7 +33,6 @@ TEST(ParseHostFxrArguments, NoExecProvided) L"test.dll", // args exeStr, // exe path L"ignored", // physical path to application - NULL, // event log &retVal, // arg count &bstrArray); // args array. @@ -53,7 +52,6 @@ TEST(ParseHostFxrArguments, ConvertDllToAbsolutePath) L"exec \"test.dll\"", // args exeStr, // exe path L"C:/test", // physical path to application - NULL, // event log &retVal, // arg count &bstrArray); // args array. @@ -74,7 +72,6 @@ TEST(ParseHostFxrArguments, ProvideNoArgs_InvalidArgs) L"", // args exeStr, // exe path L"ignored", // physical path to application - NULL, // event log &retVal, // arg count &bstrArray); // args array. @@ -101,11 +98,11 @@ TEST(GetAbsolutePathToDotnetFromProgramFiles, BackupWorks) if (is64Bit) { - fDotnetInProgramFiles = UTILITY::CheckIfFileExists(L"C:/Program Files/dotnet/dotnet.exe"); + fDotnetInProgramFiles = FILE_UTILITY::CheckIfFileExists(L"C:/Program Files/dotnet/dotnet.exe"); } else { - fDotnetInProgramFiles = UTILITY::CheckIfFileExists(L"C:/Program Files (x86)/dotnet/dotnet.exe"); + fDotnetInProgramFiles = FILE_UTILITY::CheckIfFileExists(L"C:/Program Files (x86)/dotnet/dotnet.exe"); } auto dotnetPath = HOSTFXR_UTILITY::GetAbsolutePathToDotnetFromProgramFiles(); @@ -127,11 +124,10 @@ TEST(GetHostFxrArguments, InvalidParams) STRU struExeLocation; HRESULT hr = HOSTFXR_UTILITY::GetHostFxrParameters( - INVALID_HANDLE_VALUE, L"bogus", // processPath L"", // application physical path, ignored. L"ignored", //arguments - NULL, // event log + NULL, &struExeLocation, &retVal, // arg count &bstrArray); // args array. diff --git a/test/CommonLibTests/stdafx.h b/test/CommonLibTests/stdafx.h index 93dffac456..4b9ac7cd27 100644 --- a/test/CommonLibTests/stdafx.h +++ b/test/CommonLibTests/stdafx.h @@ -46,7 +46,6 @@ #include "config_utility.h" #include "environmentvariablehash.h" #include "iapplication.h" -#include "utility.h" #include "debugutil.h" #include "requesthandler.h" #include "resources.h" From f1c1f82e8bdd7f479c05caf1d2f2cccdbd29333d Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 13 Aug 2018 10:32:39 -0700 Subject: [PATCH 209/363] Fix is_regular_file again (#1218) --- .../AspNetCore/AppOfflineApplication.cpp | 2 +- .../PollingAppOfflineApplication.cpp | 22 +++++++++---------- .../AspNetCore/PollingAppOfflineApplication.h | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp index 738199725e..49b2b07993 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp @@ -57,5 +57,5 @@ HRESULT AppOfflineApplication::OnAppOfflineFound() bool AppOfflineApplication::ShouldBeStarted(IHttpApplication& pApplication) { - return is_regular_file(GetAppOfflineLocation(pApplication)); + return FileExists(GetAppOfflineLocation(pApplication)); } diff --git a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp index b448a89d7a..1270319e8b 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp @@ -28,20 +28,12 @@ PollingAppOfflineApplication::CheckAppOffline() SRWExclusiveLock lock(m_statusLock); if (ulCurrentTime - m_ulLastCheckTime > c_appOfflineRefreshIntervalMS) { - try + m_fAppOfflineFound = FileExists(m_appOfflineLocation); + if(m_fAppOfflineFound) { - m_fAppOfflineFound = is_regular_file(m_appOfflineLocation); - if(m_fAppOfflineFound) - { - LOG_IF_FAILED(OnAppOfflineFound()); - } - m_ulLastCheckTime = ulCurrentTime; - } - catch (...) - { - // is_regular_file might throw in very rare cases - OBSERVE_CAUGHT_EXCEPTION(); + LOG_IF_FAILED(OnAppOfflineFound()); } + m_ulLastCheckTime = ulCurrentTime; } } @@ -56,3 +48,9 @@ std::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpA { return std::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm"; } + +bool PollingAppOfflineApplication::FileExists(const std::filesystem::path& path) +{ + std::error_code ec; + return is_regular_file(path, ec) || ec.value() == ERROR_SHARING_VIOLATION; +} diff --git a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h index 95097bb3ac..e7ec367c17 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h +++ b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h @@ -32,7 +32,7 @@ public: protected: std::filesystem::path m_appOfflineLocation; static std::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication); - + static bool FileExists(const std::filesystem::path& path); private: static const int c_appOfflineRefreshIntervalMS = 200; std::string m_strAppOfflineContent; From d72597235569ab9c38b1d05fec2ad0b8f75e0868 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 13 Aug 2018 13:02:57 -0700 Subject: [PATCH 210/363] Start adding configuration reload tests (#1212) --- .../CommonLib/debugutil.cpp | 3 +- .../IISDeployer.cs | 74 ++++++++++++------- .../Common.FunctionalTests/AppOfflineTests.cs | 39 ++-------- .../ConfigurationChangeTests.cs | 58 +++++++++++++++ .../Utilities/Helpers.cs | 66 ++++++++++++++++- 5 files changed, 176 insertions(+), 64 deletions(-) create mode 100644 test/Common.FunctionalTests/ConfigurationChangeTests.cs diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index 4e9e73a936..e31351a764 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -47,8 +47,9 @@ PrintDebugHeader() RETURN_LAST_ERROR_IF(!VerQueryValue(verData.data(), _T("\\StringFileInfo\\040904b0\\FileDescription"), &pvProductName, &iProductNameLen)); // Major, minor are stored in dwFileVersionMS field and patch, build in dwFileVersionLS field as pair of 32 bit numbers - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, "Initializing logs for %S. File Version: %d.%d.%d.%d. Description: %S", + DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, "Initializing logs for %S. ProcessId: %d. File Version: %d.%d.%d.%d. Description: %S", path, + GetCurrentProcessId(), ( verInfo->dwFileVersionMS >> 16 ) & 0xffff, ( verInfo->dwFileVersionMS >> 0 ) & 0xffff, ( verInfo->dwFileVersionLS >> 16 ) & 0xffff, diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index e257ed00a7..54efe1f3fe 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -123,47 +123,61 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS private void GetLogsFromFile() { - // Handle cases where debug file is redirected by test - var debugLogLocations = new List(); - if (IISDeploymentParameters.HandlerSettings.ContainsKey("debugFile")) + try { - debugLogLocations.Add(IISDeploymentParameters.HandlerSettings["debugFile"]); - } - if (DeploymentParameters.EnvironmentVariables.ContainsKey("ASPNETCORE_MODULE_DEBUG_FILE")) - { - debugLogLocations.Add(DeploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"]); - } - - // default debug file name - debugLogLocations.Add("aspnetcore-debug.log"); - - foreach (var debugLogLocation in debugLogLocations) - { - if (string.IsNullOrEmpty(debugLogLocation)) + // Handle cases where debug file is redirected by test + var debugLogLocations = new List(); + if (IISDeploymentParameters.HandlerSettings.ContainsKey("debugFile")) { - continue; + debugLogLocations.Add(IISDeploymentParameters.HandlerSettings["debugFile"]); } - var file = Path.Combine(DeploymentParameters.PublishedApplicationRootPath, debugLogLocation); - if (File.Exists(file)) + if (DeploymentParameters.EnvironmentVariables.ContainsKey("ASPNETCORE_MODULE_DEBUG_FILE")) { - var lines = File.ReadAllLines(file); - if (!lines.Any()) + debugLogLocations.Add(DeploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"]); + } + + // default debug file name + debugLogLocations.Add("aspnetcore-debug.log"); + + foreach (var debugLogLocation in debugLogLocations) + { + if (string.IsNullOrEmpty(debugLogLocation)) { - Logger.LogInformation("Debug log file found but was empty"); continue; } - foreach (var line in lines) + var file = Path.Combine(DeploymentParameters.PublishedApplicationRootPath, debugLogLocation); + if (File.Exists(file)) { - Logger.LogInformation(line); + var lines = File.ReadAllLines(file); + if (!lines.Any()) + { + Logger.LogInformation($"Debug log file {file} found but was empty"); + continue; + } + + foreach (var line in lines) + { + Logger.LogInformation(line); + } + return; } - return; + } + // ANCM V1 does not support logs + if (DeploymentParameters.AncmVersion == AncmVersion.AspNetCoreModuleV2) + { + throw new InvalidOperationException($"Unable to find non-empty debug log files. Tried: {string.Join(", ", debugLogLocations)}"); + } + } + finally + { + if (File.Exists(_debugLogFile)) + { + File.Delete(_debugLogFile); } } - - throw new InvalidOperationException($"Not able to find non-empty debug log files. Tried: {string.Join(", ", debugLogLocations)}"); } public void StartIIS(Uri uri, string contentRoot) @@ -339,6 +353,12 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS throw new InvalidOperationException("Site not stopped yet"); } + if (appPool.WorkerProcesses.Any(wp => wp.State == WorkerProcessState.Running || + wp.State == WorkerProcessState.Stopping)) + { + throw new InvalidOperationException("WorkerProcess not stopped yet"); + } + if (!HostProcess.HasExited) { throw new InvalidOperationException("Site is stopped but host process is not"); diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/test/Common.FunctionalTests/AppOfflineTests.cs index 3e1580fcb9..41bf8874d9 100644 --- a/test/Common.FunctionalTests/AppOfflineTests.cs +++ b/test/Common.FunctionalTests/AppOfflineTests.cs @@ -82,7 +82,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests } [ConditionalFact] - [RequiresIIS(IISCapability.ShutdownToken)] public async Task AppOfflineDroppedWhileSiteFailedToStartInRequestHandler_SiteStops_InProcess() { var deploymentResult = await DeployApp(HostingModel.InProcess); @@ -95,7 +94,8 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests Assert.Contains("500.30", await result.Content.ReadAsStringAsync()); AddAppOffline(deploymentResult.ContentRoot); - AssertStopsProcess(deploymentResult); + + await deploymentResult.AssertRecycledAsync(() => AssertAppOffline(deploymentResult)); } [ConditionalFact] @@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests } catch { - AssertStopsProcess(deploymentResult); + deploymentResult.AssertWorkerProcessStop(); return; } } @@ -139,18 +139,16 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests } [ConditionalFact] - [RequiresIIS(IISCapability.ShutdownToken)] public async Task AppOfflineDroppedWhileSiteRunning_SiteShutsDown_InProcess() { var deploymentResult = await AssertStarts(HostingModel.InProcess); AddAppOffline(deploymentResult.ContentRoot); - AssertStopsProcess(deploymentResult); + await deploymentResult.AssertRecycledAsync(() => AssertAppOffline(deploymentResult)); } [ConditionalFact] - [RequiresIIS(IISCapability.ShutdownToken)] public async Task AppOfflineDroppedWhileSiteRunning_SiteShutsDown_OutOfProcess() { var deploymentResult = await AssertStarts(HostingModel.OutOfProcess); @@ -245,28 +243,10 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests private async Task AssertAppOffline(IISDeploymentResult deploymentResult, string expectedResponse = "The app is offline.") { - HttpResponseMessage response = null; - - for (var i = 0; i < 5 && response?.StatusCode != HttpStatusCode.ServiceUnavailable; i++) - { - // Keep retrying until app_offline is present. - response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); - await Task.Delay(RetryDelay); - } - - Assert.Equal(HttpStatusCode.ServiceUnavailable, response.StatusCode); - + var response = await deploymentResult.HttpClient.RetryRequestAsync("HelloWorld", r => r.StatusCode == HttpStatusCode.ServiceUnavailable); Assert.Equal(expectedResponse, await response.Content.ReadAsStringAsync()); } - private void AssertStopsProcess(IISDeploymentResult deploymentResult) - { - var hostShutdownToken = deploymentResult.HostShutdownToken; - - Assert.True(hostShutdownToken.WaitHandle.WaitOne(TimeoutExtensions.DefaultTimeout)); - Assert.True(hostShutdownToken.IsCancellationRequested); - } - private async Task AssertStarts(HostingModel hostingModel) { var deploymentResult = await DeployApp(hostingModel); @@ -278,14 +258,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests private static async Task AssertRunning(IISDeploymentResult deploymentResult) { - HttpResponseMessage response = null; - - for (var i = 0; i < 5 && response?.IsSuccessStatusCode != true; i++) - { - response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); - await Task.Delay(RetryDelay); - } - + var response = await deploymentResult.HttpClient.RetryRequestAsync("HelloWorld", r => r.IsSuccessStatusCode); var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal("Hello World", responseText); } diff --git a/test/Common.FunctionalTests/ConfigurationChangeTests.cs b/test/Common.FunctionalTests/ConfigurationChangeTests.cs new file mode 100644 index 0000000000..b809bf42ca --- /dev/null +++ b/test/Common.FunctionalTests/ConfigurationChangeTests.cs @@ -0,0 +1,58 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class ConfigurationChangeTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public ConfigurationChangeTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task ConfigurationChangeStopsInProcess() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.InProcess, publish: true); + + var deploymentResult = await DeployAsync(deploymentParameters); + + await deploymentResult.AssertStarts(); + + // Just "touching" web.config should be enough + deploymentResult.ModifyWebConfig(element => {}); + + await deploymentResult.AssertRecycledAsync(); + } + + [ConditionalTheory] + [InlineData(AncmVersion.AspNetCoreModule)] + [InlineData(AncmVersion.AspNetCoreModuleV2)] + public async Task ConfigurationChangeForcesChildProcessRestart(AncmVersion version) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); + deploymentParameters.AncmVersion = version; + + var deploymentResult = await DeployAsync(deploymentParameters); + + var processBefore = await deploymentResult.HttpClient.GetStringAsync("/ProcessId"); + + // Just "touching" web.config should be enough + deploymentResult.ModifyWebConfig(element => {}); + + // Have to retry here to allow ANCM to receive notification and react to it + // Verify that worker process gets restarted with new process id + await deploymentResult.HttpClient.RetryRequestAsync("/ProcessId", async r => await r.Content.ReadAsStringAsync() != processBefore); + } + } +} diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 2781da1944..30c597a111 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Net.Http; using System.Threading.Tasks; using System.Xml.Linq; @@ -18,6 +17,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public static class Helpers { + private static readonly TimeSpan RetryRequestDelay = TimeSpan.FromMilliseconds(100); + private static readonly int RetryRequestCount = 5; + public static string GetTestWebSitePath(string name) { return Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"),"test", "WebSites", name); @@ -26,9 +28,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string GetInProcessTestSitesPath() => GetTestWebSitePath("InProcessWebSite"); public static string GetOutOfProcessTestSitesPath() => GetTestWebSitePath("OutOfProcessWebSite"); - - public static async Task AssertStarts(IISDeploymentResult deploymentResult, string path = "/HelloWorld") + public static async Task AssertStarts(this IISDeploymentResult deploymentResult, string path = "/HelloWorld") { var response = await deploymentResult.HttpClient.GetAsync(path); @@ -73,5 +74,64 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests fileInfo.CopyTo(destFileName); } } + + public static void ModifyWebConfig(this DeploymentResult deploymentResult, Action action) + { + var webConfigPath = Path.Combine(deploymentResult.ContentRoot, "web.config"); + var document = XDocument.Load(webConfigPath); + + document.Save(webConfigPath); + } + + public static Task RetryRequestAsync(this HttpClient client, string uri, Func predicate) + { + return RetryRequestAsync(client, uri, message => Task.FromResult(predicate(message))); + } + + public static async Task RetryRequestAsync(this HttpClient client, string uri, Func> predicate) + { + HttpResponseMessage response = await client.GetAsync(uri); + + for (var i = 0; i < RetryRequestCount && !await predicate(response); i++) + { + // Keep retrying until app_offline is present. + response = await client.GetAsync(uri); + await Task.Delay(RetryRequestDelay); + } + + if (!await predicate(response)) + { + throw new InvalidOperationException($"Didn't get response that satisfies predicate after {RetryRequestCount} retries"); + } + + return response; + } + + public static void AssertWorkerProcessStop(this IISDeploymentResult deploymentResult) + { + var hostProcess = deploymentResult.HostProcess; + Assert.True(hostProcess.WaitForExit((int)TimeoutExtensions.DefaultTimeout.TotalMilliseconds)); + + if (deploymentResult.DeploymentParameters.ServerType == ServerType.IISExpress) + { + Assert.Equal(0, hostProcess.ExitCode); + } + } + + + public static async Task AssertRecycledAsync(this IISDeploymentResult deploymentResult, Func verificationAction = null) + { + if (deploymentResult.DeploymentParameters.HostingModel != HostingModel.InProcess) + { + throw new NotSupportedException(); + } + + deploymentResult.AssertWorkerProcessStop(); + if (deploymentResult.DeploymentParameters.ServerType == ServerType.IIS) + { + verificationAction = verificationAction ?? (() => deploymentResult.AssertStarts()); + await verificationAction(); + } + } } } From 110fea288b7a6ae3cd0489c2f84d9775d23bb58f Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 14 Aug 2018 11:39:25 -0700 Subject: [PATCH 211/363] Produce a stress test app (#1228) --- build/repo.props | 1 + build/repo.targets | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/build/repo.props b/build/repo.props index ba3cca9388..c1b78ebabd 100644 --- a/build/repo.props +++ b/build/repo.props @@ -4,6 +4,7 @@ Microsoft $(BuildDir)AspNetCoreModule.zip + $(BuildDir)StressTestWebSite.zip diff --git a/build/repo.targets b/build/repo.targets index 4415123011..442b4b4db0 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -4,7 +4,7 @@ $(PrepareDependsOn) $(GetArtifactInfoDependsOn);GetNativeArtifactsInfo BuildNativeAssets;$(CompileDependsOn) - $(PackageDependsOn);PackageNativeProjects + $(PackageDependsOn);PackageNativeProjects;PackageStressTestApp $(TestDependsOn);RunNativeTest $(RepositoryRoot)NuGetPackageVerifier.xplat.json $(RepositoryRoot)src\ @@ -14,7 +14,7 @@ - + @@ -110,4 +110,26 @@ + + + + $(MSBuildThisFileDirectory)..\test\WebSites\StressTestWebSite\ + $(StressAppBasePath)bin\published\ + + + + + + + + + + + From 8dbe56426333c908a3b7263557aa43fba585f6b9 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 14 Aug 2018 12:24:49 -0700 Subject: [PATCH 212/363] Add commit hash to V1 description (#1229) --- src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc b/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc index 19f29cbbaf..6d771d50bd 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc +++ b/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc @@ -9,6 +9,8 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#define FileDescription "IIS AspNetCore Module. Commit: " CommitHash + ///////////////////////////////////////////////////////////////////////////// // // 11 @@ -74,7 +76,7 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Microsoft" - VALUE "FileDescription", "IIS ASP.NET Core Module" + VALUE "FileDescription", FileDescription VALUE "FileVersion", FileVersionStr VALUE "InternalName", "aspnetcore.dll" VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation" From 0d91dde2704f9a0f272453bccb55e5bb54f7fa1a Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 14 Aug 2018 12:32:39 -0700 Subject: [PATCH 213/363] Dynamically link ucrt for release builds (#1230) --- src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj | 2 ++ src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj | 2 ++ src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj | 2 ++ .../InProcessRequestHandler/InProcessRequestHandler.vcxproj | 2 ++ .../OutOfProcessRequestHandler.vcxproj | 2 ++ .../RequestHandlerLib/RequestHandlerLib.vcxproj | 2 ++ test/CommonLibTests/CommonLibTests.vcxproj | 2 ++ 7 files changed, 14 insertions(+) diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index ef86d5ed6b..9663eb06ce 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -176,6 +176,7 @@ Windows false true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true Source.def kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib @@ -215,6 +216,7 @@ Windows false true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true Source.def kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index f9903b2d38..12e6ff1691 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -155,6 +155,7 @@ Windows true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true true @@ -184,6 +185,7 @@ Windows true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true true diff --git a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index 96b722d328..8a78b19664 100644 --- a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -137,6 +137,7 @@ Windows true true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true @@ -159,6 +160,7 @@ Windows true true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 0365f219d9..08e3b32bd3 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -179,6 +179,7 @@ Windows false true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true Source.def kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib @@ -215,6 +216,7 @@ Windows false true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true Source.def kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 781eda827c..2da0550413 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -179,6 +179,7 @@ Windows false true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true Source.def kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib @@ -215,6 +216,7 @@ Windows false true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true Source.def kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj index 8b1b24631e..56025b071a 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -152,6 +152,7 @@ Windows true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true true @@ -180,6 +181,7 @@ Windows true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true true diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index d549a5679d..ef1cf020d5 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -152,6 +152,7 @@ true Console + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; @@ -179,6 +180,7 @@ true Console + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; From 1104564797e6b9bf97a1beb0d59ee0770d4015fb Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 14 Aug 2018 15:08:20 -0700 Subject: [PATCH 214/363] Throw when web config action is added without publish (#1234) --- .../IISDeployer.cs | 33 ++++--- .../IISDeployerBase.cs | 85 ++++++++++++++----- .../IISDeploymentParameters.cs | 56 +----------- .../IISExpressDeployer.cs | 65 ++++++++------ 4 files changed, 120 insertions(+), 119 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 54efe1f3fe..ca0ced4218 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -87,22 +87,9 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS IISDeploymentParameters.HandlerSettings["debugFile"] = _debugLogFile; } - if (DeploymentParameters.ApplicationType == ApplicationType.Portable) - { - DefaultWebConfigActions.Add( - WebConfigHelpers.AddOrModifyAspNetCoreSection( - "processPath", - DotNetCommands.GetDotNetExecutable(DeploymentParameters.RuntimeArchitecture))); - } - - DotnetPublish(); var contentRoot = DeploymentParameters.PublishedApplicationRootPath; - DefaultWebConfigActions.Add(WebConfigHelpers.AddOrModifyHandlerSection( - key: "modules", - value: DeploymentParameters.AncmVersion.ToString())); - RunWebConfigActions(contentRoot); var uri = TestUriHelper.BuildTestUri(ServerType.IIS, DeploymentParameters.ApplicationBaseUriHint); @@ -121,6 +108,26 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } } + protected override IEnumerable> GetWebConfigActions() + { + if (DeploymentParameters.ApplicationType == ApplicationType.Portable) + { + yield return WebConfigHelpers.AddOrModifyAspNetCoreSection( + "processPath", + DotNetCommands.GetDotNetExecutable(DeploymentParameters.RuntimeArchitecture)); + } + + yield return WebConfigHelpers.AddOrModifyHandlerSection( + key: "modules", + value: DeploymentParameters.AncmVersion.ToString()); + + + foreach (var action in base.GetWebConfigActions()) + { + yield return action; + } + } + private void GetLogsFromFile() { try diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs index f511f9f5f1..614d68b145 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs @@ -16,18 +16,20 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { public IISDeploymentParameters IISDeploymentParameters { get; } - protected List> DefaultWebConfigActions { get; } = new List>(); - - protected List> DefaultServerConfigActions { get; } = new List>(); - public IISDeployerBase(IISDeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) : base(deploymentParameters, loggerFactory) { IISDeploymentParameters = deploymentParameters; } - public void RunWebConfigActions(string contentRoot) + protected void RunWebConfigActions(string contentRoot) { + var actions = GetWebConfigActions(); + if (!actions.Any()) + { + return; + } + if (!DeploymentParameters.PublishApplicationBeforeDeployment) { throw new InvalidOperationException("Cannot modify web.config file if no published output."); @@ -36,37 +38,46 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS var path = Path.Combine(DeploymentParameters.PublishedApplicationRootPath, "web.config"); var webconfig = XDocument.Load(path); - foreach (var action in DefaultWebConfigActions) + foreach (var action in actions) { action.Invoke(webconfig.Root, contentRoot); } - if (IISDeploymentParameters != null) - { - foreach (var action in IISDeploymentParameters.WebConfigActionList) - { - action.Invoke(webconfig.Root, contentRoot); - } - } - webconfig.Save(path); } + protected virtual IEnumerable> GetWebConfigActions() + { + if (IISDeploymentParameters.HandlerSettings.Any()) + { + yield return AddHandlerSettings; + } + + if (IISDeploymentParameters.WebConfigBasedEnvironmentVariables.Any()) + { + yield return AddWebConfigEnvironmentVariables; + } + + foreach (var action in IISDeploymentParameters.WebConfigActionList) + { + yield return action; + } + } + + protected virtual IEnumerable> GetServerConfigActions() + { + foreach (var action in IISDeploymentParameters.ServerConfigActionList) + { + yield return action; + } + } public void RunServerConfigActions(XElement config, string contentRoot) { - foreach (var action in DefaultServerConfigActions) + foreach (var action in GetServerConfigActions()) { action.Invoke(config, contentRoot); } - - if (IISDeploymentParameters != null) - { - foreach (var action in IISDeploymentParameters.ServerConfigActionList) - { - action.Invoke(config, contentRoot); - } - } } protected string GetAncmLocation(AncmVersion version) @@ -85,5 +96,33 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS return ancmFile; } + + private void AddWebConfigEnvironmentVariables(XElement element, string contentRoot) + { + var environmentVariables = element + .RequiredElement("system.webServer") + .RequiredElement("aspNetCore") + .GetOrAdd("environmentVariables"); + + foreach (var envVar in IISDeploymentParameters.WebConfigBasedEnvironmentVariables) + { + environmentVariables.GetOrAdd("environmentVariable", "name", envVar.Key) + .SetAttributeValue("value", envVar.Value); + } + } + + private void AddHandlerSettings(XElement element, string contentRoot) + { + var handlerSettings = element + .RequiredElement("system.webServer") + .RequiredElement("aspNetCore") + .GetOrAdd("handlerSettings"); + + foreach (var handlerSetting in IISDeploymentParameters.HandlerSettings) + { + handlerSettings.GetOrAdd("handlerSetting", "name", handlerSetting.Key) + .SetAttributeValue("value", handlerSetting.Value); + } + } } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs index fc8fd99efc..30e3f13c25 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs @@ -11,13 +11,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { public IISDeploymentParameters() : base() { - WebConfigActionList = CreateDefaultWebConfigActionList(); } public IISDeploymentParameters(TestVariant variant) : base(variant) { - WebConfigActionList = CreateDefaultWebConfigActionList(); } public IISDeploymentParameters( @@ -27,14 +25,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS RuntimeArchitecture runtimeArchitecture) : base(applicationPath, serverType, runtimeFlavor, runtimeArchitecture) { - WebConfigActionList = CreateDefaultWebConfigActionList(); } public IISDeploymentParameters(DeploymentParameters parameters) : base(parameters) { - WebConfigActionList = CreateDefaultWebConfigActionList(); - if (parameters is IISDeploymentParameters) { var tempParameters = (IISDeploymentParameters)parameters; @@ -46,12 +41,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } } - private IList> CreateDefaultWebConfigActionList() - { - return new List>() { AddWebConfigEnvironmentVariables(), AddHandlerSettings() }; - } - - public IList> WebConfigActionList { get; } + public IList> WebConfigActionList { get; } = new List>(); public IList> ServerConfigActionList { get; } = new List>(); @@ -61,49 +51,5 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS public bool GracefulShutdown { get; set; } - private Action AddWebConfigEnvironmentVariables() - { - return (element, _) => - { - if (WebConfigBasedEnvironmentVariables.Count == 0) - { - return; - } - - var environmentVariables = element - .RequiredElement("system.webServer") - .RequiredElement("aspNetCore") - .GetOrAdd("environmentVariables"); - - - foreach (var envVar in WebConfigBasedEnvironmentVariables) - { - environmentVariables.GetOrAdd("environmentVariable", "name", envVar.Key) - .SetAttributeValue("value", envVar.Value); - } - }; - } - - private Action AddHandlerSettings() - { - return (element, _) => - { - if (HandlerSettings.Count == 0) - { - return; - } - - var handlerSettings = element - .RequiredElement("system.webServer") - .RequiredElement("aspNetCore") - .GetOrAdd("handlerSettings"); - - foreach (var handlerSetting in HandlerSettings) - { - handlerSettings.GetOrAdd("handlerSetting", "name", handlerSetting.Key) - .SetAttributeValue("value", handlerSetting.Value); - } - }; - } } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index cd1fbc69f2..c1bc7a26e1 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.IO; @@ -281,17 +282,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS if (DeploymentParameters.PublishApplicationBeforeDeployment) { - // For published apps, prefer the content in the web.config, but update it. - DefaultWebConfigActions.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection( - key: "hostingModel", - value: DeploymentParameters.HostingModel == HostingModel.InProcess ? "inprocess" : "")); - - DefaultWebConfigActions.Add(WebConfigHelpers.AddOrModifyHandlerSection( - key: "modules", - value: DeploymentParameters.AncmVersion.ToString())); - ModifyDotNetExePathInWebConfig(); serverConfig = RemoveRedundantElements(serverConfig); - RunWebConfigActions(contentRoot); } else { @@ -300,6 +291,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS serverConfig = ReplacePlaceholder(serverConfig, "[AspNetCoreModule]", DeploymentParameters.AncmVersion.ToString()); } + RunWebConfigActions(contentRoot); + var config = XDocument.Parse(serverConfig); RunServerConfigActions(config.Root, contentRoot); serverConfig = config.ToString(); @@ -320,6 +313,40 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS return content; } + protected override IEnumerable> GetWebConfigActions() + { + if (IISDeploymentParameters.PublishApplicationBeforeDeployment) + { + // For published apps, prefer the content in the web.config, but update it. + yield return WebConfigHelpers.AddOrModifyAspNetCoreSection( + key: "hostingModel", + value: DeploymentParameters.HostingModel == HostingModel.InProcess ? "inprocess" : ""); + + yield return WebConfigHelpers.AddOrModifyHandlerSection( + key: "modules", + value: DeploymentParameters.AncmVersion.ToString()); + + // We assume the x64 dotnet.exe is on the path so we need to provide an absolute path for x86 scenarios. + // Only do it for scenarios that rely on dotnet.exe (Core, portable, etc.). + if (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr + && DeploymentParameters.ApplicationType == ApplicationType.Portable + && DotNetCommands.IsRunningX86OnX64(DeploymentParameters.RuntimeArchitecture)) + { + var executableName = DotNetCommands.GetDotNetExecutable(DeploymentParameters.RuntimeArchitecture); + if (!File.Exists(executableName)) + { + throw new Exception($"Unable to find '{executableName}'.'"); + } + yield return WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", executableName); + } + } + + foreach (var action in base.GetWebConfigActions()) + { + yield return action; + } + } + private string ModifyANCMPathInConfig(string replaceFlag, AncmVersion version, string serverConfig) { if (serverConfig.Contains(replaceFlag)) @@ -451,24 +478,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } } - private void ModifyDotNetExePathInWebConfig() - { - // We assume the x64 dotnet.exe is on the path so we need to provide an absolute path for x86 scenarios. - // Only do it for scenarios that rely on dotnet.exe (Core, portable, etc.). - if (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr - && DeploymentParameters.ApplicationType == ApplicationType.Portable - && DotNetCommands.IsRunningX86OnX64(DeploymentParameters.RuntimeArchitecture)) - { - var executableName = DotNetCommands.GetDotNetExecutable(DeploymentParameters.RuntimeArchitecture); - if (!File.Exists(executableName)) - { - throw new Exception($"Unable to find '{executableName}'.'"); - } - DefaultWebConfigActions.Add( - WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", executableName)); - } - } - // These elements are duplicated in the web.config if you publish. Remove them from the host.config. private string RemoveRedundantElements(string serverConfig) { From 13281620521e5bab9313fbc04ae05f6bcf790345 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 14 Aug 2018 16:53:13 -0700 Subject: [PATCH 215/363] Remove early dereference of ASPNETCORE_PORT env var (#1225) - Addresses #1119 - Includes workaround for #1237 --- .../AspNetCore/src/serverprocess.cxx | 1 - .../OutOfProcess/AspNetCorePortTests.cs | 94 +++++++++++++++++++ test/WebSites/OutOfProcessWebSite/Startup.cs | 10 ++ 3 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx b/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx index 4caf8cd3a3..76da27a99b 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx +++ b/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx @@ -132,7 +132,6 @@ SERVER_PROCESS::SetupListenPort( pEnvironmentVarTable->FindKey(ASPNETCORE_PORT_ENV_STR, &pEntry); if (pEntry != NULL) { - pEntry->Dereference(); if (pEntry->QueryValue() != NULL || pEntry->QueryValue()[0] != L'\0') { m_dwPort = (DWORD)_wtoi(pEntry->QueryValue()); diff --git a/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs b/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs new file mode 100644 index 0000000000..e4c281c467 --- /dev/null +++ b/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs @@ -0,0 +1,94 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Net; +using System.Net.Sockets; +using System.Threading.Tasks; +using Xunit; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class AspNetCorePortTests : IISFunctionalTestBase + { + private static readonly Random _random = new Random(); + + private readonly PublishedSitesFixture _fixture; + + public AspNetCorePortTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22) + .WithApplicationTypes(ApplicationType.Portable) + .WithAllAncmVersions(); + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task EnvVarInWebConfig(TestVariant variant) + { + // Must publish to set env vars in web.config + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + + // Workaround "PublishedSitesFixture.GetBaseDeploymentParameters() overrides too many properties of baseParameters" + // https://github.com/aspnet/IISIntegration/issues/1237 + deploymentParameters.AncmVersion = variant.AncmVersion; + + var port = GetUnusedRandomPort(); + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_PORT"] = port.ToString(); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/ServerAddresses"); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(port, new Uri(responseText).Port); + } + + private static int GetUnusedRandomPort() + { + // Port range allowed by ANCM config + const int minPort = 1025; + const int maxPort = 48000; + + // Large number of retries to prevent test failures due to port collisions, but not infinite + // to prevent infinite loop in case Bind() fails repeatedly for some other reason. + const int retries = 100; + + List exceptions = null; + + for (var i = 0; i < retries; i++) + { + var port = _random.Next(minPort, maxPort); + + using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + try + { + socket.Bind(new IPEndPoint(IPAddress.Loopback, port)); + return port; + } + catch (Exception e) + { + // Bind failed, most likely because port is in use. Save exception and retry. + if (exceptions == null) + { + exceptions = new List(retries); + } + exceptions.Add(e); + } + } + } + + throw new AggregateException($"Unable to find unused random port after {retries} retries.", exceptions); + } + } +} diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/test/WebSites/OutOfProcessWebSite/Startup.cs index 059b5a1264..8a8358d364 100644 --- a/test/WebSites/OutOfProcessWebSite/Startup.cs +++ b/test/WebSites/OutOfProcessWebSite/Startup.cs @@ -11,6 +11,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.IISIntegration.FunctionalTests; @@ -22,9 +23,13 @@ namespace TestSites { public class Startup { + private IServerAddressesFeature _serverAddresses; + public void Configure(IApplicationBuilder app) { TestStartup.Register(app, this); + + _serverAddresses = app.ServerFeatures.Get(); } public Task Path(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Request.Path.Value); @@ -120,5 +125,10 @@ namespace TestSites { await context.Response.WriteAsync(Process.GetCurrentProcess().Id.ToString()); } + + private async Task ServerAddresses(HttpContext context) + { + await context.Response.WriteAsync(string.Join(",", _serverAddresses.Addresses)); + } } } From 3e00887c2f7138932e13612fe35369d2c3505b5f Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 15 Aug 2018 12:13:25 -0700 Subject: [PATCH 216/363] Call StopServer before checking all event logs (#1242) --- test/Common.FunctionalTests/Inprocess/EventLogTests.cs | 4 ++-- test/Common.FunctionalTests/MultiApplicationTests.cs | 4 ++-- test/Common.FunctionalTests/Utilities/EventLogHelpers.cs | 5 ++++- test/IISExpress.FunctionalTests/InProcess/StartupTests.cs | 8 ++++++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs index d8353181d3..3139f3b251 100644 --- a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs +++ b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); - EventLogHelpers.VerifyEventLogEvent(TestSink, "Application '.+' started the coreclr in-process successfully."); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Application '.+' started the coreclr in-process successfully."); } [ConditionalFact] @@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); - EventLogHelpers.VerifyEventLogEvent(TestSink, "Application '.+' has shutdown."); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Application '.+' has shutdown."); } } } diff --git a/test/Common.FunctionalTests/MultiApplicationTests.cs b/test/Common.FunctionalTests/MultiApplicationTests.cs index df9bb035f9..a91dfa4d76 100644 --- a/test/Common.FunctionalTests/MultiApplicationTests.cs +++ b/test/Common.FunctionalTests/MultiApplicationTests.cs @@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(200, (int)result1.StatusCode); Assert.Equal(500, (int)result2.StatusCode); StopServer(); - EventLogHelpers.VerifyEventLogEvent(TestSink, "Only one inprocess application is allowed per IIS application pool"); + EventLogHelpers.VerifyEventLogEvent(result, TestSink, "Only one inprocess application is allowed per IIS application pool"); } [ConditionalTheory] @@ -70,7 +70,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(200, (int)result1.StatusCode); Assert.Equal(500, (int)result2.StatusCode); StopServer(); - EventLogHelpers.VerifyEventLogEvent(TestSink, "Mixed hosting model is not supported."); + EventLogHelpers.VerifyEventLogEvent(result, TestSink, "Mixed hosting model is not supported."); } private void SetHostingModel(string directory, HostingModel model) diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index 7729b4359b..9d8d79fb6c 100644 --- a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Text.RegularExpressions; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.Logging.Testing; using Xunit; @@ -9,8 +10,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class EventLogHelpers { - public static void VerifyEventLogEvent(ITestSink testSink, string expectedRegexMatchString) + public static void VerifyEventLogEvent(IISDeploymentResult deploymentResult, ITestSink testSink, string expectedRegexMatchString) { + Assert.True(deploymentResult.HostProcess.HasExited); + var eventLogRegex = new Regex($"Event Log: {expectedRegexMatchString}"); int count = 0; diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 89c17d8492..e6b48f28bf 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -55,7 +55,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); - EventLogHelpers.VerifyEventLogEvent(TestSink, @"Invalid or unknown processPath provided in web\.config: processPath = '.+', ErrorCode = '0x80070002'\."); + StopServer(); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, @"Invalid or unknown processPath provided in web\.config: processPath = '.+', ErrorCode = '0x80070002'\."); } [ConditionalFact] @@ -158,7 +160,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); - EventLogHelpers.VerifyEventLogEvent(TestSink, "Unknown hosting model 'bogus'. Please specify either hostingModel=\"inprocess\" or hostingModel=\"outofprocess\" in the web.config file."); + StopServer(); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Unknown hosting model 'bogus'. Please specify either hostingModel=\"inprocess\" or hostingModel=\"outofprocess\" in the web.config file."); } } } From 60ca38ab567655ea03eb41956472fd5f49076011 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 15 Aug 2018 12:15:21 -0700 Subject: [PATCH 217/363] Fix deployment parameters override (#1241) --- .../Http.config | 10 +- .../IISDeployer.cs | 25 +- .../IISDeployerBase.cs | 25 + .../IISExpressDeployer.cs | 92 +- .../AppHostConfig/IISExpress.config | 1035 ----------------- .../OutOfProcess/AspNetCorePortTests.cs | 5 - .../OutOfProcess/HelloWorldTest.cs | 17 +- .../PublishedSitesFixture.cs | 9 +- .../Utilities/FunctionalTestsBase.cs | 5 - 9 files changed, 87 insertions(+), 1136 deletions(-) delete mode 100644 test/Common.FunctionalTests/AppHostConfig/IISExpress.config diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config index 4508dea843..8c74496e12 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config @@ -176,9 +176,6 @@ - - - @@ -255,8 +252,6 @@ - - @@ -931,11 +926,8 @@ - - - @@ -1031,4 +1023,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index ca0ced4218..d2df4a8f8c 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -276,32 +276,13 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS private void ConfigureAppHostConfig(XElement config, string contentRoot, int port) { - var siteElement = config - .RequiredElement("system.applicationHost") - .RequiredElement("sites") - .RequiredElement("site"); - - siteElement - .RequiredElement("application") - .RequiredElement("virtualDirectory") - .SetAttributeValue("physicalPath", contentRoot); - - siteElement - .RequiredElement("bindings") - .RequiredElement("binding") - .SetAttributeValue("bindingInformation", $"*:{port}:"); - - var ancmVersion = DeploymentParameters.AncmVersion.ToString(); - config - .RequiredElement("system.webServer") - .RequiredElement("globalModules") - .GetOrAdd("add", "name", ancmVersion) - .SetAttributeValue("image", GetAncmLocation(DeploymentParameters.AncmVersion)); + ConfigureModuleAndBinding(config, contentRoot, port); + // In IISExpress system.webServer/modules in under location element config .RequiredElement("system.webServer") .RequiredElement("modules") - .GetOrAdd("add", "name", ancmVersion); + .GetOrAdd("add", "name", DeploymentParameters.AncmVersion.ToString()); var pool = config .RequiredElement("system.applicationHost") diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs index 614d68b145..5e6aabdadb 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs @@ -124,5 +124,30 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS .SetAttributeValue("value", handlerSetting.Value); } } + + protected void ConfigureModuleAndBinding(XElement config, string contentRoot, int port) + { + var siteElement = config + .RequiredElement("system.applicationHost") + .RequiredElement("sites") + .RequiredElement("site"); + + siteElement + .RequiredElement("application") + .RequiredElement("virtualDirectory") + .SetAttributeValue("physicalPath", contentRoot); + + siteElement + .RequiredElement("bindings") + .RequiredElement("binding") + .SetAttributeValue("bindingInformation", $":{port}:localhost"); + + var ancmVersion = DeploymentParameters.AncmVersion.ToString(); + config + .RequiredElement("system.webServer") + .RequiredElement("globalModules") + .GetOrAdd("add", "name", ancmVersion) + .SetAttributeValue("image", GetAncmLocation(DeploymentParameters.AncmVersion)); + } } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index c1bc7a26e1..fd2aca9b4c 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -91,6 +91,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS DeploymentParameters.EnvironmentVariables["ASPNETCORE_CONTENTROOT"] = DeploymentParameters.ApplicationPath; } + RunWebConfigActions(contentRoot); + var testUri = TestUriHelper.BuildTestUri(ServerType.IISExpress, DeploymentParameters.ApplicationBaseUriHint); // Launch the host process. @@ -260,40 +262,35 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS private void PrepareConfig(string contentRoot, int port) { + var serverConfig = DeploymentParameters.ServerConfigTemplateContent;; // Config is required. If not present then fall back to one we carry with us. - if (string.IsNullOrEmpty(DeploymentParameters.ServerConfigTemplateContent)) + if (string.IsNullOrEmpty(serverConfig)) { using (var stream = GetType().Assembly.GetManifestResourceStream("Microsoft.AspNetCore.Server.IntegrationTesting.IIS.Http.config")) using (var reader = new StreamReader(stream)) { - DeploymentParameters.ServerConfigTemplateContent = reader.ReadToEnd(); + serverConfig = reader.ReadToEnd(); } } - var serverConfig = DeploymentParameters.ServerConfigTemplateContent; - + XDocument config = XDocument.Parse(serverConfig); // Pass on the applicationhost.config to iis express. With this don't need to pass in the /path /port switches as they are in the applicationHost.config // We take a copy of the original specified applicationHost.Config to prevent modifying the one in the repo. - serverConfig = ModifyANCMPathInConfig(replaceFlag: "[ANCMPath]", AncmVersion.AspNetCoreModule, serverConfig); - serverConfig = ModifyANCMPathInConfig(replaceFlag: "[ANCMV2Path]", AncmVersion.AspNetCoreModuleV2, serverConfig); - serverConfig = ReplacePlaceholder(serverConfig, "[PORT]", port.ToString(CultureInfo.InvariantCulture)); - serverConfig = ReplacePlaceholder(serverConfig, "[ApplicationPhysicalPath]", contentRoot); + config.Root + .RequiredElement("location") + .RequiredElement("system.webServer") + .RequiredElement("modules") + .GetOrAdd("add", "name", DeploymentParameters.AncmVersion.ToString()); - if (DeploymentParameters.PublishApplicationBeforeDeployment) - { - serverConfig = RemoveRedundantElements(serverConfig); - } - else + ConfigureModuleAndBinding(config.Root, contentRoot, port); + + if (!DeploymentParameters.PublishApplicationBeforeDeployment) { // The elements normally in the web.config are in the applicationhost.config for unpublished apps. - serverConfig = ReplacePlaceholder(serverConfig, "[HostingModel]", DeploymentParameters.HostingModel.ToString()); - serverConfig = ReplacePlaceholder(serverConfig, "[AspNetCoreModule]", DeploymentParameters.AncmVersion.ToString()); + AddAspNetCoreElement(config.Root); } - RunWebConfigActions(contentRoot); - - var config = XDocument.Parse(serverConfig); RunServerConfigActions(config.Root, contentRoot); serverConfig = config.ToString(); @@ -303,14 +300,31 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS File.WriteAllText(DeploymentParameters.ServerConfigLocation, serverConfig); } - private string ReplacePlaceholder(string content, string field, string value) + private void AddAspNetCoreElement(XElement config) { - if (content.Contains(field)) - { - content = content.Replace(field, value); - Logger.LogDebug("Writing {field} '{value}' to config", field, value); - } - return content; + var aspNetCore = config + .RequiredElement("system.webServer") + .GetOrAdd("aspNetCore"); + + aspNetCore.SetAttributeValue("hostingModel", DeploymentParameters.HostingModel.ToString()); + aspNetCore.SetAttributeValue("arguments", "%LAUNCHER_ARGS%"); + aspNetCore.SetAttributeValue("processPath", "%LAUNCHER_PATH%"); + + var handlers = config + .RequiredElement("location") + .RequiredElement("system.webServer") + .RequiredElement("handlers"); + + var aspNetCoreHandler = handlers + .GetOrAdd("add", "name", "aspNetCore"); + + aspNetCoreHandler.SetAttributeValue("path", "*"); + aspNetCoreHandler.SetAttributeValue("verb", "*"); + aspNetCoreHandler.SetAttributeValue("modules", DeploymentParameters.AncmVersion.ToString()); + aspNetCoreHandler.SetAttributeValue("resourceType", "Unspecified"); + // Make aspNetCore handler first + aspNetCoreHandler.Remove(); + handlers.AddFirst(aspNetCoreHandler); } protected override IEnumerable> GetWebConfigActions() @@ -347,18 +361,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } } - private string ModifyANCMPathInConfig(string replaceFlag, AncmVersion version, string serverConfig) - { - if (serverConfig.Contains(replaceFlag)) - { - var ancmFile = GetAncmLocation(version); - - Logger.LogDebug($"Writing '{replaceFlag}' '{ancmFile}' to config"); - return serverConfig.Replace(replaceFlag, ancmFile); - } - return serverConfig; - } - private string GetIISExpressPath() { var programFiles = "Program Files"; @@ -477,21 +479,5 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS throw new InvalidOperationException($"iisexpress Process {hostProcess.Id} crashed before shutdown was triggered."); } } - - // These elements are duplicated in the web.config if you publish. Remove them from the host.config. - private string RemoveRedundantElements(string serverConfig) - { - var hostConfig = XDocument.Parse(serverConfig); - - var coreElement = hostConfig.Descendants("aspNetCore").FirstOrDefault(); - coreElement?.Remove(); - - var handlersElement = hostConfig.Descendants("handlers").First(); - var handlerElement = handlersElement.Descendants("add") - .Where(x => x.Attribute("name").Value == "aspNetCore").FirstOrDefault(); - handlerElement?.Remove(); - - return hostConfig.ToString(); - } } } diff --git a/test/Common.FunctionalTests/AppHostConfig/IISExpress.config b/test/Common.FunctionalTests/AppHostConfig/IISExpress.config deleted file mode 100644 index 9dfe324091..0000000000 --- a/test/Common.FunctionalTests/AppHostConfig/IISExpress.config +++ /dev/null @@ -1,1035 +0,0 @@ - - - - - - - - -
-
-
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs b/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs index e4c281c467..89824163ed 100644 --- a/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs +++ b/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs @@ -37,11 +37,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { // Must publish to set env vars in web.config var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); - - // Workaround "PublishedSitesFixture.GetBaseDeploymentParameters() overrides too many properties of baseParameters" - // https://github.com/aspnet/IISIntegration/issues/1237 - deploymentParameters.AncmVersion = variant.AncmVersion; - var port = GetUnusedRandomPort(); deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_PORT"] = port.ToString(); diff --git a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 0b05ff54db..3f748f2314 100644 --- a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -2,9 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Diagnostics; +using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; @@ -30,9 +33,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [MemberData(nameof(TestVariants))] public async Task HelloWorld(TestVariant variant) { - // The default in hosting sets windows auth to true. - // Set it to the IISExpress.config file var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); + deploymentParameters.ServerConfigActionList.Add( + (element, _) => { + element + .RequiredElement("system.webServer") + .RequiredElement("security") + .RequiredElement("authentication") + .Element("windowsAuthentication") + ?.SetAttributeValue("enabled", "false"); + }); var deploymentResult = await DeployAsync(deploymentParameters); @@ -63,6 +73,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests $"WebRootPath {deploymentResult.ContentRoot}\\wwwroot" + Environment.NewLine + $"CurrentDirectory {deploymentResult.ContentRoot}", await deploymentResult.HttpClient.GetStringAsync("/HostingEnvironment")); + + var expectedDll = variant.AncmVersion == AncmVersion.AspNetCoreModule ? "aspnetcore.dll" : "aspnetcorev2.dll"; + Assert.Contains(deploymentResult.HostProcess.Modules.OfType(), m=> m.FileName.Contains(expectedDll)); } } } diff --git a/test/Common.FunctionalTests/PublishedSitesFixture.cs b/test/Common.FunctionalTests/PublishedSitesFixture.cs index 90104f6652..64e39e68df 100644 --- a/test/Common.FunctionalTests/PublishedSitesFixture.cs +++ b/test/Common.FunctionalTests/PublishedSitesFixture.cs @@ -49,7 +49,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests publisher, new DeploymentParameters(publisher.ApplicationPath, DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { - HostingModel = hostingModel + HostingModel = hostingModel, + TargetFramework = "netcoreapp2.2", + AncmVersion = AncmVersion.AspNetCoreModuleV2 }, publish); } @@ -60,10 +62,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { ApplicationPublisher = publisher, ApplicationPath = publisher.ApplicationPath, - TargetFramework = Tfm.NetCoreApp22, - ApplicationType = ApplicationType.Portable, - AncmVersion = AncmVersion.AspNetCoreModuleV2, - PublishApplicationBeforeDeployment = publish, + PublishApplicationBeforeDeployment = publish }; } } diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index 79919e5753..a9b6b3a4fe 100644 --- a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -28,11 +28,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting parameters.EnvironmentVariables[DebugEnvironmentVariable] = "console"; } - if (parameters.ServerType == ServerType.IISExpress) - { - parameters.ServerConfigTemplateContent = parameters.ServerConfigTemplateContent ?? File.ReadAllText("IISExpress.config"); - } - if (parameters.ApplicationPublisher == null) { throw new InvalidOperationException("All tests should use ApplicationPublisher"); From 56236f6a7478f082e9f0674beee00aded8ac0ccf Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 15 Aug 2018 16:14:37 -0700 Subject: [PATCH 218/363] Add stress test zip as an asset (#1243) --- build/repo.targets | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build/repo.targets b/build/repo.targets index 442b4b4db0..d8d4d5ab9e 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -58,9 +58,17 @@ shipoob + + ZipArchive + $(RepositoryRoot) + noship + + + + From 6440545c4a1a170de19ca80c1cf24ff346a005b1 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 15 Aug 2018 16:47:47 -0700 Subject: [PATCH 219/363] Add hosting model switch tests (#1245) --- build/launchSettings.json | 4 +-- build/testsite.props | 4 +-- .../NativeIISSample/NativeIISSample.csproj | 5 +++- .../Properties/launchSettings.json | 4 +-- samples/NativeIISSample/Startup.cs | 18 +++++++++-- .../AspNetCore/HandlerResolver.cpp | 9 ++---- .../AspNetCore/applicationmanager.cpp | 30 +++++-------------- .../AspNetCore/applicationmanager.h | 2 -- .../CommonLib/GlobalVersionUtility.cpp | 4 +-- .../ConfigurationChangeTests.cs | 20 +++++++++++++ .../Utilities/Helpers.cs | 2 +- .../OutOfProcess/GlobalVersionTests.cs | 15 ++++++++++ .../Properties/launchSettings.json | 4 +-- .../Properties/launchSettings.json | 4 +-- .../Properties/launchSettings.json | 4 +-- .../Properties/launchSettings.json | 4 +-- .../Properties/launchSettings.json | 4 +-- 17 files changed, 83 insertions(+), 54 deletions(-) diff --git a/build/launchSettings.json b/build/launchSettings.json index 38ae6c9d32..9c963c0100 100644 --- a/build/launchSettings.json +++ b/build/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/build/testsite.props b/build/testsite.props index 03aa0c9cff..1588b54226 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -36,8 +36,8 @@ /config:"$(IISExpressAppHostConfig)" /systray:false -h "$(IISAppHostConfig)" - $(AspNetCoreModuleV1ShimDll) - $(AspNetCoreModuleV2ShimDll) + $(NativePlatform)\aspnetcore.dll + $(NativePlatform)\aspnetcorev2.dll aspnetcorev2_inprocess.dll $(userprofile)\.dotnet\$(NativePlatform)\dotnet.exe diff --git a/samples/NativeIISSample/NativeIISSample.csproj b/samples/NativeIISSample/NativeIISSample.csproj index c1f4b88c89..cba368eafc 100644 --- a/samples/NativeIISSample/NativeIISSample.csproj +++ b/samples/NativeIISSample/NativeIISSample.csproj @@ -1,4 +1,4 @@ - + @@ -9,10 +9,13 @@ + + + diff --git a/samples/NativeIISSample/Properties/launchSettings.json b/samples/NativeIISSample/Properties/launchSettings.json index 38ae6c9d32..9c963c0100 100644 --- a/samples/NativeIISSample/Properties/launchSettings.json +++ b/samples/NativeIISSample/Properties/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/samples/NativeIISSample/Startup.cs b/samples/NativeIISSample/Startup.cs index 0744ef4cf1..2b18ff895c 100644 --- a/samples/NativeIISSample/Startup.cs +++ b/samples/NativeIISSample/Startup.cs @@ -14,8 +14,15 @@ namespace NativeIISSample { public class Startup { + private readonly IAuthenticationSchemeProvider _authSchemeProvider; + + public Startup(IAuthenticationSchemeProvider authSchemeProvider = null) + { + _authSchemeProvider = authSchemeProvider; + } + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, IAuthenticationSchemeProvider authSchemeProvider) + public void Configure(IApplicationBuilder app, IHostingEnvironment env) { app.Run(async (context) => { @@ -41,8 +48,11 @@ namespace NativeIISSample await context.Response.WriteAsync(Environment.NewLine); await context.Response.WriteAsync("User: " + context.User.Identity.Name + Environment.NewLine); - var scheme = await authSchemeProvider.GetSchemeAsync(IISServerDefaults.AuthenticationScheme); - await context.Response.WriteAsync("DisplayName: " + scheme?.DisplayName + Environment.NewLine); + if (_authSchemeProvider != null) + { + var scheme = await _authSchemeProvider.GetSchemeAsync(IISServerDefaults.AuthenticationScheme); + await context.Response.WriteAsync("DisplayName: " + scheme?.DisplayName + Environment.NewLine); + } await context.Response.WriteAsync(Environment.NewLine); @@ -98,7 +108,9 @@ namespace NativeIISSample public static void Main(string[] args) { var host = new WebHostBuilder() + .UseKestrel() .UseIIS() + .UseIISIntegration() .UseStartup() .Build(); diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index 1f5ede9f0e..6c78cc16a6 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -157,13 +157,10 @@ HandlerResolver::FindNativeAssemblyFromGlobalLocation( } catch (...) { - STRU struEvent; - if (SUCCEEDED(struEvent.Copy(ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG))) - { - EventLog::Info( + EventLog::Info( ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, - struEvent.QueryStr()); - } + ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG, + pstrHandlerDllName); return OBSERVE_CAUGHT_EXCEPTION(); } diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp index 8e62d9ef68..25d5966a3d 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp @@ -116,7 +116,7 @@ APPLICATION_MANAGER::FindConfigChangedApplication( BOOL fChanged = pstruConfigPath->StartsWith(pContext->pstrPath, true); if (fChanged) { - DWORD dwLen = (DWORD)wcslen(pContext->pstrPath); + auto dwLen = wcslen(pContext->pstrPath); WCHAR wChar = pstruConfigPath->QueryStr()[dwLen]; // We need to check that the last character of the config path @@ -189,12 +189,6 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( // Removed the applications which are impacted by the configurtion change m_pApplicationInfoHash->DeleteIf(FindConfigChangedApplication, (PVOID)&context); - - if (m_pApplicationInfoHash->Count() == 0 && m_hostingModel == HOSTING_OUT_PROCESS) - { - // reuse current process - m_hostingModel = HOSTING_UNKNOWN; - } } // If we receive a request at this point. @@ -211,15 +205,10 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( APPLICATION_INFO* pRecord; // Application got recycled. Log an event - STACK_STRU(strEventMsg, 256); - if (SUCCEEDED(strEventMsg.SafeSnwprintf( - ASPNETCORE_EVENT_RECYCLE_CONFIGURATION_MSG, - path))) - { - EventLog::Info( + EventLog::Info( ASPNETCORE_EVENT_RECYCLE_CONFIGURATION, - strEventMsg.QueryStr()); - } + ASPNETCORE_EVENT_RECYCLE_CONFIGURATION_MSG, + path); table->FindKey(path, &pRecord); DBG_ASSERT(pRecord != NULL); @@ -241,15 +230,10 @@ Finished: if (FAILED(hr)) { // Failed to recycle an application. Log an event - STACK_STRU(strEventMsg, 256); - if (SUCCEEDED(strEventMsg.SafeSnwprintf( - ASPNETCORE_EVENT_RECYCLE_FAILURE_CONFIGURATION_MSG, - pszApplicationId))) - { - EventLog::Error( + EventLog::Error( ASPNETCORE_EVENT_RECYCLE_APP_FAILURE, - strEventMsg.QueryStr()); - } + ASPNETCORE_EVENT_RECYCLE_FAILURE_CONFIGURATION_MSG, + pszApplicationId); // Need to recycle the process as we cannot recycle the application if (!g_fRecycleProcessCalled) { diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h index 165f3c9d3e..e0f2025f04 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h @@ -112,7 +112,6 @@ public: private: APPLICATION_MANAGER(HMODULE hModule, IHttpServer& pHttpServer) : m_pApplicationInfoHash(NULL), - m_hostingModel(HOSTING_UNKNOWN), m_fDebugInitialize(FALSE), m_pHttpServer(pHttpServer), m_handlerResolver(hModule, pHttpServer) @@ -123,7 +122,6 @@ private: APPLICATION_INFO_HASH *m_pApplicationInfoHash; static APPLICATION_MANAGER *sm_pApplicationManager; SRWLOCK m_srwLock {}; - APP_HOSTING_MODEL m_hostingModel; BOOL m_fDebugInitialize; IHttpServer &m_pHttpServer; HandlerResolver m_handlerResolver; diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp index 7cb185b0c3..15ce48b8c5 100644 --- a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp @@ -76,13 +76,13 @@ GlobalVersionUtility::FindHighestGlobalVersion(PCWSTR pwzAspNetCoreFolderPath) { if (pwzAspNetCoreFolderPath == NULL) { - throw new std::invalid_argument("pwzAspNetCoreFolderPath is NULL"); + throw std::invalid_argument("pwzAspNetCoreFolderPath is NULL"); } std::vector versionsInDirectory = GetRequestHandlerVersions(pwzAspNetCoreFolderPath); if (versionsInDirectory.empty()) { - throw new std::runtime_error("Cannot find request handler next to aspnetcorev2.dll. Verify a version of the request handler is installed in a version folder."); + throw std::runtime_error("Cannot find request handler next to aspnetcorev2.dll. Verify a version of the request handler is installed in a version folder."); } std::sort(versionsInDirectory.begin(), versionsInDirectory.end()); diff --git a/test/Common.FunctionalTests/ConfigurationChangeTests.cs b/test/Common.FunctionalTests/ConfigurationChangeTests.cs index b809bf42ca..064df80451 100644 --- a/test/Common.FunctionalTests/ConfigurationChangeTests.cs +++ b/test/Common.FunctionalTests/ConfigurationChangeTests.cs @@ -5,6 +5,7 @@ using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; @@ -54,5 +55,24 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // Verify that worker process gets restarted with new process id await deploymentResult.HttpClient.RetryRequestAsync("/ProcessId", async r => await r.Content.ReadAsStringAsync() != processBefore); } + + [ConditionalFact] + public async Task OutOfProcessToInProcessHostingModelSwitchWorks() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); + + var deploymentResult = await DeployAsync(deploymentParameters); + + await deploymentResult.AssertStarts(); + + deploymentResult.ModifyWebConfig(element => element + .GetOrAdd("system.webServer") + .GetOrAdd("aspNetCore") + .SetAttributeValue("hostingModel", "inprocess")); + + // Have to retry here to allow ANCM to receive notification and react to it + // Verify that worker process gets restarted with new process id + await deploymentResult.HttpClient.RetryRequestAsync("/HelloWorld", r => r.StatusCode == HttpStatusCode.InternalServerError); + } } } diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 30c597a111..d0b1ebc109 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -79,7 +79,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var webConfigPath = Path.Combine(deploymentResult.ContentRoot, "web.config"); var document = XDocument.Load(webConfigPath); - + action(document.Root); document.Save(webConfigPath); } diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index fa859d614a..d1096738f1 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; +using System.Net; using System.Threading.Tasks; using System.Xml.Linq; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; @@ -144,6 +145,20 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests AssertLoadedVersion(version); } + [ConditionalFact] + public async Task DoesNotCrashWhenNoVersionsAvailable() + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + CopyShimToOutput(deploymentParameters); + var deploymentResult = await DeployAsync(deploymentParameters); + + var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); + Directory.Delete(originalANCMPath, true); + var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } + private IISDeploymentParameters GetGlobalVersionBaseDeploymentParameters() { return _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); diff --git a/test/WebSites/InProcessWebSite/Properties/launchSettings.json b/test/WebSites/InProcessWebSite/Properties/launchSettings.json index 38ae6c9d32..9c963c0100 100644 --- a/test/WebSites/InProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/InProcessWebSite/Properties/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json index 38ae6c9d32..9c963c0100 100644 --- a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json index 38ae6c9d32..9c963c0100 100644 --- a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json +++ b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json index 38ae6c9d32..9c963c0100 100644 --- a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json +++ b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/StressTestWebSite/Properties/launchSettings.json b/test/WebSites/StressTestWebSite/Properties/launchSettings.json index 38ae6c9d32..9c963c0100 100644 --- a/test/WebSites/StressTestWebSite/Properties/launchSettings.json +++ b/test/WebSites/StressTestWebSite/Properties/launchSettings.json @@ -15,8 +15,8 @@ "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", + "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", From 24ed5586dc1b4c8444c3b0a5876c5bce3a2213a4 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 17 Aug 2018 10:21:03 -0700 Subject: [PATCH 220/363] Collect dumps on VSTS (#1244) --- .vsts-pipelines/templates/build-steps.yml | 16 +++- tools/SetupTestEnvironment.ps1 | 96 +++++++++++++++++++++++ tools/stresstest.ps1 | 96 ----------------------- 3 files changed, 109 insertions(+), 99 deletions(-) create mode 100644 tools/SetupTestEnvironment.ps1 delete mode 100644 tools/stresstest.ps1 diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml index dbc03620b5..2d6544e107 100644 --- a/.vsts-pipelines/templates/build-steps.yml +++ b/.vsts-pipelines/templates/build-steps.yml @@ -3,16 +3,26 @@ phases: parameters: agentOs: Windows beforeBuild: - - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1" + - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup" displayName: Prepare repo afterBuild: + - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown" + displayName: Stop AppVerifier + condition: always() - task: PublishBuildArtifacts@1 - displayName: Upload binlog + displayName: Upload logs condition: eq(variables['system.pullrequest.isfork'], false) inputs: artifactName: logs artifactType: Container - pathtoPublish: artifacts/logs/ + pathtoPublish: artifacts/logs + - task: PublishBuildArtifacts@1 + displayName: Upload dumps + condition: eq(variables['system.pullrequest.isfork'], false) + inputs: + artifactName: dumps + artifactType: Container + pathtoPublish: artifacts/dumps - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools parameters: diff --git a/tools/SetupTestEnvironment.ps1 b/tools/SetupTestEnvironment.ps1 new file mode 100644 index 0000000000..6fabf1704b --- /dev/null +++ b/tools/SetupTestEnvironment.ps1 @@ -0,0 +1,96 @@ +param($Mode) + +function Setup-appverif($application) +{ + appverif.exe -enable Exceptions Handles Heaps Leak Locks Memory Threadpool TLS SRWLock -for $application + $onlyLog = 0x181; + $codes = @( + # Exceptions + 0x650, + # Handles + 0x300, 0x301, 0x302, 0x303, 0x304, 0x305, + # Heaps + 0x001, 0x002, 0x003, 0x004, 0x005, 0x006, 0x007, 0x008, 0x009, 0x00A, 0x00B, 0x00C, 0x00D, 0x00E, 0x00F, 0x010, 0x011, 0x012, 0x013, 0x014, + # Leak + 0x900, 0x901, 0x902, 0x903, 0x904, 0x905, 0x906, + # Locks + 0x200, 0x201, 0x202, 0x203, 0x204, 0x205, 0x206, 0x207, 0x208, 0x209, 0x210, 0x211, 0x212, 0x213, 0x214, 0x215, + # Memory + 0x600, 0x601, 0x602, 0x603, 0x604, 0x605, 0x606, 0x607, 0x608, 0x609, 0x60A, 0x60B, 0x60C, 0x60D, 0x60E, 0x60F, 0x610, 0x612, 0x613, 0x614, 0x615, 0x616, 0x617, 0x618, 0x619, 0x61A, 0x61B, 0x61C, 0x61D, 0x61E, + # SRWLock + 0x250, 0x251, 0x252, 0x253, 0x254, 0x255, 0x256, 0x257, + # TSL + 0x350, 0x351, 0x352, + # ThreadPool + 0x700, 0x701, 0x702, 0x703, 0x704, 0x705, 0x706, 0x707, 0x708, 0x709, 0x70A, 0x70B, 0x70C, 0x70D + ); + appverif.exe -configure $codes -for $application -with ErrorReport=$onlyLog +} + +function Shutdown-appverif($application) +{ + appverif.exe -export log -for $application -with To=$LogsFolder\$application.xml Log=0 + appverif.exe -disable * -for $application +} + +$DumpFolder = "$PSScriptRoot\..\artifacts\dumps" +if (!(Test-Path $DumpFolder)) +{ + New-Item $DumpFolder -ItemType Directory; +} +$DumpFolder = Resolve-Path $DumpFolder + +$LogsFolder = "$PSScriptRoot\..\artifacts\logs" +if (!(Test-Path $LogsFolder)) +{ + New-Item $LogsFolder -ItemType Directory; +} +$LogsFolder = Resolve-Path $LogsFolder + +$werHive = "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting"; +$ldHive = "$werHive\LocalDumps"; + + +$cdb = "c:\Program Files (x86)\Windows Kits\10\Debuggers\x64\cdb.exe" +if (!(Test-Path $cdb)) +{ + $downloadedFile = [System.IO.Path]::GetTempFileName(); + $downloadedFile = "$downloadedFile.exe"; + Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/p/?linkid=870807" -OutFile $downloadedFile; + & $downloadedFile /features OptionId.WindowsDesktopDebuggers /norestart /q; +} + +if ($Mode -eq "Setup") +{ + #Setup-appverif w3wp.exe + #Setup-appverif iisexpress.exe + + if (!(Test-Path $ldHive )) + { + New-Item -Path $werHive -Name LocalDumps + } + + New-ItemProperty $ldHive -Name "DumpFolder" -Value $DumpFolder -PropertyType "ExpandString" -Force; + New-ItemProperty $ldHive -Name "DumpCount" -Value 15 -PropertyType "DWORD" -Force; + New-ItemProperty $ldHive -Name "DumpType" -Value 2 -PropertyType "DWORD" -Force; + + Restart-Service WerSvc +} + +if ($Mode -eq "Shutdown") +{ + Remove-Item $ldHive -Recurse -Force + + #Shutdown-appverif w3wp.exe + #Shutdown-appverif iisexpress.exe + + foreach ($dump in (Get-ChildItem -Path $DumpFolder -Filter "*.dmp")) + { + if (Test-Path $cdb) + { + & $cdb -z $dump.FullName -y "https://msdl.microsoft.com/download/symbols" -c ".loadby sos coreclr;!sym noisy;.reload /f;.dumpcab -a $($dump.FullName).cab;q;" + } + } +} + +Exit 0; \ No newline at end of file diff --git a/tools/stresstest.ps1 b/tools/stresstest.ps1 deleted file mode 100644 index 981c6fcf44..0000000000 --- a/tools/stresstest.ps1 +++ /dev/null @@ -1,96 +0,0 @@ -########################################################## -# NOTE: -# For running test automation, following prerequisite required: -# -# 1. On Win7, powershell should be upgraded to 4.0 -# https://social.technet.microsoft.com/wiki/contents/articles/21016.how-to-install-windows-powershell-4-0.aspx -# 2. url-rewrite should be installed -# 3. makecert.exe tools should be available -########################################################## - -# Replace aspnetcore.dll with the latest version -copy C:\gitroot\AspNetCoreModule\artifacts\build\AspNetCore\bin\Release\x64\aspnetcore.dll "C:\Program Files\IIS Express" -copy C:\gitroot\AspNetCoreModule\artifacts\build\AspNetCore\bin\Release\x64\aspnetcore.pdb "C:\Program Files\IIS Express" - - -# Enable appverif for IISExpress.exe -appverif /verify iisexpress.exe - -# Set the AspNetCoreModuleTest environment variable with the following command -cd C:\gitroot\AspNetCoreModule\test\AspNetCoreModule.Test -dotnet restore -dotnet build -$aspNetCoreModuleTest="C:\gitroot\AspNetCoreModule\test\AspNetCoreModule.Test\bin\Debug\net46" - -if (Test-Path (Join-Path $aspNetCoreModuleTest aspnetcoremodule.test.dll)) -{ - # Clean up applicationhost.config of IISExpress - del $env:userprofile\documents\iisexpress\config\applicationhost.config -Confirm:$false -Force - Start-Process "C:\Program Files\IIS Express\iisexpress.exe" - Sleep 3 - Stop-Process -Name iisexpress - - # Create sites - (1..50) | foreach { md ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) 2> out-null } - (1..50) | foreach { copy C:\gitroot\AspNetCoreModule\test\StressTestWebRoot\web.config ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) } - (1..50) | foreach { - $path = ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) - $appPath = "/foo"+$_ - & "C:\Program Files\IIS Express\appcmd.exe" add app /site.name:"WebSite1" /path:$appPath /physicalPath:$path - } - - <#(1..50) | foreach { - $configpath = ("WebSite1/foo" + $_) - $value = "C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ + ".exe" - & "C:\Program Files\IIS Express\appcmd.exe" set config $configpath -section:system.webServer/aspNetCore /processPath:$value - } - (1..50) | foreach { copy C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo.exe ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ +".exe") } - (1..50) | foreach { - $configpath = ("WebSite1/foo" + $_) - $value = "%AspNetCoreModuleTest%\AspnetCoreApp_HelloWeb\foo" + $_ + ".exe" - & "C:\Program Files\IIS Express\appcmd.exe" set config $configpath -section:system.webServer/aspNetCore /processPath:$value /apphostconfig:%AspNetCoreModuleTest%\config\applicationhost.config - - $value = "%AspNetCoreModuleTest%\AspnetCoreApp_HelloWeb\AutobahnTestServer.dll" - & "C:\Program Files\IIS Express\appcmd.exe" set config $configpath -section:system.webServer/aspNetCore /arguments:$value /apphostconfig:%AspNetCoreModuleTest%\config\applicationhost.config - } - #> - - # Start IISExpress with running the below command - &"C:\Program Files\Debugging Tools for Windows (x64)\windbg.exe" /g /G "C:\Program Files\IIS Express\iisexpress.exe" - - - # 6. Start stress testing - (1..10000) | foreach { - if ($_ % 2 -eq 0) - { - ("Recycling backend only") - stop-process -name dotnet - (1..50) | foreach { del ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ + "\app_offline.htm") -confirm:$false -Force 2> out-null } - stop-process -name dotnet - } - else - { - ("Recycling backedn + enabling appoffline ....") - stop-process -name dotnet - (1..50) | foreach { copy C:\gitroot\AspNetCoreModule\test\StressTestWebRoot\app_offline.htm ("C:\inetpub\wwwroot\AspnetCoreHandler_HelloWeb\foo" + $_ ) } - } - Sleep 1 - - (1..10) | foreach { - (1..50) | foreach { - invoke-webrequest ("http://localhost:8080/foo"+$_) > $null - } - } - } - - - # Stress test idea - # 1. Use Web Stress Tester - # 2. Run stop-process -name dotnet - # 3. Hit Q command to IISExpress console window - # 4. Use app_offline.htm - # 5. Save dummy web.config -} - -// bp aspnetcore!FORWARDING_HANDLER::FORWARDING_HANDLER -// bp aspnetcore!FORWARDING_HANDLER::~FORWARDING_HANDLER \ No newline at end of file From 5fc59b2331a0b6e5e08bc7748642fe73da78e34f Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 17 Aug 2018 14:26:53 -0700 Subject: [PATCH 221/363] Free ALLOC_CACHE_HANDLER on dll unload (#1253) --- .../InProcessRequestHandler/dllmain.cpp | 2 ++ .../inprocesshandler.cpp | 17 ++++++++++++----- .../InProcessRequestHandler/inprocesshandler.h | 4 ++++ .../OutOfProcessRequestHandler/dllmain.cpp | 2 ++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp index ca40d04e36..2a0369206b 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp @@ -75,6 +75,8 @@ BOOL APIENTRY DllMain(HMODULE hModule, break; case DLL_PROCESS_DETACH: g_fProcessDetach = TRUE; + IN_PROCESS_HANDLER::StaticTerminate(); + ALLOC_CACHE_HANDLER::StaticTerminate(); DebugStop(); default: break; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 90b3bd9d53..0b7357f5d2 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -180,11 +180,18 @@ HRESULT Finished: if (FAILED(hr)) { - if (sm_pAlloc != NULL) - { - delete sm_pAlloc; - sm_pAlloc = NULL; - } + StaticTerminate(); } return hr; } + +// static +void +IN_PROCESS_HANDLER::StaticTerminate(VOID) +{ + if (sm_pAlloc != NULL) + { + delete sm_pAlloc; + sm_pAlloc = NULL; + } +} diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h index fe0331da9b..ac6aa24789 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h @@ -70,6 +70,10 @@ public: HRESULT StaticInitialize(VOID); + static + void + StaticTerminate(VOID); + private: REQUEST_NOTIFICATION_STATUS ServerShutdownMessage() const; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp index d74571e953..d77c5c47d8 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp @@ -260,6 +260,8 @@ BOOL APIENTRY DllMain(HMODULE hModule, break; case DLL_PROCESS_DETACH: g_fProcessDetach = TRUE; + FORWARDING_HANDLER::StaticTerminate(); + ALLOC_CACHE_HANDLER::StaticTerminate(); DebugStop(); default: break; From 84d4627b8b3441372efa0b7773ec07fbc7564e64 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 17 Aug 2018 15:23:18 -0700 Subject: [PATCH 222/363] Upgrade build tools to use the 2.1.400 SDK (#1249) --- Directory.Build.props | 2 ++ korebuild-lock.txt | 4 ++-- .../IISDeployerBase.cs | 6 ++++-- .../WebConfigHelpers.cs | 7 +++++-- test/Common.FunctionalTests/MultiApplicationTests.cs | 4 +++- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index f015ba2785..a328745f31 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,6 +18,8 @@ MicrosoftNuGet true true + + false diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 29a57027f1..4a53936b7b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180807.2 -commithash:11495dbd236104434e08cb1152fcb58cf2a20923 +version:2.2.0-preview1-20180816.6 +commithash:226c8adaefd0d19db0d9d11d911ba7d95644b224 diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs index 5e6aabdadb..be6f39edec 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs @@ -100,7 +100,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS private void AddWebConfigEnvironmentVariables(XElement element, string contentRoot) { var environmentVariables = element - .RequiredElement("system.webServer") + .Descendants("system.webServer") + .Single() .RequiredElement("aspNetCore") .GetOrAdd("environmentVariables"); @@ -114,7 +115,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS private void AddHandlerSettings(XElement element, string contentRoot) { var handlerSettings = element - .RequiredElement("system.webServer") + .Descendants("system.webServer") + .Single() .RequiredElement("aspNetCore") .GetOrAdd("handlerSettings"); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs index 589907657f..f920622568 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Linq; using System.Xml.Linq; namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS @@ -12,7 +13,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { return (element, _) => { element - .GetOrAdd("system.webServer") + .Descendants("system.webServer") + .Single() .GetOrAdd("aspNetCore") .SetAttributeValue(key, value); }; @@ -23,7 +25,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS return (element, _) => { element - .GetOrAdd("system.webServer") + .Descendants("system.webServer") + .Single() .GetOrAdd("handlers") .GetOrAdd("add") .SetAttributeValue(key, value); diff --git a/test/Common.FunctionalTests/MultiApplicationTests.cs b/test/Common.FunctionalTests/MultiApplicationTests.cs index a91dfa4d76..009c61f373 100644 --- a/test/Common.FunctionalTests/MultiApplicationTests.cs +++ b/test/Common.FunctionalTests/MultiApplicationTests.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using System.Linq; using System.Threading.Tasks; using System.Xml.Linq; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; @@ -78,7 +79,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var webConfigLocation = GetWebConfigLocation(directory); XDocument webConfig = XDocument.Load(webConfigLocation); webConfig.Root - .GetOrAdd("system.webServer") + .Descendants("system.webServer") + .Single() .GetOrAdd("aspNetCore") .SetAttributeValue("hostingModel", model.ToString()); webConfig.Save(webConfigLocation); From a1e8b3a9af84a8e94a90585754ff4da6c379ad05 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 17 Aug 2018 16:29:30 -0700 Subject: [PATCH 223/363] Free environment variable table in inprocess application (#1254) --- .../inprocessapplication.cpp | 29 +++++++------------ .../environmentvariablehash.h | 10 +++++++ .../IISDeployer.cs | 2 +- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index b9746ff204..352ec7b093 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -259,7 +259,6 @@ IN_PROCESS_APPLICATION::LoadManagedApplication // Set up stdout redirect SRWExclusiveLock lock(m_stateLock); - if (m_pLoggerProvider == NULL) { hr = LoggingHelpers::CreateLoggingProvider( @@ -394,28 +393,22 @@ IN_PROCESS_APPLICATION::SetEnvironementVariablesOnWorkerProcess( { HRESULT hr = S_OK; ENVIRONMENT_VAR_HASH* pHashTable = NULL; - if (FAILED(hr = ENVIRONMENT_VAR_HELPERS::InitEnvironmentVariablesTable( + std::unique_ptr table; + RETURN_IF_FAILED(hr = ENVIRONMENT_VAR_HELPERS::InitEnvironmentVariablesTable( m_pConfig->QueryEnvironmentVariables(), m_pConfig->QueryWindowsAuthEnabled(), m_pConfig->QueryBasicAuthEnabled(), m_pConfig->QueryAnonymousAuthEnabled(), - &pHashTable))) - { - goto Finished; - } + &pHashTable)); - pHashTable->Apply(ENVIRONMENT_VAR_HELPERS::AppendEnvironmentVariables, &hr); - if (FAILED(hr)) - { - goto Finished; - } - pHashTable->Apply(ENVIRONMENT_VAR_HELPERS::SetEnvironmentVariables, &hr); - if (FAILED(hr)) - { - goto Finished; - } -Finished: - return hr; + table.reset(pHashTable); + + table->Apply(ENVIRONMENT_VAR_HELPERS::AppendEnvironmentVariables, &hr); + RETURN_IF_FAILED(hr); + + table->Apply(ENVIRONMENT_VAR_HELPERS::SetEnvironmentVariables, &hr); + RETURN_IF_FAILED(hr); + return S_OK; } HRESULT diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h b/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h index 8fa054f2a9..98bcd5ada4 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h @@ -76,6 +76,7 @@ private: mutable LONG _cRefs; }; + class ENVIRONMENT_VAR_HASH : public HASH_TABLE { public: @@ -129,3 +130,12 @@ private: ENVIRONMENT_VAR_HASH(const ENVIRONMENT_VAR_HASH &); void operator=(const ENVIRONMENT_VAR_HASH &); }; + +struct ENVIRONMENT_VAR_HASH_DELETER +{ + void operator ()(ENVIRONMENT_VAR_HASH* hashTable) const + { + hashTable->Clear(); + delete hashTable; + } +}; diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index d2df4a8f8c..8c07bec312 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -341,7 +341,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS throw new InvalidOperationException("Site not stopped yet"); } - if (appPool.WorkerProcesses.Any(wp => wp.State == WorkerProcessState.Running || + if (appPool.WorkerProcesses != null && appPool.WorkerProcesses.Any(wp => wp.State == WorkerProcessState.Running || wp.State == WorkerProcessState.Stopping)) { throw new InvalidOperationException("WorkerProcess not stopped yet"); From 2f46c921f5a442b70dc88e6c125b8e0b2768ca7e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 19 Aug 2018 19:16:56 +0000 Subject: [PATCH 224/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 68 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 542334e671..d8c5e54b45 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,50 +4,50 @@ 0.10.13 - 3.0.0-alpha1-20180810.1 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 0.7.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 + 3.0.0-alpha1-20180817.3 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 0.7.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 15.6.82 15.6.82 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 - 3.0.0-alpha1-10275 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 + 3.0.0-alpha1-10321 2.0.9 2.1.2 2.2.0-preview1-26618-02 1.0.1 - 3.0.0-alpha1-10275 + 3.0.0-alpha1-10321 15.6.1 11.1.0 2.0.3 - 4.6.0-preview1-26807-04 - 4.6.0-preview1-26807-04 - 4.6.0-preview1-26807-04 + 4.6.0-preview1-26816-01 + 4.6.0-preview1-26816-01 + 4.6.0-preview1-26816-01 4.6.0-preview1-26717-04 - 4.6.0-preview1-26807-04 - 4.6.0-preview1-26807-04 - 4.6.0-preview1-26807-04 - 4.6.0-preview1-26807-04 - 4.6.0-preview1-26807-04 + 4.6.0-preview1-26816-01 + 4.6.0-preview1-26816-01 + 4.6.0-preview1-26816-01 + 4.6.0-preview1-26816-01 + 4.6.0-preview1-26816-01 9.0.1 2.3.1 2.4.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index c53be3fca9..7abb5ed14d 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20180810.1 -commithash:45c32b4f020e14a9295be31866051a18d293309d +version:3.0.0-alpha1-20180817.3 +commithash:134cdbee9bee29dd3ccb654c67663b27b9ffa6c8 From cc4bbd1cef8c3d65cd9749cd8f70670608b8d149 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Mon, 20 Aug 2018 14:11:18 -0700 Subject: [PATCH 225/363] Fix typos in portsetup error message (#1265) --- src/AspNetCoreModuleV2/CommonLib/resources.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index 63e0e9b163..cf5aa90f1e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -17,7 +17,7 @@ #define ASPNETCORE_EVENT_PROCESS_START_ERROR_MSG L"Application '%s' with physical root '%s' failed to start process with commandline '%s' at stage '%s', ErrorCode = '0x%x', assigned port %d, retryCounter '%d'." #define ASPNETCORE_EVENT_PROCESS_START_FAILURE_MSG L"Application '%s' with physical root '%s' failed to start process with commandline '%s' with multiple retries. The last try of listening port is '%d'. See previous warnings for details." #define ASPNETCORE_EVENT_PROCESS_START_STATUS_ERROR_MSG L"Application '%s' with physical root '%s' failed to start process with commandline '%s' , ErrorCode = '0x%x', processId '%d', processStatus '%d'." -#define ASPNETCORE_EVENT_PROCESS_START_PORTSETUP_ERROR_MSG L"Application '%s' with physical root '%s' failed to choose listen port '%d' given port rang '%d - %d', EorrorCode = '0x%x'. If environment variable 'ASPNETCORE_PORT' was set, try removing it such that a random port is selected instead." +#define ASPNETCORE_EVENT_PROCESS_START_PORTSETUP_ERROR_MSG L"Application '%s' with physical root '%s' failed to choose listen port '%d' given port range '%d - %d', ErrorCode = '0x%x'. If environment variable 'ASPNETCORE_PORT' was set, try removing it such that a random port is selected instead." #define ASPNETCORE_EVENT_PROCESS_START_WRONGPORT_ERROR_MSG L"Application '%s' with physical root '%s' created process with commandline '%s' but failed to listen on the given port '%d'" #define ASPNETCORE_EVENT_PROCESS_START_NOTREADY_ERROR_MSG L"Application '%s' with physical root '%s' created process with commandline '%s' but either crashed or did not respond or did not listen on the given port '%d', ErrorCode = '0x%x'" #define ASPNETCORE_EVENT_PROCESS_SHUTDOWN_MSG L"Application '%s' with physical root '%s' shut down process with Id '%d' listening on port '%d'" From de32a08ae71a21f0155232fa41b85c60619dd0aa Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Mon, 20 Aug 2018 14:11:51 -0700 Subject: [PATCH 226/363] Fix typo in process start error message (#1266) --- src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h b/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h index 899e9a5c93..6330be8879 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h +++ b/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h @@ -11,7 +11,7 @@ #define ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED_MSG L"Maximum rapid fail count per minute of '%d' exceeded." #define ASPNETCORE_EVENT_PROCESS_START_INTERNAL_ERROR_MSG L"Application '%s' failed to parse processPath and arguments due to internal error, ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_PROCESS_START_POSTCREATE_ERROR_MSG L"Application '%s' with physical root '%s' created process with commandline '%s'but failed to get its status, ErrorCode = '0x%x'." -#define ASPNETCORE_EVENT_PROCESS_START_ERROR_MSG L"Application '%s' with physical root '%s' failed to start process with commandline '%s', ErrorCode = '0x%x : %x." +#define ASPNETCORE_EVENT_PROCESS_START_ERROR_MSG L"Application '%s' with physical root '%s' failed to start process with commandline '%s', ErrorCode = '0x%x' : %x." #define ASPNETCORE_EVENT_PROCESS_START_WRONGPORT_ERROR_MSG L"Application '%s' with physical root '%s' created process with commandline '%s' but failed to listen on the given port '%d'" #define ASPNETCORE_EVENT_PROCESS_START_NOTREADY_ERROR_MSG L"Application '%s' with physical root '%s' created process with commandline '%s' but either crashed or did not reponse or did not listen on the given port '%d', ErrorCode = '0x%x'" #define ASPNETCORE_EVENT_INVALID_STDOUT_LOG_FILE_MSG L"Warning: Could not create stdoutLogFile %s, ErrorCode = %d." From 6da64c6d55e2ed1e3f7ee4afaaeb16f25b53edd6 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Mon, 20 Aug 2018 14:13:55 -0700 Subject: [PATCH 227/363] Fix process start error message (#1267) - Addresses #1261 --- src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx b/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx index 76da27a99b..438b94d384 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx +++ b/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx @@ -1068,8 +1068,8 @@ Finished: { if (!fDonePrepareCommandLine) strEventMsg.SafeSnwprintf( - m_struAppFullPath.QueryStr(), ASPNETCORE_EVENT_PROCESS_START_INTERNAL_ERROR_MSG, + m_struAppFullPath.QueryStr(), hr); else strEventMsg.SafeSnwprintf( From e980ade830a01010618d25066766fcd14ad3c0f4 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 21 Aug 2018 13:33:50 -0700 Subject: [PATCH 228/363] Update package branding for 2.2.0-preview2 --- build/dependencies.props | 2 +- version.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 78d4a271f7..87d39807ff 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -52,6 +52,6 @@ 2.3.1 2.4.0 - + diff --git a/version.props b/version.props index 5055696e1c..5a339cd884 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@  2.2.0 - preview1 + preview2 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From 2d61889e5e612e080c76e102c0d20eb38da4dfd7 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 21 Aug 2018 13:44:34 -0700 Subject: [PATCH 229/363] Support empty value for ASPNETCORE_PORT (#1280) - Addresses #1264 --- .../AspNetCore/src/serverprocess.cxx | 4 +- .../serverprocess.cpp | 6 +-- .../OutOfProcess/AspNetCorePortTests.cs | 52 ++++++++++++++++--- 3 files changed, 50 insertions(+), 12 deletions(-) diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx b/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx index 438b94d384..b3fd02432a 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx +++ b/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx @@ -132,7 +132,7 @@ SERVER_PROCESS::SetupListenPort( pEnvironmentVarTable->FindKey(ASPNETCORE_PORT_ENV_STR, &pEntry); if (pEntry != NULL) { - if (pEntry->QueryValue() != NULL || pEntry->QueryValue()[0] != L'\0') + if (pEntry->QueryValue() != NULL && pEntry->QueryValue()[0] != L'\0') { m_dwPort = (DWORD)_wtoi(pEntry->QueryValue()); if(m_dwPort >MAX_PORT || m_dwPort < MIN_PORT) @@ -150,6 +150,8 @@ SERVER_PROCESS::SetupListenPort( // user set the env variable but did not give value, let's set it up // pEnvironmentVarTable->DeleteKey(ASPNETCORE_PORT_ENV_STR); + pEntry->Dereference(); + pEntry = NULL; } } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp index 03abd7fd23..890ef01f97 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp @@ -155,7 +155,7 @@ SERVER_PROCESS::SetupListenPort( pEnvironmentVarTable->FindKey(ASPNETCORE_PORT_ENV_STR, &pEntry); if (pEntry != NULL) { - if (pEntry->QueryValue() != NULL || pEntry->QueryValue()[0] != L'\0') + if (pEntry->QueryValue() != NULL && pEntry->QueryValue()[0] != L'\0') { m_dwPort = (DWORD)_wtoi(pEntry->QueryValue()); if (m_dwPort >MAX_PORT || m_dwPort < MIN_PORT) @@ -174,9 +174,9 @@ SERVER_PROCESS::SetupListenPort( // user set the env variable but did not give value, let's set it up // pEnvironmentVarTable->DeleteKey(ASPNETCORE_PORT_ENV_STR); + pEntry->Dereference(); + pEntry = NULL; } - pEntry->Dereference(); - pEntry = NULL; } WCHAR buffer[15]; diff --git a/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs b/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs index 89824163ed..3b86662717 100644 --- a/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs +++ b/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Net; using System.Net.Sockets; using System.Threading.Tasks; @@ -16,6 +17,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [Collection(PublishedSitesCollection.Name)] public class AspNetCorePortTests : IISFunctionalTestBase { + // Port range allowed by ANCM config + private const int _minPort = 1025; + private const int _maxPort = 48000; + private static readonly Random _random = new Random(); private readonly PublishedSitesFixture _fixture; @@ -31,9 +36,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests .WithApplicationTypes(ApplicationType.Portable) .WithAllAncmVersions(); + public static IEnumerable InvalidTestVariants + => from v in TestVariants.Select(v => v.Single()) + from s in new string[] { (_minPort - 1).ToString(), (_maxPort + 1).ToString(), "noninteger" } + select new object[] { v, s }; + [ConditionalTheory] [MemberData(nameof(TestVariants))] - public async Task EnvVarInWebConfig(TestVariant variant) + public async Task EnvVarInWebConfig_Valid(TestVariant variant) { // Must publish to set env vars in web.config var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); @@ -42,18 +52,44 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.HttpClient.GetAsync("/ServerAddresses"); - var responseText = await response.Content.ReadAsStringAsync(); + var responseText = await deploymentResult.HttpClient.GetStringAsync("/ServerAddresses"); Assert.Equal(port, new Uri(responseText).Port); } + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task EnvVarInWebConfig_Empty(TestVariant variant) + { + // Must publish to set env vars in web.config + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_PORT"] = string.Empty; + + var deploymentResult = await DeployAsync(deploymentParameters); + + var responseText = await deploymentResult.HttpClient.GetStringAsync("/ServerAddresses"); + + // If env var is empty, ANCM should assign a random port (same as no env var) + Assert.InRange(new Uri(responseText).Port, _minPort, _maxPort); + } + + [ConditionalTheory] + [MemberData(nameof(InvalidTestVariants))] + public async Task EnvVarInWebConfig_Invalid(TestVariant variant, string port) + { + // Must publish to set env vars in web.config + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_PORT"] = port; + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/ServerAddresses"); + + Assert.Equal(HttpStatusCode.BadGateway, response.StatusCode); + } + private static int GetUnusedRandomPort() { - // Port range allowed by ANCM config - const int minPort = 1025; - const int maxPort = 48000; - // Large number of retries to prevent test failures due to port collisions, but not infinite // to prevent infinite loop in case Bind() fails repeatedly for some other reason. const int retries = 100; @@ -62,7 +98,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests for (var i = 0; i < retries; i++) { - var port = _random.Next(minPort, maxPort); + var port = _random.Next(_minPort, _maxPort); using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) { From 2778570f0b2bbf29308f8a6fa4f96e0937f3b1d3 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 21 Aug 2018 14:03:26 -0700 Subject: [PATCH 230/363] Redirect native logs into stdout and pipe (#1154) --- .../AspNetCore/HandlerResolver.cpp | 49 ++++- .../AspNetCore/aspnetcore_shim_config.cpp | 10 +- .../AspNetCore/aspnetcore_shim_config.h | 17 +- .../CommonLib/CommonLib.vcxproj | 10 + src/AspNetCoreModuleV2/CommonLib/EventLog.cpp | 2 +- .../CommonLib/FileOutputManager.cpp | 190 +++++++++++++++++ .../FileOutputManager.h | 14 +- .../CommonLib/HandleWrapper.h | 1 + .../IOutputManager.h | 6 +- .../LoggingHelpers.cpp | 18 +- .../LoggingHelpers.h | 4 +- .../NullOutputManager.h | 0 .../PipeOutputManager.cpp | 175 +++++++++------- .../PipeOutputManager.h | 28 ++- .../CommonLib/StdWrapper.cpp | 148 +++++++++++++ src/AspNetCoreModuleV2/CommonLib/StdWrapper.h | 25 +++ .../CommonLib/aspnetcore_msg.mc | 6 +- src/AspNetCoreModuleV2/CommonLib/resources.h | 8 +- src/AspNetCoreModuleV2/CommonLib/sttimer.h | 1 + .../inprocessapplication.cpp | 40 ++-- .../inprocessapplication.h | 2 +- .../RequestHandlerLib/FileOutputManager.cpp | 195 ------------------ .../RequestHandlerLib.vcxproj | 8 - .../IISDeployer.cs | 7 + .../IISDeployerBase.cs | 2 + .../IISDeploymentParameterExtensions.cs | 10 + .../IISDeploymentParameters.cs | 3 - .../IISExpressDeployer.cs | 9 +- .../Inprocess/EventLogTests.cs | 6 +- .../Inprocess/LoggingTests.cs | 11 +- .../MultiApplicationTests.cs | 1 + .../Utilities/EventLogHelpers.cs | 15 +- .../Utilities/FunctionalTestsBase.cs | 10 +- .../Utilities/SkipIfDebugAttribute.cs | 22 ++ .../CommonLibTests/FileOutputManagerTests.cpp | 55 +++-- .../CommonLibTests/PipeOutputManagerTests.cpp | 103 ++++++++- .../Inprocess/StdOutRedirectionTests.cs | 171 +++++++++++++++ .../InProcess/ShutdownTests.cs | 7 +- 38 files changed, 989 insertions(+), 400 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp rename src/AspNetCoreModuleV2/{RequestHandlerLib => CommonLib}/FileOutputManager.h (70%) rename src/AspNetCoreModuleV2/{RequestHandlerLib => CommonLib}/IOutputManager.h (94%) rename src/AspNetCoreModuleV2/{RequestHandlerLib => CommonLib}/LoggingHelpers.cpp (62%) rename src/AspNetCoreModuleV2/{RequestHandlerLib => CommonLib}/LoggingHelpers.h (81%) rename src/AspNetCoreModuleV2/{RequestHandlerLib => CommonLib}/NullOutputManager.h (100%) rename src/AspNetCoreModuleV2/{RequestHandlerLib => CommonLib}/PipeOutputManager.cpp (50%) rename src/AspNetCoreModuleV2/{RequestHandlerLib => CommonLib}/PipeOutputManager.h (53%) create mode 100644 src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/StdWrapper.h delete mode 100644 src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp create mode 100644 test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs create mode 100644 test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index 6c78cc16a6..49d1a29093 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -10,6 +10,8 @@ #include "GlobalVersionUtility.h" #include "HandleWrapper.h" #include "file_utility.h" +#include "LoggingHelpers.h" +#include "resources.h" const PCWSTR HandlerResolver::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; const PCWSTR HandlerResolver::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; @@ -46,6 +48,7 @@ HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, STRU if (pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) { std::unique_ptr options; + std::unique_ptr outputManager; RETURN_IF_FAILED(HOSTFXR_OPTIONS::Create( NULL, @@ -56,14 +59,35 @@ HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, STRU RETURN_IF_FAILED(location.Copy(options->GetExeLocation())); - if (FAILED_LOG(hr = FindNativeAssemblyFromHostfxr(options.get(), pstrHandlerDllName, &struFileName))) - { - EventLog::Error( - ASPNETCORE_EVENT_INPROCESS_RH_MISSING, - ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG, - struFileName.IsEmpty() ? s_pwzAspnetcoreInProcessRequestHandlerName : struFileName.QueryStr()); + RETURN_IF_FAILED(LoggingHelpers::CreateLoggingProvider( + pConfiguration->QueryStdoutLogEnabled(), + !m_pServer.IsCommandLineLaunch(), + pConfiguration->QueryStdoutLogFile()->QueryStr(), + pApplication.GetApplicationPhysicalPath(), + outputManager)); + + outputManager->Start(); + + hr = FindNativeAssemblyFromHostfxr(options.get(), pstrHandlerDllName, &struFileName); + outputManager->Stop(); + + if (FAILED(hr) && m_hHostFxrDll != NULL) + { + STRA content; + STRU struStdMsg; + + outputManager->GetStdOutContent(&content); + if (content.QueryCCH() > 0) + { + struStdMsg.CopyA(content.QueryStr()); + } + + EventLog::Error( + ASPNETCORE_EVENT_GENERAL_ERROR, + ASPNETCORE_EVENT_INPROCESS_RH_ERROR_MSG, + struFileName.IsEmpty() ? s_pwzAspnetcoreInProcessRequestHandlerName : struFileName.QueryStr(), + struStdMsg.QueryStr()); - return hr; } } else @@ -188,12 +212,23 @@ HandlerResolver::FindNativeAssemblyFromHostfxr( BOOL fFound = FALSE; DWORD dwBufferSize = 1024 * 10; DWORD dwRequiredBufferSize = 0; + STRA output; + DBG_ASSERT(struFilename != NULL); RETURN_LAST_ERROR_IF_NULL(m_hHostFxrDll = LoadLibraryW(hostfxrOptions->GetHostFxrLocation())); auto pFnHostFxrSearchDirectories = reinterpret_cast(GetProcAddress(m_hHostFxrDll, "hostfxr_get_native_search_directories")); + if (pFnHostFxrSearchDirectories == nullptr) + { + EventLog::Error( + ASPNETCORE_EVENT_GENERAL_ERROR, + ASPNETCORE_EVENT_HOSTFXR_DLL_INVALID_VERSION_MSG, + hostfxrOptions->GetHostFxrLocation() + ); + RETURN_IF_FAILED(E_FAIL); + } RETURN_LAST_ERROR_IF_NULL(pFnHostFxrSearchDirectories); RETURN_IF_FAILED(struNativeSearchPaths.Resize(dwBufferSize)); diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp index 10adc6e2b4..bdd76953ac 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp @@ -29,7 +29,7 @@ ASPNETCORE_SHIM_CONFIG::Populate( CS_ASPNETCORE_PROCESS_EXE_PATH, &m_struProcessPath)); - // Swallow this error for backward compatability + // Swallow this error for backward compatibility // Use default behavior for empty string GetElementStringProperty(pAspNetCoreElement, CS_ASPNETCORE_HOSTING_MODEL, @@ -62,5 +62,13 @@ ASPNETCORE_SHIM_CONFIG::Populate( RETURN_IF_FAILED(ConfigUtility::FindHandlerVersion(pAspNetCoreElement, m_struHandlerVersion)); } + + RETURN_IF_FAILED(GetElementBoolProperty(pAspNetCoreElement, + CS_ASPNETCORE_STDOUT_LOG_ENABLED, + &m_fStdoutLogEnabled)); + RETURN_IF_FAILED(GetElementStringProperty(pAspNetCoreElement, + CS_ASPNETCORE_STDOUT_LOG_FILE, + &m_struStdoutLogFile)); + return S_OK; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h index 1ae97f79af..e80071b1c9 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h @@ -12,6 +12,8 @@ #define CS_ASPNETCORE_PROCESS_EXE_PATH L"processPath" #define CS_ASPNETCORE_PROCESS_ARGUMENTS L"arguments" #define CS_ASPNETCORE_HOSTING_MODEL L"hostingModel" +#define CS_ASPNETCORE_STDOUT_LOG_ENABLED L"stdoutLogEnabled" +#define CS_ASPNETCORE_STDOUT_LOG_FILE L"stdoutLogFile" enum APP_HOSTING_MODEL { @@ -56,6 +58,18 @@ public: return &m_struHandlerVersion; } + BOOL + QueryStdoutLogEnabled() + { + return m_fStdoutLogEnabled; + } + + STRU* + QueryStdoutLogFile() + { + return &m_struStdoutLogFile; + } + ASPNETCORE_SHIM_CONFIG() : m_hostingModel(HOSTING_UNKNOWN) { @@ -67,5 +81,6 @@ private: STRU m_struProcessPath; APP_HOSTING_MODEL m_hostingModel; STRU m_struHandlerVersion; + BOOL m_fStdoutLogEnabled; + STRU m_struStdoutLogFile; }; - diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 12e6ff1691..47a5373ee1 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -200,6 +200,7 @@ + @@ -207,7 +208,12 @@ + + + + + @@ -220,11 +226,15 @@ + + + + diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp b/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp index 7d10a8abf9..24992232de 100644 --- a/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp @@ -27,7 +27,7 @@ EventLog::LogEvent( ); } - DebugPrintf(dwEventInfoType == EVENTLOG_ERROR_TYPE ? ASPNETCORE_DEBUG_FLAG_ERROR : ASPNETCORE_DEBUG_FLAG_INFO, "Event Log: %S", pstrMsg); + DebugPrintf(dwEventInfoType == EVENTLOG_ERROR_TYPE ? ASPNETCORE_DEBUG_FLAG_ERROR : ASPNETCORE_DEBUG_FLAG_INFO, "Event Log: %S \r\nEnd Event Log Message.", pstrMsg); } VOID diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp new file mode 100644 index 0000000000..6e16ac2acd --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp @@ -0,0 +1,190 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "FileOutputManager.h" +#include "sttimer.h" +#include "exceptions.h" +#include "debugutil.h" +#include "SRWExclusiveLock.h" +#include "file_utility.h" +#include "StdWrapper.h" + +extern HINSTANCE g_hModule; + +FileOutputManager::FileOutputManager() : + FileOutputManager(/* fEnableNativeLogging */ true) { } + +FileOutputManager::FileOutputManager(bool fEnableNativeLogging) : + m_hLogFileHandle(INVALID_HANDLE_VALUE), + m_disposed(false), + stdoutWrapper(nullptr), + stderrWrapper(nullptr), + m_fEnableNativeRedirection(fEnableNativeLogging) +{ + InitializeSRWLock(&m_srwLock); +} + +FileOutputManager::~FileOutputManager() +{ + FileOutputManager::Stop(); +} + +HRESULT +FileOutputManager::Initialize(PCWSTR pwzStdOutLogFileName, PCWSTR pwzApplicationPath) +{ + RETURN_IF_FAILED(m_wsApplicationPath.Copy(pwzApplicationPath)); + RETURN_IF_FAILED(m_wsStdOutLogFileName.Copy(pwzStdOutLogFileName)); + + return S_OK; +} + +// Start redirecting stdout and stderr into the file handle. +// Uses sttimer to continuously flush output into the file. +HRESULT +FileOutputManager::Start() +{ + SYSTEMTIME systemTime; + SECURITY_ATTRIBUTES saAttr = { 0 }; + STRU struPath; + + // Concatenate the log file name and application path + RETURN_IF_FAILED(FILE_UTILITY::ConvertPathToFullPath( + m_wsStdOutLogFileName.QueryStr(), + m_wsApplicationPath.QueryStr(), + &struPath)); + + RETURN_IF_FAILED(FILE_UTILITY::EnsureDirectoryPathExist(struPath.QueryStr())); + + // Get the module name and add it to the log file name + // as two log files will be created, one from the shim + // and one from the request handler. + WCHAR path[MAX_PATH]; + RETURN_LAST_ERROR_IF(!GetModuleFileName(g_hModule, path, sizeof(path))); + std::filesystem::path fsPath(path); + + // TODO fix string as it is incorrect + GetSystemTime(&systemTime); + + RETURN_IF_FAILED( + m_struLogFilePath.SafeSnwprintf(L"%s_%d%02d%02d%02d%02d%02d_%d_%s.log", + struPath.QueryStr(), + systemTime.wYear, + systemTime.wMonth, + systemTime.wDay, + systemTime.wHour, + systemTime.wMinute, + systemTime.wSecond, + GetCurrentProcessId(), + fsPath.filename().stem().c_str())); + + saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); + saAttr.bInheritHandle = TRUE; + saAttr.lpSecurityDescriptor = NULL; + + // Create the file with both READ and WRITE. + m_hLogFileHandle = CreateFileW(m_struLogFilePath.QueryStr(), + FILE_READ_DATA | FILE_WRITE_DATA, + FILE_SHARE_READ, + &saAttr, + CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + nullptr); + + RETURN_LAST_ERROR_IF(m_hLogFileHandle == INVALID_HANDLE_VALUE); + + stdoutWrapper = std::make_unique(stdout, STD_OUTPUT_HANDLE, m_hLogFileHandle, m_fEnableNativeRedirection); + stderrWrapper = std::make_unique(stderr, STD_ERROR_HANDLE, m_hLogFileHandle, m_fEnableNativeRedirection); + + stdoutWrapper->StartRedirection(); + stderrWrapper->StartRedirection(); + + return S_OK; +} + + +HRESULT +FileOutputManager::Stop() +{ + STRA straStdOutput; + CHAR pzFileContents[MAX_FILE_READ_SIZE] = { 0 }; + DWORD dwNumBytesRead; + LARGE_INTEGER li = { 0 }; + DWORD dwFilePointer = 0; + HANDLE handle = NULL; + WIN32_FIND_DATA fileData; + + if (m_disposed) + { + return S_OK; + } + + SRWExclusiveLock lock(m_srwLock); + + if (m_disposed) + { + return S_OK; + } + + m_disposed = true; + + if (m_hLogFileHandle == INVALID_HANDLE_VALUE) + { + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + FlushFileBuffers(m_hLogFileHandle); + + if (stdoutWrapper != nullptr) + { + RETURN_IF_FAILED(stdoutWrapper->StopRedirection()); + } + + if (stderrWrapper != nullptr) + { + RETURN_IF_FAILED(stderrWrapper->StopRedirection()); + } + + // delete empty log file + handle = FindFirstFile(m_struLogFilePath.QueryStr(), &fileData); + if (handle != INVALID_HANDLE_VALUE && + handle != NULL && + fileData.nFileSizeHigh == 0 && + fileData.nFileSizeLow == 0) // skip check of nFileSizeHigh + { + FindClose(handle); + LOG_LAST_ERROR_IF(!DeleteFile(m_struLogFilePath.QueryStr())); + } + + // Read the first 30Kb from the file and store it in a buffer. + // By doing this, we can close the handle to the file and be done with it. + RETURN_LAST_ERROR_IF(!GetFileSizeEx(m_hLogFileHandle, &li)); + + if (li.LowPart == 0 || li.HighPart > 0) + { + RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + } + + dwFilePointer = SetFilePointer(m_hLogFileHandle, 0, NULL, FILE_BEGIN); + + RETURN_LAST_ERROR_IF(dwFilePointer == INVALID_SET_FILE_POINTER); + + RETURN_LAST_ERROR_IF(!ReadFile(m_hLogFileHandle, pzFileContents, MAX_FILE_READ_SIZE, &dwNumBytesRead, NULL)); + + m_straFileContent.Copy(pzFileContents, dwNumBytesRead); + + // printf will fail in in full IIS + if (printf(m_straFileContent.QueryStr()) != -1) + { + // Need to flush contents for the new stdout and stderr + _flushall(); + } + + return S_OK; +} + +bool FileOutputManager::GetStdOutContent(STRA* struStdOutput) +{ + struStdOutput->Copy(m_straFileContent); + return m_straFileContent.QueryCCH() > 0; +} diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h similarity index 70% rename from src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h rename to src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h index b1a43e6b0d..94f6e19176 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h @@ -6,12 +6,17 @@ #include "sttimer.h" #include "IOutputManager.h" #include "HandleWrapper.h" +#include "StdWrapper.h" +#include "stringa.h" +#include "stringu.h" class FileOutputManager : public IOutputManager { #define FILE_FLUSH_TIMEOUT 3000 + #define MAX_FILE_READ_SIZE 30000 public: FileOutputManager(); + FileOutputManager(bool fEnableNativeLogging); ~FileOutputManager(); HRESULT @@ -27,9 +32,10 @@ private: STRU m_wsStdOutLogFileName; STRU m_wsApplicationPath; STRU m_struLogFilePath; - int m_fdPreviousStdOut; - int m_fdPreviousStdErr; + STRA m_straFileContent; BOOL m_disposed; - SRWLOCK m_srwLock; + BOOL m_fEnableNativeRedirection; + SRWLOCK m_srwLock{}; + std::unique_ptr stdoutWrapper; + std::unique_ptr stderrWrapper; }; - diff --git a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h index 6764f4c14d..d6b50f2381 100644 --- a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h +++ b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h @@ -4,6 +4,7 @@ #pragma once #include +#include struct InvalidHandleTraits { diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/IOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h similarity index 94% rename from src/AspNetCoreModuleV2/RequestHandlerLib/IOutputManager.h rename to src/AspNetCoreModuleV2/CommonLib/IOutputManager.h index b7e04df059..6b733dd0e6 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/IOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h @@ -1,9 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "stdafx.h" - #pragma once + +#include "stdafx.h" +#include "stringa.h" + class IOutputManager { public: diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.cpp b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp similarity index 62% rename from src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.cpp rename to src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp index a133172db4..69de017e7f 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp @@ -7,14 +7,18 @@ #include "FileOutputManager.h" #include "PipeOutputManager.h" #include "NullOutputManager.h" +#include "debugutil.h" +#include +#include +#include "ntassert.h" HRESULT LoggingHelpers::CreateLoggingProvider( bool fIsLoggingEnabled, - bool fEnablePipe, + bool fEnableNativeLogging, PCWSTR pwzStdOutFileName, PCWSTR pwzApplicationPath, - _Out_ IOutputManager** outputManager + std::unique_ptr& outputManager ) { HRESULT hr = S_OK; @@ -25,17 +29,17 @@ LoggingHelpers::CreateLoggingProvider( { if (fIsLoggingEnabled) { - FileOutputManager* manager = new FileOutputManager; + auto manager = std::make_unique(fEnableNativeLogging); hr = manager->Initialize(pwzStdOutFileName, pwzApplicationPath); - *outputManager = manager; + outputManager = std::move(manager); } - else if (fEnablePipe) + else if (!GetConsoleWindow()) { - *outputManager = new PipeOutputManager; + outputManager = std::make_unique(fEnableNativeLogging); } else { - *outputManager = new NullOutputManager; + outputManager = std::make_unique(); } } catch (std::bad_alloc&) diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.h b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h similarity index 81% rename from src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.h rename to src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h index f11a4ff5f5..0c06f759cf 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/LoggingHelpers.h +++ b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h @@ -13,10 +13,10 @@ public: HRESULT CreateLoggingProvider( bool fLoggingEnabled, - bool fEnablePipe, + bool fEnableNativeLogging, PCWSTR pwzStdOutFileName, PCWSTR pwzApplicationPath, - _Out_ IOutputManager** outputManager + std::unique_ptr& outputManager ); }; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/NullOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/NullOutputManager.h rename to src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp similarity index 50% rename from src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp rename to src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp index 6fdcdb078b..54fb162fe4 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp @@ -5,63 +5,74 @@ #include "PipeOutputManager.h" #include "exceptions.h" #include "SRWExclusiveLock.h" +#include "StdWrapper.h" +#include "ntassert.h" #define LOG_IF_DUPFAIL(err) do { if (err == -1) { LOG_IF_FAILED(HRESULT_FROM_WIN32(_doserrno)); } } while (0, 0); #define LOG_IF_ERRNO(err) do { if (err != 0) { LOG_IF_FAILED(HRESULT_FROM_WIN32(_doserrno)); } } while (0, 0); -PipeOutputManager::PipeOutputManager() : - m_dwStdErrReadTotal(0), +PipeOutputManager::PipeOutputManager() + : PipeOutputManager( /* fEnableNativeLogging */ true) +{ +} + +PipeOutputManager::PipeOutputManager(bool fEnableNativeLogging) : m_hErrReadPipe(INVALID_HANDLE_VALUE), m_hErrWritePipe(INVALID_HANDLE_VALUE), - m_hErrThread(NULL), + m_hErrThread(nullptr), + m_dwStdErrReadTotal(0), m_disposed(FALSE), - m_fdPreviousStdOut(-1), - m_fdPreviousStdErr(-1) + m_fEnableNativeRedirection(fEnableNativeLogging), + stdoutWrapper(nullptr), + stderrWrapper(nullptr) { InitializeSRWLock(&m_srwLock); } PipeOutputManager::~PipeOutputManager() { - Stop(); + PipeOutputManager::Stop(); } +// Start redirecting stdout and stderr into a pipe +// Continuously read the pipe on a background thread +// until Stop is called. HRESULT PipeOutputManager::Start() { SECURITY_ATTRIBUTES saAttr = { 0 }; HANDLE hStdErrReadPipe; HANDLE hStdErrWritePipe; - m_fdPreviousStdOut = _dup(_fileno(stdout)); - LOG_IF_DUPFAIL(m_fdPreviousStdOut); - - m_fdPreviousStdErr = _dup(_fileno(stderr)); - LOG_IF_DUPFAIL(m_fdPreviousStdErr); - RETURN_LAST_ERROR_IF(!CreatePipe(&hStdErrReadPipe, &hStdErrWritePipe, &saAttr, 0 /*nSize*/)); - // TODO this still doesn't redirect calls in native, like wprintf - RETURN_LAST_ERROR_IF(!SetStdHandle(STD_ERROR_HANDLE, hStdErrWritePipe)); - - RETURN_LAST_ERROR_IF(!SetStdHandle(STD_OUTPUT_HANDLE, hStdErrWritePipe)); - m_hErrReadPipe = hStdErrReadPipe; m_hErrWritePipe = hStdErrWritePipe; - // Read the stderr handle on a separate thread until we get 4096 bytes. + stdoutWrapper = std::make_unique(stdout, STD_OUTPUT_HANDLE, hStdErrWritePipe, m_fEnableNativeRedirection); + stderrWrapper = std::make_unique(stderr, STD_ERROR_HANDLE, hStdErrWritePipe, m_fEnableNativeRedirection); + + LOG_IF_FAILED(stdoutWrapper->StartRedirection()); + LOG_IF_FAILED(stderrWrapper->StartRedirection()); + + // Read the stderr handle on a separate thread until we get 30Kb. m_hErrThread = CreateThread( - NULL, // default security attributes + nullptr, // default security attributes 0, // default stack size - (LPTHREAD_START_ROUTINE)ReadStdErrHandle, + reinterpret_cast(ReadStdErrHandle), this, // thread function arguments 0, // default creation flags - NULL); // receive thread identifier + nullptr); // receive thread identifier RETURN_LAST_ERROR_IF_NULL(m_hErrThread); return S_OK; } +// Stop redirecting stdout and stderr into a pipe +// This closes the background thread reading from the pipe +// and prints any output that was captured in the pipe. +// If more than 30Kb was written to the pipe, that output will +// be thrown away. HRESULT PipeOutputManager::Stop() { DWORD dwThreadStatus = 0; @@ -71,57 +82,53 @@ HRESULT PipeOutputManager::Stop() { return S_OK; } + SRWExclusiveLock lock(m_srwLock); if (m_disposed) { return S_OK; } + m_disposed = true; - fflush(stdout); - fflush(stderr); - - // Restore the original stdout and stderr handles of the process, - // as the application has either finished startup or has exited. - - // If stdout/stderr were not set, we need to set it to NUL: - // such that other calls to Console.WriteLine don't use an invalid handle - FILE *stream; - - if (m_fdPreviousStdOut >= 0) - { - LOG_LAST_ERROR_IF(SetStdHandle(STD_OUTPUT_HANDLE, (HANDLE)_get_osfhandle(m_fdPreviousStdOut))); - } - else - { - LOG_IF_ERRNO(freopen_s(&stream, "NUL:", "w", stdout)); - } - - if (m_fdPreviousStdErr >= 0) - { - LOG_LAST_ERROR_IF(SetStdHandle(STD_ERROR_HANDLE, (HANDLE)_get_osfhandle(m_fdPreviousStdErr))); - } - else - { - LOG_IF_ERRNO(freopen_s(&stream, "NUL:", "w", stderr)); - } - + // Both pipe wrappers duplicate the pipe writer handle + // meaning we are fine to close the handle too. if (m_hErrWritePipe != INVALID_HANDLE_VALUE) { + // Flush the pipe writer before closing to capture all output + RETURN_LAST_ERROR_IF(!FlushFileBuffers(m_hErrWritePipe)); CloseHandle(m_hErrWritePipe); m_hErrWritePipe = INVALID_HANDLE_VALUE; } + // Tell each pipe wrapper to stop redirecting output and restore the original values + if (stdoutWrapper != nullptr) + { + LOG_IF_FAILED(stdoutWrapper->StopRedirection()); + } + + if (stderrWrapper != nullptr) + { + LOG_IF_FAILED(stderrWrapper->StopRedirection()); + } + + // Forces ReadFile to cancel, causing the read loop to complete. + // Don't check return value as IO may or may not be completed already. + if (m_hErrThread != nullptr) + { + CancelSynchronousIo(m_hErrThread); + } + // GetExitCodeThread returns 0 on failure; thread status code is invalid. - if (m_hErrThread != NULL && + if (m_hErrThread != nullptr && !LOG_LAST_ERROR_IF(GetExitCodeThread(m_hErrThread, &dwThreadStatus) == 0) && dwThreadStatus == STILL_ACTIVE) { - // wait for graceful shutdown, i.e., the exit of the background thread or timeout + // Wait for graceful shutdown, i.e., the exit of the background thread or timeout if (WaitForSingleObject(m_hErrThread, PIPE_OUTPUT_THREAD_TIMEOUT) != WAIT_OBJECT_0) { - // if the thread is still running, we need kill it first before exit to avoid AV + // If the thread is still running, we need kill it first before exit to avoid AV if (!LOG_LAST_ERROR_IF(GetExitCodeThread(m_hErrThread, &dwThreadStatus) == 0) && dwThreadStatus == STILL_ACTIVE) { @@ -131,42 +138,38 @@ HRESULT PipeOutputManager::Stop() } } - if (m_hErrThread != NULL) + if (m_hErrThread != nullptr) { CloseHandle(m_hErrThread); - m_hErrThread = NULL; + m_hErrThread = nullptr; } - if (m_hErrReadPipe != INVALID_HANDLE_VALUE) { CloseHandle(m_hErrReadPipe); m_hErrReadPipe = INVALID_HANDLE_VALUE; } + // If we captured any output, relog it to the original stdout + // Useful for the IIS Express scenario as it is running with stdout and stderr if (GetStdOutContent(&straStdOutput)) { - printf(straStdOutput.QueryStr()); - // Need to flush contents for the new stdout and stderr - _flushall(); + // printf will fail in in full IIS + if (printf(straStdOutput.QueryStr()) != -1) + { + // Need to flush contents for the new stdout and stderr + _flushall(); + } } return S_OK; } -VOID -PipeOutputManager::ReadStdErrHandle( - LPVOID pContext -) -{ - PipeOutputManager *pLoggingProvider = (PipeOutputManager*)pContext; - DBG_ASSERT(pLoggingProvider != NULL); - pLoggingProvider->ReadStdErrHandleInternal(); -} - bool PipeOutputManager::GetStdOutContent(STRA* straStdOutput) { bool fLogged = false; + + // TODO consider returning the file contents rather than copying. if (m_dwStdErrReadTotal > 0) { if (SUCCEEDED(straStdOutput->Copy(m_pzFileContents, m_dwStdErrReadTotal))) @@ -178,15 +181,29 @@ bool PipeOutputManager::GetStdOutContent(STRA* straStdOutput) return fLogged; } -VOID -PipeOutputManager::ReadStdErrHandleInternal( - VOID +void +PipeOutputManager::ReadStdErrHandle( + LPVOID pContext ) { + auto pLoggingProvider = static_cast(pContext); + DBG_ASSERT(pLoggingProvider != NULL); + pLoggingProvider->ReadStdErrHandleInternal(); +} + +void +PipeOutputManager::ReadStdErrHandleInternal() +{ + // If ReadFile ever returns false, exit the thread DWORD dwNumBytesRead = 0; while (true) { - if (ReadFile(m_hErrReadPipe, &m_pzFileContents[m_dwStdErrReadTotal], MAX_PIPE_READ_SIZE - m_dwStdErrReadTotal, &dwNumBytesRead, NULL)) + // Fill a maximum of MAX_PIPE_READ_SIZE into a buffer. + if (ReadFile(m_hErrReadPipe, + &m_pzFileContents[m_dwStdErrReadTotal], + MAX_PIPE_READ_SIZE - m_dwStdErrReadTotal, + &dwNumBytesRead, + nullptr)) { m_dwStdErrReadTotal += dwNumBytesRead; if (m_dwStdErrReadTotal >= MAX_PIPE_READ_SIZE) @@ -194,19 +211,21 @@ PipeOutputManager::ReadStdErrHandleInternal( break; } } - else if (GetLastError() == ERROR_BROKEN_PIPE) + else { return; } } - char tempBuffer[MAX_PIPE_READ_SIZE]; + // Using std::string as a wrapper around new char[] so we don't need to call delete + // Also don't allocate on stack as stack size is 128KB by default. + std::string tempBuffer; + tempBuffer.resize(MAX_PIPE_READ_SIZE); + + // After reading the maximum amount of data, keep reading in a loop until Stop is called on the output manager. while (true) { - if (ReadFile(m_hErrReadPipe, tempBuffer, MAX_PIPE_READ_SIZE, &dwNumBytesRead, NULL)) - { - } - else if (GetLastError() == ERROR_BROKEN_PIPE) + if (!ReadFile(m_hErrReadPipe, tempBuffer.data(), MAX_PIPE_READ_SIZE, &dwNumBytesRead, nullptr)) { return; } diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h similarity index 53% rename from src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h rename to src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h index 3a15c2e68e..0b51ff4038 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/PipeOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h @@ -4,35 +4,41 @@ #pragma once #include "IOutputManager.h" +#include "StdWrapper.h" +#include "stringu.h" class PipeOutputManager : public IOutputManager { + // Timeout to be used if a thread never exits #define PIPE_OUTPUT_THREAD_TIMEOUT 2000 - #define MAX_PIPE_READ_SIZE 4096 + + // Max event log message is ~32KB, limit pipe size just below that. + #define MAX_PIPE_READ_SIZE 30000 public: PipeOutputManager(); + PipeOutputManager(bool fEnableNativeLogging); ~PipeOutputManager(); - virtual HRESULT Start() override; - virtual HRESULT Stop() override; - virtual bool GetStdOutContent(STRA* struStdOutput) override; + HRESULT Start() override; + HRESULT Stop() override; + bool GetStdOutContent(STRA* straStdOutput) override; // Thread functions - VOID ReadStdErrHandleInternal(VOID); + void ReadStdErrHandleInternal(); - static - VOID ReadStdErrHandle(LPVOID pContext); + static void ReadStdErrHandle(LPVOID pContext); private: + HANDLE m_hErrReadPipe; HANDLE m_hErrWritePipe; STRU m_struLogFilePath; HANDLE m_hErrThread; CHAR m_pzFileContents[MAX_PIPE_READ_SIZE] = { 0 }; DWORD m_dwStdErrReadTotal; - SRWLOCK m_srwLock; - int m_fdPreviousStdOut; - int m_fdPreviousStdErr; + SRWLOCK m_srwLock {}; BOOL m_disposed; + BOOL m_fEnableNativeRedirection; + std::unique_ptr stdoutWrapper; + std::unique_ptr stderrWrapper; }; - diff --git a/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp b/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp new file mode 100644 index 0000000000..dffaa491c5 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp @@ -0,0 +1,148 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "StdWrapper.h" +#include "exceptions.h" +#include "LoggingHelpers.h" +#include +#include + +StdWrapper::StdWrapper(FILE* stdStream, DWORD stdHandleNumber, HANDLE handleToRedirectTo, BOOL fEnableNativeRedirection) + : m_previousFileDescriptor(0), + m_stdStream(stdStream), + m_stdHandleNumber(stdHandleNumber), + m_fEnableNativeRedirection(fEnableNativeRedirection), + m_handleToRedirectTo(handleToRedirectTo), + m_redirectedFile(nullptr) +{ +} + +StdWrapper::~StdWrapper() = default; + +// Redirects stdout/stderr to the provided handle. +// Example: +// If the handleToRedirecTo = 0x24 +// Before: +// _fileno(stdout) = 1 +// GetStdHandle(STD_OUTPUT_HANDLE) = 0x20 +// After: +// _fileno(stdout) = 3 +// GetStdHandle(STD_OUTPUT_HANDLE) = 0x28 <- Duplicated from 0x24 +HRESULT +StdWrapper::StartRedirection() +{ + HANDLE stdHandle; + + // In IIS, stdout and stderr are set to null as w3wp is created with DETACHED_PROCESS, + // so fileno(m_stdStream) returns -2. + // Open a null file such that undoing the redirection succeeds and _dup2 works. + // m_previousFileDescriptor will be used for restoring stdout/stderr + if (_fileno(m_stdStream) == -2) + { + freopen_s((FILE**)&m_stdStream, "nul", "w", m_stdStream); + m_previousFileDescriptor = _dup(_fileno(m_stdStream)); + } + else + { + m_previousFileDescriptor = _dup(_fileno(m_stdStream)); + } + + if (!m_fEnableNativeRedirection) + { + RETURN_LAST_ERROR_IF(!SetStdHandle(m_stdHandleNumber, m_handleToRedirectTo)); + + return S_OK; + } + // After setting the std handle, we need to set stdout/stderr to the current + // output/error handle. + + // Duplicate the handle before opening the handle and associating a file pointer. + // If we don't by calling close on the file, the same handle value will be closed + // multiple times. + // Note, by calling duplicate handle, the new handle returned will have a different value + // than the original, but point to the same underlying file object. + RETURN_LAST_ERROR_IF(!DuplicateHandle( + /* hSourceProcessHandle*/ GetCurrentProcess(), + /* hSourceHandle */ m_handleToRedirectTo, + /* hTargetProcessHandle */ GetCurrentProcess(), + /* lpTargetHandle */&stdHandle, + /* dwDesiredAccess */ 0, // dwDesired is ignored if DUPLICATE_SAME_ACCESS is specified + /* bInheritHandle */ TRUE, + /* dwOptions */ DUPLICATE_SAME_ACCESS)); + + RETURN_LAST_ERROR_IF(!SetStdHandle(m_stdHandleNumber, stdHandle)); + + // _open_osfhandle will associate a filedescriptor with the handle. + const auto fileDescriptor = _open_osfhandle(reinterpret_cast(stdHandle), _O_WTEXT | _O_TEXT); + + if (fileDescriptor == -1) + { + RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + } + + m_redirectedFile = _fdopen(fileDescriptor, "w"); + + if (m_redirectedFile == nullptr) + { + RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + } + + // Set stdout/stderr to the newly created file. + const auto dup2Result = _dup2(_fileno(m_redirectedFile), _fileno(m_stdStream)); + + if (dup2Result != 0) + { + RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + } + + // Removes buffering from the output + if (setvbuf(m_stdStream, nullptr, _IONBF, 0) != 0) + { + RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + } + + return S_OK; +} + +// Redirects stdout/stderr back to the original stdout/stderr. +// Note, this will not restore the original handle values returned by GetStdHandle, +// rather a duplicated number. This is because the original handle value is invalid +// due to dup2 closing the file originally in stdout/stderr +HRESULT +StdWrapper::StopRedirection() const +{ + // After setting the std handle, we need to set stdout/stderr to the current + // output/error handle. + FILE * file = _fdopen(m_previousFileDescriptor, "w"); + if (file == nullptr) + { + RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + } + + RETURN_LAST_ERROR_IF(!SetStdHandle(m_stdHandleNumber, reinterpret_cast(_get_osfhandle(m_previousFileDescriptor)))); + + if (!m_fEnableNativeRedirection) + { + return S_OK; + } + + // Set stdout/stderr to the newly created file output. + const auto dup2Result = _dup2(_fileno(file), _fileno(m_stdStream)); + if (dup2Result != 0) + { + RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + } + + if (setvbuf(m_stdStream, nullptr, _IONBF, 0) != 0) + { + RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + } + + if (fclose(m_redirectedFile) != 0) + { + RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + } + + return S_OK; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h b/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h new file mode 100644 index 0000000000..f03b2ff060 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h @@ -0,0 +1,25 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include + +// Wraps stdout/stderr stream, modifying them to redirect to the given handle +class StdWrapper +{ +public: + StdWrapper(FILE* stdStream, DWORD stdHandleNumber, HANDLE handleToRedirectTo, BOOL fEnableNativeRedirection); + ~StdWrapper(); + HRESULT StartRedirection(); + HRESULT StopRedirection() const; + +private: + int m_previousFileDescriptor; + FILE* m_stdStream; + DWORD m_stdHandleNumber; + BOOL m_fEnableNativeRedirection; + HANDLE m_handleToRedirectTo; + FILE* m_redirectedFile; +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc index c71cbfeee2..5b4c244c63 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc +++ b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc @@ -177,19 +177,19 @@ Language=English . Messageid=1025 -SymbolicName=ASPNETCORE_EVENT_GENERAL_INFO_MSG +SymbolicName=ASPNETCORE_EVENT_GENERAL_INFO Language=English %1 . Messageid=1026 -SymbolicName=ASPNETCORE_EVENT_GENERAL_WARNING_MSG +SymbolicName=ASPNETCORE_EVENT_GENERAL_WARNING Language=English %1 . Messageid=1027 -SymbolicName=ASPNETCORE_EVENT_GENERAL_ERROR_MSG +SymbolicName=ASPNETCORE_EVENT_GENERAL_ERROR Language=English %1 . diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index cf5aa90f1e..82f22c52c0 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -31,8 +31,8 @@ #define ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG L"Mixed hosting model is not supported. Application '%s' configured with different hostingModel value '%d' other than the one of running application(s)." #define ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR_MSG L"Unknown hosting model '%s'. Please specify either hostingModel=\"inprocess\" or hostingModel=\"outofprocess\" in the web.config file." #define ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG L"Failed to start application '%s', ErrorCode '0x%x'." -#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x. Last 4KB characters of captured stdout and stderr logs:\r\n%s" -#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x. Please check the stderr logs for more information." +#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x'. Last 4KB characters of captured stdout and stderr logs:\r\n%s" +#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x'. Please check the stderr logs for more information." #define ASPNETCORE_EVENT_APP_IN_SHUTDOWN_MSG L"Application shutting down." #define ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG L"Application '%s' was recycled after detecting the app_offline file." #define ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR_MSG L"Monitoring app_offline.htm failed for application '%s', ErrorCode '0x%x'. " @@ -43,9 +43,11 @@ #define ASPNETCORE_EVENT_PORTABLE_APP_DOTNET_MISSING_MSG L"Could not find dotnet.exe on the system PATH environment variable for portable application '%s'. Check that a valid path to dotnet is on the PATH and the bitness of dotnet matches the bitness of the IIS worker process. ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND_MSG L"Could not find the hostfxr directory '%s' in the dotnet directory. ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND_MSG L"Could not find hostfxr.dll in '%s'. ErrorCode = '0x%x'." +#define ASPNETCORE_EVENT_HOSTFXR_DLL_INVALID_VERSION_MSG L"Hostfxr version used does not support 'hostfxr_get_native_search_directories', update the version of hostfxr to a higher version. Path to hostfxr: '%s'." +#define ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_LEVEL EVENTLOG_ERROR_TYPE #define ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_MSG L"Could not find application executable in '%s'. ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, ErrorCode = '0x%x. Please check the stderr logs for more information." #define ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG L"Invalid or unknown processPath provided in web.config: processPath = '%s', ErrorCode = '0x%x'." -#define ASPNETCORE_EVENT_INPROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application." +#define ASPNETCORE_EVENT_INPROCESS_RH_ERROR_MSG L"Could not find the assembly '%s' for in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application. Captured output: %s" #define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for out-of-process application. Please confirm the assembly is installed correctly for IIS or IISExpress." #define ASPNETCORE_EVENT_INPROCESS_START_SUCCESS_MSG L"Application '%s' started the coreclr in-process successfully." diff --git a/src/AspNetCoreModuleV2/CommonLib/sttimer.h b/src/AspNetCoreModuleV2/CommonLib/sttimer.h index 0ebbdbd822..26d79d0737 100644 --- a/src/AspNetCoreModuleV2/CommonLib/sttimer.h +++ b/src/AspNetCoreModuleV2/CommonLib/sttimer.h @@ -6,6 +6,7 @@ #ifndef _STTIMER_H #define _STTIMER_H +#include "stringu.h" class STTIMER { diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 352ec7b093..43a4071cf5 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -102,12 +102,6 @@ IN_PROCESS_APPLICATION::StopInternal(bool fServerInitiated) } } - if (m_pLoggerProvider != NULL) - { - delete m_pLoggerProvider; - m_pLoggerProvider = NULL; - } - Finished: if (FAILED(hr)) @@ -256,24 +250,7 @@ IN_PROCESS_APPLICATION::LoadManagedApplication } { - // Set up stdout redirect - SRWExclusiveLock lock(m_stateLock); - if (m_pLoggerProvider == NULL) - { - hr = LoggingHelpers::CreateLoggingProvider( - m_pConfig->QueryStdoutLogEnabled(), - !GetConsoleWindow(), - m_pConfig->QueryStdoutLogFile()->QueryStr(), - m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), - &m_pLoggerProvider); - if (FAILED(hr)) - { - goto Finished; - } - - LOG_IF_FAILED(m_pLoggerProvider->Start()); - } if (m_status != MANAGED_APPLICATION_STATUS::STARTING) { @@ -461,6 +438,20 @@ IN_PROCESS_APPLICATION::ExecuteApplication( FINISHED_IF_FAILED(SetEnvironementVariablesOnWorkerProcess()); } + LOG_INFO("Starting managed application"); + + if (m_pLoggerProvider == NULL) + { + FINISHED_IF_FAILED(hr = LoggingHelpers::CreateLoggingProvider( + m_pConfig->QueryStdoutLogEnabled(), + !m_pHttpServer.IsCommandLineLaunch(), + m_pConfig->QueryStdoutLogFile()->QueryStr(), + m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), + m_pLoggerProvider)); + + LOG_IF_FAILED(m_pLoggerProvider->Start()); + } + // There can only ever be a single instance of .NET Core // loaded in the process but we need to get config information to boot it up in the // first place. This is happening in an execute request handler and everyone waits @@ -482,7 +473,7 @@ Finished: // m_status = MANAGED_APPLICATION_STATUS::SHUTDOWN; m_fShutdownCalledFromManaged = TRUE; - FreeLibrary(hModule); + m_pLoggerProvider->Stop(); if (!m_fShutdownCalledFromNative) @@ -545,7 +536,6 @@ IN_PROCESS_APPLICATION::RunDotnetApplication(DWORD argc, CONST PCWSTR* argv, hos __try { - LOG_INFO("Starting managed application"); m_ProcessExitCode = pProc(argc, argv); if (m_ProcessExitCode != 0) { diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index 8993d7fc8e..10149cf3f3 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -150,7 +150,7 @@ private: static IN_PROCESS_APPLICATION* s_Application; - IOutputManager* m_pLoggerProvider; + std::unique_ptr m_pLoggerProvider; static const LPCSTR s_exeLocationParameterName; diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp deleted file mode 100644 index 29041f7ab5..0000000000 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/FileOutputManager.cpp +++ /dev/null @@ -1,195 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#include "stdafx.h" -#include "FileOutputManager.h" -#include "sttimer.h" -#include "exceptions.h" -#include "debugutil.h" -#include "SRWExclusiveLock.h" -#include "file_utility.h" - -FileOutputManager::FileOutputManager() : - m_hLogFileHandle(INVALID_HANDLE_VALUE), - m_fdPreviousStdOut(-1), - m_fdPreviousStdErr(-1), - m_disposed(false) -{ - InitializeSRWLock(&m_srwLock); -} - -FileOutputManager::~FileOutputManager() -{ - Stop(); -} - -HRESULT -FileOutputManager::Initialize(PCWSTR pwzStdOutLogFileName, PCWSTR pwzApplicationPath) -{ - RETURN_IF_FAILED(m_wsApplicationPath.Copy(pwzApplicationPath)); - RETURN_IF_FAILED(m_wsStdOutLogFileName.Copy(pwzStdOutLogFileName)); - - return S_OK; -} - -bool FileOutputManager::GetStdOutContent(STRA* struStdOutput) -{ - // - // Ungraceful shutdown, try to log an error message. - // This will be a common place for errors as it means the hostfxr_main returned - // or there was an exception. - // - CHAR pzFileContents[4096] = { 0 }; - DWORD dwNumBytesRead; - LARGE_INTEGER li = { 0 }; - BOOL fLogged = FALSE; - DWORD dwFilePointer = 0; - - if (m_hLogFileHandle != INVALID_HANDLE_VALUE) - { - if (GetFileSizeEx(m_hLogFileHandle, &li) && li.LowPart > 0 && li.HighPart == 0) - { - if (li.LowPart > 4096) - { - dwFilePointer = SetFilePointer(m_hLogFileHandle, -4096, NULL, FILE_END); - } - else - { - dwFilePointer = SetFilePointer(m_hLogFileHandle, 0, NULL, FILE_BEGIN); - } - - if (dwFilePointer != INVALID_SET_FILE_POINTER) - { - // Read file fails. - if (ReadFile(m_hLogFileHandle, pzFileContents, 4096, &dwNumBytesRead, NULL)) - { - if (SUCCEEDED(struStdOutput->Copy(pzFileContents, dwNumBytesRead))) - { - fLogged = TRUE; - } - } - } - } - } - - return fLogged; -} - -HRESULT -FileOutputManager::Start() -{ - SYSTEMTIME systemTime; - SECURITY_ATTRIBUTES saAttr = { 0 }; - STRU struPath; - - RETURN_IF_FAILED(FILE_UTILITY::ConvertPathToFullPath( - m_wsStdOutLogFileName.QueryStr(), - m_wsApplicationPath.QueryStr(), - &struPath)); - - RETURN_IF_FAILED(FILE_UTILITY::EnsureDirectoryPathExist(struPath.QueryStr())); - - GetSystemTime(&systemTime); - - RETURN_IF_FAILED( - m_struLogFilePath.SafeSnwprintf(L"%s_%d%02d%02d%02d%02d%02d_%d.log", - struPath.QueryStr(), - systemTime.wYear, - systemTime.wMonth, - systemTime.wDay, - systemTime.wHour, - systemTime.wMinute, - systemTime.wSecond, - GetCurrentProcessId())); - - m_fdPreviousStdOut = _dup(_fileno(stdout)); - m_fdPreviousStdErr = _dup(_fileno(stderr)); - - m_hLogFileHandle = CreateFileW(m_struLogFilePath.QueryStr(), - FILE_READ_DATA | FILE_WRITE_DATA, - FILE_SHARE_READ, - &saAttr, - CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, - NULL); - - if (m_hLogFileHandle == INVALID_HANDLE_VALUE) - { - return LOG_IF_FAILED(HRESULT_FROM_WIN32(GetLastError())); - } - - // There are a few options for redirecting stdout/stderr, - // but there are issues with most of them. - // AllocConsole() - // *stdout = *m_pStdFile; - // *stderr = *m_pStdFile; - // Calling _dup2 on stderr fails on IIS. IIS sets stderr to -2 - // _dup2(_fileno(m_pStdFile), _fileno(stdout)); - // _dup2(_fileno(m_pStdFile), _fileno(stderr)); - // If we were okay setting stdout and stderr to separate files, we could use: - // _wfreopen_s(&m_pStdFile, struLogFileName.QueryStr(), L"w+", stdout); - // _wfreopen_s(&m_pStdFile, struLogFileName.QueryStr(), L"w+", stderr); - // Calling SetStdHandle works for redirecting managed logs, however you cannot - // capture native logs (including hostfxr failures). - - RETURN_LAST_ERROR_IF(!SetStdHandle(STD_OUTPUT_HANDLE, m_hLogFileHandle)); - - RETURN_LAST_ERROR_IF(!SetStdHandle(STD_ERROR_HANDLE, m_hLogFileHandle)); - - // Periodically flush the log content to file - m_Timer.InitializeTimer(STTIMER::TimerCallback, &m_struLogFilePath, 3000, 3000); - - LOG_INFOF("Created log file for inprocess application: %S", - m_struLogFilePath.QueryStr()); - - return S_OK; -} - - -HRESULT -FileOutputManager::Stop() -{ - if (m_disposed) - { - return S_OK; - } - SRWExclusiveLock lock(m_srwLock); - if (m_disposed) - { - return S_OK; - } - m_disposed = true; - - HANDLE handle = NULL; - WIN32_FIND_DATA fileData; - - if (m_hLogFileHandle != INVALID_HANDLE_VALUE) - { - m_Timer.CancelTimer(); - } - - // delete empty log file - handle = FindFirstFile(m_struLogFilePath.QueryStr(), &fileData); - if (handle != INVALID_HANDLE_VALUE && - handle != NULL && - fileData.nFileSizeHigh == 0 && - fileData.nFileSizeLow == 0) // skip check of nFileSizeHigh - { - FindClose(handle); - LOG_LAST_ERROR_IF(!DeleteFile(m_struLogFilePath.QueryStr())); - } - - if (m_fdPreviousStdOut >= 0) - { - LOG_LAST_ERROR_IF(!SetStdHandle(STD_OUTPUT_HANDLE, (HANDLE)_get_osfhandle(m_fdPreviousStdOut))); - LOG_INFOF("Restoring original stdout: %d", m_fdPreviousStdOut); - } - - if (m_fdPreviousStdErr >= 0) - { - LOG_LAST_ERROR_IF(!SetStdHandle(STD_ERROR_HANDLE, (HANDLE)_get_osfhandle(m_fdPreviousStdErr))); - LOG_INFOF("Restoring original stderr: %d", m_fdPreviousStdOut); - } - - return S_OK; -} diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj index 56025b071a..a2c89e2b40 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -193,22 +193,14 @@ - - - - - - - - diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 8c07bec312..743944d971 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -44,6 +44,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } public override void Dispose() + { + Dispose(gracefulShutdown: false); + } + + public override void Dispose(bool gracefulShutdown) { Stop(); @@ -128,6 +133,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } } + + private void GetLogsFromFile() { try diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs index be6f39edec..d0745b4f01 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs @@ -151,5 +151,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS .GetOrAdd("add", "name", ancmVersion) .SetAttributeValue("image", GetAncmLocation(DeploymentParameters.AncmVersion)); } + + public abstract void Dispose(bool gracefulShutdown); } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs index f1e90f1a24..485c61cf4c 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO; using System.Linq; using System.Xml.Linq; @@ -50,5 +51,14 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS .SetAttributeValue("enabled", "true"); }); } + + public static void EnableLogging(this IISDeploymentParameters deploymentParameters, string path) + { + deploymentParameters.WebConfigActionList.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogEnabled", "true")); + + deploymentParameters.WebConfigActionList.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogFile", Path.Combine(path, "std"))); + } } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs index 30e3f13c25..3b2dfc4804 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs @@ -37,7 +37,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS ServerConfigActionList = tempParameters.ServerConfigActionList; WebConfigBasedEnvironmentVariables = tempParameters.WebConfigBasedEnvironmentVariables; HandlerSettings = tempParameters.HandlerSettings; - GracefulShutdown = tempParameters.GracefulShutdown; } } @@ -49,7 +48,5 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS public IDictionary HandlerSettings { get; set; } = new Dictionary(); - public bool GracefulShutdown { get; set; } - } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index fd2aca9b4c..797c46dde9 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS private const string FailedToInitializeBindingsMessage = "Failed to initialize site bindings"; private const string UnableToStartIISExpressMessage = "Unable to start iisexpress."; private const int MaximumAttempts = 5; - private readonly TimeSpan ShutdownTimeSpan = TimeSpan.FromSeconds(60); + private readonly TimeSpan ShutdownTimeSpan = Debugger.IsAttached ? TimeSpan.FromMinutes(60) : TimeSpan.FromMinutes(1); private static readonly Regex UrlDetectorRegex = new Regex(@"^\s*Successfully registered URL ""(?[^""]+)"" for site.*$"); private Process _hostProcess; @@ -381,10 +381,15 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } public override void Dispose() + { + Dispose(gracefulShutdown: false); + } + + public override void Dispose(bool gracefulShutdown) { using (Logger.BeginScope("Dispose")) { - if (IISDeploymentParameters.GracefulShutdown) + if (gracefulShutdown) { GracefullyShutdownProcess(_hostProcess); } diff --git a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs index 3139f3b251..77abc90190 100644 --- a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs +++ b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs @@ -23,8 +23,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CheckStartupEventLogMessage() { var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var deploymentResult = await DeployAsync(deploymentParameters); - await Helpers.AssertStarts(deploymentResult); + await deploymentResult.AssertStarts(); StopServer(); @@ -35,9 +36,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CheckShutdownEventLogMessage() { var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); - deploymentParameters.GracefulShutdown = true; var deploymentResult = await DeployAsync(deploymentParameters); - await Helpers.AssertStarts(deploymentResult); + await deploymentResult.AssertStarts(); StopServer(); diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index 0a19a90133..7ef360a487 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -47,20 +46,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); - var fileInDirectory = Directory.GetFiles(pathToLogs).Single(); - + var fileInDirectory = Directory.GetFiles(pathToLogs).Single(fileName => fileName.Contains("inprocess")); var contents = File.ReadAllText(fileInDirectory); Assert.NotNull(contents); Assert.Contains("TEST MESSAGE", contents); - Assert.DoesNotContain(TestSink.Writes, context => context.Message.Contains("TEST MESSAGE")); - // TODO we should check that debug logs are restored during graceful shutdown. - // The IIS Express deployer doesn't support graceful shutdown. - //Assert.Contains(TestSink.Writes, context => context.Message.Contains("Restoring original stdout: ")); } finally { - RetryHelper.RetryOperation( () => Directory.Delete(pathToLogs, true), e => Logger.LogWarning($"Failed to delete directory : {e.Message}"), @@ -132,7 +125,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CheckStdoutLoggingToPipe_DoesNotCrashProcess(string path) { var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); - deploymentParameters.GracefulShutdown = true; var deploymentResult = await DeployAsync(deploymentParameters); await Helpers.AssertStarts(deploymentResult, path); @@ -151,7 +143,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CheckStdoutLoggingToPipeWithFirstWrite(string path) { var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); - deploymentParameters.GracefulShutdown = true; var firstWriteString = path + path; diff --git a/test/Common.FunctionalTests/MultiApplicationTests.cs b/test/Common.FunctionalTests/MultiApplicationTests.cs index 009c61f373..e0adccfc54 100644 --- a/test/Common.FunctionalTests/MultiApplicationTests.cs +++ b/test/Common.FunctionalTests/MultiApplicationTests.cs @@ -44,6 +44,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var parameters = _fixture.GetBaseDeploymentParameters(HostingModel.InProcess, publish: true); parameters.ServerConfigActionList.Add(DuplicateApplication); + var result = await DeployAsync(parameters); var result1 = await result.HttpClient.GetAsync("/app1/HelloWorld"); var result2 = await result.HttpClient.GetAsync("/app2/HelloWorld"); diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index 9d8d79fb6c..c449863e4b 100644 --- a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.Linq; +using System.Text; using System.Text.RegularExpressions; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.Logging.Testing; @@ -14,17 +16,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { Assert.True(deploymentResult.HostProcess.HasExited); - var eventLogRegex = new Regex($"Event Log: {expectedRegexMatchString}"); + var builder = new StringBuilder(); - int count = 0; foreach (var context in testSink.Writes) { - if (eventLogRegex.IsMatch(context.Message)) - { - count++; - } + builder.Append(context.Message); } - Assert.Equal(1, count); + + var eventLogRegex = new Regex($"Event Log: (.*?){expectedRegexMatchString}(.*?)End Event Log Message.", RegexOptions.Singleline); + + Assert.Matches(eventLogRegex, builder.ToString()); } } } diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index a9b6b3a4fe..b9e80dd27f 100644 --- a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting { } - protected ApplicationDeployer _deployer; + protected IISDeployerBase _deployer; protected ApplicationDeployer CreateDeployer(IISDeploymentParameters parameters) { @@ -38,18 +38,18 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting protected virtual async Task DeployAsync(IISDeploymentParameters parameters) { - _deployer = CreateDeployer(parameters); + _deployer = (IISDeployerBase)CreateDeployer(parameters); return (IISDeploymentResult)await _deployer.DeployAsync(); } public override void Dispose() { - StopServer(); + StopServer(false); } - public void StopServer() + public void StopServer(bool gracefulShutdown = true) { - _deployer?.Dispose(); + _deployer?.Dispose(gracefulShutdown); _deployer = null; } } diff --git a/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs b/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs new file mode 100644 index 0000000000..6cdd725392 --- /dev/null +++ b/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs @@ -0,0 +1,22 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class SkipIfDebugAttribute : Attribute, ITestCondition + { + public bool IsMet => + #if DEBUG + false; + #else + true; + #endif + + public string SkipReason => "Test cannot be run in Debug mode."; + } +} diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/test/CommonLibTests/FileOutputManagerTests.cpp index ae1085408c..bba9e22704 100644 --- a/test/CommonLibTests/FileOutputManagerTests.cpp +++ b/test/CommonLibTests/FileOutputManagerTests.cpp @@ -34,6 +34,7 @@ namespace FileOutManagerStartupTests auto tempDirectory = TempDirectory(); FileOutputManager* pManager = new FileOutputManager; + pManager->Initialize(fileNamePrefix.c_str(), tempDirectory.path().c_str()); { FileManagerWrapper wrapper(pManager); @@ -47,19 +48,17 @@ namespace FileOutManagerStartupTests ASSERT_EQ(filename.substr(0, fileNamePrefix.size()), fileNamePrefix); std::wstring content = Helpers::ReadFileContent(std::wstring(p.path())); - ASSERT_EQ(content.length(), DWORD(4)); - ASSERT_STREQ(content.c_str(), expected); } } }; - TEST_F(FileOutputManagerTest, DISABLED_WriteToFileCheckContentsWritten) + TEST_F(FileOutputManagerTest, WriteToFileCheckContentsWritten) { Test(L"", stdout); Test(L"log", stdout); } - TEST_F(FileOutputManagerTest, DISABLED_WriteToFileCheckContentsWrittenErr) + TEST_F(FileOutputManagerTest, WriteToFileCheckContentsWrittenErr) { Test(L"", stderr); Test(L"log", stderr); @@ -68,8 +67,7 @@ namespace FileOutManagerStartupTests namespace FileOutManagerOutputTests { - - TEST(FileOutManagerOutputTest, DISABLED_StdErr) + TEST(FileOutManagerOutputTest, StdOut) { PCSTR expected = "test"; @@ -80,7 +78,9 @@ namespace FileOutManagerOutputTests { FileManagerWrapper wrapper(pManager); - printf(expected, stderr); + fprintf(stdout, expected); + pManager->Stop(); + STRA straContent; ASSERT_TRUE(pManager->GetStdOutContent(&straContent)); @@ -88,7 +88,7 @@ namespace FileOutManagerOutputTests } } - TEST(FileOutManagerOutputTest, DISABLED_CheckFileOutput) + TEST(FileOutManagerOutputTest, StdErr) { PCSTR expected = "test"; @@ -99,7 +99,9 @@ namespace FileOutManagerOutputTests { FileManagerWrapper wrapper(pManager); - printf(expected); + fprintf(stderr, expected); + pManager->Stop(); + STRA straContent; ASSERT_TRUE(pManager->GetStdOutContent(&straContent)); @@ -107,9 +109,9 @@ namespace FileOutManagerOutputTests } } - TEST(FileOutManagerOutputTest, DISABLED_CapAt4KB) + TEST(FileOutManagerOutputTest, CapAt30KB) { - PCSTR expected = "test"; + PCSTR expected = "hello world"; auto tempDirectory = TempDirectory(); @@ -118,16 +120,39 @@ namespace FileOutManagerOutputTests { FileManagerWrapper wrapper(pManager); - for (int i = 0; i < 1200; i++) + for (int i = 0; i < 3000; i++) { printf(expected); } - + pManager->Stop(); STRA straContent; ASSERT_TRUE(pManager->GetStdOutContent(&straContent)); - ASSERT_EQ(straContent.QueryCCH(), 4096); + ASSERT_EQ(straContent.QueryCCH(), 30000); + } + } + + + TEST(FileOutManagerOutputTest, StartStopRestoresCorrectly) + { + PCSTR expected = "test"; + + auto tempDirectory = TempDirectory(); + + for (int i = 0; i < 10; i++) + { + FileOutputManager* pManager = new FileOutputManager; + pManager->Initialize(L"", tempDirectory.path().c_str()); + { + FileManagerWrapper wrapper(pManager); + + printf(expected); + pManager->Stop(); + STRA straContent; + ASSERT_TRUE(pManager->GetStdOutContent(&straContent)); + + ASSERT_STREQ(straContent.QueryStr(), expected); + } } } } - diff --git a/test/CommonLibTests/PipeOutputManagerTests.cpp b/test/CommonLibTests/PipeOutputManagerTests.cpp index 6cc09e7678..20609adf72 100644 --- a/test/CommonLibTests/PipeOutputManagerTests.cpp +++ b/test/CommonLibTests/PipeOutputManagerTests.cpp @@ -23,14 +23,58 @@ public: namespace PipeOutputManagerTests { - TEST(PipeManagerOutputTest, NotifyStartupCompleteCallsDispose) + TEST(PipeManagerOutputTest, StdOut) { PCWSTR expected = L"test"; + STRA output; + + PipeOutputManager* pManager = new PipeOutputManager(true); - PipeOutputManager* pManager = new PipeOutputManager(); ASSERT_EQ(S_OK, pManager->Start()); + fwprintf(stdout, expected); + + ASSERT_EQ(S_OK, pManager->Stop()); + + pManager->GetStdOutContent(&output); + ASSERT_STREQ(output.QueryStr(), "test"); + delete pManager; } + TEST(PipeManagerOutputTest, StdErr) + { + PCWSTR expected = L"test"; + STRA output; + + PipeOutputManager* pManager = new PipeOutputManager(); + + ASSERT_EQ(S_OK, pManager->Start()); + fwprintf(stderr, expected); + ASSERT_EQ(S_OK, pManager->Stop()); + + pManager->GetStdOutContent(&output); + ASSERT_STREQ(output.QueryStr(), "test"); + delete pManager; + } + + TEST(PipeManagerOutputTest, CheckMaxPipeSize) + { + std::wstring test; + STRA output; + for (int i = 0; i < 3000; i++) + { + test.append(L"hello world"); + } + + PipeOutputManager* pManager = new PipeOutputManager(); + + ASSERT_EQ(S_OK, pManager->Start()); + wprintf(test.c_str()); + ASSERT_EQ(S_OK, pManager->Stop()); + + pManager->GetStdOutContent(&output); + ASSERT_EQ(output.QueryCCH(), (DWORD)30000); + delete pManager; + } TEST(PipeManagerOutputTest, SetInvalidHandlesForErrAndOut) { auto m_fdPreviousStdOut = _dup(_fileno(stdout)); @@ -50,6 +94,61 @@ namespace PipeOutputManagerTests // Test will fail if we didn't redirect stdout back to a file descriptor. // This is because gtest relies on console output to know if a test succeeded or failed. // If the output still points to a file/pipe, the test (and all other tests after it) will fail. + delete pManager; + } + + TEST(PipeManagerOutputTest, CreateDeleteMultipleTimesStdOutWorks) + { + for (int i = 0; i < 10; i++) + { + auto stdoutBefore = _fileno(stdout); + auto stderrBefore = _fileno(stderr); + PCWSTR expected = L"test"; + STRA output; + + PipeOutputManager* pManager = new PipeOutputManager(); + + ASSERT_EQ(S_OK, pManager->Start()); + fwprintf(stdout, expected); + + ASSERT_EQ(S_OK, pManager->Stop()); + + pManager->GetStdOutContent(&output); + ASSERT_STREQ(output.QueryStr(), "test"); + ASSERT_EQ(stdoutBefore, _fileno(stdout)); + ASSERT_EQ(stderrBefore, _fileno(stderr)); + delete pManager; + } + // When this returns, we get an AV from gtest. + } + + TEST(PipeManagerOutputTest, CreateDeleteKeepOriginalStdErr) + { + for (int i = 0; i < 10; i++) + { + auto stdoutBefore = _fileno(stdout); + auto stderrBefore = _fileno(stderr); + auto stdoutHandle = GetStdHandle(STD_OUTPUT_HANDLE); + auto stderrHandle = GetStdHandle(STD_ERROR_HANDLE); + PCWSTR expected = L"test"; + STRA output; + + PipeOutputManager* pManager = new PipeOutputManager(); + + ASSERT_EQ(S_OK, pManager->Start()); + fwprintf(stderr, expected); + ASSERT_EQ(S_OK, pManager->Stop()); + + pManager->GetStdOutContent(&output); + ASSERT_STREQ(output.QueryStr(), "test"); + ASSERT_EQ(stdoutBefore, _fileno(stdout)); + + ASSERT_EQ(stderrBefore, _fileno(stderr)); + + delete pManager; + } + + wprintf(L"Hello!"); } } diff --git a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs new file mode 100644 index 0000000000..e0cb1cef5d --- /dev/null +++ b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs @@ -0,0 +1,171 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Newtonsoft.Json; +using Xunit; + +namespace IIS.FunctionalTests.Inprocess +{ + [Collection(PublishedSitesCollection.Name)] + public class StdOutRedirectionTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + private readonly string _logFolderPath; + + public StdOutRedirectionTests(PublishedSitesFixture fixture) + { + _logFolderPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); + _fixture = fixture; + } + + public override void Dispose() + { + base.Dispose(); + if (Directory.Exists(_logFolderPath)) + { + Directory.Delete(_logFolderPath, true); + } + } + + [ConditionalFact] + [SkipIfDebug] + public async Task FrameworkNotFoundExceptionLogged_Pipe() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + + var deploymentResult = await DeployAsync(deploymentParameters); + + InvalidateRuntimeConfig(deploymentResult); + + var response = await deploymentResult.HttpClient.GetAsync("/"); + Assert.False(response.IsSuccessStatusCode); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, + "The specified framework 'Microsoft.NETCore.App', version '2.9.9' was not found."); + } + + [ConditionalFact] + [SkipIfDebug] + public async Task FrameworkNotFoundExceptionLogged_File() + { + var deploymentParameters = + _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + + deploymentParameters.EnableLogging(_logFolderPath); + + var deploymentResult = await DeployAsync(deploymentParameters); + + InvalidateRuntimeConfig(deploymentResult); + + var response = await deploymentResult.HttpClient.GetAsync("/"); + Assert.False(response.IsSuccessStatusCode); + + StopServer(); + + var fileInDirectory = Directory.GetFiles(_logFolderPath).Single(); + var contents = File.ReadAllText(fileInDirectory); + var expectedString = "The specified framework 'Microsoft.NETCore.App', version '2.9.9' was not found."; + EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, expectedString); + Assert.Contains(expectedString, contents); + } + + [ConditionalFact] + [SkipIfDebug] + public async Task EnableCoreHostTraceLogging_TwoLogFilesCreated() + { + var deploymentParameters = + _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + deploymentParameters.EnvironmentVariables["COREHOST_TRACE"] = "1"; + + deploymentParameters.EnableLogging(_logFolderPath); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/"); + Assert.False(response.IsSuccessStatusCode); + + StopServer(); + + var filesInDirectory = Directory.GetFiles(_logFolderPath); + Assert.Equal(2, filesInDirectory.Length); + foreach (var file in filesInDirectory) + { + var contents = File.ReadAllText(file); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Invoked hostfxr"); + Assert.Contains("Invoked hostfxr", contents); + } + } + + [ConditionalTheory] + [SkipIfDebug] + [InlineData("CheckLargeStdErrWrites")] + [InlineData("CheckLargeStdOutWrites")] + [InlineData("CheckOversizedStdErrWrites")] + [InlineData("CheckOversizedStdOutWrites")] + public async Task EnableCoreHostTraceLogging_PipeCaptureNativeLogs(string path) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + deploymentParameters.EnvironmentVariables["COREHOST_TRACE"] = "1"; + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/"); + + Assert.False(response.IsSuccessStatusCode); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Invoked hostfxr"); + } + + [ConditionalTheory] + [SkipIfDebug] + [InlineData("CheckLargeStdErrWrites")] + [InlineData("CheckLargeStdOutWrites")] + [InlineData("CheckOversizedStdErrWrites")] + [InlineData("CheckOversizedStdOutWrites")] + public async Task EnableCoreHostTraceLogging_FileCaptureNativeLogs(string path) + { + var deploymentParameters = + _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + deploymentParameters.EnvironmentVariables["COREHOST_TRACE"] = "1"; + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + + deploymentParameters.EnableLogging(_logFolderPath); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/"); + Assert.False(response.IsSuccessStatusCode); + + StopServer(); + + var fileInDirectory = Directory.GetFiles(_logFolderPath).First(); + var contents = File.ReadAllText(fileInDirectory); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Invoked hostfxr"); + Assert.Contains("Invoked hostfxr", contents); + } + + private static void InvalidateRuntimeConfig(IISDeploymentResult deploymentResult) + { + var path = Path.Combine(deploymentResult.ContentRoot, "StartupExceptionWebSite.runtimeconfig.json"); + dynamic depsFileContent = JsonConvert.DeserializeObject(File.ReadAllText(path)); + depsFileContent["runtimeOptions"]["framework"]["version"] = "2.9.9"; + var output = JsonConvert.SerializeObject(depsFileContent); + File.WriteAllText(path, output); + } + } +} diff --git a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs index d9dbcd2b6e..1e5af7c13f 100644 --- a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs @@ -42,22 +42,21 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task GracefulShutdown_DoesNotCrashProcess() { var parameters = _fixture.GetBaseDeploymentParameters(publish: true); - parameters.GracefulShutdown = true; var result = await DeployAsync(parameters); var response = await result.HttpClient.GetAsync("/HelloWorld"); - StopServer(); + StopServer(gracefulShutdown: true); Assert.True(result.HostProcess.ExitCode == 0); } [ConditionalFact] - public async Task ForcefulShutdown_DoesrashProcess() + public async Task ForcefulShutdown_DoesCrashProcess() { var parameters = _fixture.GetBaseDeploymentParameters(publish: true); var result = await DeployAsync(parameters); var response = await result.HttpClient.GetAsync("/HelloWorld"); - StopServer(); + StopServer(gracefulShutdown: false); Assert.True(result.HostProcess.ExitCode == 1); } } From 26964b268740150ee4aa77e6b3ddf695cbb4aaaa Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 21 Aug 2018 14:11:34 -0700 Subject: [PATCH 231/363] Macrosify out-of-proc (#1268) --- .../AspNetCore/aspnetcore_shim_config.cpp | 2 +- src/AspNetCoreModuleV2/CommonLib/exceptions.h | 2 + .../OutOfProcessRequestHandler.vcxproj | 1 - .../OutOfProcessRequestHandler/dllmain.cpp | 77 +++----- .../forwarderconnection.cpp | 32 +--- .../forwardinghandler.cpp | 131 +++++++------- .../outprocessapplication.cpp | 33 +--- .../processmanager.cpp | 166 ++++-------------- .../protocolconfig.cpp | 26 +-- .../responseheaderhash.cpp | 18 +- .../serverprocess.cpp | 107 +++++------ .../url_utility.cpp | 45 ++--- .../websockethandler.cpp | 75 ++++---- .../winhttphelper.cpp | 46 +---- 14 files changed, 263 insertions(+), 498 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp index bdd76953ac..bf62cd9e87 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp @@ -50,7 +50,7 @@ ASPNETCORE_SHIM_CONFIG::Populate( ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR, ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR_MSG, strHostingModel.QueryStr()); - RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED)); + RETURN_HR(HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED)); } RETURN_IF_FAILED(GetElementStringProperty(pAspNetCoreElement, diff --git a/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/AspNetCoreModuleV2/CommonLib/exceptions.h index ac05f910c1..bd6f30af33 100644 --- a/src/AspNetCoreModuleV2/CommonLib/exceptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/exceptions.h @@ -26,6 +26,8 @@ #endif #define OBSERVE_CAUGHT_EXCEPTION() CaughtExceptionHResult(LOCATION_INFO); +#define RETURN_HR(hr) do { HRESULT __hrRet = hr; if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); } return __hrRet; } while (0, 0) +#define RETURN_LAST_ERROR() do { return LogLastError(LOCATION_INFO); } while (0, 0) #define RETURN_IF_FAILED(hr) do { HRESULT __hrRet = hr; if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); return __hrRet; }} while (0, 0) #define RETURN_CAUGHT_EXCEPTION() return CaughtExceptionHResult(LOCATION_INFO); #define RETURN_LAST_ERROR_IF(condition) do { if (condition) { return LogLastError(LOCATION_INFO); }} while (0, 0) diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 2da0550413..df9c00ebb1 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -224,7 +224,6 @@ - diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp index d77c5c47d8..25e8054318 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp @@ -121,28 +121,29 @@ EnsureOutOfProcessInitializtion() DBG_ASSERT(g_pHttpServer); HRESULT hr = S_OK; - BOOL fLocked = FALSE; if (g_fOutOfProcessInitializeError) { - hr = E_NOT_VALID_STATE; - goto Finished; + FINISHED(E_NOT_VALID_STATE); } - if (!g_fOutOfProcessInitialize) + if (g_fOutOfProcessInitialize) { - AcquireSRWLockExclusive(&g_srwLockRH); - fLocked = TRUE; + FINISHED(S_OK); + } + + { + auto lock = SRWExclusiveLock(g_srwLockRH); + if (g_fOutOfProcessInitializeError) { - hr = E_NOT_VALID_STATE; - goto Finished; + FINISHED(E_NOT_VALID_STATE); } if (g_fOutOfProcessInitialize) { // Done by another thread - goto Finished; + FINISHED(S_OK); } g_hWinHttpModule = GetModuleHandle(TEXT("winhttp.dll")); @@ -150,7 +151,7 @@ EnsureOutOfProcessInitializtion() g_hAspNetCoreModule = GetModuleHandle(TEXT("aspnetcorev2.dll")); hr = WINHTTP_HELPER::StaticInitialize(); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { if (hr == HRESULT_FROM_WIN32(ERROR_PROC_NOT_FOUND)) { @@ -158,7 +159,7 @@ EnsureOutOfProcessInitializtion() } else { - goto Finished; + FINISHED(hr); } } @@ -167,11 +168,7 @@ EnsureOutOfProcessInitializtion() WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, WINHTTP_FLAG_ASYNC); - if (g_hWinhttpSession == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + FINISHED_LAST_ERROR_IF(g_hWinhttpSession == NULL); // // Don't set non-blocking callbacks WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS, @@ -182,65 +179,33 @@ EnsureOutOfProcessInitializtion() // // Setup the callback function // - if (WinHttpSetStatusCallback(g_hWinhttpSession, + FINISHED_LAST_ERROR_IF(WinHttpSetStatusCallback(g_hWinhttpSession, FORWARDING_HANDLER::OnWinHttpCompletion, (WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS | WINHTTP_CALLBACK_STATUS_SENDING_REQUEST), - NULL) == WINHTTP_INVALID_STATUS_CALLBACK) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + NULL) == WINHTTP_INVALID_STATUS_CALLBACK); // // Make sure we see the redirects (rather than winhttp doing it // automatically) // DWORD dwRedirectOption = WINHTTP_OPTION_REDIRECT_POLICY_NEVER; - if (!WinHttpSetOption(g_hWinhttpSession, + FINISHED_LAST_ERROR_IF(!WinHttpSetOption(g_hWinhttpSession, WINHTTP_OPTION_REDIRECT_POLICY, &dwRedirectOption, - sizeof(dwRedirectOption))) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + sizeof(dwRedirectOption))); g_dwTlsIndex = TlsAlloc(); - if (g_dwTlsIndex == TLS_OUT_OF_INDEXES) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - hr = ALLOC_CACHE_HANDLER::StaticInitialize(); - if (FAILED(hr)) - { - goto Finished; - } - - hr = FORWARDING_HANDLER::StaticInitialize(g_fEnableReferenceCountTracing); - if (FAILED(hr)) - { - goto Finished; - } - - hr = WEBSOCKET_HANDLER::StaticInitialize(g_fEnableReferenceCountTracing); - if (FAILED(hr)) - { - goto Finished; - } + FINISHED_LAST_ERROR_IF(g_dwTlsIndex == TLS_OUT_OF_INDEXES); + FINISHED_IF_FAILED(ALLOC_CACHE_HANDLER::StaticInitialize()); + FINISHED_IF_FAILED(FORWARDING_HANDLER::StaticInitialize(g_fEnableReferenceCountTracing)); + FINISHED_IF_FAILED(WEBSOCKET_HANDLER::StaticInitialize(g_fEnableReferenceCountTracing)); } - Finished: if (FAILED(hr)) { g_fOutOfProcessInitializeError = TRUE; } - if (fLocked) - { - ReleaseSRWLockExclusive(&g_srwLockRH); - } return hr; } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp index 0369edcce9..ee49e99242 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp @@ -2,12 +2,13 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "forwarderconnection.h" +#include "exceptions.h" FORWARDER_CONNECTION::FORWARDER_CONNECTION( VOID ) : m_cRefs (1), m_hConnection (NULL) -{ +{ } HRESULT @@ -15,38 +16,19 @@ FORWARDER_CONNECTION::Initialize( DWORD dwPort ) { - HRESULT hr = S_OK; - - hr = m_ConnectionKey.Initialize( dwPort ); - if ( FAILED( hr ) ) - { - goto Finished; - } - + RETURN_IF_FAILED(m_ConnectionKey.Initialize( dwPort )); m_hConnection = WinHttpConnect(g_hWinhttpSession, L"127.0.0.1", (USHORT) dwPort, 0); - if (m_hConnection == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - + RETURN_LAST_ERROR_IF_NULL(m_hConnection); // // Since WinHttp will not emit WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING // when closing WebSocket handle on Win8. Register callback at Connect level as a workaround // - if (WinHttpSetStatusCallback(m_hConnection, + RETURN_LAST_ERROR_IF (WinHttpSetStatusCallback(m_hConnection, FORWARDING_HANDLER::OnWinHttpCompletion, WINHTTP_CALLBACK_FLAG_HANDLES, - NULL) == WINHTTP_INVALID_STATUS_CALLBACK) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - -Finished: - - return hr; + NULL) == WINHTTP_INVALID_STATUS_CALLBACK); + return S_OK; } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp index f1bcb7a2cc..e06b15f805 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp @@ -3,6 +3,7 @@ #include "forwardinghandler.h" #include "url_utility.h" +#include "exceptions.h" // Just to be aware of the FORWARDING_HANDLER object size. C_ASSERT(sizeof(FORWARDING_HANDLER) <= 632); @@ -140,7 +141,7 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() } hr = pApplication->GetProcess(&pServerProcess); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { fFailedToStartKestrel = TRUE; goto Failure; @@ -165,7 +166,7 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() // // parse original url // - if (FAILED(hr = URL_UTILITY::SplitUrl(pRequest->GetRawHttpRequest()->CookedUrl.pFullUrl, + if (FAILED_LOG(hr = URL_UTILITY::SplitUrl(pRequest->GetRawHttpRequest()->CookedUrl.pFullUrl, &fSecure, &strDestination, &strUrl))) @@ -173,7 +174,7 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() goto Failure; } - if (FAILED(hr = URL_UTILITY::EscapeAbsPath(pRequest, &struEscapedUrl))) + if (FAILED_LOG(hr = URL_UTILITY::EscapeAbsPath(pRequest, &struEscapedUrl))) { goto Failure; } @@ -200,7 +201,7 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() hConnect, &struEscapedUrl, pServerProcess); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Failure; } @@ -222,7 +223,7 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() SetConnectionModuleContext(m_pDisconnect, m_pModuleId); DBG_ASSERT(hr != HRESULT_FROM_WIN32(ERROR_ALREADY_ASSIGNED)); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Failure; } @@ -477,7 +478,7 @@ REQUEST_NOTIFICATION_STATUS InterlockedIncrement(&m_dwHandlers); } - if (FAILED(hr)) + if (FAILED_LOG(hr)) { // This failure could happen when client disconnect happens or backend server fails // after websocket upgrade @@ -514,7 +515,7 @@ REQUEST_NOTIFICATION_STATUS // failure, if there is more data available from WinHTTP, read it // or else ask if there is more. // - if (FAILED(hrCompletionStatus)) + if (FAILED_LOG(hrCompletionStatus)) { hr = hrCompletionStatus; fClientError = TRUE; @@ -522,7 +523,7 @@ REQUEST_NOTIFICATION_STATUS } hr = OnReceivingResponse(); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Failure; } @@ -533,7 +534,7 @@ REQUEST_NOTIFICATION_STATUS hr = OnSendingRequest(cbCompletion, hrCompletionStatus, &fClientError); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Failure; } @@ -730,7 +731,7 @@ HRESULT hr = sm_pAlloc->Initialize(sizeof(FORWARDING_HANDLER), 64); // nThreshold - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -743,14 +744,14 @@ HRESULT } hr = sm_pResponseHeaderHash->Initialize(); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } // Initialize PROTOCOL_CONFIG hr = sm_ProtocolConfig.Initialize(); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -786,7 +787,7 @@ HRESULT "); Finished: - if (FAILED(hr)) + if (FAILED_LOG(hr)) { StaticTerminate(); } @@ -871,12 +872,12 @@ FORWARDING_HANDLER::GetHeaders( // if (!pProtocol->QueryPreserveHostHeader()) { - if (FAILED(hr = URL_UTILITY::SplitUrl(pRequest->GetRawHttpRequest()->CookedUrl.pFullUrl, + if (FAILED_LOG(hr = URL_UTILITY::SplitUrl(pRequest->GetRawHttpRequest()->CookedUrl.pFullUrl, &fSecure, &struDestination, &struUrl)) || - FAILED(hr = strTemp.CopyW(struDestination.QueryStr())) || - FAILED(hr = pRequest->SetHeader(HttpHeaderHost, + FAILED_LOG(hr = strTemp.CopyW(struDestination.QueryStr())) || + FAILED_LOG(hr = pRequest->SetHeader(HttpHeaderHost, strTemp.QueryStr(), static_cast(strTemp.QueryCCH()), TRUE))) // fReplace @@ -917,7 +918,7 @@ FORWARDING_HANDLER::GetHeaders( pServerProcess->QueryGuid(), (USHORT)strlen(pServerProcess->QueryGuid()), TRUE); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { return hr; } @@ -933,7 +934,7 @@ FORWARDING_HANDLER::GetHeaders( HANDLE hTargetTokenHandle = NULL; hr = pServerProcess->SetWindowsAuthToken(m_pW3Context->GetUser()->GetPrimaryToken(), &hTargetTokenHandle); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { return hr; } @@ -952,7 +953,7 @@ FORWARDING_HANDLER::GetHeaders( pszHandleStr, (USHORT)strlen(pszHandleStr), TRUE); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { return hr; } @@ -966,14 +967,14 @@ FORWARDING_HANDLER::GetHeaders( pszCurrentHeader = pRequest->GetHeader(pProtocol->QueryXForwardedForName()->QueryStr(), &cchCurrentHeader); if (pszCurrentHeader != NULL) { - if (FAILED(hr = strTemp.Copy(pszCurrentHeader, cchCurrentHeader)) || - FAILED(hr = strTemp.Append(", ", 2))) + if (FAILED_LOG(hr = strTemp.Copy(pszCurrentHeader, cchCurrentHeader)) || + FAILED_LOG(hr = strTemp.Append(", ", 2))) { return hr; } } - if (FAILED(hr = m_pW3Context->GetServerVariable("REMOTE_ADDR", + if (FAILED_LOG(hr = m_pW3Context->GetServerVariable("REMOTE_ADDR", &pszFinalHeader, &cchFinalHeader))) { @@ -982,16 +983,16 @@ FORWARDING_HANDLER::GetHeaders( if (pRequest->GetRawHttpRequest()->Address.pRemoteAddress->sa_family == AF_INET6) { - if (FAILED(hr = strTemp.Append("[", 1)) || - FAILED(hr = strTemp.Append(pszFinalHeader, cchFinalHeader)) || - FAILED(hr = strTemp.Append("]", 1))) + if (FAILED_LOG(hr = strTemp.Append("[", 1)) || + FAILED_LOG(hr = strTemp.Append(pszFinalHeader, cchFinalHeader)) || + FAILED_LOG(hr = strTemp.Append("]", 1))) { return hr; } } else { - if (FAILED(hr = strTemp.Append(pszFinalHeader, cchFinalHeader))) + if (FAILED_LOG(hr = strTemp.Append(pszFinalHeader, cchFinalHeader))) { return hr; } @@ -999,21 +1000,21 @@ FORWARDING_HANDLER::GetHeaders( if (pProtocol->QueryIncludePortInXForwardedFor()) { - if (FAILED(hr = m_pW3Context->GetServerVariable("REMOTE_PORT", + if (FAILED_LOG(hr = m_pW3Context->GetServerVariable("REMOTE_PORT", &pszFinalHeader, &cchFinalHeader))) { return hr; } - if (FAILED(hr = strTemp.Append(":", 1)) || - FAILED(hr = strTemp.Append(pszFinalHeader, cchFinalHeader))) + if (FAILED_LOG(hr = strTemp.Append(":", 1)) || + FAILED_LOG(hr = strTemp.Append(pszFinalHeader, cchFinalHeader))) { return hr; } } - if (FAILED(hr = pRequest->SetHeader(pProtocol->QueryXForwardedForName()->QueryStr(), + if (FAILED_LOG(hr = pRequest->SetHeader(pProtocol->QueryXForwardedForName()->QueryStr(), strTemp.QueryStr(), static_cast(strTemp.QueryCCH()), TRUE))) // fReplace @@ -1036,19 +1037,19 @@ FORWARDING_HANDLER::GetHeaders( pszCurrentHeader = pRequest->GetHeader(pProtocol->QuerySslHeaderName()->QueryStr(), &cchCurrentHeader); if (pszCurrentHeader != NULL) { - if (FAILED(hr = strTemp.Copy(pszCurrentHeader, cchCurrentHeader)) || - FAILED(hr = strTemp.Append(", ", 2))) + if (FAILED_LOG(hr = strTemp.Copy(pszCurrentHeader, cchCurrentHeader)) || + FAILED_LOG(hr = strTemp.Append(", ", 2))) { return hr; } } - if (FAILED(hr = strTemp.Append(pszScheme))) + if (FAILED_LOG(hr = strTemp.Append(pszScheme))) { return hr; } - if (FAILED(pRequest->SetHeader(pProtocol->QuerySslHeaderName()->QueryStr(), + if (FAILED_LOG(pRequest->SetHeader(pProtocol->QuerySslHeaderName()->QueryStr(), strTemp.QueryStr(), (USHORT)strTemp.QueryCCH(), TRUE))) @@ -1067,7 +1068,7 @@ FORWARDING_HANDLER::GetHeaders( else { // Resize the buffer large enough to hold the encoded certificate info - if (FAILED(hr = strTemp.Resize( + if (FAILED_LOG(hr = strTemp.Resize( 1 + (pRequest->GetRawHttpRequest()->pSslInfo->pClientCertInfo->CertEncodedSize + 2) / 3 * 4))) { return hr; @@ -1081,7 +1082,7 @@ FORWARDING_HANDLER::GetHeaders( NULL); strTemp.SyncWithBuffer(); - if (FAILED(hr = pRequest->SetHeader( + if (FAILED_LOG(hr = pRequest->SetHeader( pProtocol->QueryClientCertName()->QueryStr(), strTemp.QueryStr(), static_cast(strTemp.QueryCCH()), @@ -1106,7 +1107,7 @@ FORWARDING_HANDLER::GetHeaders( hr = m_pW3Context->GetServerVariable("ALL_RAW", ppszHeaders, pcchHeaders); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { return hr; } @@ -1134,7 +1135,7 @@ FORWARDING_HANDLER::CreateWinHttpRequest( // we will fill them when sending the request) // pszVerb = pRequest->GetHttpMethod(); - if (FAILED(hr = strVerb.CopyA(pszVerb))) + if (FAILED_LOG(hr = strVerb.CopyA(pszVerb))) { goto Finished; } @@ -1147,7 +1148,7 @@ FORWARDING_HANDLER::CreateWinHttpRequest( "HTTP_VERSION", &pszVersion, &cchUnused); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -1235,7 +1236,7 @@ FORWARDING_HANDLER::CreateWinHttpRequest( pServerProcess, &m_pszHeaders, &m_cchHeaders); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -1514,7 +1515,7 @@ None // // Handle failure code for switch statement above. // - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Failure; } @@ -1762,7 +1763,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionSendRequestOrWriteComplete( goto Finished; } } - else if (FAILED(hr)) + else if (FAILED_LOG(hr)) { *pfClientError = TRUE; goto Finished; @@ -1842,7 +1843,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusHeadersAvailable( } } - if (FAILED(hr = strHeaders.CopyW( + if (FAILED_LOG(hr = strHeaders.CopyW( reinterpret_cast(bufHeaderBuffer.QueryPtr())))) { goto Finished; @@ -1859,13 +1860,13 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusHeadersAvailable( if (!strHeaders.IsEmpty() && strHeaders.QueryStr()[strHeaders.QueryCCH() - 1] != '\n') { hr = strHeaders.Append("\r\n"); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } } - if (FAILED(hr = SetStatusAndHeaders( + if (FAILED_LOG(hr = SetStatusAndHeaders( strHeaders.QueryStr(), strHeaders.QueryCCH()))) { @@ -1890,7 +1891,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusHeadersAvailable( NULL, NULL); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { *pfAnotherCompletionExpected = FALSE; } @@ -2022,7 +2023,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusReadComplete( Chunk.DataChunkType = HttpDataChunkFromMemory; Chunk.FromMemory.pBuffer = m_pEntityBuffer; Chunk.FromMemory.BufferLength = dwStatusInformationLength; - if (FAILED(hr = pResponse->WriteEntityChunkByReference(&Chunk))) + if (FAILED_LOG(hr = pResponse->WriteEntityChunkByReference(&Chunk))) { goto Finished; } @@ -2036,7 +2037,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusReadComplete( hr = pResponse->Flush(TRUE, // fAsync TRUE, // fMoreData NULL); // pcbSent - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -2357,10 +2358,10 @@ FORWARDING_HANDLER::SetStatusAndHeaders( // // Copy the status description // - if (FAILED(hr = strHeaderValue.Copy( + if (FAILED_LOG(hr = strHeaderValue.Copy( pchStatus, (DWORD)(pchEndofHeaderValue - pchStatus) + 1)) || - FAILED(hr = pResponse->SetStatus(uStatus, + FAILED_LOG(hr = pResponse->SetStatus(uStatus, strHeaderValue.QueryStr(), 0, S_OK, @@ -2422,7 +2423,7 @@ FORWARDING_HANDLER::SetStatusAndHeaders( // // Copy the header name // - if (FAILED(hr = strHeaderName.Copy( + if (FAILED_LOG(hr = strHeaderName.Copy( pszHeaders + index, (DWORD)(pchEndofHeaderName - pszHeaders) - index))) { @@ -2458,7 +2459,7 @@ FORWARDING_HANDLER::SetStatusAndHeaders( { strHeaderValue.Reset(); } - else if (FAILED(hr = strHeaderValue.Copy( + else if (FAILED_LOG(hr = strHeaderValue.Copy( pszHeaders + index, (DWORD)(pchEndofHeaderValue - pszHeaders) - index))) { @@ -2508,7 +2509,7 @@ FORWARDING_HANDLER::SetStatusAndHeaders( static_cast(strHeaderValue.QueryCCH()), TRUE); // fReplace } - if (FAILED(hr)) + if (FAILED_LOG(hr)) { return hr; } @@ -2526,7 +2527,7 @@ FORWARDING_HANDLER::SetStatusAndHeaders( if (m_fDoReverseRewriteHeaders) { hr = DoReverseRewrite(pResponse); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { return hr; } @@ -2573,17 +2574,17 @@ FORWARDING_HANDLER::DoReverseRewrite( pszEndHost = strchr(pszStartHost, '/'); - if (FAILED(hr = strTemp.Copy(fSecure ? "https://" : "http://")) || - FAILED(hr = strTemp.Append(m_pszOriginalHostHeader))) + if (FAILED_LOG(hr = strTemp.Copy(fSecure ? "https://" : "http://")) || + FAILED_LOG(hr = strTemp.Append(m_pszOriginalHostHeader))) { return hr; } if (pszEndHost != NULL && - FAILED(hr = strTemp.Append(pszEndHost))) + FAILED_LOG(hr = strTemp.Append(pszEndHost))) { return hr; } - if (FAILED(hr = pResponse->SetHeader(HttpHeaderContentLocation, + if (FAILED_LOG(hr = pResponse->SetHeader(HttpHeaderContentLocation, strTemp.QueryStr(), static_cast(strTemp.QueryCCH()), TRUE))) @@ -2612,17 +2613,17 @@ Location: pszEndHost = strchr(pszStartHost, '/'); - if (FAILED(hr = strTemp.Copy(fSecure ? "https://" : "http://")) || - FAILED(hr = strTemp.Append(m_pszOriginalHostHeader))) + if (FAILED_LOG(hr = strTemp.Copy(fSecure ? "https://" : "http://")) || + FAILED_LOG(hr = strTemp.Append(m_pszOriginalHostHeader))) { return hr; } if (pszEndHost != NULL && - FAILED(hr = strTemp.Append(pszEndHost))) + FAILED_LOG(hr = strTemp.Append(pszEndHost))) { return hr; } - if (FAILED(hr = pResponse->SetHeader(HttpHeaderLocation, + if (FAILED_LOG(hr = pResponse->SetHeader(HttpHeaderLocation, strTemp.QueryStr(), static_cast(strTemp.QueryCCH()), TRUE))) @@ -2687,9 +2688,9 @@ SetCookie: pszEndHost++; } - if (FAILED(hr = strTemp.Copy(pszHeader, static_cast(pszStartHost - pszHeader))) || - FAILED(hr = strTemp.Append(m_pszOriginalHostHeader)) || - FAILED(hr = strTemp.Append(pszEndHost))) + if (FAILED_LOG(hr = strTemp.Copy(pszHeader, static_cast(pszStartHost - pszHeader))) || + FAILED_LOG(hr = strTemp.Append(m_pszOriginalHostHeader)) || + FAILED_LOG(hr = strTemp.Append(pszEndHost))) { return hr; } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp index 564adea383..8d3738d82f 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp @@ -4,6 +4,7 @@ #include "outprocessapplication.h" #include "SRWExclusiveLock.h" +#include "exceptions.h" OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION( IHttpApplication& pApplication, @@ -30,25 +31,12 @@ HRESULT OUT_OF_PROCESS_APPLICATION::Initialize( ) { - HRESULT hr = S_OK; if (m_pProcessManager == NULL) { - m_pProcessManager = new PROCESS_MANAGER; - if (m_pProcessManager == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } - - hr = m_pProcessManager->Initialize(); - if (FAILED(hr)) - { - goto Finished; - } + m_pProcessManager = new PROCESS_MANAGER(); + RETURN_IF_FAILED(m_pProcessManager->Initialize()); } - -Finished: - return hr; + return S_OK; } HRESULT @@ -76,7 +64,6 @@ OUT_OF_PROCESS_APPLICATION::CreateHandler( _In_ IHttpContext *pHttpContext, _Out_ IREQUEST_HANDLER **pRequestHandler) { - HRESULT hr = S_OK; IREQUEST_HANDLER* pHandler = NULL; //add websocket check here @@ -86,14 +73,8 @@ OUT_OF_PROCESS_APPLICATION::CreateHandler( } pHandler = new FORWARDING_HANDLER(pHttpContext, this); - - if (pHandler == NULL) - { - hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); - } - *pRequestHandler = pHandler; - return hr; + return S_OK; } VOID @@ -105,10 +86,8 @@ OUT_OF_PROCESS_APPLICATION::SetWebsocketStatus( // the websocket module may still not be enabled. PCWSTR pszTempWebsocketValue; DWORD cbLength; - HRESULT hr; - hr = pHttpContext->GetServerVariable("WEBSOCKET_VERSION", &pszTempWebsocketValue, &cbLength); - if (FAILED(hr)) + if (FAILED_LOG(pHttpContext->GetServerVariable("WEBSOCKET_VERSION", &pszTempWebsocketValue, &cbLength))) { m_fWebSocketSupported = WEBSOCKET_STATUS::WEBSOCKET_NOT_SUPPORTED; } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp index b0dd2991e2..71d106fb77 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp @@ -3,6 +3,8 @@ #include "processmanager.h" #include "EventLog.h" +#include "exceptions.h" +#include "SRWSharedLock.h" volatile BOOL PROCESS_MANAGER::sm_fWSAStartupDone = FALSE; @@ -11,28 +13,21 @@ PROCESS_MANAGER::Initialize( VOID ) { - HRESULT hr = S_OK; WSADATA wsaData; int result; - BOOL fLocked = FALSE; if( !sm_fWSAStartupDone ) { - AcquireSRWLockExclusive( &m_srwLock ); - fLocked = TRUE; + auto lock = SRWExclusiveLock(m_srwLock); if( !sm_fWSAStartupDone ) { if( (result = WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0 ) { - hr = HRESULT_FROM_WIN32( result ); - goto Finished; + RETURN_HR(HRESULT_FROM_WIN32( result )); } sm_fWSAStartupDone = TRUE; } - - ReleaseSRWLockExclusive( &m_srwLock ); - fLocked = FALSE; } m_dwRapidFailTickStart = GetTickCount(); @@ -51,55 +46,14 @@ PROCESS_MANAGER::Initialize( CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); - if( m_hNULHandle == INVALID_HANDLE_VALUE ) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + RETURN_LAST_ERROR_IF( m_hNULHandle == INVALID_HANDLE_VALUE ); } -Finished: - - if(fLocked) - { - ReleaseSRWLockExclusive( &m_srwLock ); - } - - return hr; + return S_OK; } PROCESS_MANAGER::~PROCESS_MANAGER() { - AcquireSRWLockExclusive(&m_srwLock); - - //if( m_ppServerProcessList != NULL ) - //{ - // for( DWORD i = 0; i < m_dwProcessesPerApplication; ++i ) - // { - // if( m_ppServerProcessList[i] != NULL ) - // { - // m_ppServerProcessList[i]->DereferenceServerProcess(); - // m_ppServerProcessList[i] = NULL; - // } - // } - - // delete[] m_ppServerProcessList; - // m_ppServerProcessList = NULL; - //} - - //if( m_hNULHandle != NULL ) - //{ - // CloseHandle( m_hNULHandle ); - // m_hNULHandle = NULL; - //} - - //if( sm_fWSAStartupDone ) - //{ - // WSACleanup(); - // sm_fWSAStartupDone = FALSE; - //} - - ReleaseSRWLockExclusive(&m_srwLock); } HRESULT @@ -109,31 +63,22 @@ PROCESS_MANAGER::GetProcess( _Out_ SERVER_PROCESS **ppServerProcess ) { - HRESULT hr = S_OK; - BOOL fSharedLock = FALSE; - BOOL fExclusiveLock = FALSE; DWORD dwProcessIndex = 0; - SERVER_PROCESS *pSelectedServerProcess = NULL; + std::unique_ptr pSelectedServerProcess; if (InterlockedCompareExchange(&m_lStopping, 1L, 1L) == 1L) { - return hr = E_APPLICATION_EXITING; + RETURN_IF_FAILED(E_APPLICATION_EXITING); } if (!m_fServerProcessListReady) { - AcquireSRWLockExclusive(&m_srwLock); - fExclusiveLock = TRUE; + auto lock = SRWExclusiveLock(m_srwLock); if (!m_fServerProcessListReady) { m_dwProcessesPerApplication = pConfig->QueryProcessesPerApplication(); m_ppServerProcessList = new SERVER_PROCESS*[m_dwProcessesPerApplication]; - if (m_ppServerProcessList == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } for (DWORD i = 0; i < m_dwProcessesPerApplication; ++i) { @@ -141,35 +86,30 @@ PROCESS_MANAGER::GetProcess( } } m_fServerProcessListReady = TRUE; - ReleaseSRWLockExclusive(&m_srwLock); - fExclusiveLock = FALSE; } - AcquireSRWLockShared(&m_srwLock); - fSharedLock = TRUE; - - // - // round robin through to the next available process. - // - dwProcessIndex = (DWORD)InterlockedIncrement64((LONGLONG*)&m_dwRouteToProcessIndex); - dwProcessIndex = dwProcessIndex % m_dwProcessesPerApplication; - - if (m_ppServerProcessList[dwProcessIndex] != NULL && - m_ppServerProcessList[dwProcessIndex]->IsReady()) { - *ppServerProcess = m_ppServerProcessList[dwProcessIndex]; - goto Finished; - } + auto lock = SRWSharedLock(m_srwLock); - ReleaseSRWLockShared(&m_srwLock); - fSharedLock = FALSE; + // + // round robin through to the next available process. + // + dwProcessIndex = (DWORD)InterlockedIncrement64((LONGLONG*)&m_dwRouteToProcessIndex); + dwProcessIndex = dwProcessIndex % m_dwProcessesPerApplication; + + if (m_ppServerProcessList[dwProcessIndex] != NULL && + m_ppServerProcessList[dwProcessIndex]->IsReady()) + { + *ppServerProcess = m_ppServerProcessList[dwProcessIndex]; + return S_OK; + } + } // should make the lock per process so that we can start processes simultaneously ? if (m_ppServerProcessList[dwProcessIndex] == NULL || !m_ppServerProcessList[dwProcessIndex]->IsReady()) { - AcquireSRWLockExclusive(&m_srwLock); - fExclusiveLock = TRUE; + auto lock = SRWExclusiveLock(m_srwLock); if (m_ppServerProcessList[dwProcessIndex] != NULL) { @@ -186,7 +126,7 @@ PROCESS_MANAGER::GetProcess( // server is already up and ready to serve requests. //m_ppServerProcessList[dwProcessIndex]->ReferenceServerProcess(); *ppServerProcess = m_ppServerProcessList[dwProcessIndex]; - goto Finished; + return S_OK; } } @@ -200,22 +140,14 @@ PROCESS_MANAGER::GetProcess( ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED_MSG, pConfig->QueryRapidFailsPerMinute()); - hr = HRESULT_FROM_WIN32(ERROR_SERVER_DISABLED); - goto Finished; + RETURN_HR(HRESULT_FROM_WIN32(ERROR_SERVER_DISABLED)); } if (m_ppServerProcessList[dwProcessIndex] == NULL) { - pSelectedServerProcess = new SERVER_PROCESS(); - if (pSelectedServerProcess == NULL) - { - hr = E_OUTOFMEMORY; - goto Finished; - } - - - hr = pSelectedServerProcess->Initialize( + pSelectedServerProcess = std::make_unique(); + RETURN_IF_FAILED(pSelectedServerProcess->Initialize( this, //ProcessManager pConfig->QueryProcessPath(), // pConfig->QueryArguments(), // @@ -231,50 +163,18 @@ PROCESS_MANAGER::GetProcess( pConfig->QueryApplicationPhysicalPath(), // physical path pConfig->QueryApplicationPath(), // app path pConfig->QueryApplicationVirtualPath() // App relative virtual path - ); - if (FAILED(hr)) - { - goto Finished; - } - - hr = pSelectedServerProcess->StartProcess(); - if (FAILED(hr)) - { - goto Finished; - } + )); + RETURN_IF_FAILED(pSelectedServerProcess->StartProcess()); } if (!pSelectedServerProcess->IsReady()) { - hr = HRESULT_FROM_WIN32(ERROR_CREATE_FAILED); - goto Finished; + RETURN_HR(HRESULT_FROM_WIN32(ERROR_CREATE_FAILED)); } - m_ppServerProcessList[dwProcessIndex] = pSelectedServerProcess; - pSelectedServerProcess = NULL; - + m_ppServerProcessList[dwProcessIndex] = pSelectedServerProcess.release(); } *ppServerProcess = m_ppServerProcessList[dwProcessIndex]; -Finished: - - if (fSharedLock) - { - ReleaseSRWLockShared(&m_srwLock); - fSharedLock = FALSE; - } - - if (fExclusiveLock) - { - ReleaseSRWLockExclusive(&m_srwLock); - fExclusiveLock = FALSE; - } - - if (pSelectedServerProcess != NULL) - { - delete pSelectedServerProcess; - pSelectedServerProcess = NULL; - } - - return hr; + return S_OK; } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp index 0f75a9d072..d0e44b5bd3 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp @@ -2,41 +2,25 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "protocolconfig.h" +#include "exceptions.h" HRESULT PROTOCOL_CONFIG::Initialize() { - HRESULT hr; - STRU strTemp; - m_fKeepAlive = TRUE; m_msTimeout = 120000; m_fPreserveHostHeader = TRUE; m_fReverseRewriteHeaders = FALSE; - if (FAILED(hr = m_strXForwardedForName.CopyW(L"X-Forwarded-For"))) - { - goto Finished; - } - - if (FAILED(hr = m_strSslHeaderName.CopyW(L"X-Forwarded-Proto"))) - { - goto Finished; - } - - if (FAILED(hr = m_strClientCertName.CopyW(L"MS-ASPNETCORE-CLIENTCERT"))) - { - goto Finished; - } + RETURN_IF_FAILED(m_strXForwardedForName.CopyW(L"X-Forwarded-For")); + RETURN_IF_FAILED(m_strSslHeaderName.CopyW(L"X-Forwarded-Proto")); + RETURN_IF_FAILED(m_strClientCertName.CopyW(L"MS-ASPNETCORE-CLIENTCERT")); m_fIncludePortInXForwardedFor = TRUE; m_dwMinResponseBuffer = 0; // no response buffering m_dwResponseBufferLimit = 4096*1024; m_dwMaxResponseHeaderSize = 65536; - -Finished: - - return hr; + return S_OK; } VOID diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp index d8c77eccb0..55dcc2fbd4 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp @@ -2,8 +2,9 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "responseheaderhash.h" +#include "exceptions.h" -HEADER_RECORD RESPONSE_HEADER_HASH::sm_rgHeaders[] = +HEADER_RECORD RESPONSE_HEADER_HASH::sm_rgHeaders[] = { { "Cache-Control", HttpHeaderCacheControl }, { "Connection", HttpHeaderConnection }, @@ -65,8 +66,6 @@ Return Value: --*/ { - HRESULT hr; - // // 31 response headers. // Make sure to update the number of buckets it new headers @@ -79,20 +78,13 @@ Return Value: // Known collisions are "Age" colliding with "Expire" and "Location" // colliding with both "Expire" and "Age". // - hr = HASH_TABLE::Initialize(79); - if (FAILED(hr)) - { - return hr; - } + RETURN_IF_FAILED(HASH_TABLE::Initialize(79)); for ( DWORD Index = 0; Index < _countof(sm_rgHeaders); ++Index ) { - if (FAILED(hr = InsertRecord(&sm_rgHeaders[Index]))) - { - return hr; - } + RETURN_IF_FAILED(InsertRecord(&sm_rgHeaders[Index])); } - + return S_OK; } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp index 890ef01f97..494911472a 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp @@ -6,6 +6,7 @@ #include #include "EventLog.h" #include "file_utility.h" +#include "exceptions.h" //#include //extern BOOL g_fNsiApiNotSupported; @@ -45,13 +46,13 @@ SERVER_PROCESS::Initialize( m_pProcessManager->ReferenceProcessManager(); m_fDebuggerAttached = FALSE; - if (FAILED(hr = m_ProcessPath.Copy(*pszProcessExePath)) || - FAILED(hr = m_struLogFile.Copy(*pstruStdoutLogFile))|| - FAILED(hr = m_struPhysicalPath.Copy(*pszAppPhysicalPath))|| - FAILED(hr = m_struAppFullPath.Copy(*pszAppPath))|| - FAILED(hr = m_struAppVirtualPath.Copy(*pszAppVirtualPath))|| - FAILED(hr = m_Arguments.Copy(*pszArguments)) || - FAILED(hr = SetupJobObject())) + if (FAILED_LOG(hr = m_ProcessPath.Copy(*pszProcessExePath)) || + FAILED_LOG(hr = m_struLogFile.Copy(*pstruStdoutLogFile))|| + FAILED_LOG(hr = m_struPhysicalPath.Copy(*pszAppPhysicalPath))|| + FAILED_LOG(hr = m_struAppFullPath.Copy(*pszAppPath))|| + FAILED_LOG(hr = m_struAppVirtualPath.Copy(*pszAppVirtualPath))|| + FAILED_LOG(hr = m_Arguments.Copy(*pszArguments)) || + FAILED_LOG(hr = SetupJobObject())) { goto Finished; } @@ -180,7 +181,7 @@ SERVER_PROCESS::SetupListenPort( } WCHAR buffer[15]; - if (FAILED(hr = GetRandomPort(&m_dwPort))) + if (FAILED_LOG(hr = GetRandomPort(&m_dwPort))) { goto Finished; } @@ -198,9 +199,9 @@ SERVER_PROCESS::SetupListenPort( goto Finished; } - if (FAILED(hr = pEntry->Initialize(ASPNETCORE_PORT_ENV_STR, buffer)) || - FAILED(hr = pEnvironmentVarTable->InsertRecord(pEntry)) || - FAILED(hr = m_struPort.Copy(buffer))) + if (FAILED_LOG(hr = pEntry->Initialize(ASPNETCORE_PORT_ENV_STR, buffer)) || + FAILED_LOG(hr = pEnvironmentVarTable->InsertRecord(pEntry)) || + FAILED_LOG(hr = m_struPort.Copy(buffer))) { goto Finished; } @@ -212,7 +213,7 @@ Finished: pEntry = NULL; } - if (FAILED(hr)) + if (FAILED_LOG(hr)) { EventLog::Error( ASPNETCORE_EVENT_PROCESS_START_SUCCESS, @@ -252,8 +253,8 @@ SERVER_PROCESS::SetupAppPath( goto Finished; } - if (FAILED(hr = pEntry->Initialize(ASPNETCORE_APP_PATH_ENV_STR, m_struAppVirtualPath.QueryStr())) || - FAILED(hr = pEnvironmentVarTable->InsertRecord(pEntry))) + if (FAILED_LOG(hr = pEntry->Initialize(ASPNETCORE_APP_PATH_ENV_STR, m_struAppVirtualPath.QueryStr())) || + FAILED_LOG(hr = pEnvironmentVarTable->InsertRecord(pEntry))) { goto Finished; } @@ -311,7 +312,7 @@ SERVER_PROCESS::SetupAppToken( fRpcStringAllocd = TRUE; - if (FAILED(hr = m_straGuid.Copy(pszLogUuid))) + if (FAILED_LOG(hr = m_straGuid.Copy(pszLogUuid))) { goto Finished; } @@ -324,9 +325,9 @@ SERVER_PROCESS::SetupAppToken( goto Finished; } - if (FAILED(strAppToken.CopyA(m_straGuid.QueryStr())) || - FAILED(hr = pEntry->Initialize(ASPNETCORE_APP_TOKEN_ENV_STR, strAppToken.QueryStr())) || - FAILED(hr = pEnvironmentVarTable->InsertRecord(pEntry))) + if (FAILED_LOG(strAppToken.CopyA(m_straGuid.QueryStr())) || + FAILED_LOG(hr = pEntry->Initialize(ASPNETCORE_APP_TOKEN_ENV_STR, strAppToken.QueryStr())) || + FAILED_LOG(hr = pEnvironmentVarTable->InsertRecord(pEntry))) { goto Finished; } @@ -382,7 +383,7 @@ SERVER_PROCESS::OutputEnvironmentVariables pszEqualChar = wcschr(pszCurrentVariable, L'='); if (pszEqualChar != NULL) { - if (FAILED(hr = strEnvVar.Copy(pszCurrentVariable, (DWORD)(pszEqualChar - pszCurrentVariable) + 1))) + if (FAILED_LOG(hr = strEnvVar.Copy(pszCurrentVariable, (DWORD)(pszEqualChar - pszCurrentVariable) + 1))) { goto Finished; } @@ -390,7 +391,7 @@ SERVER_PROCESS::OutputEnvironmentVariables if (pEntry != NULL) { // same env variable is defined in configuration, use it - if (FAILED(hr = strEnvVar.Append(pEntry->QueryValue()))) + if (FAILED_LOG(hr = strEnvVar.Append(pEntry->QueryValue()))) { goto Finished; } @@ -453,9 +454,9 @@ SERVER_PROCESS::SetupCommandLine( if ((wcsstr(pszPath, L":") == NULL) && (wcsstr(pszPath, L"%") == NULL)) { // let's check whether it is a relative path - if (FAILED(hr = strRelativePath.Copy(m_struPhysicalPath.QueryStr())) || - FAILED(hr = strRelativePath.Append(L"\\")) || - FAILED(hr = strRelativePath.Append(pszPath))) + if (FAILED_LOG(hr = strRelativePath.Copy(m_struPhysicalPath.QueryStr())) || + FAILED_LOG(hr = strRelativePath.Append(L"\\")) || + FAILED_LOG(hr = strRelativePath.Append(pszPath))) { goto Finished; } @@ -482,9 +483,9 @@ SERVER_PROCESS::SetupCommandLine( pszPath = pszFullPath; } } - if (FAILED(hr = pstrCommandLine->Copy(pszPath)) || - FAILED(hr = pstrCommandLine->Append(L" ")) || - FAILED(hr = pstrCommandLine->Append(m_Arguments.QueryStr()))) + if (FAILED_LOG(hr = pstrCommandLine->Copy(pszPath)) || + FAILED_LOG(hr = pstrCommandLine->Append(L" ")) || + FAILED_LOG(hr = pstrCommandLine->Append(m_Arguments.QueryStr()))) { goto Finished; } @@ -566,7 +567,7 @@ SERVER_PROCESS::PostStartCheck( } // register call back with the created process - if (FAILED(hr = RegisterProcessWait(&m_hProcessWaitHandle, m_hProcessHandle))) + if (FAILED_LOG(hr = RegisterProcessWait(&m_hProcessWaitHandle, m_hProcessHandle))) { goto Finished; } @@ -595,7 +596,7 @@ SERVER_PROCESS::PostStartCheck( if (!fProcessMatch) { // could be the scenario that backend creates child process - if (FAILED(hr = GetChildProcessHandles())) + if (FAILED_LOG(hr = GetChildProcessHandles())) { goto Finished; } @@ -617,7 +618,7 @@ SERVER_PROCESS::PostStartCheck( fDebuggerAttached = FALSE; } - if (FAILED(hr = RegisterProcessWait(&m_hChildProcessWaitHandles[i], + if (FAILED_LOG(hr = RegisterProcessWait(&m_hChildProcessWaitHandles[i], m_hChildProcessHandles[i]))) { goto Finished; @@ -678,7 +679,7 @@ SERVER_PROCESS::PostStartCheck( hr = CheckIfServerIsUp(m_dwPort, &dwActualProcessId, &fReady); - if ((FAILED(hr) || fReady == FALSE)) + if ((FAILED_LOG(hr) || fReady == FALSE)) { strEventMsg.SafeSnwprintf( ASPNETCORE_EVENT_PROCESS_START_NOTREADY_ERROR_MSG, @@ -705,7 +706,7 @@ SERVER_PROCESS::PostStartCheck( } hr = m_pForwarderConnection->Initialize(m_dwPort); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -726,7 +727,7 @@ SERVER_PROCESS::PostStartCheck( Finished: m_fDebuggerAttached = fDebuggerAttached; - if (FAILED(hr)) + if (FAILED_LOG(hr)) { if (m_pForwarderConnection != NULL) { @@ -773,13 +774,13 @@ SERVER_PROCESS::StartProcess( // // generate process command line. // - if (FAILED(hr = SetupCommandLine(&m_struCommandLine))) + if (FAILED_LOG(hr = SetupCommandLine(&m_struCommandLine))) { pStrStage = L"SetupCommandLine"; goto Failure; } - if (FAILED(hr = ENVIRONMENT_VAR_HELPERS::InitEnvironmentVariablesTable( + if (FAILED_LOG(hr = ENVIRONMENT_VAR_HELPERS::InitEnvironmentVariablesTable( m_pEnvironmentVarTable, m_fWindowsAuthEnabled, m_fBasicAuthEnabled, @@ -790,7 +791,7 @@ SERVER_PROCESS::StartProcess( goto Failure; } - if (FAILED(hr = ENVIRONMENT_VAR_HELPERS::AddWebsocketEnabledToEnvironmentVariables( + if (FAILED_LOG(hr = ENVIRONMENT_VAR_HELPERS::AddWebsocketEnabledToEnvironmentVariables( pHashTable, m_fWebSocketSupported ))) @@ -803,7 +804,7 @@ SERVER_PROCESS::StartProcess( // // setup the the port that the backend process will listen on // - if (FAILED(hr = SetupListenPort(pHashTable, &fCriticalError))) + if (FAILED_LOG(hr = SetupListenPort(pHashTable, &fCriticalError))) { pStrStage = L"SetupListenPort"; goto Failure; @@ -812,7 +813,7 @@ SERVER_PROCESS::StartProcess( // // get app path // - if (FAILED(hr = SetupAppPath(pHashTable))) + if (FAILED_LOG(hr = SetupAppPath(pHashTable))) { pStrStage = L"SetupAppPath"; goto Failure; @@ -821,7 +822,7 @@ SERVER_PROCESS::StartProcess( // // generate new guid for each process // - if (FAILED(hr = SetupAppToken(pHashTable))) + if (FAILED_LOG(hr = SetupAppToken(pHashTable))) { pStrStage = L"SetupAppToken"; goto Failure; @@ -830,7 +831,7 @@ SERVER_PROCESS::StartProcess( // // setup environment variables for new process // - if (FAILED(hr = OutputEnvironmentVariables(&mszNewEnvironment, pHashTable))) + if (FAILED_LOG(hr = OutputEnvironmentVariables(&mszNewEnvironment, pHashTable))) { pStrStage = L"OutputEnvironmentVariables"; goto Failure; @@ -861,7 +862,7 @@ SERVER_PROCESS::StartProcess( m_hProcessHandle = processInformation.hProcess; m_dwProcessId = processInformation.dwProcessId; - if (FAILED(hr = SetupJobObject())) + if (FAILED_LOG(hr = SetupJobObject())) { pStrStage = L"SetupJobObject"; goto Failure; @@ -890,7 +891,7 @@ SERVER_PROCESS::StartProcess( // // need to make sure the server is up and listening on the port specified. // - if (FAILED(hr = PostStartCheck())) + if (FAILED_LOG(hr = PostStartCheck())) { pStrStage = L"PostStartCheck"; goto Failure; @@ -944,7 +945,7 @@ SERVER_PROCESS::StartProcess( } Finished: - if (FAILED(hr) || m_fReady == FALSE) + if (FAILED_LOG(hr) || m_fReady == FALSE) { if (m_hStdoutHandle != NULL) { @@ -1034,7 +1035,7 @@ SERVER_PROCESS::SetupStdHandles( m_struLogFile.QueryStr(), m_struPhysicalPath.QueryStr(), &struPath); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -1049,13 +1050,13 @@ SERVER_PROCESS::SetupStdHandles( systemTime.wMinute, systemTime.wSecond, GetCurrentProcessId()); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } hr = FILE_UTILITY::EnsureDirectoryPathExist(struPath.QueryStr()); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -1086,7 +1087,7 @@ SERVER_PROCESS::SetupStdHandles( m_Timer.InitializeTimer(STTIMER::TimerCallback, &m_struFullLogFile, 3000, 3000); Finished: - if (FAILED(hr)) + if (FAILED_LOG(hr)) { pStartupInfo->dwFlags = STARTF_USESTDHANDLES; pStartupInfo->hStdInput = INVALID_HANDLE_VALUE; @@ -1305,7 +1306,7 @@ Finished: hThread = NULL; } - if (FAILED(hr)) + if (FAILED_LOG(hr)) { TerminateBackendProcess(); } @@ -1874,7 +1875,7 @@ SERVER_PROCESS::RegisterProcessWait( Finished: - if (FAILED(hr)) + if (FAILED_LOG(hr)) { *phWaitHandle = NULL; DereferenceServerProcess(); @@ -1981,10 +1982,10 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID ) } // set up the shutdown headers - if (FAILED(hr = strHeaders.Append(L"MS-ASPNETCORE-EVENT:shutdown \r\n")) || - FAILED(hr = strAppToken.Append(L"MS-ASPNETCORE-TOKEN:")) || - FAILED(hr = strAppToken.AppendA(m_straGuid.QueryStr())) || - FAILED(hr = strHeaders.Append(strAppToken.QueryStr()))) + if (FAILED_LOG(hr = strHeaders.Append(L"MS-ASPNETCORE-EVENT:shutdown \r\n")) || + FAILED_LOG(hr = strAppToken.Append(L"MS-ASPNETCORE-TOKEN:")) || + FAILED_LOG(hr = strAppToken.AppendA(m_straGuid.QueryStr())) || + FAILED_LOG(hr = strHeaders.Append(strAppToken.QueryStr()))) { goto Finished; } @@ -2072,7 +2073,7 @@ SERVER_PROCESS::SendShutDownSignalInternal( { ReferenceServerProcess(); - if (FAILED(SendShutdownHttpMessage())) + if (FAILED_LOG(SendShutdownHttpMessage())) { // // failed to send shutdown http message diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp index c5b3a06e86..64118b61b6 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp @@ -5,6 +5,7 @@ #include #include "debugutil.h" +#include "exceptions.h" // static HRESULT @@ -38,8 +39,6 @@ Return Value: --*/ { - HRESULT hr; - // // First determine if the target is secure // @@ -55,12 +54,12 @@ Return Value: } else { - return HRESULT_FROM_WIN32(ERROR_INVALID_DATA); + RETURN_HR(HRESULT_FROM_WIN32(ERROR_INVALID_DATA)); } if (*pszDestinationUrl == L'\0') { - return HRESULT_FROM_WIN32(ERROR_INVALID_DATA); + RETURN_HR(HRESULT_FROM_WIN32(ERROR_INVALID_DATA)); } // @@ -69,20 +68,14 @@ Return Value: LPCWSTR pszSlash = wcschr(pszDestinationUrl, L'/'); if (pszSlash == NULL) { - if (FAILED(hr = pstrUrl->Copy(L"/", 1)) || - FAILED(hr = pstrDestination->Copy(pszDestinationUrl))) - { - return hr; - } + RETURN_IF_FAILED(pstrUrl->Copy(L"/", 1)); + RETURN_IF_FAILED(pstrDestination->Copy(pszDestinationUrl)); } else { - if (FAILED(hr = pstrUrl->Copy(pszSlash)) || - FAILED(hr = pstrDestination->Copy(pszDestinationUrl, - (DWORD)(pszSlash - pszDestinationUrl)))) - { - return hr; - } + RETURN_IF_FAILED(pstrUrl->Copy(pszSlash)); + RETURN_IF_FAILED(pstrDestination->Copy(pszDestinationUrl, + (DWORD)(pszSlash - pszDestinationUrl))); } return S_OK; @@ -102,34 +95,28 @@ URL_UTILITY::EscapeAbsPath( STRU * strEscapedUrl ) { - HRESULT hr = S_OK; STRU strAbsPath; LPCWSTR pszAbsPath = NULL; LPCWSTR pszFindStr = NULL; - hr = strAbsPath.Copy( pRequest->GetRawHttpRequest()->CookedUrl.pAbsPath, - pRequest->GetRawHttpRequest()->CookedUrl.AbsPathLength / sizeof(WCHAR) ); - if(FAILED(hr)) - { - goto Finished; - } + RETURN_IF_FAILED(strAbsPath.Copy( pRequest->GetRawHttpRequest()->CookedUrl.pAbsPath, + pRequest->GetRawHttpRequest()->CookedUrl.AbsPathLength / sizeof(WCHAR) )); pszAbsPath = strAbsPath.QueryStr(); pszFindStr = wcschr(pszAbsPath, L'?'); while(pszFindStr != NULL) { - strEscapedUrl->Append( pszAbsPath, pszFindStr - pszAbsPath); - strEscapedUrl->Append(L"%3F"); + RETURN_IF_FAILED(strEscapedUrl->Append( pszAbsPath, pszFindStr - pszAbsPath)); + RETURN_IF_FAILED(strEscapedUrl->Append(L"%3F")); pszAbsPath = pszFindStr + 1; pszFindStr = wcschr(pszAbsPath, L'?'); } - strEscapedUrl->Append(pszAbsPath); - strEscapedUrl->Append(pRequest->GetRawHttpRequest()->CookedUrl.pQueryString, - pRequest->GetRawHttpRequest()->CookedUrl.QueryStringLength / sizeof(WCHAR)); + RETURN_IF_FAILED(strEscapedUrl->Append(pszAbsPath)); + RETURN_IF_FAILED(strEscapedUrl->Append(pRequest->GetRawHttpRequest()->CookedUrl.pQueryString, + pRequest->GetRawHttpRequest()->CookedUrl.QueryStringLength / sizeof(WCHAR))); -Finished: - return hr; + return S_OK; } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp index f58d599f98..5eac6001e9 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp @@ -28,6 +28,7 @@ This prevents the need for data buffering at the Asp.Net Core Module level. --*/ #include "websockethandler.h" +#include "exceptions.h" SRWLOCK WEBSOCKET_HANDLER::sm_RequestsListLock; @@ -86,7 +87,7 @@ HRESULT WEBSOCKET_HANDLER::StaticInitialize( BOOL fEnableReferenceCountTracing ) -/*++ +/*++ Routine Description: @@ -145,7 +146,7 @@ WEBSOCKET_HANDLER::InsertRequest( } } -//static +//static VOID WEBSOCKET_HANDLER::RemoveRequest( VOID @@ -244,11 +245,11 @@ WEBSOCKET_HANDLER::ProcessRequest( Routine Description: Entry point to WebSocket Handler: - + This routine is called after the 101 response was successfully sent to - the client. - This routine get's a websocket handle to winhttp, - websocket handle to IIS's websocket context, and initiates IO + the client. + This routine get's a websocket handle to winhttp, + websocket handle to IIS's websocket context, and initiates IO in these two endpoints. @@ -267,10 +268,10 @@ Routine Description: // // Cache the points to IHttpContext3 // - hr = HttpGetExtendedInterface(g_pHttpServer, - pHttpContext, + hr = HttpGetExtendedInterface(g_pHttpServer, + pHttpContext, &_pHttpContext); - if (FAILED (hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -338,7 +339,7 @@ Routine Description: // Initiate Read on IIS // hr = DoIisWebSocketReceive(); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -348,7 +349,7 @@ Routine Description: // hr = DoWinHttpWebSocketReceive(); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -356,7 +357,7 @@ Routine Description: Finished: LeaveCriticalSection(&_RequestLock); - if (FAILED (hr)) + if (FAILED_LOG(hr)) { DebugPrintf (ASPNETCORE_DEBUG_FLAG_ERROR, "Process Request Failed with HR=%08x", hr); @@ -399,7 +400,7 @@ Routine Description: OnReadIoCompletion, this, NULL); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { DecrementOutstandingIo(); DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, @@ -498,7 +499,7 @@ Routine Description: // hr = strCloseReason.CopyA((PCSTR)&_WinHttpReceiveBuffer, dwReceived); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -549,13 +550,13 @@ Routine Description: NULL); } - if (FAILED(hr)) + if (FAILED_LOG(hr)) { DecrementOutstandingIo(); } Finished: - if (FAILED(hr)) + if (FAILED_LOG(hr)) { DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, "WEBSOCKET_HANDLER::DoIisWebSocketSend failed with %08x", hr); @@ -592,10 +593,10 @@ Routine Description: // // Get Close status from IIS. // - hr = _pWebSocketContext->GetCloseStatus(&uStatus, + hr = _pWebSocketContext->GetCloseStatus(&uStatus, &pszReason); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -604,7 +605,7 @@ Routine Description: // Convert status to UTF8 // hr = strCloseReason.CopyWToUTF8Unescaped(pszReason); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } @@ -663,7 +664,7 @@ Routine Description: } Finished: - if (FAILED(hr)) + if (FAILED_LOG(hr)) { DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, "WEBSOCKET_HANDLER::DoWinHttpWebSocketSend failed with %08x", hr); @@ -691,7 +692,7 @@ WEBSOCKET_HANDLER::OnReadIoCompletion( --*/ { - WEBSOCKET_HANDLER * pHandler = (WEBSOCKET_HANDLER *) + WEBSOCKET_HANDLER * pHandler = (WEBSOCKET_HANDLER *) pvCompletionContext; pHandler->OnIisReceiveComplete( @@ -721,7 +722,7 @@ WEBSOCKET_HANDLER::OnWriteIoCompletion( --*/ { - WEBSOCKET_HANDLER * pHandler = (WEBSOCKET_HANDLER *) + WEBSOCKET_HANDLER * pHandler = (WEBSOCKET_HANDLER *) pvCompletionContext; UNREFERENCED_PARAMETER(fUTF8Encoded); @@ -776,18 +777,18 @@ Routine Description: // hr = DoIisWebSocketReceive(); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { goto Finished; } Finished: - if (fLocked) + if (fLocked) { LeaveCriticalSection(&_RequestLock); } - if (FAILED (hr)) + if (FAILED_LOG(hr)) { Cleanup (cleanupReason); @@ -848,7 +849,7 @@ Routine Description: Issue send on the Client(IIS) if the receive was successful. - If the receive completed with zero bytes, that + If the receive completed with zero bytes, that indicates that the server has disconnected the connection. Issue cleanup for the websocket handler. --*/ @@ -877,18 +878,18 @@ Routine Description: pCompletionStatus->eBufferType ); - if (FAILED (hr)) + if (FAILED_LOG(hr)) { cleanupReason = ClientDisconnect; goto Finished; } Finished: - if (fLocked) + if (fLocked) { LeaveCriticalSection(&_RequestLock); } - if (FAILED (hr)) + if (FAILED_LOG(hr)) { Cleanup (cleanupReason); @@ -917,7 +918,7 @@ Routine Description: Completion callback executed when a send completes from the client. - If send was successful,issue read on the + If send was successful,issue read on the server endpoint, to continue the readloop. --*/ @@ -930,7 +931,7 @@ Routine Description: DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, "WEBSOCKET_HANDLER::OnIisSendComplete"); - if (FAILED(hrCompletion)) + if (FAILED_LOG(hrCompletion)) { hr = hrCompletion; cleanupReason = ClientDisconnect; @@ -957,7 +958,7 @@ Routine Description: // Write Completed, initiate next read from backend server. // hr = DoWinHttpWebSocketReceive(); - if (FAILED(hr)) + if (FAILED_LOG(hr)) { cleanupReason = ServerDisconnect; goto Finished; @@ -969,7 +970,7 @@ Finished: { LeaveCriticalSection(&_RequestLock); } - if (FAILED (hr)) + if (FAILED_LOG(hr)) { Cleanup (cleanupReason); @@ -1016,7 +1017,7 @@ Routine Description: DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, "WEBSOCKET_HANDLER::OnIisReceiveComplete"); - if (FAILED(hrCompletion)) + if (FAILED_LOG(hrCompletion)) { cleanupReason = ClientDisconnect; hr = hrCompletion; @@ -1029,7 +1030,7 @@ Routine Description: } EnterCriticalSection(&_RequestLock); - + fLocked = TRUE; if (_fCleanupInProgress) { @@ -1049,7 +1050,7 @@ Routine Description: // hr = DoWinHttpWebSocketSend(cbIO, BufferType); - if (FAILED (hr)) + if (FAILED_LOG(hr)) { cleanupReason = ServerDisconnect; goto Finished; @@ -1060,7 +1061,7 @@ Finished: { LeaveCriticalSection(&_RequestLock); } - if (FAILED (hr)) + if (FAILED_LOG(hr)) { Cleanup (cleanupReason); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp index 8d14ffc417..8f6c5d3720 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp @@ -2,6 +2,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "winhttphelper.h" +#include "exceptions.h" PFN_WINHTTP_WEBSOCKET_COMPLETE_UPGRADE WINHTTP_HELPER::sm_pfnWinHttpWebSocketCompleteUpgrade; @@ -24,8 +25,6 @@ WINHTTP_HELPER::StaticInitialize( VOID ) { - HRESULT hr = S_OK; - // // Initialize the function pointers for WinHttp Websocket API's. // @@ -35,54 +34,29 @@ WINHTTP_HELPER::StaticInitialize( } HMODULE hWinHttp = GetModuleHandleA("winhttp.dll"); - if (hWinHttp == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + RETURN_LAST_ERROR_IF (hWinHttp == NULL); - sm_pfnWinHttpWebSocketCompleteUpgrade = (PFN_WINHTTP_WEBSOCKET_COMPLETE_UPGRADE) + sm_pfnWinHttpWebSocketCompleteUpgrade = (PFN_WINHTTP_WEBSOCKET_COMPLETE_UPGRADE) GetProcAddress(hWinHttp, "WinHttpWebSocketCompleteUpgrade"); - if (sm_pfnWinHttpWebSocketCompleteUpgrade == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketCompleteUpgrade == NULL); sm_pfnWinHttpWebSocketQueryCloseStatus = (PFN_WINHTTP_WEBSOCKET_QUERY_CLOSE_STATUS) GetProcAddress(hWinHttp, "WinHttpWebSocketQueryCloseStatus"); - if (sm_pfnWinHttpWebSocketQueryCloseStatus == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketQueryCloseStatus == NULL); sm_pfnWinHttpWebSocketReceive = (PFN_WINHTTP_WEBSOCKET_RECEIVE) GetProcAddress(hWinHttp, "WinHttpWebSocketReceive"); - if (sm_pfnWinHttpWebSocketReceive == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketReceive == NULL); sm_pfnWinHttpWebSocketSend = (PFN_WINHTTP_WEBSOCKET_SEND) GetProcAddress(hWinHttp, "WinHttpWebSocketSend"); - if (sm_pfnWinHttpWebSocketSend == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketSend == NULL); sm_pfnWinHttpWebSocketShutdown = (PFN_WINHTTP_WEBSOCKET_SHUTDOWN) GetProcAddress(hWinHttp, "WinHttpWebSocketShutdown"); - if (sm_pfnWinHttpWebSocketShutdown == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } + RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketShutdown == NULL); -Finished: - return hr; + return S_OK; } @@ -170,6 +144,4 @@ WINHTTP_HELPER::GetBufferTypeFromFlags( *pBufferType = WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; } } - - return; } From 135da118d1346f8c622b4721126a3c897f4971e2 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 21 Aug 2018 14:12:15 -0700 Subject: [PATCH 232/363] Add rc file as an include for ANCMV1 (#1284) --- src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc b/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc index 6d771d50bd..11aef4a8dc 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc +++ b/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc @@ -3,6 +3,7 @@ #include #include "version.h" #include "resource.h" +#include "Aspnetcore_msg.rc" ///////////////////////////////////////////////////////////////////////////// // English (United States) resources From 8b078218b0e5a71c7704d9feec7dde8784d2e60c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 21 Aug 2018 14:12:37 -0700 Subject: [PATCH 233/363] Change ANCM version to 12.2 (#1272) --- version.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.props b/version.props index 5a339cd884..ad728a1390 100644 --- a/version.props +++ b/version.props @@ -8,8 +8,8 @@ a- $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) $(VersionSuffix)-$(BuildNumber) - 8 - 1 + 12 + 2 0 2.0.0 From 9ccd3addc3cd0c4c8a6c5e0af73327423d66947c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 21 Aug 2018 14:13:33 -0700 Subject: [PATCH 234/363] Synchronizes copyrights between V1 and V2. (#1283) --- src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc | 3 ++- src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc b/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc index 0bbc4fa1c2..73eb713f1c 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc +++ b/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc @@ -1,6 +1,7 @@ ;/*++ ; -;Copyright (c) 2014 Microsoft Corporation +; Copyright (c) .NET Foundation. All rights reserved. +; Licensed under the MIT License. See License.txt in the project root for license information. ; ;Module Name: ; diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc b/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc index 11aef4a8dc..7790f5067f 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc +++ b/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc @@ -76,10 +76,10 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Microsoft" + VALUE "CompanyName", "Microsoft Corporation" VALUE "FileDescription", FileDescription VALUE "FileVersion", FileVersionStr - VALUE "InternalName", "aspnetcore.dll" + VALUE "InternalName", "aspnetcore" VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation" VALUE "OriginalFilename", "aspnetcore.dll" VALUE "ProductName", "ASP.NET Core Module" From cc96a611ea18eeabb81408a6de51d1ce70819f93 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 21 Aug 2018 15:11:39 -0700 Subject: [PATCH 235/363] Fix failing tests (#1288) --- test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs index e0cb1cef5d..b97aaf46f5 100644 --- a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs +++ b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs @@ -81,6 +81,7 @@ namespace IIS.FunctionalTests.Inprocess } [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] [SkipIfDebug] public async Task EnableCoreHostTraceLogging_TwoLogFilesCreated() { @@ -108,6 +109,7 @@ namespace IIS.FunctionalTests.Inprocess } [ConditionalTheory] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] [SkipIfDebug] [InlineData("CheckLargeStdErrWrites")] [InlineData("CheckLargeStdOutWrites")] @@ -131,6 +133,7 @@ namespace IIS.FunctionalTests.Inprocess } [ConditionalTheory] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] [SkipIfDebug] [InlineData("CheckLargeStdErrWrites")] [InlineData("CheckLargeStdOutWrites")] From e23d9cb4ac39d9868edc5295da76d42fdfccd6b6 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 21 Aug 2018 15:45:42 -0700 Subject: [PATCH 236/363] Fix a few leaked handles (#1260) --- .../InProcessRequestHandler/inprocessapplication.cpp | 3 --- .../InProcessRequestHandler/inprocessapplication.h | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 43a4071cf5..56eb63577c 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -44,7 +44,6 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION() { - m_hThread = NULL; s_Application = NULL; } @@ -190,8 +189,6 @@ IN_PROCESS_APPLICATION::ShutDownInternal() } } - CloseHandle(m_hThread); - m_hThread = NULL; s_Application = NULL; } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index 10149cf3f3..1d5cfec4c9 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -121,7 +121,7 @@ private: }; // Thread executing the .NET Core process - HANDLE m_hThread; + HandleWrapper m_hThread; // The request handler callback from managed code PFN_REQUEST_HANDLER m_RequestHandler; @@ -134,7 +134,7 @@ private: PFN_ASYNC_COMPLETION_HANDLER m_AsyncCompletionHandler; // The event that gets triggered when managed initialization is complete - HANDLE m_pInitalizeEvent; + HandleWrapper m_pInitalizeEvent; STRU m_struExeLocation; From e26231b61314b35571c99f032ae7353e72bb4056 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 22 Aug 2018 08:23:40 -0700 Subject: [PATCH 237/363] Cleanup application manager (#1250) --- .../AspNetCore/ApplicationFactory.h | 46 +++ .../AspNetCore/AspNetCore.vcxproj | 1 + .../AspNetCore/HandlerResolver.cpp | 194 ++++++------ .../AspNetCore/HandlerResolver.h | 34 +- .../AspNetCore/applicationinfo.cpp | 72 +---- .../AspNetCore/applicationinfo.h | 158 +++------- .../AspNetCore/applicationmanager.cpp | 290 ++++++------------ .../AspNetCore/applicationmanager.h | 57 +--- .../AspNetCore/aspnetcore_shim_config.cpp | 14 +- .../AspNetCore/aspnetcore_shim_config.h | 23 +- .../AspNetCore/proxymodule.cpp | 21 +- .../AspNetCore/proxymodule.h | 6 +- .../CommonLib/HandleWrapper.h | 7 + .../CommonLib/debugutil.cpp | 2 +- .../CommonLib/file_utility.cpp | 31 -- .../CommonLib/file_utility.h | 6 - .../CommonLib/iapplication.h | 4 +- .../OutOfProcessRequestHandler/dllmain.cpp | 2 + .../ConfigurationChangeTests.cs | 52 +++- test/CommonLibTests/hostfxr_utility_tests.cpp | 4 +- 20 files changed, 394 insertions(+), 630 deletions(-) create mode 100644 src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h b/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h new file mode 100644 index 0000000000..380b0de6cc --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h @@ -0,0 +1,46 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include +#include +#include "iapplication.h" +#include "HandleWrapper.h" + +typedef +HRESULT +(WINAPI * PFN_ASPNETCORE_CREATE_APPLICATION)( + _In_ IHttpServer *pServer, + _In_ IHttpApplication *pHttpApplication, + _In_ APPLICATION_PARAMETER *pParameters, + _In_ DWORD nParameters, + _Out_ IAPPLICATION **pApplication + ); + +class ApplicationFactory +{ +public: + ApplicationFactory(HMODULE hRequestHandlerDll, std::wstring location, PFN_ASPNETCORE_CREATE_APPLICATION pfnAspNetCoreCreateApplication): + m_pfnAspNetCoreCreateApplication(pfnAspNetCoreCreateApplication), + m_location(location), + m_hRequestHandlerDll(hRequestHandlerDll) + { + } + + HRESULT Execute( + _In_ IHttpServer *pServer, + _In_ IHttpApplication *pHttpApplication, + _Out_ IAPPLICATION **pApplication) const + { + std::array parameters { + {"InProcessExeLocation", reinterpret_cast(m_location.data())} + }; + return m_pfnAspNetCoreCreateApplication(pServer, pHttpApplication, parameters.data(), static_cast(parameters.size()), pApplication); + } + +private: + PFN_ASPNETCORE_CREATE_APPLICATION m_pfnAspNetCoreCreateApplication; + std::wstring m_location; + HandleWrapper m_hRequestHandlerDll; +}; diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index 9663eb06ce..b809cdeadc 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -227,6 +227,7 @@ + diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index 49d1a29093..83c34a30c0 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -19,56 +19,59 @@ const PCWSTR HandlerResolver::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L" HandlerResolver::HandlerResolver(HMODULE hModule, IHttpServer &pServer) : m_hModule(hModule), m_pServer(pServer), - m_fAspnetcoreRHLoadResult(S_FALSE), - m_loadedApplicationHostingModel(HOSTING_UNKNOWN), - m_hRequestHandlerDll(nullptr), - m_pfnAspNetCoreCreateApplication(nullptr) + m_loadedApplicationHostingModel(HOSTING_UNKNOWN) { InitializeSRWLock(&m_requestHandlerLoadLock); } HRESULT -HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, STRU& location, ASPNETCORE_SHIM_CONFIG * pConfiguration) +HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, ASPNETCORE_SHIM_CONFIG& pConfiguration, std::unique_ptr& pApplicationFactory) { HRESULT hr; - STACK_STRU(struFileName, MAX_PATH); PCWSTR pstrHandlerDllName; - if (pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) + bool preventUnload; + if (pConfiguration.QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) { + preventUnload = false; pstrHandlerDllName = s_pwzAspnetcoreInProcessRequestHandlerName; } else { + // OutOfProcess handler is not able to handle unload correctly + // It has code running after application.Stop exits + preventUnload = true; pstrHandlerDllName = s_pwzAspnetcoreOutOfProcessRequestHandlerName; } - + HandleWrapper hRequestHandlerDll; + std::wstring location; + std::wstring handlerDllPath; // Try to see if RH is already loaded, use GetModuleHandleEx to increment ref count - if (!GetModuleHandleEx(0, pstrHandlerDllName, &m_hRequestHandlerDll)) + if (!GetModuleHandleEx(0, pstrHandlerDllName, &hRequestHandlerDll)) { - if (pConfiguration->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) + if (pConfiguration.QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) { std::unique_ptr options; std::unique_ptr outputManager; RETURN_IF_FAILED(HOSTFXR_OPTIONS::Create( NULL, - pConfiguration->QueryProcessPath()->QueryStr(), + pConfiguration.QueryProcessPath().c_str(), pApplication.GetApplicationPhysicalPath(), - pConfiguration->QueryArguments()->QueryStr(), + pConfiguration.QueryArguments().c_str(), options)); - RETURN_IF_FAILED(location.Copy(options->GetExeLocation())); + location = options->GetExeLocation(); RETURN_IF_FAILED(LoggingHelpers::CreateLoggingProvider( - pConfiguration->QueryStdoutLogEnabled(), + pConfiguration.QueryStdoutLogEnabled(), !m_pServer.IsCommandLineLaunch(), - pConfiguration->QueryStdoutLogFile()->QueryStr(), + pConfiguration.QueryStdoutLogFile()->QueryStr(), pApplication.GetApplicationPhysicalPath(), outputManager)); outputManager->Start(); - hr = FindNativeAssemblyFromHostfxr(options.get(), pstrHandlerDllName, &struFileName); + hr = FindNativeAssemblyFromHostfxr(*options.get(), pstrHandlerDllName, handlerDllPath); outputManager->Stop(); if (FAILED(hr) && m_hHostFxrDll != NULL) @@ -85,85 +88,99 @@ HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, STRU EventLog::Error( ASPNETCORE_EVENT_GENERAL_ERROR, ASPNETCORE_EVENT_INPROCESS_RH_ERROR_MSG, - struFileName.IsEmpty() ? s_pwzAspnetcoreInProcessRequestHandlerName : struFileName.QueryStr(), + handlerDllPath.empty()? s_pwzAspnetcoreInProcessRequestHandlerName : handlerDllPath.c_str(), struStdMsg.QueryStr()); } } else { - if (FAILED_LOG(hr = FindNativeAssemblyFromGlobalLocation(pConfiguration, pstrHandlerDllName, &struFileName))) + if (FAILED_LOG(hr = FindNativeAssemblyFromGlobalLocation(pConfiguration, pstrHandlerDllName, handlerDllPath))) { EventLog::Error( ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG, - struFileName.IsEmpty() ? s_pwzAspnetcoreOutOfProcessRequestHandlerName : struFileName.QueryStr()); + handlerDllPath.empty() ? s_pwzAspnetcoreOutOfProcessRequestHandlerName : handlerDllPath.c_str()); return hr; } } - LOG_INFOF("Loading request handler: %S", struFileName.QueryStr()); + LOG_INFOF("Loading request handler: %S", handlerDllPath.c_str()); - m_hRequestHandlerDll = LoadLibraryW(struFileName.QueryStr()); - RETURN_LAST_ERROR_IF_NULL(m_hRequestHandlerDll); + hRequestHandlerDll = LoadLibrary(handlerDllPath.c_str()); + if (preventUnload) + { + // Pin module in memory + GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_PIN, pstrHandlerDllName, &hRequestHandlerDll); + } + RETURN_LAST_ERROR_IF_NULL(hRequestHandlerDll); } - m_pfnAspNetCoreCreateApplication = reinterpret_cast(GetProcAddress(m_hRequestHandlerDll, "CreateApplication")); - - RETURN_LAST_ERROR_IF_NULL(m_pfnAspNetCoreCreateApplication); + auto pfnAspNetCoreCreateApplication = reinterpret_cast(GetProcAddress(hRequestHandlerDll, "CreateApplication")); + RETURN_LAST_ERROR_IF_NULL(pfnAspNetCoreCreateApplication); + pApplicationFactory = std::make_unique(hRequestHandlerDll.release(), location, pfnAspNetCoreCreateApplication); return S_OK; } HRESULT -HandlerResolver::GetApplicationFactory(IHttpApplication &pApplication, STRU& location, PFN_ASPNETCORE_CREATE_APPLICATION * pfnCreateApplication) +HandlerResolver::GetApplicationFactory(IHttpApplication &pApplication, std::unique_ptr& pApplicationFactory) { - ASPNETCORE_SHIM_CONFIG pConfiguration; - RETURN_IF_FAILED(pConfiguration.Populate(&m_pServer, &pApplication)); - - if (m_fAspnetcoreRHLoadResult == S_FALSE) + try { + ASPNETCORE_SHIM_CONFIG pConfiguration; + RETURN_IF_FAILED(pConfiguration.Populate(&m_pServer, &pApplication)); + SRWExclusiveLock lock(m_requestHandlerLoadLock); - if (m_fAspnetcoreRHLoadResult == S_FALSE) + if (m_loadedApplicationHostingModel != HOSTING_UNKNOWN) { - m_loadedApplicationHostingModel = pConfiguration.QueryHostingModel(); - m_loadedApplicationId = pApplication.GetApplicationId(); - LOG_IF_FAILED(m_fAspnetcoreRHLoadResult = LoadRequestHandlerAssembly(pApplication, location, &pConfiguration)); + // Mixed hosting models + if (m_loadedApplicationHostingModel != pConfiguration.QueryHostingModel()) + { + EventLog::Error( + ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR, + ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG, + pApplication.GetApplicationId(), + pConfiguration.QueryHostingModel()); + + return E_FAIL; + } + // Multiple in-process apps + if (m_loadedApplicationHostingModel == HOSTING_IN_PROCESS && m_loadedApplicationId != pApplication.GetApplicationId()) + { + EventLog::Error( + ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP, + ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG, + pApplication.GetApplicationId()); + + return E_FAIL; + } } + + m_loadedApplicationHostingModel = pConfiguration.QueryHostingModel(); + m_loadedApplicationId = pApplication.GetApplicationId(); + RETURN_IF_FAILED(LoadRequestHandlerAssembly(pApplication, pConfiguration, pApplicationFactory)); + } + CATCH_RETURN(); - // Mixed hosting models - if (m_loadedApplicationHostingModel != pConfiguration.QueryHostingModel()) - { - EventLog::Error( - ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR, - ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG, - pApplication.GetApplicationId(), - pConfiguration.QueryHostingModel()); + return S_OK; +} - return E_FAIL; - } - // Multiple in-process apps - else if (m_loadedApplicationHostingModel == HOSTING_IN_PROCESS && m_loadedApplicationId != pApplication.GetApplicationId()) - { - EventLog::Error( - ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP, - ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG, - pApplication.GetApplicationId()); +void HandlerResolver::ResetHostingModel() +{ + SRWExclusiveLock lock(m_requestHandlerLoadLock); - return E_FAIL; - } - - *pfnCreateApplication = m_pfnAspNetCoreCreateApplication; - return m_fAspnetcoreRHLoadResult; + m_loadedApplicationHostingModel = APP_HOSTING_MODEL::HOSTING_UNKNOWN; + m_loadedApplicationId.resize(0); } HRESULT HandlerResolver::FindNativeAssemblyFromGlobalLocation( - ASPNETCORE_SHIM_CONFIG * pConfiguration, + ASPNETCORE_SHIM_CONFIG& pConfiguration, PCWSTR pstrHandlerDllName, - STRU* struFilename + std::wstring& handlerDllPath ) { try @@ -172,12 +189,10 @@ HandlerResolver::FindNativeAssemblyFromGlobalLocation( modulePath = GlobalVersionUtility::RemoveFileNameFromFolderPath(modulePath); - std::wstring retval = GlobalVersionUtility::GetGlobalRequestHandlerPath(modulePath.c_str(), - pConfiguration->QueryHandlerVersion()->QueryStr(), + handlerDllPath = GlobalVersionUtility::GetGlobalRequestHandlerPath(modulePath.c_str(), + pConfiguration.QueryHandlerVersion().c_str(), pstrHandlerDllName ); - - RETURN_IF_FAILED(struFilename->Copy(retval.c_str())); } catch (...) { @@ -199,25 +214,18 @@ HandlerResolver::FindNativeAssemblyFromGlobalLocation( // HRESULT HandlerResolver::FindNativeAssemblyFromHostfxr( - HOSTFXR_OPTIONS* hostfxrOptions, + HOSTFXR_OPTIONS& hostfxrOptions, PCWSTR libraryName, - STRU* struFilename + std::wstring& handlerDllPath ) { - STRU struApplicationFullPath; - STRU struNativeSearchPaths; - STRU struNativeDllLocation; - INT intIndex = -1; - INT intPrevIndex = 0; - BOOL fFound = FALSE; - DWORD dwBufferSize = 1024 * 10; - DWORD dwRequiredBufferSize = 0; - STRA output; + std::wstring struNativeSearchPaths; + size_t intIndex; + size_t intPrevIndex = 0; + DWORD dwBufferSize = s_initialGetNativeSearchDirectoriesBufferSize; + DWORD dwRequiredBufferSize = 0; - - DBG_ASSERT(struFilename != NULL); - - RETURN_LAST_ERROR_IF_NULL(m_hHostFxrDll = LoadLibraryW(hostfxrOptions->GetHostFxrLocation())); + RETURN_LAST_ERROR_IF_NULL(m_hHostFxrDll = LoadLibraryW(hostfxrOptions.GetHostFxrLocation())); auto pFnHostFxrSearchDirectories = reinterpret_cast(GetProcAddress(m_hHostFxrDll, "hostfxr_get_native_search_directories")); if (pFnHostFxrSearchDirectories == nullptr) @@ -225,20 +233,20 @@ HandlerResolver::FindNativeAssemblyFromHostfxr( EventLog::Error( ASPNETCORE_EVENT_GENERAL_ERROR, ASPNETCORE_EVENT_HOSTFXR_DLL_INVALID_VERSION_MSG, - hostfxrOptions->GetHostFxrLocation() + hostfxrOptions.GetHostFxrLocation() ); RETURN_IF_FAILED(E_FAIL); } RETURN_LAST_ERROR_IF_NULL(pFnHostFxrSearchDirectories); - RETURN_IF_FAILED(struNativeSearchPaths.Resize(dwBufferSize)); + struNativeSearchPaths.resize(dwBufferSize); while (TRUE) { - auto intHostFxrExitCode = pFnHostFxrSearchDirectories( - hostfxrOptions->GetArgc(), - hostfxrOptions->GetArgv(), - struNativeSearchPaths.QueryStr(), + const auto intHostFxrExitCode = pFnHostFxrSearchDirectories( + hostfxrOptions.GetArgc(), + hostfxrOptions.GetArgv(), + struNativeSearchPaths.data(), dwBufferSize, &dwRequiredBufferSize ); @@ -251,7 +259,7 @@ HandlerResolver::FindNativeAssemblyFromHostfxr( { dwBufferSize = dwRequiredBufferSize + 1; // for null terminator - RETURN_IF_FAILED(struNativeSearchPaths.Resize(dwBufferSize)); + struNativeSearchPaths.resize(dwBufferSize); } else { @@ -260,26 +268,26 @@ HandlerResolver::FindNativeAssemblyFromHostfxr( } } - RETURN_IF_FAILED(struNativeSearchPaths.SyncWithBuffer()); + struNativeSearchPaths.resize(struNativeSearchPaths.find(L'\0')); - fFound = FALSE; + auto fFound = FALSE; // The native search directories are semicolon delimited. // Split on semicolons, append aspnetcorerh.dll, and check if the file exists. - while ((intIndex = struNativeSearchPaths.IndexOf(L";", intPrevIndex)) != -1) + while ((intIndex = struNativeSearchPaths.find(L';', intPrevIndex)) != std::wstring::npos) { - RETURN_IF_FAILED(struNativeDllLocation.Copy(&struNativeSearchPaths.QueryStr()[intPrevIndex], intIndex - intPrevIndex)); + auto path = struNativeSearchPaths.substr(intPrevIndex, intIndex - intPrevIndex); - if (!struNativeDllLocation.EndsWith(L"\\")) + if (!path.empty() && !(path[path.length() - 1] == L'\\')) { - RETURN_IF_FAILED(struNativeDllLocation.Append(L"\\")); + path.append(L"\\"); } - RETURN_IF_FAILED(struNativeDllLocation.Append(libraryName)); + path.append(libraryName); - if (FILE_UTILITY::CheckIfFileExists(struNativeDllLocation.QueryStr())) + if (std::filesystem::is_regular_file(path)) { - RETURN_IF_FAILED(struFilename->Copy(struNativeDllLocation)); + handlerDllPath = path; fFound = TRUE; break; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h index 847d664956..101b1ad2a0 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h @@ -3,47 +3,35 @@ #pragma once #include "aspnetcore_shim_config.h" -#include "hostfxroptions.h" -#include -#include "iapplication.h" -#include -#include "HandleWrapper.h" -typedef -HRESULT -(WINAPI * PFN_ASPNETCORE_CREATE_APPLICATION)( - _In_ IHttpServer *pServer, - _In_ IHttpApplication *pHttpApplication, - _In_ APPLICATION_PARAMETER *pParameters, - _In_ DWORD nParameters, - _Out_ IAPPLICATION **pApplication - ); +#include +#include +#include "hostfxroptions.h" +#include "HandleWrapper.h" +#include "ApplicationFactory.h" class HandlerResolver { public: HandlerResolver(HMODULE hModule, IHttpServer &pServer); - HRESULT GetApplicationFactory(IHttpApplication &pApplication, STRU& location, PFN_ASPNETCORE_CREATE_APPLICATION *pfnCreateApplication); + HRESULT GetApplicationFactory(IHttpApplication &pApplication, std::unique_ptr& pApplicationFactory); + void ResetHostingModel(); private: - HRESULT LoadRequestHandlerAssembly(IHttpApplication &pApplication,STRU& location, ASPNETCORE_SHIM_CONFIG * pConfiguration); - HRESULT FindNativeAssemblyFromGlobalLocation(ASPNETCORE_SHIM_CONFIG * pConfiguration, PCWSTR libraryName, STRU* location); - HRESULT FindNativeAssemblyFromHostfxr(HOSTFXR_OPTIONS* hostfxrOptions, PCWSTR libraryName, STRU* location); + HRESULT LoadRequestHandlerAssembly(IHttpApplication &pApplication, ASPNETCORE_SHIM_CONFIG& pConfiguration, std::unique_ptr& pApplicationFactory); + HRESULT FindNativeAssemblyFromGlobalLocation(ASPNETCORE_SHIM_CONFIG& pConfiguration, PCWSTR libraryName, std::wstring& handlerDllPath); + HRESULT FindNativeAssemblyFromHostfxr(HOSTFXR_OPTIONS& hostfxrOptions, PCWSTR libraryName, std::wstring& handlerDllPath); HMODULE m_hModule; IHttpServer &m_pServer; SRWLOCK m_requestHandlerLoadLock {}; - // S_FALSE - not loaded, S_OK - loaded, everything else - error - HRESULT m_fAspnetcoreRHLoadResult; std::wstring m_loadedApplicationId; APP_HOSTING_MODEL m_loadedApplicationHostingModel; - HandleWrapper m_hRequestHandlerDll; HandleWrapper m_hHostFxrDll; - PFN_ASPNETCORE_CREATE_APPLICATION m_pfnAspNetCoreCreateApplication; - static const PCWSTR s_pwzAspnetcoreInProcessRequestHandlerName; static const PCWSTR s_pwzAspnetcoreOutOfProcessRequestHandlerName; + static const DWORD s_initialGetNativeSearchDirectoriesBufferSize = MAX_PATH * 4; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index 2a00d3c82c..e250045677 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -3,7 +3,6 @@ #include "applicationinfo.h" -#include #include "proxymodule.h" #include "hostfxr_utility.h" #include "debugutil.h" @@ -11,28 +10,14 @@ #include "SRWExclusiveLock.h" #include "exceptions.h" #include "EventLog.h" -#include "HandleWrapper.h" #include "ServerErrorApplication.h" #include "AppOfflineApplication.h" APPLICATION_INFO::~APPLICATION_INFO() { - ShutDownApplication(); + ShutDownApplication(/* fServerInitiated */ false); } -HRESULT -APPLICATION_INFO::Initialize( - _In_ IHttpApplication &pApplication, - HandlerResolver * pHandlerResolver -) -{ - m_handlerResolver = pHandlerResolver; - RETURN_IF_FAILED(m_struConfigPath.Copy(pApplication.GetAppConfigPath())); - RETURN_IF_FAILED(m_struInfoKey.Copy(pApplication.GetApplicationId())); - return S_OK; -} - - HRESULT APPLICATION_INFO::GetOrCreateApplication( IHttpContext *pHttpContext, @@ -54,6 +39,7 @@ APPLICATION_INFO::GetOrCreateApplication( // Call to wait for application to complete stopping m_pApplication->Stop(/* fServerInitiated */ false); m_pApplication = nullptr; + m_pApplicationFactory = nullptr; } else { @@ -69,20 +55,13 @@ APPLICATION_INFO::GetOrCreateApplication( } else { - STRU struExeLocation; - PFN_ASPNETCORE_CREATE_APPLICATION pfnAspNetCoreCreateApplication; - FINISHED_IF_FAILED(m_handlerResolver->GetApplicationFactory(httpApplication, struExeLocation, &pfnAspNetCoreCreateApplication)); - std::array parameters { - {"InProcessExeLocation", struExeLocation.QueryStr()} - }; + FINISHED_IF_FAILED(m_handlerResolver.GetApplicationFactory(httpApplication, m_pApplicationFactory)); LOG_INFO("Creating handler application"); IAPPLICATION * newApplication; - FINISHED_IF_FAILED(pfnAspNetCoreCreateApplication( + FINISHED_IF_FAILED(m_pApplicationFactory->Execute( &m_pServer, &httpApplication, - parameters.data(), - static_cast(parameters.size()), &newApplication)); m_pApplication.reset(newApplication); @@ -110,50 +89,17 @@ Finished: return hr; } + VOID -APPLICATION_INFO::RecycleApplication() +APPLICATION_INFO::ShutDownApplication(bool fServerInitiated) { SRWExclusiveLock lock(m_applicationLock); if (m_pApplication) { - const auto pApplication = m_pApplication.release(); - - HandleWrapper hThread = CreateThread( - NULL, // default security attributes - 0, // default stack size - (LPTHREAD_START_ROUTINE)DoRecycleApplication, - pApplication, // thread function arguments - 0, // default creation flags - NULL); // receive thread identifier - } -} - - -DWORD WINAPI -APPLICATION_INFO::DoRecycleApplication( - LPVOID lpParam) -{ - auto pApplication = std::unique_ptr(static_cast(lpParam)); - - if (pApplication) - { - // Recycle will call shutdown for out of process - pApplication->Stop(/*fServerInitiated*/ false); - } - - return 0; -} - - -VOID -APPLICATION_INFO::ShutDownApplication() -{ - SRWExclusiveLock lock(m_applicationLock); - - if (m_pApplication) - { - m_pApplication ->Stop(/* fServerInitiated */ true); + LOG_ERRORF("Stopping application %S", QueryApplicationInfoKey().c_str()); + m_pApplication ->Stop(fServerInitiated); m_pApplication = nullptr; + m_pApplicationFactory = nullptr; } } diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h index ddf3e23aaa..90f9fe8df9 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h @@ -4,8 +4,6 @@ #pragma once #include "hostfxroptions.h" -#include "hashtable.h" -#include "hashfn.h" #include "aspnetcore_shim_config.h" #include "iapplication.h" #include "SRWSharedLock.h" @@ -19,61 +17,35 @@ class APPLICATION_INFO { public: - APPLICATION_INFO(IHttpServer &pServer) : + APPLICATION_INFO( + IHttpServer &pServer, + IHttpApplication &pApplication, + HandlerResolver &pHandlerResolver + ) : m_pServer(pServer), - m_cRefs(1), - m_handlerResolver(nullptr) + m_handlerResolver(pHandlerResolver), + m_strConfigPath(pApplication.GetAppConfigPath()), + m_strInfoKey(pApplication.GetApplicationId()) { InitializeSRWLock(&m_applicationLock); } - PCWSTR - QueryApplicationInfoKey() - { - return m_struInfoKey.QueryStr(); - } - - STRU* - QueryConfigPath() - { - return &m_struConfigPath; - } - - virtual ~APPLICATION_INFO(); - static - void - StaticInitialize() + std::wstring& + QueryApplicationInfoKey() { + return m_strInfoKey; } - HRESULT - Initialize( - IHttpApplication &pApplication, - HandlerResolver *pHandlerResolver - ); - - VOID - ReferenceApplicationInfo() const + std::wstring& + QueryConfigPath() { - InterlockedIncrement(&m_cRefs); + return m_strConfigPath; } VOID - DereferenceApplicationInfo() const - { - if (InterlockedDecrement(&m_cRefs) == 0) - { - delete this; - } - } - - VOID - RecycleApplication(); - - VOID - ShutDownApplication(); + ShutDownApplication(bool fServerInitiated); HRESULT GetOrCreateApplication( @@ -81,88 +53,30 @@ public: std::unique_ptr& pApplication ); + bool ConfigurationPathApplies(const std::wstring& path) + { + // We need to check that the last character of the config path + // is either a null terminator or a slash. + // This checks the case where the config path was + // MACHINE/WEBROOT/site and your site path is MACHINE/WEBROOT/siteTest + auto const changed = m_strConfigPath._Starts_with(path); + if (changed) + { + const auto lastChar = m_strConfigPath[m_strConfigPath.length()]; + return lastChar == L'\0' || lastChar == L'/'; + } + return false; + } + private: - - static DWORD WINAPI DoRecycleApplication(LPVOID lpParam); - - mutable LONG m_cRefs; - STRU m_struConfigPath; - STRU m_struInfoKey; - SRWLOCK m_applicationLock; IHttpServer &m_pServer; - HandlerResolver *m_handlerResolver; + HandlerResolver &m_handlerResolver; + std::wstring m_strConfigPath; + std::wstring m_strInfoKey; + SRWLOCK m_applicationLock {}; + + std::unique_ptr m_pApplicationFactory; std::unique_ptr m_pApplication; }; -class APPLICATION_INFO_HASH : - public HASH_TABLE -{ - -public: - - APPLICATION_INFO_HASH() - {} - - PCWSTR - ExtractKey( - APPLICATION_INFO *pApplicationInfo - ) - { - return pApplicationInfo->QueryApplicationInfoKey(); - } - - DWORD - CalcKeyHash( - PCWSTR pszApplicationId - ) - { - return HashStringNoCase(pszApplicationId); - } - - BOOL - EqualKeys( - PCWSTR pszKey1, - PCWSTR pszKey2 - ) - { - return CompareStringOrdinal(pszKey1, - -1, - pszKey2, - -1, - TRUE) == CSTR_EQUAL; - } - - VOID - ReferenceRecord( - APPLICATION_INFO *pApplicationInfo - ) - { - pApplicationInfo->ReferenceApplicationInfo(); - } - - VOID - DereferenceRecord( - APPLICATION_INFO *pApplicationInfo - ) - { - pApplicationInfo->DereferenceApplicationInfo(); - } - - static - VOID - ReferenceCopyToTable( - APPLICATION_INFO * pEntry, - PVOID pvData - ) - { - APPLICATION_INFO_HASH *pHash = static_cast(pvData); - DBG_ASSERT(pHash); - pHash->InsertRecord(pEntry); - } - -private: - - APPLICATION_INFO_HASH(const APPLICATION_INFO_HASH &); - void operator=(const APPLICATION_INFO_HASH &); -}; diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp index 25d5966a3d..36fc9a96ba 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp @@ -20,25 +20,16 @@ APPLICATION_MANAGER* APPLICATION_MANAGER::sm_pApplicationManager = NULL; // HRESULT APPLICATION_MANAGER::GetOrCreateApplicationInfo( - _In_ IHttpContext* pHttpContext, - _Out_ APPLICATION_INFO ** ppApplicationInfo + _In_ IHttpContext& pHttpContext, + _Out_ std::shared_ptr& ppApplicationInfo ) { - HRESULT hr = S_OK; - APPLICATION_INFO *pApplicationInfo = NULL; - PCWSTR pszApplicationId = NULL; - STACK_STRU ( strEventMsg, 256 ); - - DBG_ASSERT(pHttpContext); - DBG_ASSERT(ppApplicationInfo); - - *ppApplicationInfo = NULL; - IHttpApplication &pApplication = *pHttpContext->GetApplication(); + auto &pApplication = *pHttpContext.GetApplication(); // The configuration path is unique for each application and is used for the // key in the applicationInfoHash. - pszApplicationId = pApplication.GetApplicationId(); + std::wstring pszApplicationId = pApplication.GetApplicationId(); { // When accessing the m_pApplicationInfoHash, we need to acquire the application manager @@ -47,93 +38,41 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( if (g_fInShutdown) { - FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); + return HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS); } - m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); + const auto pair = m_pApplicationInfoHash.find(pszApplicationId); + if (pair != m_pApplicationInfoHash.end()) + { + ppApplicationInfo = pair->second; + return S_OK; + } // It's important to release read lock here so exclusive lock // can be reacquired later as SRW lock doesn't allow upgrades } - if (*ppApplicationInfo == NULL) + // Take exclusive lock before creating the application + SRWExclusiveLock writeLock(m_srwLock); + + if (!m_fDebugInitialize) { - // Take exclusive lock before creating the application - SRWExclusiveLock writeLock(m_srwLock); - - if (!m_fDebugInitialize) - { - DebugInitializeFromConfig(m_pHttpServer, pApplication); - m_fDebugInitialize = TRUE; - } - - // Check if other thread created the application - m_pApplicationInfoHash->FindKey(pszApplicationId, ppApplicationInfo); - if (*ppApplicationInfo != NULL) - { - FINISHED(S_OK); - } - - pApplicationInfo = new APPLICATION_INFO(m_pHttpServer); - - FINISHED_IF_FAILED(pApplicationInfo->Initialize(pApplication, &m_handlerResolver)); - FINISHED_IF_FAILED(m_pApplicationInfoHash->InsertRecord(pApplicationInfo)); - - *ppApplicationInfo = pApplicationInfo; - pApplicationInfo = NULL; - } -Finished: - - if (pApplicationInfo != NULL) - { - pApplicationInfo->DereferenceApplicationInfo(); - pApplicationInfo = NULL; + DebugInitializeFromConfig(m_pHttpServer, pApplication); + m_fDebugInitialize = TRUE; } - return hr; -} - - -// -// If the application's configuration was changed, -// append the configuration path to the config change context. -// -BOOL -APPLICATION_MANAGER::FindConfigChangedApplication( - _In_ APPLICATION_INFO * pEntry, - _In_ PVOID pvContext) -{ - DBG_ASSERT(pEntry); - DBG_ASSERT(pvContext); - - // Config Change context contains the original config path that changed - // and a multiStr containing - CONFIG_CHANGE_CONTEXT* pContext = static_cast(pvContext); - STRU* pstruConfigPath = pEntry->QueryConfigPath(); - - // check if the application path contains our app/subapp by seeing if the config path - // starts with the notification path. - BOOL fChanged = pstruConfigPath->StartsWith(pContext->pstrPath, true); - if (fChanged) + // Check if other thread created the application + const auto pair = m_pApplicationInfoHash.find(pszApplicationId); + if (pair != m_pApplicationInfoHash.end()) { - auto dwLen = wcslen(pContext->pstrPath); - WCHAR wChar = pstruConfigPath->QueryStr()[dwLen]; - - // We need to check that the last character of the config path - // is either a null terminator or a slash. - // This checks the case where the config path was - // MACHINE/WEBROOT/site and your site path is MACHINE/WEBROOT/siteTest - if (wChar != L'\0' && wChar != L'/') - { - // not current app or sub app - fChanged = FALSE; - } - else - { - pContext->MultiSz.Append(pEntry->QueryApplicationInfoKey()); - } + ppApplicationInfo = pair->second; + return S_OK; } - return fChanged; + + ppApplicationInfo = std::make_shared(m_pHttpServer, pApplication, m_handlerResolver); + m_pApplicationInfoHash.emplace(pszApplicationId, ppApplicationInfo); + + return S_OK; } // @@ -148,101 +87,82 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( _In_ LPCWSTR pszApplicationId ) { - HRESULT hr = S_OK; - DWORD dwPreviousCounter = 0; - APPLICATION_INFO_HASH* table = NULL; - CONFIG_CHANGE_CONTEXT context; - - if (g_fInShutdown) + try { - // We are already shutting down, ignore this event as a global configuration change event - // can occur after global stop listening for some reason. - return hr; - } + std::vector> applicationsToRecycle; - { - SRWExclusiveLock lock(m_srwLock); if (g_fInShutdown) { - return hr; + // We are already shutting down, ignore this event as a global configuration change event + // can occur after global stop listening for some reason. + return S_OK; } - // Make a shallow copy of existing hashtable as we may need to remove nodes - // This will be used for finding differences in which applications are affected by a config change. - table = new APPLICATION_INFO_HASH(); - - // few application expected, small bucket size for hash table - if (FAILED(hr = table->Initialize(17 /*prime*/))) { - goto Finished; + SRWExclusiveLock lock(m_srwLock); + if (g_fInShutdown) + { + return S_OK; + } + const std::wstring configurationPath = pszApplicationId; + + auto itr = m_pApplicationInfoHash.begin(); + while (itr != m_pApplicationInfoHash.end()) + { + if (itr->second->ConfigurationPathApplies(configurationPath)) + { + applicationsToRecycle.emplace_back(itr->second); + itr = m_pApplicationInfoHash.erase(itr); + } + else + { + ++itr; + } + } + + // All applications were unloaded reset handler resolver validation logic + if (m_pApplicationInfoHash.empty()) + { + m_handlerResolver.ResetHostingModel(); + } } - context.pstrPath = pszApplicationId; + // If we receive a request at this point. + // OutOfProcess: we will create a new application with new configuration + // InProcess: the request would have to be rejected, as we are about to call g_HttpServer->RecycleProcess + // on the worker proocess - // Keep track of the preview count of applications to know whether there are applications to delete - dwPreviousCounter = m_pApplicationInfoHash->Count(); - - // We don't want to hold the application manager lock for long time as it will block all incoming requests - // Don't call application shutdown inside the lock - m_pApplicationInfoHash->Apply(APPLICATION_INFO_HASH::ReferenceCopyToTable, static_cast(table)); - DBG_ASSERT(dwPreviousCounter == table->Count()); - - // Removed the applications which are impacted by the configurtion change - m_pApplicationInfoHash->DeleteIf(FindConfigChangedApplication, (PVOID)&context); - } - - // If we receive a request at this point. - // OutOfProcess: we will create a new application with new configuration - // InProcess: the request would have to be rejected, as we are about to call g_HttpServer->RecycleProcess - // on the worker proocess - if (!context.MultiSz.IsEmpty()) - { - PCWSTR path = context.MultiSz.First(); - // Iterate through each of the paths that were shut down, - // calling RecycleApplication on each of them. - while (path != NULL) + if (!applicationsToRecycle.empty()) { - APPLICATION_INFO* pRecord; + for (auto& application : applicationsToRecycle) + { + try + { + application->ShutDownApplication(/* fServerInitiated */ false); + } + catch (...) + { + LOG_ERRORF("Failed to stop application %S", application->QueryApplicationInfoKey().c_str()); + OBSERVE_CAUGHT_EXCEPTION(); - // Application got recycled. Log an event - EventLog::Info( - ASPNETCORE_EVENT_RECYCLE_CONFIGURATION, - ASPNETCORE_EVENT_RECYCLE_CONFIGURATION_MSG, - path); - - table->FindKey(path, &pRecord); - DBG_ASSERT(pRecord != NULL); - - // RecycleApplication is called on a separate thread. - pRecord->RecycleApplication(); - pRecord->DereferenceApplicationInfo(); - path = context.MultiSz.Next(path); + // Failed to recycle an application. Log an event + EventLog::Error( + ASPNETCORE_EVENT_RECYCLE_APP_FAILURE, + ASPNETCORE_EVENT_RECYCLE_FAILURE_CONFIGURATION_MSG, + pszApplicationId); + // Need to recycle the process as we cannot recycle the application + if (!g_fRecycleProcessCalled) + { + g_fRecycleProcessCalled = TRUE; + m_pHttpServer.RecycleProcess(L"AspNetCore Recycle Process on Demand Due Application Recycle Error"); + } + } + } } } + CATCH_RETURN(); -Finished: - if (table != NULL) - { - table->Clear(); - delete table; - } - - if (FAILED(hr)) - { - // Failed to recycle an application. Log an event - EventLog::Error( - ASPNETCORE_EVENT_RECYCLE_APP_FAILURE, - ASPNETCORE_EVENT_RECYCLE_FAILURE_CONFIGURATION_MSG, - pszApplicationId); - // Need to recycle the process as we cannot recycle the application - if (!g_fRecycleProcessCalled) - { - g_fRecycleProcessCalled = TRUE; - m_pHttpServer.RecycleProcess(L"AspNetCore Recycle Process on Demand Due Application Recycle Error"); - } - } - - return hr; + return S_OK; } // @@ -256,34 +176,12 @@ APPLICATION_MANAGER::ShutDown() // However, it is possible to receive multiple OnGlobalStopListening events // Protect against this by checking if we already shut down. g_fInShutdown = TRUE; - if (m_pApplicationInfoHash != NULL) + + // During shutdown we lock until we delete the application + SRWExclusiveLock lock(m_srwLock); + for (auto &pair : m_pApplicationInfoHash) { - DBG_ASSERT(m_pApplicationInfoHash); - - // During shutdown we lock until we delete the application - SRWExclusiveLock lock(m_srwLock); - - // Call shutdown on each application in the application manager - m_pApplicationInfoHash->Apply(ShutdownApplication, NULL); - m_pApplicationInfoHash->Clear(); - delete m_pApplicationInfoHash; - m_pApplicationInfoHash = NULL; + pair.second->ShutDownApplication(/* fServerInitiated */ true); + pair.second = nullptr; } } - -// -// Calls shutdown on each application. ApplicationManager's lock is held for duration of -// each shutdown call, guaranteeing another application cannot be created. -// -// static -VOID -APPLICATION_MANAGER::ShutdownApplication( - _In_ APPLICATION_INFO * pEntry, - _In_ PVOID pvContext -) -{ - UNREFERENCED_PARAMETER(pvContext); - DBG_ASSERT(pEntry != NULL); - - pEntry->ShutDownApplication(); -} diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h index e0f2025f04..5cb341087d 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h @@ -6,6 +6,7 @@ #include "applicationinfo.h" #include "multisz.h" #include "exceptions.h" +#include #define DEFAULT_HASH_BUCKETS 17 @@ -15,11 +16,6 @@ // Should always call GetInstance to get the object instance // -struct CONFIG_CHANGE_CONTEXT -{ - PCWSTR pstrPath; - MULTISZ MultiSz; -}; class APPLICATION_MANAGER { @@ -35,9 +31,7 @@ public: static VOID - Cleanup( - VOID - ) + Cleanup() { if(sm_pApplicationManager != NULL) { @@ -46,24 +40,10 @@ public: } } - static - BOOL - FindConfigChangedApplication( - _In_ APPLICATION_INFO * pEntry, - _In_ PVOID pvContext - ); - - static - VOID - ShutdownApplication( - _In_ APPLICATION_INFO * pEntry, - _In_ PVOID pvContext - ); - HRESULT GetOrCreateApplicationInfo( - _In_ IHttpContext* pHttpContext, - _Out_ APPLICATION_INFO ** ppApplicationInfo + _In_ IHttpContext& pHttpContext, + _Out_ std::shared_ptr& ppApplicationInfo ); HRESULT @@ -74,40 +54,13 @@ public: VOID ShutDown(); - ~APPLICATION_MANAGER() - { - - if(m_pApplicationInfoHash != NULL) - { - m_pApplicationInfoHash->Clear(); - delete m_pApplicationInfoHash; - m_pApplicationInfoHash = NULL; - } - } - static HRESULT StaticInitialize(HMODULE hModule, IHttpServer& pHttpServer) { assert(!sm_pApplicationManager); sm_pApplicationManager = new APPLICATION_MANAGER(hModule, pHttpServer); - RETURN_IF_FAILED(sm_pApplicationManager->Initialize()); - - APPLICATION_INFO::StaticInitialize(); return S_OK; } - HRESULT Initialize() - { - if(m_pApplicationInfoHash == NULL) - { - try - { - m_pApplicationInfoHash = new APPLICATION_INFO_HASH(); - } - CATCH_RETURN(); - RETURN_IF_FAILED(m_pApplicationInfoHash->Initialize(DEFAULT_HASH_BUCKETS)); - } - return S_OK; - } private: APPLICATION_MANAGER(HMODULE hModule, IHttpServer& pHttpServer) : @@ -119,7 +72,7 @@ private: InitializeSRWLock(&m_srwLock); } - APPLICATION_INFO_HASH *m_pApplicationInfoHash; + std::unordered_map> m_pApplicationInfoHash; static APPLICATION_MANAGER *sm_pApplicationManager; SRWLOCK m_srwLock {}; BOOL m_fDebugInitialize; diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp index bf62cd9e87..f994fcc06d 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp @@ -14,7 +14,6 @@ ASPNETCORE_SHIM_CONFIG::Populate( ) { STACK_STRU(strHostingModel, 12); - STRU strApplicationFullPath; CComPtr pAspNetCoreElement; IAppHostAdminManager *pAdminManager = pHttpServer->GetAdminManager(); @@ -25,9 +24,11 @@ ASPNETCORE_SHIM_CONFIG::Populate( applicationConfigPath, &pAspNetCoreElement)); + CComBSTR struProcessPath; RETURN_IF_FAILED(GetElementStringProperty(pAspNetCoreElement, CS_ASPNETCORE_PROCESS_EXE_PATH, - &m_struProcessPath)); + &struProcessPath)); + m_strProcessPath = struProcessPath; // Swallow this error for backward compatibility // Use default behavior for empty string @@ -53,13 +54,18 @@ ASPNETCORE_SHIM_CONFIG::Populate( RETURN_HR(HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED)); } + CComBSTR struArguments; RETURN_IF_FAILED(GetElementStringProperty(pAspNetCoreElement, CS_ASPNETCORE_PROCESS_ARGUMENTS, - &m_struArguments)); + &struArguments)); + + m_strArguments = struArguments; if (m_hostingModel == HOSTING_OUT_PROCESS) { - RETURN_IF_FAILED(ConfigUtility::FindHandlerVersion(pAspNetCoreElement, m_struHandlerVersion)); + STRU struHandlerVersion; + RETURN_IF_FAILED(ConfigUtility::FindHandlerVersion(pAspNetCoreElement, struHandlerVersion)); + m_strHandlerVersion = struHandlerVersion.QueryStr(); } diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h index e80071b1c9..c380433e72 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h @@ -3,11 +3,10 @@ #pragma once +#include #include #include -#include "stringu.h" - #define CS_ASPNETCORE_SECTION L"system.webServer/aspNetCore" #define CS_ASPNETCORE_PROCESS_EXE_PATH L"processPath" #define CS_ASPNETCORE_PROCESS_ARGUMENTS L"arguments" @@ -34,16 +33,16 @@ public: IHttpApplication *pHttpApplication ); - STRU* + std::wstring& QueryProcessPath() { - return &m_struProcessPath; + return m_strProcessPath; } - STRU* + std::wstring& QueryArguments() { - return &m_struArguments; + return m_strArguments; } APP_HOSTING_MODEL @@ -52,10 +51,10 @@ public: return m_hostingModel; } - STRU* + std::wstring& QueryHandlerVersion() { - return &m_struHandlerVersion; + return m_strHandlerVersion; } BOOL @@ -77,10 +76,10 @@ public: private: - STRU m_struArguments; - STRU m_struProcessPath; - APP_HOSTING_MODEL m_hostingModel; - STRU m_struHandlerVersion; + std::wstring m_strArguments; + std::wstring m_strProcessPath; + APP_HOSTING_MODEL m_hostingModel; + std::wstring m_strHandlerVersion; BOOL m_fStdoutLogEnabled; STRU m_struStdoutLogFile; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index 2d9fe9150c..b4ed0fbaad 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -51,19 +51,10 @@ Return value: } ASPNET_CORE_PROXY_MODULE::ASPNET_CORE_PROXY_MODULE( -) : m_pApplicationInfo(nullptr), m_pApplication(nullptr), m_pHandler(nullptr) +) : m_pApplicationInfo(nullptr), m_pHandler(nullptr) { } -ASPNET_CORE_PROXY_MODULE::~ASPNET_CORE_PROXY_MODULE() -{ - if (m_pApplicationInfo != NULL) - { - m_pApplicationInfo->DereferenceApplicationInfo(); - m_pApplicationInfo = NULL; - } -} - __override REQUEST_NOTIFICATION_STATUS ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( @@ -72,9 +63,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( ) { HRESULT hr = S_OK; - APPLICATION_MANAGER *pApplicationManager = NULL; REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; - STRU struExeLocation; try { @@ -83,13 +72,11 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); } - pApplicationManager = APPLICATION_MANAGER::GetInstance(); + auto pApplicationManager = APPLICATION_MANAGER::GetInstance(); FINISHED_IF_FAILED(pApplicationManager->GetOrCreateApplicationInfo( - pHttpContext, - &m_pApplicationInfo)); - - DBG_ASSERT(pHttpContext); + *pHttpContext, + m_pApplicationInfo)); std::unique_ptr pApplication; FINISHED_IF_FAILED(m_pApplicationInfo->GetOrCreateApplication(pHttpContext, pApplication)); diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h index a66a0fd3e1..06e333d595 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h @@ -15,7 +15,7 @@ class ASPNET_CORE_PROXY_MODULE : public CHttpModule ASPNET_CORE_PROXY_MODULE(); - ~ASPNET_CORE_PROXY_MODULE(); + ~ASPNET_CORE_PROXY_MODULE() = default; void * operator new(size_t size, IModuleAllocator * pPlacement) { @@ -46,9 +46,7 @@ class ASPNET_CORE_PROXY_MODULE : public CHttpModule ); private: - - APPLICATION_INFO *m_pApplicationInfo; - IAPPLICATION *m_pApplication; + std::shared_ptr m_pApplicationInfo; std::unique_ptr m_pHandler; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h index d6b50f2381..1d607210e2 100644 --- a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h +++ b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h @@ -52,6 +52,13 @@ public: HandleType* operator&() { return &m_handle; } + HandleType release() noexcept + { + auto value = m_handle; + m_handle = traits::DefaultHandle; + return value; + } + private: HandleType m_handle; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index e31351a764..7184dbfde8 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -65,7 +65,7 @@ void SetDebugFlags(const std::wstring &debugValue) { try { - if (!debugValue.empty()) + if (!debugValue.empty() && debugValue.find_first_not_of(L"0123456789") == std::wstring::npos) { const auto value = std::stoi(debugValue); diff --git a/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp index 0d12c32259..a971821208 100644 --- a/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp @@ -165,34 +165,3 @@ FILE_UTILITY::EnsureDirectoryPathExist( Finished: return hr; } - -BOOL -FILE_UTILITY::CheckIfFileExists( - _In_ PCWSTR pszFilePath -) -{ - HANDLE hFileHandle = INVALID_HANDLE_VALUE; - SECURITY_ATTRIBUTES saAttr; - BOOL fFileExists = FALSE; - - saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); - saAttr.bInheritHandle = TRUE; - saAttr.lpSecurityDescriptor = NULL; - - hFileHandle = CreateFile(pszFilePath, - GENERIC_READ, - FILE_SHARE_READ, - &saAttr, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - - fFileExists = hFileHandle != INVALID_HANDLE_VALUE || GetLastError() == ERROR_SHARING_VIOLATION; - - if (fFileExists) - { - CloseHandle(hFileHandle); - } - - return fFileExists; -} diff --git a/src/AspNetCoreModuleV2/CommonLib/file_utility.h b/src/AspNetCoreModuleV2/CommonLib/file_utility.h index 900e787cd7..cc541b712a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/file_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/file_utility.h @@ -25,12 +25,6 @@ public: EnsureDirectoryPathExist( _In_ LPCWSTR pszPath ); - - static - BOOL - CheckIfFileExists( - PCWSTR pszFilePath - ); private: static HRESULT diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h index 1f69a39bbb..222230c672 100644 --- a/src/AspNetCoreModuleV2/CommonLib/iapplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -14,8 +14,8 @@ enum APPLICATION_STATUS struct APPLICATION_PARAMETER { - LPCSTR pzName; - PVOID pValue; + LPCSTR pzName; + const void *pValue; }; class IAPPLICATION diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp index 25e8054318..451221255b 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp @@ -146,6 +146,8 @@ EnsureOutOfProcessInitializtion() FINISHED(S_OK); } + g_fOutOfProcessInitialize = TRUE; + g_hWinHttpModule = GetModuleHandle(TEXT("winhttp.dll")); g_hAspNetCoreModule = GetModuleHandle(TEXT("aspnetcorev2.dll")); diff --git a/test/Common.FunctionalTests/ConfigurationChangeTests.cs b/test/Common.FunctionalTests/ConfigurationChangeTests.cs index 064df80451..d1e5f62ff1 100644 --- a/test/Common.FunctionalTests/ConfigurationChangeTests.cs +++ b/test/Common.FunctionalTests/ConfigurationChangeTests.cs @@ -1,12 +1,18 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; +using System.IO; +using System.Linq; using System.Net; +using System.Net.Http; +using System.Net.Sockets; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests @@ -14,6 +20,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [Collection(PublishedSitesCollection.Name)] public class ConfigurationChangeTests : IISFunctionalTestBase { + private static readonly TimeSpan RetryDelay = TimeSpan.FromMilliseconds(100); private readonly PublishedSitesFixture _fixture; public ConfigurationChangeTests(PublishedSitesFixture fixture) @@ -66,13 +73,54 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await deploymentResult.AssertStarts(); deploymentResult.ModifyWebConfig(element => element - .GetOrAdd("system.webServer") + .Descendants("system.webServer") + .Single() .GetOrAdd("aspNetCore") .SetAttributeValue("hostingModel", "inprocess")); // Have to retry here to allow ANCM to receive notification and react to it - // Verify that worker process gets restarted with new process id + // Verify that inprocess application was created and tried to start await deploymentResult.HttpClient.RetryRequestAsync("/HelloWorld", r => r.StatusCode == HttpStatusCode.InternalServerError); + + StopServer(); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Could not find the assembly 'aspnetcorev2_inprocess.dll'"); + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task ConfigurationTouchedStress(HostingModel hostingModel) + { + var deploymentResult = await DeployAsync(_fixture.GetBaseDeploymentParameters(hostingModel, publish: true)); + + await deploymentResult.AssertStarts(); + var load = Helpers.StressLoad(deploymentResult.HttpClient, "/HelloWorld", response => { + var statusCode = (int)response.StatusCode; + Assert.True(statusCode == 200 || statusCode == 503, "Status code was " + statusCode); + }); + + for (int i = 0; i < 100; i++) + { + // ModifyWebConfig might fail if web.config is being read by IIS + RetryHelper.RetryOperation( + () => deploymentResult.ModifyWebConfig(element => {}), + e => Logger.LogError($"Failed to touch web.config : {e.Message}"), + retryCount: 3, + retryDelayMilliseconds: RetryDelay.Milliseconds); + } + + try + { + await load; + } + catch (HttpRequestException ex) when (ex.InnerException is IOException | ex.InnerException is SocketException) + { + // IOException in InProcess is fine, just means process stopped + if (hostingModel != HostingModel.InProcess) + { + throw; + } + } } } } diff --git a/test/CommonLibTests/hostfxr_utility_tests.cpp b/test/CommonLibTests/hostfxr_utility_tests.cpp index 7997220726..232f7627b8 100644 --- a/test/CommonLibTests/hostfxr_utility_tests.cpp +++ b/test/CommonLibTests/hostfxr_utility_tests.cpp @@ -98,11 +98,11 @@ TEST(GetAbsolutePathToDotnetFromProgramFiles, BackupWorks) if (is64Bit) { - fDotnetInProgramFiles = FILE_UTILITY::CheckIfFileExists(L"C:/Program Files/dotnet/dotnet.exe"); + fDotnetInProgramFiles = std::filesystem::is_regular_file(L"C:/Program Files/dotnet/dotnet.exe"); } else { - fDotnetInProgramFiles = FILE_UTILITY::CheckIfFileExists(L"C:/Program Files (x86)/dotnet/dotnet.exe"); + fDotnetInProgramFiles = std::filesystem::is_regular_file(L"C:/Program Files (x86)/dotnet/dotnet.exe"); } auto dotnetPath = HOSTFXR_UTILITY::GetAbsolutePathToDotnetFromProgramFiles(); From 36e5aceb3c1cc4d677c75a11caf248cb98a8c4fa Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 22 Aug 2018 09:53:25 -0700 Subject: [PATCH 238/363] Serve 503 if server process is shutting down (#1293) --- .../OutOfProcessRequestHandler/forwardinghandler.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp index e06b15f805..881c6393ad 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp @@ -344,6 +344,10 @@ Failure: { pResponse->SetStatus(400, "Bad Request", 0, hr); } + else if (hr == E_APPLICATION_EXITING) + { + pResponse->SetStatus(503, "Service Unavailable", 0, S_OK, nullptr, TRUE); + } else if (fFailedToStartKestrel && !m_pApplication->QueryConfig()->QueryDisableStartUpErrorPage()) { HTTP_DATA_CHUNK DataChunk; From eebbb6a6022ce609dcf141906148eaf32b1e570f Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 22 Aug 2018 12:04:04 -0700 Subject: [PATCH 239/363] Support portable.exe apps and better error reporting (#1287) --- build/testsite.props | 2 +- .../AspNetCore/HandlerResolver.cpp | 14 +- .../CommonLib/CommonLib.vcxproj | 2 + .../CommonLib/HandleWrapper.cpp | 1 + .../CommonLib/HandleWrapper.h | 9 +- .../CommonLib/StringHelpers.cpp | 15 + .../CommonLib/StringHelpers.h | 20 + .../CommonLib/aspnetcore_msg.mc | 44 +- src/AspNetCoreModuleV2/CommonLib/exceptions.h | 3 +- .../CommonLib/hostfxr_utility.cpp | 462 ++++++------------ .../CommonLib/hostfxr_utility.h | 120 +++-- .../CommonLib/hostfxroptions.cpp | 90 ++-- .../CommonLib/hostfxroptions.h | 59 ++- src/AspNetCoreModuleV2/CommonLib/resources.h | 9 +- .../inprocessapplication.cpp | 12 +- .../Utilities/EventLogHelpers.cs | 16 +- .../Utilities/FunctionalTestsBase.cs | 5 - test/CommonLibTests/hostfxr_utility_tests.cpp | 94 ++-- .../InProcess/StartupTests.cs | 33 +- 19 files changed, 415 insertions(+), 595 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/StringHelpers.h diff --git a/build/testsite.props b/build/testsite.props index 1588b54226..ad7204aab4 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -48,7 +48,7 @@ - + False diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index 83c34a30c0..51b8cb611e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -60,7 +60,7 @@ HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, ASPN pConfiguration.QueryArguments().c_str(), options)); - location = options->GetExeLocation(); + location = options->GetDotnetExeLocation(); RETURN_IF_FAILED(LoggingHelpers::CreateLoggingProvider( pConfiguration.QueryStdoutLogEnabled(), @@ -225,7 +225,7 @@ HandlerResolver::FindNativeAssemblyFromHostfxr( DWORD dwBufferSize = s_initialGetNativeSearchDirectoriesBufferSize; DWORD dwRequiredBufferSize = 0; - RETURN_LAST_ERROR_IF_NULL(m_hHostFxrDll = LoadLibraryW(hostfxrOptions.GetHostFxrLocation())); + RETURN_LAST_ERROR_IF_NULL(m_hHostFxrDll = LoadLibraryW(hostfxrOptions.GetHostFxrLocation().c_str())); auto pFnHostFxrSearchDirectories = reinterpret_cast(GetProcAddress(m_hHostFxrDll, "hostfxr_get_native_search_directories")); if (pFnHostFxrSearchDirectories == nullptr) @@ -233,7 +233,7 @@ HandlerResolver::FindNativeAssemblyFromHostfxr( EventLog::Error( ASPNETCORE_EVENT_GENERAL_ERROR, ASPNETCORE_EVENT_HOSTFXR_DLL_INVALID_VERSION_MSG, - hostfxrOptions.GetHostFxrLocation() + hostfxrOptions.GetHostFxrLocation().c_str() ); RETURN_IF_FAILED(E_FAIL); } @@ -243,9 +243,13 @@ HandlerResolver::FindNativeAssemblyFromHostfxr( while (TRUE) { + DWORD hostfxrArgc; + std::unique_ptr hostfxrArgv; + + hostfxrOptions.GetArguments(hostfxrArgc, hostfxrArgv); const auto intHostFxrExitCode = pFnHostFxrSearchDirectories( - hostfxrOptions.GetArgc(), - hostfxrOptions.GetArgv(), + hostfxrArgc, + hostfxrArgv.get(), struNativeSearchPaths.data(), dwBufferSize, &dwRequiredBufferSize diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 47a5373ee1..84b7f360cc 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -219,6 +219,7 @@ + @@ -243,6 +244,7 @@ Create Create + diff --git a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp index fde7d2fd1f..4960b06f4e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp @@ -5,3 +5,4 @@ // Workaround for VC++ bug https://developercommunity.visualstudio.com/content/problem/33928/constexpr-failing-on-nullptr-v141-compiler-regress.html const HANDLE InvalidHandleTraits::DefaultHandle = INVALID_HANDLE_VALUE; +const HANDLE FindFileHandleTraits::DefaultHandle = INVALID_HANDLE_VALUE; diff --git a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h index 1d607210e2..d3afa64551 100644 --- a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h +++ b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include "ntassert.h" struct InvalidHandleTraits { @@ -20,6 +20,13 @@ struct NullHandleTraits static void Close(HANDLE handle) { CloseHandle(handle); } }; +struct FindFileHandleTraits +{ + using HandleType = HANDLE; + static const HANDLE DefaultHandle; + static void Close(HANDLE handle) { FindClose(handle); } +}; + struct ModuleHandleTraits { using HandleType = HMODULE; diff --git a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp new file mode 100644 index 0000000000..8e574677cd --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp @@ -0,0 +1,15 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "StringHelpers.h" + +bool ends_with(const std::wstring &source, const std::wstring &suffix, bool ignoreCase) +{ + if (source.length() < suffix.length()) + { + return false; + } + + const auto offset = source.length() - suffix.length(); + return CSTR_EQUAL == CompareStringOrdinal(source.c_str() + offset, static_cast(suffix.length()), suffix.c_str(), static_cast(suffix.length()), ignoreCase); +} diff --git a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h new file mode 100644 index 0000000000..4999bec7a7 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#pragma once + +#include + +[[nodiscard]] +bool ends_with(const std::wstring &source, const std::wstring &suffix, bool ignoreCase = false); + +template +[[nodiscard]] +std::wstring format(const std::wstring& format, Args ... args) +{ + const size_t size = swprintf(nullptr, 0, format.c_str(), args ...) + 1; // Extra char for '\0' + std::unique_ptr formattedBuffer(new wchar_t[size]); + swprintf(formattedBuffer.get(), size, format.c_str(), args ... ); + return std::wstring(formattedBuffer.get(), formattedBuffer.get() + size - 1); +} + diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc index 5b4c244c63..f0e3d66de3 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc +++ b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc @@ -38,12 +38,6 @@ Language=English %1 . -Messageid=1002 -SymbolicName=ASPNETCORE_EVENT_PROCESS_CRASH -Language=English -%1 -. - Messageid=1003 SymbolicName=ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED Language=English @@ -110,42 +104,12 @@ Language=English %1 . -Messageid=1014 -SymbolicName=ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP -Language=English -%1 -. - -Messageid=1015 -SymbolicName=ASPNETCORE_EVENT_PORTABLE_APP_DOTNET_MISSING -Language=English -%1 -. - -Messageid=1016 -SymbolicName=ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND -Language=English -%1 -. - -Messageid=1017 -SymbolicName=ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND -Language=English -%1 -. - Messageid=1018 SymbolicName=ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION Language=English %1 . -Messageid=1019 -SymbolicName=ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND -Language=English -%1 -. - Messageid=1020 SymbolicName=ASPNETCORE_EVENT_PROCESS_START_FAILURE Language=English @@ -164,12 +128,6 @@ Language=English %1 . -Messageid=1023 -SymbolicName=ASPNETCORE_EVENT_APP_IN_SHUTDOWN -Language=English -%1 -. - Messageid=1024 SymbolicName=ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR Language=English @@ -213,7 +171,7 @@ Language=English . Messageid=1031 -SymbolicName=ASPNETCORE_EVENT_INVALID_PROCESS_PATH +SymbolicName=ASPNETCORE_EVENT_INPROCESS_START_ERROR Language=English %1 . diff --git a/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/AspNetCoreModuleV2/CommonLib/exceptions.h index bd6f30af33..31873bc743 100644 --- a/src/AspNetCoreModuleV2/CommonLib/exceptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/exceptions.h @@ -43,6 +43,7 @@ #define CATCH_RETURN() catch (...) { RETURN_CAUGHT_EXCEPTION(); } #define LOG_IF_FAILED(hr) LogHResultFailed(LOCATION_INFO, hr) +#define LOG_LAST_ERROR() LogLastErrorIf(LOCATION_INFO, true) #define LOG_LAST_ERROR_IF(condition) LogLastErrorIf(LOCATION_INFO, condition) #define SUCCEEDED_LOG(hr) SUCCEEDED(LOG_IF_FAILED(hr)) #define FAILED_LOG(hr) FAILED(LOG_IF_FAILED(hr)) @@ -74,7 +75,7 @@ __declspec(noinline) inline VOID ReportException(LOCATION_ARGUMENTS std::exception& exception) { - DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, LOCATION_FORMAT "Unhandled exception: %s", LOCATION_CALL exception.what()); + DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, "Exception : %s caught at" LOCATION_FORMAT, exception.what(), LOCATION_CALL_ONLY); } __declspec(noinline) inline HRESULT LogHResultFailed(LOCATION_ARGUMENTS HRESULT hr) diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index 3d360b324d..c96133596d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -3,185 +3,78 @@ #include "hostfxr_utility.h" -#include #include -#include "EventLog.h" -#include "ntassert.h" #include "fx_ver.h" #include "debugutil.h" #include "exceptions.h" #include "HandleWrapper.h" #include "Environment.h" -#include "file_utility.h" +#include "StringHelpers.h" namespace fs = std::filesystem; -// -// Runs a standalone appliction. -// The folder structure looks like this: -// Application/ -// hostfxr.dll -// Application.exe -// Application.dll -// etc. -// We get the full path to hostfxr.dll and Application.dll and run hostfxr_main, -// passing in Application.dll. -// Assuming we don't need Application.exe as the dll is the actual application. -// -HRESULT -HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( - PCWSTR pwzExeAbsolutePath, // includes .exe file extension. - PCWSTR pcwzApplicationPhysicalPath, - PCWSTR pcwzArguments, - _Inout_ STRU* pStruHostFxrDllLocation, - _Out_ DWORD* pdwArgCount, - _Out_ BSTR** ppwzArgv -) -{ - LOG_INFOF("Resolving standalone hostfxr parameters for application: %S arguments: %S path: %S", - pwzExeAbsolutePath, - pcwzArguments, - pwzExeAbsolutePath); - - const fs::path exePath(pwzExeAbsolutePath); - - if (!exePath.has_extension()) - { - LOG_INFOF("Exe path has not extension, returning"); - - return false; - } - - const fs::path physicalPath(pcwzApplicationPhysicalPath); - const fs::path hostFxrLocation = physicalPath / "hostfxr.dll"; - - LOG_INFOF("Checking hostfxr.dll at %S", hostFxrLocation.c_str()); - - if (!is_regular_file(hostFxrLocation)) - { - fs::path runtimeConfigLocation = exePath; - runtimeConfigLocation.replace_extension(L".runtimeconfig.json"); - - LOG_INFOF("Checking runtimeconfig.json at %S", runtimeConfigLocation.c_str()); - if (!is_regular_file(runtimeConfigLocation)) - { - EventLog::Error( - ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP, - ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP_MSG, - pcwzApplicationPhysicalPath, - 0); - return E_FAIL; - } - - EventLog::Error( - ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND, - ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_MSG, - pcwzApplicationPhysicalPath, - 0); - return E_FAIL; - } - - fs::path dllPath = exePath; - dllPath.replace_extension(".dll"); - - if (!is_regular_file(dllPath)) - { - LOG_INFOF("Application dll at %S was not found", dllPath.c_str()); - return E_FAIL; - } - - auto arguments = std::wstring(dllPath) + L" " + pcwzArguments; - - RETURN_IF_FAILED(pStruHostFxrDllLocation->Copy(hostFxrLocation.c_str())); - - RETURN_IF_FAILED(ParseHostfxrArguments( - arguments.c_str(), - pwzExeAbsolutePath, - pcwzApplicationPhysicalPath, - pdwArgCount, - ppwzArgv)); - - return S_OK; -} - -BOOL -HOSTFXR_UTILITY::IsDotnetExecutable(const std::filesystem::path & dotnetPath) -{ - auto name = dotnetPath.filename(); - name.replace_extension(""); - return _wcsnicmp(name.c_str(), L"dotnet", 6) == 0; -} - -HRESULT +void HOSTFXR_UTILITY::GetHostFxrParameters( - _In_ PCWSTR pcwzProcessPath, - _In_ PCWSTR pcwzApplicationPhysicalPath, - _In_ PCWSTR pcwzArguments, - _Inout_ STRU *pStruHostFxrDllLocation, - _Inout_ STRU *pStruExeAbsolutePath, - _Out_ DWORD *pdwArgCount, - _Out_ BSTR **pbstrArgv + const fs::path &processPath, + const fs::path &applicationPhysicalPath, + const std::wstring &applicationArguments, + fs::path &hostFxrDllPath, + fs::path &dotnetExePath, + std::vector &arguments ) { - HRESULT hr = S_OK; + LOG_INFOF("Resolving hostfxr parameters for application: '%S' arguments: '%S' path: '%S'", + processPath.c_str(), + applicationArguments.c_str(), + applicationPhysicalPath.c_str()); - LOG_INFOF("Resolving hostfxr parameters for application: %S arguments: %S path: %S", - pcwzProcessPath, - pcwzArguments, - pcwzApplicationPhysicalPath); + fs::path expandedProcessPath = Environment::ExpandEnvironmentVariables(processPath); + const auto expandedApplicationArguments = Environment::ExpandEnvironmentVariables(applicationArguments); - const fs::path applicationPhysicalPath = pcwzApplicationPhysicalPath; - fs::path processPath = Environment::ExpandEnvironmentVariables(pcwzProcessPath); - std::wstring arguments = Environment::ExpandEnvironmentVariables(pcwzArguments); + LOG_INFOF("Expanded hostfxr parameters for application: '%S' arguments: '%S'", + expandedProcessPath.c_str(), + expandedApplicationArguments.c_str()); + + LOG_INFOF("Known dotnet.exe location: '%S'", dotnetExePath.c_str()); + + if (!expandedProcessPath.has_extension()) + { + // The only executable extension inprocess supports + expandedProcessPath.replace_extension(".exe"); + } + else if (!ends_with(expandedProcessPath, L".exe", true)) + { + throw StartupParametersResolutionException(format(L"Process path '%s' doesn't have '.exe' extension.", expandedProcessPath.c_str())); + } // Check if the absolute path is to dotnet or not. - if (IsDotnetExecutable(processPath)) + if (IsDotnetExecutable(expandedProcessPath)) { - LOG_INFOF("Process path %S is dotnet, treating application as portable", processPath.c_str()); - // - // The processPath ends with dotnet.exe or dotnet - // like: C:\Program Files\dotnet\dotnet.exe, C:\Program Files\dotnet\dotnet, dotnet.exe, or dotnet. - // Get the absolute path to dotnet. If the path is already an absolute path, it will return that path - // - // Make sure to append the dotnet.exe path correctly here (pass in regular path)? - auto fullProcessPath = GetAbsolutePathToDotnet(applicationPhysicalPath, processPath); - if (!fullProcessPath.has_value()) + LOG_INFOF("Process path '%S' is dotnet, treating application as portable", expandedProcessPath.c_str()); + + if (dotnetExePath.empty()) { - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - EventLog::Error( - ASPNETCORE_EVENT_INVALID_PROCESS_PATH, - ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG, - processPath.c_str(), - hr); - return hr; + dotnetExePath = GetAbsolutePathToDotnet(applicationPhysicalPath, expandedProcessPath); } - processPath = fullProcessPath.value(); + hostFxrDllPath = GetAbsolutePathToHostFxr(dotnetExePath); - auto hostFxrPath = GetAbsolutePathToHostFxr(processPath); - if (!hostFxrPath.has_value()) - { - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - return hr; - } - - RETURN_IF_FAILED(HOSTFXR_UTILITY::ParseHostfxrArguments( - arguments.c_str(), - processPath.c_str(), - pcwzApplicationPhysicalPath, - pdwArgCount, - pbstrArgv)); - - RETURN_IF_FAILED(pStruHostFxrDllLocation->Copy(hostFxrPath->c_str())); - RETURN_IF_FAILED(pStruExeAbsolutePath->Copy(processPath.c_str())); + ParseHostfxrArguments( + expandedApplicationArguments, + dotnetExePath, + applicationPhysicalPath, + arguments, + true); } else { - LOG_INFOF("Process path %S is not dotnet, treating application as standalone", processPath.c_str()); + LOG_INFOF("Process path '%S' is not dotnet, treating application as standalone or portable with bootstrapper", expandedProcessPath.c_str()); - if (processPath.is_relative()) + auto executablePath = expandedProcessPath; + + if (executablePath.is_relative()) { - processPath = applicationPhysicalPath / processPath; + executablePath = applicationPhysicalPath / expandedProcessPath; } // @@ -189,17 +82,42 @@ HOSTFXR_UTILITY::GetHostFxrParameters( // like: C:\test\MyApp.Exe or MyApp.Exe // Check if the file exists, and if it does, get the parameters for a standalone application // - if (is_regular_file(processPath)) + if (is_regular_file(executablePath)) { - RETURN_IF_FAILED(GetStandaloneHostfxrParameters( - processPath.c_str(), - pcwzApplicationPhysicalPath, - arguments.c_str(), - pStruHostFxrDllLocation, - pdwArgCount, - pbstrArgv)); + auto applicationDllPath = executablePath; + applicationDllPath.replace_extension(".dll"); - RETURN_IF_FAILED(pStruExeAbsolutePath->Copy(processPath.c_str())); + LOG_INFOF("Checking application.dll at %S", applicationDllPath.c_str()); + if (!is_regular_file(applicationDllPath)) + { + throw StartupParametersResolutionException(format(L"Application .dll was not found at %s", applicationDllPath.c_str())); + } + + hostFxrDllPath = executablePath.parent_path() / "hostfxr.dll"; + LOG_INFOF("Checking hostfxr.dll at %S", hostFxrDllPath.c_str()); + if (is_regular_file(hostFxrDllPath)) + { + LOG_INFOF("hostfxr.dll found app local at '%S', treating application as standalone", hostFxrDllPath.c_str()); + } + else + { + LOG_INFOF("hostfxr.dll found app local at '%S', treating application as portable with launcher", hostFxrDllPath.c_str()); + + // passing "dotnet" here because we don't know where dotnet.exe should come from + // so trying all fallbacks is appropriate + if (dotnetExePath.empty()) + { + dotnetExePath = GetAbsolutePathToDotnet(applicationPhysicalPath, L"dotnet"); + } + executablePath = dotnetExePath; + hostFxrDllPath = GetAbsolutePathToHostFxr(dotnetExePath); + } + + ParseHostfxrArguments( + applicationDllPath.generic_wstring() + L" " + expandedApplicationArguments, + executablePath, + applicationPhysicalPath, + arguments); } else { @@ -207,140 +125,75 @@ HOSTFXR_UTILITY::GetHostFxrParameters( // If the processPath file does not exist and it doesn't include dotnet.exe or dotnet // then it is an invalid argument. // - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - EventLog::Error( - ASPNETCORE_EVENT_INVALID_PROCESS_PATH, - ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG, - processPath.c_str(), - hr); - return hr; + throw StartupParametersResolutionException(format(L"Executable was not found at '%s'", executablePath.c_str())); } } - - return S_OK; } -// -// Forms the argument list in HOSTFXR_PARAMETERS. -// Sets the ArgCount and Arguments. -// Arg structure: -// argv[0] = Path to exe activating hostfxr. -// argv[1] = L"exec" -// argv[2] = absolute path to dll. -// -HRESULT +BOOL +HOSTFXR_UTILITY::IsDotnetExecutable(const std::filesystem::path & dotnetPath) +{ + return ends_with(dotnetPath, L"dotnet.exe", true); +} + +void HOSTFXR_UTILITY::ParseHostfxrArguments( - PCWSTR pwzArgumentsFromConfig, - PCWSTR pwzExePath, - PCWSTR pcwzApplicationPhysicalPath, - _Out_ DWORD* pdwArgCount, - _Out_ BSTR** pbstrArgv + const std::wstring &applicationArguments, + const fs::path &applicationExePath, + const fs::path &applicationPhysicalPath, + std::vector &arguments, + bool expandDllPaths ) { - DBG_ASSERT(pdwArgCount != NULL); - DBG_ASSERT(pbstrArgv != NULL); - DBG_ASSERT(pwzExePath != NULL); + LOG_INFOF("Resolving hostfxr_main arguments application: '%S' arguments: '%S' path: %S", applicationExePath.c_str(), applicationArguments.c_str(), applicationPhysicalPath.c_str()); - HRESULT hr = S_OK; - INT argc = 0; - BSTR* argv = NULL; - LPWSTR* pwzArgs = NULL; - STRU struTempPath; - INT intArgsProcessed = 0; + arguments = std::vector(); + arguments.push_back(applicationExePath); - LOG_INFOF("Resolving hostfxr_main arguments application: %S arguments: %S path: %S", - pwzExePath, - pwzArgumentsFromConfig, - pcwzApplicationPhysicalPath); - - // If we call CommandLineToArgvW with an empty string, argc is 5 for some interesting reason. - // Protectively guard against this by check if the string is null or empty. - if (pwzArgumentsFromConfig == NULL || wcscmp(pwzArgumentsFromConfig, L"") == 0) + if (applicationArguments.empty()) { - hr = E_INVALIDARG; - goto Finished; + throw StartupParametersResolutionException(L"Application arguments are empty."); } - pwzArgs = CommandLineToArgvW(pwzArgumentsFromConfig, &argc); - - if (pwzArgs == NULL) + int argc = 0; + auto pwzArgs = std::unique_ptr(CommandLineToArgvW(applicationArguments.c_str(), &argc)); + if (!pwzArgs) { - hr = LOG_IF_FAILED(HRESULT_FROM_WIN32(GetLastError())); - goto Failure; + throw StartupParametersResolutionException(format(L"Unable parse command line argumens '%s' or '%s'", applicationArguments.c_str())); } - argv = new BSTR[argc + 1]; + for (int intArgsProcessed = 0; intArgsProcessed < argc; intArgsProcessed++) + { + std::wstring argument = pwzArgs[intArgsProcessed]; - argv[0] = SysAllocString(pwzExePath); - if (argv[0] == NULL) - { - hr = E_OUTOFMEMORY; - goto Failure; - } - // Try to convert the application dll from a relative to an absolute path - // Don't record this failure as pwzArgs[0] may already be an absolute path to the dll. - for (intArgsProcessed = 0; intArgsProcessed < argc; intArgsProcessed++) - { - DBG_ASSERT(pwzArgs[intArgsProcessed] != NULL); - struTempPath.Copy(pwzArgs[intArgsProcessed]); - if (struTempPath.EndsWith(L".dll")) + // Try expanding arguments ending in .dll to a full paths + if (expandDllPaths && ends_with(argument, L".dll", true)) { - if (SUCCEEDED(FILE_UTILITY::ConvertPathToFullPath(pwzArgs[intArgsProcessed], pcwzApplicationPhysicalPath, &struTempPath))) + fs::path argumentAsPath = argument; + if (argumentAsPath.is_relative()) { - argv[intArgsProcessed + 1] = SysAllocString(struTempPath.QueryStr()); - } - else - { - argv[intArgsProcessed + 1] = SysAllocString(pwzArgs[intArgsProcessed]); - } - if (argv[intArgsProcessed + 1] == NULL) - { - hr = E_OUTOFMEMORY; - goto Failure; - } - } - else - { - argv[intArgsProcessed + 1] = SysAllocString(pwzArgs[intArgsProcessed]); - if (argv[intArgsProcessed + 1] == NULL) - { - hr = E_OUTOFMEMORY; - goto Failure; + argumentAsPath = applicationPhysicalPath / argumentAsPath; + if (exists(argumentAsPath)) + { + LOG_INFOF("Converted argument '%S' to %S", argument.c_str(), argumentAsPath.c_str()); + argument = argumentAsPath; + } } } - LOG_INFOF("Argument[%d] = %S", - intArgsProcessed + 1, - argv[intArgsProcessed + 1]); + arguments.push_back(argument); } - *pbstrArgv = argv; - *pdwArgCount = argc + 1; - - goto Finished; - -Failure: - if (argv != NULL) + for (size_t i = 0; i < arguments.size(); i++) { - // intArgsProcess - 1 here as if we fail to allocated the ith string - // we don't want to free it. - for (INT i = 0; i < intArgsProcessed - 1; i++) - { - SysFreeString(argv[i]); - } + LOG_INFOF("Argument[%d] = %S", i, arguments[i].c_str()); } - - delete[] argv; - -Finished: - if (pwzArgs != NULL) - { - LocalFree(pwzArgs); - } - return hr; } -std::optional +// The processPath ends with dotnet.exe or dotnet +// like: C:\Program Files\dotnet\dotnet.exe, C:\Program Files\dotnet\dotnet, dotnet.exe, or dotnet. +// Get the absolute path to dotnet. If the path is already an absolute path, it will return that path +fs::path HOSTFXR_UTILITY::GetAbsolutePathToDotnet( const fs::path & applicationPath, const fs::path & requestedPath @@ -357,21 +210,11 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( // // If we are given an absolute path to dotnet.exe, we are done // - if (is_regular_file(requestedPath)) + if (is_regular_file(processPath)) { - LOG_INFOF("Found dotnet.exe at %S", requestedPath.c_str()); + LOG_INFOF("Found dotnet.exe at %S", processPath.c_str()); - return std::make_optional(requestedPath); - } - - auto pathWithExe = requestedPath; - pathWithExe.concat(L".exe"); - - if (is_regular_file(pathWithExe)) - { - LOG_INFOF("Found dotnet.exe at %S", pathWithExe.c_str()); - - return std::make_optional(pathWithExe); + return processPath; } // At this point, we are calling where.exe to find dotnet. @@ -382,7 +225,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( { LOG_INFOF("Absolute path to dotnet.exe was not found at %S", requestedPath.c_str()); - return std::nullopt; + throw StartupParametersResolutionException(format(L"Could not find dotnet.exe at '%s'", processPath.c_str())); } const auto dotnetViaWhere = InvokeWhereToFindDotnet(); @@ -390,7 +233,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( { LOG_INFOF("Found dotnet.exe via where.exe invocation at %S", dotnetViaWhere.value().c_str()); - return dotnetViaWhere; + return dotnetViaWhere.value(); } const auto programFilesLocation = GetAbsolutePathToDotnetFromProgramFiles(); @@ -398,14 +241,17 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( { LOG_INFOF("Found dotnet.exe in Program Files at %S", programFilesLocation.value().c_str()); - return programFilesLocation; + return programFilesLocation.value(); } LOG_INFOF("dotnet.exe not found"); - return std::nullopt; + throw StartupParametersResolutionException(format( + L"Could not find dotnet.exe at '%s' or using the system PATH environment variable." + " Check that a valid path to dotnet is on the PATH and the bitness of dotnet matches the bitness of the IIS worker process.", + processPath.c_str())); } -std::optional +fs::path HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( const fs::path & dotnetPath ) @@ -417,23 +263,14 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( if (!is_directory(hostFxrBase)) { - EventLog::Error(ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND, ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND_MSG, hostFxrBase.c_str(), HRESULT_FROM_WIN32(ERROR_BAD_ENVIRONMENT)); - - return std::nullopt; + throw StartupParametersResolutionException(format(L"Unable to find hostfxr directory at %s", hostFxrBase.c_str())); } - auto searchPattern = std::wstring(hostFxrBase) + L"\\*"; - FindDotNetFolders(searchPattern.c_str(), versionFolders); + FindDotNetFolders(hostFxrBase, versionFolders); if (versionFolders.empty()) { - EventLog::Error( - ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND, - ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND_MSG, - hostFxrBase.c_str(), - HRESULT_FROM_WIN32(ERROR_BAD_ENVIRONMENT)); - - return std::nullopt; + throw StartupParametersResolutionException(format(L"Hostfxr directory '%s' doesn't contain any version subdirectories", hostFxrBase.c_str())); } const auto highestVersion = FindHighestDotNetVersion(versionFolders); @@ -441,24 +278,18 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( if (!is_regular_file(hostFxrPath)) { - EventLog::Error( - ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND, - ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND_MSG, - hostFxrPath.c_str(), - HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); - - return std::nullopt; + throw StartupParametersResolutionException(format(L"hostfxr.dll not found at '%s'", hostFxrPath.c_str())); } LOG_INFOF("hostfxr.dll located at %S", hostFxrPath.c_str()); - return std::make_optional(hostFxrPath); + return hostFxrPath; } // // Tries to call where.exe to find the location of dotnet.exe. // Will check that the bitness of dotnet matches the current // worker process bitness. -// Returns true if a valid dotnet was found, else false. +// Returns true if a valid dotnet was found, else false.R // std::optional HOSTFXR_UTILITY::InvokeWhereToFindDotnet() @@ -638,7 +469,6 @@ HOSTFXR_UTILITY::FindHighestDotNetVersion( fx_ver_t fx_ver(-1, -1, -1); if (fx_ver_t::parse(dir, &fx_ver, false)) { - // TODO using max instead of std::max works max_ver = max(max_ver, fx_ver); } } @@ -648,16 +478,16 @@ HOSTFXR_UTILITY::FindHighestDotNetVersion( VOID HOSTFXR_UTILITY::FindDotNetFolders( - _In_ PCWSTR pszPath, - _Out_ std::vector & pvFolders + const std::filesystem::path &path, + _Out_ std::vector &pvFolders ) { - HANDLE handle = NULL; - WIN32_FIND_DATAW data = { 0 }; - - handle = FindFirstFileExW(pszPath, FindExInfoStandard, &data, FindExSearchNameMatch, NULL, 0); + WIN32_FIND_DATAW data = {}; + const auto searchPattern = std::wstring(path) + L"\\*"; + HandleWrapper handle = FindFirstFileExW(searchPattern.c_str(), FindExInfoStandard, &data, FindExSearchNameMatch, nullptr, 0); if (handle == INVALID_HANDLE_VALUE) { + LOG_LAST_ERROR(); return; } @@ -665,6 +495,4 @@ HOSTFXR_UTILITY::FindDotNetFolders( { pvFolders.emplace_back(data.cFileName); } while (FindNextFileW(handle, &data)); - - FindClose(handle); } diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index 126867a865..e12153aaf6 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -7,7 +7,7 @@ #include #include #include -#include "stringu.h" +#include typedef INT(*hostfxr_get_native_search_directories_fn) (CONST INT argc, CONST PCWSTR* argv, PWSTR buffer, DWORD buffer_size, DWORD* required_buffer_size); typedef INT(*hostfxr_main_fn) (CONST DWORD argc, CONST PCWSTR argv[]); @@ -19,76 +19,88 @@ class HOSTFXR_UTILITY public: static - HRESULT - GetStandaloneHostfxrParameters( - PCWSTR pwzExeAbsolutePath, // includes .exe file extension. - PCWSTR pcwzApplicationPhysicalPath, - PCWSTR pcwzArguments, - _Inout_ STRU* pStruHostFxrDllLocation, - _Out_ DWORD* pdwArgCount, - _Out_ BSTR** ppwzArgv - ); - - static - HRESULT - ParseHostfxrArguments( - PCWSTR pwzArgumentsFromConfig, - PCWSTR pwzExePath, - PCWSTR pcwzApplicationPhysicalPath, - _Out_ DWORD* pdwArgCount, - _Out_ BSTR** pbstrArgv - ); - - static - BOOL - IsDotnetExecutable( - _In_ const std::filesystem::path & dotnetPath - ); - - static - HRESULT + void GetHostFxrParameters( - _In_ PCWSTR pcwzProcessPath, - _In_ PCWSTR pcwzApplicationPhysicalPath, - _In_ PCWSTR pcwzArguments, - _Inout_ STRU *pStruHostFxrDllLocation, - _Inout_ STRU *struExeAbsolutePath, - _Out_ DWORD *pdwArgCount, - _Out_ BSTR **ppwzArgv + const std::filesystem::path &processPath, + const std::filesystem::path &applicationPhysicalPath, + const std::wstring &applicationArguments, + std::filesystem::path &hostFxrDllPath, + std::filesystem::path &dotnetExePath, + std::vector &arguments ); - static - VOID - FindDotNetFolders( - _In_ PCWSTR pszPath, - _Out_ std::vector & pvFolders - ); + class StartupParametersResolutionException: public std::runtime_error + { + public: + StartupParametersResolutionException(std::wstring msg) + : runtime_error("Startup parameter resulution error occured"), message(std::move(msg)) + { + } + + std::wstring get_message() const { return message; } + + private: + std::wstring message; + }; static - std::wstring - FindHighestDotNetVersion( - _In_ std::vector & vFolders - ); - - static - std::optional - GetAbsolutePathToHostFxr( - _In_ const std::filesystem::path & dotnetPath + void + ParseHostfxrArguments( + const std::wstring &arugments, + const std::filesystem::path &exePath, + const std::filesystem::path &applicationPhysicalPath, + std::vector &arguments, + bool expandDllPaths = false ); static std::optional GetAbsolutePathToDotnetFromProgramFiles(); +private: + + static + BOOL + IsDotnetExecutable( + const std::filesystem::path & dotnetPath + ); + + static + VOID + FindDotNetFolders( + const std::filesystem::path& path, + std::vector & pvFolders + ); + + static + std::wstring + FindHighestDotNetVersion( + std::vector & vFolders + ); + + static + std::filesystem::path + GetAbsolutePathToHostFxr( + const std::filesystem::path & dotnetPath + ); + static std::optional InvokeWhereToFindDotnet(); static - std::optional + std::filesystem::path GetAbsolutePathToDotnet( - _In_ const std::filesystem::path & applicationPath, - _In_ const std::filesystem::path & requestedPath + const std::filesystem::path & applicationPath, + const std::filesystem::path & requestedPath ); + + struct LocalFreeDeleter + { + void operator ()(LPWSTR* ptr) const + { + LocalFree(ptr); + } + }; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp index e8f2983028..7445724d98 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp @@ -6,82 +6,48 @@ #include "hostfxr_utility.h" #include "debugutil.h" #include "exceptions.h" +#include "EventLog.h" HRESULT HOSTFXR_OPTIONS::Create( - _In_ PCWSTR pcwzExeLocation, + _In_ PCWSTR pcwzDotnetExePath, _In_ PCWSTR pcwzProcessPath, _In_ PCWSTR pcwzApplicationPhysicalPath, _In_ PCWSTR pcwzArguments, _Out_ std::unique_ptr& ppWrapper) { - STRU struHostFxrDllLocation; - STRU struExeAbsolutePath; - STRU struExeLocation; - BSTR* pwzArgv; - DWORD dwArgCount; + std::filesystem::path knownDotnetLocation; - if (pcwzExeLocation != NULL) + if (pcwzDotnetExePath != nullptr) { - RETURN_IF_FAILED(struExeLocation.Copy(pcwzExeLocation)); + knownDotnetLocation = pcwzDotnetExePath; } + try + { + std::filesystem::path hostFxrDllPath; + std::vector arguments; + HOSTFXR_UTILITY::GetHostFxrParameters( + pcwzProcessPath, + pcwzApplicationPhysicalPath, + pcwzArguments, + hostFxrDllPath, + knownDotnetLocation, + arguments); - // If the exe was not provided by the shim, reobtain the hostfxr parameters (which finds dotnet). - if (struExeLocation.IsEmpty()) - { - RETURN_IF_FAILED(HOSTFXR_UTILITY::GetHostFxrParameters( - pcwzProcessPath, - pcwzApplicationPhysicalPath, - pcwzArguments, - &struHostFxrDllLocation, - &struExeAbsolutePath, - &dwArgCount, - &pwzArgv)); + ppWrapper = std::make_unique(knownDotnetLocation, hostFxrDllPath, arguments); } - else if (HOSTFXR_UTILITY::IsDotnetExecutable(struExeLocation.QueryStr())) + catch (HOSTFXR_UTILITY::StartupParametersResolutionException &resolutionException) { - RETURN_IF_FAILED(HOSTFXR_UTILITY::ParseHostfxrArguments( - pcwzArguments, - pcwzExeLocation, - pcwzApplicationPhysicalPath, - &dwArgCount, - &pwzArgv)); - } - else - { - RETURN_IF_FAILED(HOSTFXR_UTILITY::GetStandaloneHostfxrParameters( - pcwzExeLocation, - pcwzApplicationPhysicalPath, - pcwzArguments, - &struHostFxrDllLocation, - &dwArgCount, - &pwzArgv)); - } + OBSERVE_CAUGHT_EXCEPTION(); - ppWrapper = std::make_unique(); - RETURN_IF_FAILED(ppWrapper->Populate(struHostFxrDllLocation.QueryStr(), struExeAbsolutePath.QueryStr(), dwArgCount, pwzArgv)); + EventLog::Error( + ASPNETCORE_EVENT_INPROCESS_START_ERROR, + ASPNETCORE_EVENT_INPROCESS_START_ERROR_MSG, + pcwzApplicationPhysicalPath, + resolutionException.get_message().c_str()); + + return E_FAIL; + } + CATCH_RETURN(); return S_OK; } - - -HRESULT HOSTFXR_OPTIONS::Populate(PCWSTR hostFxrLocation, PCWSTR struExeLocation, DWORD argc, BSTR argv[]) -{ - HRESULT hr; - - m_argc = argc; - m_argv = argv; - - if (FAILED(hr = m_hostFxrLocation.Copy(hostFxrLocation))) - { - goto Finished; - } - - if (FAILED(hr = m_exeLocation.Copy(struExeLocation))) - { - goto Finished; - } - - Finished: - - return hr; -} diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h index 99b972cde8..50bdfe1ded 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h @@ -5,41 +5,45 @@ #include #include - -#include "stringu.h" +#include +#include +#include +#include class HOSTFXR_OPTIONS { public: - HOSTFXR_OPTIONS() {} + HOSTFXR_OPTIONS( + std::filesystem::path dotnetExeLocation, + std::filesystem::path hostFxrLocation, + std::vector arguments + ) + : m_dotnetExeLocation(std::move(dotnetExeLocation)), + m_hostFxrLocation(std::move(hostFxrLocation)), + m_arguments(std::move(arguments)) + {} - ~HOSTFXR_OPTIONS() + void + GetArguments(DWORD &hostfxrArgc, std::unique_ptr &hostfxrArgv) const { - delete[] m_argv; + hostfxrArgc = static_cast(m_arguments.size()); + hostfxrArgv = std::unique_ptr(new PCWSTR[hostfxrArgc]); + for (DWORD i = 0; i < hostfxrArgc; ++i) + { + hostfxrArgv[i] = m_arguments[i].c_str(); + } } - DWORD - GetArgc() const - { - return m_argc; - } - - BSTR* - GetArgv() const - { - return m_argv; - } - - PCWSTR + const std::filesystem::path& GetHostFxrLocation() const { - return m_hostFxrLocation.QueryStr(); + return m_hostFxrLocation; } - PCWSTR - GetExeLocation() const + const std::filesystem::path& + GetDotnetExeLocation() const { - return m_exeLocation.QueryStr(); + return m_dotnetExeLocation; } static @@ -51,12 +55,7 @@ public: _Out_ std::unique_ptr& ppWrapper); private: - - HRESULT Populate(PCWSTR hostFxrLocation, PCWSTR struExeLocation, DWORD argc, BSTR argv[]); - - STRU m_exeLocation; - STRU m_hostFxrLocation; - - DWORD m_argc; - BSTR* m_argv; + const std::filesystem::path m_dotnetExeLocation; + const std::filesystem::path m_hostFxrLocation; + const std::vector m_arguments; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index 82f22c52c0..b2ea6f5b85 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -11,7 +11,6 @@ #define ASPNETCORE_EVENT_PROVIDER L"IIS AspNetCore Module V2" #define ASPNETCORE_IISEXPRESS_EVENT_PROVIDER L"IIS Express AspNetCore Module V2" -#define ASPNETCORE_EVENT_MSG_BUFFER_SIZE 256 #define ASPNETCORE_EVENT_PROCESS_START_SUCCESS_MSG L"Application '%s' started process '%d' successfully and process '%d' is listening on port '%d'." #define ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED_MSG L"Maximum rapid fail count per minute of '%d' exceeded." #define ASPNETCORE_EVENT_PROCESS_START_ERROR_MSG L"Application '%s' with physical root '%s' failed to start process with commandline '%s' at stage '%s', ErrorCode = '0x%x', assigned port %d, retryCounter '%d'." @@ -39,15 +38,9 @@ #define ASPNETCORE_EVENT_RECYCLE_CONFIGURATION_MSG L"Application '%s' was recycled due to configuration change" #define ASPNETCORE_EVENT_RECYCLE_FAILURE_CONFIGURATION_MSG L"Failed to recycle application due to a configuration change at '%s'. Recycling worker process." #define ASPNETCORE_EVENT_MODULE_DISABLED_MSG L"AspNetCore Module is disabled" -#define ASPNETCORE_EVENT_INPROCESS_FULL_FRAMEWORK_APP_MSG L"Application '%s' was compiled for .NET Framework. Please compile for .NET core to run the inprocess application or change the process mode to out of process. ErrorCode = '0x%x'." -#define ASPNETCORE_EVENT_PORTABLE_APP_DOTNET_MISSING_MSG L"Could not find dotnet.exe on the system PATH environment variable for portable application '%s'. Check that a valid path to dotnet is on the PATH and the bitness of dotnet matches the bitness of the IIS worker process. ErrorCode = '0x%x'." -#define ASPNETCORE_EVENT_HOSTFXR_DIRECTORY_NOT_FOUND_MSG L"Could not find the hostfxr directory '%s' in the dotnet directory. ErrorCode = '0x%x'." -#define ASPNETCORE_EVENT_HOSTFXR_DLL_NOT_FOUND_MSG L"Could not find hostfxr.dll in '%s'. ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_HOSTFXR_DLL_INVALID_VERSION_MSG L"Hostfxr version used does not support 'hostfxr_get_native_search_directories', update the version of hostfxr to a higher version. Path to hostfxr: '%s'." -#define ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_LEVEL EVENTLOG_ERROR_TYPE -#define ASPNETCORE_EVENT_APPLICATION_EXE_NOT_FOUND_MSG L"Could not find application executable in '%s'. ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, ErrorCode = '0x%x. Please check the stderr logs for more information." -#define ASPNETCORE_EVENT_INVALID_PROCESS_PATH_MSG L"Invalid or unknown processPath provided in web.config: processPath = '%s', ErrorCode = '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_RH_ERROR_MSG L"Could not find the assembly '%s' for in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application. Captured output: %s" #define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for out-of-process application. Please confirm the assembly is installed correctly for IIS or IISExpress." #define ASPNETCORE_EVENT_INPROCESS_START_SUCCESS_MSG L"Application '%s' started the coreclr in-process successfully." +#define ASPNETCORE_EVENT_INPROCESS_START_ERROR_MSG L"Application '%s' wasn't able to start. %s" diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 56eb63577c..182ee53148 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -392,11 +392,10 @@ IN_PROCESS_APPLICATION::ExecuteApplication( { HRESULT hr; HMODULE hModule = nullptr; - DWORD hostfxrArgc = 0; - BSTR *hostfxrArgv = NULL; hostfxr_main_fn pProc; std::unique_ptr hostFxrOptions = NULL; - + DWORD hostfxrArgc = 0; + std::unique_ptr hostfxrArgv; DBG_ASSERT(m_status == MANAGED_APPLICATION_STATUS::STARTING); pProc = s_fMainCallback; @@ -428,10 +427,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication( m_pConfig->QueryArguments()->QueryStr(), hostFxrOptions )); - - hostfxrArgc = hostFxrOptions->GetArgc(); - hostfxrArgv = hostFxrOptions->GetArgv(); - + hostFxrOptions->GetArguments(hostfxrArgc, hostfxrArgv); FINISHED_IF_FAILED(SetEnvironementVariablesOnWorkerProcess()); } @@ -457,7 +453,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication( // set the callbacks s_Application = this; - hr = RunDotnetApplication(hostfxrArgc, hostfxrArgv, pProc); + hr = RunDotnetApplication(hostfxrArgc, hostfxrArgv.get(), pProc); Finished: diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index c449863e4b..c4ca40436a 100644 --- a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Linq; using System.Text; using System.Text.RegularExpressions; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; @@ -12,6 +11,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class EventLogHelpers { + private static readonly Regex EventLogRegex = new Regex("Event Log: (?.+?)End Event Log Message.", RegexOptions.Singleline | RegexOptions.Compiled); public static void VerifyEventLogEvent(IISDeploymentResult deploymentResult, ITestSink testSink, string expectedRegexMatchString) { Assert.True(deploymentResult.HostProcess.HasExited); @@ -23,9 +23,19 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests builder.Append(context.Message); } - var eventLogRegex = new Regex($"Event Log: (.*?){expectedRegexMatchString}(.*?)End Event Log Message.", RegexOptions.Singleline); + var count = 0; + var expectedRegex = new Regex(expectedRegexMatchString, RegexOptions.Singleline); + foreach (Match match in EventLogRegex.Matches(builder.ToString())) + { + var eventLogText = match.Groups["EventLogMessage"].Value; + if (expectedRegex.IsMatch(eventLogText)) + { + count++; + } + } - Assert.Matches(eventLogRegex, builder.ToString()); + Assert.True(count > 0, $"'{expectedRegexMatchString}' didn't match any event log messaged"); + Assert.True(count < 2, $"'{expectedRegexMatchString}' matched more then one event log message"); } } } diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index b9e80dd27f..e0d49615a5 100644 --- a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -28,11 +28,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting parameters.EnvironmentVariables[DebugEnvironmentVariable] = "console"; } - if (parameters.ApplicationPublisher == null) - { - throw new InvalidOperationException("All tests should use ApplicationPublisher"); - } - return IISApplicationDeployerFactory.Create(parameters, LoggerFactory); } diff --git a/test/CommonLibTests/hostfxr_utility_tests.cpp b/test/CommonLibTests/hostfxr_utility_tests.cpp index 232f7627b8..7d323868f8 100644 --- a/test/CommonLibTests/hostfxr_utility_tests.cpp +++ b/test/CommonLibTests/hostfxr_utility_tests.cpp @@ -2,80 +2,75 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. #include "stdafx.h" -#include "file_utility.h" +#include +#include +#include +#include "hostfxr_utility.h" +#include "Environment.h" TEST(ParseHostFxrArguments, BasicHostFxrArguments) { - DWORD retVal = 0; - BSTR* bstrArray; + std::vector bstrArray; PCWSTR exeStr = L"C:/Program Files/dotnet.exe"; - HRESULT hr = HOSTFXR_UTILITY::ParseHostfxrArguments( + + HOSTFXR_UTILITY::ParseHostfxrArguments( L"exec \"test.dll\"", // args exeStr, // exe path L"invalid", // physical path to application - &retVal, // arg count - &bstrArray); // args array. + bstrArray); // args array. - EXPECT_EQ(hr, S_OK); - EXPECT_EQ(DWORD(3), retVal); - ASSERT_STREQ(exeStr, bstrArray[0]); - ASSERT_STREQ(L"exec", bstrArray[1]); - ASSERT_STREQ(L"test.dll", bstrArray[2]); + EXPECT_EQ(3, bstrArray.size()); + ASSERT_STREQ(exeStr, bstrArray[0].c_str()); + ASSERT_STREQ(L"exec", bstrArray[1].c_str()); + ASSERT_STREQ(L"test.dll", bstrArray[2].c_str()); } TEST(ParseHostFxrArguments, NoExecProvided) { - DWORD retVal = 0; - BSTR* bstrArray; + std::vector bstrArray; PCWSTR exeStr = L"C:/Program Files/dotnet.exe"; - HRESULT hr = HOSTFXR_UTILITY::ParseHostfxrArguments( + HOSTFXR_UTILITY::ParseHostfxrArguments( L"test.dll", // args exeStr, // exe path L"ignored", // physical path to application - &retVal, // arg count - &bstrArray); // args array. + bstrArray); // args array. - EXPECT_EQ(hr, S_OK); - EXPECT_EQ(DWORD(2), retVal); - ASSERT_STREQ(exeStr, bstrArray[0]); - ASSERT_STREQ(L"test.dll", bstrArray[1]); + EXPECT_EQ(DWORD(2), bstrArray.size()); + ASSERT_STREQ(exeStr, bstrArray[0].c_str()); + ASSERT_STREQ(L"test.dll", bstrArray[1].c_str()); } TEST(ParseHostFxrArguments, ConvertDllToAbsolutePath) { - DWORD retVal = 0; - BSTR* bstrArray; + std::vector bstrArray; PCWSTR exeStr = L"C:/Program Files/dotnet.exe"; - - HRESULT hr = HOSTFXR_UTILITY::ParseHostfxrArguments( - L"exec \"test.dll\"", // args + // we need to use existing dll so let's use ntdll that we know exists everywhere + auto system32 = Environment::ExpandEnvironmentVariables(L"%WINDIR%\\System32"); + HOSTFXR_UTILITY::ParseHostfxrArguments( + L"exec \"ntdll.dll\"", // args exeStr, // exe path - L"C:/test", // physical path to application - &retVal, // arg count - &bstrArray); // args array. + system32, // physical path to application + bstrArray, // args array. + true); // expandDllPaths - EXPECT_EQ(hr, S_OK); - EXPECT_EQ(DWORD(3), retVal); - ASSERT_STREQ(exeStr, bstrArray[0]); - ASSERT_STREQ(L"exec", bstrArray[1]); - ASSERT_STREQ(L"C:\\test\\test.dll", bstrArray[2]); + EXPECT_EQ(DWORD(3), bstrArray.size()); + ASSERT_STREQ(exeStr, bstrArray[0].c_str()); + ASSERT_STREQ(L"exec", bstrArray[1].c_str()); + ASSERT_STREQ((system32 + L"\\ntdll.dll").c_str(), bstrArray[2].c_str()); } TEST(ParseHostFxrArguments, ProvideNoArgs_InvalidArgs) { - DWORD retVal = 0; - BSTR* bstrArray; + std::vector bstrArray; PCWSTR exeStr = L"C:/Program Files/dotnet.exe"; - HRESULT hr = HOSTFXR_UTILITY::ParseHostfxrArguments( + ASSERT_THROW(HOSTFXR_UTILITY::ParseHostfxrArguments( L"", // args exeStr, // exe path L"ignored", // physical path to application - &retVal, // arg count - &bstrArray); // args array. - - EXPECT_EQ(E_INVALIDARG, hr); + bstrArray), // args array. + HOSTFXR_UTILITY::StartupParametersResolutionException); } TEST(GetAbsolutePathToDotnetFromProgramFiles, BackupWorks) @@ -118,19 +113,16 @@ TEST(GetAbsolutePathToDotnetFromProgramFiles, BackupWorks) TEST(GetHostFxrArguments, InvalidParams) { - DWORD retVal = 0; - BSTR* bstrArray; - STRU struHostFxrDllLocation; - STRU struExeLocation; + std::vector bstrArray; + std::filesystem::path struHostFxrDllLocation; + std::filesystem::path struExeLocation; - HRESULT hr = HOSTFXR_UTILITY::GetHostFxrParameters( + EXPECT_THROW(HOSTFXR_UTILITY::GetHostFxrParameters( L"bogus", // processPath L"", // application physical path, ignored. L"ignored", //arguments - NULL, - &struExeLocation, - &retVal, // arg count - &bstrArray); // args array. - - EXPECT_EQ(HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), hr); + struHostFxrDllLocation, + struExeLocation, + bstrArray), // args array. + HOSTFXR_UTILITY::StartupParametersResolutionException); } diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index e6b48f28bf..73bea61017 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -5,6 +5,7 @@ using System; using System.IO; using System.Linq; using System.Net; +using System.Text.RegularExpressions; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; @@ -40,14 +41,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalTheory] - [InlineData("bogus")] - [InlineData("c:\\random files\\dotnet.exe")] - [InlineData(".\\dotnet.exe")] - public async Task InvalidProcessPath_ExpectServerError(string path) + [InlineData("bogus", "", @"Executable was not found at '.*?\\bogus.exe")] + [InlineData("c:\\random files\\dotnet.exe", "something.dll", @"Could not find dotnet.exe at '.*?\\dotnet.exe'")] + [InlineData(".\\dotnet.exe", "something.dll", @"Could not find dotnet.exe at '.*?\\.\\dotnet.exe'")] + [InlineData("dotnet.exe", "", @"Application arguments are empty.")] + [InlineData("dotnet.zip", "", @"Process path 'dotnet.zip' doesn't have '.exe' extension.")] + public async Task InvalidProcessPath_ExpectServerError(string path, string arguments, string subError) { var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", path)); - + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("arguments", arguments)); var deploymentResult = await DeployAsync(deploymentParameters); @@ -57,7 +60,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, @"Invalid or unknown processPath provided in web\.config: processPath = '.+', ErrorCode = '0x80070002'\."); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, $@"Application '{Regex.Escape(deploymentResult.ContentRoot)}\\' wasn't able to start. {subError}"); } [ConditionalFact] @@ -136,6 +139,24 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal("Hello World", responseText); } + [ConditionalFact] + public async Task StartsWithPortableAndBootstraperExe() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + // rest publisher as it doesn't support additional parameters + deploymentParameters.ApplicationPublisher = null; + // ReferenceTestTasks is workaround for https://github.com/dotnet/sdk/issues/2482 + deploymentParameters.AdditionalPublishParameters = "-p:RuntimeIdentifier=win7-x64 -p:UseAppHost=true -p:SelfContained=false -p:ReferenceTestTasks=false"; + deploymentParameters.RestoreOnPublish = true; + var deploymentResult = await DeployAsync(deploymentParameters); + + Assert.True(File.Exists(Path.Combine(deploymentResult.ContentRoot, "InProcessWebSite.exe"))); + Assert.False(File.Exists(Path.Combine(deploymentResult.ContentRoot, "hostfxr.dll"))); + Assert.Contains("InProcessWebSite.exe", File.ReadAllText(Path.Combine(deploymentResult.ContentRoot, "web.config"))); + + await deploymentResult.AssertStarts(); + } + [ConditionalFact] public async Task DetectsOveriddenServer() { From 3b3f1283063db02821da4cd76e5c12be7dfc933b Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 22 Aug 2018 15:39:59 -0700 Subject: [PATCH 240/363] Enable app verifier on VSTS; Fix debug log handle use (#1291) --- src/AspNetCoreModuleV2/CommonLib/debugutil.cpp | 6 ++---- test/Common.FunctionalTests/AppOfflineTests.cs | 2 +- tools/SetupTestEnvironment.ps1 | 11 ++++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index 7184dbfde8..45e1d7ceab 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -14,7 +14,6 @@ #include "atlbase.h" #include "config_utility.h" -inline HANDLE g_hStandardOutput = INVALID_HANDLE_VALUE; inline HANDLE g_logFile = INVALID_HANDLE_VALUE; inline HMODULE g_hModule; inline SRWLOCK g_logFileLock; @@ -149,7 +148,6 @@ VOID DebugInitialize(HMODULE hModule) { g_hModule = hModule; - g_hStandardOutput = GetStdHandle(STD_OUTPUT_HANDLE); HKEY hKey; InitializeSRWLock(&g_logFileLock); @@ -290,10 +288,10 @@ DebugPrint( OutputDebugStringA( strOutput.QueryStr() ); DWORD nBytesWritten = 0; - if (IsEnabled(ASPNETCORE_DEBUG_FLAG_CONSOLE)) { - WriteFile(g_hStandardOutput, strOutput.QueryStr(), strOutput.QueryCB(), &nBytesWritten, nullptr); + auto outputHandle = GetStdHandle(STD_OUTPUT_HANDLE); + WriteFile(outputHandle, strOutput.QueryStr(), strOutput.QueryCB(), &nBytesWritten, nullptr); } if (g_logFile != INVALID_HANDLE_VALUE) diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/test/Common.FunctionalTests/AppOfflineTests.cs index 41bf8874d9..53afd34504 100644 --- a/test/Common.FunctionalTests/AppOfflineTests.cs +++ b/test/Common.FunctionalTests/AppOfflineTests.cs @@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests DeletePublishOutput(deploymentResult); } - [ConditionalFact] + [ConditionalFact(Skip = "https://github.com/aspnet/IISIntegration/issues/933")] public async Task AppOfflineDroppedWhileSiteFailedToStartInRequestHandler_SiteStops_InProcess() { var deploymentResult = await DeployApp(HostingModel.InProcess); diff --git a/tools/SetupTestEnvironment.ps1 b/tools/SetupTestEnvironment.ps1 index 6fabf1704b..cc9fbed394 100644 --- a/tools/SetupTestEnvironment.ps1 +++ b/tools/SetupTestEnvironment.ps1 @@ -3,7 +3,7 @@ param($Mode) function Setup-appverif($application) { appverif.exe -enable Exceptions Handles Heaps Leak Locks Memory Threadpool TLS SRWLock -for $application - $onlyLog = 0x181; + $onlyLog = 0x1E1; $codes = @( # Exceptions 0x650, @@ -62,8 +62,8 @@ if (!(Test-Path $cdb)) if ($Mode -eq "Setup") { - #Setup-appverif w3wp.exe - #Setup-appverif iisexpress.exe + Setup-appverif w3wp.exe + Setup-appverif iisexpress.exe if (!(Test-Path $ldHive )) { @@ -81,14 +81,15 @@ if ($Mode -eq "Shutdown") { Remove-Item $ldHive -Recurse -Force - #Shutdown-appverif w3wp.exe - #Shutdown-appverif iisexpress.exe + Shutdown-appverif w3wp.exe + Shutdown-appverif iisexpress.exe foreach ($dump in (Get-ChildItem -Path $DumpFolder -Filter "*.dmp")) { if (Test-Path $cdb) { & $cdb -z $dump.FullName -y "https://msdl.microsoft.com/download/symbols" -c ".loadby sos coreclr;!sym noisy;.reload /f;.dumpcab -a $($dump.FullName).cab;q;" + Remove-Item $dump.FullName } } } From b3893720b76f3120e3c7880ab6b6abf7676ae77b Mon Sep 17 00:00:00 2001 From: Sourabh Shirhatti Date: Thu, 23 Aug 2018 12:41:27 -0700 Subject: [PATCH 241/363] inproc property was changed in 2.2 (#1316) --- samples/NativeIISSample/NativeIISSample.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/NativeIISSample/NativeIISSample.csproj b/samples/NativeIISSample/NativeIISSample.csproj index cba368eafc..5fcf5c96a8 100644 --- a/samples/NativeIISSample/NativeIISSample.csproj +++ b/samples/NativeIISSample/NativeIISSample.csproj @@ -19,6 +19,6 @@ - inprocess + inprocess From 1d4d882c0d1f4fc48d5bc0a8f97a5f86ea1b0816 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 23 Aug 2018 13:44:30 -0700 Subject: [PATCH 242/363] Spelling mistake in debug log --- src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index c96133596d..223cb38ab4 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -159,7 +159,7 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( auto pwzArgs = std::unique_ptr(CommandLineToArgvW(applicationArguments.c_str(), &argc)); if (!pwzArgs) { - throw StartupParametersResolutionException(format(L"Unable parse command line argumens '%s' or '%s'", applicationArguments.c_str())); + throw StartupParametersResolutionException(format(L"Unable parse command line arguments '%s' or '%s'", applicationArguments.c_str())); } for (int intArgsProcessed = 0; intArgsProcessed < argc; intArgsProcessed++) From 9d5cbe1e3da50ba226568c1ae78a9b266b6745b5 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 23 Aug 2018 15:49:39 -0700 Subject: [PATCH 243/363] Remove Internal.Sdk reference from test projects (#1318) --- test/WebSites/Directory.Build.props | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 test/WebSites/Directory.Build.props diff --git a/test/WebSites/Directory.Build.props b/test/WebSites/Directory.Build.props new file mode 100644 index 0000000000..9b29d34f16 --- /dev/null +++ b/test/WebSites/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + + + From 5a97539ec52a0eb30a09b42d11b0a71efbb9c22a Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 24 Aug 2018 09:53:19 -0700 Subject: [PATCH 244/363] Update ANCM version to 13.0 (#1285) --- version.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.props b/version.props index 958113fee1..c71c500e63 100644 --- a/version.props +++ b/version.props @@ -8,8 +8,8 @@ a- $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) $(VersionSuffix)-$(BuildNumber) - 12 - 2 + 13 + 0 0 2.0.0 From 2cbf5bd84e8441c639692e5ae708298c69aeb3a0 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 24 Aug 2018 16:02:04 -0700 Subject: [PATCH 245/363] Query event logs when verifying event log messages. (#1323) --- .../AspNetCore/aspnetcoremodule.rc | 2 +- .../AspNetCore/aspnetcoremodule.rc | 2 +- src/AspNetCoreModuleV2/CommonLib/EventLog.cpp | 19 +++- .../CommonLib/debugutil.cpp | 86 +++++++++++++------ src/AspNetCoreModuleV2/CommonLib/debugutil.h | 9 ++ .../inprocessrequesthandler.rc | 2 +- .../outofprocessrequesthandler.rc | 2 +- .../Inprocess/EventLogTests.cs | 1 - .../Inprocess/LoggingTests.cs | 4 +- .../Utilities/EventLogHelpers.cs | 44 ++++++++++ 10 files changed, 134 insertions(+), 37 deletions(-) diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc b/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc index 7790f5067f..2e4ee7c0f9 100644 --- a/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc +++ b/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc @@ -10,7 +10,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#define FileDescription "IIS AspNetCore Module. Commit: " CommitHash +#define FileDescription "IIS ASP.NET Core Module. Commit: " CommitHash ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc b/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc index f9acf89035..9a110e2920 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc +++ b/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc @@ -10,7 +10,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#define FileDescription "IIS AspNetCore Module V2. Commit: " CommitHash +#define FileDescription "IIS ASP.NET Core Module V2. Commit: " CommitHash ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp b/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp index 24992232de..fe97805a39 100644 --- a/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp @@ -1,8 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. +#include #include "EventLog.h" #include "debugutil.h" +#include "StringHelpers.h" extern HANDLE g_hEventLog; @@ -13,6 +15,19 @@ EventLog::LogEvent( _In_ LPCWSTR pstrMsg ) { + // Static locals to avoid getting the process ID and string multiple times. + // Effectively have the same semantics as global variables, except initialized + // on first occurence. + static const auto processIdString = GetProcessIdString(); + static const auto versionInfoString = GetVersionInfoString(); + + std::array eventLogDataStrings + { + pstrMsg, + processIdString.c_str(), + versionInfoString.c_str() + }; + if (g_hEventLog != NULL) { ReportEventW(g_hEventLog, @@ -20,9 +35,9 @@ EventLog::LogEvent( 0, // wCategory dwEventId, NULL, // lpUserSid - 1, // wNumStrings + 3, // wNumStrings 0, // dwDataSize, - &pstrMsg, + eventLogDataStrings.data(), NULL // lpRawData ); } diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index 45e1d7ceab..3988d78796 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -13,6 +13,7 @@ #include "exceptions.h" #include "atlbase.h" #include "config_utility.h" +#include "StringHelpers.h" inline HANDLE g_logFile = INVALID_HANDLE_VALUE; inline HMODULE g_hModule; @@ -21,43 +22,72 @@ inline SRWLOCK g_logFileLock; HRESULT PrintDebugHeader() { - DWORD verHandle = 0; - UINT size = 0; - LPVOID lpBuffer = NULL; + // Major, minor are stored in dwFileVersionMS field and patch, build in dwFileVersionLS field as pair of 32 bit numbers + DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, "Initializing logs for %S. %S. %S.", + GetModuleName().c_str(), + GetProcessIdString().c_str(), + GetVersionInfoString().c_str() + ); - WCHAR path[MAX_PATH]; - RETURN_LAST_ERROR_IF(!GetModuleFileName(g_hModule, path, sizeof(path))); + return S_OK; +} - DWORD verSize = GetFileVersionInfoSize(path, &verHandle); - RETURN_LAST_ERROR_IF(verSize == 0); +std::wstring +GetProcessIdString() +{ + return format(L"Process Id: %u.", GetCurrentProcessId()); +} - // Allocate memory to hold data structure returned by GetFileVersionInfo - std::vector verData(verSize); - - RETURN_LAST_ERROR_IF(!GetFileVersionInfo(path, verHandle, verSize, verData.data())); - RETURN_LAST_ERROR_IF(!VerQueryValue(verData.data(), L"\\", &lpBuffer, &size)); - - auto verInfo = reinterpret_cast(lpBuffer); - // Check result signature - if (verInfo->dwSignature == VS_FFI_SIGNATURE) +std::wstring +GetVersionInfoString() +{ + auto func = [](std::wstring& res) { + DWORD verHandle = 0; + UINT size = 0; + LPVOID lpBuffer = NULL; + + auto path = GetModuleName(); + + DWORD verSize = GetFileVersionInfoSize(path.c_str(), &verHandle); + RETURN_LAST_ERROR_IF(verSize == 0); + + // Allocate memory to hold data structure returned by GetFileVersionInfo + std::vector verData(verSize); + + RETURN_LAST_ERROR_IF(!GetFileVersionInfo(path.c_str(), verHandle, verSize, verData.data())); + RETURN_LAST_ERROR_IF(!VerQueryValue(verData.data(), L"\\", &lpBuffer, &size)); + + auto verInfo = reinterpret_cast(lpBuffer); + if (verInfo->dwSignature != VS_FFI_SIGNATURE) + { + RETURN_IF_FAILED(E_FAIL); + } + LPVOID pvProductName = NULL; unsigned int iProductNameLen = 0; RETURN_LAST_ERROR_IF(!VerQueryValue(verData.data(), _T("\\StringFileInfo\\040904b0\\FileDescription"), &pvProductName, &iProductNameLen)); - // Major, minor are stored in dwFileVersionMS field and patch, build in dwFileVersionLS field as pair of 32 bit numbers - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, "Initializing logs for %S. ProcessId: %d. File Version: %d.%d.%d.%d. Description: %S", - path, - GetCurrentProcessId(), - ( verInfo->dwFileVersionMS >> 16 ) & 0xffff, - ( verInfo->dwFileVersionMS >> 0 ) & 0xffff, - ( verInfo->dwFileVersionLS >> 16 ) & 0xffff, - ( verInfo->dwFileVersionLS >> 0 ) & 0xffff, - pvProductName - ); - } + res = format(L"File Version: %d.%d.%d.%d. Description: %s", + (verInfo->dwFileVersionMS >> 16) & 0xffff, + (verInfo->dwFileVersionMS >> 0) & 0xffff, + (verInfo->dwFileVersionLS >> 16) & 0xffff, + (verInfo->dwFileVersionLS >> 0) & 0xffff, + pvProductName); + return S_OK; + }; - return S_OK; + std::wstring versionInfoString; + + return func(versionInfoString) == S_OK ? versionInfoString : L""; +} + +std::wstring +GetModuleName() +{ + WCHAR path[MAX_PATH]; + LOG_LAST_ERROR_IF(GetModuleFileName(g_hModule, path, sizeof(path))); + return path; } void SetDebugFlags(const std::wstring &debugValue) diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/AspNetCoreModuleV2/CommonLib/debugutil.h index b070794d0a..611d00d53d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.h +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.h @@ -49,3 +49,12 @@ DebugPrintf( LPCSTR szFormat, ... ); + +std::wstring +GetProcessIdString(); + +std::wstring +GetVersionInfoString(); + +std::wstring +GetModuleName(); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc index bf1e4d5191..2cddc56709 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc @@ -9,7 +9,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#define FileDescription "IIS ASP.NET Core Module Request Handler. Commit: " CommitHash +#define FileDescription "IIS ASP.NET Core Module V2 Request Handler. Commit: " CommitHash ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc index eb32a08eb7..654496a8c5 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc @@ -9,7 +9,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#define FileDescription "IIS ASP.NET Core Module Request Handler. Commit: " CommitHash +#define FileDescription "IIS ASP.NET Core Module V2 Request Handler. Commit: " CommitHash ///////////////////////////////////////////////////////////////////////////// // diff --git a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs index 77abc90190..296d99f789 100644 --- a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs +++ b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Testing.xunit; diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index 7ef360a487..e530befc51 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -200,8 +200,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var logContents = streamReader.ReadToEnd(); Assert.Contains("[aspnetcorev2.dll]", logContents); Assert.Contains("[aspnetcorev2_inprocess.dll]", logContents); - Assert.Contains("Description: IIS AspNetCore Module V2. Commit:", logContents); - Assert.Contains("Description: IIS ASP.NET Core Module Request Handler. Commit:", logContents); + Assert.Contains("Description: IIS ASP.NET Core Module V2. Commit:", logContents); + Assert.Contains("Description: IIS ASP.NET Core Module V2 Request Handler. Commit:", logContents); } } } diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index c4ca40436a..c85a78bdd3 100644 --- a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -1,17 +1,24 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; using System.Text; using System.Text.RegularExpressions; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.Logging.Testing; using Xunit; +using Xunit.Sdk; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class EventLogHelpers { private static readonly Regex EventLogRegex = new Regex("Event Log: (?.+?)End Event Log Message.", RegexOptions.Singleline | RegexOptions.Compiled); + public static void VerifyEventLogEvent(IISDeploymentResult deploymentResult, ITestSink testSink, string expectedRegexMatchString) { Assert.True(deploymentResult.HostProcess.HasExited); @@ -36,6 +43,43 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.True(count > 0, $"'{expectedRegexMatchString}' didn't match any event log messaged"); Assert.True(count < 2, $"'{expectedRegexMatchString}' matched more then one event log message"); + + var eventLog = new EventLog("Application"); + + // Perf: only get the last 20 events from the event log. + // Eventlog is already sorted based on time of event in ascending time. + // Add results in reverse order. + var expectedRegexEventLog = new Regex(expectedRegexMatchString); + var processIdString = $"Process Id: {deploymentResult.HostProcess.Id}."; + + for (var i = eventLog.Entries.Count - 1; i >= eventLog.Entries.Count - 20; i--) + { + var eventLogEntry = eventLog.Entries[i]; + if (eventLogEntry.ReplacementStrings == null || + eventLogEntry.ReplacementStrings.Length < 3) + { + continue; + } + + // ReplacementStings == EventData collection in EventLog + // This is unaffected if event providers are not registered correctly + if (eventLogEntry.Source == AncmVersionToMatch(deploymentResult) && + processIdString == eventLogEntry.ReplacementStrings[1] && + expectedRegex.IsMatch(eventLogEntry.ReplacementStrings[0])) + { + return; + } + } + + Assert.True(false, $"'{expectedRegexMatchString}' didn't match any event log messaged."); + } + + private static string AncmVersionToMatch(IISDeploymentResult deploymentResult) + { + return "IIS " + + (deploymentResult.DeploymentParameters.ServerType == ServerType.IISExpress ? "Express " : "") + + "AspNetCore Module" + + (deploymentResult.DeploymentParameters.AncmVersion == AncmVersion.AspNetCoreModuleV2 ? " V2" : ""); } } } From 6ddbfb64b92f49ca582668bd2e21b23b57b54fd7 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 24 Aug 2018 20:20:26 -0700 Subject: [PATCH 246/363] Improve configuration file handling logic (#1317) --- .../AspNetCore/AspNetCore.vcxproj | 4 +- .../AspNetCore/HandlerResolver.cpp | 29 ++++-- .../AspNetCore/HandlerResolver.h | 6 +- .../AspNetCore/PollingAppOfflineApplication.h | 2 +- .../AspNetCore/ShimOptions.cpp | 43 +++++++++ .../AspNetCore/ShimOptions.h | 65 +++++++++++++ .../AspNetCore/applicationinfo.h | 1 - .../AspNetCore/aspnetcore_shim_config.cpp | 80 ---------------- .../AspNetCore/aspnetcore_shim_config.h | 85 ----------------- .../CommonLib/CommonLib.vcxproj | 10 ++ .../CommonLib/ConfigurationLoadException.h | 20 ++++ .../CommonLib/ConfigurationSection.cpp | 57 +++++++++++ .../CommonLib/ConfigurationSection.h | 46 +++++++++ .../CommonLib/ConfigurationSource.cpp | 18 ++++ .../CommonLib/ConfigurationSource.h | 24 +++++ .../CommonLib/NonCopyable.h | 11 +++ .../CommonLib/StringHelpers.cpp | 5 + .../CommonLib/StringHelpers.h | 13 +++ .../WebConfigConfigurationSection.cpp | 81 ++++++++++++++++ .../CommonLib/WebConfigConfigurationSection.h | 25 +++++ .../WebConfigConfigurationSource.cpp | 20 ++++ .../CommonLib/WebConfigConfigurationSource.h | 23 +++++ .../CommonLib/application.h | 59 +++++++++++- .../CommonLib/aspnetcore_msg.mc | 2 +- src/AspNetCoreModuleV2/CommonLib/exceptions.h | 38 +++++++- src/AspNetCoreModuleV2/CommonLib/resources.h | 2 +- src/AspNetCoreModuleV2/IISLib/ahutil.h | 1 + .../InProcessOptions.cpp | 30 ++++++ .../InProcessOptions.h | 95 +++++++++++++++++++ .../InProcessRequestHandler.vcxproj | 2 + .../InProcessRequestHandler/dllmain.cpp | 20 +++- .../inprocessapplication.cpp | 48 ++++++---- .../inprocessapplication.h | 12 +-- .../managedexports.cpp | 10 +- .../AppOfflineTrackingApplication.h | 2 +- .../environmentvariablehash.h | 14 ++- .../Inprocess/EnvironmentVariableTests.cs | 4 +- .../Utilities/Helpers.cs | 6 ++ test/CommonLibTests/fakeclasses.h | 13 +-- .../inprocess_application_tests.cpp | 48 +++++++++- .../InProcess/StartupTests.cs | 42 ++++++++ 41 files changed, 877 insertions(+), 239 deletions(-) create mode 100644 src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp create mode 100644 src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h delete mode 100644 src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp delete mode 100644 src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/NonCopyable.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp create mode 100644 src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index b809cdeadc..d700f7ed1b 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -231,7 +231,7 @@ - + @@ -246,7 +246,7 @@ - + diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index 51b8cb611e..fbed8b09e9 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -12,6 +12,8 @@ #include "file_utility.h" #include "LoggingHelpers.h" #include "resources.h" +#include "ConfigurationLoadException.h" +#include "WebConfigConfigurationSource.h" const PCWSTR HandlerResolver::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; const PCWSTR HandlerResolver::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; @@ -25,7 +27,7 @@ HandlerResolver::HandlerResolver(HMODULE hModule, IHttpServer &pServer) } HRESULT -HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, ASPNETCORE_SHIM_CONFIG& pConfiguration, std::unique_ptr& pApplicationFactory) +HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, ShimOptions& pConfiguration, std::unique_ptr& pApplicationFactory) { HRESULT hr; PCWSTR pstrHandlerDllName; @@ -65,7 +67,7 @@ HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, ASPN RETURN_IF_FAILED(LoggingHelpers::CreateLoggingProvider( pConfiguration.QueryStdoutLogEnabled(), !m_pServer.IsCommandLineLaunch(), - pConfiguration.QueryStdoutLogFile()->QueryStr(), + pConfiguration.QueryStdoutLogFile().c_str(), pApplication.GetApplicationPhysicalPath(), outputManager)); @@ -129,20 +131,20 @@ HandlerResolver::GetApplicationFactory(IHttpApplication &pApplication, std::uniq { try { - ASPNETCORE_SHIM_CONFIG pConfiguration; - RETURN_IF_FAILED(pConfiguration.Populate(&m_pServer, &pApplication)); + const WebConfigConfigurationSource configurationSource(m_pServer.GetAdminManager(), pApplication); + ShimOptions options(configurationSource); SRWExclusiveLock lock(m_requestHandlerLoadLock); if (m_loadedApplicationHostingModel != HOSTING_UNKNOWN) { // Mixed hosting models - if (m_loadedApplicationHostingModel != pConfiguration.QueryHostingModel()) + if (m_loadedApplicationHostingModel != options.QueryHostingModel()) { EventLog::Error( ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR, ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG, pApplication.GetApplicationId(), - pConfiguration.QueryHostingModel()); + options.QueryHostingModel()); return E_FAIL; } @@ -158,11 +160,20 @@ HandlerResolver::GetApplicationFactory(IHttpApplication &pApplication, std::uniq } } - m_loadedApplicationHostingModel = pConfiguration.QueryHostingModel(); + m_loadedApplicationHostingModel = options.QueryHostingModel(); m_loadedApplicationId = pApplication.GetApplicationId(); - RETURN_IF_FAILED(LoadRequestHandlerAssembly(pApplication, pConfiguration, pApplicationFactory)); + RETURN_IF_FAILED(LoadRequestHandlerAssembly(pApplication, options, pApplicationFactory)); } + catch(ConfigurationLoadException &ex) + { + EventLog::Error( + ASPNETCORE_CONFIGURATION_LOAD_ERROR, + ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG, + ex.get_message().c_str()); + + RETURN_HR(E_FAIL); + } CATCH_RETURN(); return S_OK; @@ -178,7 +189,7 @@ void HandlerResolver::ResetHostingModel() HRESULT HandlerResolver::FindNativeAssemblyFromGlobalLocation( - ASPNETCORE_SHIM_CONFIG& pConfiguration, + ShimOptions& pConfiguration, PCWSTR pstrHandlerDllName, std::wstring& handlerDllPath ) diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h index 101b1ad2a0..be927693ab 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h @@ -2,10 +2,10 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #pragma once -#include "aspnetcore_shim_config.h" #include #include +#include "ShimOptions.h" #include "hostfxroptions.h" #include "HandleWrapper.h" #include "ApplicationFactory.h" @@ -18,8 +18,8 @@ public: void ResetHostingModel(); private: - HRESULT LoadRequestHandlerAssembly(IHttpApplication &pApplication, ASPNETCORE_SHIM_CONFIG& pConfiguration, std::unique_ptr& pApplicationFactory); - HRESULT FindNativeAssemblyFromGlobalLocation(ASPNETCORE_SHIM_CONFIG& pConfiguration, PCWSTR libraryName, std::wstring& handlerDllPath); + HRESULT LoadRequestHandlerAssembly(IHttpApplication &pApplication, ShimOptions& pConfiguration, std::unique_ptr& pApplicationFactory); + HRESULT FindNativeAssemblyFromGlobalLocation(ShimOptions& pConfiguration, PCWSTR libraryName, std::wstring& handlerDllPath); HRESULT FindNativeAssemblyFromHostfxr(HOSTFXR_OPTIONS& hostfxrOptions, PCWSTR libraryName, std::wstring& handlerDllPath); HMODULE m_hModule; diff --git a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h index e7ec367c17..193a63e639 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h +++ b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h @@ -15,7 +15,7 @@ class PollingAppOfflineApplication: public APPLICATION { public: PollingAppOfflineApplication(IHttpApplication& pApplication, PollingAppOfflineApplicationMode mode) - : + : APPLICATION(pApplication), m_ulLastCheckTime(0), m_appOfflineLocation(GetAppOfflineLocation(pApplication)), m_fAppOfflineFound(false), diff --git a/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp b/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp new file mode 100644 index 0000000000..3ba1db7889 --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp @@ -0,0 +1,43 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "ShimOptions.h" + +#include "StringHelpers.h" +#include "ConfigurationLoadException.h" + +#define CS_ASPNETCORE_HANDLER_VERSION L"handlerVersion" + +ShimOptions::ShimOptions(const ConfigurationSource &configurationSource) : + m_hostingModel(HOSTING_UNKNOWN), + m_fStdoutLogEnabled(false) +{ + auto const section = configurationSource.GetRequiredSection(CS_ASPNETCORE_SECTION); + auto hostingModel = section->GetString(CS_ASPNETCORE_HOSTING_MODEL).value_or(L""); + + if (hostingModel.empty() || equals_ignore_case(hostingModel, CS_ASPNETCORE_HOSTING_MODEL_OUTOFPROCESS)) + { + m_hostingModel = HOSTING_OUT_PROCESS; + } + else if (equals_ignore_case(hostingModel, CS_ASPNETCORE_HOSTING_MODEL_INPROCESS)) + { + m_hostingModel = HOSTING_IN_PROCESS; + } + else + { + throw ConfigurationLoadException(format( + L"Unknown hosting model '%s'. Please specify either hostingModel=\"inprocess\" " + "or hostingModel=\"outofprocess\" in the web.config file.", hostingModel.c_str())); + } + + if (m_hostingModel == HOSTING_OUT_PROCESS) + { + const auto handlerSettings = section->GetKeyValuePairs(CS_ASPNETCORE_HANDLER_SETTINGS); + m_strHandlerVersion = find_element(handlerSettings, CS_ASPNETCORE_HANDLER_VERSION).value_or(std::wstring()); + } + + m_strProcessPath = section->GetRequiredString(CS_ASPNETCORE_PROCESS_EXE_PATH); + m_strArguments = section->GetString(CS_ASPNETCORE_PROCESS_ARGUMENTS).value_or(CS_ASPNETCORE_PROCESS_ARGUMENTS_DEFAULT); + m_fStdoutLogEnabled = section->GetRequiredBool(CS_ASPNETCORE_STDOUT_LOG_ENABLED); + m_struStdoutLogFile = section->GetRequiredString(CS_ASPNETCORE_STDOUT_LOG_FILE); +} diff --git a/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h b/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h new file mode 100644 index 0000000000..f987e864ba --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h @@ -0,0 +1,65 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include +#include "ConfigurationSource.h" +#include "exceptions.h" + +enum APP_HOSTING_MODEL +{ + HOSTING_UNKNOWN = 0, + HOSTING_IN_PROCESS, + HOSTING_OUT_PROCESS +}; + +class ShimOptions: NonCopyable +{ +public: + const std::wstring& + QueryProcessPath() const + { + return m_strProcessPath; + } + + const std::wstring& + QueryArguments() const + { + return m_strArguments; + } + + APP_HOSTING_MODEL + QueryHostingModel() const + { + return m_hostingModel; + } + + const std::wstring& + QueryHandlerVersion() const + { + return m_strHandlerVersion; + } + + BOOL + QueryStdoutLogEnabled() const + { + return m_fStdoutLogEnabled; + } + + const std::wstring& + QueryStdoutLogFile() const + { + return m_struStdoutLogFile; + } + + ShimOptions(const ConfigurationSource &configurationSource); + +private: + std::wstring m_strArguments; + std::wstring m_strProcessPath; + APP_HOSTING_MODEL m_hostingModel; + std::wstring m_strHandlerVersion; + std::wstring m_struStdoutLogFile; + bool m_fStdoutLogEnabled; +}; diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h index 90f9fe8df9..94f2718e08 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h @@ -4,7 +4,6 @@ #pragma once #include "hostfxroptions.h" -#include "aspnetcore_shim_config.h" #include "iapplication.h" #include "SRWSharedLock.h" #include "HandlerResolver.h" diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp deleted file mode 100644 index f994fcc06d..0000000000 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#include "aspnetcore_shim_config.h" - -#include "EventLog.h" -#include "config_utility.h" -#include "ahutil.h" - -HRESULT -ASPNETCORE_SHIM_CONFIG::Populate( - IHttpServer *pHttpServer, - IHttpApplication *pHttpApplication -) -{ - STACK_STRU(strHostingModel, 12); - CComPtr pAspNetCoreElement; - - IAppHostAdminManager *pAdminManager = pHttpServer->GetAdminManager(); - const CComBSTR bstrAspNetCoreSection = CS_ASPNETCORE_SECTION; - const CComBSTR applicationConfigPath = pHttpApplication->GetAppConfigPath(); - - RETURN_IF_FAILED(pAdminManager->GetAdminSection(bstrAspNetCoreSection, - applicationConfigPath, - &pAspNetCoreElement)); - - CComBSTR struProcessPath; - RETURN_IF_FAILED(GetElementStringProperty(pAspNetCoreElement, - CS_ASPNETCORE_PROCESS_EXE_PATH, - &struProcessPath)); - m_strProcessPath = struProcessPath; - - // Swallow this error for backward compatibility - // Use default behavior for empty string - GetElementStringProperty(pAspNetCoreElement, - CS_ASPNETCORE_HOSTING_MODEL, - &strHostingModel); - - if (strHostingModel.IsEmpty() || strHostingModel.Equals(L"outofprocess", TRUE)) - { - m_hostingModel = HOSTING_OUT_PROCESS; - } - else if (strHostingModel.Equals(L"inprocess", TRUE)) - { - m_hostingModel = HOSTING_IN_PROCESS; - } - else - { - // block unknown hosting value - EventLog::Error( - ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR, - ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR_MSG, - strHostingModel.QueryStr()); - RETURN_HR(HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED)); - } - - CComBSTR struArguments; - RETURN_IF_FAILED(GetElementStringProperty(pAspNetCoreElement, - CS_ASPNETCORE_PROCESS_ARGUMENTS, - &struArguments)); - - m_strArguments = struArguments; - - if (m_hostingModel == HOSTING_OUT_PROCESS) - { - STRU struHandlerVersion; - RETURN_IF_FAILED(ConfigUtility::FindHandlerVersion(pAspNetCoreElement, struHandlerVersion)); - m_strHandlerVersion = struHandlerVersion.QueryStr(); - } - - - RETURN_IF_FAILED(GetElementBoolProperty(pAspNetCoreElement, - CS_ASPNETCORE_STDOUT_LOG_ENABLED, - &m_fStdoutLogEnabled)); - RETURN_IF_FAILED(GetElementStringProperty(pAspNetCoreElement, - CS_ASPNETCORE_STDOUT_LOG_FILE, - &m_struStdoutLogFile)); - - return S_OK; -} diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h b/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h deleted file mode 100644 index c380433e72..0000000000 --- a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_shim_config.h +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#pragma once - -#include -#include -#include - -#define CS_ASPNETCORE_SECTION L"system.webServer/aspNetCore" -#define CS_ASPNETCORE_PROCESS_EXE_PATH L"processPath" -#define CS_ASPNETCORE_PROCESS_ARGUMENTS L"arguments" -#define CS_ASPNETCORE_HOSTING_MODEL L"hostingModel" -#define CS_ASPNETCORE_STDOUT_LOG_ENABLED L"stdoutLogEnabled" -#define CS_ASPNETCORE_STDOUT_LOG_FILE L"stdoutLogFile" - -enum APP_HOSTING_MODEL -{ - HOSTING_UNKNOWN = 0, - HOSTING_IN_PROCESS, - HOSTING_OUT_PROCESS -}; - -class ASPNETCORE_SHIM_CONFIG -{ -public: - virtual - ~ASPNETCORE_SHIM_CONFIG() = default; - - HRESULT - Populate( - IHttpServer *pHttpServer, - IHttpApplication *pHttpApplication - ); - - std::wstring& - QueryProcessPath() - { - return m_strProcessPath; - } - - std::wstring& - QueryArguments() - { - return m_strArguments; - } - - APP_HOSTING_MODEL - QueryHostingModel() - { - return m_hostingModel; - } - - std::wstring& - QueryHandlerVersion() - { - return m_strHandlerVersion; - } - - BOOL - QueryStdoutLogEnabled() - { - return m_fStdoutLogEnabled; - } - - STRU* - QueryStdoutLogFile() - { - return &m_struStdoutLogFile; - } - - ASPNETCORE_SHIM_CONFIG() : - m_hostingModel(HOSTING_UNKNOWN) - { - } - -private: - - std::wstring m_strArguments; - std::wstring m_strProcessPath; - APP_HOSTING_MODEL m_hostingModel; - std::wstring m_strHandlerVersion; - BOOL m_fStdoutLogEnabled; - STRU m_struStdoutLogFile; -}; diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 84b7f360cc..ef9f1c1986 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -195,6 +195,9 @@ + + + @@ -211,6 +214,7 @@ + @@ -221,8 +225,12 @@ + + + + @@ -245,6 +253,8 @@ Create + + diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h b/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h new file mode 100644 index 0000000000..0aade37061 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include + +class ConfigurationLoadException: public std::runtime_error +{ + public: + ConfigurationLoadException(std::wstring msg) + : runtime_error("Configuration load exception has occured"), message(std::move(msg)) + { + } + + std::wstring get_message() const { return message; } + + private: + std::wstring message; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp b/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp new file mode 100644 index 0000000000..77c3319dd1 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp @@ -0,0 +1,57 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "ConfigurationSection.h" + +#include "StringHelpers.h" +#include "ConfigurationLoadException.h" + +std::wstring ConfigurationSection::GetRequiredString(const std::wstring& name) const +{ + auto result = GetString(name); + if (!result.has_value() || result.value().empty()) + { + ThrowRequiredException(name); + } + return result.value(); +} + +bool ConfigurationSection::GetRequiredBool(const std::wstring& name) const +{ + auto result = GetBool(name); + if (!result.has_value()) + { + ThrowRequiredException(name); + } + return result.value(); +} + +DWORD ConfigurationSection::GetRequiredTimespan(const std::wstring& name) const +{ + auto result = GetTimespan(name); + if (!result.has_value()) + { + ThrowRequiredException(name); + } + return result.value(); +} + +void ConfigurationSection::ThrowRequiredException(const std::wstring& name) +{ + throw ConfigurationLoadException(format(L"Attribute '%s' is required.", name.c_str())); +} + +std::optional find_element(const std::vector>& pairs, const std::wstring& name) +{ + const auto iter = std::find_if( + pairs.begin(), + pairs.end(), + [&](const std::pair& pair) { return equals_ignore_case(pair.first, name); }); + + if (iter == pairs.end()) + { + return std::nullopt; + } + + return std::make_optional(iter->second); +} diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h b/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h new file mode 100644 index 0000000000..163f50f8e5 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h @@ -0,0 +1,46 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include +#include +#include + +#include "NonCopyable.h" + +#define CS_ASPNETCORE_COLLECTION_ITEM_NAME L"name" +#define CS_ASPNETCORE_COLLECTION_ITEM_VALUE L"value" +#define CS_ASPNETCORE_ENVIRONMENT_VARIABLES L"environmentVariables" +#define CS_ASPNETCORE_STDOUT_LOG_FILE L"stdoutLogFile" +#define CS_ASPNETCORE_STDOUT_LOG_ENABLED L"stdoutLogEnabled" +#define CS_ASPNETCORE_PROCESS_EXE_PATH L"processPath" +#define CS_ASPNETCORE_PROCESS_ARGUMENTS L"arguments" +#define CS_ASPNETCORE_PROCESS_ARGUMENTS_DEFAULT L"" +#define CS_ASPNETCORE_HOSTING_MODEL_OUTOFPROCESS L"outofprocess" +#define CS_ASPNETCORE_HOSTING_MODEL_INPROCESS L"inprocess" +#define CS_ASPNETCORE_HOSTING_MODEL L"hostingModel" +#define CS_ASPNETCORE_HANDLER_SETTINGS L"handlerSettings" +#define CS_ASPNETCORE_DISABLE_START_UP_ERROR_PAGE L"disableStartUpErrorPage" +#define CS_ENABLED L"enabled" + +class ConfigurationSection: NonCopyable +{ +public: + ConfigurationSection() = default; + virtual ~ConfigurationSection() = default; + virtual std::optional GetString(const std::wstring& name) const = 0; + virtual std::optional GetBool(const std::wstring& name) const = 0; + virtual std::optional GetTimespan(const std::wstring& name) const = 0; + + std::wstring GetRequiredString(const std::wstring& name) const; + bool GetRequiredBool(const std::wstring& name) const; + DWORD GetRequiredTimespan(const std::wstring& name) const; + + virtual std::vector> GetKeyValuePairs(const std::wstring& name) const = 0; + +protected: + static void ThrowRequiredException(const std::wstring& name); +}; + +std::optional find_element(const std::vector>& pairs, const std::wstring& name); diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp b/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp new file mode 100644 index 0000000000..558d054659 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp @@ -0,0 +1,18 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "ConfigurationSource.h" + +#include "StringHelpers.h" +#include "ConfigurationLoadException.h" + +std::shared_ptr ConfigurationSource::GetRequiredSection(const std::wstring& name) const +{ + auto section = GetSection(name); + if (!section) + { + throw ConfigurationLoadException(format(L"Unable to get required configuration section '%s'. Possible reason is web.config authoring error.", name.c_str())); + } + return section; +} + diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h b/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h new file mode 100644 index 0000000000..53ab5a5218 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h @@ -0,0 +1,24 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include +#include +#include +#include "NonCopyable.h" +#include "ConfigurationSection.h" + +#define CS_ASPNETCORE_SECTION L"system.webServer/aspNetCore" +#define CS_WINDOWS_AUTHENTICATION_SECTION L"system.webServer/security/authentication/windowsAuthentication" +#define CS_BASIC_AUTHENTICATION_SECTION L"system.webServer/security/authentication/basicAuthentication" +#define CS_ANONYMOUS_AUTHENTICATION_SECTION L"system.webServer/security/authentication/anonymousAuthentication" + +class ConfigurationSource: NonCopyable +{ +public: + ConfigurationSource() = default; + virtual ~ConfigurationSource() = default; + virtual std::shared_ptr GetSection(const std::wstring& name) const = 0; + std::shared_ptr GetRequiredSection(const std::wstring& name) const; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h b/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h new file mode 100644 index 0000000000..8dcb282411 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h @@ -0,0 +1,11 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +class NonCopyable { +public: + NonCopyable() = default; + NonCopyable(const NonCopyable&) = default; + NonCopyable& operator=(const NonCopyable&) = default; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp index 8e574677cd..5e251f69ed 100644 --- a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp @@ -13,3 +13,8 @@ bool ends_with(const std::wstring &source, const std::wstring &suffix, bool igno const auto offset = source.length() - suffix.length(); return CSTR_EQUAL == CompareStringOrdinal(source.c_str() + offset, static_cast(suffix.length()), suffix.c_str(), static_cast(suffix.length()), ignoreCase); } + +bool equals_ignore_case(const std::wstring& s1, const std::wstring& s2) +{ + return CSTR_EQUAL == CompareStringOrdinal(s1.c_str(), static_cast(s1.length()), s2.c_str(), static_cast(s2.length()), true); +} diff --git a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h index 4999bec7a7..957f5bc3d6 100644 --- a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h +++ b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h @@ -8,6 +8,9 @@ [[nodiscard]] bool ends_with(const std::wstring &source, const std::wstring &suffix, bool ignoreCase = false); +[[nodiscard]] +bool equals_ignore_case(const std::wstring& s1, const std::wstring& s2); + template [[nodiscard]] std::wstring format(const std::wstring& format, Args ... args) @@ -18,3 +21,13 @@ std::wstring format(const std::wstring& format, Args ... args) return std::wstring(formattedBuffer.get(), formattedBuffer.get() + size - 1); } +template +[[nodiscard]] +std::string format(const std::string& format, Args ... args) +{ + const size_t size = snprintf(nullptr, 0, format.c_str(), args ...) + 1; // Extra char for '\0' + std::unique_ptr formattedBuffer(new char[size]); + snprintf(formattedBuffer.get(), size, format.c_str(), args ... ); + return std::string(formattedBuffer.get(), formattedBuffer.get() + size - 1); +} + diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp new file mode 100644 index 0000000000..aa2495359b --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp @@ -0,0 +1,81 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "WebConfigConfigurationSection.h" + +#include "exceptions.h" +#include "ahutil.h" + +std::optional WebConfigConfigurationSection::GetString(const std::wstring& name) const +{ + CComBSTR result; + if (FAILED_LOG(GetElementStringProperty(m_element, name.c_str(), &result.m_str))) + { + return std::nullopt; + } + + return std::make_optional(std::wstring(result)); +} + +std::optional WebConfigConfigurationSection::GetBool(const std::wstring& name) const +{ + bool result; + if (FAILED_LOG(GetElementBoolProperty(m_element, name.c_str(), &result))) + { + return std::nullopt; + } + + return std::make_optional(result); +} + +std::optional WebConfigConfigurationSection::GetTimespan(const std::wstring& name) const +{ + ULONGLONG result; + if (FAILED_LOG(GetElementRawTimeSpanProperty(m_element, name.c_str(), &result))) + { + return std::nullopt; + } + + return std::make_optional(static_cast(result / 10000ull)); +} + +std::vector> WebConfigConfigurationSection::GetKeyValuePairs(const std::wstring& name) const +{ + std::vector> pairs; + HRESULT findElementResult; + CComPtr element = nullptr; + CComPtr elementCollection = nullptr; + CComPtr collectionEntry = nullptr; + ENUM_INDEX index{}; + + if (FAILED_LOG(GetElementChildByName(m_element, name.c_str(), &element))) + { + return pairs; + } + + THROW_IF_FAILED(element->get_Collection(&elementCollection)); + THROW_IF_FAILED(findElementResult = FindFirstElement(elementCollection, &index, &collectionEntry)); + + while (findElementResult != S_FALSE) + { + CComBSTR strHandlerName; + if (LOG_IF_FAILED(GetElementStringProperty(collectionEntry, CS_ASPNETCORE_COLLECTION_ITEM_NAME, &strHandlerName.m_str))) + { + ThrowRequiredException(CS_ASPNETCORE_COLLECTION_ITEM_NAME); + } + + CComBSTR strHandlerValue; + if (LOG_IF_FAILED(GetElementStringProperty(collectionEntry, CS_ASPNETCORE_COLLECTION_ITEM_VALUE, &strHandlerValue.m_str))) + { + ThrowRequiredException(CS_ASPNETCORE_COLLECTION_ITEM_VALUE); + } + + pairs.emplace_back(strHandlerName, strHandlerValue); + + collectionEntry.Release(); + + THROW_IF_FAILED(findElementResult = FindNextElement(elementCollection, &index, &collectionEntry)); + } + + return pairs; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h new file mode 100644 index 0000000000..c2f87a9cfe --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h @@ -0,0 +1,25 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include +#include +#include "ConfigurationSection.h" + +class WebConfigConfigurationSection: public ConfigurationSection +{ +public: + WebConfigConfigurationSection(IAppHostElement* pElement) + : m_element(pElement) + { + } + + std::optional GetString(const std::wstring& name) const override; + std::optional GetBool(const std::wstring& name) const override; + std::optional GetTimespan(const std::wstring& name) const override; + std::vector> GetKeyValuePairs(const std::wstring& name) const override; + +private: + CComPtr m_element; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp new file mode 100644 index 0000000000..c433913ec7 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "WebConfigConfigurationSource.h" + +#include "exceptions.h" +#include "WebConfigConfigurationSection.h" + +std::shared_ptr WebConfigConfigurationSource::GetSection(const std::wstring& name) const +{ + const CComBSTR bstrAspNetCoreSection = name.c_str(); + const CComBSTR applicationConfigPath = m_application.GetAppConfigPath(); + + IAppHostElement* sectionElement; + if (LOG_IF_FAILED(m_manager->GetAdminSection(bstrAspNetCoreSection, applicationConfigPath, §ionElement))) + { + return nullptr; + } + return std::make_unique(sectionElement); +} diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h new file mode 100644 index 0000000000..ce8dbcdc50 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h @@ -0,0 +1,23 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +#include +#include "ConfigurationSection.h" +#include "ConfigurationSource.h" + +class WebConfigConfigurationSource: public ConfigurationSource +{ +public: + WebConfigConfigurationSource(IAppHostAdminManager *pAdminManager, IHttpApplication &pHttpApplication) + : m_manager(pAdminManager), + m_application(pHttpApplication) + { + } + + std::shared_ptr GetSection(const std::wstring& name) const override; + +private: + CComPtr m_manager; + IHttpApplication &m_application; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index 9c02484b1a..5e87e4ddf8 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -3,6 +3,7 @@ #pragma once +#include #include "iapplication.h" #include "ntassert.h" #include "SRWExclusiveLock.h" @@ -20,11 +21,15 @@ public: return m_fStopCalled ? APPLICATION_STATUS::RECYCLED : APPLICATION_STATUS::RUNNING; } - APPLICATION() + APPLICATION(const IHttpApplication& pHttpApplication) : m_fStopCalled(false), - m_cRefs(1) + m_cRefs(1), + m_applicationPhysicalPath(pHttpApplication.GetApplicationPhysicalPath()), + m_applicationConfigPath(pHttpApplication.GetAppConfigPath()), + m_applicationId(pHttpApplication.GetApplicationId()) { InitializeSRWLock(&m_stateLock); + m_applicationVirtualPath = ToVirtualPath(m_applicationConfigPath); } @@ -69,10 +74,58 @@ public: } } + const std::wstring& + QueryApplicationId() const + { + return m_applicationId; + } + + const std::wstring& + QueryApplicationPhysicalPath() const + { + return m_applicationPhysicalPath; + } + + const std::wstring& + QueryApplicationVirtualPath() const + { + return m_applicationVirtualPath; + } + + const std::wstring& + QueryConfigPath() const + { + return m_applicationConfigPath; + } + protected: - SRWLOCK m_stateLock; + SRWLOCK m_stateLock {}; bool m_fStopCalled; private: mutable LONG m_cRefs; + + std::wstring m_applicationPhysicalPath; + std::wstring m_applicationVirtualPath; + std::wstring m_applicationConfigPath; + std::wstring m_applicationId; + + static std::wstring ToVirtualPath(const std::wstring& configurationPath) + { + auto segments = 0; + auto position = configurationPath.find('/'); + // Skip first 4 segments of config path + while (segments != 3 && position != std::wstring::npos) + { + segments++; + position = configurationPath.find('/', position + 1); + } + + if (position != std::wstring::npos) + { + return configurationPath.substr(position); + } + + return L"/"; + } }; diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc index f0e3d66de3..7289b85ce6 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc +++ b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc @@ -190,7 +190,7 @@ Language=English . Messageid=1034 -SymbolicName=ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR +SymbolicName=ASPNETCORE_CONFIGURATION_LOAD_ERROR Language=English %1 . diff --git a/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/AspNetCoreModuleV2/CommonLib/exceptions.h index 31873bc743..8d9a50ded3 100644 --- a/src/AspNetCoreModuleV2/CommonLib/exceptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/exceptions.h @@ -6,6 +6,7 @@ #include #include "debugutil.h" +#include "StringHelpers.h" #define LOCATION_INFO_ENABLED TRUE @@ -26,10 +27,11 @@ #endif #define OBSERVE_CAUGHT_EXCEPTION() CaughtExceptionHResult(LOCATION_INFO); +#define RETURN_CAUGHT_EXCEPTION() return CaughtExceptionHResult(LOCATION_INFO); + #define RETURN_HR(hr) do { HRESULT __hrRet = hr; if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); } return __hrRet; } while (0, 0) #define RETURN_LAST_ERROR() do { return LogLastError(LOCATION_INFO); } while (0, 0) #define RETURN_IF_FAILED(hr) do { HRESULT __hrRet = hr; if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); return __hrRet; }} while (0, 0) -#define RETURN_CAUGHT_EXCEPTION() return CaughtExceptionHResult(LOCATION_INFO); #define RETURN_LAST_ERROR_IF(condition) do { if (condition) { return LogLastError(LOCATION_INFO); }} while (0, 0) #define RETURN_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { return LogLastError(LOCATION_INFO); }} while (0, 0) @@ -39,6 +41,11 @@ #define FINISHED_LAST_ERROR_IF(condition) do { if (condition) { hr = LogLastError(LOCATION_INFO); goto Finished; }} while (0, 0) #define FINISHED_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { hr = LogLastError(LOCATION_INFO); goto Finished; }} while (0, 0) +#define THROW_LAST_ERROR() do { ThrowResultException(LogLastError(LOCATION_INFO)); } while (0, 0) +#define THROW_IF_FAILED(hr) do { HRESULT __hrRet = hr; if (FAILED(__hrRet)) { ThrowResultException(LOCATION_INFO, __hrRet); }} while (0, 0) +#define THROW_LAST_ERROR_IF(condition) do { if (condition) { ThrowResultException(LogLastError(LOCATION_INFO)); }} while (0, 0) +#define THROW_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { ThrowResultException(LogLastError(LOCATION_INFO)); }} while (0, 0) + #define THROW_IF_NULL_ALLOC(ptr) Throw_IfNullAlloc(ptr) #define CATCH_RETURN() catch (...) { RETURN_CAUGHT_EXCEPTION(); } @@ -48,6 +55,22 @@ #define SUCCEEDED_LOG(hr) SUCCEEDED(LOG_IF_FAILED(hr)) #define FAILED_LOG(hr) FAILED(LOG_IF_FAILED(hr)) + +class ResultException: public std::runtime_error +{ +public: + explicit ResultException(HRESULT hr, LOCATION_ARGUMENTS_ONLY) : + runtime_error(format("HRESULT 0x%x returned at " LOCATION_FORMAT, hr, LOCATION_CALL_ONLY)), + m_hr(hr) + { + } + + HRESULT GetResult() const { return m_hr; } + +private: + HRESULT m_hr; +}; + __declspec(noinline) inline VOID ReportUntypedException(LOCATION_ARGUMENTS_ONLY) { DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, LOCATION_FORMAT "Unhandled non-standard exception", LOCATION_CALL_ONLY); @@ -75,7 +98,7 @@ __declspec(noinline) inline VOID ReportException(LOCATION_ARGUMENTS std::exception& exception) { - DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, "Exception : %s caught at" LOCATION_FORMAT, exception.what(), LOCATION_CALL_ONLY); + DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, "Exception '%s' caught at " LOCATION_FORMAT, exception.what(), LOCATION_CALL_ONLY); } __declspec(noinline) inline HRESULT LogHResultFailed(LOCATION_ARGUMENTS HRESULT hr) @@ -97,10 +120,10 @@ __declspec(noinline) inline HRESULT CaughtExceptionHResult(LOCATION_ARGUMENTS_ON { return E_OUTOFMEMORY; } - catch (std::system_error& exception) + catch (ResultException& exception) { ReportException(LOCATION_CALL exception); - return exception.code().value(); + return exception.GetResult(); } catch (std::exception& exception) { @@ -114,6 +137,13 @@ __declspec(noinline) inline HRESULT CaughtExceptionHResult(LOCATION_ARGUMENTS_ON } } +[[noreturn]] + __declspec(noinline) inline void ThrowResultException(LOCATION_ARGUMENTS HRESULT hr) +{ + DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, "Throwing ResultException for HRESULT 0x%x at " LOCATION_FORMAT, hr, LOCATION_CALL_ONLY); + throw ResultException(hr, LOCATION_CALL_ONLY); +} + template auto Throw_IfNullAlloc(PointerT pointer) { if (pointer == nullptr) diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index b2ea6f5b85..c9cca2b8b6 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -28,7 +28,7 @@ #define ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL_MSG L"Application '%s' has shutdown." #define ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG L"Only one inprocess application is allowed per IIS application pool. Please assign the application '%s' to a different IIS application pool." #define ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG L"Mixed hosting model is not supported. Application '%s' configured with different hostingModel value '%d' other than the one of running application(s)." -#define ASPNETCORE_EVENT_UNKNOWN_HOSTING_MODEL_ERROR_MSG L"Unknown hosting model '%s'. Please specify either hostingModel=\"inprocess\" or hostingModel=\"outofprocess\" in the web.config file." +#define ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG L"Configuration load error. %s" #define ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG L"Failed to start application '%s', ErrorCode '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x'. Last 4KB characters of captured stdout and stderr logs:\r\n%s" #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x'. Please check the stderr logs for more information." diff --git a/src/AspNetCoreModuleV2/IISLib/ahutil.h b/src/AspNetCoreModuleV2/IISLib/ahutil.h index 3632650aa4..d17dc7be30 100644 --- a/src/AspNetCoreModuleV2/IISLib/ahutil.h +++ b/src/AspNetCoreModuleV2/IISLib/ahutil.h @@ -2,6 +2,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #pragma once +#include "stringu.h" #include HRESULT diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp new file mode 100644 index 0000000000..6b26b3dcc9 --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp @@ -0,0 +1,30 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "InProcessOptions.h" + +InProcessOptions::InProcessOptions(const ConfigurationSource &configurationSource) : + m_fStdoutLogEnabled(false), + m_fWindowsAuthEnabled(false), + m_fBasicAuthEnabled(false), + m_fAnonymousAuthEnabled(false), + m_dwStartupTimeLimitInMS(INFINITE), + m_dwShutdownTimeLimitInMS(INFINITE) +{ + auto const aspNetCoreSection = configurationSource.GetRequiredSection(CS_ASPNETCORE_SECTION); + m_strArguments = aspNetCoreSection->GetString(CS_ASPNETCORE_PROCESS_ARGUMENTS).value_or(CS_ASPNETCORE_PROCESS_ARGUMENTS_DEFAULT); + m_strProcessPath = aspNetCoreSection->GetRequiredString(CS_ASPNETCORE_PROCESS_EXE_PATH); + m_fStdoutLogEnabled = aspNetCoreSection->GetRequiredBool(CS_ASPNETCORE_STDOUT_LOG_ENABLED); + m_struStdoutLogFile = aspNetCoreSection->GetRequiredString(CS_ASPNETCORE_STDOUT_LOG_FILE); + m_fDisableStartUpErrorPage = aspNetCoreSection->GetRequiredBool(CS_ASPNETCORE_DISABLE_START_UP_ERROR_PAGE); + m_environmentVariables = aspNetCoreSection->GetKeyValuePairs(CS_ASPNETCORE_ENVIRONMENT_VARIABLES); + + const auto basicAuthSection = configurationSource.GetSection(CS_BASIC_AUTHENTICATION_SECTION); + m_fBasicAuthEnabled = basicAuthSection && basicAuthSection->GetBool(CS_ENABLED).value_or(false); + + const auto windowsAuthSection = configurationSource.GetSection(CS_WINDOWS_AUTHENTICATION_SECTION); + m_fWindowsAuthEnabled = windowsAuthSection && windowsAuthSection->GetBool(CS_ENABLED).value_or(false); + + const auto anonAuthSection = configurationSource.GetSection(CS_ANONYMOUS_AUTHENTICATION_SECTION); + m_fAnonymousAuthEnabled = anonAuthSection && anonAuthSection->GetBool(CS_ENABLED).value_or(false); +} diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h new file mode 100644 index 0000000000..c0509b3003 --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h @@ -0,0 +1,95 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include +#include "ConfigurationSource.h" + +class InProcessOptions: NonCopyable +{ +public: + const std::wstring& + QueryProcessPath() const + { + return m_strProcessPath; + } + + const std::wstring& + QueryArguments() const + { + return m_strArguments; + } + + bool + QueryStdoutLogEnabled() const + { + return m_fStdoutLogEnabled; + } + + const std::wstring& + QueryStdoutLogFile() const + { + return m_struStdoutLogFile; + } + + bool + QueryDisableStartUpErrorPage() const + { + return m_fDisableStartUpErrorPage; + } + + bool + QueryWindowsAuthEnabled() const + { + return m_fWindowsAuthEnabled; + } + + bool + QueryBasicAuthEnabled() const + { + return m_fBasicAuthEnabled; + } + + bool + QueryAnonymousAuthEnabled() const + { + return m_fAnonymousAuthEnabled; + } + + DWORD + QueryStartupTimeLimitInMS() const + { + return m_dwStartupTimeLimitInMS; + } + + DWORD + QueryShutdownTimeLimitInMS() const + { + return m_dwShutdownTimeLimitInMS; + } + + const std::vector>& + QueryEnvironmentVariables() const + { + return m_environmentVariables; + } + + InProcessOptions(const ConfigurationSource &configurationSource); + +private: + std::wstring m_strArguments; + std::wstring m_strProcessPath; + std::wstring m_struStdoutLogFile; + bool m_fStdoutLogEnabled; + bool m_fDisableStartUpErrorPage; + bool m_fWindowsAuthEnabled; + bool m_fBasicAuthEnabled; + bool m_fAnonymousAuthEnabled; + DWORD m_dwStartupTimeLimitInMS; + DWORD m_dwShutdownTimeLimitInMS; + std::vector> m_environmentVariables; + +protected: + InProcessOptions() = default; +}; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 08e3b32bd3..f295280e4e 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -228,6 +228,7 @@ + @@ -238,6 +239,7 @@ + Create diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp index 2a0369206b..90779ce6d8 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp @@ -13,6 +13,10 @@ #include "resources.h" #include "exceptions.h" #include "ShuttingDownApplication.h" +#include "InProcessOptions.h" +#include "EventLog.h" +#include "WebConfigConfigurationSource.h" +#include "ConfigurationLoadException.h" DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_inprocess.dll"); @@ -106,13 +110,12 @@ CreateApplication( return S_OK; } - REQUESTHANDLER_CONFIG *pConfig = nullptr; - RETURN_IF_FAILED(REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpApplication, &pConfig)); - std::unique_ptr pRequestHandlerConfig(pConfig); + const WebConfigConfigurationSource configurationSource(pServer->GetAdminManager(), *pHttpApplication); + auto pConfig = std::make_unique(configurationSource); BOOL disableStartupPage = pConfig->QueryDisableStartUpErrorPage(); - auto pApplication = std::make_unique(*pServer, *pHttpApplication, std::move(pRequestHandlerConfig), pParameters, nParameters); + auto pApplication = std::make_unique(*pServer, *pHttpApplication, std::move(pConfig), pParameters, nParameters); // never create two inprocess applications in one process g_fInProcessApplicationCreated = true; @@ -130,6 +133,15 @@ CreateApplication( *ppApplication = pApplication.release(); } } + catch(ConfigurationLoadException &ex) + { + EventLog::Error( + ASPNETCORE_CONFIGURATION_LOAD_ERROR, + ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG, + ex.get_message().c_str()); + + RETURN_HR(E_FAIL); + } CATCH_RETURN(); return S_OK; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 182ee53148..0a07ccc616 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -19,7 +19,7 @@ IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL; IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( IHttpServer& pHttpServer, IHttpApplication& pApplication, - std::unique_ptr pConfig, + std::unique_ptr pConfig, APPLICATION_PARAMETER *pParameters, DWORD nParameters) : InProcessApplicationBase(pHttpServer, pApplication), @@ -108,14 +108,14 @@ Finished: EventLog::Warn( ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE, ASPNETCORE_EVENT_APP_SHUTDOWN_FAILURE_MSG, - m_pConfig->QueryConfigPath()->QueryStr()); + QueryConfigPath().c_str()); } else { EventLog::Info( ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL, ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL_MSG, - m_pConfig->QueryConfigPath()->QueryStr()); + QueryConfigPath().c_str()); } InProcessApplicationBase::StopInternal(fServerInitiated); @@ -212,7 +212,7 @@ IN_PROCESS_APPLICATION::SetCallbackHandles( EventLog::Info( ASPNETCORE_EVENT_INPROCESS_START_SUCCESS, ASPNETCORE_EVENT_INPROCESS_START_SUCCESS_MSG, - m_pConfig->QueryApplicationPhysicalPath()->QueryStr()); + QueryApplicationPhysicalPath().c_str()); SetEvent(m_pInitalizeEvent); m_fInitialized = TRUE; } @@ -334,8 +334,8 @@ Finished: EventLog::Error( ASPNETCORE_EVENT_LOAD_CLR_FALIURE, ASPNETCORE_EVENT_LOAD_CLR_FALIURE_MSG, - m_pConfig->QueryApplicationPath()->QueryStr(), - m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), + QueryApplicationId().c_str(), + QueryApplicationPhysicalPath().c_str(), hr); } DereferenceApplication(); @@ -365,11 +365,21 @@ IN_PROCESS_APPLICATION::SetEnvironementVariablesOnWorkerProcess( VOID ) { - HRESULT hr = S_OK; + auto variables = m_pConfig->QueryEnvironmentVariables(); + auto inputTable = std::unique_ptr(new ENVIRONMENT_VAR_HASH()); + RETURN_IF_FAILED(inputTable->Initialize(37 /*prime*/)); + // Copy environment variables to old style hash table + for (auto & variable : variables) + { + auto pNewEntry = std::unique_ptr(new ENVIRONMENT_VAR_ENTRY()); + RETURN_IF_FAILED(pNewEntry->Initialize((variable.first + L"=").c_str(), variable.second.c_str())); + RETURN_IF_FAILED(inputTable->InsertRecord(pNewEntry.get())); + } + ENVIRONMENT_VAR_HASH* pHashTable = NULL; std::unique_ptr table; - RETURN_IF_FAILED(hr = ENVIRONMENT_VAR_HELPERS::InitEnvironmentVariablesTable( - m_pConfig->QueryEnvironmentVariables(), + RETURN_IF_FAILED(ENVIRONMENT_VAR_HELPERS::InitEnvironmentVariablesTable( + inputTable.get(), m_pConfig->QueryWindowsAuthEnabled(), m_pConfig->QueryBasicAuthEnabled(), m_pConfig->QueryAnonymousAuthEnabled(), @@ -377,11 +387,13 @@ IN_PROCESS_APPLICATION::SetEnvironementVariablesOnWorkerProcess( table.reset(pHashTable); + HRESULT hr = S_OK; table->Apply(ENVIRONMENT_VAR_HELPERS::AppendEnvironmentVariables, &hr); RETURN_IF_FAILED(hr); table->Apply(ENVIRONMENT_VAR_HELPERS::SetEnvironmentVariables, &hr); RETURN_IF_FAILED(hr); + return S_OK; } @@ -422,9 +434,9 @@ IN_PROCESS_APPLICATION::ExecuteApplication( FINISHED_IF_FAILED(hr = HOSTFXR_OPTIONS::Create( m_struExeLocation.QueryStr(), - m_pConfig->QueryProcessPath()->QueryStr(), - m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), - m_pConfig->QueryArguments()->QueryStr(), + m_pConfig->QueryProcessPath().c_str(), + QueryApplicationPhysicalPath().c_str(), + m_pConfig->QueryArguments().c_str(), hostFxrOptions )); hostFxrOptions->GetArguments(hostfxrArgc, hostfxrArgv); @@ -438,8 +450,8 @@ IN_PROCESS_APPLICATION::ExecuteApplication( FINISHED_IF_FAILED(hr = LoggingHelpers::CreateLoggingProvider( m_pConfig->QueryStdoutLogEnabled(), !m_pHttpServer.IsCommandLineLaunch(), - m_pConfig->QueryStdoutLogFile()->QueryStr(), - m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), + m_pConfig->QueryStdoutLogFile().c_str(), + QueryApplicationPhysicalPath().c_str(), m_pLoggerProvider)); LOG_IF_FAILED(m_pLoggerProvider->Start()); @@ -502,8 +514,8 @@ IN_PROCESS_APPLICATION::LogErrorsOnMainExit( EventLog::Error( ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT, ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG, - m_pConfig->QueryApplicationPath()->QueryStr(), - m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), + QueryApplicationId().c_str(), + QueryApplicationPhysicalPath().c_str(), hr, struStdMsg.QueryStr()); } @@ -513,8 +525,8 @@ IN_PROCESS_APPLICATION::LogErrorsOnMainExit( EventLog::Error( ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT, ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG, - m_pConfig->QueryApplicationPath()->QueryStr(), - m_pConfig->QueryApplicationPhysicalPath()->QueryStr(), + QueryApplicationId().c_str(), + QueryApplicationPhysicalPath().c_str(), hr); } } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index 1d5cfec4c9..7183ad86b3 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -4,8 +4,8 @@ #pragma once #include "InProcessApplicationBase.h" -#include "requesthandler_config.h" #include "IOutputManager.h" +#include "InProcessOptions.h" class IN_PROCESS_HANDLER; typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_REQUEST_HANDLER) (IN_PROCESS_HANDLER* pInProcessHandler, void* pvRequestHandlerContext); @@ -18,7 +18,7 @@ public: IN_PROCESS_APPLICATION( IHttpServer& pHttpServer, IHttpApplication& pApplication, - std::unique_ptr pConfig, + std::unique_ptr pConfig, APPLICATION_PARAMETER *pParameters, DWORD nParameters); @@ -97,10 +97,10 @@ public: return m_struExeLocation.QueryStr(); } - REQUESTHANDLER_CONFIG* - QueryConfig() + const InProcessOptions& + QueryConfig() const { - return m_pConfig.get(); + return *m_pConfig.get(); } bool @@ -146,7 +146,7 @@ private: volatile BOOL m_fShutdownCalledFromManaged; BOOL m_fInitialized; MANAGED_APPLICATION_STATUS m_status; - std::unique_ptr m_pConfig; + std::unique_ptr m_pConfig; static IN_PROCESS_APPLICATION* s_Application; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp index af0035be11..d8d28e5a28 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp @@ -187,11 +187,11 @@ http_get_application_properties( auto pConfiguration = pInProcessApplication->QueryConfig(); pIISCofigurationData->pInProcessApplication = pInProcessApplication; - pIISCofigurationData->pwzFullApplicationPath = SysAllocString(pConfiguration->QueryApplicationPhysicalPath()->QueryStr()); - pIISCofigurationData->pwzVirtualApplicationPath = SysAllocString(pConfiguration->QueryApplicationVirtualPath()->QueryStr()); - pIISCofigurationData->fWindowsAuthEnabled = pConfiguration->QueryWindowsAuthEnabled(); - pIISCofigurationData->fBasicAuthEnabled = pConfiguration->QueryBasicAuthEnabled(); - pIISCofigurationData->fAnonymousAuthEnable = pConfiguration->QueryAnonymousAuthEnabled(); + pIISCofigurationData->pwzFullApplicationPath = SysAllocString(pInProcessApplication->QueryApplicationPhysicalPath().c_str()); + pIISCofigurationData->pwzVirtualApplicationPath = SysAllocString(pInProcessApplication->QueryApplicationVirtualPath().c_str()); + pIISCofigurationData->fWindowsAuthEnabled = pConfiguration.QueryWindowsAuthEnabled(); + pIISCofigurationData->fBasicAuthEnabled = pConfiguration.QueryBasicAuthEnabled(); + pIISCofigurationData->fAnonymousAuthEnable = pConfiguration.QueryAnonymousAuthEnabled(); return S_OK; } diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h index f2ce7a5c20..b504a730fd 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h @@ -12,7 +12,7 @@ class AppOfflineTrackingApplication: public APPLICATION { public: AppOfflineTrackingApplication(const IHttpApplication& application) - : APPLICATION(), + : APPLICATION(application), m_applicationPath(application.GetApplicationPhysicalPath()), m_fileWatcher(nullptr), m_fAppOfflineProcessed(false) diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h b/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h index 98bcd5ada4..c5f63f6fde 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h @@ -33,13 +33,13 @@ public: { HRESULT hr = S_OK; if (FAILED(hr = _strName.Copy(pszName)) || - FAILED(hr = _strValue.Copy(pszValue))) + FAILED(hr = _strValue.Copy(pszValue))) { } - return hr; + return hr; } - VOID + VOID Reference() const { InterlockedIncrement(&_cRefs); @@ -139,3 +139,11 @@ struct ENVIRONMENT_VAR_HASH_DELETER delete hashTable; } }; + +struct ENVIRONMENT_VAR_ENTRY_DELETER +{ + void operator ()(ENVIRONMENT_VAR_ENTRY* entry) const + { + entry->Dereference(); + } +}; diff --git a/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs b/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs index 413aa4c35f..ae8fde39ed 100644 --- a/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs +++ b/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs @@ -8,11 +8,11 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISTestSiteCollection.Name)] - public class EnvironmentVariableTests + public class EnvironmentVariableTests: FixtureLoggedTest { private readonly IISTestSiteFixture _fixture; - public EnvironmentVariableTests(IISTestSiteFixture fixture) + public EnvironmentVariableTests(IISTestSiteFixture fixture): base(fixture) { _fixture = fixture; } diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index d0b1ebc109..34fb88082a 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Net.Http; using System.Threading.Tasks; using System.Xml.Linq; @@ -133,5 +134,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await verificationAction(); } } + + public static IEnumerable ToTheoryData(this Dictionary dictionary) + { + return dictionary.Keys.Select(k => new[] { k }); + } } } diff --git a/test/CommonLibTests/fakeclasses.h b/test/CommonLibTests/fakeclasses.h index ba792017c4..a6f4a3e111 100644 --- a/test/CommonLibTests/fakeclasses.h +++ b/test/CommonLibTests/fakeclasses.h @@ -5,6 +5,7 @@ #include "gtest/gtest.h" #include "gmock/gmock.h" +#include "InProcessOptions.h" class MockProperty : public IAppHostProperty { @@ -176,20 +177,14 @@ public: MOCK_METHOD0(GetModuleContextContainer, IHttpModuleContextContainer* ()); }; -class MockRequestHandlerConfig : public REQUESTHANDLER_CONFIG +class MockInProcessOptions : public InProcessOptions { public: static - MockRequestHandlerConfig* + MockInProcessOptions* CreateConfig() { - return new MockRequestHandlerConfig; - } - -private: - MockRequestHandlerConfig() - { - + return new MockInProcessOptions; } }; diff --git a/test/CommonLibTests/inprocess_application_tests.cpp b/test/CommonLibTests/inprocess_application_tests.cpp index 00c7b01611..06be5493bd 100644 --- a/test/CommonLibTests/inprocess_application_tests.cpp +++ b/test/CommonLibTests/inprocess_application_tests.cpp @@ -24,7 +24,13 @@ namespace InprocessTests ON_CALL(application, GetApplicationPhysicalPath()) .WillByDefault(testing::Return(L"Some path")); - auto requestHandlerConfig = std::unique_ptr(MockRequestHandlerConfig::CreateConfig()); + ON_CALL(application, GetAppConfigPath()) + .WillByDefault(testing::Return(L"")); + + ON_CALL(application, GetApplicationId()) + .WillByDefault(testing::Return(L"")); + + auto requestHandlerConfig = std::unique_ptr(MockInProcessOptions::CreateConfig()); std::wstring exePath(L"hello"); @@ -36,4 +42,44 @@ namespace InprocessTests ASSERT_STREQ(app->QueryExeLocation(), L"hello"); } + + TEST(InProcessTest, GeneratesVirtualPath) + { + MockHttpServer server; + NiceMock application; + + ON_CALL(application, GetApplicationPhysicalPath()) + .WillByDefault(testing::Return(L"Some path")); + + ON_CALL(application, GetAppConfigPath()) + .WillByDefault(testing::Return(L"SECTION1/SECTION2/SECTION3/SECTION4/SECTION5")); + + ON_CALL(application, GetApplicationId()) + .WillByDefault(testing::Return(L"")); + + auto requestHandlerConfig = std::unique_ptr(MockInProcessOptions::CreateConfig()); + IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), nullptr, 0); + + ASSERT_STREQ(app->QueryApplicationVirtualPath().c_str(), L"/SECTION5"); + } + + TEST(InProcessTest, GeneratesVirtualPathForDefaultApp) + { + MockHttpServer server; + NiceMock application; + + ON_CALL(application, GetApplicationPhysicalPath()) + .WillByDefault(testing::Return(L"Some path")); + + ON_CALL(application, GetAppConfigPath()) + .WillByDefault(testing::Return(L"SECTION1/SECTION2/SECTION3/SECTION4")); + + ON_CALL(application, GetApplicationId()) + .WillByDefault(testing::Return(L"")); + + auto requestHandlerConfig = std::unique_ptr(MockInProcessOptions::CreateConfig()); + IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), nullptr, 0); + + ASSERT_STREQ(app->QueryApplicationVirtualPath().c_str(), L"/"); + } } diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 73bea61017..55d399ef03 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -2,11 +2,13 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Net; using System.Text.RegularExpressions; using System.Threading.Tasks; +using System.Xml.Linq; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; @@ -185,5 +187,45 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Unknown hosting model 'bogus'. Please specify either hostingModel=\"inprocess\" or hostingModel=\"outofprocess\" in the web.config file."); } + + + private static Dictionary)> InvalidConfigTransformations = InitInvalidConfigTransformations(); + public static IEnumerable InvalidConfigTransformationsScenarios => InvalidConfigTransformations.ToTheoryData(); + + [ConditionalTheory] + [MemberData(nameof(InvalidConfigTransformationsScenarios))] + public async Task StartsWithWebConfigVariationsPortable(string scenario) + { + var (expectedError, action) = InvalidConfigTransformations[scenario]; + var iisDeploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + iisDeploymentParameters.WebConfigActionList.Add((element, _) => action(element)); + var deploymentResult = await DeployAsync(iisDeploymentParameters); + var result = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + Assert.Equal(HttpStatusCode.InternalServerError, result.StatusCode); + + StopServer(); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Configuration load error. " + expectedError); + } + + public static Dictionary)> InitInvalidConfigTransformations() + { + var dictionary = new Dictionary)>(); + dictionary.Add("Empty process path", + ( + "Attribute 'processPath' is required.", + element => element.Descendants("aspNetCore").Single().SetAttributeValue("processPath", "") + )); + dictionary.Add("Unknown hostingModel", + ( + "Unknown hosting model 'asdf'.", + element => element.Descendants("aspNetCore").Single().SetAttributeValue("hostingModel", "asdf") + )); + dictionary.Add("environmentVariables with add", + ( + "Unable to get required configuration section 'system.webServer/aspNetCore'. Possible reason is web.config authoring error.", + element => element.Descendants("aspNetCore").Single().GetOrAdd("environmentVariables").GetOrAdd("add") + )); + return dictionary; + } } } From 9b68c5ce89c1f5c77bbd1fba13ec13ac2e0016ac Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 24 Aug 2018 22:20:28 -0700 Subject: [PATCH 247/363] Add tests for processpath and arguments (#1331) --- .../AspNetCore/HandlerResolver.cpp | 2 +- .../AspNetCore/applicationinfo.cpp | 8 +- .../AspNetCore/applicationmanager.cpp | 2 +- .../AspNetCore/globalmodule.cpp | 4 +- .../AspNetCore/globalmodule.h | 2 +- src/AspNetCoreModuleV2/CommonLib/EventLog.cpp | 2 +- .../CommonLib/PipeOutputManager.cpp | 2 +- .../CommonLib/debugutil.cpp | 96 ++++++-- src/AspNetCoreModuleV2/CommonLib/debugutil.h | 26 ++- .../CommonLib/hostfxr_utility.cpp | 115 ++++++---- .../CommonLib/hostfxr_utility.h | 3 +- .../CommonLib/hostfxroptions.cpp | 5 + .../inprocessapplication.cpp | 6 +- .../AppOfflineTrackingApplication.cpp | 4 +- .../RequestHandlerLib/filewatcher.cpp | 4 +- .../Utilities/FunctionalTestsBase.cs | 8 + .../Utilities/Helpers.cs | 9 +- test/CommonLibTests/hostfxr_utility_tests.cpp | 44 ++-- .../InProcess/StartupTests.cs | 215 ++++++++++++++---- test/WebSites/InProcessWebSite/Startup.cs | 8 +- 20 files changed, 394 insertions(+), 171 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index fbed8b09e9..2c79f60a85 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -108,7 +108,7 @@ HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, Shim } } - LOG_INFOF("Loading request handler: %S", handlerDllPath.c_str()); + LOG_INFOF(L"Loading request handler: '%ls'", handlerDllPath.c_str()); hRequestHandlerDll = LoadLibrary(handlerDllPath.c_str()); if (preventUnload) diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index e250045677..9f2b20cf8e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -34,7 +34,7 @@ APPLICATION_INFO::GetOrCreateApplication( { if (m_pApplication->QueryStatus() == RECYCLED) { - LOG_INFO("Application went offline"); + LOG_INFO(L"Application went offline"); // Call to wait for application to complete stopping m_pApplication->Stop(/* fServerInitiated */ false); @@ -50,14 +50,14 @@ APPLICATION_INFO::GetOrCreateApplication( if (AppOfflineApplication::ShouldBeStarted(httpApplication)) { - LOG_INFO("Detected app_offline file, creating polling application"); + LOG_INFO(L"Detected app_offline file, creating polling application"); m_pApplication.reset(new AppOfflineApplication(httpApplication)); } else { FINISHED_IF_FAILED(m_handlerResolver.GetApplicationFactory(httpApplication, m_pApplicationFactory)); - LOG_INFO("Creating handler application"); + LOG_INFO(L"Creating handler application"); IAPPLICATION * newApplication; FINISHED_IF_FAILED(m_pApplicationFactory->Execute( &m_pServer, @@ -97,7 +97,7 @@ APPLICATION_INFO::ShutDownApplication(bool fServerInitiated) if (m_pApplication) { - LOG_ERRORF("Stopping application %S", QueryApplicationInfoKey().c_str()); + LOG_ERRORF(L"Stopping application '%ls'", QueryApplicationInfoKey().c_str()); m_pApplication ->Stop(fServerInitiated); m_pApplication = nullptr; m_pApplicationFactory = nullptr; diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp index 36fc9a96ba..7b9df85a43 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp @@ -142,7 +142,7 @@ APPLICATION_MANAGER::RecycleApplicationFromManager( } catch (...) { - LOG_ERRORF("Failed to stop application %S", application->QueryApplicationInfoKey().c_str()); + LOG_ERRORF(L"Failed to stop application '%ls'", application->QueryApplicationInfoKey().c_str()); OBSERVE_CAUGHT_EXCEPTION(); // Failed to recycle an application. Log an event diff --git a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp index 0a9c0ccf02..755b1ffc79 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp @@ -22,7 +22,7 @@ ASPNET_CORE_GLOBAL_MODULE::OnGlobalStopListening( { UNREFERENCED_PARAMETER(pProvider); - LOG_INFO("ASPNET_CORE_GLOBAL_MODULE::OnGlobalStopListening"); + LOG_INFO(L"ASPNET_CORE_GLOBAL_MODULE::OnGlobalStopListening"); if (g_fInShutdown) { @@ -56,7 +56,7 @@ ASPNET_CORE_GLOBAL_MODULE::OnGlobalConfigurationChange( // Retrieve the path that has changed. PCWSTR pwszChangePath = pProvider->GetChangePath(); - LOG_INFOF("ASPNET_CORE_GLOBAL_MODULE::OnGlobalConfigurationChange %S", pwszChangePath); + LOG_INFOF(L"ASPNET_CORE_GLOBAL_MODULE::OnGlobalConfigurationChange '%ls'", pwszChangePath); // Test for an error. if (NULL != pwszChangePath && diff --git a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h index b790ebb0f5..13b6f86bea 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h @@ -20,7 +20,7 @@ public: VOID Terminate() { - LOG_INFO("ASPNET_CORE_GLOBAL_MODULE::Terminate"); + LOG_INFO(L"ASPNET_CORE_GLOBAL_MODULE::Terminate"); // Remove the class from memory. delete this; } diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp b/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp index fe97805a39..a8b32849ff 100644 --- a/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp @@ -42,7 +42,7 @@ EventLog::LogEvent( ); } - DebugPrintf(dwEventInfoType == EVENTLOG_ERROR_TYPE ? ASPNETCORE_DEBUG_FLAG_ERROR : ASPNETCORE_DEBUG_FLAG_INFO, "Event Log: %S \r\nEnd Event Log Message.", pstrMsg); + DebugPrintfW(dwEventInfoType == EVENTLOG_ERROR_TYPE ? ASPNETCORE_DEBUG_FLAG_ERROR : ASPNETCORE_DEBUG_FLAG_INFO, L"Event Log: '%ls' \r\nEnd Event Log Message.", pstrMsg); } VOID diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp index 54fb162fe4..8ddfcb437f 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp @@ -132,7 +132,7 @@ HRESULT PipeOutputManager::Stop() if (!LOG_LAST_ERROR_IF(GetExitCodeThread(m_hErrThread, &dwThreadStatus) == 0) && dwThreadStatus == STILL_ACTIVE) { - LOG_WARN("Thread reading stdout/err hit timeout, forcibly closing thread."); + LOG_WARN(L"Thread reading stdout/err hit timeout, forcibly closing thread."); TerminateThread(m_hErrThread, STATUS_CONTROL_C_EXIT); } } diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index 3988d78796..964c411bf9 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -23,7 +23,7 @@ HRESULT PrintDebugHeader() { // Major, minor are stored in dwFileVersionMS field and patch, build in dwFileVersionLS field as pair of 32 bit numbers - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, "Initializing logs for %S. %S. %S.", + DebugPrintfW(ASPNETCORE_DEBUG_FLAG_INFO, L"Initializing logs for '%ls'. %ls. %ls.", GetModuleName().c_str(), GetProcessIdString().c_str(), GetVersionInfoString().c_str() @@ -86,7 +86,7 @@ std::wstring GetModuleName() { WCHAR path[MAX_PATH]; - LOG_LAST_ERROR_IF(GetModuleFileName(g_hModule, path, sizeof(path))); + LOG_LAST_ERROR_IF(!GetModuleFileName(g_hModule, path, sizeof(path))); return path; } @@ -146,7 +146,7 @@ bool CreateDebugLogFile(const std::wstring &debugOutputFile) { if (g_logFile != INVALID_HANDLE_VALUE) { - LOG_INFOF("Switching debug log files to %S", debugOutputFile.c_str()); + LOG_INFOF(L"Switching debug log files to '%ls'", debugOutputFile.c_str()); } SRWExclusiveLock lock(g_logFileLock); @@ -296,19 +296,29 @@ IsEnabled( return ( dwFlag & DEBUG_FLAGS_VAR ); } +void WriteFileEncoded(UINT codePage, HANDLE hFile, const LPCWSTR szString) +{ + DWORD nBytesWritten = 0; + auto const encodedByteCount = WideCharToMultiByte(codePage, 0, szString, -1, nullptr, 0, nullptr, nullptr); + auto encodedBytes = std::shared_ptr(new CHAR[encodedByteCount]); + WideCharToMultiByte(codePage, 0, szString, -1, encodedBytes.get(), encodedByteCount, nullptr, nullptr); + + WriteFile(hFile, encodedBytes.get(), encodedByteCount - 1, &nBytesWritten, nullptr); +} + VOID -DebugPrint( +DebugPrintW( DWORD dwFlag, - const LPCSTR szString + const LPCWSTR szString ) { - STACK_STRA (strOutput, 256); + STACK_STRU (strOutput, 256); HRESULT hr = S_OK; if ( IsEnabled( dwFlag ) ) { - hr = strOutput.SafeSnprintf( - "[%s] %s\r\n", + hr = strOutput.SafeSnwprintf( + L"[%S] %s\r\n", DEBUG_LABEL_VAR, szString ); if (FAILED (hr)) @@ -316,22 +326,68 @@ DebugPrint( return; } - OutputDebugStringA( strOutput.QueryStr() ); - DWORD nBytesWritten = 0; - if (IsEnabled(ASPNETCORE_DEBUG_FLAG_CONSOLE)) + OutputDebugString( strOutput.QueryStr() ); + + if (IsEnabled(ASPNETCORE_DEBUG_FLAG_CONSOLE) || g_logFile != INVALID_HANDLE_VALUE) { - auto outputHandle = GetStdHandle(STD_OUTPUT_HANDLE); - WriteFile(outputHandle, strOutput.QueryStr(), strOutput.QueryCB(), &nBytesWritten, nullptr); + if (IsEnabled(ASPNETCORE_DEBUG_FLAG_CONSOLE)) + { + WriteFileEncoded(GetConsoleOutputCP(), GetStdHandle(STD_OUTPUT_HANDLE), strOutput.QueryStr()); + } + + if (g_logFile != INVALID_HANDLE_VALUE) + { + SRWExclusiveLock lock(g_logFileLock); + + SetFilePointer(g_logFile, 0, nullptr, FILE_END); + WriteFileEncoded(CP_UTF8, g_logFile, strOutput.QueryStr()); + FlushFileBuffers(g_logFile); + } + } + } +} + +VOID +DebugPrintfW( + DWORD dwFlag, + const LPCWSTR szFormat, + ... + ) +{ + STACK_STRU (strCooked,256); + + va_list args; + HRESULT hr = S_OK; + + if ( IsEnabled( dwFlag ) ) + { + va_start( args, szFormat ); + + hr = strCooked.SafeVsnwprintf(szFormat, args ); + + va_end( args ); + + if (FAILED (hr)) + { + return; } - if (g_logFile != INVALID_HANDLE_VALUE) - { - SRWExclusiveLock lock(g_logFileLock); + DebugPrintW( dwFlag, strCooked.QueryStr() ); + } +} - SetFilePointer(g_logFile, 0, nullptr, FILE_END); - WriteFile(g_logFile, strOutput.QueryStr(), strOutput.QueryCB(), &nBytesWritten, nullptr); - FlushFileBuffers(g_logFile); - } +VOID +DebugPrint( + DWORD dwFlag, + const LPCSTR szString + ) +{ + STACK_STRU (strOutput, 256); + + if ( IsEnabled( dwFlag ) ) + { + strOutput.CopyA(szString); + DebugPrintW(dwFlag, strOutput.QueryStr()); } } diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/AspNetCoreModuleV2/CommonLib/debugutil.h index 611d00d53d..f8c7a9b7c9 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.h +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.h @@ -14,14 +14,14 @@ #define ASPNETCORE_DEBUG_FLAG_CONSOLE 0x00000008 #define ASPNETCORE_DEBUG_FLAG_FILE 0x00000010 -#define LOG_INFO(...) DebugPrint(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) -#define LOG_INFOF(...) DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) +#define LOG_INFO(...) DebugPrintW(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) +#define LOG_INFOF(...) DebugPrintfW(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) -#define LOG_WARN(...) DebugPrint(ASPNETCORE_DEBUG_FLAG_WARNING, __VA_ARGS__) -#define LOG_WARNF(...) DebugPrintf(ASPNETCORE_DEBUG_FLAG_WARNING, __VA_ARGS__) +#define LOG_WARN(...) DebugPrintW(ASPNETCORE_DEBUG_FLAG_WARNING, __VA_ARGS__) +#define LOG_WARNF(...) DebugPrintfW(ASPNETCORE_DEBUG_FLAG_WARNING, __VA_ARGS__) -#define LOG_ERROR(...) DebugPrint(ASPNETCORE_DEBUG_FLAG_ERROR, __VA_ARGS__) -#define LOG_ERRORF(...) DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, __VA_ARGS__) +#define LOG_ERROR(...) DebugPrintW(ASPNETCORE_DEBUG_FLAG_ERROR, __VA_ARGS__) +#define LOG_ERRORF(...) DebugPrintfW(ASPNETCORE_DEBUG_FLAG_ERROR, __VA_ARGS__) VOID DebugInitialize(HMODULE hModule); @@ -37,6 +37,20 @@ IsEnabled( DWORD dwFlag ); +VOID +DebugPrintW( + DWORD dwFlag, + LPCWSTR szString + ); + +VOID +DebugPrintfW( + DWORD dwFlag, + LPCWSTR szFormat, + ... + ); + + VOID DebugPrint( DWORD dwFlag, diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index 223cb38ab4..eb82490ced 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -23,19 +23,16 @@ HOSTFXR_UTILITY::GetHostFxrParameters( std::vector &arguments ) { - LOG_INFOF("Resolving hostfxr parameters for application: '%S' arguments: '%S' path: '%S'", + LOG_INFOF(L"Resolving hostfxr parameters for application: '%ls' arguments: '%ls' path: '%ls'", processPath.c_str(), applicationArguments.c_str(), applicationPhysicalPath.c_str()); + arguments = std::vector(); fs::path expandedProcessPath = Environment::ExpandEnvironmentVariables(processPath); const auto expandedApplicationArguments = Environment::ExpandEnvironmentVariables(applicationArguments); - LOG_INFOF("Expanded hostfxr parameters for application: '%S' arguments: '%S'", - expandedProcessPath.c_str(), - expandedApplicationArguments.c_str()); - - LOG_INFOF("Known dotnet.exe location: '%S'", dotnetExePath.c_str()); + LOG_INFOF(L"Known dotnet.exe location: '%ls'", dotnetExePath.c_str()); if (!expandedProcessPath.has_extension()) { @@ -50,7 +47,12 @@ HOSTFXR_UTILITY::GetHostFxrParameters( // Check if the absolute path is to dotnet or not. if (IsDotnetExecutable(expandedProcessPath)) { - LOG_INFOF("Process path '%S' is dotnet, treating application as portable", expandedProcessPath.c_str()); + LOG_INFOF(L"Process path '%ls' is dotnet, treating application as portable", expandedProcessPath.c_str()); + + if (applicationArguments.empty()) + { + throw StartupParametersResolutionException(L"Application arguments are empty."); + } if (dotnetExePath.empty()) { @@ -59,16 +61,16 @@ HOSTFXR_UTILITY::GetHostFxrParameters( hostFxrDllPath = GetAbsolutePathToHostFxr(dotnetExePath); - ParseHostfxrArguments( + arguments.push_back(dotnetExePath); + AppendArguments( expandedApplicationArguments, - dotnetExePath, applicationPhysicalPath, arguments, true); } else { - LOG_INFOF("Process path '%S' is not dotnet, treating application as standalone or portable with bootstrapper", expandedProcessPath.c_str()); + LOG_INFOF(L"Process path '%ls' is not dotnet, treating application as standalone or portable with bootstrapper", expandedProcessPath.c_str()); auto executablePath = expandedProcessPath; @@ -87,21 +89,23 @@ HOSTFXR_UTILITY::GetHostFxrParameters( auto applicationDllPath = executablePath; applicationDllPath.replace_extension(".dll"); - LOG_INFOF("Checking application.dll at %S", applicationDllPath.c_str()); + LOG_INFOF(L"Checking application.dll at '%ls'", applicationDllPath.c_str()); if (!is_regular_file(applicationDllPath)) { throw StartupParametersResolutionException(format(L"Application .dll was not found at %s", applicationDllPath.c_str())); } hostFxrDllPath = executablePath.parent_path() / "hostfxr.dll"; - LOG_INFOF("Checking hostfxr.dll at %S", hostFxrDllPath.c_str()); + LOG_INFOF(L"Checking hostfxr.dll at '%ls'", hostFxrDllPath.c_str()); if (is_regular_file(hostFxrDllPath)) { - LOG_INFOF("hostfxr.dll found app local at '%S', treating application as standalone", hostFxrDllPath.c_str()); + LOG_INFOF(L"hostfxr.dll found app local at '%ls', treating application as standalone", hostFxrDllPath.c_str()); + // For standalone apps we need .exe to be argv[0], dll would be discovered next to it + arguments.push_back(executablePath); } else { - LOG_INFOF("hostfxr.dll found app local at '%S', treating application as portable with launcher", hostFxrDllPath.c_str()); + LOG_INFOF(L"hostfxr.dll found app local at '%ls', treating application as portable with launcher", hostFxrDllPath.c_str()); // passing "dotnet" here because we don't know where dotnet.exe should come from // so trying all fallbacks is appropriate @@ -109,13 +113,15 @@ HOSTFXR_UTILITY::GetHostFxrParameters( { dotnetExePath = GetAbsolutePathToDotnet(applicationPhysicalPath, L"dotnet"); } - executablePath = dotnetExePath; hostFxrDllPath = GetAbsolutePathToHostFxr(dotnetExePath); + + // For portable with launcher apps we need dotnet.exe to be argv[0] and .dll be argv[1] + arguments.push_back(dotnetExePath); + arguments.push_back(applicationDllPath); } - ParseHostfxrArguments( - applicationDllPath.generic_wstring() + L" " + expandedApplicationArguments, - executablePath, + AppendArguments( + expandedApplicationArguments, applicationPhysicalPath, arguments); } @@ -137,29 +143,49 @@ HOSTFXR_UTILITY::IsDotnetExecutable(const std::filesystem::path & dotnetPath) } void -HOSTFXR_UTILITY::ParseHostfxrArguments( +HOSTFXR_UTILITY::AppendArguments( const std::wstring &applicationArguments, - const fs::path &applicationExePath, const fs::path &applicationPhysicalPath, std::vector &arguments, bool expandDllPaths ) { - LOG_INFOF("Resolving hostfxr_main arguments application: '%S' arguments: '%S' path: %S", applicationExePath.c_str(), applicationArguments.c_str(), applicationPhysicalPath.c_str()); - - arguments = std::vector(); - arguments.push_back(applicationExePath); - if (applicationArguments.empty()) { - throw StartupParametersResolutionException(L"Application arguments are empty."); + return; + } + + // don't throw while trying to expand arguments + std::error_code ec; + + // Try to treat entire arguments section as a single path + if (expandDllPaths) + { + fs::path argumentAsPath = applicationArguments; + if (is_regular_file(argumentAsPath, ec)) + { + LOG_INFOF(L"Treating '%ls' as a single path argument", applicationArguments.c_str()); + arguments.push_back(argumentAsPath); + return; + } + + if (argumentAsPath.is_relative()) + { + argumentAsPath = applicationPhysicalPath / argumentAsPath; + if (is_regular_file(argumentAsPath, ec)) + { + LOG_INFOF(L"Converted argument '%ls' to '%ls'", applicationArguments.c_str(), argumentAsPath.c_str()); + arguments.push_back(argumentAsPath); + return; + } + } } int argc = 0; auto pwzArgs = std::unique_ptr(CommandLineToArgvW(applicationArguments.c_str(), &argc)); if (!pwzArgs) { - throw StartupParametersResolutionException(format(L"Unable parse command line arguments '%s' or '%s'", applicationArguments.c_str())); + throw StartupParametersResolutionException(format(L"Unable parse command line arguments '%s'", applicationArguments.c_str())); } for (int intArgsProcessed = 0; intArgsProcessed < argc; intArgsProcessed++) @@ -173,9 +199,9 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( if (argumentAsPath.is_relative()) { argumentAsPath = applicationPhysicalPath / argumentAsPath; - if (exists(argumentAsPath)) + if (is_regular_file(argumentAsPath, ec)) { - LOG_INFOF("Converted argument '%S' to %S", argument.c_str(), argumentAsPath.c_str()); + LOG_INFOF(L"Converted argument '%ls' to '%ls'", argument.c_str(), argumentAsPath.c_str()); argument = argumentAsPath; } } @@ -183,11 +209,6 @@ HOSTFXR_UTILITY::ParseHostfxrArguments( arguments.push_back(argument); } - - for (size_t i = 0; i < arguments.size(); i++) - { - LOG_INFOF("Argument[%d] = %S", i, arguments[i].c_str()); - } } // The processPath ends with dotnet.exe or dotnet @@ -199,7 +220,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( const fs::path & requestedPath ) { - LOG_INFOF("Resolving absolute path to dotnet.exe from %S", requestedPath.c_str()); + LOG_INFOF(L"Resolving absolute path to dotnet.exe from '%ls'", requestedPath.c_str()); auto processPath = requestedPath; if (processPath.is_relative()) @@ -212,7 +233,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( // if (is_regular_file(processPath)) { - LOG_INFOF("Found dotnet.exe at %S", processPath.c_str()); + LOG_INFOF(L"Found dotnet.exe at '%ls'", processPath.c_str()); return processPath; } @@ -223,7 +244,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( // Only do it if no path is specified if (requestedPath.has_parent_path()) { - LOG_INFOF("Absolute path to dotnet.exe was not found at %S", requestedPath.c_str()); + LOG_INFOF(L"Absolute path to dotnet.exe was not found at '%ls'", requestedPath.c_str()); throw StartupParametersResolutionException(format(L"Could not find dotnet.exe at '%s'", processPath.c_str())); } @@ -231,7 +252,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( const auto dotnetViaWhere = InvokeWhereToFindDotnet(); if (dotnetViaWhere.has_value()) { - LOG_INFOF("Found dotnet.exe via where.exe invocation at %S", dotnetViaWhere.value().c_str()); + LOG_INFOF(L"Found dotnet.exe via where.exe invocation at '%ls'", dotnetViaWhere.value().c_str()); return dotnetViaWhere.value(); } @@ -239,12 +260,12 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( const auto programFilesLocation = GetAbsolutePathToDotnetFromProgramFiles(); if (programFilesLocation.has_value()) { - LOG_INFOF("Found dotnet.exe in Program Files at %S", programFilesLocation.value().c_str()); + LOG_INFOF(L"Found dotnet.exe in Program Files at '%ls'", programFilesLocation.value().c_str()); return programFilesLocation.value(); } - LOG_INFOF("dotnet.exe not found"); + LOG_INFOF(L"dotnet.exe not found"); throw StartupParametersResolutionException(format( L"Could not find dotnet.exe at '%s' or using the system PATH environment variable." " Check that a valid path to dotnet is on the PATH and the bitness of dotnet matches the bitness of the IIS worker process.", @@ -259,7 +280,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( std::vector versionFolders; const auto hostFxrBase = dotnetPath.parent_path() / "host" / "fxr"; - LOG_INFOF("Resolving absolute path to hostfxr.dll from %S", dotnetPath.c_str()); + LOG_INFOF(L"Resolving absolute path to hostfxr.dll from '%ls'", dotnetPath.c_str()); if (!is_directory(hostFxrBase)) { @@ -281,7 +302,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( throw StartupParametersResolutionException(format(L"hostfxr.dll not found at '%s'", hostFxrPath.c_str())); } - LOG_INFOF("hostfxr.dll located at %S", hostFxrPath.c_str()); + LOG_INFOF(L"hostfxr.dll located at '%ls'", hostFxrPath.c_str()); return hostFxrPath; } @@ -323,7 +344,7 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() securityAttributes.lpSecurityDescriptor = NULL; securityAttributes.bInheritHandle = TRUE; - LOG_INFO("Invoking where.exe to find dotnet.exe"); + LOG_INFO(L"Invoking where.exe to find dotnet.exe"); // Create a read/write pipe that will be used for reading the result of where.exe FINISHED_LAST_ERROR_IF(!CreatePipe(&hStdOutReadPipe, &hStdOutWritePipe, &securityAttributes, 0)); @@ -398,7 +419,7 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() FINISHED_IF_FAILED(struDotnetLocationsString.CopyA(pzFileContents, dwNumBytesRead)); - LOG_INFOF("where.exe invocation returned: %S", struDotnetLocationsString.QueryStr()); + LOG_INFOF(L"where.exe invocation returned: '%ls'", struDotnetLocationsString.QueryStr()); // Check the bitness of the currently running process // matches the dotnet.exe found. @@ -417,7 +438,7 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() fIsCurrentProcess64Bit = systemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64; } - LOG_INFOF("Current process bitness type detected as isX64=%d", fIsCurrentProcess64Bit); + LOG_INFOF(L"Current process bitness type detected as isX64=%d", fIsCurrentProcess64Bit); while (TRUE) { @@ -431,14 +452,14 @@ HOSTFXR_UTILITY::InvokeWhereToFindDotnet() // \r\n is two wchars, so add 2 here. prevIndex = index + 2; - LOG_INFOF("Processing entry %S", struDotnetSubstring.QueryStr()); + LOG_INFOF(L"Processing entry '%ls'", struDotnetSubstring.QueryStr()); if (LOG_LAST_ERROR_IF(!GetBinaryTypeW(struDotnetSubstring.QueryStr(), &dwBinaryType))) { continue; } - LOG_INFOF("Binary type %d", dwBinaryType); + LOG_INFOF(L"Binary type %d", dwBinaryType); if (fIsCurrentProcess64Bit == (dwBinaryType == SCS_64BIT_BINARY)) { diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index e12153aaf6..d13b7e139e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -45,9 +45,8 @@ public: static void - ParseHostfxrArguments( + AppendArguments( const std::wstring &arugments, - const std::filesystem::path &exePath, const std::filesystem::path &applicationPhysicalPath, std::vector &arguments, bool expandDllPaths = false diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp index 7445724d98..9e1d8ab609 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp @@ -33,6 +33,11 @@ HRESULT HOSTFXR_OPTIONS::Create( knownDotnetLocation, arguments); + LOG_INFOF(L"Parsed hostfxr options: dotnet location: '%ls' hostfxr path: '%ls' arguments:", knownDotnetLocation.c_str(), hostFxrDllPath.c_str()); + for (size_t i = 0; i < arguments.size(); i++) + { + LOG_INFOF(L"Argument[%d] = '%ls'", i, arguments[i].c_str()); + } ppWrapper = std::make_unique(knownDotnetLocation, hostFxrDllPath, arguments); } catch (HOSTFXR_UTILITY::StartupParametersResolutionException &resolutionException) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 0a07ccc616..5f43952287 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -443,7 +443,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication( FINISHED_IF_FAILED(SetEnvironementVariablesOnWorkerProcess()); } - LOG_INFO("Starting managed application"); + LOG_INFO(L"Starting managed application"); if (m_pLoggerProvider == NULL) { @@ -547,12 +547,12 @@ IN_PROCESS_APPLICATION::RunDotnetApplication(DWORD argc, CONST PCWSTR* argv, hos hr = HRESULT_FROM_WIN32(GetLastError()); } - LOG_INFOF("Managed application exited with code %d", m_ProcessExitCode); + LOG_INFOF(L"Managed application exited with code %d", m_ProcessExitCode); } __except(GetExceptionCode() != 0) { - LOG_INFOF("Managed threw an exception %d", GetExceptionCode()); + LOG_INFOF(L"Managed threw an exception %d", GetExceptionCode()); hr = HRESULT_FROM_WIN32(GetLastError()); } diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp index f156ec1fbc..0b987bf8cd 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp @@ -8,7 +8,7 @@ HRESULT AppOfflineTrackingApplication::StartMonitoringAppOffline() { - LOG_INFOF("Starting app_offline monitoring in application %S", m_applicationPath.c_str()); + LOG_INFOF(L"Starting app_offline monitoring in application '%ls'", m_applicationPath.c_str()); HRESULT hr = StartMonitoringAppOflineImpl(); if (FAILED_LOG(hr)) @@ -56,7 +56,7 @@ void AppOfflineTrackingApplication::OnAppOffline() return; } - LOG_INFOF("Received app_offline notification in application %S", m_applicationPath.c_str()); + LOG_INFOF(L"Received app_offline notification in application '%ls'", m_applicationPath.c_str()); EventLog::Info( ASPNETCORE_EVENT_RECYCLE_APPOFFLINE, ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG, diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp index 7c0aaccefa..9d17f95b37 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp @@ -137,7 +137,7 @@ Win32 error DWORD dwErrorStatus; ULONG_PTR completionKey; - LOG_INFO("Starting file watcher thread"); + LOG_INFO(L"Starting file watcher thread"); pFileMonitor = (FILE_WATCHER*)pvArg; DBG_ASSERT(pFileMonitor != NULL); @@ -177,7 +177,7 @@ Win32 error pFileMonitor->m_fThreadExit = TRUE; - LOG_INFO("Stopping file watcher thread"); + LOG_INFO(L"Stopping file watcher thread"); ExitThread(0); } diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index e0d49615a5..1a1a4ce490 100644 --- a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -4,6 +4,7 @@ using System; using System.IO; using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.Logging.Testing; using Xunit.Abstractions; @@ -37,6 +38,13 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting return (IISDeploymentResult)await _deployer.DeployAsync(); } + protected virtual async Task StartAsync(IISDeploymentParameters parameters) + { + var result = await DeployAsync(parameters); + await result.AssertStarts(); + return result; + } + public override void Dispose() { StopServer(false); diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 34fb88082a..9ff2fda815 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -65,12 +65,15 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { foreach (DirectoryInfo directoryInfo in source.GetDirectories()) { - CopyFiles(directoryInfo, target.CreateSubdirectory(directoryInfo.Name), logger); + if (directoryInfo.FullName != target.FullName) + { + CopyFiles(directoryInfo, target.CreateSubdirectory(directoryInfo.Name), logger); + } } - logger.LogDebug($"Processing {target.FullName}"); + logger?.LogDebug($"Processing {target.FullName}"); foreach (FileInfo fileInfo in source.GetFiles()) { - logger.LogDebug($" Copying {fileInfo.Name}"); + logger?.LogDebug($" Copying {fileInfo.Name}"); var destFileName = Path.Combine(target.FullName, fileInfo.Name); fileInfo.CopyTo(destFileName); } diff --git a/test/CommonLibTests/hostfxr_utility_tests.cpp b/test/CommonLibTests/hostfxr_utility_tests.cpp index 7d323868f8..a9beb49676 100644 --- a/test/CommonLibTests/hostfxr_utility_tests.cpp +++ b/test/CommonLibTests/hostfxr_utility_tests.cpp @@ -11,64 +11,58 @@ TEST(ParseHostFxrArguments, BasicHostFxrArguments) { std::vector bstrArray; - PCWSTR exeStr = L"C:/Program Files/dotnet.exe"; - HOSTFXR_UTILITY::ParseHostfxrArguments( + HOSTFXR_UTILITY::AppendArguments( L"exec \"test.dll\"", // args - exeStr, // exe path L"invalid", // physical path to application bstrArray); // args array. - EXPECT_EQ(3, bstrArray.size()); - ASSERT_STREQ(exeStr, bstrArray[0].c_str()); - ASSERT_STREQ(L"exec", bstrArray[1].c_str()); - ASSERT_STREQ(L"test.dll", bstrArray[2].c_str()); + EXPECT_EQ(2, bstrArray.size()); + ASSERT_STREQ(L"exec", bstrArray[0].c_str()); + ASSERT_STREQ(L"test.dll", bstrArray[1].c_str()); } TEST(ParseHostFxrArguments, NoExecProvided) { std::vector bstrArray; - PCWSTR exeStr = L"C:/Program Files/dotnet.exe"; - HOSTFXR_UTILITY::ParseHostfxrArguments( + HOSTFXR_UTILITY::AppendArguments( L"test.dll", // args - exeStr, // exe path L"ignored", // physical path to application bstrArray); // args array. - EXPECT_EQ(DWORD(2), bstrArray.size()); - ASSERT_STREQ(exeStr, bstrArray[0].c_str()); - ASSERT_STREQ(L"test.dll", bstrArray[1].c_str()); + EXPECT_EQ(1, bstrArray.size()); + ASSERT_STREQ(L"test.dll", bstrArray[0].c_str()); } TEST(ParseHostFxrArguments, ConvertDllToAbsolutePath) { std::vector bstrArray; - PCWSTR exeStr = L"C:/Program Files/dotnet.exe"; // we need to use existing dll so let's use ntdll that we know exists everywhere auto system32 = Environment::ExpandEnvironmentVariables(L"%WINDIR%\\System32"); - HOSTFXR_UTILITY::ParseHostfxrArguments( + HOSTFXR_UTILITY::AppendArguments( L"exec \"ntdll.dll\"", // args - exeStr, // exe path system32, // physical path to application bstrArray, // args array. true); // expandDllPaths - EXPECT_EQ(DWORD(3), bstrArray.size()); - ASSERT_STREQ(exeStr, bstrArray[0].c_str()); - ASSERT_STREQ(L"exec", bstrArray[1].c_str()); - ASSERT_STREQ((system32 + L"\\ntdll.dll").c_str(), bstrArray[2].c_str()); + EXPECT_EQ(2, bstrArray.size()); + ASSERT_STREQ(L"exec", bstrArray[0].c_str()); + ASSERT_STREQ((system32 + L"\\ntdll.dll").c_str(), bstrArray[1].c_str()); } TEST(ParseHostFxrArguments, ProvideNoArgs_InvalidArgs) { std::vector bstrArray; - PCWSTR exeStr = L"C:/Program Files/dotnet.exe"; + std::filesystem::path struHostFxrDllLocation; + std::filesystem::path struExeLocation; - ASSERT_THROW(HOSTFXR_UTILITY::ParseHostfxrArguments( - L"", // args - exeStr, // exe path - L"ignored", // physical path to application + EXPECT_THROW(HOSTFXR_UTILITY::GetHostFxrParameters( + L"dotnet", // processPath + L"some\\path", // application physical path, ignored. + L"", //arguments + struHostFxrDllLocation, + struExeLocation, bstrArray), // args array. HOSTFXR_UTILITY::StartupParametersResolutionException); } diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 55d399ef03..1953a6975a 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -33,13 +33,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task ExpandEnvironmentVariableInWebConfig() { // Point to dotnet installed in user profile. - await AssertStarts( - deploymentParameters => - { - deploymentParameters.EnvironmentVariables["DotnetPath"] = _dotnetLocation; - deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", "%DotnetPath%")); - } - ); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + deploymentParameters.EnvironmentVariables["DotnetPath"] = _dotnetLocation; + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", "%DotnetPath%")); + await StartAsync(deploymentParameters); } [ConditionalTheory] @@ -68,26 +65,23 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task StartsWithDotnetLocationWithoutExe() { - var dotnetLocationWithoutExtension = _dotnetLocation.Substring(0, _dotnetLocation.LastIndexOf(".")); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); - await AssertStarts( - deploymentParameters => - { - deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", dotnetLocationWithoutExtension)); - } - ); + var dotnetLocationWithoutExtension = _dotnetLocation.Substring(0, _dotnetLocation.LastIndexOf(".")); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", dotnetLocationWithoutExtension)); + + await StartAsync(deploymentParameters); } [ConditionalFact] public async Task StartsWithDotnetLocationUppercase() { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var dotnetLocationWithoutExtension = _dotnetLocation.Substring(0, _dotnetLocation.LastIndexOf(".")).ToUpperInvariant(); - await AssertStarts( - deploymentParameters => - { - deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", dotnetLocationWithoutExtension)); - } - ); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", dotnetLocationWithoutExtension)); + + await StartAsync(deploymentParameters); } [ConditionalTheory] @@ -95,32 +89,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [InlineData("dotnet.EXE")] public async Task StartsWithDotnetOnThePath(string path) { - await AssertStarts( - deploymentParameters => - { - deploymentParameters.EnvironmentVariables["PATH"] = Path.GetDirectoryName(_dotnetLocation); - deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", path)); - } - ); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + + deploymentParameters.EnvironmentVariables["PATH"] = Path.GetDirectoryName(_dotnetLocation); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", path)); + + var deploymentResult = await DeployAsync(deploymentParameters); + await deploymentResult.AssertStarts(); // Verify that in this scenario where.exe was invoked only once by shim and request handler uses cached value Assert.Equal(1, TestSink.Writes.Count(w => w.Message.Contains("Invoking where.exe to find dotnet.exe"))); } - private async Task AssertStarts(Action preDeploy = null) - { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); - - preDeploy?.Invoke(deploymentParameters); - - var deploymentResult = await DeployAsync(deploymentParameters); - - var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); - - var responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal("Hello World", responseText); - } - public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp22) @@ -132,13 +112,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task HelloWorld(TestVariant variant) { var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); - - var deploymentResult = await DeployAsync(deploymentParameters); - - var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); - var responseText = await response.Content.ReadAsStringAsync(); - - Assert.Equal("Hello World", responseText); + await StartAsync(deploymentParameters); } [ConditionalFact] @@ -194,7 +168,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalTheory] [MemberData(nameof(InvalidConfigTransformationsScenarios))] - public async Task StartsWithWebConfigVariationsPortable(string scenario) + public async Task ReportsWebConfigAuthoringErrors(string scenario) { var (expectedError, action) = InvalidConfigTransformations[scenario]; var iisDeploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); @@ -227,5 +201,148 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests )); return dictionary; } + + private static Dictionary> PortableConfigTransformations = InitPortableWebConfigTransformations(); + public static IEnumerable PortableConfigTransformationsScenarios => PortableConfigTransformations.ToTheoryData(); + + [ConditionalTheory] + [MemberData(nameof(PortableConfigTransformationsScenarios))] + public async Task StartsWithWebConfigVariationsPortable(string scenario) + { + var action = PortableConfigTransformations[scenario]; + var iisDeploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var expectedArguments = action(iisDeploymentParameters); + var result = await DeployAsync(iisDeploymentParameters); + Assert.Equal(expectedArguments, await result.HttpClient.GetStringAsync("/CommandLineArgs")); + } + + public static Dictionary> InitPortableWebConfigTransformations() + { + var dictionary = new Dictionary>(); + var pathWithSpace = "\u03c0 \u2260 3\u00b714"; + + dictionary.Add("App in bin subdirectory full path to dll using exec and quotes", + parameters => { + MoveApplication(parameters, "bin"); + TransformArguments(parameters, (arguments, root) => "exec " + Path.Combine(root, "bin", arguments)); + return ""; + }); + + dictionary.Add("App in subdirectory with space", + parameters => { + MoveApplication(parameters, pathWithSpace); + TransformArguments(parameters, (arguments, root) => Path.Combine(pathWithSpace, arguments)); + return ""; + }); + + dictionary.Add("App in subdirectory with space and full path to dll", + parameters => { + MoveApplication(parameters, pathWithSpace); + TransformArguments(parameters, (arguments, root) => Path.Combine(root, pathWithSpace, arguments)); + return ""; + }); + + dictionary.Add("App in bin subdirectory with space full path to dll using exec and quotes", + parameters => { + MoveApplication(parameters, pathWithSpace); + TransformArguments(parameters, (arguments, root) => "exec \"" + Path.Combine(root, pathWithSpace, arguments) + "\" extra arguments"); + return "extra|arguments"; + }); + + dictionary.Add("App in bin subdirectory and quoted argument", + parameters => { + MoveApplication(parameters, "bin"); + TransformArguments(parameters, (arguments, root) => Path.Combine("bin", arguments) + " \"extra argument\""); + return "extra argument"; + }); + + dictionary.Add("App in bin subdirectory full path to dll", + parameters => { + MoveApplication(parameters, "bin"); + TransformArguments(parameters, (arguments, root) => Path.Combine(root, "bin", arguments) + " extra arguments"); + return "extra|arguments"; + }); + return dictionary; + } + + + private static Dictionary> StandaloneConfigTransformations = InitStandaloneConfigTransformations(); + public static IEnumerable StandaloneConfigTransformationsScenarios => StandaloneConfigTransformations.ToTheoryData(); + + [ConditionalTheory] + [MemberData(nameof(StandaloneConfigTransformationsScenarios))] + public async Task StartsWithWebConfigVariationsStandalone(string scenario) + { + var action = StandaloneConfigTransformations[scenario]; + var iisDeploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + iisDeploymentParameters.ApplicationType = ApplicationType.Standalone; + var expectedArguments = action(iisDeploymentParameters); + var result = await DeployAsync(iisDeploymentParameters); + Assert.Equal(expectedArguments, await result.HttpClient.GetStringAsync("/CommandLineArgs")); + } + + public static Dictionary> InitStandaloneConfigTransformations() + { + var dictionary = new Dictionary>(); + var pathWithSpace = "\u03c0 \u2260 3\u00b714"; + + dictionary.Add("App in subdirectory", + parameters => { + MoveApplication(parameters, pathWithSpace); + TransformPath(parameters, (path, root) => Path.Combine(pathWithSpace, path)); + TransformArguments(parameters, (arguments, root) => "\"additional argument\""); + return "additional argument"; + }); + + dictionary.Add("App in bin subdirectory full path", + parameters => { + MoveApplication(parameters, pathWithSpace); + TransformPath(parameters, (path, root) => Path.Combine(root, pathWithSpace, path)); + TransformArguments(parameters, (arguments, root) => "additional arguments"); + return "additional|arguments"; + }); + + return dictionary; + } + + private static void MoveApplication( + IISDeploymentParameters parameters, + string subdirectory) + { + parameters.WebConfigActionList.Add((config, contentRoot) => + { + var source = new DirectoryInfo(contentRoot); + var subDirectoryPath = source.CreateSubdirectory(subdirectory); + + // Copy everything into a subfolder + Helpers.CopyFiles(source, subDirectoryPath, null); + // Cleanup files + foreach (var fileSystemInfo in source.GetFiles()) + { + fileSystemInfo.Delete(); + } + }); + } + + private static void TransformPath(IISDeploymentParameters parameters, Func transformation) + { + parameters.WebConfigActionList.Add( + (config, contentRoot) => + { + var aspNetCoreElement = config.Descendants("aspNetCore").Single(); + aspNetCoreElement.SetAttributeValue("processPath", transformation((string)aspNetCoreElement.Attribute("processPath"), contentRoot)); + }); + } + + private static void TransformArguments(IISDeploymentParameters parameters, Func transformation) + { + parameters.WebConfigActionList.Add( + (config, contentRoot) => + { + var aspNetCoreElement = config.Descendants("aspNetCore").Single(); + aspNetCoreElement.SetAttributeValue("arguments", transformation((string)aspNetCoreElement.Attribute("arguments"), contentRoot)); + }); + } + } } diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index 7142f627d3..08837417bf 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using System.Linq; using System.Net; using System.Text; using System.Threading.Tasks; @@ -46,7 +47,7 @@ namespace IISTestSite private async Task HostingEnvironment(HttpContext context) { var hostingEnv = context.RequestServices.GetService(); - + await context.Response.WriteAsync("ContentRootPath "+hostingEnv.ContentRootPath + Environment.NewLine); await context.Response.WriteAsync("WebRootPath "+hostingEnv.WebRootPath + Environment.NewLine); await context.Response.WriteAsync("CurrentDirectory "+Environment.CurrentDirectory); @@ -762,5 +763,10 @@ namespace IISTestSite } await context.Response.WriteAsync("Response End"); } + + private async Task CommandLineArgs(HttpContext context) + { + await context.Response.WriteAsync(string.Join("|", Environment.GetCommandLineArgs().Skip(1))); + } } } From 4ac3b0246eaf3dd725e419472033633b5a55aa50 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 26 Aug 2018 19:16:27 +0000 Subject: [PATCH 248/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 68 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 1027e444c9..dd1280daac 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,50 +4,50 @@ 0.10.13 - 3.0.0-alpha1-20180817.3 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 0.7.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 + 3.0.0-alpha1-20180821.3 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 0.7.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 15.6.82 15.6.82 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 - 3.0.0-alpha1-10321 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 + 3.0.0-alpha1-10352 2.0.9 2.1.2 2.2.0-preview1-26618-02 1.0.1 - 3.0.0-alpha1-10321 + 3.0.0-alpha1-10352 15.6.1 11.1.0 2.0.3 - 4.6.0-preview1-26816-01 - 4.6.0-preview1-26816-01 - 4.6.0-preview1-26816-01 + 4.6.0-preview1-26817-04 + 4.6.0-preview1-26817-04 + 4.6.0-preview1-26817-04 4.6.0-preview1-26717-04 - 4.6.0-preview1-26816-01 - 4.6.0-preview1-26816-01 - 4.6.0-preview1-26816-01 - 4.6.0-preview1-26816-01 - 4.6.0-preview1-26816-01 + 4.6.0-preview1-26817-04 + 4.6.0-preview1-26817-04 + 4.6.0-preview1-26817-04 + 4.6.0-preview1-26817-04 + 4.6.0-preview1-26817-04 9.0.1 2.3.1 2.4.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 7abb5ed14d..74c82096f1 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20180817.3 -commithash:134cdbee9bee29dd3ccb654c67663b27b9ffa6c8 +version:3.0.0-alpha1-20180821.3 +commithash:0939a90812deb1c604eb9a4768869687495fc1dd From 9f49539177173d2c03ed7d771896e6a71a0c0aad Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 27 Aug 2018 11:10:16 -0700 Subject: [PATCH 249/363] Re enable --no-restore (#1336) --- test/IISExpress.FunctionalTests/InProcess/StartupTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 1953a6975a..cab621a3e6 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -123,7 +123,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests deploymentParameters.ApplicationPublisher = null; // ReferenceTestTasks is workaround for https://github.com/dotnet/sdk/issues/2482 deploymentParameters.AdditionalPublishParameters = "-p:RuntimeIdentifier=win7-x64 -p:UseAppHost=true -p:SelfContained=false -p:ReferenceTestTasks=false"; - deploymentParameters.RestoreOnPublish = true; var deploymentResult = await DeployAsync(deploymentParameters); Assert.True(File.Exists(Path.Combine(deploymentResult.ContentRoot, "InProcessWebSite.exe"))); From 2605b943f3a262ff37709d81a1879643a50ae175 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 27 Aug 2018 16:50:16 -0700 Subject: [PATCH 250/363] Use only one log file for stdout (#1334) --- .../CommonLib/FileOutputManager.cpp | 21 +++---- .../IISDeployer.cs | 3 + .../IISExpressDeployer.cs | 2 + .../Inprocess/LoggingTests.cs | 58 +++++++++++-------- .../Utilities/Helpers.cs | 9 +++ .../Inprocess/StdOutRedirectionTests.cs | 15 ++--- 6 files changed, 63 insertions(+), 45 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp index 6e16ac2acd..15bc54cbe6 100644 --- a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp @@ -47,6 +47,8 @@ FileOutputManager::Start() SYSTEMTIME systemTime; SECURITY_ATTRIBUTES saAttr = { 0 }; STRU struPath; + FILETIME processCreationTime; + FILETIME dummyFileTime; // Concatenate the log file name and application path RETURN_IF_FAILED(FILE_UTILITY::ConvertPathToFullPath( @@ -56,18 +58,18 @@ FileOutputManager::Start() RETURN_IF_FAILED(FILE_UTILITY::EnsureDirectoryPathExist(struPath.QueryStr())); - // Get the module name and add it to the log file name - // as two log files will be created, one from the shim - // and one from the request handler. - WCHAR path[MAX_PATH]; - RETURN_LAST_ERROR_IF(!GetModuleFileName(g_hModule, path, sizeof(path))); - std::filesystem::path fsPath(path); // TODO fix string as it is incorrect - GetSystemTime(&systemTime); + RETURN_LAST_ERROR_IF(!GetProcessTimes( + GetCurrentProcess(), + &processCreationTime, + &dummyFileTime, + &dummyFileTime, + &dummyFileTime)); + RETURN_LAST_ERROR_IF(!FileTimeToSystemTime(&processCreationTime, &systemTime)); RETURN_IF_FAILED( - m_struLogFilePath.SafeSnwprintf(L"%s_%d%02d%02d%02d%02d%02d_%d_%s.log", + m_struLogFilePath.SafeSnwprintf(L"%s_%d%02d%02d%02d%02d%02d_%d.log", struPath.QueryStr(), systemTime.wYear, systemTime.wMonth, @@ -75,8 +77,7 @@ FileOutputManager::Start() systemTime.wHour, systemTime.wMinute, systemTime.wSecond, - GetCurrentProcessId(), - fsPath.filename().stem().c_str())); + GetCurrentProcessId())); saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); saAttr.bInheritHandle = TRUE; diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 743944d971..814ca5e14b 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -254,6 +254,9 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } HostProcess = Process.GetProcessById(workerProcess.ProcessId); + // cache the process start time for verifying log file name. + var _ = HostProcess.StartTime; + Logger.LogInformation("Site has started."); }); } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index 797c46dde9..8464088f48 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -249,6 +249,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS else { _hostProcess = process; + // cache the process start time for verifying log file name. + var _ = _hostProcess.StartTime; Logger.LogInformation("Started iisexpress successfully. Process Id : {processId}, Port: {port}", _hostProcess.Id, port); return (url: url, hostExitToken: hostExitTokenSource.Token); } diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index e530befc51..dd0ac8cf6c 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests @@ -18,12 +17,23 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public class LoggingTests : IISFunctionalTestBase { private readonly PublishedSitesFixture _fixture; + private readonly string _logFolderPath; public LoggingTests(PublishedSitesFixture fixture) { + _logFolderPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); _fixture = fixture; } + public override void Dispose() + { + base.Dispose(); + if (Directory.Exists(_logFolderPath)) + { + Directory.Delete(_logFolderPath, true); + } + } + [ConditionalTheory] [InlineData("CheckErrLogFile")] [InlineData("CheckLogFile")] @@ -31,35 +41,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); - deploymentParameters.WebConfigActionList.Add( - WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogEnabled", "true")); - - var pathToLogs = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); - deploymentParameters.WebConfigActionList.Add( - WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogFile", Path.Combine(pathToLogs, "std"))); + deploymentParameters.EnableLogging(_logFolderPath); var deploymentResult = await DeployAsync(deploymentParameters); + + await Helpers.AssertStarts(deploymentResult, path); - try - { - await Helpers.AssertStarts(deploymentResult, path); + StopServer(); - StopServer(); + var contents = File.ReadAllText(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath)); - var fileInDirectory = Directory.GetFiles(pathToLogs).Single(fileName => fileName.Contains("inprocess")); - var contents = File.ReadAllText(fileInDirectory); - - Assert.NotNull(contents); - Assert.Contains("TEST MESSAGE", contents); - } - finally - { - RetryHelper.RetryOperation( - () => Directory.Delete(pathToLogs, true), - e => Logger.LogWarning($"Failed to delete directory : {e.Message}"), - retryCount: 3, - retryDelayMilliseconds: 100); - } + Assert.NotNull(contents); + Assert.Contains("TEST MESSAGE", contents); } [ConditionalFact] @@ -77,6 +70,21 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await Helpers.AssertStarts(deploymentResult, "HelloWorld"); } + [ConditionalFact] + public async Task OnlyOneFileCreatedWithProcessStartTime() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + + deploymentParameters.EnableLogging(_logFolderPath); + + var deploymentResult = await DeployAsync(deploymentParameters); + await Helpers.AssertStarts(deploymentResult, "CheckLogFile"); + + StopServer(); + + Assert.Single(Directory.GetFiles(_logFolderPath), Helpers.GetExpectedLogName(deploymentResult, _logFolderPath)); + } + [ConditionalFact] public async Task StartupMessagesAreLoggedIntoDebugLogFile() { diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 9ff2fda815..27155effcc 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -142,5 +142,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { return dictionary.Keys.Select(k => new[] { k }); } + + public static string GetExpectedLogName(IISDeploymentResult deploymentResult, string logFolderPath) + { + var startTime = deploymentResult.HostProcess.StartTime.ToUniversalTime(); + return Path.Combine(logFolderPath, $"std_{startTime.Year}{startTime.Month:D2}" + + $"{startTime.Day:D2}{startTime.Hour:D2}" + + $"{startTime.Minute:D2}{startTime.Second:D2}_" + + $"{deploymentResult.HostProcess.Id}.log"); + } } } diff --git a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs index b97aaf46f5..49088180c1 100644 --- a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs +++ b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs @@ -73,8 +73,7 @@ namespace IIS.FunctionalTests.Inprocess StopServer(); - var fileInDirectory = Directory.GetFiles(_logFolderPath).Single(); - var contents = File.ReadAllText(fileInDirectory); + var contents = File.ReadAllText(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath)); var expectedString = "The specified framework 'Microsoft.NETCore.App', version '2.9.9' was not found."; EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, expectedString); Assert.Contains(expectedString, contents); @@ -98,14 +97,10 @@ namespace IIS.FunctionalTests.Inprocess StopServer(); - var filesInDirectory = Directory.GetFiles(_logFolderPath); - Assert.Equal(2, filesInDirectory.Length); - foreach (var file in filesInDirectory) - { - var contents = File.ReadAllText(file); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Invoked hostfxr"); - Assert.Contains("Invoked hostfxr", contents); - } + var fileInDirectory = Directory.GetFiles(_logFolderPath).Single(); + var contents = File.ReadAllText(fileInDirectory); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Invoked hostfxr"); + Assert.Contains("Invoked hostfxr", contents); } [ConditionalTheory] From c62c7f6a61905e789486909e3d942b45542b202e Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 28 Aug 2018 14:26:07 -0700 Subject: [PATCH 251/363] Check event logs until process start time (#1338) --- .../Utilities/EventLogHelpers.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index c85a78bdd3..6d2393f187 100644 --- a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -46,15 +46,22 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var eventLog = new EventLog("Application"); - // Perf: only get the last 20 events from the event log. // Eventlog is already sorted based on time of event in ascending time. - // Add results in reverse order. + // Check results in reverse order. var expectedRegexEventLog = new Regex(expectedRegexMatchString); var processIdString = $"Process Id: {deploymentResult.HostProcess.Id}."; - for (var i = eventLog.Entries.Count - 1; i >= eventLog.Entries.Count - 20; i--) + // Event log messages round down to the nearest second, so subtract a second + var processStartTime = deploymentResult.HostProcess.StartTime.AddSeconds(-1); + for (var i = eventLog.Entries.Count - 1; i >= 0; i--) { var eventLogEntry = eventLog.Entries[i]; + if (eventLogEntry.TimeGenerated < processStartTime) + { + // If event logs is older than the process start time, we didn't find a match. + break; + } + if (eventLogEntry.ReplacementStrings == null || eventLogEntry.ReplacementStrings.Length < 3) { From a741af1e77a6b47cecc22c11fa25156037d45666 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 30 Aug 2018 09:07:02 -0700 Subject: [PATCH 252/363] Add header to sample (#1353) --- samples/IISSample/Startup.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/samples/IISSample/Startup.cs b/samples/IISSample/Startup.cs index 138f993d9e..f99b6ad729 100644 --- a/samples/IISSample/Startup.cs +++ b/samples/IISSample/Startup.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + using System; using System.Linq; using Microsoft.AspNetCore.Authentication; From e7f3c7c62ecaa5ed7d9519fcf5b017e384e47992 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 30 Aug 2018 12:18:30 -0700 Subject: [PATCH 253/363] Remove bad rc files (#1355) --- src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc | 2 -- src/AspNetCoreModuleV2/RequestHandlerLib/aspnetcore_msg.rc | 2 -- 2 files changed, 4 deletions(-) delete mode 100644 src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc delete mode 100644 src/AspNetCoreModuleV2/RequestHandlerLib/aspnetcore_msg.rc diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc deleted file mode 100644 index 0abcb0fa2c..0000000000 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc +++ /dev/null @@ -1,2 +0,0 @@ -LANGUAGE 0x9,0x1 -1 11 "MSG00001.bin" diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/aspnetcore_msg.rc b/src/AspNetCoreModuleV2/RequestHandlerLib/aspnetcore_msg.rc deleted file mode 100644 index 0abcb0fa2c..0000000000 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/aspnetcore_msg.rc +++ /dev/null @@ -1,2 +0,0 @@ -LANGUAGE 0x9,0x1 -1 11 "MSG00001.bin" From 729a98adfc03442b27b3f7953704e7022a9e1829 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 30 Aug 2018 12:20:53 -0700 Subject: [PATCH 254/363] Call AllocConsole (#1351) --- .../CommonLib/FileOutputManager.cpp | 23 ++++++++++++++- .../CommonLib/FileOutputManager.h | 1 + .../CommonLib/LoggingHelpers.cpp | 7 ++++- .../CommonLib/PipeOutputManager.cpp | 23 ++++++++++++++- .../CommonLib/PipeOutputManager.h | 1 + .../Inprocess/StartupExceptionTests.cs | 29 +++++++++++++------ .../StartupExceptionWebSite/Program.cs | 10 +++++++ 7 files changed, 82 insertions(+), 12 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp index 15bc54cbe6..66292196a6 100644 --- a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp @@ -20,7 +20,8 @@ FileOutputManager::FileOutputManager(bool fEnableNativeLogging) : m_disposed(false), stdoutWrapper(nullptr), stderrWrapper(nullptr), - m_fEnableNativeRedirection(fEnableNativeLogging) + m_fEnableNativeRedirection(fEnableNativeLogging), + m_fCreatedConsole(false) { InitializeSRWLock(&m_srwLock); } @@ -49,6 +50,21 @@ FileOutputManager::Start() STRU struPath; FILETIME processCreationTime; FILETIME dummyFileTime; + + // To make Console.* functions work, allocate a console + // in the current process. + if (!AllocConsole()) + { + // ERROR_ACCESS_DENIED means there is a console already present. + if (GetLastError() != ERROR_ACCESS_DENIED) + { + RETURN_LAST_ERROR(); + } + } + else + { + m_fCreatedConsole = true; + } // Concatenate the log file name and application path RETURN_IF_FAILED(FILE_UTILITY::ConvertPathToFullPath( @@ -129,6 +145,11 @@ FileOutputManager::Stop() m_disposed = true; + if (m_fCreatedConsole) + { + RETURN_LAST_ERROR_IF(!FreeConsole()); + } + if (m_hLogFileHandle == INVALID_HANDLE_VALUE) { return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h index 94f6e19176..7cb3e452fa 100644 --- a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h @@ -35,6 +35,7 @@ private: STRA m_straFileContent; BOOL m_disposed; BOOL m_fEnableNativeRedirection; + BOOL m_fCreatedConsole; SRWLOCK m_srwLock{}; std::unique_ptr stdoutWrapper; std::unique_ptr stderrWrapper; diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp index 69de017e7f..3d1aacf46d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp @@ -27,13 +27,18 @@ LoggingHelpers::CreateLoggingProvider( try { + // Check if there is an existing active console window before redirecting + // Window == IISExpress with active console window, don't redirect to a pipe + // if true. + CONSOLE_SCREEN_BUFFER_INFO dummy; + if (fIsLoggingEnabled) { auto manager = std::make_unique(fEnableNativeLogging); hr = manager->Initialize(pwzStdOutFileName, pwzApplicationPath); outputManager = std::move(manager); } - else if (!GetConsoleWindow()) + else if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &dummy)) { outputManager = std::make_unique(fEnableNativeLogging); } diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp index 8ddfcb437f..20aafcc17e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp @@ -24,7 +24,8 @@ PipeOutputManager::PipeOutputManager(bool fEnableNativeLogging) : m_disposed(FALSE), m_fEnableNativeRedirection(fEnableNativeLogging), stdoutWrapper(nullptr), - stderrWrapper(nullptr) + stderrWrapper(nullptr), + m_fCreatedConsole(false) { InitializeSRWLock(&m_srwLock); } @@ -43,6 +44,21 @@ HRESULT PipeOutputManager::Start() HANDLE hStdErrReadPipe; HANDLE hStdErrWritePipe; + // To make Console.* functions work, allocate a console + // in the current process. + if (!AllocConsole()) + { + // ERROR_ACCESS_DENIED means there is a console already present. + if (GetLastError() != ERROR_ACCESS_DENIED) + { + RETURN_LAST_ERROR(); + } + } + else + { + m_fCreatedConsole = true; + } + RETURN_LAST_ERROR_IF(!CreatePipe(&hStdErrReadPipe, &hStdErrWritePipe, &saAttr, 0 /*nSize*/)); m_hErrReadPipe = hStdErrReadPipe; @@ -92,6 +108,11 @@ HRESULT PipeOutputManager::Stop() m_disposed = true; + if (m_fCreatedConsole) + { + FreeConsole(); + } + // Both pipe wrappers duplicate the pipe writer handle // meaning we are fine to close the handle too. if (m_hErrWritePipe != INVALID_HANDLE_VALUE) diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h index 0b51ff4038..e41bee6d10 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h @@ -39,6 +39,7 @@ private: SRWLOCK m_srwLock {}; BOOL m_disposed; BOOL m_fEnableNativeRedirection; + BOOL m_fCreatedConsole; std::unique_ptr stdoutWrapper; std::unique_ptr stderrWrapper; }; diff --git a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs index 1234d368fc..12eae66d01 100644 --- a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -35,13 +35,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_RANDOM_VALUE"] = randomNumberString; - var deploymentResult = await DeployAsync(deploymentParameters); - - var response = await deploymentResult.HttpClient.GetAsync(path); - - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); - - StopServer(); + await AssertFailsToStart(path, deploymentParameters); Assert.Contains(TestSink.Writes, context => context.Message.Contains($"Random number: {randomNumberString}")); } @@ -56,6 +50,25 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + await AssertFailsToStart(path, deploymentParameters); + + Assert.Contains(TestSink.Writes, context => context.Message.Contains(new string('a', 4096))); + } + + [ConditionalFact] + public async Task CheckValidConsoleFunctions() + { + var path = "CheckConsoleFunctions"; + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + + await AssertFailsToStart(path, deploymentParameters); + + Assert.Contains(TestSink.Writes, context => context.Message.Contains("Is Console redirection: True")); + } + + private async Task AssertFailsToStart(string path, IntegrationTesting.IIS.IISDeploymentParameters deploymentParameters) + { var deploymentResult = await DeployAsync(deploymentParameters); var response = await deploymentResult.HttpClient.GetAsync(path); @@ -63,8 +76,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); StopServer(); - - Assert.Contains(TestSink.Writes, context => context.Message.Contains(new string('a', 4096))); } [ConditionalFact] diff --git a/test/WebSites/StartupExceptionWebSite/Program.cs b/test/WebSites/StartupExceptionWebSite/Program.cs index 283a0136ce..44c8b1f461 100644 --- a/test/WebSites/StartupExceptionWebSite/Program.cs +++ b/test/WebSites/StartupExceptionWebSite/Program.cs @@ -2,6 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO; +using System.Text; namespace IISTestSite { @@ -41,6 +43,14 @@ namespace IISTestSite Console.Error.WriteLine(new string('a', 4096)); Console.Error.Flush(); } + else if (envVariable == "CheckConsoleFunctions") + { + // Call a bunch of console functions and make sure none return invalid handle. + Console.OutputEncoding = Encoding.UTF8; + Console.Title = "Test"; + Console.WriteLine($"Is Console redirection: {Console.IsOutputRedirected}"); + Console.BackgroundColor = ConsoleColor.Blue; + } } } } From db01ae37170c948bf9b6d61332d67c4d0bdb6e8d Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 31 Aug 2018 08:16:07 -0700 Subject: [PATCH 255/363] Remove FreeConsole calls. (#1358) --- .../CommonLib/FileOutputManager.cpp | 12 +----------- src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h | 1 - .../CommonLib/PipeOutputManager.cpp | 12 +----------- src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h | 1 - 4 files changed, 2 insertions(+), 24 deletions(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp index 66292196a6..69cc0fe76a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp @@ -20,8 +20,7 @@ FileOutputManager::FileOutputManager(bool fEnableNativeLogging) : m_disposed(false), stdoutWrapper(nullptr), stderrWrapper(nullptr), - m_fEnableNativeRedirection(fEnableNativeLogging), - m_fCreatedConsole(false) + m_fEnableNativeRedirection(fEnableNativeLogging) { InitializeSRWLock(&m_srwLock); } @@ -61,10 +60,6 @@ FileOutputManager::Start() RETURN_LAST_ERROR(); } } - else - { - m_fCreatedConsole = true; - } // Concatenate the log file name and application path RETURN_IF_FAILED(FILE_UTILITY::ConvertPathToFullPath( @@ -145,11 +140,6 @@ FileOutputManager::Stop() m_disposed = true; - if (m_fCreatedConsole) - { - RETURN_LAST_ERROR_IF(!FreeConsole()); - } - if (m_hLogFileHandle == INVALID_HANDLE_VALUE) { return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h index 7cb3e452fa..94f6e19176 100644 --- a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h @@ -35,7 +35,6 @@ private: STRA m_straFileContent; BOOL m_disposed; BOOL m_fEnableNativeRedirection; - BOOL m_fCreatedConsole; SRWLOCK m_srwLock{}; std::unique_ptr stdoutWrapper; std::unique_ptr stderrWrapper; diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp index 20aafcc17e..60c2723fcb 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp @@ -24,8 +24,7 @@ PipeOutputManager::PipeOutputManager(bool fEnableNativeLogging) : m_disposed(FALSE), m_fEnableNativeRedirection(fEnableNativeLogging), stdoutWrapper(nullptr), - stderrWrapper(nullptr), - m_fCreatedConsole(false) + stderrWrapper(nullptr) { InitializeSRWLock(&m_srwLock); } @@ -54,10 +53,6 @@ HRESULT PipeOutputManager::Start() RETURN_LAST_ERROR(); } } - else - { - m_fCreatedConsole = true; - } RETURN_LAST_ERROR_IF(!CreatePipe(&hStdErrReadPipe, &hStdErrWritePipe, &saAttr, 0 /*nSize*/)); @@ -108,11 +103,6 @@ HRESULT PipeOutputManager::Stop() m_disposed = true; - if (m_fCreatedConsole) - { - FreeConsole(); - } - // Both pipe wrappers duplicate the pipe writer handle // meaning we are fine to close the handle too. if (m_hErrWritePipe != INVALID_HANDLE_VALUE) diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h index e41bee6d10..0b51ff4038 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h @@ -39,7 +39,6 @@ private: SRWLOCK m_srwLock {}; BOOL m_disposed; BOOL m_fEnableNativeRedirection; - BOOL m_fCreatedConsole; std::unique_ptr stdoutWrapper; std::unique_ptr stderrWrapper; }; From 0459b6d0d48635e72939ecf789cad32fb41578ba Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 31 Aug 2018 09:05:46 -0700 Subject: [PATCH 256/363] Fix dotnet.exe abort exception and startup/shutdown timeouts (#1352) --- .../AspNetCore/HandlerResolver.cpp | 6 +- .../AspNetCore/applicationmanager.h | 2 - .../CommonLib/CommonLib.vcxproj | 3 +- .../CommonLib/ConfigurationSection.cpp | 10 + .../CommonLib/ConfigurationSection.h | 4 + .../CommonLib/InvalidOperationException.h | 22 + .../CommonLib/ModuleHelpers.h | 20 + .../WebConfigConfigurationSection.cpp | 11 + .../CommonLib/WebConfigConfigurationSection.h | 1 + .../CommonLib/application.h | 12 +- src/AspNetCoreModuleV2/CommonLib/exceptions.h | 12 +- .../CommonLib/hostfxr_utility.cpp | 20 +- .../CommonLib/hostfxr_utility.h | 16 +- .../CommonLib/hostfxroptions.cpp | 31 +- .../CommonLib/hostfxroptions.h | 8 +- src/AspNetCoreModuleV2/CommonLib/resources.h | 9 +- .../InProcessApplicationBase.cpp | 18 +- .../InProcessApplicationBase.h | 4 - .../InProcessOptions.cpp | 37 + .../InProcessOptions.h | 17 + .../StartupExceptionApplication.cpp | 2 +- .../StartupExceptionApplication.h | 23 - .../StartupExceptionHandler.cpp | 30 +- .../StartupExceptionHandler.h | 15 +- .../InProcessRequestHandler/dllmain.cpp | 36 +- .../inprocessapplication.cpp | 751 ++++++++---------- .../inprocessapplication.h | 155 ++-- .../inprocesshandler.h | 12 +- .../IISDeploymentParameterExtensions.cs | 20 + .../IISExpressDeployer.cs | 2 +- .../ConfigurationChangeTests.cs | 2 +- .../Inprocess/EventLogTests.cs | 4 +- .../Inprocess/StartupExceptionTests.cs | 28 +- .../MultiApplicationTests.cs | 4 +- .../Utilities/EventLogHelpers.cs | 107 ++- test/CommonLibTests/CommonLibTests.vcxproj | 8 +- test/CommonLibTests/hostfxr_utility_tests.cpp | 4 +- .../inprocess_application_tests.cpp | 2 +- .../Inprocess/StdOutRedirectionTests.cs | 10 +- .../InProcess/ShutdownTests.cs | 33 +- .../InProcess/StartupTests.cs | 114 ++- .../StartupExceptionWebSite/Program.cs | 93 ++- 42 files changed, 962 insertions(+), 756 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index 2c79f60a85..bd7dacfb34 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -56,10 +56,10 @@ HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, Shim std::unique_ptr outputManager; RETURN_IF_FAILED(HOSTFXR_OPTIONS::Create( - NULL, - pConfiguration.QueryProcessPath().c_str(), + L"", + pConfiguration.QueryProcessPath(), pApplication.GetApplicationPhysicalPath(), - pConfiguration.QueryArguments().c_str(), + pConfiguration.QueryArguments(), options)); location = options->GetDotnetExeLocation(); diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h index 5cb341087d..ab3fbe9746 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h @@ -8,8 +8,6 @@ #include "exceptions.h" #include -#define DEFAULT_HASH_BUCKETS 17 - // // This class will manage the lifecycle of all Asp.Net Core applciation // It should be global singleton. diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index ef9f1c1986..20e37c30f3 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -195,7 +195,6 @@ - @@ -211,9 +210,11 @@ + + diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp b/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp index 77c3319dd1..11e790cff7 100644 --- a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp @@ -26,6 +26,16 @@ bool ConfigurationSection::GetRequiredBool(const std::wstring& name) const return result.value(); } +DWORD ConfigurationSection::GetRequiredLong(const std::wstring& name) const +{ + auto result = GetLong(name); + if (!result.has_value()) + { + ThrowRequiredException(name); + } + return result.value(); +} + DWORD ConfigurationSection::GetRequiredTimespan(const std::wstring& name) const { auto result = GetTimespan(name); diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h b/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h index 163f50f8e5..f998478db2 100644 --- a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h +++ b/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h @@ -17,6 +17,8 @@ #define CS_ASPNETCORE_PROCESS_EXE_PATH L"processPath" #define CS_ASPNETCORE_PROCESS_ARGUMENTS L"arguments" #define CS_ASPNETCORE_PROCESS_ARGUMENTS_DEFAULT L"" +#define CS_ASPNETCORE_PROCESS_STARTUP_TIME_LIMIT L"startupTimeLimit" +#define CS_ASPNETCORE_PROCESS_SHUTDOWN_TIME_LIMIT L"shutdownTimeLimit" #define CS_ASPNETCORE_HOSTING_MODEL_OUTOFPROCESS L"outofprocess" #define CS_ASPNETCORE_HOSTING_MODEL_INPROCESS L"inprocess" #define CS_ASPNETCORE_HOSTING_MODEL L"hostingModel" @@ -31,10 +33,12 @@ public: virtual ~ConfigurationSection() = default; virtual std::optional GetString(const std::wstring& name) const = 0; virtual std::optional GetBool(const std::wstring& name) const = 0; + virtual std::optional GetLong(const std::wstring& name) const = 0; virtual std::optional GetTimespan(const std::wstring& name) const = 0; std::wstring GetRequiredString(const std::wstring& name) const; bool GetRequiredBool(const std::wstring& name) const; + DWORD GetRequiredLong(const std::wstring& name) const; DWORD GetRequiredTimespan(const std::wstring& name) const; virtual std::vector> GetKeyValuePairs(const std::wstring& name) const = 0; diff --git a/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h b/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h new file mode 100644 index 0000000000..3963091911 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h @@ -0,0 +1,22 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +#include + +class InvalidOperationException: public std::runtime_error +{ + public: + InvalidOperationException(std::wstring msg) + : runtime_error("InvalidOperationException"), message(std::move(msg)) + { + } + + std::wstring as_wstring() const + { + return message; + } + + private: + std::wstring message; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h b/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h new file mode 100644 index 0000000000..0ef9a7662d --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +#include "HandleWrapper.h" +#include "exceptions.h" + +extern HMODULE g_hModule; + +class ModuleHelpers +{ +public: + static + void IncrementCurrentModuleRefCount(HandleWrapper &handle) + { + WCHAR path[MAX_PATH]; + THROW_LAST_ERROR_IF(!GetModuleFileName(g_hModule, path, sizeof(path))); + THROW_LAST_ERROR_IF(!GetModuleHandleEx(0, path, &handle)); + } +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp index aa2495359b..7003442f01 100644 --- a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp @@ -28,6 +28,17 @@ std::optional WebConfigConfigurationSection::GetBool(const std::wstring& n return std::make_optional(result); } +std::optional WebConfigConfigurationSection::GetLong(const std::wstring& name) const +{ + DWORD result; + if (FAILED_LOG(GetElementDWORDProperty(m_element, name.c_str(), &result))) + { + return std::nullopt; + } + + return std::make_optional(result); +} + std::optional WebConfigConfigurationSection::GetTimespan(const std::wstring& name) const { ULONGLONG result; diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h index c2f87a9cfe..b206c02049 100644 --- a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h +++ b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h @@ -17,6 +17,7 @@ public: std::optional GetString(const std::wstring& name) const override; std::optional GetBool(const std::wstring& name) const override; + std::optional GetLong(const std::wstring& name) const override; std::optional GetTimespan(const std::wstring& name) const override; std::vector> GetKeyValuePairs(const std::wstring& name) const override; diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index 5e87e4ddf8..e99159d324 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -7,6 +7,7 @@ #include "iapplication.h" #include "ntassert.h" #include "SRWExclusiveLock.h" +#include "SRWSharedLock.h" class APPLICATION : public IAPPLICATION { @@ -15,11 +16,6 @@ public: APPLICATION(const APPLICATION&) = delete; const APPLICATION& operator=(const APPLICATION&) = delete; - APPLICATION_STATUS - QueryStatus() override - { - return m_fStopCalled ? APPLICATION_STATUS::RECYCLED : APPLICATION_STATUS::RUNNING; - } APPLICATION(const IHttpApplication& pHttpApplication) : m_fStopCalled(false), @@ -32,6 +28,12 @@ public: m_applicationVirtualPath = ToVirtualPath(m_applicationConfigPath); } + APPLICATION_STATUS + QueryStatus() override + { + SRWSharedLock stateLock(m_stateLock); + return m_fStopCalled ? APPLICATION_STATUS::RECYCLED : APPLICATION_STATUS::RUNNING; + } VOID Stop(bool fServerInitiated) override diff --git a/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/AspNetCoreModuleV2/CommonLib/exceptions.h index 8d9a50ded3..0bf30d1bcc 100644 --- a/src/AspNetCoreModuleV2/CommonLib/exceptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/exceptions.h @@ -3,10 +3,12 @@ #pragma once +#include #include #include "debugutil.h" #include "StringHelpers.h" +#include "InvalidOperationException.h" #define LOCATION_INFO_ENABLED TRUE @@ -41,10 +43,10 @@ #define FINISHED_LAST_ERROR_IF(condition) do { if (condition) { hr = LogLastError(LOCATION_INFO); goto Finished; }} while (0, 0) #define FINISHED_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { hr = LogLastError(LOCATION_INFO); goto Finished; }} while (0, 0) -#define THROW_LAST_ERROR() do { ThrowResultException(LogLastError(LOCATION_INFO)); } while (0, 0) +#define THROW_LAST_ERROR() do { ThrowResultException(LOCATION_INFO, LogLastError(LOCATION_INFO)); } while (0, 0) #define THROW_IF_FAILED(hr) do { HRESULT __hrRet = hr; if (FAILED(__hrRet)) { ThrowResultException(LOCATION_INFO, __hrRet); }} while (0, 0) -#define THROW_LAST_ERROR_IF(condition) do { if (condition) { ThrowResultException(LogLastError(LOCATION_INFO)); }} while (0, 0) -#define THROW_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { ThrowResultException(LogLastError(LOCATION_INFO)); }} while (0, 0) +#define THROW_LAST_ERROR_IF(condition) do { if (condition) { ThrowResultException(LOCATION_INFO, LogLastError(LOCATION_INFO)); }} while (0, 0) +#define THROW_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { ThrowResultException(LOCATION_INFO, LogLastError(LOCATION_INFO)); }} while (0, 0) #define THROW_IF_NULL_ALLOC(ptr) Throw_IfNullAlloc(ptr) @@ -152,3 +154,7 @@ template auto Throw_IfNullAlloc(PointerT pointer) } return pointer; } +__declspec(noinline) inline std::wstring GetUnexpectedExceptionMessage(std::runtime_error& ex) +{ + return format(L"Unexpected exception: %S", ex.what()); +} diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp index eb82490ced..bc27526a41 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp @@ -41,7 +41,7 @@ HOSTFXR_UTILITY::GetHostFxrParameters( } else if (!ends_with(expandedProcessPath, L".exe", true)) { - throw StartupParametersResolutionException(format(L"Process path '%s' doesn't have '.exe' extension.", expandedProcessPath.c_str())); + throw InvalidOperationException(format(L"Process path '%s' doesn't have '.exe' extension.", expandedProcessPath.c_str())); } // Check if the absolute path is to dotnet or not. @@ -51,7 +51,7 @@ HOSTFXR_UTILITY::GetHostFxrParameters( if (applicationArguments.empty()) { - throw StartupParametersResolutionException(L"Application arguments are empty."); + throw InvalidOperationException(L"Application arguments are empty."); } if (dotnetExePath.empty()) @@ -92,7 +92,7 @@ HOSTFXR_UTILITY::GetHostFxrParameters( LOG_INFOF(L"Checking application.dll at '%ls'", applicationDllPath.c_str()); if (!is_regular_file(applicationDllPath)) { - throw StartupParametersResolutionException(format(L"Application .dll was not found at %s", applicationDllPath.c_str())); + throw InvalidOperationException(format(L"Application .dll was not found at %s", applicationDllPath.c_str())); } hostFxrDllPath = executablePath.parent_path() / "hostfxr.dll"; @@ -131,7 +131,7 @@ HOSTFXR_UTILITY::GetHostFxrParameters( // If the processPath file does not exist and it doesn't include dotnet.exe or dotnet // then it is an invalid argument. // - throw StartupParametersResolutionException(format(L"Executable was not found at '%s'", executablePath.c_str())); + throw InvalidOperationException(format(L"Executable was not found at '%s'", executablePath.c_str())); } } } @@ -185,7 +185,7 @@ HOSTFXR_UTILITY::AppendArguments( auto pwzArgs = std::unique_ptr(CommandLineToArgvW(applicationArguments.c_str(), &argc)); if (!pwzArgs) { - throw StartupParametersResolutionException(format(L"Unable parse command line arguments '%s'", applicationArguments.c_str())); + throw InvalidOperationException(format(L"Unable parse command line arguments '%s'", applicationArguments.c_str())); } for (int intArgsProcessed = 0; intArgsProcessed < argc; intArgsProcessed++) @@ -246,7 +246,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( { LOG_INFOF(L"Absolute path to dotnet.exe was not found at '%ls'", requestedPath.c_str()); - throw StartupParametersResolutionException(format(L"Could not find dotnet.exe at '%s'", processPath.c_str())); + throw InvalidOperationException(format(L"Could not find dotnet.exe at '%s'", processPath.c_str())); } const auto dotnetViaWhere = InvokeWhereToFindDotnet(); @@ -266,7 +266,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToDotnet( } LOG_INFOF(L"dotnet.exe not found"); - throw StartupParametersResolutionException(format( + throw InvalidOperationException(format( L"Could not find dotnet.exe at '%s' or using the system PATH environment variable." " Check that a valid path to dotnet is on the PATH and the bitness of dotnet matches the bitness of the IIS worker process.", processPath.c_str())); @@ -284,14 +284,14 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( if (!is_directory(hostFxrBase)) { - throw StartupParametersResolutionException(format(L"Unable to find hostfxr directory at %s", hostFxrBase.c_str())); + throw InvalidOperationException(format(L"Unable to find hostfxr directory at %s", hostFxrBase.c_str())); } FindDotNetFolders(hostFxrBase, versionFolders); if (versionFolders.empty()) { - throw StartupParametersResolutionException(format(L"Hostfxr directory '%s' doesn't contain any version subdirectories", hostFxrBase.c_str())); + throw InvalidOperationException(format(L"Hostfxr directory '%s' doesn't contain any version subdirectories", hostFxrBase.c_str())); } const auto highestVersion = FindHighestDotNetVersion(versionFolders); @@ -299,7 +299,7 @@ HOSTFXR_UTILITY::GetAbsolutePathToHostFxr( if (!is_regular_file(hostFxrPath)) { - throw StartupParametersResolutionException(format(L"hostfxr.dll not found at '%s'", hostFxrPath.c_str())); + throw InvalidOperationException(format(L"hostfxr.dll not found at '%s'", hostFxrPath.c_str())); } LOG_INFOF(L"hostfxr.dll located at '%ls'", hostFxrPath.c_str()); diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h index d13b7e139e..c015fadc88 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h @@ -29,20 +29,6 @@ public: std::vector &arguments ); - class StartupParametersResolutionException: public std::runtime_error - { - public: - StartupParametersResolutionException(std::wstring msg) - : runtime_error("Startup parameter resulution error occured"), message(std::move(msg)) - { - } - - std::wstring get_message() const { return message; } - - private: - std::wstring message; - }; - static void AppendArguments( @@ -96,7 +82,7 @@ private: struct LocalFreeDeleter { - void operator ()(LPWSTR* ptr) const + void operator ()(_In_ LPWSTR* ptr) const { LocalFree(ptr); } diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp index 9e1d8ab609..060224c60d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp @@ -9,18 +9,19 @@ #include "EventLog.h" HRESULT HOSTFXR_OPTIONS::Create( - _In_ PCWSTR pcwzDotnetExePath, - _In_ PCWSTR pcwzProcessPath, - _In_ PCWSTR pcwzApplicationPhysicalPath, - _In_ PCWSTR pcwzArguments, + _In_ const std::wstring& pcwzDotnetExePath, + _In_ const std::wstring& pcwzProcessPath, + _In_ const std::wstring& pcwzApplicationPhysicalPath, + _In_ const std::wstring& pcwzArguments, _Out_ std::unique_ptr& ppWrapper) { std::filesystem::path knownDotnetLocation; - if (pcwzDotnetExePath != nullptr) + if (!pcwzDotnetExePath.empty()) { knownDotnetLocation = pcwzDotnetExePath; } + try { std::filesystem::path hostFxrDllPath; @@ -40,17 +41,25 @@ HRESULT HOSTFXR_OPTIONS::Create( } ppWrapper = std::make_unique(knownDotnetLocation, hostFxrDllPath, arguments); } - catch (HOSTFXR_UTILITY::StartupParametersResolutionException &resolutionException) + catch (InvalidOperationException &ex) { - OBSERVE_CAUGHT_EXCEPTION(); - EventLog::Error( ASPNETCORE_EVENT_INPROCESS_START_ERROR, ASPNETCORE_EVENT_INPROCESS_START_ERROR_MSG, - pcwzApplicationPhysicalPath, - resolutionException.get_message().c_str()); + pcwzApplicationPhysicalPath.c_str(), + ex.as_wstring().c_str()); - return E_FAIL; + RETURN_CAUGHT_EXCEPTION(); + } + catch (std::runtime_error &ex) + { + EventLog::Error( + ASPNETCORE_EVENT_INPROCESS_START_ERROR, + ASPNETCORE_EVENT_INPROCESS_START_ERROR_MSG, + pcwzApplicationPhysicalPath.c_str(), + GetUnexpectedExceptionMessage(ex).c_str()); + + RETURN_CAUGHT_EXCEPTION(); } CATCH_RETURN(); diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h index 50bdfe1ded..8c42d08c37 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h @@ -48,10 +48,10 @@ public: static HRESULT Create( - _In_ PCWSTR pcwzExeLocation, - _In_ PCWSTR pcwzProcessPath, - _In_ PCWSTR pcwzApplicationPhysicalPath, - _In_ PCWSTR pcwzArguments, + _In_ const std::wstring& pcwzExeLocation, + _In_ const std::wstring& pcwzProcessPath, + _In_ const std::wstring& pcwzApplicationPhysicalPath, + _In_ const std::wstring& pcwzArguments, _Out_ std::unique_ptr& ppWrapper); private: diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index c9cca2b8b6..790e849516 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -24,14 +24,14 @@ #define ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE_MSG L"Failed to gracefully shutdown process '%d'." #define ASPNETCORE_EVENT_SENT_SHUTDOWN_HTTP_REQUEST_MSG L"Sent shutdown HTTP message to process '%d' and received http status '%d'." #define ASPNETCORE_EVENT_APP_SHUTDOWN_FAILURE_MSG L"Failed to gracefully shutdown application '%s'." -#define ASPNETCORE_EVENT_LOAD_CLR_FALIURE_MSG L"Application '%s' with physical root '%s' failed to load clr and managed application, ErrorCode = '0x%x." +#define ASPNETCORE_EVENT_LOAD_CLR_FALIURE_MSG L"Application '%s' with physical root '%s' failed to load clr and managed application. %s" #define ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL_MSG L"Application '%s' has shutdown." #define ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG L"Only one inprocess application is allowed per IIS application pool. Please assign the application '%s' to a different IIS application pool." #define ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG L"Mixed hosting model is not supported. Application '%s' configured with different hostingModel value '%d' other than the one of running application(s)." #define ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG L"Configuration load error. %s" #define ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG L"Failed to start application '%s', ErrorCode '0x%x'." -#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x'. Last 4KB characters of captured stdout and stderr logs:\r\n%s" -#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, ErrorCode = '0x%x'. Please check the stderr logs for more information." +#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, exit code = '%d'. Last 4KB characters of captured stdout and stderr logs:\r\n%s" +#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, exit code = '%d'. Please check the stderr logs for more information." #define ASPNETCORE_EVENT_APP_IN_SHUTDOWN_MSG L"Application shutting down." #define ASPNETCORE_EVENT_RECYCLE_APPOFFLINE_MSG L"Application '%s' was recycled after detecting the app_offline file." #define ASPNETCORE_EVENT_MONITOR_APPOFFLINE_ERROR_MSG L"Monitoring app_offline.htm failed for application '%s', ErrorCode '0x%x'. " @@ -39,7 +39,8 @@ #define ASPNETCORE_EVENT_RECYCLE_FAILURE_CONFIGURATION_MSG L"Failed to recycle application due to a configuration change at '%s'. Recycling worker process." #define ASPNETCORE_EVENT_MODULE_DISABLED_MSG L"AspNetCore Module is disabled" #define ASPNETCORE_EVENT_HOSTFXR_DLL_INVALID_VERSION_MSG L"Hostfxr version used does not support 'hostfxr_get_native_search_directories', update the version of hostfxr to a higher version. Path to hostfxr: '%s'." -#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, ErrorCode = '0x%x. Please check the stderr logs for more information." +#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, exception code = '0x%x. Please check the stderr logs for more information." +#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, exception code = '0x%x. Last 4KB characters of captured stdout and stderr logs:\r\n%s" #define ASPNETCORE_EVENT_INPROCESS_RH_ERROR_MSG L"Could not find the assembly '%s' for in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application. Captured output: %s" #define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for out-of-process application. Please confirm the assembly is installed correctly for IIS or IISExpress." #define ASPNETCORE_EVENT_INPROCESS_START_SUCCESS_MSG L"Application '%s' started the coreclr in-process successfully." diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp index 0abdc42025..fb9fe8a015 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp @@ -3,8 +3,6 @@ #include "InProcessApplicationBase.h" -hostfxr_main_fn InProcessApplicationBase::s_fMainCallback = NULL; - InProcessApplicationBase::InProcessApplicationBase( IHttpServer& pHttpServer, IHttpApplication& pHttpApplication) @@ -35,7 +33,21 @@ InProcessApplicationBase::StopInternal(bool fServerInitiated) } else { - exit(0); + // Send WM_QUIT to the main window to initiate graceful shutdown + EnumWindows([](HWND hwnd, LPARAM) -> BOOL + { + DWORD processId; + + if (GetWindowThreadProcessId(hwnd, &processId) && + processId == GetCurrentProcessId() && + GetConsoleWindow() != hwnd) + { + PostMessage(hwnd, WM_QUIT, 0, 0); + return false; + } + + return true; + }, 0); } } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h index bb343725f5..5bc2dd41e1 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h @@ -3,7 +3,6 @@ #pragma once -#include "application.h" #include "AppOfflineTrackingApplication.h" typedef INT(*hostfxr_main_fn) (CONST DWORD argc, CONST PCWSTR argv[]); // TODO these may need to be BSTRs @@ -23,8 +22,5 @@ public: protected: BOOL m_fRecycleCalled; IHttpServer& m_pHttpServer; - // Allows to override call to hostfxr_main with custome callback - // used in testing - static hostfxr_main_fn s_fMainCallback; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp index 6b26b3dcc9..1b3e22e1dc 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp @@ -2,6 +2,41 @@ // Licensed under the MIT License. See License.txt in the project root for license information. #include "InProcessOptions.h" +#include "InvalidOperationException.h" +#include "EventLog.h" + +HRESULT InProcessOptions::Create( + IHttpServer& pServer, + IHttpApplication& pHttpApplication, + std::unique_ptr& options) +{ + try + { + const WebConfigConfigurationSource configurationSource(pServer.GetAdminManager(), pHttpApplication); + options = std::make_unique(configurationSource); + } + catch (InvalidOperationException& ex) + { + EventLog::Error( + ASPNETCORE_CONFIGURATION_LOAD_ERROR, + ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG, + ex.as_wstring().c_str()); + + RETURN_CAUGHT_EXCEPTION(); + } + catch (std::runtime_error& ex) + { + EventLog::Error( + ASPNETCORE_CONFIGURATION_LOAD_ERROR, + ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG, + GetUnexpectedExceptionMessage(ex).c_str()); + + RETURN_CAUGHT_EXCEPTION(); + } + CATCH_RETURN(); + + return S_OK; +} InProcessOptions::InProcessOptions(const ConfigurationSource &configurationSource) : m_fStdoutLogEnabled(false), @@ -18,6 +53,8 @@ InProcessOptions::InProcessOptions(const ConfigurationSource &configurationSourc m_struStdoutLogFile = aspNetCoreSection->GetRequiredString(CS_ASPNETCORE_STDOUT_LOG_FILE); m_fDisableStartUpErrorPage = aspNetCoreSection->GetRequiredBool(CS_ASPNETCORE_DISABLE_START_UP_ERROR_PAGE); m_environmentVariables = aspNetCoreSection->GetKeyValuePairs(CS_ASPNETCORE_ENVIRONMENT_VARIABLES); + m_dwStartupTimeLimitInMS = aspNetCoreSection->GetRequiredLong(CS_ASPNETCORE_PROCESS_STARTUP_TIME_LIMIT) * 1000; + m_dwShutdownTimeLimitInMS = aspNetCoreSection->GetRequiredLong(CS_ASPNETCORE_PROCESS_SHUTDOWN_TIME_LIMIT) * 1000; const auto basicAuthSection = configurationSource.GetSection(CS_BASIC_AUTHENTICATION_SECTION); m_fBasicAuthEnabled = basicAuthSection && basicAuthSection->GetBool(CS_ENABLED).value_or(false); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h index c0509b3003..e299c2033e 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h @@ -5,6 +5,7 @@ #include #include "ConfigurationSource.h" +#include "WebConfigConfigurationSource.h" class InProcessOptions: NonCopyable { @@ -60,12 +61,22 @@ public: DWORD QueryStartupTimeLimitInMS() const { + if (IsDebuggerPresent()) + { + return INFINITE; + } + return m_dwStartupTimeLimitInMS; } DWORD QueryShutdownTimeLimitInMS() const { + if (IsDebuggerPresent()) + { + return INFINITE; + } + return m_dwShutdownTimeLimitInMS; } @@ -76,6 +87,12 @@ public: } InProcessOptions(const ConfigurationSource &configurationSource); + + static + HRESULT InProcessOptions::Create( + IHttpServer& pServer, + IHttpApplication& pHttpApplication, + std::unique_ptr& options); private: std::wstring m_strArguments; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp index fbb5350d62..b198e95909 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp @@ -5,6 +5,6 @@ HRESULT StartupExceptionApplication::CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler) { - *pRequestHandler = new StartupExceptionHandler(pHttpContext, m_disableLogs, this); + *pRequestHandler = new StartupExceptionHandler(pHttpContext, m_disableLogs); return S_OK; } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h index 369c57adfe..d3505315be 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h @@ -16,29 +16,6 @@ public: : m_disableLogs(disableLogs), InProcessApplicationBase(pServer, pApplication) { - html500Page = std::string(" \ - \ - \ - \ - IIS 500.30 Error \ -
\ -

HTTP Error 500.30 - ANCM In-Process Start Failure

\ -
\ -

Common causes of this issue:

\ -
  • The application failed to start
    • \ -
  • The application started but then stopped
    • \ -
  • The application started but threw an exception during startup
\ -
\ -
\ -

Troubleshooting steps:

\ -
  • Check the system event log for error messages
    • \ -
  • Enable logging the application process' stdout messages
    • \ -
  • Attach a debugger to the application process and inspect
\ -

For more information visit: \ - https://go.microsoft.com/fwlink/?LinkID=808681

\ -
\ -
\ -
"); } ~StartupExceptionApplication() = default; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp index f8041a0f13..d180460898 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp @@ -4,6 +4,30 @@ #include "StartupExceptionApplication.h" #include "StartupExceptionHandler.h" +std::string StartupExceptionHandler::s_html500Page = " \ + \ + \ + \ + IIS 500.30 Error \ +
\ +

HTTP Error 500.30 - ANCM In-Process Start Failure

\ +
\ +

Common causes of this issue:

\ +
  • The application failed to start
    • \ +
  • The application started but then stopped
    • \ +
  • The application started but threw an exception during startup
\ +
\ +
\ +

Troubleshooting steps:

\ +
  • Check the system event log for error messages
    • \ +
  • Enable logging the application process' stdout messages
    • \ +
  • Attach a debugger to the application process and inspect
\ +

For more information visit: \ + https://go.microsoft.com/fwlink/?LinkID=808681

\ +
\ +
\ +
"; + REQUEST_NOTIFICATION_STATUS StartupExceptionHandler::OnExecuteRequestHandler() { if (!m_disableLogs) @@ -16,11 +40,9 @@ REQUEST_NOTIFICATION_STATUS StartupExceptionHandler::OnExecuteRequestHandler() (USHORT)strlen("text/html"), FALSE ); - const std::string& html500Page = m_pApplication->GetStaticHtml500Content(); - DataChunk.DataChunkType = HttpDataChunkFromMemory; - DataChunk.FromMemory.pBuffer = (PVOID)html500Page.c_str(); - DataChunk.FromMemory.BufferLength = (ULONG)html500Page.size(); + DataChunk.FromMemory.pBuffer = (PVOID)s_html500Page.c_str(); + DataChunk.FromMemory.BufferLength = (ULONG)s_html500Page.size(); pResponse->WriteEntityChunkByReference(&DataChunk); } else diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h index 9b5a9ba45d..266474e1b5 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h @@ -3,6 +3,7 @@ #pragma once +#include #include "requesthandler.h" class StartupExceptionApplication; @@ -10,19 +11,23 @@ class StartupExceptionApplication; class StartupExceptionHandler : public REQUEST_HANDLER { public: - StartupExceptionHandler(IHttpContext* pContext, BOOL disableLogs, StartupExceptionApplication* pApplication) + StartupExceptionHandler(IHttpContext* pContext, BOOL disableLogs) : m_pContext(pContext), - m_disableLogs(disableLogs), - m_pApplication(pApplication) + m_disableLogs(disableLogs) { } - + ~StartupExceptionHandler() + { + + } REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override; private: IHttpContext * m_pContext; BOOL m_disableLogs; - StartupExceptionApplication* m_pApplication; + + static + std::string s_html500Page; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp index 90779ce6d8..32a314dd50 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp @@ -110,39 +110,25 @@ CreateApplication( return S_OK; } - const WebConfigConfigurationSource configurationSource(pServer->GetAdminManager(), *pHttpApplication); - auto pConfig = std::make_unique(configurationSource); - - BOOL disableStartupPage = pConfig->QueryDisableStartUpErrorPage(); - - auto pApplication = std::make_unique(*pServer, *pHttpApplication, std::move(pConfig), pParameters, nParameters); - // never create two inprocess applications in one process g_fInProcessApplicationCreated = true; - if (FAILED_LOG(pApplication->LoadManagedApplication())) + + std::unique_ptr inProcessApplication; + if (!FAILED_LOG(IN_PROCESS_APPLICATION::Start(*pServer, *pHttpApplication, pParameters, nParameters, inProcessApplication))) { + *ppApplication = inProcessApplication.release(); + } + else + { + std::unique_ptr options; + THROW_IF_FAILED(InProcessOptions::Create(*pServer, *pHttpApplication, options)); // Set the currently running application to a fake application that returns startup exceptions. - auto pErrorApplication = std::make_unique(*pServer, *pHttpApplication, disableStartupPage); + auto pErrorApplication = std::make_unique(*pServer, *pHttpApplication, options->QueryDisableStartUpErrorPage()); RETURN_IF_FAILED(pErrorApplication->StartMonitoringAppOffline()); *ppApplication = pErrorApplication.release(); } - else - { - RETURN_IF_FAILED(pApplication->StartMonitoringAppOffline()); - *ppApplication = pApplication.release(); - } - } - catch(ConfigurationLoadException &ex) - { - EventLog::Error( - ASPNETCORE_CONFIGURATION_LOAD_ERROR, - ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG, - ex.get_message().c_str()); - - RETURN_HR(E_FAIL); + return S_OK; } CATCH_RETURN(); - - return S_OK; } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 5f43952287..942bfe44b0 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -6,13 +6,11 @@ #include "hostfxroptions.h" #include "requesthandler_config.h" #include "environmentvariablehelpers.h" -#include "SRWExclusiveLock.h" #include "exceptions.h" #include "LoggingHelpers.h" #include "resources.h" #include "EventLog.h" - -const LPCSTR IN_PROCESS_APPLICATION::s_exeLocationParameterName = "InProcessExeLocation"; +#include "ModuleHelpers.h" IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL; @@ -23,10 +21,9 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( APPLICATION_PARAMETER *pParameters, DWORD nParameters) : InProcessApplicationBase(pHttpServer, pApplication), - m_ProcessExitCode(0), - m_fBlockCallbacksIntoManaged(FALSE), - m_fShutdownCalledFromNative(FALSE), - m_fShutdownCalledFromManaged(FALSE), + m_Initialized(false), + m_blockManagedCallbacks(true), + m_waitForShutdown(true), m_pConfig(std::move(pConfig)) { DBG_ASSERT(m_pConfig); @@ -35,161 +32,54 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( { if (_stricmp(pParameters[i].pzName, s_exeLocationParameterName) == 0) { - m_struExeLocation.Copy(reinterpret_cast(pParameters[i].pValue)); + m_dotnetExeKnownLocation = reinterpret_cast(pParameters[i].pValue); } } - - m_status = MANAGED_APPLICATION_STATUS::STARTING; } IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION() { - s_Application = NULL; + s_Application = nullptr; } -//static -DWORD WINAPI -IN_PROCESS_APPLICATION::DoShutDown( - LPVOID lpParam -) -{ - IN_PROCESS_APPLICATION* pApplication = static_cast(lpParam); - DBG_ASSERT(pApplication); - pApplication->ShutDownInternal(); - return 0; -} - -__override VOID IN_PROCESS_APPLICATION::StopInternal(bool fServerInitiated) -{ - UNREFERENCED_PARAMETER(fServerInitiated); - HRESULT hr = S_OK; - CHandle hThread; - DWORD dwThreadStatus = 0; - - DWORD dwTimeout = m_pConfig->QueryShutdownTimeLimitInMS(); - - if (IsDebuggerPresent()) - { - dwTimeout = INFINITE; - } - - hThread.Attach(CreateThread( - NULL, // default security attributes - 0, // default stack size - (LPTHREAD_START_ROUTINE)DoShutDown, - this, // thread function arguments - 0, // default creation flags - NULL)); // receive thread identifier - - if ((HANDLE)hThread == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - if (WaitForSingleObject(hThread, dwTimeout) != WAIT_OBJECT_0) - { - // if the thread is still running, we need kill it first before exit to avoid AV - if (GetExitCodeThread(m_hThread, &dwThreadStatus) != 0 && dwThreadStatus == STILL_ACTIVE) - { - // Calling back into managed at this point is prone to have AVs - // Calling terminate thread here may be our best solution. - TerminateThread(hThread, STATUS_CONTROL_C_EXIT); - hr = HRESULT_FROM_WIN32(ERROR_TIMEOUT); - } - } - -Finished: - - if (FAILED(hr)) - { - EventLog::Warn( - ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE, - ASPNETCORE_EVENT_APP_SHUTDOWN_FAILURE_MSG, - QueryConfigPath().c_str()); - } - else - { - EventLog::Info( - ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL, - ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL_MSG, - QueryConfigPath().c_str()); - } - +{ + StopClr(); InProcessApplicationBase::StopInternal(fServerInitiated); } VOID -IN_PROCESS_APPLICATION::ShutDownInternal() -{ - DWORD dwThreadStatus = 0; - DWORD dwTimeout = m_pConfig->QueryShutdownTimeLimitInMS(); +IN_PROCESS_APPLICATION::StopClr() +{ + LOG_INFO(L"Stopping CLR"); - if (IsDebuggerPresent()) + if (!m_blockManagedCallbacks) { - dwTimeout = INFINITE; - } + // We cannot call into managed if the dll is detaching from the process. + // Calling into managed code when the dll is detaching is strictly a bad idea, + // and usually results in an AV saying "The string binding is invalid" + const auto shutdownHandler = m_ShutdownHandler; - if (m_fShutdownCalledFromNative || - m_status == MANAGED_APPLICATION_STATUS::STARTING || - m_status == MANAGED_APPLICATION_STATUS::FAIL) - { - return; - } - - { - if (m_fShutdownCalledFromNative || - m_status == MANAGED_APPLICATION_STATUS::STARTING || - m_status == MANAGED_APPLICATION_STATUS::FAIL) + if (!g_fProcessDetach && shutdownHandler != nullptr) { - return; - } - - // We need to keep track of when both managed and native initiate shutdown - // to avoid AVs. If shutdown has already been initiated in managed, we don't want to call into - // managed. We still need to wait on main exiting no matter what. m_fShutdownCalledFromNative - // is used for detecting redundant calls and blocking more requests to OnExecuteRequestHandler. - m_fShutdownCalledFromNative = TRUE; - m_status = MANAGED_APPLICATION_STATUS::SHUTDOWN; - - if (!m_fShutdownCalledFromManaged) - { - // We cannot call into managed if the dll is detaching from the process. - // Calling into managed code when the dll is detaching is strictly a bad idea, - // and usually results in an AV saying "The string binding is invalid" - if (!g_fProcessDetach) - { - m_ShutdownHandler(m_ShutdownHandlerContext); - m_ShutdownHandler = NULL; - } - } - - // Release the lock before we wait on the thread to exit. - } - - if (!m_fShutdownCalledFromManaged) - { - if (m_hThread != NULL && - GetExitCodeThread(m_hThread, &dwThreadStatus) != 0 && - dwThreadStatus == STILL_ACTIVE) - { - // wait for graceful shutdown, i.e., the exit of the background thread or timeout - if (WaitForSingleObject(m_hThread, dwTimeout) != WAIT_OBJECT_0) - { - // if the thread is still running, we need kill it first before exit to avoid AV - if (GetExitCodeThread(m_hThread, &dwThreadStatus) != 0 && dwThreadStatus == STILL_ACTIVE) - { - // Calling back into managed at this point is prone to have AVs - // Calling terminate thread here may be our best solution. - TerminateThread(m_hThread, STATUS_CONTROL_C_EXIT); - } - } + shutdownHandler(m_ShutdownHandlerContext); } } - s_Application = NULL; + // Signal shutdown + if (m_pShutdownEvent != nullptr) + { + LOG_IF_FAILED(SetEvent(m_pShutdownEvent)); + } + + if (m_workerThread.joinable()) + { + // Worker thread would wait for clr to finish and log error if required + m_workerThread.join(); + } + + s_Application = nullptr; } VOID @@ -201,169 +91,320 @@ IN_PROCESS_APPLICATION::SetCallbackHandles( _In_ VOID* pvShutdownHandlerContext ) { + LOG_INFO(L"In-process callbacks set"); + m_RequestHandler = request_handler; m_RequestHandlerContext = pvRequstHandlerContext; m_ShutdownHandler = shutdown_handler; m_ShutdownHandlerContext = pvShutdownHandlerContext; m_AsyncCompletionHandler = async_completion_handler; + m_blockManagedCallbacks = false; + m_Initialized = true; + // Can't check the std err handle as it isn't a critical error // Initialization complete EventLog::Info( ASPNETCORE_EVENT_INPROCESS_START_SUCCESS, ASPNETCORE_EVENT_INPROCESS_START_SUCCESS_MSG, QueryApplicationPhysicalPath().c_str()); - SetEvent(m_pInitalizeEvent); - m_fInitialized = TRUE; + + SetEvent(m_pInitializeEvent); } -// Will be called by the inprocesshandler HRESULT -IN_PROCESS_APPLICATION::LoadManagedApplication -( - VOID -) +IN_PROCESS_APPLICATION::LoadManagedApplication() { - HRESULT hr = S_OK; - DWORD dwTimeout; - DWORD dwResult; + THROW_LAST_ERROR_IF_NULL(m_pInitializeEvent = CreateEvent( + nullptr, // default security attributes + TRUE, // manual reset event + FALSE, // not set + nullptr)); // name - ReferenceApplication(); + THROW_LAST_ERROR_IF_NULL(m_pShutdownEvent = CreateEvent( + nullptr, // default security attributes + TRUE, // manual reset event + FALSE, // not set + nullptr)); // name - if (m_status != MANAGED_APPLICATION_STATUS::STARTING) + m_workerThread = std::thread([](std::unique_ptr application) { - // Core CLR has already been loaded. - // Cannot load more than once even there was a failure - if (m_status == MANAGED_APPLICATION_STATUS::FAIL) - { - hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; - } - else if (m_status == MANAGED_APPLICATION_STATUS::SHUTDOWN) - { - hr = HRESULT_FROM_WIN32(ERROR_SHUTDOWN_IS_SCHEDULED); - } + LOG_INFO(L"Starting in-process worker thread"); + application->ExecuteApplication(); + LOG_INFO(L"Stopping in-process worker thread"); + }, ::ReferenceApplication(this)); - goto Finished; + LOG_INFO(L"Waiting for initialization"); + + const HANDLE waitHandles[2] = { m_pInitializeEvent, m_workerThread.native_handle() }; + + // Wait for shutdown request + const auto waitResult = WaitForMultipleObjects(2, waitHandles, FALSE, m_pConfig->QueryStartupTimeLimitInMS()); + THROW_LAST_ERROR_IF(waitResult == WAIT_FAILED); + + if (waitResult == WAIT_TIMEOUT) + { + // If server wasn't initialized in time shut application down without waiting for CLR thread to exit + m_waitForShutdown = false; + StopClr(); + throw InvalidOperationException(format(L"Managed server didn't initialize after %u ms.", m_pConfig->QueryStartupTimeLimitInMS())); } + // WAIT_OBJECT_0 + 1 is the worker thead handle + if (waitResult == WAIT_OBJECT_0 + 1) { - SRWExclusiveLock lock(m_stateLock); + // Worker thread exited stop + StopClr(); + throw InvalidOperationException(format(L"CLR worker thread exited prematurely")); + } - if (m_status != MANAGED_APPLICATION_STATUS::STARTING) + THROW_IF_FAILED(StartMonitoringAppOffline()); + + return S_OK; +} + + +void +IN_PROCESS_APPLICATION::ExecuteApplication() +{ + try + { + std::unique_ptr hostFxrOptions; + + auto context = std::make_shared(); + + auto pProc = s_fMainCallback; + if (pProc == nullptr) { - if (m_status == MANAGED_APPLICATION_STATUS::FAIL) + HMODULE hModule; + // hostfxr should already be loaded by the shim. If not, then we will need + // to load it ourselves by finding hostfxr again. + THROW_LAST_ERROR_IF_NULL(hModule = GetModuleHandle(L"hostfxr.dll")); + + // Get the entry point for main + pProc = reinterpret_cast(GetProcAddress(hModule, "hostfxr_main")); + THROW_LAST_ERROR_IF_NULL(pProc); + + THROW_IF_FAILED(HOSTFXR_OPTIONS::Create( + m_dotnetExeKnownLocation, + m_pConfig->QueryProcessPath(), + QueryApplicationPhysicalPath(), + m_pConfig->QueryArguments(), + hostFxrOptions + )); + + hostFxrOptions->GetArguments(context->m_argc, context->m_argv); + THROW_IF_FAILED(SetEnvironmentVariablesOnWorkerProcess()); + } + context->m_pProc = pProc; + + if (m_pLoggerProvider == nullptr) + { + THROW_IF_FAILED(LoggingHelpers::CreateLoggingProvider( + m_pConfig->QueryStdoutLogEnabled(), + !m_pHttpServer.IsCommandLineLaunch(), + m_pConfig->QueryStdoutLogFile().c_str(), + QueryApplicationPhysicalPath().c_str(), + m_pLoggerProvider)); + + LOG_IF_FAILED(m_pLoggerProvider->Start()); + } + + // There can only ever be a single instance of .NET Core + // loaded in the process but we need to get config information to boot it up in the + // first place. This is happening in an execute request handler and everyone waits + // until this initialization is done. + // We set a static so that managed code can call back into this instance and + // set the callbacks + s_Application = this; + + //Start CLR thread + m_clrThread = std::thread(ClrThreadEntryPoint, context); + + // Wait for thread exit or shutdown event + const HANDLE waitHandles[2] = { m_pShutdownEvent, m_clrThread.native_handle() }; + + // Wait for shutdown request + const auto waitResult = WaitForMultipleObjects(2, waitHandles, FALSE, INFINITE); + THROW_LAST_ERROR_IF(waitResult == WAIT_FAILED); + + LOG_INFOF(L"Starting shutdown sequence %d", waitResult); + + bool clrThreadExited = waitResult == (WAIT_OBJECT_0 + 1); + // shutdown was signaled + // only wait for shutdown in case of successful startup + if (m_waitForShutdown) + { + const auto clrWaitResult = WaitForSingleObject(m_clrThread.native_handle(), m_pConfig->QueryShutdownTimeLimitInMS()); + THROW_LAST_ERROR_IF(waitResult == WAIT_FAILED); + + clrThreadExited = clrWaitResult != WAIT_TIMEOUT; + } + + LOG_INFOF(L"Clr thread wait ended: clrThreadExited: %d", clrThreadExited); + + // At this point CLR thread either finished or timed out, abandon it. + m_clrThread.detach(); + + LOG_IF_FAILED(m_pLoggerProvider->Stop()); + + if (m_fStopCalled) + { + if (clrThreadExited) { - hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; + EventLog::Info( + ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL, + ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL_MSG, + QueryConfigPath().c_str()); } - else if (m_status == MANAGED_APPLICATION_STATUS::SHUTDOWN) + else { - hr = HRESULT_FROM_WIN32(ERROR_SHUTDOWN_IS_SCHEDULED); + EventLog::Warn( + ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE, + ASPNETCORE_EVENT_APP_SHUTDOWN_FAILURE_MSG, + QueryConfigPath().c_str()); } - - goto Finished; - } - m_hThread = CreateThread( - NULL, // default security attributes - 0, // default stack size - (LPTHREAD_START_ROUTINE)ExecuteAspNetCoreProcess, - this, // thread function arguments - 0, // default creation flags - NULL); // receive thread identifier - - if (m_hThread == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - m_pInitalizeEvent = CreateEvent( - NULL, // default security attributes - TRUE, // manual reset event - FALSE, // not set - NULL); // name - - if (m_pInitalizeEvent == NULL) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - } - - // If the debugger is attached, never timeout - if (IsDebuggerPresent()) - { - dwTimeout = INFINITE; } else { - dwTimeout = m_pConfig->QueryStartupTimeLimitInMS(); + if (clrThreadExited) + { + UnexpectedThreadExit(*context); + // If the inprocess server was initialized, we need to cause recycle to be called on the worker process. + // in case when it was not initialized we need to keep server running to serve 502 page + if (m_Initialized) + { + QueueStop(); + } + } } - - const HANDLE pHandles[2]{ m_hThread, m_pInitalizeEvent }; - - // Wait on either the thread to complete or the event to be set - dwResult = WaitForMultipleObjects(2, pHandles, FALSE, dwTimeout); - - // It all timed out - if (dwResult == WAIT_TIMEOUT) - { - // kill the backend thread as loading dotnet timedout - TerminateThread(m_hThread, 0); - hr = HRESULT_FROM_WIN32(dwResult); - goto Finished; - } - else if (dwResult == WAIT_FAILED) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto Finished; - } - - // The thread ended it means that something failed - if (dwResult == WAIT_OBJECT_0) - { - hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; - goto Finished; - } - - m_status = MANAGED_APPLICATION_STATUS::RUNNING_MANAGED; } -Finished: - - if (FAILED(hr)) + catch (InvalidOperationException& ex) { - m_status = MANAGED_APPLICATION_STATUS::FAIL; - EventLog::Error( ASPNETCORE_EVENT_LOAD_CLR_FALIURE, ASPNETCORE_EVENT_LOAD_CLR_FALIURE_MSG, QueryApplicationId().c_str(), QueryApplicationPhysicalPath().c_str(), - hr); - } - DereferenceApplication(); + ex.as_wstring().c_str()); - return hr; + OBSERVE_CAUGHT_EXCEPTION(); + } + catch (std::runtime_error& ex) + { + EventLog::Error( + ASPNETCORE_EVENT_LOAD_CLR_FALIURE, + ASPNETCORE_EVENT_LOAD_CLR_FALIURE_MSG, + QueryApplicationId().c_str(), + QueryApplicationPhysicalPath().c_str(), + GetUnexpectedExceptionMessage(ex).c_str()); + + OBSERVE_CAUGHT_EXCEPTION(); + } } -// static -VOID -IN_PROCESS_APPLICATION::ExecuteAspNetCoreProcess( - _In_ LPVOID pContext -) +void IN_PROCESS_APPLICATION::QueueStop() { - HRESULT hr = S_OK; - IN_PROCESS_APPLICATION *pApplication = (IN_PROCESS_APPLICATION*)pContext; - DBG_ASSERT(pApplication != NULL); - hr = pApplication->ExecuteApplication(); - // - // no need to log the error here as if error happened, the thread will exit - // the error will ba catched by caller LoadManagedApplication which will log an error - // + if (m_fStopCalled) + { + return; + } + LOG_INFO(L"Queueing in-process stop thread"); + + std::thread stoppingThread([](std::unique_ptr application) + { + LOG_INFO(L"Starting in-process stop thread"); + application->Stop(false); + LOG_INFO(L"Stopping in-process stop thread"); + }, ::ReferenceApplication(this)); + + stoppingThread.detach(); +} + +HRESULT IN_PROCESS_APPLICATION::Start( + IHttpServer& pServer, + IHttpApplication& pHttpApplication, + APPLICATION_PARAMETER* pParameters, + DWORD nParameters, + std::unique_ptr& application) +{ + try + { + std::unique_ptr options; + THROW_IF_FAILED(InProcessOptions::Create(pServer, pHttpApplication, options)); + application = std::unique_ptr( + new IN_PROCESS_APPLICATION(pServer, pHttpApplication, std::move(options), pParameters, nParameters)); + THROW_IF_FAILED(application->LoadManagedApplication()); + return S_OK; + } + catch (InvalidOperationException& ex) + { + EventLog::Error( + ASPNETCORE_EVENT_LOAD_CLR_FALIURE, + ASPNETCORE_EVENT_LOAD_CLR_FALIURE_MSG, + pHttpApplication.GetApplicationId(), + pHttpApplication.GetApplicationPhysicalPath(), + ex.as_wstring().c_str()); + + RETURN_CAUGHT_EXCEPTION(); + } + catch (std::runtime_error& ex) + { + EventLog::Error( + ASPNETCORE_EVENT_LOAD_CLR_FALIURE, + ASPNETCORE_EVENT_LOAD_CLR_FALIURE_MSG, + pHttpApplication.GetApplicationId(), + pHttpApplication.GetApplicationPhysicalPath(), + GetUnexpectedExceptionMessage(ex).c_str()); + + RETURN_CAUGHT_EXCEPTION(); + } + CATCH_RETURN(); +} + +// Required because __try and objects with destructors can not be mixed +void +IN_PROCESS_APPLICATION::ExecuteClr(const std::shared_ptr& context) +{ + __try + { + auto const exitCode = context->m_pProc(context->m_argc, context->m_argv.get()); + + LOG_INFOF(L"Managed application exited with code %d", exitCode); + + context->m_exitCode = exitCode; + } + __except(GetExceptionCode() != 0) + { + LOG_INFOF(L"Managed threw an exception %d", GetExceptionCode()); + + context->m_exceptionCode = GetExceptionCode(); + } +} + +// +// Calls hostfxr_main with the hostfxr and application as arguments. +// This method should not access IN_PROCESS_APPLICATION instance as it may be already freed +// in case of startup timeout +// +VOID +IN_PROCESS_APPLICATION::ClrThreadEntryPoint(const std::shared_ptr &context) +{ + LOG_INFO(L"Starting CLR thread"); + + // Keep aspnetcorev2_inprocess.dll loaded while this thread is running + // this is required because thread might be abandoned + HandleWrapper moduleHandle; + ModuleHelpers::IncrementCurrentModuleRefCount(moduleHandle); + + ExecuteClr(context); + + FreeLibraryAndExitThread(moduleHandle.release(), 0); } HRESULT -IN_PROCESS_APPLICATION::SetEnvironementVariablesOnWorkerProcess( - VOID -) +IN_PROCESS_APPLICATION::SetEnvironmentVariablesOnWorkerProcess() { auto variables = m_pConfig->QueryEnvironmentVariables(); auto inputTable = std::unique_ptr(new ENVIRONMENT_VAR_HASH()); @@ -397,128 +438,53 @@ IN_PROCESS_APPLICATION::SetEnvironementVariablesOnWorkerProcess( return S_OK; } -HRESULT -IN_PROCESS_APPLICATION::ExecuteApplication( - VOID -) -{ - HRESULT hr; - HMODULE hModule = nullptr; - hostfxr_main_fn pProc; - std::unique_ptr hostFxrOptions = NULL; - DWORD hostfxrArgc = 0; - std::unique_ptr hostfxrArgv; - DBG_ASSERT(m_status == MANAGED_APPLICATION_STATUS::STARTING); - - pProc = s_fMainCallback; - if (pProc == nullptr) - { - // hostfxr should already be loaded by the shim. If not, then we will need - // to load it ourselves by finding hostfxr again. - hModule = LoadLibraryW(L"hostfxr.dll"); - - if (hModule == NULL) - { - // .NET Core not installed (we can log a more detailed error message here) - hr = LOG_IF_FAILED(ERROR_BAD_ENVIRONMENT); - goto Finished; - } - - // Get the entry point for main - pProc = (hostfxr_main_fn)GetProcAddress(hModule, "hostfxr_main"); - if (pProc == NULL) - { - hr = LOG_IF_FAILED(ERROR_BAD_ENVIRONMENT); - goto Finished; - } - - FINISHED_IF_FAILED(hr = HOSTFXR_OPTIONS::Create( - m_struExeLocation.QueryStr(), - m_pConfig->QueryProcessPath().c_str(), - QueryApplicationPhysicalPath().c_str(), - m_pConfig->QueryArguments().c_str(), - hostFxrOptions - )); - hostFxrOptions->GetArguments(hostfxrArgc, hostfxrArgv); - FINISHED_IF_FAILED(SetEnvironementVariablesOnWorkerProcess()); - } - - LOG_INFO(L"Starting managed application"); - - if (m_pLoggerProvider == NULL) - { - FINISHED_IF_FAILED(hr = LoggingHelpers::CreateLoggingProvider( - m_pConfig->QueryStdoutLogEnabled(), - !m_pHttpServer.IsCommandLineLaunch(), - m_pConfig->QueryStdoutLogFile().c_str(), - QueryApplicationPhysicalPath().c_str(), - m_pLoggerProvider)); - - LOG_IF_FAILED(m_pLoggerProvider->Start()); - } - - // There can only ever be a single instance of .NET Core - // loaded in the process but we need to get config information to boot it up in the - // first place. This is happening in an execute request handler and everyone waits - // until this initialization is done. - // We set a static so that managed code can call back into this instance and - // set the callbacks - s_Application = this; - - hr = RunDotnetApplication(hostfxrArgc, hostfxrArgv.get(), pProc); - -Finished: - - // - // this method is called by the background thread and should never exit unless shutdown - // If main returned and shutdown was not called in managed, we want to block native from calling into - // managed. To do this, we can say that shutdown was called from managed. - // Don't bother locking here as there will always be a race between receiving a native shutdown - // notification and unexpected managed exit. - // - m_status = MANAGED_APPLICATION_STATUS::SHUTDOWN; - m_fShutdownCalledFromManaged = TRUE; - - m_pLoggerProvider->Stop(); - - if (!m_fShutdownCalledFromNative) - { - LogErrorsOnMainExit(hr); - if (m_fInitialized) - { - // - // If the inprocess server was initialized, we need to cause recycle to be called on the worker process. - // - Stop(/*fServerInitiated*/ false); - } - } - - return hr; -} - VOID -IN_PROCESS_APPLICATION::LogErrorsOnMainExit( - HRESULT hr -) +IN_PROCESS_APPLICATION::UnexpectedThreadExit(const ExecuteClrContext& context) const { + STRA straStdErrOutput; + STRU struStdMsg; + auto hasStdOut = m_pLoggerProvider->GetStdOutContent(&straStdErrOutput) && + SUCCEEDED(struStdMsg.CopyA(straStdErrOutput.QueryStr())); + + if (context.m_exceptionCode != 0) + { + if (hasStdOut) + { + EventLog::Error( + ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION, + ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_STDOUT_MSG, + QueryApplicationId().c_str(), + QueryApplicationPhysicalPath().c_str(), + context.m_exceptionCode, + struStdMsg.QueryStr()); + } + else + { + EventLog::Error( + ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION, + ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_MSG, + QueryApplicationId().c_str(), + QueryApplicationPhysicalPath().c_str(), + context.m_exceptionCode + ); + } + return; + } + // // Ungraceful shutdown, try to log an error message. // This will be a common place for errors as it means the hostfxr_main returned // or there was an exception. // - STRA straStdErrOutput; - STRU struStdMsg; - if (m_pLoggerProvider->GetStdOutContent(&straStdErrOutput)) + if (hasStdOut) { - if (SUCCEEDED(struStdMsg.CopyA(straStdErrOutput.QueryStr()))) { - EventLog::Error( - ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT, - ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG, - QueryApplicationId().c_str(), - QueryApplicationPhysicalPath().c_str(), - hr, - struStdMsg.QueryStr()); - } + EventLog::Error( + ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT, + ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG, + QueryApplicationId().c_str(), + QueryApplicationPhysicalPath().c_str(), + context.m_exitCode, + struStdMsg.QueryStr()); } else { @@ -527,53 +493,20 @@ IN_PROCESS_APPLICATION::LogErrorsOnMainExit( ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG, QueryApplicationId().c_str(), QueryApplicationPhysicalPath().c_str(), - hr); + context.m_exitCode); } } -// -// Calls hostfxr_main with the hostfxr and application as arguments. -// -HRESULT -IN_PROCESS_APPLICATION::RunDotnetApplication(DWORD argc, CONST PCWSTR* argv, hostfxr_main_fn pProc) -{ - HRESULT hr = S_OK; - - __try - { - m_ProcessExitCode = pProc(argc, argv); - if (m_ProcessExitCode != 0) - { - hr = HRESULT_FROM_WIN32(GetLastError()); - } - - LOG_INFOF(L"Managed application exited with code %d", m_ProcessExitCode); - } - __except(GetExceptionCode() != 0) - { - - LOG_INFOF(L"Managed threw an exception %d", GetExceptionCode()); - hr = HRESULT_FROM_WIN32(GetLastError()); - } - - return hr; -} - HRESULT IN_PROCESS_APPLICATION::CreateHandler( _In_ IHttpContext *pHttpContext, _Out_ IREQUEST_HANDLER **pRequestHandler) { - HRESULT hr = S_OK; - IREQUEST_HANDLER* pHandler = NULL; - - pHandler = new IN_PROCESS_HANDLER(::ReferenceApplication(this), pHttpContext, m_RequestHandler, m_RequestHandlerContext, m_AsyncCompletionHandler); - - if (pHandler == NULL) + try { - hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); + *pRequestHandler = new IN_PROCESS_HANDLER(::ReferenceApplication(this), pHttpContext, m_RequestHandler, m_RequestHandlerContext, m_AsyncCompletionHandler); } - - *pRequestHandler = pHandler; - return hr; + CATCH_RETURN(); + + return S_OK; } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index 7183ad86b3..cab7a49e9b 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -3,6 +3,7 @@ #pragma once +#include #include "InProcessApplicationBase.h" #include "IOutputManager.h" #include "InProcessOptions.h" @@ -45,35 +46,26 @@ public: override; // Executes the .NET Core process + void + ExecuteApplication(); + HRESULT - ExecuteApplication( - VOID - ); + LoadManagedApplication(); - HRESULT - LoadManagedApplication( - VOID - ); - VOID - LogErrorsOnMainExit( - HRESULT hr - ); - - VOID - StopCallsIntoManaged( - VOID - ) + void + QueueStop(); + + void + StopIncomingRequests() { - m_fBlockCallbacksIntoManaged = TRUE; + QueueStop(); } - VOID - StopIncomingRequests( - VOID - ) + void + StopCallsIntoManaged() { - m_fShutdownCalledFromManaged = TRUE; + m_blockManagedCallbacks = true; } static @@ -84,44 +76,64 @@ public: static IN_PROCESS_APPLICATION* - GetInstance( - VOID - ) + GetInstance() { return s_Application; } - PCWSTR - QueryExeLocation() + const std::wstring& + QueryExeLocation() const { - return m_struExeLocation.QueryStr(); + return m_dotnetExeKnownLocation; } const InProcessOptions& QueryConfig() const { - return *m_pConfig.get(); + return *m_pConfig; } bool QueryBlockCallbacksIntoManaged() const { - return m_fBlockCallbacksIntoManaged; + return m_blockManagedCallbacks; } + static + HRESULT Start( + IHttpServer& pServer, + IHttpApplication& pHttpApplication, + APPLICATION_PARAMETER* pParameters, + DWORD nParameters, + std::unique_ptr& application); + private: - - enum MANAGED_APPLICATION_STATUS + struct ExecuteClrContext: std::enable_shared_from_this { - UNKNOWN = 0, - STARTING, - RUNNING_MANAGED, - SHUTDOWN, - FAIL - }; + ExecuteClrContext(): + m_argc(0), + m_pProc(nullptr), + m_exitCode(0), + m_exceptionCode(0) + { + } - // Thread executing the .NET Core process - HandleWrapper m_hThread; + DWORD m_argc; + std::unique_ptr m_argv; + hostfxr_main_fn m_pProc; + + int m_exitCode; + int m_exceptionCode; + }; + + // Thread executing the .NET Core process this might be abandoned in timeout cases + std::thread m_clrThread; + // Thread tracking the CLR thread, this one is always joined on shutdown + std::thread m_workerThread; + // The event that gets triggered when managed initialization is complete + HandleWrapper m_pInitializeEvent; + // The event that gets triggered when worker thread should exit + HandleWrapper m_pShutdownEvent; // The request handler callback from managed code PFN_REQUEST_HANDLER m_RequestHandler; @@ -133,53 +145,38 @@ private: PFN_ASYNC_COMPLETION_HANDLER m_AsyncCompletionHandler; - // The event that gets triggered when managed initialization is complete - HandleWrapper m_pInitalizeEvent; + std::wstring m_dotnetExeKnownLocation; - STRU m_struExeLocation; + std::atomic_bool m_blockManagedCallbacks; + bool m_Initialized; + bool m_waitForShutdown; - // The exit code of the .NET Core process - INT m_ProcessExitCode; - - volatile BOOL m_fBlockCallbacksIntoManaged; - volatile BOOL m_fShutdownCalledFromNative; - volatile BOOL m_fShutdownCalledFromManaged; - BOOL m_fInitialized; - MANAGED_APPLICATION_STATUS m_status; std::unique_ptr m_pConfig; static IN_PROCESS_APPLICATION* s_Application; std::unique_ptr m_pLoggerProvider; - static const LPCSTR s_exeLocationParameterName; - - static - VOID - ExecuteAspNetCoreProcess( - _In_ LPVOID pContext - ); - - HRESULT - SetEnvironementVariablesOnWorkerProcess( - VOID - ); - - HRESULT - RunDotnetApplication( - DWORD argc, - CONST PCWSTR* argv, - hostfxr_main_fn pProc - ); - - static - DWORD WINAPI - DoShutDown( - LPVOID lpParam - ); + inline static const LPCSTR s_exeLocationParameterName = "InProcessExeLocation"; VOID - ShutDownInternal( - VOID - ); + UnexpectedThreadExit(const ExecuteClrContext& context) const; + + HRESULT + SetEnvironmentVariablesOnWorkerProcess(); + + void + StopClr(); + + static + void + ClrThreadEntryPoint(const std::shared_ptr &context); + + static + void + ExecuteClr(const std::shared_ptr &context); + + // Allows to override call to hostfxr_main with custom callback + // used in testing + inline static hostfxr_main_fn s_fMainCallback = nullptr; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h index ac6aa24789..6089adc3ca 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h @@ -40,9 +40,7 @@ public: ) override; IHttpContext* - QueryHttpContext( - VOID - ) const + QueryHttpContext() const { return m_pW3Context; } @@ -53,9 +51,7 @@ public: ); VOID - IndicateManagedRequestComplete( - VOID - ); + IndicateManagedRequestComplete(); VOID SetAsyncCompletionStatus( @@ -68,11 +64,11 @@ public: static HRESULT - StaticInitialize(VOID); + StaticInitialize(); static void - StaticTerminate(VOID); + StaticTerminate(); private: REQUEST_NOTIFICATION_STATUS diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs index 485c61cf4c..3cb2d40c3a 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs @@ -60,5 +60,25 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS deploymentParameters.WebConfigActionList.Add( WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogFile", Path.Combine(path, "std"))); } + + public static void TransformPath(this IISDeploymentParameters parameters, Func transformation) + { + parameters.WebConfigActionList.Add( + (config, contentRoot) => + { + var aspNetCoreElement = config.Descendants("aspNetCore").Single(); + aspNetCoreElement.SetAttributeValue("processPath", transformation((string)aspNetCoreElement.Attribute("processPath"), contentRoot)); + }); + } + + public static void TransformArguments(this IISDeploymentParameters parameters, Func transformation) + { + parameters.WebConfigActionList.Add( + (config, contentRoot) => + { + var aspNetCoreElement = config.Descendants("aspNetCore").Single(); + aspNetCoreElement.SetAttributeValue("arguments", transformation((string)aspNetCoreElement.Attribute("arguments"), contentRoot)); + }); + } } } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index 8464088f48..4604fb5652 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -483,7 +483,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } else { - throw new InvalidOperationException($"iisexpress Process {hostProcess.Id} crashed before shutdown was triggered."); + throw new InvalidOperationException($"iisexpress Process {hostProcess?.Id} crashed before shutdown was triggered."); } } } diff --git a/test/Common.FunctionalTests/ConfigurationChangeTests.cs b/test/Common.FunctionalTests/ConfigurationChangeTests.cs index d1e5f62ff1..014e2520c4 100644 --- a/test/Common.FunctionalTests/ConfigurationChangeTests.cs +++ b/test/Common.FunctionalTests/ConfigurationChangeTests.cs @@ -83,7 +83,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await deploymentResult.HttpClient.RetryRequestAsync("/HelloWorld", r => r.StatusCode == HttpStatusCode.InternalServerError); StopServer(); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Could not find the assembly 'aspnetcorev2_inprocess.dll'"); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Could not find the assembly 'aspnetcorev2_inprocess.dll'"); } [ConditionalTheory] diff --git a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs index 296d99f789..1df7f3c077 100644 --- a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs +++ b/test/Common.FunctionalTests/Inprocess/EventLogTests.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Application '.+' started the coreclr in-process successfully."); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Application '.+' started the coreclr in-process successfully."); } [ConditionalFact] @@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Application '.+' has shutdown."); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Application '.+' has shutdown."); } } } diff --git a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs index 12eae66d01..dbbf09f1ac 100644 --- a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -5,6 +5,7 @@ using System; using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; @@ -23,19 +24,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalTheory] [InlineData("CheckLogFile")] [InlineData("CheckErrLogFile")] - public async Task CheckStdoutWithRandomNumber(string path) + public async Task CheckStdoutWithRandomNumber(string mode) { - // Forcing publish for now to have parity between IIS and IISExpress - // Reason is because by default for IISExpress, we expect there to not be a web.config file. - // However, for IIS, we need a web.config file because the default on generated on publish - // doesn't include V2. We can remove the publish flag once IIS supports non-publish running var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); var randomNumberString = new Random(Guid.NewGuid().GetHashCode()).Next(10000000).ToString(); - deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; - deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_RANDOM_VALUE"] = randomNumberString; + deploymentParameters.TransformArguments((a, _) => $"{a} {mode} {randomNumberString}"); - await AssertFailsToStart(path, deploymentParameters); + await AssertFailsToStart(deploymentParameters); Assert.Contains(TestSink.Writes, context => context.Message.Contains($"Random number: {randomNumberString}")); } @@ -45,12 +41,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [InlineData("CheckLargeStdOutWrites")] [InlineData("CheckOversizedStdErrWrites")] [InlineData("CheckOversizedStdOutWrites")] - public async Task CheckStdoutWithLargeWrites(string path) + public async Task CheckStdoutWithLargeWrites(string mode) { var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); - deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + deploymentParameters.TransformArguments((a, _) => $"{a} {mode}"); - await AssertFailsToStart(path, deploymentParameters); + await AssertFailsToStart(deploymentParameters); Assert.Contains(TestSink.Writes, context => context.Message.Contains(new string('a', 4096))); } @@ -58,20 +54,19 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task CheckValidConsoleFunctions() { - var path = "CheckConsoleFunctions"; var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); - deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + deploymentParameters.TransformArguments((a, _) => $"{a} CheckConsoleFunctions"); - await AssertFailsToStart(path, deploymentParameters); + await AssertFailsToStart(deploymentParameters); Assert.Contains(TestSink.Writes, context => context.Message.Contains("Is Console redirection: True")); } - private async Task AssertFailsToStart(string path, IntegrationTesting.IIS.IISDeploymentParameters deploymentParameters) + private async Task AssertFailsToStart(IntegrationTesting.IIS.IISDeploymentParameters deploymentParameters) { var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.HttpClient.GetAsync(path); + var response = await deploymentResult.HttpClient.GetAsync("/"); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); @@ -92,5 +87,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var responseText = await response.Content.ReadAsStringAsync(); Assert.Contains("500.30 - ANCM In-Process Start Failure", responseText); } + } } diff --git a/test/Common.FunctionalTests/MultiApplicationTests.cs b/test/Common.FunctionalTests/MultiApplicationTests.cs index e0adccfc54..3723369c89 100644 --- a/test/Common.FunctionalTests/MultiApplicationTests.cs +++ b/test/Common.FunctionalTests/MultiApplicationTests.cs @@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(200, (int)result1.StatusCode); Assert.Equal(500, (int)result2.StatusCode); StopServer(); - EventLogHelpers.VerifyEventLogEvent(result, TestSink, "Only one inprocess application is allowed per IIS application pool"); + EventLogHelpers.VerifyEventLogEvent(result, "Only one inprocess application is allowed per IIS application pool"); } [ConditionalTheory] @@ -72,7 +72,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(200, (int)result1.StatusCode); Assert.Equal(500, (int)result2.StatusCode); StopServer(); - EventLogHelpers.VerifyEventLogEvent(result, TestSink, "Mixed hosting model is not supported."); + EventLogHelpers.VerifyEventLogEvent(result, "Mixed hosting model is not supported."); } private void SetHostingModel(string directory, HostingModel model) diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index 6d2393f187..4fb129feaf 100644 --- a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -1,54 +1,64 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using System.Text; using System.Text.RegularExpressions; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; -using Microsoft.Extensions.Logging.Testing; using Xunit; -using Xunit.Sdk; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class EventLogHelpers { - private static readonly Regex EventLogRegex = new Regex("Event Log: (?.+?)End Event Log Message.", RegexOptions.Singleline | RegexOptions.Compiled); - - public static void VerifyEventLogEvent(IISDeploymentResult deploymentResult, ITestSink testSink, string expectedRegexMatchString) + public static void VerifyEventLogEvent(IISDeploymentResult deploymentResult, string expectedRegexMatchString) { Assert.True(deploymentResult.HostProcess.HasExited); - var builder = new StringBuilder(); + var entries = GetEntries(deploymentResult); + AssertSingleEntry(expectedRegexMatchString, entries); + } + + public static void VerifyEventLogEvents(IISDeploymentResult deploymentResult, params string[] expectedRegexMatchString) + { + Assert.True(deploymentResult.HostProcess.HasExited); - foreach (var context in testSink.Writes) + var entries = GetEntries(deploymentResult).ToList(); + foreach (var regexString in expectedRegexMatchString) { - builder.Append(context.Message); - } + var matchedEntries = AssertSingleEntry(regexString, entries); - var count = 0; - var expectedRegex = new Regex(expectedRegexMatchString, RegexOptions.Singleline); - foreach (Match match in EventLogRegex.Matches(builder.ToString())) - { - var eventLogText = match.Groups["EventLogMessage"].Value; - if (expectedRegex.IsMatch(eventLogText)) + foreach (var matchedEntry in matchedEntries) { - count++; + entries.Remove(matchedEntry); } } + + Assert.True(0 == entries.Count, $"Some entries were not matched by any regex {FormatEntries(entries)}"); + } - Assert.True(count > 0, $"'{expectedRegexMatchString}' didn't match any event log messaged"); - Assert.True(count < 2, $"'{expectedRegexMatchString}' matched more then one event log message"); + private static EventLogEntry[] AssertSingleEntry(string regexString, IEnumerable entries) + { + var expectedRegex = new Regex(regexString, RegexOptions.Singleline); + var matchedEntries = entries.Where(entry => expectedRegex.IsMatch(entry.Message)).ToArray(); + Assert.True(matchedEntries.Length > 0, $"No entries matched by '{regexString}'"); + Assert.True(matchedEntries.Length < 2, $"Multiple entries matched by '{regexString}': {FormatEntries(matchedEntries)}"); + return matchedEntries; + } + private static string FormatEntries(IEnumerable entries) + { + return string.Join(",", entries.Select(e => e.Message)); + } + + private static IEnumerable GetEntries(IISDeploymentResult deploymentResult) + { var eventLog = new EventLog("Application"); // Eventlog is already sorted based on time of event in ascending time. // Check results in reverse order. - var expectedRegexEventLog = new Regex(expectedRegexMatchString); var processIdString = $"Process Id: {deploymentResult.HostProcess.Id}."; // Event log messages round down to the nearest second, so subtract a second @@ -67,18 +77,15 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { continue; } - + // ReplacementStings == EventData collection in EventLog // This is unaffected if event providers are not registered correctly if (eventLogEntry.Source == AncmVersionToMatch(deploymentResult) && - processIdString == eventLogEntry.ReplacementStrings[1] && - expectedRegex.IsMatch(eventLogEntry.ReplacementStrings[0])) + processIdString == eventLogEntry.ReplacementStrings[1]) { - return; + yield return eventLogEntry; } } - - Assert.True(false, $"'{expectedRegexMatchString}' didn't match any event log messaged."); } private static string AncmVersionToMatch(IISDeploymentResult deploymentResult) @@ -88,5 +95,51 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests "AspNetCore Module" + (deploymentResult.DeploymentParameters.AncmVersion == AncmVersion.AspNetCoreModuleV2 ? " V2" : ""); } + + + public static string InProcessStarted(IISDeploymentResult deploymentResult) + { + return $"Application '{EscapedContentRoot(deploymentResult)}' started the coreclr in-process successfully"; + } + + public static string InProcessFailedToStart(IISDeploymentResult deploymentResult, string reason) + { + return $"Application '/LM/W3SVC/1/ROOT' with physical root '{EscapedContentRoot(deploymentResult)}' failed to load clr and managed application. {reason}"; + } + + public static string InProcessFailedToStop(IISDeploymentResult deploymentResult, string reason) + { + return "Failed to gracefully shutdown application 'MACHINE/WEBROOT/APPHOST/HTTPTESTSITE'."; + } + + public static string InProcessThreadException(IISDeploymentResult deploymentResult, string reason) + { + return $"Application '/LM/W3SVC/1/ROOT' with physical root '{EscapedContentRoot(deploymentResult)}' hit unexpected managed exception{reason}"; + } + + public static string InProcessThreadExit(IISDeploymentResult deploymentResult, string code) + { + return $"Application '/LM/W3SVC/1/ROOT' with physical root '{EscapedContentRoot(deploymentResult)}' hit unexpected managed background thread exit, exit code = '{code}'."; + } + + public static string FailedToStartApplication(IISDeploymentResult deploymentResult, string code) + { + return $"Failed to start application '/LM/W3SVC/1/ROOT', ErrorCode '{code}'."; + } + + public static string ConfigurationLoadError(IISDeploymentResult deploymentResult, string reason) + { + return $"Configuration load error. {reason}"; + } + + private static string EscapedContentRoot(IISDeploymentResult deploymentResult) + { + var contentRoot = deploymentResult.ContentRoot; + if (!contentRoot.EndsWith('\\')) + { + contentRoot += '\\'; + } + return Regex.Escape(contentRoot); + } } } diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/test/CommonLibTests/CommonLibTests.vcxproj index ef1cf020d5..87dbd16675 100644 --- a/test/CommonLibTests/CommonLibTests.vcxproj +++ b/test/CommonLibTests/CommonLibTests.vcxproj @@ -101,7 +101,7 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) UseLinkTimeCodeGeneration @@ -128,7 +128,7 @@ true Console ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) UseLinkTimeCodeGeneration @@ -156,7 +156,7 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) UseLinkTimeCodeGeneration @@ -184,7 +184,7 @@ true true ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) UseLinkTimeCodeGeneration diff --git a/test/CommonLibTests/hostfxr_utility_tests.cpp b/test/CommonLibTests/hostfxr_utility_tests.cpp index a9beb49676..01c9541429 100644 --- a/test/CommonLibTests/hostfxr_utility_tests.cpp +++ b/test/CommonLibTests/hostfxr_utility_tests.cpp @@ -64,7 +64,7 @@ TEST(ParseHostFxrArguments, ProvideNoArgs_InvalidArgs) struHostFxrDllLocation, struExeLocation, bstrArray), // args array. - HOSTFXR_UTILITY::StartupParametersResolutionException); + InvalidOperationException); } TEST(GetAbsolutePathToDotnetFromProgramFiles, BackupWorks) @@ -118,5 +118,5 @@ TEST(GetHostFxrArguments, InvalidParams) struHostFxrDllLocation, struExeLocation, bstrArray), // args array. - HOSTFXR_UTILITY::StartupParametersResolutionException); + InvalidOperationException); } diff --git a/test/CommonLibTests/inprocess_application_tests.cpp b/test/CommonLibTests/inprocess_application_tests.cpp index 06be5493bd..d2ec985723 100644 --- a/test/CommonLibTests/inprocess_application_tests.cpp +++ b/test/CommonLibTests/inprocess_application_tests.cpp @@ -40,7 +40,7 @@ namespace InprocessTests IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), parameters.data(), 1); - ASSERT_STREQ(app->QueryExeLocation(), L"hello"); + ASSERT_STREQ(app->QueryExeLocation().c_str(), L"hello"); } TEST(InProcessTest, GeneratesVirtualPath) diff --git a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs index 49088180c1..fea6d3b5fb 100644 --- a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs +++ b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs @@ -51,7 +51,7 @@ namespace IIS.FunctionalTests.Inprocess StopServer(); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "The specified framework 'Microsoft.NETCore.App', version '2.9.9' was not found."); } @@ -75,7 +75,7 @@ namespace IIS.FunctionalTests.Inprocess var contents = File.ReadAllText(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath)); var expectedString = "The specified framework 'Microsoft.NETCore.App', version '2.9.9' was not found."; - EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, expectedString); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, expectedString); Assert.Contains(expectedString, contents); } @@ -99,7 +99,7 @@ namespace IIS.FunctionalTests.Inprocess var fileInDirectory = Directory.GetFiles(_logFolderPath).Single(); var contents = File.ReadAllText(fileInDirectory); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Invoked hostfxr"); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Invoked hostfxr"); Assert.Contains("Invoked hostfxr", contents); } @@ -124,7 +124,7 @@ namespace IIS.FunctionalTests.Inprocess StopServer(); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Invoked hostfxr"); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Invoked hostfxr"); } [ConditionalTheory] @@ -153,7 +153,7 @@ namespace IIS.FunctionalTests.Inprocess var fileInDirectory = Directory.GetFiles(_logFolderPath).First(); var contents = File.ReadAllText(fileInDirectory); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Invoked hostfxr"); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Invoked hostfxr"); Assert.Contains("Invoked hostfxr", contents); } diff --git a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs index 1e5af7c13f..caaf728c64 100644 --- a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs @@ -4,6 +4,7 @@ using System; using System.IO; using System.Net.Http; +using System.Net.Sockets; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; @@ -26,16 +27,42 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task ServerShutsDownWhenMainExits() { var parameters = _fixture.GetBaseDeploymentParameters(publish: true); - var result = await DeployAsync(parameters); + var deploymentResult = await DeployAsync(parameters); try { - await result.HttpClient.GetAsync("/Shutdown"); + await deploymentResult.HttpClient.GetAsync("/Shutdown"); } catch (HttpRequestException ex) when (ex.InnerException is IOException) { // Server might close a connection before request completes } - Assert.True(result.HostShutdownToken.WaitHandle.WaitOne(TimeoutExtensions.DefaultTimeout)); + + deploymentResult.AssertWorkerProcessStop(); + } + + + [ConditionalFact] + public async Task ServerShutsDownWhenMainExitsStress() + { + var parameters = _fixture.GetBaseDeploymentParameters(publish: true); + var deploymentResult = await StartAsync(parameters); + + var load = Helpers.StressLoad(deploymentResult.HttpClient, "/HelloWorld", response => { + var statusCode = (int)response.StatusCode; + Assert.True(statusCode == 200 || statusCode == 503, "Status code was " + statusCode); + }); + + try + { + await deploymentResult.HttpClient.GetAsync("/Shutdown"); + await load; + } + catch (HttpRequestException ex) when (ex.InnerException is IOException | ex.InnerException is SocketException) + { + // Server might close a connection before request completes + } + + deploymentResult.AssertWorkerProcessStop(); } [ConditionalFact] diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index cab621a3e6..4c288ef90e 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -59,7 +59,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, $@"Application '{Regex.Escape(deploymentResult.ContentRoot)}\\' wasn't able to start. {subError}"); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, $@"Application '{Regex.Escape(deploymentResult.ContentRoot)}\\' wasn't able to start. {subError}"); } [ConditionalFact] @@ -137,11 +137,67 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var deploymentResult = await DeployAsync(_fixture.GetBaseDeploymentParameters(_fixture.OverriddenServerWebSite, publish: true)); var response = await deploymentResult.HttpClient.GetAsync("/"); - Assert.False(response.IsSuccessStatusCode); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.InProcessFailedToStart(deploymentResult, "CLR worker thread exited prematurely"), + EventLogHelpers.InProcessThreadException(deploymentResult, ".*?Application is running inside IIS process but is not configured to use IIS server")); + } + + [ConditionalFact] + public async Task LogsUnexpectedThreadExitError() + { + var deploymentResult = await DeployAsync(_fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true)); + + var response = await deploymentResult.HttpClient.GetAsync("/"); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); StopServer(); - Assert.Contains(TestSink.Writes, context => context.Message.Contains("Application is running inside IIS process but is not configured to use IIS server")); + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.InProcessFailedToStart(deploymentResult, "CLR worker thread exited prematurely"), + EventLogHelpers.InProcessThreadExit(deploymentResult, "12")); + } + + [ConditionalFact] + public async Task StartupTimeoutIsApplied() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} Hang"); + deploymentParameters.WebConfigActionList.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection("startupTimeLimit", "1")); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/"); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.InProcessFailedToStart(deploymentResult, "Managed server didn't initialize after 1000 ms.") + ); + } + + [ConditionalFact] + public async Task ShutdownTimeoutIsApplied() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} HangOnStop"); + deploymentParameters.WebConfigActionList.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection("shutdownTimeLimit", "1")); + + var deploymentResult = await DeployAsync(deploymentParameters); + + Assert.Equal("OK", await deploymentResult.HttpClient.GetStringAsync("/")); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.InProcessStarted(deploymentResult), + EventLogHelpers.InProcessFailedToStop(deploymentResult, "")); } [ConditionalFact] @@ -158,10 +214,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Unknown hosting model 'bogus'. Please specify either hostingModel=\"inprocess\" or hostingModel=\"outofprocess\" in the web.config file."); + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.FailedToStartApplication(deploymentResult, "0x80004005"), + EventLogHelpers.ConfigurationLoadError(deploymentResult, "Unknown hosting model 'bogus'. Please specify either hostingModel=\"inprocess\" or hostingModel=\"outofprocess\" in the web.config file.") + ); } - private static Dictionary)> InvalidConfigTransformations = InitInvalidConfigTransformations(); public static IEnumerable InvalidConfigTransformationsScenarios => InvalidConfigTransformations.ToTheoryData(); @@ -177,7 +235,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(HttpStatusCode.InternalServerError, result.StatusCode); StopServer(); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, TestSink, "Configuration load error. " + expectedError); + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.FailedToStartApplication(deploymentResult, "0x80004005"), + EventLogHelpers.ConfigurationLoadError(deploymentResult, expectedError) + ); } public static Dictionary)> InitInvalidConfigTransformations() @@ -223,42 +284,42 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests dictionary.Add("App in bin subdirectory full path to dll using exec and quotes", parameters => { MoveApplication(parameters, "bin"); - TransformArguments(parameters, (arguments, root) => "exec " + Path.Combine(root, "bin", arguments)); + parameters.TransformArguments((arguments, root) => "exec " + Path.Combine(root, "bin", arguments)); return ""; }); dictionary.Add("App in subdirectory with space", parameters => { MoveApplication(parameters, pathWithSpace); - TransformArguments(parameters, (arguments, root) => Path.Combine(pathWithSpace, arguments)); + parameters.TransformArguments((arguments, root) => Path.Combine(pathWithSpace, arguments)); return ""; }); dictionary.Add("App in subdirectory with space and full path to dll", parameters => { MoveApplication(parameters, pathWithSpace); - TransformArguments(parameters, (arguments, root) => Path.Combine(root, pathWithSpace, arguments)); + parameters.TransformArguments((arguments, root) => Path.Combine(root, pathWithSpace, arguments)); return ""; }); dictionary.Add("App in bin subdirectory with space full path to dll using exec and quotes", parameters => { MoveApplication(parameters, pathWithSpace); - TransformArguments(parameters, (arguments, root) => "exec \"" + Path.Combine(root, pathWithSpace, arguments) + "\" extra arguments"); + parameters.TransformArguments((arguments, root) => "exec \"" + Path.Combine(root, pathWithSpace, arguments) + "\" extra arguments"); return "extra|arguments"; }); dictionary.Add("App in bin subdirectory and quoted argument", parameters => { MoveApplication(parameters, "bin"); - TransformArguments(parameters, (arguments, root) => Path.Combine("bin", arguments) + " \"extra argument\""); + parameters.TransformArguments((arguments, root) => Path.Combine("bin", arguments) + " \"extra argument\""); return "extra argument"; }); dictionary.Add("App in bin subdirectory full path to dll", parameters => { MoveApplication(parameters, "bin"); - TransformArguments(parameters, (arguments, root) => Path.Combine(root, "bin", arguments) + " extra arguments"); + parameters.TransformArguments((arguments, root) => Path.Combine(root, "bin", arguments) + " extra arguments"); return "extra|arguments"; }); return dictionary; @@ -288,16 +349,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests dictionary.Add("App in subdirectory", parameters => { MoveApplication(parameters, pathWithSpace); - TransformPath(parameters, (path, root) => Path.Combine(pathWithSpace, path)); - TransformArguments(parameters, (arguments, root) => "\"additional argument\""); + parameters.TransformPath((path, root) => Path.Combine(pathWithSpace, path)); + parameters.TransformArguments((arguments, root) => "\"additional argument\""); return "additional argument"; }); dictionary.Add("App in bin subdirectory full path", parameters => { MoveApplication(parameters, pathWithSpace); - TransformPath(parameters, (path, root) => Path.Combine(root, pathWithSpace, path)); - TransformArguments(parameters, (arguments, root) => "additional arguments"); + parameters.TransformPath((path, root) => Path.Combine(root, pathWithSpace, path)); + parameters.TransformArguments((arguments, root) => "additional arguments"); return "additional|arguments"; }); @@ -322,26 +383,5 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } }); } - - private static void TransformPath(IISDeploymentParameters parameters, Func transformation) - { - parameters.WebConfigActionList.Add( - (config, contentRoot) => - { - var aspNetCoreElement = config.Descendants("aspNetCore").Single(); - aspNetCoreElement.SetAttributeValue("processPath", transformation((string)aspNetCoreElement.Attribute("processPath"), contentRoot)); - }); - } - - private static void TransformArguments(IISDeploymentParameters parameters, Func transformation) - { - parameters.WebConfigActionList.Add( - (config, contentRoot) => - { - var aspNetCoreElement = config.Descendants("aspNetCore").Single(); - aspNetCoreElement.SetAttributeValue("arguments", transformation((string)aspNetCoreElement.Attribute("arguments"), contentRoot)); - }); - } - } } diff --git a/test/WebSites/StartupExceptionWebSite/Program.cs b/test/WebSites/StartupExceptionWebSite/Program.cs index 44c8b1f461..750f247481 100644 --- a/test/WebSites/StartupExceptionWebSite/Program.cs +++ b/test/WebSites/StartupExceptionWebSite/Program.cs @@ -2,54 +2,75 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.IO; +using System.Linq; using System.Text; +using System.Threading; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; namespace IISTestSite { public static class Program { - public static void Main(string[] args) + public static int Main(string[] args) { - var envVariable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_STARTUP_VALUE"); - var randomNumber = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_RANDOM_VALUE"); + var mode = args.FirstOrDefault(); - // Semicolons are appended to env variables; removing them. - if (envVariable == "CheckLargeStdOutWrites") + switch (mode) { - Console.WriteLine(new string('a', 4096)); - } - else if (envVariable == "CheckLargeStdErrWrites") - { - Console.Error.WriteLine(new string('a', 4096)); - Console.Error.Flush(); - } - else if (envVariable == "CheckLogFile") - { - Console.WriteLine($"Random number: {randomNumber}"); - } - else if (envVariable == "CheckErrLogFile") - { - Console.Error.WriteLine($"Random number: {randomNumber}"); - Console.Error.Flush(); - } - else if (envVariable == "CheckOversizedStdErrWrites") - { - Console.WriteLine(new string('a', 5000)); + // Semicolons are appended to env variables; removing them. + case "CheckLargeStdOutWrites": + Console.WriteLine(new string('a', 4096)); + break; + case "CheckLargeStdErrWrites": + Console.Error.WriteLine(new string('a', 4096)); + Console.Error.Flush(); + break; + case "CheckLogFile": + Console.WriteLine($"Random number: {args[1]}"); + break; + case "CheckErrLogFile": + Console.Error.WriteLine($"Random number: {args[1]}"); + Console.Error.Flush(); + break; + case "CheckOversizedStdErrWrites": + Console.WriteLine(new string('a', 5000)); + break; + case "CheckOversizedStdOutWrites": + Console.Error.WriteLine(new string('a', 4096)); + Console.Error.Flush(); + break; + case "Hang": + Thread.Sleep(Timeout.Infinite); + break; + case "HangOnStop": + + var host = new WebHostBuilder() + .UseIIS() + .UseStartup() + .Build(); + host.Run(); + Thread.Sleep(Timeout.Infinite); + break; + case "CheckConsoleFunctions": + // Call a bunch of console functions and make sure none return invalid handle. + Console.OutputEncoding = Encoding.UTF8; + Console.Title = "Test"; + Console.WriteLine($"Is Console redirection: {Console.IsOutputRedirected}"); + Console.BackgroundColor = ConsoleColor.Blue; + break; } - else if (envVariable == "CheckOversizedStdOutWrites") + + return 12; + } + + public partial class Startup + { + public void Configure(IApplicationBuilder app) { - Console.Error.WriteLine(new string('a', 4096)); - Console.Error.Flush(); - } - else if (envVariable == "CheckConsoleFunctions") - { - // Call a bunch of console functions and make sure none return invalid handle. - Console.OutputEncoding = Encoding.UTF8; - Console.Title = "Test"; - Console.WriteLine($"Is Console redirection: {Console.IsOutputRedirected}"); - Console.BackgroundColor = ConsoleColor.Blue; + app.Run(async context => await context.Response.WriteAsync("OK")); } } } From d22e54244923a22d0b09e09b7e7cc0c80758c8fc Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 2 Sep 2018 12:15:01 -0700 Subject: [PATCH 257/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 52 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 ++-- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 87d39807ff..3ecafbac3f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,38 +4,38 @@ 0.10.13 - 2.2.0-preview1-20180807.2 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 0.6.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 + 2.2.0-preview1-20180821.1 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 0.6.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 15.6.82 15.6.82 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 2.0.9 2.1.2 2.2.0-preview1-26618-02 1.0.1 - 2.2.0-preview1-34967 + 2.2.0-preview2-35143 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 4a53936b7b..524a2323d0 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180816.6 -commithash:226c8adaefd0d19db0d9d11d911ba7d95644b224 +version:2.2.0-preview1-20180821.1 +commithash:c8d0cc52cd1abb697be24e288ffd54f8fae8bf17 From f52684a7bc2519f1e528bc615675502ca147e35e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 2 Sep 2018 19:16:26 +0000 Subject: [PATCH 258/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 66 ++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index dd1280daac..81b2224c9d 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,49 +5,49 @@ 0.10.13 3.0.0-alpha1-20180821.3 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 0.7.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 0.7.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 15.6.82 15.6.82 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 - 3.0.0-alpha1-10352 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 + 3.0.0-alpha1-10393 2.0.9 2.1.2 2.2.0-preview1-26618-02 1.0.1 - 3.0.0-alpha1-10352 + 3.0.0-alpha1-10393 15.6.1 11.1.0 2.0.3 - 4.6.0-preview1-26817-04 - 4.6.0-preview1-26817-04 - 4.6.0-preview1-26817-04 + 4.6.0-preview1-26829-04 + 4.6.0-preview1-26829-04 + 4.6.0-preview1-26829-04 4.6.0-preview1-26717-04 - 4.6.0-preview1-26817-04 - 4.6.0-preview1-26817-04 - 4.6.0-preview1-26817-04 - 4.6.0-preview1-26817-04 - 4.6.0-preview1-26817-04 + 4.6.0-preview1-26829-04 + 4.6.0-preview1-26829-04 + 4.6.0-preview1-26829-04 + 4.6.0-preview1-26829-04 + 4.6.0-preview1-26829-04 9.0.1 2.3.1 2.4.0 From 9b5e34e197f2c614573884f9b6c4e0c48fe2717a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 5 Sep 2018 16:34:49 -0700 Subject: [PATCH 259/363] Update branding to 2.2.0-preview3 --- version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.props b/version.props index 623841625a..378470ee63 100644 --- a/version.props +++ b/version.props @@ -7,7 +7,7 @@ 12 $(DotNetMinorVersion) $(DotNetPatchVersion) - preview2 + preview3 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From 2f4172e7e70b18da3b1a5d8a22a6fb397ca3b837 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 5 Sep 2018 16:43:09 -0700 Subject: [PATCH 260/363] Reduce probability of MultipleAppTests failure (#1365) - Decrease false-positive failure rate from 1 in 1,000 to 1 in 1,000,000 - Addresses #1350 --- .../OutOfProcess/MultipleAppTests.cs | 81 +++++++++++++------ 1 file changed, 58 insertions(+), 23 deletions(-) diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs index cf647f46e7..cc270d9afa 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.Collections.Generic; using System.Net; using System.Net.Http; @@ -25,42 +26,76 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalTheory] [InlineData(AncmVersion.AspNetCoreModule)] [InlineData(AncmVersion.AspNetCoreModuleV2)] - public async Task Startup(AncmVersion ancmVersion) + public Task Startup(AncmVersion ancmVersion) { - const int numApps = 10; + // ANCM v1 currently does *not* retry if an app fails to start the first time due to a port collision. + // So, this test is expected to fail on v1 approximately 1 in 1,000 times (probably of at least one collision + // when 10 sites choose a random port from the range 1025-48000). Adding one retry should reduce the failure + // rate from 1 in 1,000 to 1 in 1,000,000. The previous product code (with "srand(GetTickCount())") should still + // fail the test reliably. + // https://github.com/aspnet/IISIntegration/issues/1350 + // + // ANCM v2 does retry on port collisions, so no retries should be required. + var attempts = (ancmVersion == AncmVersion.AspNetCoreModule) ? 2 : 1; - using (var deployers = new DisposableList()) + return Retry(async () => { - var deploymentResults = new List(); + const int numApps = 10; - // Deploy all apps - for (var i = 0; i < numApps; i++) + using (var deployers = new DisposableList()) { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel: IntegrationTesting.HostingModel.OutOfProcess); - deploymentParameters.AncmVersion = ancmVersion; + var deploymentResults = new List(); - var deployer = CreateDeployer(deploymentParameters); - deployers.Add(deployer); - deploymentResults.Add(await deployer.DeployAsync()); + // Deploy all apps + for (var i = 0; i < numApps; i++) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel: IntegrationTesting.HostingModel.OutOfProcess); + deploymentParameters.AncmVersion = ancmVersion; + + var deployer = CreateDeployer(deploymentParameters); + deployers.Add(deployer); + deploymentResults.Add(await deployer.DeployAsync()); + } + + // Start all requests as quickly as possible, so apps are started as quickly as possible, + // to test possible race conditions when multiple apps start at the same time. + var requestTasks = new List>(); + foreach (var deploymentResult in deploymentResults) + { + requestTasks.Add(deploymentResult.HttpClient.GetAsync("/HelloWorld")); + } + + // Verify all apps started and return expected response + foreach (var requestTask in requestTasks) + { + var response = await requestTask; + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("Hello World", responseText); + } } + }, + attempts: attempts); + } - // Start all requests as quickly as possible, so apps are started as quickly as possible, - // to test possible race conditions when multiple apps start at the same time. - var requestTasks = new List>(); - foreach (var deploymentResult in deploymentResults) + private async Task Retry(Func func, int attempts) + { + var exceptions = new List(); + + for (var attempt = 0; attempt < attempts; attempt++) + { + try { - requestTasks.Add(deploymentResult.HttpClient.GetAsync("/HelloWorld")); + await func(); + return; } - - // Verify all apps started and return expected response - foreach (var requestTask in requestTasks) + catch (Exception e) { - var response = await requestTask; - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - var responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal("Hello World", responseText); + exceptions.Add(e); } } + + throw new AggregateException(exceptions); } } } From 58df4ef34df0ccab5768c4abe457ce78a6a05d7d Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 5 Sep 2018 16:47:11 -0700 Subject: [PATCH 261/363] AppVeyor: Reset dynamic port range to Windows default (#1368) - Prevents conflicts between ANCM random ports and Windows dynamic ports - Addresses #1269 --- .appveyor.yml | 6 ++++++ IISIntegration.sln | 1 + 2 files changed, 7 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index f46dcc270f..2bc93c45a8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,10 @@ init: + # Reset dynamic port range from AppVeyor setting (1025-65535) to Windows default (49152-65535), + # to prevent conflicts with ANCM random ports (1025-48000). + - netsh int ipv4 show dynamicport tcp + - netsh int ipv4 set dynamic tcp start=49152 num=16384 + - netsh int ipv4 show dynamicport tcp + - git config --global core.autocrlf true branches: only: diff --git a/IISIntegration.sln b/IISIntegration.sln index 549f17f75b..b47fed50fa 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04B1EDB6-E96 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}" ProjectSection(SolutionItems) = preProject + .appveyor.yml = .appveyor.yml .editorconfig = .editorconfig Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets From 613fbcc349a6e2f43aa65e28722e9054d41c04aa Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 5 Sep 2018 16:47:51 -0700 Subject: [PATCH 262/363] Enable code analysis on shim project (#1361) --- build/Build.Settings | 5 + .../AspNetCore/AppOfflineApplication.cpp | 9 +- .../AspNetCore/AppOfflineApplication.h | 2 +- .../AspNetCore/AppOfflineHandler.cpp | 4 +- .../AspNetCore/AppOfflineHandler.h | 4 +- .../AspNetCore/ApplicationFactory.h | 9 +- .../AspNetCore/AspNetCore.vcxproj | 4 +- .../AspNetCore/HandlerResolver.cpp | 25 +- .../AspNetCore/HandlerResolver.h | 12 +- .../PollingAppOfflineApplication.cpp | 4 +- .../AspNetCore/PollingAppOfflineApplication.h | 4 +- .../AspNetCore/ServerErrorApplication.h | 7 +- .../AspNetCore/ServerErrorHandler.h | 6 +- .../AspNetCore/ShimOptions.h | 12 +- .../AspNetCore/applicationinfo.cpp | 17 +- .../AspNetCore/applicationinfo.h | 14 +- .../AspNetCore/applicationmanager.cpp | 3 - .../AspNetCore/applicationmanager.h | 33 +- src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp | 71 +-- .../AspNetCore/globalmodule.cpp | 16 +- .../AspNetCore/globalmodule.h | 18 +- .../AspNetCore/proxymodule.cpp | 37 +- .../AspNetCore/proxymodule.h | 24 +- src/AspNetCoreModuleV2/CommonLib/EventLog.cpp | 2 +- src/AspNetCoreModuleV2/CommonLib/EventLog.h | 24 +- .../CommonLib/FileOutputManager.cpp | 2 +- .../CommonLib/HandleWrapper.h | 26 +- .../CommonLib/IOutputManager.h | 2 +- .../CommonLib/ModuleHelpers.h | 21 +- .../CommonLib/NonCopyable.h | 4 +- .../CommonLib/ResultException.h | 19 + .../CommonLib/StdWrapper.cpp | 16 +- .../CommonLib/StringHelpers.h | 30 +- .../CommonLib/WebConfigConfigurationSource.h | 4 +- .../CommonLib/application.h | 12 +- src/AspNetCoreModuleV2/CommonLib/exceptions.h | 51 ++- src/AspNetCoreModuleV2/CommonLib/fx_ver.h | 14 +- .../CommonLib/hostfxroptions.h | 8 +- .../CommonLib/iapplication.h | 2 +- .../CommonLib/requesthandler.h | 4 +- src/AspNetCoreModuleV2/DefaultRules.ruleset | 432 ++++++++++++++++++ src/AspNetCoreModuleV2/IISLib/acache.cpp | 7 +- src/AspNetCoreModuleV2/IISLib/buffer.h | 5 + src/AspNetCoreModuleV2/IISLib/multisz.h | 7 +- src/AspNetCoreModuleV2/IISLib/percpu.h | 7 +- src/AspNetCoreModuleV2/IISLib/stringa.h | 6 + src/AspNetCoreModuleV2/IISLib/stringu.cpp | 22 +- src/AspNetCoreModuleV2/IISLib/stringu.h | 8 +- .../managedexports.cpp | 2 +- .../AppOfflineTrackingApplication.cpp | 2 +- 50 files changed, 793 insertions(+), 286 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/ResultException.h create mode 100644 src/AspNetCoreModuleV2/DefaultRules.ruleset diff --git a/build/Build.Settings b/build/Build.Settings index 9daccf4aaa..d60b07c269 100644 --- a/build/Build.Settings +++ b/build/Build.Settings @@ -20,6 +20,11 @@ false true + ..\DefaultRules.ruleset + false + + true + $(RunCodeAnalysis) diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp index 49b2b07993..abae1963d5 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp @@ -11,7 +11,8 @@ HRESULT AppOfflineApplication::CreateHandler(IHttpContext* pHttpContext, IREQUES { try { - *pRequestHandler = new AppOfflineHandler(pHttpContext, m_strAppOfflineContent); + auto handler = std::make_unique(*pHttpContext, m_strAppOfflineContent); + *pRequestHandler = handler.release(); } CATCH_RETURN(); @@ -44,9 +45,9 @@ HRESULT AppOfflineApplication::OnAppOfflineFound() if (li.LowPart > 0) { DWORD bytesRead = 0; - std::string pszBuff(li.LowPart + 1, '\0'); + std::string pszBuff(static_cast(li.LowPart) + 1, '\0'); - RETURN_LAST_ERROR_IF(!ReadFile(handle, pszBuff.data(), li.LowPart, &bytesRead, NULL)); + RETURN_LAST_ERROR_IF(!ReadFile(handle, pszBuff.data(), li.LowPart, &bytesRead, nullptr)); pszBuff.resize(bytesRead); m_strAppOfflineContent = pszBuff; @@ -55,7 +56,7 @@ HRESULT AppOfflineApplication::OnAppOfflineFound() return S_OK; } -bool AppOfflineApplication::ShouldBeStarted(IHttpApplication& pApplication) +bool AppOfflineApplication::ShouldBeStarted(const IHttpApplication& pApplication) { return FileExists(GetAppOfflineLocation(pApplication)); } diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h index 71f79e5294..14399edaaa 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h +++ b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h @@ -20,7 +20,7 @@ public: HRESULT OnAppOfflineFound() override; - static bool ShouldBeStarted(IHttpApplication& pApplication); + static bool ShouldBeStarted(const IHttpApplication& pApplication); private: std::string m_strAppOfflineContent; diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp index 3efeb74463..f5098f71f6 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp @@ -7,8 +7,8 @@ REQUEST_NOTIFICATION_STATUS AppOfflineHandler::OnExecuteRequestHandler() { - HTTP_DATA_CHUNK DataChunk; - IHttpResponse* pResponse = m_pContext->GetResponse(); + HTTP_DATA_CHUNK DataChunk {}; + auto pResponse = m_pContext.GetResponse(); DBG_ASSERT(pResponse); diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h index 784a470915..e0ffd5d7cc 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h +++ b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h @@ -9,7 +9,7 @@ class AppOfflineHandler: public REQUEST_HANDLER { public: - AppOfflineHandler(IHttpContext* pContext, const std::string appOfflineContent) + AppOfflineHandler(IHttpContext& pContext, const std::string appOfflineContent) : m_pContext(pContext), m_strAppOfflineContent(appOfflineContent) { @@ -18,6 +18,6 @@ public: REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override; private: - IHttpContext* m_pContext; + IHttpContext& m_pContext; std::string m_strAppOfflineContent; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h b/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h index 380b0de6cc..9d310438ef 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h +++ b/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h @@ -5,6 +5,7 @@ #include #include +#include #include "iapplication.h" #include "HandleWrapper.h" @@ -21,9 +22,9 @@ HRESULT class ApplicationFactory { public: - ApplicationFactory(HMODULE hRequestHandlerDll, std::wstring location, PFN_ASPNETCORE_CREATE_APPLICATION pfnAspNetCoreCreateApplication): + ApplicationFactory(HMODULE hRequestHandlerDll, std::wstring location, PFN_ASPNETCORE_CREATE_APPLICATION pfnAspNetCoreCreateApplication) noexcept: m_pfnAspNetCoreCreateApplication(pfnAspNetCoreCreateApplication), - m_location(location), + m_location(std::move(location)), m_hRequestHandlerDll(hRequestHandlerDll) { } @@ -31,10 +32,10 @@ public: HRESULT Execute( _In_ IHttpServer *pServer, _In_ IHttpApplication *pHttpApplication, - _Out_ IAPPLICATION **pApplication) const + _Outptr_ IAPPLICATION **pApplication) const noexcept { std::array parameters { - {"InProcessExeLocation", reinterpret_cast(m_location.data())} + {"InProcessExeLocation", m_location.data()} }; return m_pfnAspNetCoreCreateApplication(pServer, pHttpApplication, parameters.data(), static_cast(parameters.size()), pApplication); } diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index d700f7ed1b..b71ab41c83 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -1,6 +1,5 @@ - + - Debug @@ -56,6 +55,7 @@ Unicode + diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index bd7dacfb34..4c98e60f11 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -14,11 +14,12 @@ #include "resources.h" #include "ConfigurationLoadException.h" #include "WebConfigConfigurationSource.h" +#include "ModuleHelpers.h" const PCWSTR HandlerResolver::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; const PCWSTR HandlerResolver::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; -HandlerResolver::HandlerResolver(HMODULE hModule, IHttpServer &pServer) +HandlerResolver::HandlerResolver(HMODULE hModule, const IHttpServer &pServer) : m_hModule(hModule), m_pServer(pServer), m_loadedApplicationHostingModel(HOSTING_UNKNOWN) @@ -27,11 +28,11 @@ HandlerResolver::HandlerResolver(HMODULE hModule, IHttpServer &pServer) } HRESULT -HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, ShimOptions& pConfiguration, std::unique_ptr& pApplicationFactory) +HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication, const ShimOptions& pConfiguration, std::unique_ptr& pApplicationFactory) { - HRESULT hr; - PCWSTR pstrHandlerDllName; - bool preventUnload; + HRESULT hr = S_OK; + PCWSTR pstrHandlerDllName = nullptr; + bool preventUnload = false; if (pConfiguration.QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) { preventUnload = false; @@ -76,7 +77,7 @@ HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, Shim hr = FindNativeAssemblyFromHostfxr(*options.get(), pstrHandlerDllName, handlerDllPath); outputManager->Stop(); - if (FAILED(hr) && m_hHostFxrDll != NULL) + if (FAILED(hr) && m_hHostFxrDll != nullptr) { STRA content; STRU struStdMsg; @@ -119,7 +120,7 @@ HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, Shim RETURN_LAST_ERROR_IF_NULL(hRequestHandlerDll); } - auto pfnAspNetCoreCreateApplication = reinterpret_cast(GetProcAddress(hRequestHandlerDll, "CreateApplication")); + auto pfnAspNetCoreCreateApplication = ModuleHelpers::GetKnownProcAddress(hRequestHandlerDll, "CreateApplication"); RETURN_LAST_ERROR_IF_NULL(pfnAspNetCoreCreateApplication); pApplicationFactory = std::make_unique(hRequestHandlerDll.release(), location, pfnAspNetCoreCreateApplication); @@ -127,7 +128,7 @@ HandlerResolver::LoadRequestHandlerAssembly(IHttpApplication &pApplication, Shim } HRESULT -HandlerResolver::GetApplicationFactory(IHttpApplication &pApplication, std::unique_ptr& pApplicationFactory) +HandlerResolver::GetApplicationFactory(const IHttpApplication &pApplication, std::unique_ptr& pApplicationFactory) { try { @@ -189,7 +190,7 @@ void HandlerResolver::ResetHostingModel() HRESULT HandlerResolver::FindNativeAssemblyFromGlobalLocation( - ShimOptions& pConfiguration, + const ShimOptions& pConfiguration, PCWSTR pstrHandlerDllName, std::wstring& handlerDllPath ) @@ -225,20 +226,20 @@ HandlerResolver::FindNativeAssemblyFromGlobalLocation( // HRESULT HandlerResolver::FindNativeAssemblyFromHostfxr( - HOSTFXR_OPTIONS& hostfxrOptions, + const HOSTFXR_OPTIONS& hostfxrOptions, PCWSTR libraryName, std::wstring& handlerDllPath ) { std::wstring struNativeSearchPaths; - size_t intIndex; + size_t intIndex = 0; size_t intPrevIndex = 0; DWORD dwBufferSize = s_initialGetNativeSearchDirectoriesBufferSize; DWORD dwRequiredBufferSize = 0; RETURN_LAST_ERROR_IF_NULL(m_hHostFxrDll = LoadLibraryW(hostfxrOptions.GetHostFxrLocation().c_str())); - auto pFnHostFxrSearchDirectories = reinterpret_cast(GetProcAddress(m_hHostFxrDll, "hostfxr_get_native_search_directories")); + const auto pFnHostFxrSearchDirectories = ModuleHelpers::GetKnownProcAddress(m_hHostFxrDll, "hostfxr_get_native_search_directories"); if (pFnHostFxrSearchDirectories == nullptr) { EventLog::Error( diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h index be927693ab..7b230a928f 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h @@ -13,17 +13,17 @@ class HandlerResolver { public: - HandlerResolver(HMODULE hModule, IHttpServer &pServer); - HRESULT GetApplicationFactory(IHttpApplication &pApplication, std::unique_ptr& pApplicationFactory); + HandlerResolver(HMODULE hModule, const IHttpServer &pServer); + HRESULT GetApplicationFactory(const IHttpApplication &pApplication, std::unique_ptr& pApplicationFactory); void ResetHostingModel(); private: - HRESULT LoadRequestHandlerAssembly(IHttpApplication &pApplication, ShimOptions& pConfiguration, std::unique_ptr& pApplicationFactory); - HRESULT FindNativeAssemblyFromGlobalLocation(ShimOptions& pConfiguration, PCWSTR libraryName, std::wstring& handlerDllPath); - HRESULT FindNativeAssemblyFromHostfxr(HOSTFXR_OPTIONS& hostfxrOptions, PCWSTR libraryName, std::wstring& handlerDllPath); + HRESULT LoadRequestHandlerAssembly(const IHttpApplication &pApplication, const ShimOptions& pConfiguration, std::unique_ptr& pApplicationFactory); + HRESULT FindNativeAssemblyFromGlobalLocation(const ShimOptions& pConfiguration, PCWSTR libraryName, std::wstring& handlerDllPath); + HRESULT FindNativeAssemblyFromHostfxr(const HOSTFXR_OPTIONS& hostfxrOptions, PCWSTR libraryName, std::wstring& handlerDllPath); HMODULE m_hModule; - IHttpServer &m_pServer; + const IHttpServer &m_pServer; SRWLOCK m_requestHandlerLoadLock {}; std::wstring m_loadedApplicationId; diff --git a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp index 1270319e8b..382950fde4 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp @@ -44,12 +44,12 @@ PollingAppOfflineApplication::CheckAppOffline() } -std::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpApplication& pApplication) +std::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(const IHttpApplication& pApplication) { return std::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm"; } -bool PollingAppOfflineApplication::FileExists(const std::filesystem::path& path) +bool PollingAppOfflineApplication::FileExists(const std::filesystem::path& path) noexcept { std::error_code ec; return is_regular_file(path, ec) || ec.value() == ERROR_SHARING_VIOLATION; diff --git a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h index 193a63e639..eadd0da3b8 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h +++ b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h @@ -31,8 +31,8 @@ public: protected: std::filesystem::path m_appOfflineLocation; - static std::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication); - static bool FileExists(const std::filesystem::path& path); + static std::filesystem::path GetAppOfflineLocation(const IHttpApplication& pApplication); + static bool FileExists(const std::filesystem::path& path) noexcept; private: static const int c_appOfflineRefreshIntervalMS = 200; std::string m_strAppOfflineContent; diff --git a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h index 2162075950..86a9a1a0e3 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h +++ b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h @@ -17,13 +17,14 @@ public: ~ServerErrorApplication() = default; - HRESULT CreateHandler(IHttpContext * pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override + HRESULT CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override { - *pRequestHandler = new ServerErrorHandler(pHttpContext, m_HR); + auto handler = std::make_unique(*pHttpContext, m_HR); + *pRequestHandler = handler.release(); return S_OK; } - HRESULT OnAppOfflineFound() override { return S_OK; } + HRESULT OnAppOfflineFound() noexcept override { return S_OK; } private: HRESULT m_HR; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorHandler.h b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorHandler.h index b3d917039d..10cf3ee049 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorHandler.h +++ b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorHandler.h @@ -7,17 +7,17 @@ class ServerErrorHandler : public REQUEST_HANDLER { public: - ServerErrorHandler(IHttpContext* pContext, HRESULT hr) : m_pContext(pContext), m_HR(hr) + ServerErrorHandler(IHttpContext &pContext, HRESULT hr) : m_pContext(pContext), m_HR(hr) { } REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override { - m_pContext->GetResponse()->SetStatus(500, "Internal Server Error", 0, m_HR); + m_pContext.GetResponse()->SetStatus(500, "Internal Server Error", 0, m_HR); return RQ_NOTIFICATION_FINISH_REQUEST; } private: - IHttpContext * m_pContext; + IHttpContext &m_pContext; HRESULT m_HR; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h b/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h index f987e864ba..4b934ad9b4 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h +++ b/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h @@ -18,37 +18,37 @@ class ShimOptions: NonCopyable { public: const std::wstring& - QueryProcessPath() const + QueryProcessPath() const noexcept { return m_strProcessPath; } const std::wstring& - QueryArguments() const + QueryArguments() const noexcept { return m_strArguments; } APP_HOSTING_MODEL - QueryHostingModel() const + QueryHostingModel() const noexcept { return m_hostingModel; } const std::wstring& - QueryHandlerVersion() const + QueryHandlerVersion() const noexcept { return m_strHandlerVersion; } BOOL - QueryStdoutLogEnabled() const + QueryStdoutLogEnabled() const noexcept { return m_fStdoutLogEnabled; } const std::wstring& - QueryStdoutLogFile() const + QueryStdoutLogFile() const noexcept { return m_struStdoutLogFile; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index 9f2b20cf8e..fb558e52d0 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -13,14 +13,9 @@ #include "ServerErrorApplication.h" #include "AppOfflineApplication.h" -APPLICATION_INFO::~APPLICATION_INFO() -{ - ShutDownApplication(/* fServerInitiated */ false); -} - HRESULT APPLICATION_INFO::GetOrCreateApplication( - IHttpContext *pHttpContext, + IHttpContext& pHttpContext, std::unique_ptr& pApplication ) { @@ -28,7 +23,7 @@ APPLICATION_INFO::GetOrCreateApplication( SRWExclusiveLock lock(m_applicationLock); - auto& httpApplication = *pHttpContext->GetApplication(); + auto& httpApplication = *pHttpContext.GetApplication(); if (m_pApplication != nullptr) { @@ -51,7 +46,10 @@ APPLICATION_INFO::GetOrCreateApplication( if (AppOfflineApplication::ShouldBeStarted(httpApplication)) { LOG_INFO(L"Detected app_offline file, creating polling application"); + #pragma warning( push ) + #pragma warning ( disable : 26409 ) // Disable "Avoid using new", using custom deleter here m_pApplication.reset(new AppOfflineApplication(httpApplication)); + #pragma warning( pop ) } else { @@ -77,8 +75,11 @@ Finished: ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG, httpApplication.GetApplicationId(), hr); - + + #pragma warning( push ) + #pragma warning ( disable : 26409 ) // Disable "Avoid using new", using custom deleter here m_pApplication.reset(new ServerErrorApplication(httpApplication, hr)); + #pragma warning( pop ) } if (m_pApplication) diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h index 94f2718e08..998cdc5ae1 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h @@ -12,7 +12,7 @@ extern BOOL g_fRecycleProcessCalled; -class APPLICATION_INFO +class APPLICATION_INFO: NonCopyable { public: @@ -29,16 +29,16 @@ public: InitializeSRWLock(&m_applicationLock); } - ~APPLICATION_INFO(); + ~APPLICATION_INFO() = default; - std::wstring& - QueryApplicationInfoKey() + const std::wstring& + QueryApplicationInfoKey() const noexcept { return m_strInfoKey; } - std::wstring& - QueryConfigPath() + const std::wstring& + QueryConfigPath() const noexcept { return m_strConfigPath; } @@ -48,7 +48,7 @@ public: HRESULT GetOrCreateApplication( - IHttpContext *pHttpContext, + IHttpContext& pHttpContext, std::unique_ptr& pApplication ); diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp index 7b9df85a43..52d9730ec1 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp @@ -11,9 +11,6 @@ extern BOOL g_fInShutdown; -// The application manager is a singleton across ANCM. -APPLICATION_MANAGER* APPLICATION_MANAGER::sm_pApplicationManager = NULL; - // // Retrieves the application info from the application manager // Will create the application info if it isn't initalized diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h index ab3fbe9746..a9fdde6a5f 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h @@ -19,25 +19,6 @@ class APPLICATION_MANAGER { public: - static - APPLICATION_MANAGER* - GetInstance() - { - assert(sm_pApplicationManager); - return sm_pApplicationManager; - } - - static - VOID - Cleanup() - { - if(sm_pApplicationManager != NULL) - { - delete sm_pApplicationManager; - sm_pApplicationManager = NULL; - } - } - HRESULT GetOrCreateApplicationInfo( _In_ IHttpContext& pHttpContext, @@ -51,16 +32,7 @@ public: VOID ShutDown(); - - static HRESULT StaticInitialize(HMODULE hModule, IHttpServer& pHttpServer) - { - assert(!sm_pApplicationManager); - sm_pApplicationManager = new APPLICATION_MANAGER(hModule, pHttpServer); - return S_OK; - } - - -private: + APPLICATION_MANAGER(HMODULE hModule, IHttpServer& pHttpServer) : m_pApplicationInfoHash(NULL), m_fDebugInitialize(FALSE), @@ -70,8 +42,9 @@ private: InitializeSRWLock(&m_srwLock); } +private: + std::unordered_map> m_pApplicationInfoHash; - static APPLICATION_MANAGER *sm_pApplicationManager; SRWLOCK m_srwLock {}; BOOL m_fDebugInitialize; IHttpServer &m_pHttpServer; diff --git a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp index b20ca03b97..1f34270aee 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp @@ -13,7 +13,7 @@ DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2.dll"); -HANDLE g_hEventLog = NULL; +HANDLE g_hEventLog = nullptr; BOOL g_fRecycleProcessCalled = FALSE; BOOL g_fInShutdown = FALSE; HINSTANCE g_hServerModule; @@ -21,14 +21,14 @@ HINSTANCE g_hServerModule; VOID StaticCleanup() { - APPLICATION_MANAGER::Cleanup(); - if (g_hEventLog != NULL) + if (g_hEventLog != nullptr) { DeregisterEventSource(g_hEventLog); - g_hEventLog = NULL; + g_hEventLog = nullptr; } DebugStop(); + ALLOC_CACHE_HANDLER::StaticTerminate(); } BOOL WINAPI DllMain(HMODULE hModule, @@ -41,11 +41,14 @@ BOOL WINAPI DllMain(HMODULE hModule, switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: + + ALLOC_CACHE_HANDLER::StaticInitialize(); g_hServerModule = hModule; DisableThreadLibraryCalls(hModule); DebugInitialize(hModule); break; case DLL_PROCESS_DETACH: + // IIS can cause dll detach to occur before we receive global notifications // For example, when we switch the bitness of the worker process, // this is a bug in IIS. To try to avoid AVs, we will set a global flag @@ -85,21 +88,18 @@ HRESULT --*/ { - HRESULT hr = S_OK; - HKEY hKey; + HKEY hKey {}; BOOL fDisableANCM = FALSE; - ASPNET_CORE_PROXY_MODULE_FACTORY * pFactory = NULL; - ASPNET_CORE_GLOBAL_MODULE * pGlobalModule = NULL; UNREFERENCED_PARAMETER(dwServerVersion); if (pHttpServer->IsCommandLineLaunch()) { - g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); + g_hEventLog = RegisterEventSource(nullptr, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); } else { - g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_EVENT_PROVIDER); + g_hEventLog = RegisterEventSource(nullptr, ASPNETCORE_EVENT_PROVIDER); } // check whether the feature is disabled due to security reason @@ -109,14 +109,14 @@ HRESULT KEY_READ, &hKey) == NO_ERROR) { - DWORD dwType; - DWORD dwData; + DWORD dwType = 0; + DWORD dwData = 0; DWORD cbData; cbData = sizeof(dwData); if ((RegQueryValueEx(hKey, L"DisableANCM", - NULL, + nullptr, &dwType, (LPBYTE)&dwData, &cbData) == NO_ERROR) && @@ -136,7 +136,7 @@ HRESULT ASPNETCORE_EVENT_MODULE_DISABLED_MSG); // this will return 500 error to client // as we did not register the module - goto Finished; + return S_OK; } // @@ -144,43 +144,22 @@ HRESULT // The ASPNET_CORE_PROXY_MODULE_FACTORY::Terminate method will clean any // static object initialized. // - pFactory = new ASPNET_CORE_PROXY_MODULE_FACTORY; + + auto applicationManager = std::make_shared(g_hServerModule, *pHttpServer); + auto moduleFactory = std::make_unique(applicationManager); - FINISHED_IF_FAILED(pModuleInfo->SetRequestNotifications( - pFactory, + RETURN_IF_FAILED(pModuleInfo->SetRequestNotifications( + moduleFactory.release(), RQ_EXECUTE_REQUEST_HANDLER, 0)); +; + auto pGlobalModule = std::make_unique(std::move(applicationManager)); - pFactory = NULL; - - FINISHED_IF_FAILED(APPLICATION_MANAGER::StaticInitialize(g_hServerModule, *pHttpServer)); - - pGlobalModule = NULL; - - pGlobalModule = new ASPNET_CORE_GLOBAL_MODULE(APPLICATION_MANAGER::GetInstance()); - - FINISHED_IF_FAILED(pModuleInfo->SetGlobalNotifications( - pGlobalModule, + RETURN_IF_FAILED(pModuleInfo->SetGlobalNotifications( + pGlobalModule.release(), GL_CONFIGURATION_CHANGE | // Configuration change trigers IIS application stop GL_STOP_LISTENING)); // worker process stop or recycle - - pGlobalModule = NULL; - - FINISHED_IF_FAILED(ALLOC_CACHE_HANDLER::StaticInitialize()); - -Finished: - if (pGlobalModule != NULL) - { - delete pGlobalModule; - pGlobalModule = NULL; - } - - if (pFactory != NULL) - { - pFactory->Terminate(); - pFactory = NULL; - } - - return hr; + + return S_OK; } CATCH_RETURN() diff --git a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp index 755b1ffc79..abe08964cd 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp @@ -5,10 +5,9 @@ extern BOOL g_fInShutdown; -ASPNET_CORE_GLOBAL_MODULE::ASPNET_CORE_GLOBAL_MODULE( - APPLICATION_MANAGER* pApplicationManager) +ASPNET_CORE_GLOBAL_MODULE::ASPNET_CORE_GLOBAL_MODULE(std::shared_ptr pApplicationManager) noexcept + :m_pApplicationManager(std::move(pApplicationManager)) { - m_pApplicationManager = pApplicationManager; } // @@ -30,11 +29,8 @@ ASPNET_CORE_GLOBAL_MODULE::OnGlobalStopListening( return GL_NOTIFICATION_CONTINUE; } - DBG_ASSERT(m_pApplicationManager); - // we should let application manager to shutdown all allication - // and dereference it as some requests may still reference to application manager m_pApplicationManager->ShutDown(); - m_pApplicationManager = NULL; + m_pApplicationManager = nullptr; // Return processing to the pipeline. return GL_NOTIFICATION_CONTINUE; @@ -59,13 +55,13 @@ ASPNET_CORE_GLOBAL_MODULE::OnGlobalConfigurationChange( LOG_INFOF(L"ASPNET_CORE_GLOBAL_MODULE::OnGlobalConfigurationChange '%ls'", pwszChangePath); // Test for an error. - if (NULL != pwszChangePath && + if (nullptr != pwszChangePath && _wcsicmp(pwszChangePath, L"MACHINE") != 0 && _wcsicmp(pwszChangePath, L"MACHINE/WEBROOT") != 0) { - if (m_pApplicationManager != NULL) + if (m_pApplicationManager) { - m_pApplicationManager->RecycleApplicationFromManager(pwszChangePath); + m_pApplicationManager->RecycleApplicationFromManager(pwszChangePath); } } diff --git a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h index 13b6f86bea..80f047e08d 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h @@ -5,20 +5,18 @@ #include "applicationmanager.h" -class ASPNET_CORE_GLOBAL_MODULE : public CGlobalModule +class ASPNET_CORE_GLOBAL_MODULE : NonCopyable, public CGlobalModule { public: ASPNET_CORE_GLOBAL_MODULE( - APPLICATION_MANAGER* pApplicationManager - ); + std::shared_ptr pApplicationManager + ) noexcept; - ~ASPNET_CORE_GLOBAL_MODULE() - { - } + virtual ~ASPNET_CORE_GLOBAL_MODULE() = default; - VOID Terminate() + VOID Terminate() override { LOG_INFO(L"ASPNET_CORE_GLOBAL_MODULE::Terminate"); // Remove the class from memory. @@ -28,13 +26,13 @@ public: GLOBAL_NOTIFICATION_STATUS OnGlobalStopListening( _In_ IGlobalStopListeningProvider * pProvider - ); + ) override; GLOBAL_NOTIFICATION_STATUS OnGlobalConfigurationChange( _In_ IGlobalConfigurationChangeProvider * pProvider - ); + ) override; private: - APPLICATION_MANAGER * m_pApplicationManager; + std::shared_ptr m_pApplicationManager; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index b4ed0fbaad..c93c7c7602 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -5,31 +5,40 @@ #include "applicationmanager.h" #include "applicationinfo.h" -#include "acache.h" #include "exceptions.h" extern BOOL g_fInShutdown; __override + +ASPNET_CORE_PROXY_MODULE_FACTORY::ASPNET_CORE_PROXY_MODULE_FACTORY(std::shared_ptr applicationManager) noexcept + :m_pApplicationManager(std::move(applicationManager)) +{ +} + HRESULT ASPNET_CORE_PROXY_MODULE_FACTORY::GetHttpModule( CHttpModule ** ppModule, IModuleAllocator * pAllocator ) { - try + + #pragma warning( push ) + #pragma warning ( disable : 26409 ) // Disable "Avoid using new" + *ppModule = new (pAllocator) ASPNET_CORE_PROXY_MODULE(m_pApplicationManager); + #pragma warning( push ) + if (*ppModule == nullptr) { - *ppModule = THROW_IF_NULL_ALLOC(new (pAllocator) ASPNET_CORE_PROXY_MODULE());; - return S_OK; + return E_OUTOFMEMORY; } - CATCH_RETURN(); + return S_OK; } __override VOID ASPNET_CORE_PROXY_MODULE_FACTORY::Terminate( VOID -) +) noexcept /*++ Routine description: @@ -46,12 +55,13 @@ Return value: --*/ { - ALLOC_CACHE_HANDLER::StaticTerminate(); delete this; } -ASPNET_CORE_PROXY_MODULE::ASPNET_CORE_PROXY_MODULE( -) : m_pApplicationInfo(nullptr), m_pHandler(nullptr) +ASPNET_CORE_PROXY_MODULE::ASPNET_CORE_PROXY_MODULE(std::shared_ptr applicationManager) noexcept + : m_pApplicationManager(std::move(applicationManager)), + m_pApplicationInfo(nullptr), + m_pHandler(nullptr) { } @@ -64,6 +74,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( { HRESULT hr = S_OK; REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; + try { @@ -72,14 +83,12 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); } - auto pApplicationManager = APPLICATION_MANAGER::GetInstance(); - - FINISHED_IF_FAILED(pApplicationManager->GetOrCreateApplicationInfo( + FINISHED_IF_FAILED(m_pApplicationManager->GetOrCreateApplicationInfo( *pHttpContext, m_pApplicationInfo)); std::unique_ptr pApplication; - FINISHED_IF_FAILED(m_pApplicationInfo->GetOrCreateApplication(pHttpContext, pApplication)); + FINISHED_IF_FAILED(m_pApplicationInfo->GetOrCreateApplication(*pHttpContext, pApplication)); IREQUEST_HANDLER* pHandler; // Create RequestHandler and process the request @@ -94,7 +103,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( } Finished: - if (LOG_IF_FAILED(hr)) + if (FAILED(LOG_IF_FAILED(hr))) { retVal = RQ_NOTIFICATION_FINISH_REQUEST; if (hr == HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)) diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h index 06e333d595..7c67712bab 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h @@ -6,14 +6,15 @@ #include #include "applicationinfo.h" #include "irequesthandler.h" +#include "applicationmanager.h" extern HTTP_MODULE_ID g_pModuleId; -class ASPNET_CORE_PROXY_MODULE : public CHttpModule +class ASPNET_CORE_PROXY_MODULE : NonCopyable, public CHttpModule { public: - ASPNET_CORE_PROXY_MODULE(); + ASPNET_CORE_PROXY_MODULE(std::shared_ptr applicationManager) noexcept; ~ASPNET_CORE_PROXY_MODULE() = default; @@ -33,7 +34,7 @@ class ASPNET_CORE_PROXY_MODULE : public CHttpModule OnExecuteRequestHandler( IHttpContext * pHttpContext, IHttpEventProvider * pProvider - ); + ) override; __override REQUEST_NOTIFICATION_STATUS @@ -43,22 +44,29 @@ class ASPNET_CORE_PROXY_MODULE : public CHttpModule BOOL fPostNotification, IHttpEventProvider * pProvider, IHttpCompletionInfo * pCompletionInfo - ); + ) override; private: + std::shared_ptr m_pApplicationManager; std::shared_ptr m_pApplicationInfo; - std::unique_ptr m_pHandler; + std::unique_ptr m_pHandler; }; -class ASPNET_CORE_PROXY_MODULE_FACTORY : public IHttpModuleFactory +class ASPNET_CORE_PROXY_MODULE_FACTORY : NonCopyable, public IHttpModuleFactory { public: + ASPNET_CORE_PROXY_MODULE_FACTORY(std::shared_ptr applicationManager) noexcept; + virtual ~ASPNET_CORE_PROXY_MODULE_FACTORY() = default; + HRESULT GetHttpModule( CHttpModule ** ppModule, IModuleAllocator * pAllocator - ); + ) override; VOID - Terminate(); + Terminate() noexcept override; + + private: + std::shared_ptr m_pApplicationManager; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp b/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp index a8b32849ff..c3a3608820 100644 --- a/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp @@ -50,7 +50,7 @@ EventLog::LogEventF( _In_ WORD dwEventInfoType, _In_ DWORD dwEventId, _In_ LPCWSTR pstrMsg, - va_list argsList + _In_ va_list argsList ) { STACK_STRU ( strEventMsg, 256 ); diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.h b/src/AspNetCoreModuleV2/CommonLib/EventLog.h index cdc330300f..fa2cde1947 100644 --- a/src/AspNetCoreModuleV2/CommonLib/EventLog.h +++ b/src/AspNetCoreModuleV2/CommonLib/EventLog.h @@ -5,6 +5,18 @@ #include "resources.h" +#define _va_start(ap, x) \ + __pragma(warning(push)) \ + __pragma(warning(disable:26481 26492)) /*Don't use pointer arithmetic. Don't use const_cast to cast away const.*/ \ + va_start(ap, x) \ + __pragma(warning(pop)) + +#define _va_end(args) \ + __pragma(warning(push)) \ + __pragma(warning(disable:26477)) /*Use 'nullptr' rather than 0 or NULL*/ \ + va_end(args) \ + __pragma(warning(pop)) + class EventLog { public: @@ -16,9 +28,9 @@ public: ...) { va_list args; - va_start(args, pstrMsg); + _va_start(args, pstrMsg); LogEventF(EVENTLOG_ERROR_TYPE, dwEventId, pstrMsg, args); - va_end(args); + _va_end(args); } static @@ -29,9 +41,9 @@ public: ...) { va_list args; - va_start(args, pstrMsg); + _va_start(args, pstrMsg); LogEventF(EVENTLOG_INFORMATION_TYPE, dwEventId, pstrMsg, args); - va_end(args); + _va_end(args); } static @@ -42,9 +54,9 @@ public: ...) { va_list args; - va_start(args, pstrMsg); + _va_start(args, pstrMsg); LogEventF(EVENTLOG_WARNING_TYPE, dwEventId, pstrMsg, args); - va_end(args); + _va_end(args); } private: diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp index 69cc0fe76a..fb95017af8 100644 --- a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp @@ -174,7 +174,7 @@ FileOutputManager::Stop() if (li.LowPart == 0 || li.HighPart > 0) { - RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + RETURN_HR(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); } dwFilePointer = SetFilePointer(m_hLogFileHandle, 0, NULL, FILE_BEGIN); diff --git a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h index d3afa64551..56da4ae035 100644 --- a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h +++ b/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h @@ -10,37 +10,41 @@ struct InvalidHandleTraits { using HandleType = HANDLE; static const HANDLE DefaultHandle; - static void Close(HANDLE handle) { CloseHandle(handle); } + static void Close(HANDLE handle) noexcept { CloseHandle(handle); } }; struct NullHandleTraits { using HandleType = HANDLE; - static constexpr HANDLE DefaultHandle = NULL; - static void Close(HANDLE handle) { CloseHandle(handle); } + static constexpr HANDLE DefaultHandle = nullptr; + static void Close(HANDLE handle) noexcept { CloseHandle(handle); } }; struct FindFileHandleTraits { using HandleType = HANDLE; static const HANDLE DefaultHandle; - static void Close(HANDLE handle) { FindClose(handle); } + static void Close(HANDLE handle) noexcept { FindClose(handle); } }; struct ModuleHandleTraits { using HandleType = HMODULE; - static constexpr HMODULE DefaultHandle = NULL; - static void Close(HMODULE handle) { FreeModule(handle); } + static constexpr HMODULE DefaultHandle = nullptr; + static void Close(HMODULE handle) noexcept { FreeModule(handle); } }; +// Code analysis doesn't like nullptr usages via traits +#pragma warning( push ) +#pragma warning ( disable : 26477 ) // disable Use 'nullptr' rather than 0 or NULL (es.47). + template class HandleWrapper { public: using HandleType = typename traits::HandleType; - HandleWrapper(HandleType handle = traits::DefaultHandle) : m_handle(handle) { } + HandleWrapper(HandleType handle = traits::DefaultHandle) noexcept : m_handle(handle) { } ~HandleWrapper() { if (m_handle != traits::DefaultHandle) @@ -49,15 +53,15 @@ public: } } - operator HandleType() { return m_handle; } - HandleWrapper& operator =(HandleType value) + operator HandleType() noexcept { return m_handle; } + HandleWrapper& operator =(HandleType value) noexcept { DBG_ASSERT(m_handle == traits::DefaultHandle); m_handle = value; return *this; } - HandleType* operator&() { return &m_handle; } + HandleType* operator&() noexcept { return &m_handle; } HandleType release() noexcept { @@ -69,3 +73,5 @@ public: private: HandleType m_handle; }; + +#pragma warning( pop ) diff --git a/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h index 6b733dd0e6..fec85cea96 100644 --- a/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h @@ -14,7 +14,7 @@ public: Start() = 0; virtual - ~IOutputManager() {}; + ~IOutputManager() = default; virtual bool diff --git a/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h b/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h index 0ef9a7662d..cab86d76ea 100644 --- a/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h +++ b/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h @@ -14,7 +14,26 @@ public: void IncrementCurrentModuleRefCount(HandleWrapper &handle) { WCHAR path[MAX_PATH]; - THROW_LAST_ERROR_IF(!GetModuleFileName(g_hModule, path, sizeof(path))); + +#pragma warning( push ) +#pragma warning ( disable : 26485 ) // Calling WinAPI causes expected array to pointer decay + + THROW_LAST_ERROR_IF(!GetModuleFileName(g_hModule, path, MAX_PATH)); THROW_LAST_ERROR_IF(!GetModuleHandleEx(0, path, &handle)); + +#pragma warning( pop ) + } + + template + static + Func GetKnownProcAddress(HMODULE hModule, LPCSTR lpProcName) { + +#pragma warning( push ) +#pragma warning ( disable : 26490 ) // Disable Don't use reinterpret_cast + auto proc = reinterpret_cast(GetProcAddress(hModule, lpProcName)); +#pragma warning( pop ) + + THROW_LAST_ERROR_IF (!proc); + return proc; } }; diff --git a/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h b/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h index 8dcb282411..11f73903fa 100644 --- a/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h +++ b/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h @@ -6,6 +6,6 @@ class NonCopyable { public: NonCopyable() = default; - NonCopyable(const NonCopyable&) = default; - NonCopyable& operator=(const NonCopyable&) = default; + NonCopyable(const NonCopyable&) = delete; + NonCopyable& operator=(const NonCopyable&) = delete; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/ResultException.h b/src/AspNetCoreModuleV2/CommonLib/ResultException.h new file mode 100644 index 0000000000..e6cb8b4b81 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/ResultException.h @@ -0,0 +1,19 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +class ResultException: public std::runtime_error +{ +public: + ResultException(HRESULT hr, LOCATION_ARGUMENTS_ONLY) : + runtime_error(format("HRESULT 0x%x returned at " LOCATION_FORMAT, hr, LOCATION_CALL_ONLY)), + m_hr(hr) + { + } + + HRESULT GetResult() const noexcept { return m_hr; } + +private: + HRESULT m_hr; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp b/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp index dffaa491c5..432e48a163 100644 --- a/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp @@ -78,14 +78,14 @@ StdWrapper::StartRedirection() if (fileDescriptor == -1) { - RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + RETURN_HR(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); } m_redirectedFile = _fdopen(fileDescriptor, "w"); if (m_redirectedFile == nullptr) { - RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + RETURN_HR(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); } // Set stdout/stderr to the newly created file. @@ -93,13 +93,13 @@ StdWrapper::StartRedirection() if (dup2Result != 0) { - RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + RETURN_HR(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); } // Removes buffering from the output if (setvbuf(m_stdStream, nullptr, _IONBF, 0) != 0) { - RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + RETURN_HR(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); } return S_OK; @@ -117,7 +117,7 @@ StdWrapper::StopRedirection() const FILE * file = _fdopen(m_previousFileDescriptor, "w"); if (file == nullptr) { - RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + RETURN_HR(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); } RETURN_LAST_ERROR_IF(!SetStdHandle(m_stdHandleNumber, reinterpret_cast(_get_osfhandle(m_previousFileDescriptor)))); @@ -131,17 +131,17 @@ StdWrapper::StopRedirection() const const auto dup2Result = _dup2(_fileno(file), _fileno(m_stdStream)); if (dup2Result != 0) { - RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + RETURN_HR(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); } if (setvbuf(m_stdStream, nullptr, _IONBF, 0) != 0) { - RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + RETURN_HR(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); } if (fclose(m_redirectedFile) != 0) { - RETURN_IF_FAILED(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + RETURN_HR(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); } return S_OK; diff --git a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h index 957f5bc3d6..e6cda03ff7 100644 --- a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h +++ b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h @@ -15,19 +15,33 @@ template [[nodiscard]] std::wstring format(const std::wstring& format, Args ... args) { - const size_t size = swprintf(nullptr, 0, format.c_str(), args ...) + 1; // Extra char for '\0' - std::unique_ptr formattedBuffer(new wchar_t[size]); - swprintf(formattedBuffer.get(), size, format.c_str(), args ... ); - return std::wstring(formattedBuffer.get(), formattedBuffer.get() + size - 1); + std::wstring result; + if (!format.empty()) + { + const size_t size = swprintf(nullptr, 0, format.c_str(), args ...); // Extra char for '\0' + result.resize(size + 1); + if (swprintf(result.data(), result.size(), format.c_str(), args ... ) == -1) + { + throw std::system_error(std::error_code(errno, std::system_category())); + } + } + return result; } template [[nodiscard]] std::string format(const std::string& format, Args ... args) { - const size_t size = snprintf(nullptr, 0, format.c_str(), args ...) + 1; // Extra char for '\0' - std::unique_ptr formattedBuffer(new char[size]); - snprintf(formattedBuffer.get(), size, format.c_str(), args ... ); - return std::string(formattedBuffer.get(), formattedBuffer.get() + size - 1); + std::string result; + if (!format.empty()) + { + const size_t size = snprintf(nullptr, 0, format.c_str(), args ...); // Extra char for '\0' + result.resize(size + 1); + if (snprintf(result.data(), result.size(), format.c_str(), args ... ) == -1) + { + throw std::system_error(std::error_code(errno, std::system_category())); + } + } + return result; } diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h index ce8dbcdc50..d0c866096b 100644 --- a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h +++ b/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h @@ -9,7 +9,7 @@ class WebConfigConfigurationSource: public ConfigurationSource { public: - WebConfigConfigurationSource(IAppHostAdminManager *pAdminManager, IHttpApplication &pHttpApplication) + WebConfigConfigurationSource(IAppHostAdminManager *pAdminManager, const IHttpApplication &pHttpApplication) noexcept : m_manager(pAdminManager), m_application(pHttpApplication) { @@ -19,5 +19,5 @@ public: private: CComPtr m_manager; - IHttpApplication &m_application; + const IHttpApplication &m_application; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index e99159d324..c3d8eeb898 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -58,7 +58,7 @@ public: } VOID - ReferenceApplication() override + ReferenceApplication() noexcept override { DBG_ASSERT(m_cRefs > 0); @@ -66,7 +66,7 @@ public: } VOID - DereferenceApplication() override + DereferenceApplication() noexcept override { DBG_ASSERT(m_cRefs > 0); @@ -77,25 +77,25 @@ public: } const std::wstring& - QueryApplicationId() const + QueryApplicationId() const noexcept { return m_applicationId; } const std::wstring& - QueryApplicationPhysicalPath() const + QueryApplicationPhysicalPath() const noexcept { return m_applicationPhysicalPath; } const std::wstring& - QueryApplicationVirtualPath() const + QueryApplicationVirtualPath() const noexcept { return m_applicationVirtualPath; } const std::wstring& - QueryConfigPath() const + QueryConfigPath() const noexcept { return m_applicationConfigPath; } diff --git a/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/AspNetCoreModuleV2/CommonLib/exceptions.h index 0bf30d1bcc..109f76ce87 100644 --- a/src/AspNetCoreModuleV2/CommonLib/exceptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/exceptions.h @@ -31,20 +31,36 @@ #define OBSERVE_CAUGHT_EXCEPTION() CaughtExceptionHResult(LOCATION_INFO); #define RETURN_CAUGHT_EXCEPTION() return CaughtExceptionHResult(LOCATION_INFO); -#define RETURN_HR(hr) do { HRESULT __hrRet = hr; if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); } return __hrRet; } while (0, 0) +#define _CHECK_FAILED(expr) __pragma(warning(push)) \ + __pragma(warning(disable:4127)) /*disable condition is const warning*/ \ + FAILED(expr) \ + __pragma(warning(pop)) + +#define _HR_RET(hr) __pragma(warning(push)) \ + __pragma(warning(disable:26498)) /*disable constexpr warning */ \ + const HRESULT __hrRet = hr; \ + __pragma(warning(pop)) + +#define RETURN_HR(hr) do { _HR_RET(hr); if (_CHECK_FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); } return __hrRet; } while (0, 0) #define RETURN_LAST_ERROR() do { return LogLastError(LOCATION_INFO); } while (0, 0) -#define RETURN_IF_FAILED(hr) do { HRESULT __hrRet = hr; if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); return __hrRet; }} while (0, 0) +#define RETURN_IF_FAILED(hr) do { _HR_RET(hr); if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); return __hrRet; }} while (0, 0) #define RETURN_LAST_ERROR_IF(condition) do { if (condition) { return LogLastError(LOCATION_INFO); }} while (0, 0) #define RETURN_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { return LogLastError(LOCATION_INFO); }} while (0, 0) -#define FINISHED(hrr) do { HRESULT __hrRet = hrr; LogHResultFailed(LOCATION_INFO, __hrRet); hr = __hrRet; goto Finished; } while (0, 0) -#define FINISHED_IF_FAILED(hrr) do { HRESULT __hrRet = hrr; if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); hr = __hrRet; goto Finished; }} while (0, 0) -#define FINISHED_IF_NULL_ALLOC(ptr) do { if ((ptr) == nullptr) { hr = LogHResultFailed(LOCATION_INFO, E_OUTOFMEMORY); goto Finished; }} while (0, 0) -#define FINISHED_LAST_ERROR_IF(condition) do { if (condition) { hr = LogLastError(LOCATION_INFO); goto Finished; }} while (0, 0) -#define FINISHED_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { hr = LogLastError(LOCATION_INFO); goto Finished; }} while (0, 0) +#define _GOTO_FINISHED() __pragma(warning(push)) \ + __pragma(warning(disable:26438)) /*disable avoid goto warning*/ \ + goto Finished \ + __pragma(warning(pop)) + + +#define FINISHED(hrr) do { _HR_RET(hrr); if (_CHECK_FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); } hr = __hrRet; _GOTO_FINISHED(); } while (0, 0) +#define FINISHED_IF_FAILED(hrr) do { _HR_RET(hrr); if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); hr = __hrRet; _GOTO_FINISHED(); }} while (0, 0) +#define FINISHED_IF_NULL_ALLOC(ptr) do { if ((ptr) == nullptr) { hr = LogHResultFailed(LOCATION_INFO, E_OUTOFMEMORY); _GOTO_FINISHED(); }} while (0, 0) +#define FINISHED_LAST_ERROR_IF(condition) do { if (condition) { hr = LogLastError(LOCATION_INFO); _GOTO_FINISHED(); }} while (0, 0) +#define FINISHED_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { hr = LogLastError(LOCATION_INFO); _GOTO_FINISHED(); }} while (0, 0) #define THROW_LAST_ERROR() do { ThrowResultException(LOCATION_INFO, LogLastError(LOCATION_INFO)); } while (0, 0) -#define THROW_IF_FAILED(hr) do { HRESULT __hrRet = hr; if (FAILED(__hrRet)) { ThrowResultException(LOCATION_INFO, __hrRet); }} while (0, 0) +#define THROW_IF_FAILED(hr) do { _HR_RET(hr); if (FAILED(__hrRet)) { ThrowResultException(LOCATION_INFO, __hrRet); }} while (0, 0) #define THROW_LAST_ERROR_IF(condition) do { if (condition) { ThrowResultException(LOCATION_INFO, LogLastError(LOCATION_INFO)); }} while (0, 0) #define THROW_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { ThrowResultException(LOCATION_INFO, LogLastError(LOCATION_INFO)); }} while (0, 0) @@ -57,21 +73,24 @@ #define SUCCEEDED_LOG(hr) SUCCEEDED(LOG_IF_FAILED(hr)) #define FAILED_LOG(hr) FAILED(LOG_IF_FAILED(hr)) - class ResultException: public std::runtime_error { public: - explicit ResultException(HRESULT hr, LOCATION_ARGUMENTS_ONLY) : + ResultException(HRESULT hr, LOCATION_ARGUMENTS_ONLY) : runtime_error(format("HRESULT 0x%x returned at " LOCATION_FORMAT, hr, LOCATION_CALL_ONLY)), m_hr(hr) { } - HRESULT GetResult() const { return m_hr; } + HRESULT GetResult() const noexcept { return m_hr; } private: - HRESULT m_hr; + +#pragma warning( push ) +#pragma warning ( disable : 26495 ) // bug in CA: m_hr is reported as uninitialized + const HRESULT m_hr = S_OK; }; +#pragma warning( pop ) __declspec(noinline) inline VOID ReportUntypedException(LOCATION_ARGUMENTS_ONLY) { @@ -98,7 +117,7 @@ private: return condition; } - __declspec(noinline) inline VOID ReportException(LOCATION_ARGUMENTS std::exception& exception) + __declspec(noinline) inline VOID ReportException(LOCATION_ARGUMENTS const std::exception& exception) { DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, "Exception '%s' caught at " LOCATION_FORMAT, exception.what(), LOCATION_CALL_ONLY); } @@ -122,12 +141,12 @@ __declspec(noinline) inline HRESULT CaughtExceptionHResult(LOCATION_ARGUMENTS_ON { return E_OUTOFMEMORY; } - catch (ResultException& exception) + catch (const ResultException& exception) { ReportException(LOCATION_CALL exception); return exception.GetResult(); } - catch (std::exception& exception) + catch (const std::exception& exception) { ReportException(LOCATION_CALL exception); return HRESULT_FROM_WIN32(ERROR_UNHANDLED_EXCEPTION); @@ -154,7 +173,7 @@ template auto Throw_IfNullAlloc(PointerT pointer) } return pointer; } -__declspec(noinline) inline std::wstring GetUnexpectedExceptionMessage(std::runtime_error& ex) +__declspec(noinline) inline std::wstring GetUnexpectedExceptionMessage(const std::runtime_error& ex) { return format(L"Unexpected exception: %S", ex.what()); } diff --git a/src/AspNetCoreModuleV2/CommonLib/fx_ver.h b/src/AspNetCoreModuleV2/CommonLib/fx_ver.h index 2740fa37ee..723a0da360 100644 --- a/src/AspNetCoreModuleV2/CommonLib/fx_ver.h +++ b/src/AspNetCoreModuleV2/CommonLib/fx_ver.h @@ -13,15 +13,15 @@ struct fx_ver_t fx_ver_t(int major, int minor, int patch, const std::wstring& pre); fx_ver_t(int major, int minor, int patch, const std::wstring& pre, const std::wstring& build); - int get_major() const { return m_major; } - int get_minor() const { return m_minor; } - int get_patch() const { return m_patch; } + int get_major() const noexcept { return m_major; } + int get_minor() const noexcept { return m_minor; } + int get_patch() const noexcept { return m_patch; } - void set_major(int m) { m_major = m; } - void set_minor(int m) { m_minor = m; } - void set_patch(int p) { m_patch = p; } + void set_major(int m) noexcept { m_major = m; } + void set_minor(int m) noexcept { m_minor = m; } + void set_patch(int p) noexcept { m_patch = p; } - bool is_prerelease() const { return !m_pre.empty(); } + bool is_prerelease() const noexcept { return !m_pre.empty(); } std::wstring as_str() const; diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h index 8c42d08c37..243cc53ae7 100644 --- a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h @@ -17,7 +17,7 @@ public: std::filesystem::path dotnetExeLocation, std::filesystem::path hostFxrLocation, std::vector arguments - ) + ) noexcept : m_dotnetExeLocation(std::move(dotnetExeLocation)), m_hostFxrLocation(std::move(hostFxrLocation)), m_arguments(std::move(arguments)) @@ -27,7 +27,7 @@ public: GetArguments(DWORD &hostfxrArgc, std::unique_ptr &hostfxrArgv) const { hostfxrArgc = static_cast(m_arguments.size()); - hostfxrArgv = std::unique_ptr(new PCWSTR[hostfxrArgc]); + hostfxrArgv = std::make_unique(hostfxrArgc); for (DWORD i = 0; i < hostfxrArgc; ++i) { hostfxrArgv[i] = m_arguments[i].c_str(); @@ -35,13 +35,13 @@ public: } const std::filesystem::path& - GetHostFxrLocation() const + GetHostFxrLocation() const noexcept { return m_hostFxrLocation; } const std::filesystem::path& - GetDotnetExeLocation() const + GetDotnetExeLocation() const noexcept { return m_dotnetExeLocation; } diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h index 222230c672..7c205ed68c 100644 --- a/src/AspNetCoreModuleV2/CommonLib/iapplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -44,7 +44,7 @@ public: HRESULT CreateHandler( _In_ IHttpContext *pHttpContext, - _Out_ IREQUEST_HANDLER **pRequestHandler) = 0; + _Outptr_ IREQUEST_HANDLER **pRequestHandler) = 0; }; struct IAPPLICATION_DELETER diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h index ea4692f506..7de54e4c77 100644 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h @@ -14,13 +14,13 @@ class REQUEST_HANDLER: public virtual IREQUEST_HANDLER public: VOID - ReferenceRequestHandler() override + ReferenceRequestHandler() noexcept override { InterlockedIncrement(&m_cRefs); } VOID - DereferenceRequestHandler() override + DereferenceRequestHandler() noexcept override { DBG_ASSERT(m_cRefs != 0); diff --git a/src/AspNetCoreModuleV2/DefaultRules.ruleset b/src/AspNetCoreModuleV2/DefaultRules.ruleset new file mode 100644 index 0000000000..1c2bbdaeaf --- /dev/null +++ b/src/AspNetCoreModuleV2/DefaultRules.ruleset @@ -0,0 +1,432 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/IISLib/acache.cpp b/src/AspNetCoreModuleV2/IISLib/acache.cpp index d68813edbc..5f2125134e 100644 --- a/src/AspNetCoreModuleV2/IISLib/acache.cpp +++ b/src/AspNetCoreModuleV2/IISLib/acache.cpp @@ -3,6 +3,9 @@ #include "precomp.h" +#pragma warning( push ) +#pragma warning ( disable : ALL_CODE_ANALYSIS_WARNINGS ) + LONG ALLOC_CACHE_HANDLER::sm_nFillPattern = 0xACA50000; HANDLE ALLOC_CACHE_HANDLER::sm_hHeap; @@ -440,4 +443,6 @@ Finished: } return fRet; -} \ No newline at end of file +} + +#pragma warning( pop ) diff --git a/src/AspNetCoreModuleV2/IISLib/buffer.h b/src/AspNetCoreModuleV2/IISLib/buffer.h index 1d68155387..385b73d717 100644 --- a/src/AspNetCoreModuleV2/IISLib/buffer.h +++ b/src/AspNetCoreModuleV2/IISLib/buffer.h @@ -4,7 +4,10 @@ #pragma once #include +#include +#pragma warning( push ) +#pragma warning ( disable : ALL_CODE_ANALYSIS_WARNINGS ) // // BUFFER_T class shouldn't be used directly. Use BUFFER specialization class instead. @@ -269,3 +272,5 @@ C_ASSERT( sizeof(VOID*) <= sizeof(ULONGLONG) ); #define INLINE_BUFFER_INIT( _name ) \ _name( (BYTE*)__aqw##_name, sizeof( __aqw##_name ) ) + +#pragma warning( pop ) diff --git a/src/AspNetCoreModuleV2/IISLib/multisz.h b/src/AspNetCoreModuleV2/IISLib/multisz.h index f65c151d4f..9473f52033 100644 --- a/src/AspNetCoreModuleV2/IISLib/multisz.h +++ b/src/AspNetCoreModuleV2/IISLib/multisz.h @@ -6,6 +6,10 @@ #include "stringu.h" #include "ntassert.h" +#include + +#pragma warning( push ) +#pragma warning ( disable : ALL_CODE_ANALYSIS_WARNINGS ) /*++ class MULTISZ: @@ -221,5 +225,6 @@ SplitCommaDelimitedString( MULTISZ * pmszList ); -#endif // !_MULTISZ_HXX_ +#pragma warning( pop ) +#endif // !_MULTISZ_HXX_ diff --git a/src/AspNetCoreModuleV2/IISLib/percpu.h b/src/AspNetCoreModuleV2/IISLib/percpu.h index 5d3c563935..07828830d7 100644 --- a/src/AspNetCoreModuleV2/IISLib/percpu.h +++ b/src/AspNetCoreModuleV2/IISLib/percpu.h @@ -3,6 +3,9 @@ #pragma once +#pragma warning( push ) +#pragma warning ( disable : 26451 ) + template class PER_CPU { @@ -302,4 +305,6 @@ Return: *pCacheLineSize = SYSTEM_CACHE_ALIGNMENT_SIZE; return S_OK; -} \ No newline at end of file +} + +#pragma warning( pop ) diff --git a/src/AspNetCoreModuleV2/IISLib/stringa.h b/src/AspNetCoreModuleV2/IISLib/stringa.h index 39737f4a69..94ace540f6 100644 --- a/src/AspNetCoreModuleV2/IISLib/stringa.h +++ b/src/AspNetCoreModuleV2/IISLib/stringa.h @@ -7,6 +7,10 @@ #include "macros.h" #include + +#pragma warning( push ) +#pragma warning ( disable : ALL_CODE_ANALYSIS_WARNINGS ) + class STRA { @@ -513,3 +517,5 @@ CHAR* InitHelper(__out CHAR (&psz)[size]) STRA name; #define INLINE_STRA_INIT(name) name(InitHelper(__ach##name), sizeof(__ach##name)) + +#pragma warning( pop ) diff --git a/src/AspNetCoreModuleV2/IISLib/stringu.cpp b/src/AspNetCoreModuleV2/IISLib/stringu.cpp index 15da79a7fe..74f8595482 100644 --- a/src/AspNetCoreModuleV2/IISLib/stringu.cpp +++ b/src/AspNetCoreModuleV2/IISLib/stringu.cpp @@ -1,10 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#pragma warning (disable : 4267) #include "precomp.h" +#pragma warning( push ) +#pragma warning ( disable : 4267 ALL_CODE_ANALYSIS_WARNINGS ) + STRU::STRU( VOID ) : m_cchLen( 0 ) @@ -1199,25 +1201,17 @@ STRU::ExpandEnvironmentVariables( __out STRU * pstrExpandedString ) /*++ - Routine Description: - Expand the environment variables in a string - Arguments: - pszString - String with environment variables to expand pstrExpandedString - Receives expanded string on success - Return Value: - HRESULT - --*/ { HRESULT hr = S_OK; DWORD cchNewSize = 0; - if ( pszString == NULL || pstrExpandedString == NULL ) { @@ -1225,7 +1219,6 @@ Return Value: hr = HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER ); goto Exit; } - cchNewSize = ExpandEnvironmentStrings( pszString, pstrExpandedString->QueryStr(), pstrExpandedString->QuerySizeCCH() ); @@ -1234,7 +1227,6 @@ Return Value: hr = HRESULT_FROM_WIN32( GetLastError() ); goto Exit; } - if ( cchNewSize > pstrExpandedString->QuerySizeCCH() ) { hr = pstrExpandedString->Resize( @@ -1244,13 +1236,11 @@ Return Value: { goto Exit; } - cchNewSize = ExpandEnvironmentStrings( pszString, pstrExpandedString->QueryStr(), pstrExpandedString->QuerySizeCCH() ); - if ( cchNewSize == 0 || cchNewSize > pstrExpandedString->QuerySizeCCH() ) { @@ -1258,14 +1248,10 @@ Return Value: goto Exit; } } - pstrExpandedString->SyncWithBuffer(); - hr = S_OK; - Exit: - return hr; } -#pragma warning(default:4267) +#pragma warning( pop ) diff --git a/src/AspNetCoreModuleV2/IISLib/stringu.h b/src/AspNetCoreModuleV2/IISLib/stringu.h index 6f27c5421d..f60f04cfbb 100644 --- a/src/AspNetCoreModuleV2/IISLib/stringu.h +++ b/src/AspNetCoreModuleV2/IISLib/stringu.h @@ -4,8 +4,12 @@ #pragma once #include "buffer.h" +#include #include +#pragma warning( push ) +#pragma warning ( disable : ALL_CODE_ANALYSIS_WARNINGS ) + class STRU { @@ -349,13 +353,12 @@ public: __in PCWSTR pwszFormatString, va_list argsList ); - + static HRESULT ExpandEnvironmentVariables( __in PCWSTR pszString, __out STRU * pstrExpandedString ); - private: // @@ -425,3 +428,4 @@ MakePathCanonicalizationProof( IN PCWSTR pszName, OUT STRU * pstrPath ); +#pragma warning( pop ) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp index d8d28e5a28..c1444a8571 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp @@ -184,7 +184,7 @@ http_get_application_properties( return E_FAIL; } - auto pConfiguration = pInProcessApplication->QueryConfig(); + const auto& pConfiguration = pInProcessApplication->QueryConfig(); pIISCofigurationData->pInProcessApplication = pInProcessApplication; pIISCofigurationData->pwzFullApplicationPath = SysAllocString(pInProcessApplication->QueryApplicationPhysicalPath().c_str()); diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp index 0b987bf8cd..a946e7c2dc 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp @@ -38,7 +38,7 @@ HRESULT AppOfflineTrackingApplication::StartMonitoringAppOflineImpl() { if (m_fileWatcher) { - RETURN_IF_FAILED(E_UNEXPECTED); + RETURN_HR(E_UNEXPECTED); } m_fileWatcher = std::make_unique(); From 18a718d1f09ccd527f82e52fee1546a4fd2a4a08 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 5 Sep 2018 16:48:10 -0700 Subject: [PATCH 263/363] Catch all exception in native callbacks (#1369) --- .../Core/IISHttpServer.cs | 57 ++++++++++++++----- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs index 1e6a7c86f4..ddf16f269d 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs @@ -20,9 +20,9 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { private const string WebSocketVersionString = "WEBSOCKET_VERSION"; - private static NativeMethods.PFN_REQUEST_HANDLER _requestHandler = HandleRequest; - private static NativeMethods.PFN_SHUTDOWN_HANDLER _shutdownHandler = HandleShutdown; - private static NativeMethods.PFN_ASYNC_COMPLETION _onAsyncCompletion = OnAsyncCompletion; + private static readonly NativeMethods.PFN_REQUEST_HANDLER _requestHandler = HandleRequest; + private static readonly NativeMethods.PFN_SHUTDOWN_HANDLER _shutdownHandler = HandleShutdown; + private static readonly NativeMethods.PFN_ASYNC_COMPLETION _onAsyncCompletion = OnAsyncCompletion; private IISContextFactory _iisContextFactory; private readonly MemoryPool _memoryPool = new SlabMemoryPool(); @@ -147,15 +147,24 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private static NativeMethods.REQUEST_NOTIFICATION_STATUS HandleRequest(IntPtr pInProcessHandler, IntPtr pvRequestContext) { - // Unwrap the server so we can create an http context and process the request - var server = (IISHttpServer)GCHandle.FromIntPtr(pvRequestContext).Target; - Interlocked.Increment(ref server._outstandingRequests); + IISHttpServer server = null; + try + { + // Unwrap the server so we can create an http context and process the request + server = (IISHttpServer)GCHandle.FromIntPtr(pvRequestContext).Target; + Interlocked.Increment(ref server._outstandingRequests); - var context = server._iisContextFactory.CreateHttpContext(pInProcessHandler); + var context = server._iisContextFactory.CreateHttpContext(pInProcessHandler); - ThreadPool.QueueUserWorkItem(state => _ = HandleRequest((IISHttpContext)state), context); + ThreadPool.QueueUserWorkItem(state => _ = HandleRequest((IISHttpContext)state), context); + return NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_PENDING; + } + catch (Exception ex) + { + server?._logger.LogError(0, ex, $"Unexpected exception in static {nameof(IISHttpServer)}.{nameof(HandleRequest)}."); - return NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_PENDING; + return NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_FINISH_REQUEST; + } } private static async Task HandleRequest(IISHttpContext context) @@ -167,7 +176,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } catch (Exception ex) { - context.Server._logger.LogError("Exception in ProcessRequestAsync", ex); + context.Server._logger.LogError(0, ex, $"Unexpected exception in {nameof(IISHttpServer)}.{nameof(HandleRequest)}."); } finally { @@ -177,16 +186,34 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private static bool HandleShutdown(IntPtr pvRequestContext) { - var server = (IISHttpServer)GCHandle.FromIntPtr(pvRequestContext).Target; - server._applicationLifetime.StopApplication(); + IISHttpServer server = null; + try + { + server = (IISHttpServer)GCHandle.FromIntPtr(pvRequestContext).Target; + server._applicationLifetime.StopApplication(); + } + catch (Exception ex) + { + server?._logger.LogError(0, ex, $"Unexpected exception in {nameof(IISHttpServer)}.{nameof(HandleShutdown)}."); + } return true; } private static NativeMethods.REQUEST_NOTIFICATION_STATUS OnAsyncCompletion(IntPtr pvManagedHttpContext, int hr, int bytes) { - var context = (IISHttpContext)GCHandle.FromIntPtr(pvManagedHttpContext).Target; - context.OnAsyncCompletion(hr, bytes); - return NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_PENDING; + IISHttpContext context = null; + try + { + context = (IISHttpContext)GCHandle.FromIntPtr(pvManagedHttpContext).Target; + context.OnAsyncCompletion(hr, bytes); + return NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_PENDING; + } + catch (Exception ex) + { + context?.Server._logger.LogError(0, ex, $"Unexpected exception in {nameof(IISHttpServer)}.{nameof(OnAsyncCompletion)}."); + + return NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_FINISH_REQUEST; + } } private static void CompleteRequest(IISHttpContext context, bool result) From 5956300df7fdc55ed77cdba0a55bda9e9d2549b9 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 5 Sep 2018 16:48:23 -0700 Subject: [PATCH 264/363] Retry TestServer port selection (#1367) --- test/IIS.Tests/Utilities/TestServer.cs | 83 +++++++++++++++++++------- 1 file changed, 63 insertions(+), 20 deletions(-) diff --git a/test/IIS.Tests/Utilities/TestServer.cs b/test/IIS.Tests/Utilities/TestServer.cs index 4adaaff776..cd3188bf83 100644 --- a/test/IIS.Tests/Utilities/TestServer.cs +++ b/test/IIS.Tests/Utilities/TestServer.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Generic; using System.IO; using System.Net.Http; using System.Reflection; @@ -14,7 +15,9 @@ using System.Xml.XPath; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Extensions; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -29,39 +32,33 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests internal static string HostableWebCoreLocation => Environment.ExpandEnvironmentVariables($@"%windir%\system32\inetsrv\{HWebCoreDll}"); internal static string BasePath => Path.GetDirectoryName(new Uri(typeof(TestServer).Assembly.CodeBase).AbsolutePath); - internal static string InProcessHandlerLocation => Path.Combine(BasePath, InProcessHandlerDll); internal static string AspNetCoreModuleLocation => Path.Combine(BasePath, AspNetCoreModuleDll); private static readonly SemaphoreSlim WebCoreLock = new SemaphoreSlim(1, 1); - // Currently this is hardcoded in HostableWebCore.config - private static readonly int BasePort = 50691; - private static readonly Uri BaseUri = new Uri("http://localhost:" + BasePort); + private static readonly int PortRetryCount = 10; private readonly TaskCompletionSource _startedTaskCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); private readonly Action _appBuilder; private readonly ILoggerFactory _loggerFactory; private readonly hostfxr_main_fn _hostfxrMainFn; - - public HttpClient HttpClient { get; } - public TestConnection CreateConnection() => new TestConnection(BasePort); + + private Uri BaseUri => new Uri("http://localhost:" + _currentPort); + public HttpClient HttpClient { get; private set; } + public TestConnection CreateConnection() => new TestConnection(_currentPort); private IWebHost _host; private string _appHostConfigPath; + private int _currentPort; private TestServer(Action appBuilder, ILoggerFactory loggerFactory) { _hostfxrMainFn = Main; _appBuilder = appBuilder; _loggerFactory = loggerFactory; - - HttpClient = new HttpClient(new LoggingHandler(new SocketsHttpHandler(), _loggerFactory.CreateLogger())) - { - BaseAddress = BaseUri - }; } public static async Task Create(Action appBuilder, ILoggerFactory loggerFactory) @@ -83,19 +80,45 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { LoadLibrary(HostableWebCoreLocation); _appHostConfigPath = Path.GetTempFileName(); + + set_main_handler(_hostfxrMainFn); + Retry(() => + { + _currentPort = TestPortHelper.GetNextPort(); + + InitializeConfig(_currentPort); + + var startResult = WebCoreActivate(_appHostConfigPath, null, "Instance"); + if (startResult != 0) + { + throw new InvalidOperationException($"Error while running WebCoreActivate: {startResult} on port {_currentPort}"); + } + }, PortRetryCount); + + HttpClient = new HttpClient(new LoggingHandler(new SocketsHttpHandler(), _loggerFactory.CreateLogger())) + { + BaseAddress = BaseUri + }; + } + + private void InitializeConfig(int port) + { var webHostConfig = XDocument.Load(Path.GetFullPath("HostableWebCore.config")); webHostConfig.XPathSelectElement("/configuration/system.webServer/globalModules/add[@name='AspNetCoreModuleV2']") .SetAttributeValue("image", AspNetCoreModuleLocation); + + var siteElement = webHostConfig.Root + .RequiredElement("system.applicationHost") + .RequiredElement("sites") + .RequiredElement("site"); + + siteElement + .RequiredElement("bindings") + .RequiredElement("binding") + .SetAttributeValue("bindingInformation", $":{port}:localhost"); + webHostConfig.Save(_appHostConfigPath); - - set_main_handler(_hostfxrMainFn); - - var startResult = WebCoreActivate(_appHostConfigPath, null, "Instance"); - if (startResult != 0) - { - throw new InvalidOperationException($"Error while running WebCoreActivate: {startResult}"); - } } private int Main(IntPtr argc, IntPtr argv) @@ -157,5 +180,25 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [DllImport("kernel32", SetLastError=true, CharSet = CharSet.Ansi)] private static extern IntPtr LoadLibrary([MarshalAs(UnmanagedType.LPStr)] string lpFileName); + + private void Retry(Action func, int attempts) + { + var exceptions = new List(); + + for (var attempt = 0; attempt < attempts; attempt++) + { + try + { + func(); + return; + } + catch (Exception e) + { + exceptions.Add(e); + } + } + + throw new AggregateException(exceptions); + } } } From 10f92c9065114f1008826cb50650c3fca86dbda4 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 5 Sep 2018 23:48:36 +0000 Subject: [PATCH 265/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 70 ++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 81b2224c9d..cd5ae46710 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,49 +5,49 @@ 0.10.13 3.0.0-alpha1-20180821.3 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 0.7.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 0.7.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 15.6.82 15.6.82 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 - 3.0.0-alpha1-10393 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 + 3.0.0-alpha1-10400 2.0.9 - 2.1.2 - 2.2.0-preview1-26618-02 + 2.1.3 + 2.2.0-preview2-26905-02 1.0.1 - 3.0.0-alpha1-10393 + 3.0.0-alpha1-10400 15.6.1 11.1.0 2.0.3 - 4.6.0-preview1-26829-04 - 4.6.0-preview1-26829-04 - 4.6.0-preview1-26829-04 + 4.6.0-preview1-26831-06 + 4.6.0-preview1-26831-06 + 4.6.0-preview1-26831-06 4.6.0-preview1-26717-04 - 4.6.0-preview1-26829-04 - 4.6.0-preview1-26829-04 - 4.6.0-preview1-26829-04 - 4.6.0-preview1-26829-04 - 4.6.0-preview1-26829-04 + 4.6.0-preview1-26831-06 + 4.6.0-preview1-26831-06 + 4.6.0-preview1-26831-06 + 4.6.0-preview1-26831-06 + 4.6.0-preview1-26831-06 9.0.1 2.3.1 2.4.0 From 88d857147454cf739d43b2676cb8ff1dce23b1f2 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 5 Sep 2018 17:15:04 -0700 Subject: [PATCH 266/363] Add Trace level for request events, allow logging to eventlog (#1337) --- .../AspNetCore/applicationinfo.cpp | 2 +- src/AspNetCoreModuleV2/CommonLib/EventLog.cpp | 65 +++++++++------- src/AspNetCoreModuleV2/CommonLib/EventLog.h | 7 ++ .../CommonLib/aspnetcore_msg.mc | 6 ++ .../CommonLib/debugutil.cpp | 52 +++++++------ src/AspNetCoreModuleV2/CommonLib/debugutil.h | 9 ++- src/AspNetCoreModuleV2/IISLib/dbgutil.h | 10 ++- .../OutOfProcessRequestHandler/dllmain.cpp | 6 +- .../forwardinghandler.cpp | 40 +++------- .../websockethandler.cpp | 78 +++++++------------ .../requesthandler_config.cpp | 2 - .../IISDeployer.cs | 2 +- .../IISDeploymentParameterExtensions.cs | 2 +- .../Inprocess/LoggingTests.cs | 39 ++++++++-- 14 files changed, 170 insertions(+), 150 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index fb558e52d0..225a82bdec 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -98,7 +98,7 @@ APPLICATION_INFO::ShutDownApplication(bool fServerInitiated) if (m_pApplication) { - LOG_ERRORF(L"Stopping application '%ls'", QueryApplicationInfoKey().c_str()); + LOG_INFOF(L"Stopping application '%ls'", QueryApplicationInfoKey().c_str()); m_pApplication ->Stop(fServerInitiated); m_pApplication = nullptr; m_pApplicationFactory = nullptr; diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp b/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp index c3a3608820..e5ee8c1708 100644 --- a/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp @@ -4,10 +4,46 @@ #include #include "EventLog.h" #include "debugutil.h" -#include "StringHelpers.h" +#include "exceptions.h" extern HANDLE g_hEventLog; +bool +EventLog::LogEventNoTrace( + _In_ WORD dwEventInfoType, + _In_ DWORD dwEventId, + _In_ LPCWSTR pstrMsg +) +{ + if (g_hEventLog == nullptr) + { + return true; + } + // Static locals to avoid getting the process ID and string multiple times. + // Effectively have the same semantics as global variables, except initialized + // on first occurence. + static const auto processIdString = GetProcessIdString(); + static const auto versionInfoString = GetVersionInfoString(); + + std::array eventLogDataStrings + { + pstrMsg, + processIdString.c_str(), + versionInfoString.c_str() + }; + + return ReportEventW(g_hEventLog, + dwEventInfoType, + 0, // wCategory + dwEventId, + NULL, // lpUserSid + static_cast(eventLogDataStrings.size()), // wNumStrings + 0, // dwDataSize, + eventLogDataStrings.data(), + NULL // lpRawData + ); +} + VOID EventLog::LogEvent( _In_ WORD dwEventInfoType, @@ -15,32 +51,7 @@ EventLog::LogEvent( _In_ LPCWSTR pstrMsg ) { - // Static locals to avoid getting the process ID and string multiple times. - // Effectively have the same semantics as global variables, except initialized - // on first occurence. - static const auto processIdString = GetProcessIdString(); - static const auto versionInfoString = GetVersionInfoString(); - - std::array eventLogDataStrings - { - pstrMsg, - processIdString.c_str(), - versionInfoString.c_str() - }; - - if (g_hEventLog != NULL) - { - ReportEventW(g_hEventLog, - dwEventInfoType, - 0, // wCategory - dwEventId, - NULL, // lpUserSid - 3, // wNumStrings - 0, // dwDataSize, - eventLogDataStrings.data(), - NULL // lpRawData - ); - } + LOG_LAST_ERROR_IF(!LogEventNoTrace(dwEventInfoType, dwEventId, pstrMsg)); DebugPrintfW(dwEventInfoType == EVENTLOG_ERROR_TYPE ? ASPNETCORE_DEBUG_FLAG_ERROR : ASPNETCORE_DEBUG_FLAG_INFO, L"Event Log: '%ls' \r\nEnd Event Log Message.", pstrMsg); } diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.h b/src/AspNetCoreModuleV2/CommonLib/EventLog.h index fa2cde1947..4bb72b623a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/EventLog.h +++ b/src/AspNetCoreModuleV2/CommonLib/EventLog.h @@ -59,6 +59,13 @@ public: _va_end(args); } + static + bool + LogEventNoTrace( + _In_ WORD dwEventInfoType, + _In_ DWORD dwEventId, + _In_ LPCWSTR pstrMsg); + private: static VOID diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc index 7289b85ce6..547192d0df 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc +++ b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc @@ -201,6 +201,12 @@ Language=English %1 . +Messageid=1036 +SymbolicName=ASPNETCORE_EVENT_DEBUG_LOG +Language=English +%1 +. + ; ;#endif // _ASPNETCORE_MODULE_MSG_H_ diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index 964c411bf9..cbf48a3b20 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -3,17 +3,19 @@ #include "debugutil.h" +#include #include #include "dbgutil.h" #include "stringu.h" #include "stringa.h" -#include "dbgutil.h" #include "Environment.h" #include "SRWExclusiveLock.h" #include "exceptions.h" #include "atlbase.h" #include "config_utility.h" #include "StringHelpers.h" +#include "aspnetcore_msg.h" +#include "EventLog.h" inline HANDLE g_logFile = INVALID_HANDLE_VALUE; inline HMODULE g_hModule; @@ -23,7 +25,7 @@ HRESULT PrintDebugHeader() { // Major, minor are stored in dwFileVersionMS field and patch, build in dwFileVersionLS field as pair of 32 bit numbers - DebugPrintfW(ASPNETCORE_DEBUG_FLAG_INFO, L"Initializing logs for '%ls'. %ls. %ls.", + LOG_INFOF(L"Initializing logs for '%ls'. %ls. %ls.", GetModuleName().c_str(), GetProcessIdString().c_str(), GetVersionInfoString().c_str() @@ -92,26 +94,6 @@ GetModuleName() void SetDebugFlags(const std::wstring &debugValue) { - try - { - if (!debugValue.empty() && debugValue.find_first_not_of(L"0123456789") == std::wstring::npos) - { - const auto value = std::stoi(debugValue); - - if (value >= 1) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_ERROR; - if (value >= 2) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_WARNING; - if (value >= 3) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_INFO; - if (value >= 4) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_CONSOLE; - if (value >= 5) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_FILE; - - return; - } - } - catch (...) - { - // ignore - } - try { std::wstringstream stringStream(debugValue); @@ -122,14 +104,16 @@ void SetDebugFlags(const std::wstring &debugValue) if (_wcsnicmp(flag.c_str(), L"error", wcslen(L"error")) == 0) DEBUG_FLAGS_VAR |= DEBUG_FLAGS_ERROR; if (_wcsnicmp(flag.c_str(), L"warning", wcslen(L"warning")) == 0) DEBUG_FLAGS_VAR |= DEBUG_FLAGS_WARN; if (_wcsnicmp(flag.c_str(), L"info", wcslen(L"info")) == 0) DEBUG_FLAGS_VAR |= DEBUG_FLAGS_INFO; + if (_wcsnicmp(flag.c_str(), L"trace", wcslen(L"trace")) == 0) DEBUG_FLAGS_VAR |= DEBUG_FLAGS_TRACE; if (_wcsnicmp(flag.c_str(), L"console", wcslen(L"console")) == 0) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_CONSOLE; if (_wcsnicmp(flag.c_str(), L"file", wcslen(L"file")) == 0) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_FILE; + if (_wcsnicmp(flag.c_str(), L"eventlog", wcslen(L"eventlog")) == 0) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_EVENTLOG; } - // If file or console is enabled but level is not set, enable all levels + // If file or console is enabled but level is not set, enable levels up to info if (DEBUG_FLAGS_VAR != 0 && (DEBUG_FLAGS_VAR & DEBUG_FLAGS_ANY) == 0) { - DEBUG_FLAGS_VAR |= DEBUG_FLAGS_ANY; + DEBUG_FLAGS_VAR |= DEBUG_FLAGS_INFO; } } catch (...) @@ -209,7 +193,7 @@ DebugInitialize(HMODULE hModule) try { - SetDebugFlags(Environment::GetEnvironmentVariableValue(L"ASPNETCORE_MODULE_DEBUG").value_or(L"0")); + SetDebugFlags(Environment::GetEnvironmentVariableValue(L"ASPNETCORE_MODULE_DEBUG").value_or(L"")); } catch (...) { @@ -344,6 +328,24 @@ DebugPrintW( FlushFileBuffers(g_logFile); } } + + if (IsEnabled(ASPNETCORE_DEBUG_FLAG_EVENTLOG)) + { + WORD eventType; + switch (dwFlag) + { + case ASPNETCORE_DEBUG_FLAG_ERROR: + eventType = EVENTLOG_ERROR_TYPE; + break; + case ASPNETCORE_DEBUG_FLAG_WARNING: + eventType = EVENTLOG_WARNING_TYPE; + break; + default: + eventType = EVENTLOG_INFORMATION_TYPE; + break; + } + EventLog::LogEventNoTrace(eventType, ASPNETCORE_EVENT_DEBUG_LOG, strOutput.QueryStr()); + } } } diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/AspNetCoreModuleV2/CommonLib/debugutil.h index f8c7a9b7c9..24446dbd80 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.h +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.h @@ -8,11 +8,16 @@ #include #include "dbgutil.h" +#define ASPNETCORE_DEBUG_FLAG_TRACE DEBUG_FLAG_TRACE #define ASPNETCORE_DEBUG_FLAG_INFO DEBUG_FLAG_INFO #define ASPNETCORE_DEBUG_FLAG_WARNING DEBUG_FLAG_WARN #define ASPNETCORE_DEBUG_FLAG_ERROR DEBUG_FLAG_ERROR -#define ASPNETCORE_DEBUG_FLAG_CONSOLE 0x00000008 -#define ASPNETCORE_DEBUG_FLAG_FILE 0x00000010 +#define ASPNETCORE_DEBUG_FLAG_CONSOLE 0x00000010 +#define ASPNETCORE_DEBUG_FLAG_FILE 0x00000020 +#define ASPNETCORE_DEBUG_FLAG_EVENTLOG 0x00000040 + +#define LOG_TRACE(...) DebugPrintW(ASPNETCORE_DEBUG_FLAG_TRACE, __VA_ARGS__) +#define LOG_TRACEF(...) DebugPrintfW(ASPNETCORE_DEBUG_FLAG_TRACE, __VA_ARGS__) #define LOG_INFO(...) DebugPrintW(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) #define LOG_INFOF(...) DebugPrintfW(ASPNETCORE_DEBUG_FLAG_INFO, __VA_ARGS__) diff --git a/src/AspNetCoreModuleV2/IISLib/dbgutil.h b/src/AspNetCoreModuleV2/IISLib/dbgutil.h index 60365faad2..9b714e9bbf 100644 --- a/src/AspNetCoreModuleV2/IISLib/dbgutil.h +++ b/src/AspNetCoreModuleV2/IISLib/dbgutil.h @@ -21,19 +21,21 @@ // Debug error levels for DEBUG_FLAGS_VAR. // -#define DEBUG_FLAG_INFO 0x00000001 -#define DEBUG_FLAG_WARN 0x00000002 -#define DEBUG_FLAG_ERROR 0x00000004 +#define DEBUG_FLAG_TRACE 0x00000001 +#define DEBUG_FLAG_INFO 0x00000002 +#define DEBUG_FLAG_WARN 0x00000004 +#define DEBUG_FLAG_ERROR 0x00000008 // // Predefined error level values. These are backwards from the // windows definitions. // +#define DEBUG_FLAGS_TRACE (DEBUG_FLAG_ERROR | DEBUG_FLAG_WARN | DEBUG_FLAG_INFO | DEBUG_FLAG_TRACE) #define DEBUG_FLAGS_INFO (DEBUG_FLAG_ERROR | DEBUG_FLAG_WARN | DEBUG_FLAG_INFO) #define DEBUG_FLAGS_WARN (DEBUG_FLAG_ERROR | DEBUG_FLAG_WARN) #define DEBUG_FLAGS_ERROR (DEBUG_FLAG_ERROR) -#define DEBUG_FLAGS_ANY (DEBUG_FLAG_INFO | DEBUG_FLAG_WARN | DEBUG_FLAG_ERROR) +#define DEBUG_FLAGS_ANY (DEBUG_FLAG_INFO | DEBUG_FLAG_WARN | DEBUG_FLAG_ERROR | DEBUG_FLAG_TRACE) // // Global variables to control tracing. Generally per module diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp index 451221255b..b5f2014bf2 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp @@ -115,7 +115,7 @@ Finished: // Global initialization routine for OutOfProcess // HRESULT -EnsureOutOfProcessInitializtion() +EnsureOutOfProcessInitializtion(IHttpApplication *pHttpApplication) { DBG_ASSERT(g_pHttpServer); @@ -202,6 +202,8 @@ EnsureOutOfProcessInitializtion() FINISHED_IF_FAILED(ALLOC_CACHE_HANDLER::StaticInitialize()); FINISHED_IF_FAILED(FORWARDING_HANDLER::StaticInitialize(g_fEnableReferenceCountTracing)); FINISHED_IF_FAILED(WEBSOCKET_HANDLER::StaticInitialize(g_fEnableReferenceCountTracing)); + + DebugInitializeFromConfig(*g_pHttpServer, *pHttpApplication); } Finished: if (FAILED(hr)) @@ -255,7 +257,7 @@ CreateApplication( RETURN_IF_FAILED(REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpApplication, &pConfig)); std::unique_ptr pRequestHandlerConfig(pConfig); - RETURN_IF_FAILED(EnsureOutOfProcessInitializtion()); + RETURN_IF_FAILED(EnsureOutOfProcessInitializtion(pHttpApplication)); std::unique_ptr pApplication = std::make_unique(*pHttpApplication, std::move(pRequestHandlerConfig)); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp index 881c6393ad..b0fa1aa03f 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp @@ -48,10 +48,7 @@ FORWARDING_HANDLER::FORWARDING_HANDLER( m_pW3Context(pW3Context), m_pApplication(pApplication) { -#ifdef DEBUG - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "FORWARDING_HANDLER::FORWARDING_HANDLER"); -#endif + LOG_TRACE(L"FORWARDING_HANDLER::FORWARDING_HANDLER"); m_fWebSocketSupported = m_pApplication->QueryWebsocketStatus(); InitializeSRWLock(&m_RequestLock); @@ -65,10 +62,8 @@ FORWARDING_HANDLER::~FORWARDING_HANDLER( // m_Signature = FORWARDING_HANDLER_SIGNATURE_FREE; -#ifdef DEBUG - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "FORWARDING_HANDLER::~FORWARDING_HANDLER"); -#endif + LOG_TRACE(L"FORWARDING_HANDLER::~FORWARDING_HANDLER"); + // // RemoveRequest() should already have been called and m_pDisconnect // has been freed or m_pDisconnect was never initialized. @@ -309,10 +304,9 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() reinterpret_cast(static_cast(this)))) { hr = HRESULT_FROM_WIN32(GetLastError()); -#ifdef DEBUG - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "FORWARDING_HANDLER::OnExecuteRequestHandler, Send request failed"); -#endif + + LOG_TRACE(L"FORWARDING_HANDLER::OnExecuteRequestHandler, Send request failed"); + // FREB log if (ANCMEvents::ANCM_REQUEST_FORWARD_FAIL::IsEnabled(m_pW3Context->GetTraceContext())) { @@ -460,10 +454,8 @@ REQUEST_NOTIFICATION_STATUS if (m_RequestStatus == FORWARDER_RECEIVED_WEBSOCKET_RESPONSE) { -#ifdef DEBUG - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "FORWARDING_HANDLER::OnAsyncCompletion, Send completed for 101 response"); -#endif + LOG_TRACE(L"FORWARDING_HANDLER::OnAsyncCompletion, Send completed for 101 response"); + // // This should be the write completion of the 101 response. // @@ -696,10 +688,7 @@ Finished: // // Do not use this object after dereferencing it, it may be gone. // -#ifdef DEBUG - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "FORWARDING_HANDLER::OnAsyncCompletion Done %d", retVal); -#endif + LOG_TRACEF(L"FORWARDING_HANDLER::OnAsyncCompletion Done %d", retVal); return retVal; } @@ -1336,10 +1325,8 @@ None dwInternetStatus); } -#ifdef DEBUG - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "FORWARDING_HANDLER::OnWinHttpCompletionInternal %x -- %d --%p\n", dwInternetStatus, GetCurrentThreadId(), m_pW3Context); -#endif + LOG_TRACEF(L"FORWARDING_HANDLER::OnWinHttpCompletionInternal %x -- %d --%p\n", dwInternetStatus, GetCurrentThreadId(), m_pW3Context); + // // Exclusive lock on the winhttp handle to protect from a client disconnect/ // server stop closing the handle while we are using it. @@ -2751,10 +2738,7 @@ FORWARDING_HANDLER::TerminateRequest( // a winhttp callback on the same thread and we donot want to // acquire the lock again -#ifdef DEBUG - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "FORWARDING_HANDLER::TerminateRequest %d --%p\n", GetCurrentThreadId(), m_pW3Context); -#endif // DEBUG + LOG_TRACEF(L"FORWARDING_HANDLER::TerminateRequest %d --%p\n", GetCurrentThreadId(), m_pW3Context); if (!m_fHttpHandleInClose) { diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp index 5eac6001e9..ecd97737fe 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp @@ -47,7 +47,7 @@ WEBSOCKET_HANDLER::WEBSOCKET_HANDLER() : _fHandleClosed(FALSE), _fReceivedCloseMsg(FALSE) { - DebugPrintf (ASPNETCORE_DEBUG_FLAG_INFO, "WEBSOCKET_HANDLER::WEBSOCKET_HANDLER"); + LOG_TRACE(L"WEBSOCKET_HANDLER::WEBSOCKET_HANDLER"); InitializeCriticalSectionAndSpinCount(&_RequestLock, 1000); InsertRequest(); @@ -58,7 +58,7 @@ WEBSOCKET_HANDLER::Terminate( VOID ) { - DebugPrintf (ASPNETCORE_DEBUG_FLAG_INFO, "WEBSOCKET_HANDLER::Terminate"); + LOG_TRACE(L"WEBSOCKET_HANDLER::Terminate"); if (!_fHandleClosed) { RemoveRequest(); @@ -212,8 +212,7 @@ WEBSOCKET_HANDLER::IndicateCompletionToIIS( --*/ { - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::IndicateCompletionToIIS called %d", _dwOutstandingIo); + LOG_TRACEF(L"WEBSOCKET_HANDLER::IndicateCompletionToIIS called %d", _dwOutstandingIo); // // close Websocket handle. This will triger a WinHttp callback @@ -223,8 +222,7 @@ WEBSOCKET_HANDLER::IndicateCompletionToIIS( // if (_hWebSocketRequest != NULL && _dwOutstandingIo == 0) { - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::IndicateCompletionToIIS"); + LOG_TRACE(L"WEBSOCKET_HANDLER::IndicateCompletionToIIS"); _pHandler->SetStatus(FORWARDER_DONE); _fHandleClosed = TRUE; @@ -262,8 +260,7 @@ Routine Description: _pHandler = pHandler; EnterCriticalSection(&_RequestLock); - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::ProcessRequest"); + LOG_TRACEF(L"WEBSOCKET_HANDLER::ProcessRequest"); // // Cache the points to IHttpContext3 @@ -359,8 +356,7 @@ Finished: if (FAILED_LOG(hr)) { - DebugPrintf (ASPNETCORE_DEBUG_FLAG_ERROR, - "Process Request Failed with HR=%08x", hr); + LOG_ERRORF(L"Process Request Failed with HR=%08x", hr); } return hr; @@ -385,8 +381,7 @@ Routine Description: BOOL fFinalFragment; BOOL fClose; - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::DoIisWebSocketReceive"); + LOG_TRACE(L"WEBSOCKET_HANDLER::DoIisWebSocketReceive"); IncrementOutstandingIo(); @@ -403,8 +398,7 @@ Routine Description: if (FAILED_LOG(hr)) { DecrementOutstandingIo(); - DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, - "WEBSOCKET_HANDLER::DoIisWebSocketSend failed with %08x", hr); + LOG_ERRORF(L"WEBSOCKET_HANDLER::DoIisWebSocketSend failed with %08x", hr); } return hr; @@ -426,8 +420,7 @@ Routine Description: HRESULT hr = S_OK; DWORD dwError = NO_ERROR; - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::DoWinHttpWebSocketReceive"); + LOG_TRACE(L"WEBSOCKET_HANDLER::DoWinHttpWebSocketReceive"); IncrementOutstandingIo(); @@ -442,8 +435,7 @@ Routine Description: { DecrementOutstandingIo(); hr = HRESULT_FROM_WIN32(dwError); - DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, - "WEBSOCKET_HANDLER::DoWinHttpWebSocketReceive failed with %08x", hr); + LOG_ERRORF(L"WEBSOCKET_HANDLER::DoWinHttpWebSocketReceive failed with %08x", hr); } return hr; @@ -467,8 +459,7 @@ Routine Description: BOOL fFinalFragment = FALSE; BOOL fClose = FALSE; - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::DoIisWebSocketSend %d", eBufferType); + LOG_TRACEF(L"WEBSOCKET_HANDLER::DoIisWebSocketSend %d", eBufferType); if (eBufferType == WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE) { @@ -558,8 +549,7 @@ Routine Description: Finished: if (FAILED_LOG(hr)) { - DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, - "WEBSOCKET_HANDLER::DoIisWebSocketSend failed with %08x", hr); + LOG_ERRORF(L"WEBSOCKET_HANDLER::DoIisWebSocketSend failed with %08x", hr); } return hr; @@ -581,8 +571,7 @@ Routine Description: DWORD dwError = NO_ERROR; HRESULT hr = S_OK; - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::DoWinHttpWebSocketSend, %d", eBufferType); + LOG_TRACEF(L"WEBSOCKET_HANDLER::DoWinHttpWebSocketSend, %d", eBufferType); if (eBufferType == WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE) { @@ -627,8 +616,7 @@ Routine Description: // Call will complete asynchronously, return. // ignore error. // - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::DoWinhttpWebSocketSend IO_PENDING"); + LOG_TRACE(L"WEBSOCKET_HANDLER::DoWinhttpWebSocketSend IO_PENDING"); dwError = NO_ERROR; } @@ -639,8 +627,7 @@ Routine Description: // // Call completed synchronously. // - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::DoWinhttpWebSocketSend Shutdown successful."); + LOG_TRACE(L"WEBSOCKET_HANDLER::DoWinhttpWebSocketSend Shutdown successful."); } } } @@ -666,8 +653,7 @@ Routine Description: Finished: if (FAILED_LOG(hr)) { - DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, - "WEBSOCKET_HANDLER::DoWinHttpWebSocketSend failed with %08x", hr); + LOG_ERRORF(L"WEBSOCKET_HANDLER::DoWinHttpWebSocketSend failed with %08x", hr); } return hr; @@ -755,8 +741,7 @@ Routine Description: BOOL fLocked = FALSE; CleanupReason cleanupReason = CleanupReasonUnknown; - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::OnWinHttpSendComplete"); + LOG_TRACE(L"WEBSOCKET_HANDLER::OnWinHttpSendComplete"); if (_fCleanupInProgress) { @@ -792,8 +777,7 @@ Finished: { Cleanup (cleanupReason); - DebugPrintf (ASPNETCORE_DEBUG_FLAG_ERROR, - "WEBSOCKET_HANDLER::OnWinsockSendComplete failed with HR=%08x", hr); + LOG_ERRORF(L"WEBSOCKET_HANDLER::OnWinsockSendComplete failed with HR=%08x", hr); } // @@ -810,8 +794,7 @@ WEBSOCKET_HANDLER::OnWinHttpShutdownComplete( VOID ) { - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::OnWinHttpShutdownComplete --%p", _pHandler); + LOG_TRACEF(L"WEBSOCKET_HANDLER::OnWinHttpShutdownComplete --%p", _pHandler); DecrementOutstandingIo(); @@ -825,8 +808,7 @@ WEBSOCKET_HANDLER::OnWinHttpIoError( { HRESULT hr = HRESULT_FROM_WIN32(pCompletionStatus->AsyncResult.dwError); - DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, - "WEBSOCKET_HANDLER::OnWinHttpIoError HR = %08x, Operation = %d", + LOG_ERRORF(L"WEBSOCKET_HANDLER::OnWinHttpIoError HR = %08x, Operation = %d", hr, pCompletionStatus->AsyncResult.dwResult); Cleanup(ServerDisconnect); @@ -858,8 +840,7 @@ Routine Description: BOOL fLocked = FALSE; CleanupReason cleanupReason = CleanupReasonUnknown; - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::OnWinHttpReceiveComplete --%p", _pHandler); + LOG_TRACEF(L"WEBSOCKET_HANDLER::OnWinHttpReceiveComplete --%p", _pHandler); if (_fCleanupInProgress) { @@ -893,8 +874,7 @@ Finished: { Cleanup (cleanupReason); - DebugPrintf (ASPNETCORE_DEBUG_FLAG_ERROR, - "WEBSOCKET_HANDLER::OnWinsockReceiveComplete failed with HR=%08x", hr); + LOG_ERRORF(L"WEBSOCKET_HANDLER::OnWinsockReceiveComplete failed with HR=%08x", hr); } // @@ -929,7 +909,7 @@ Routine Description: UNREFERENCED_PARAMETER(cbIo); - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, "WEBSOCKET_HANDLER::OnIisSendComplete"); + LOG_TRACE(L"WEBSOCKET_HANDLER::OnIisSendComplete"); if (FAILED_LOG(hrCompletion)) { @@ -974,8 +954,7 @@ Finished: { Cleanup (cleanupReason); - DebugPrintf (ASPNETCORE_DEBUG_FLAG_ERROR, - "WEBSOCKET_HANDLER::OnIisSendComplete failed with HR=%08x", hr); + LOG_ERRORF(L"WEBSOCKET_HANDLER::OnIisSendComplete failed with HR=%08x", hr); } // @@ -1014,8 +993,7 @@ Routine Description: CleanupReason cleanupReason = CleanupReasonUnknown; WINHTTP_WEB_SOCKET_BUFFER_TYPE BufferType; - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::OnIisReceiveComplete"); + LOG_TRACE(L"WEBSOCKET_HANDLER::OnIisReceiveComplete"); if (FAILED_LOG(hrCompletion)) { @@ -1065,8 +1043,7 @@ Finished: { Cleanup (cleanupReason); - DebugPrintf (ASPNETCORE_DEBUG_FLAG_ERROR, - "WEBSOCKET_HANDLER::OnIisReceiveComplete failed with HR=%08x", hr); + LOG_ERRORF(L"WEBSOCKET_HANDLER::OnIisReceiveComplete failed with HR=%08x", hr); } // @@ -1097,8 +1074,7 @@ Arguments: --*/ { BOOL fLocked = FALSE; - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "WEBSOCKET_HANDLER::Cleanup Initiated with reason %d", reason); + LOG_TRACEF(L"WEBSOCKET_HANDLER::Cleanup Initiated with reason %d", reason); if (_fCleanupInProgress) { diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp index 0af41d0f1c..1a087d5c95 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp @@ -55,8 +55,6 @@ REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig( goto Finished; } - DebugPrintf(ASPNETCORE_DEBUG_FLAG_INFO, - "REQUESTHANDLER_CONFIG::GetConfig, set config to ModuleContext"); // set appliction info here instead of inside Populate() // as the destructor will delete the backend process hr = pRequestHandlerConfig->QueryApplicationPath()->Copy(pHttpApplication->GetApplicationId()); diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 814ca5e14b..0e6b1cc932 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -88,7 +88,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS !IISDeploymentParameters.HandlerSettings.ContainsKey("debugFile")) { _debugLogFile = Path.GetTempFileName(); - IISDeploymentParameters.HandlerSettings["debugLevel"] = "4"; + IISDeploymentParameters.HandlerSettings["debugLevel"] = "file"; IISDeploymentParameters.HandlerSettings["debugFile"] = _debugLogFile; } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs index 3cb2d40c3a..2d45f036a7 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { public static void AddDebugLogToWebConfig(this IISDeploymentParameters parameters, string filename) { - parameters.HandlerSettings["debugLevel"] = "4"; + parameters.HandlerSettings["debugLevel"] = "file"; parameters.HandlerSettings["debugFile"] = filename; } diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index dd0ac8cf6c..e574d4f96f 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -200,17 +200,44 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } - private static void AssertLogs(string logPath) + [ConditionalFact] + public async Task DebugLogsAreWrittenToEventLog() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + deploymentParameters.HandlerSettings["debugLevel"] = "file,eventlog"; + var deploymentResult = await StartAsync(deploymentParameters); + StopServer(); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, @"\[aspnetcorev2.dll\] Initializing logs for .*?Description: IIS ASP.NET Core Module V2"); + } + + [ConditionalFact] + public async Task OutOfProcessReadsLogConfiguration() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel:HostingModel.OutOfProcess, publish: true); + deploymentParameters.HandlerSettings["debugLevel"] = "file,trace"; + deploymentParameters.HandlerSettings["debugFile"] = ""; + var deploymentResult = await StartAsync(deploymentParameters); + + var logContents = ReadLogs(Path.Combine(deploymentResult.ContentRoot, "aspnetcore-debug.log")); + Assert.Contains("FORWARDING_HANDLER::", logContents); + } + + private static string ReadLogs(string logPath) { using (var stream = File.Open(logPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) using (var streamReader = new StreamReader(stream)) { - var logContents = streamReader.ReadToEnd(); - Assert.Contains("[aspnetcorev2.dll]", logContents); - Assert.Contains("[aspnetcorev2_inprocess.dll]", logContents); - Assert.Contains("Description: IIS ASP.NET Core Module V2. Commit:", logContents); - Assert.Contains("Description: IIS ASP.NET Core Module V2 Request Handler. Commit:", logContents); + return streamReader.ReadToEnd(); } } + + private static void AssertLogs(string logPath) + { + var logContents = ReadLogs(logPath); + Assert.Contains("[aspnetcorev2.dll]", logContents); + Assert.Contains("[aspnetcorev2_inprocess.dll]", logContents); + Assert.Contains("Description: IIS ASP.NET Core Module V2. Commit:", logContents); + Assert.Contains("Description: IIS ASP.NET Core Module V2 Request Handler. Commit:", logContents); + } } } From 71b7bb50b28409614d730c7965ff7035534b1974 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 5 Sep 2018 17:21:59 -0700 Subject: [PATCH 267/363] Ensure external processes are killed when test process exits (#1371) - Prevents locked files when stop debugging unit test - Addresses #1279 --- .../IISDeployer.cs | 5 + .../IISExpressDeployer.cs | 6 + .../ProcessTracker.cs | 128 ++++++++++++++++++ 3 files changed, 139 insertions(+) create mode 100644 src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 0e6b1cc932..b1394bccb5 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -254,6 +254,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } HostProcess = Process.GetProcessById(workerProcess.ProcessId); + + // Ensure w3wp.exe is killed if test process termination is non-graceful. + // Prevents locked files when stop debugging unit test. + ProcessTracker.Add(HostProcess); + // cache the process start time for verifying log file name. var _ = HostProcess.StartTime; diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index 4604fb5652..56d4afb46b 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -249,8 +249,14 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS else { _hostProcess = process; + + // Ensure iisexpress.exe is killed if test process termination is non-graceful. + // Prevents locked files when stop debugging unit test. + ProcessTracker.Add(_hostProcess); + // cache the process start time for verifying log file name. var _ = _hostProcess.StartTime; + Logger.LogInformation("Started iisexpress successfully. Process Id : {processId}, Port: {port}", _hostProcess.Id, port); return (url: url, hostExitToken: hostExitTokenSource.Token); } diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs new file mode 100644 index 0000000000..be2e6cc62b --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs @@ -0,0 +1,128 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.ComponentModel; +using System.Diagnostics; +using System.Runtime.InteropServices; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS +{ + // Uses Windows Job Objects to ensure external processes are killed if the current process is terminated non-gracefully. + internal static class ProcessTracker + { + private static readonly IntPtr _jobHandle; + + static ProcessTracker() + { + // Requires Win8 or later + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || Environment.OSVersion.Version < new Version(6, 2)) + { + return; + } + + // Job name is optional but helps with diagnostics. Job name must be unique if non-null. + _jobHandle = CreateJobObject(IntPtr.Zero, name: $"ProcessTracker{Process.GetCurrentProcess().Id}"); + + var extendedInfo = new JOBOBJECT_EXTENDED_LIMIT_INFORMATION + { + BasicLimitInformation = new JOBOBJECT_BASIC_LIMIT_INFORMATION + { + LimitFlags = JOBOBJECTLIMIT.JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE + } + }; + + var length = Marshal.SizeOf(typeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION)); + var extendedInfoPtr = Marshal.AllocHGlobal(length); + try + { + Marshal.StructureToPtr(extendedInfo, extendedInfoPtr, false); + + if (!SetInformationJobObject(_jobHandle, JobObjectInfoType.ExtendedLimitInformation, + extendedInfoPtr, (uint)length)) + { + throw new Win32Exception(); + } + } + finally + { + Marshal.FreeHGlobal(extendedInfoPtr); + } + } + + public static void Add(Process process) + { + if (_jobHandle != IntPtr.Zero) + { + var success = AssignProcessToJobObject(_jobHandle, process.Handle); + if (!success && !process.HasExited) + { + throw new Win32Exception(); + } + } + } + + [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] + static extern IntPtr CreateJobObject(IntPtr lpJobAttributes, string name); + + [DllImport("kernel32.dll")] + static extern bool SetInformationJobObject(IntPtr job, JobObjectInfoType infoType, + IntPtr lpJobObjectInfo, uint cbJobObjectInfoLength); + + [DllImport("kernel32.dll", SetLastError = true)] + static extern bool AssignProcessToJobObject(IntPtr job, IntPtr process); + + private enum JobObjectInfoType + { + AssociateCompletionPortInformation = 7, + BasicLimitInformation = 2, + BasicUIRestrictions = 4, + EndOfJobTimeInformation = 6, + ExtendedLimitInformation = 9, + SecurityLimitInformation = 5, + GroupInformation = 11 + } + + [StructLayout(LayoutKind.Sequential)] + private struct JOBOBJECT_BASIC_LIMIT_INFORMATION + { + public Int64 PerProcessUserTimeLimit; + public Int64 PerJobUserTimeLimit; + public JOBOBJECTLIMIT LimitFlags; + public UIntPtr MinimumWorkingSetSize; + public UIntPtr MaximumWorkingSetSize; + public UInt32 ActiveProcessLimit; + public Int64 Affinity; + public UInt32 PriorityClass; + public UInt32 SchedulingClass; + } + + [Flags] + private enum JOBOBJECTLIMIT : uint + { + JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE = 0x2000 + } + + [StructLayout(LayoutKind.Sequential)] + private struct IO_COUNTERS + { + public UInt64 ReadOperationCount; + public UInt64 WriteOperationCount; + public UInt64 OtherOperationCount; + public UInt64 ReadTransferCount; + public UInt64 WriteTransferCount; + public UInt64 OtherTransferCount; + } + + [StructLayout(LayoutKind.Sequential)] + private struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION + { + public JOBOBJECT_BASIC_LIMIT_INFORMATION BasicLimitInformation; + public IO_COUNTERS IoInfo; + public UIntPtr ProcessMemoryLimit; + public UIntPtr JobMemoryLimit; + public UIntPtr PeakProcessMemoryUsed; + public UIntPtr PeakJobMemoryUsed; + } + } +} From b1f0f173aa937bed8910bd42ad92436c0de1b830 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 6 Sep 2018 10:10:07 -0700 Subject: [PATCH 268/363] Use ConnectionResetException with 'The client disconnected' message (#1364) --- build/dependencies.props | 1 + .../Core/IO/AsyncIOOperation.cs | 4 +- .../Microsoft.AspNetCore.Server.IIS.csproj | 3 +- test/IIS.Tests/ClientDisconnectTests.cs | 50 +++++++++++++++++-- test/IIS.Tests/TestServerTest.cs | 22 ++++---- 5 files changed, 62 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 3ecafbac3f..5418510639 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -8,6 +8,7 @@ 2.2.0-preview2-35143 2.2.0-preview2-35143 2.2.0-preview2-35143 + 2.2.0-preview2-35143 2.2.0-preview2-35143 2.2.0-preview2-35143 2.2.0-preview2-35143 diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs index 9d3752ef08..80e9234ea2 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs @@ -8,6 +8,7 @@ using System.IO; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks.Sources; +using Microsoft.AspNetCore.Connections; namespace Microsoft.AspNetCore.Server.IIS.Core.IO { @@ -103,7 +104,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO _result = bytes; if (hr != NativeMethods.HR_OK) { - _exception = new IOException("Native IO operation failed", Marshal.GetExceptionForHR(hr)); + // Treat all errors as the client disconnect + _exception = new ConnectionResetException("The client has disconnected", Marshal.GetExceptionForHR(hr)); } } else diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index f9c6fbbd6f..d82d80f9a6 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -24,6 +24,7 @@ + diff --git a/test/IIS.Tests/ClientDisconnectTests.cs b/test/IIS.Tests/ClientDisconnectTests.cs index 72e7adc5bb..c1b2c25062 100644 --- a/test/IIS.Tests/ClientDisconnectTests.cs +++ b/test/IIS.Tests/ClientDisconnectTests.cs @@ -5,6 +5,7 @@ using System; using System.IO; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging.Testing; @@ -17,7 +18,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public class ClientDisconnectTests : LoggedTest { - [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/1075")] + [ConditionalFact] public async Task WritesSucceedAfterClientDisconnect() { var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -49,7 +50,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } - [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/1075")] + [ConditionalFact] public async Task ReadThrowsAfterClientDisconnect() { var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -82,8 +83,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await requestCompletedCompletionSource.Task.TimeoutAfterDefault(); } - Assert.IsType(exception); - Assert.Equal("Native IO operation failed", exception.Message); + Assert.IsType(exception); + Assert.Equal("The client has disconnected", exception.Message); } [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/1075")] @@ -126,7 +127,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.IsType(exception); } } - [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/1075")] public async Task ReaderThrowsCancelledException() { @@ -163,6 +163,46 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } + [ConditionalFact] + public async Task ReaderThrowsResetExceptionOnInvalidBody() + { + var requestCompletedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + Exception exception = null; + + var data = new byte[1024]; + using (var testServer = await TestServer.Create(async ctx => + { + try + { + await ctx.Request.Body.ReadAsync(data); + } + catch (Exception e) + { + exception = e; + } + + requestCompletedCompletionSource.SetResult(true); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await connection.Send( + "POST / HTTP/1.1", + "Transfer-Encoding: chunked", + "Host: localhost", + "Connection: close", + "", + "ZZZ", + ""); + await requestCompletedCompletionSource.Task.TimeoutAfterDefault(); + } + } + + Assert.IsType(exception); + Assert.Equal("The client has disconnected", exception.Message); + } + private static async Task SendContentLength1Post(TestConnection connection) { await connection.Send( diff --git a/test/IIS.Tests/TestServerTest.cs b/test/IIS.Tests/TestServerTest.cs index 79b1c42113..c168af99d8 100644 --- a/test/IIS.Tests/TestServerTest.cs +++ b/test/IIS.Tests/TestServerTest.cs @@ -19,17 +19,17 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var helloWorld = "Hello World"; var expectedPath = "/Path"; - string path = null; - using (var testServer = await TestServer.Create(ctx => - { - path = ctx.Request.Path.ToString(); - return ctx.Response.WriteAsync(helloWorld); - }, LoggerFactory)) - { - var result = await testServer.HttpClient.GetAsync(expectedPath); - Assert.Equal(helloWorld, await result.Content.ReadAsStringAsync()); - Assert.Equal(expectedPath, path); - } + string path = null; + using (var testServer = await TestServer.Create(ctx => + { + path = ctx.Request.Path.ToString(); + return ctx.Response.WriteAsync(helloWorld); + }, LoggerFactory)) + { + var result = await testServer.HttpClient.GetAsync(expectedPath); + Assert.Equal(helloWorld, await result.Content.ReadAsStringAsync()); + Assert.Equal(expectedPath, path); } } + } } From 1fca011674f920e6bbb9d9f19c83afd1cf8c6c7e Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 6 Sep 2018 10:32:49 -0700 Subject: [PATCH 269/363] Fix output location for lib files (#1373) --- src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj | 4 ++++ .../RequestHandlerLib/RequestHandlerLib.vcxproj | 4 ++++ test/gtest/gtest.vcxproj | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 20e37c30f3..5e430905e1 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -72,16 +72,20 @@ true + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ true + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ false + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ false C:\AspNetCoreModule\src\IISLib;$(IncludePath) + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj index a2c89e2b40..2519c101b1 100644 --- a/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj +++ b/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -72,16 +72,20 @@ true + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ true + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ false + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ false C:\AspNetCoreModule\src\IISLib;$(IncludePath) + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ diff --git a/test/gtest/gtest.vcxproj b/test/gtest/gtest.vcxproj index 9f745f3a84..924f26337d 100644 --- a/test/gtest/gtest.vcxproj +++ b/test/gtest/gtest.vcxproj @@ -82,21 +82,25 @@ true $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_SourcePath); + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ true $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_SourcePath); + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ false $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_SourcePath); + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ false $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_SourcePath); + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ From 2cc108b2e1e81b999461f7b52e1ce96d80cb0939 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 6 Sep 2018 11:57:00 -0700 Subject: [PATCH 270/363] Write wide strings to stdout; cleanup logging providers; test utf8 (#1332) --- .../AspNetCore/HandlerResolver.cpp | 20 +-- src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp | 2 +- .../CommonLib/BaseOutputManager.h | 68 ++++++++++ .../CommonLib/CommonLib.vcxproj | 1 + .../CommonLib/FileOutputManager.cpp | 126 ++++++++---------- .../CommonLib/FileOutputManager.h | 31 ++--- .../CommonLib/IOutputManager.h | 8 +- .../CommonLib/LoggingHelpers.cpp | 9 +- .../CommonLib/LoggingHelpers.h | 4 +- .../CommonLib/NullOutputManager.h | 12 +- .../CommonLib/PipeOutputManager.cpp | 68 ++++------ .../CommonLib/PipeOutputManager.h | 20 +-- .../CommonLib/StdWrapper.cpp | 6 +- src/AspNetCoreModuleV2/CommonLib/StdWrapper.h | 2 +- .../CommonLib/StringHelpers.cpp | 23 ++++ .../CommonLib/StringHelpers.h | 3 + src/AspNetCoreModuleV2/CommonLib/exceptions.h | 1 + src/AspNetCoreModuleV2/CommonLib/resources.h | 4 +- .../inprocessapplication.cpp | 20 ++- .../inprocessapplication.h | 4 +- .../Inprocess/LoggingTests.cs | 47 +++++++ .../Inprocess/StartupExceptionTests.cs | 2 +- .../Utilities/EventLogHelpers.cs | 6 +- .../CommonLibTests/FileOutputManagerTests.cpp | 56 ++++---- .../CommonLibTests/PipeOutputManagerTests.cpp | 60 +++++---- .../StartupExceptionWebSite/Program.cs | 10 +- 26 files changed, 348 insertions(+), 265 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index 4c98e60f11..7414f51161 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -15,6 +15,7 @@ #include "ConfigurationLoadException.h" #include "WebConfigConfigurationSource.h" #include "ModuleHelpers.h" +#include "BaseOutputManager.h" const PCWSTR HandlerResolver::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; const PCWSTR HandlerResolver::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; @@ -54,7 +55,7 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication if (pConfiguration.QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) { std::unique_ptr options; - std::unique_ptr outputManager; + std::unique_ptr outputManager; RETURN_IF_FAILED(HOSTFXR_OPTIONS::Create( L"", @@ -72,28 +73,21 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication pApplication.GetApplicationPhysicalPath(), outputManager)); - outputManager->Start(); + outputManager->TryStartRedirection(); hr = FindNativeAssemblyFromHostfxr(*options.get(), pstrHandlerDllName, handlerDllPath); - outputManager->Stop(); + + outputManager->TryStopRedirection(); if (FAILED(hr) && m_hHostFxrDll != nullptr) { - STRA content; - STRU struStdMsg; - - outputManager->GetStdOutContent(&content); - if (content.QueryCCH() > 0) - { - struStdMsg.CopyA(content.QueryStr()); - } + auto output = outputManager->GetStdOutContent(); EventLog::Error( ASPNETCORE_EVENT_GENERAL_ERROR, ASPNETCORE_EVENT_INPROCESS_RH_ERROR_MSG, handlerDllPath.empty()? s_pwzAspnetcoreInProcessRequestHandlerName : handlerDllPath.c_str(), - struStdMsg.QueryStr()); - + output.c_str()); } } else diff --git a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp index 1f34270aee..4ec0d774dd 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp @@ -101,7 +101,7 @@ HRESULT { g_hEventLog = RegisterEventSource(nullptr, ASPNETCORE_EVENT_PROVIDER); } - + // check whether the feature is disabled due to security reason if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters", diff --git a/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h new file mode 100644 index 0000000000..32706b0192 --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h @@ -0,0 +1,68 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +#include "IOutputManager.h" +#include "StdWrapper.h" +#include "EventLog.h" +#include "exceptions.h" +#include "StringHelpers.h" +#include "debugutil.h" + +class BaseOutputManager : + public IOutputManager +{ +public: + BaseOutputManager() : BaseOutputManager(/* fEnableNativeLogging */ true) {} + BaseOutputManager(bool enableNativeLogging) : + m_disposed(false), + stdoutWrapper(nullptr), + stderrWrapper(nullptr), + m_enableNativeRedirection(enableNativeLogging) + { + InitializeSRWLock(&m_srwLock); + } + ~BaseOutputManager() {} + + void + TryStartRedirection() + { + const auto startLambda = [&]() { this->Start(); }; + TryOperation(startLambda, L"Could not start stdout redirection in %s. Exception message: %s."); + } + + void + TryStopRedirection() + { + const auto stopLambda = [&]() { this->Stop(); }; + TryOperation(stopLambda, L"Could not stop stdout redirection in %s. Exception message: %s."); + } + +protected: + std::wstring m_stdOutContent; + bool m_disposed; + bool m_enableNativeRedirection; + SRWLOCK m_srwLock{}; + std::unique_ptr stdoutWrapper; + std::unique_ptr stderrWrapper; + + template + void + TryOperation(Functor func, + std::wstring exceptionMessage) + { + try + { + func(); + } + catch (std::runtime_error& exception) + { + EventLog::Warn(ASPNETCORE_EVENT_GENERAL_WARNING, exceptionMessage.c_str(), GetModuleName().c_str(), to_wide_string(exception.what(), GetConsoleOutputCP()).c_str()); + } + catch (...) + { + OBSERVE_CAUGHT_EXCEPTION(); + } + } +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 5e430905e1..8628cc6529 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -199,6 +199,7 @@ + diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp index fb95017af8..b0442e1a81 100644 --- a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp @@ -9,18 +9,18 @@ #include "SRWExclusiveLock.h" #include "file_utility.h" #include "StdWrapper.h" +#include "StringHelpers.h" extern HINSTANCE g_hModule; -FileOutputManager::FileOutputManager() : - FileOutputManager(/* fEnableNativeLogging */ true) { } +FileOutputManager::FileOutputManager(std::wstring pwzStdOutLogFileName, std::wstring pwzApplicationPath) : + FileOutputManager(pwzStdOutLogFileName, pwzApplicationPath, /* fEnableNativeLogging */ true) { } -FileOutputManager::FileOutputManager(bool fEnableNativeLogging) : +FileOutputManager::FileOutputManager(std::wstring pwzStdOutLogFileName, std::wstring pwzApplicationPath, bool fEnableNativeLogging) : + BaseOutputManager(fEnableNativeLogging), m_hLogFileHandle(INVALID_HANDLE_VALUE), - m_disposed(false), - stdoutWrapper(nullptr), - stderrWrapper(nullptr), - m_fEnableNativeRedirection(fEnableNativeLogging) + m_applicationPath(pwzApplicationPath), + m_stdOutLogFileName(pwzStdOutLogFileName) { InitializeSRWLock(&m_srwLock); } @@ -30,23 +30,13 @@ FileOutputManager::~FileOutputManager() FileOutputManager::Stop(); } -HRESULT -FileOutputManager::Initialize(PCWSTR pwzStdOutLogFileName, PCWSTR pwzApplicationPath) -{ - RETURN_IF_FAILED(m_wsApplicationPath.Copy(pwzApplicationPath)); - RETURN_IF_FAILED(m_wsStdOutLogFileName.Copy(pwzStdOutLogFileName)); - - return S_OK; -} - // Start redirecting stdout and stderr into the file handle. // Uses sttimer to continuously flush output into the file. -HRESULT +void FileOutputManager::Start() { SYSTEMTIME systemTime; SECURITY_ATTRIBUTES saAttr = { 0 }; - STRU struPath; FILETIME processCreationTime; FILETIME dummyFileTime; @@ -54,48 +44,38 @@ FileOutputManager::Start() // in the current process. if (!AllocConsole()) { - // ERROR_ACCESS_DENIED means there is a console already present. - if (GetLastError() != ERROR_ACCESS_DENIED) - { - RETURN_LAST_ERROR(); - } + THROW_LAST_ERROR_IF(GetLastError() != ERROR_ACCESS_DENIED); } // Concatenate the log file name and application path - RETURN_IF_FAILED(FILE_UTILITY::ConvertPathToFullPath( - m_wsStdOutLogFileName.QueryStr(), - m_wsApplicationPath.QueryStr(), - &struPath)); + auto logPath = m_applicationPath / m_stdOutLogFileName; + create_directories(logPath.parent_path()); - RETURN_IF_FAILED(FILE_UTILITY::EnsureDirectoryPathExist(struPath.QueryStr())); - - - // TODO fix string as it is incorrect - RETURN_LAST_ERROR_IF(!GetProcessTimes( + THROW_LAST_ERROR_IF(!GetProcessTimes( GetCurrentProcess(), &processCreationTime, &dummyFileTime, &dummyFileTime, &dummyFileTime)); - RETURN_LAST_ERROR_IF(!FileTimeToSystemTime(&processCreationTime, &systemTime)); - RETURN_IF_FAILED( - m_struLogFilePath.SafeSnwprintf(L"%s_%d%02d%02d%02d%02d%02d_%d.log", - struPath.QueryStr(), - systemTime.wYear, - systemTime.wMonth, - systemTime.wDay, - systemTime.wHour, - systemTime.wMinute, - systemTime.wSecond, - GetCurrentProcessId())); + THROW_LAST_ERROR_IF(!FileTimeToSystemTime(&processCreationTime, &systemTime)); + + m_logFilePath = format(L"%s_%d%02d%02d%02d%02d%02d_%d.log", + logPath.c_str(), + systemTime.wYear, + systemTime.wMonth, + systemTime.wDay, + systemTime.wHour, + systemTime.wMinute, + systemTime.wSecond, + GetCurrentProcessId()); saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); saAttr.bInheritHandle = TRUE; saAttr.lpSecurityDescriptor = NULL; // Create the file with both READ and WRITE. - m_hLogFileHandle = CreateFileW(m_struLogFilePath.QueryStr(), + m_hLogFileHandle = CreateFileW(m_logFilePath.c_str(), FILE_READ_DATA | FILE_WRITE_DATA, FILE_SHARE_READ, &saAttr, @@ -103,22 +83,18 @@ FileOutputManager::Start() FILE_ATTRIBUTE_NORMAL, nullptr); - RETURN_LAST_ERROR_IF(m_hLogFileHandle == INVALID_HANDLE_VALUE); + THROW_LAST_ERROR_IF(m_hLogFileHandle == INVALID_HANDLE_VALUE); - stdoutWrapper = std::make_unique(stdout, STD_OUTPUT_HANDLE, m_hLogFileHandle, m_fEnableNativeRedirection); - stderrWrapper = std::make_unique(stderr, STD_ERROR_HANDLE, m_hLogFileHandle, m_fEnableNativeRedirection); + stdoutWrapper = std::make_unique(stdout, STD_OUTPUT_HANDLE, m_hLogFileHandle, m_enableNativeRedirection); + stderrWrapper = std::make_unique(stderr, STD_ERROR_HANDLE, m_hLogFileHandle, m_enableNativeRedirection); stdoutWrapper->StartRedirection(); stderrWrapper->StartRedirection(); - - return S_OK; } - -HRESULT +void FileOutputManager::Stop() { - STRA straStdOutput; CHAR pzFileContents[MAX_FILE_READ_SIZE] = { 0 }; DWORD dwNumBytesRead; LARGE_INTEGER li = { 0 }; @@ -128,75 +104,77 @@ FileOutputManager::Stop() if (m_disposed) { - return S_OK; + return; } SRWExclusiveLock lock(m_srwLock); if (m_disposed) { - return S_OK; + return; } m_disposed = true; if (m_hLogFileHandle == INVALID_HANDLE_VALUE) { - return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + THROW_HR(HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)); } FlushFileBuffers(m_hLogFileHandle); if (stdoutWrapper != nullptr) { - RETURN_IF_FAILED(stdoutWrapper->StopRedirection()); + THROW_IF_FAILED(stdoutWrapper->StopRedirection()); } if (stderrWrapper != nullptr) { - RETURN_IF_FAILED(stderrWrapper->StopRedirection()); + THROW_IF_FAILED(stderrWrapper->StopRedirection()); } // delete empty log file - handle = FindFirstFile(m_struLogFilePath.QueryStr(), &fileData); + handle = FindFirstFile(m_logFilePath.c_str(), &fileData); if (handle != INVALID_HANDLE_VALUE && handle != NULL && fileData.nFileSizeHigh == 0 && fileData.nFileSizeLow == 0) // skip check of nFileSizeHigh { FindClose(handle); - LOG_LAST_ERROR_IF(!DeleteFile(m_struLogFilePath.QueryStr())); + LOG_LAST_ERROR_IF(!DeleteFile(m_logFilePath.c_str())); + return; } // Read the first 30Kb from the file and store it in a buffer. // By doing this, we can close the handle to the file and be done with it. - RETURN_LAST_ERROR_IF(!GetFileSizeEx(m_hLogFileHandle, &li)); + THROW_LAST_ERROR_IF(!GetFileSizeEx(m_hLogFileHandle, &li)); - if (li.LowPart == 0 || li.HighPart > 0) + if (li.HighPart > 0) { - RETURN_HR(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); + THROW_HR(HRESULT_FROM_WIN32(ERROR_FILE_INVALID)); } dwFilePointer = SetFilePointer(m_hLogFileHandle, 0, NULL, FILE_BEGIN); - RETURN_LAST_ERROR_IF(dwFilePointer == INVALID_SET_FILE_POINTER); + THROW_LAST_ERROR_IF(dwFilePointer == INVALID_SET_FILE_POINTER); - RETURN_LAST_ERROR_IF(!ReadFile(m_hLogFileHandle, pzFileContents, MAX_FILE_READ_SIZE, &dwNumBytesRead, NULL)); + THROW_LAST_ERROR_IF(!ReadFile(m_hLogFileHandle, pzFileContents, MAX_FILE_READ_SIZE, &dwNumBytesRead, NULL)); - m_straFileContent.Copy(pzFileContents, dwNumBytesRead); + m_stdOutContent = to_wide_string(std::string(pzFileContents, dwNumBytesRead), GetConsoleOutputCP()); - // printf will fail in in full IIS - if (printf(m_straFileContent.QueryStr()) != -1) + auto content = GetStdOutContent(); + if (!content.empty()) { - // Need to flush contents for the new stdout and stderr - _flushall(); + // printf will fail in in full IIS + if (wprintf(content.c_str()) != -1) + { + // Need to flush contents for the new stdout and stderr + _flushall(); + } } - - return S_OK; } -bool FileOutputManager::GetStdOutContent(STRA* struStdOutput) +std::wstring FileOutputManager::GetStdOutContent() { - struStdOutput->Copy(m_straFileContent); - return m_straFileContent.QueryCCH() > 0; + return m_stdOutContent; } diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h index 94f6e19176..435e07d4ff 100644 --- a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h @@ -4,38 +4,27 @@ #pragma once #include "sttimer.h" -#include "IOutputManager.h" #include "HandleWrapper.h" #include "StdWrapper.h" #include "stringa.h" #include "stringu.h" +#include "BaseOutputManager.h" -class FileOutputManager : public IOutputManager +class FileOutputManager : public BaseOutputManager { - #define FILE_FLUSH_TIMEOUT 3000 #define MAX_FILE_READ_SIZE 30000 public: - FileOutputManager(); - FileOutputManager(bool fEnableNativeLogging); + FileOutputManager(std::wstring pwzApplicationPath, std::wstring pwzStdOutLogFileName); + FileOutputManager(std::wstring pwzApplicationPath, std::wstring pwzStdOutLogFileName, bool fEnableNativeLogging); ~FileOutputManager(); - HRESULT - Initialize(PCWSTR pwzStdOutLogFileName, PCWSTR pwzApplciationpath); - - virtual bool GetStdOutContent(STRA* struStdOutput) override; - virtual HRESULT Start() override; - virtual HRESULT Stop() override; + virtual std::wstring GetStdOutContent() override; + void Start() override; + void Stop() override; private: HandleWrapper m_hLogFileHandle; - STTIMER m_Timer; - STRU m_wsStdOutLogFileName; - STRU m_wsApplicationPath; - STRU m_struLogFilePath; - STRA m_straFileContent; - BOOL m_disposed; - BOOL m_fEnableNativeRedirection; - SRWLOCK m_srwLock{}; - std::unique_ptr stdoutWrapper; - std::unique_ptr stderrWrapper; + std::wstring m_stdOutLogFileName; + std::filesystem::path m_applicationPath; + std::filesystem::path m_logFilePath; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h index fec85cea96..4f19ad983d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h @@ -10,18 +10,18 @@ class IOutputManager { public: virtual - HRESULT + void Start() = 0; virtual ~IOutputManager() = default; virtual - bool - GetStdOutContent(STRA* struStdOutput) = 0; + std::wstring + GetStdOutContent() = 0; virtual - HRESULT + void Stop() = 0; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp index 3d1aacf46d..0a33c4c145 100644 --- a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp @@ -3,7 +3,6 @@ #include "stdafx.h" #include "LoggingHelpers.h" -#include "IOutputManager.h" #include "FileOutputManager.h" #include "PipeOutputManager.h" #include "NullOutputManager.h" @@ -11,6 +10,9 @@ #include #include #include "ntassert.h" +#include "exceptions.h" +#include "EventLog.h" +#include "BaseOutputManager.h" HRESULT LoggingHelpers::CreateLoggingProvider( @@ -18,7 +20,7 @@ LoggingHelpers::CreateLoggingProvider( bool fEnableNativeLogging, PCWSTR pwzStdOutFileName, PCWSTR pwzApplicationPath, - std::unique_ptr& outputManager + std::unique_ptr& outputManager ) { HRESULT hr = S_OK; @@ -34,8 +36,7 @@ LoggingHelpers::CreateLoggingProvider( if (fIsLoggingEnabled) { - auto manager = std::make_unique(fEnableNativeLogging); - hr = manager->Initialize(pwzStdOutFileName, pwzApplicationPath); + auto manager = std::make_unique(pwzStdOutFileName, pwzApplicationPath, fEnableNativeLogging); outputManager = std::move(manager); } else if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &dummy)) diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h index 0c06f759cf..eff25b47d1 100644 --- a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h +++ b/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h @@ -3,7 +3,7 @@ #pragma once -#include "IOutputManager.h" +#include "BaseOutputManager.h" class LoggingHelpers { @@ -16,7 +16,7 @@ public: bool fEnableNativeLogging, PCWSTR pwzStdOutFileName, PCWSTR pwzApplicationPath, - std::unique_ptr& outputManager + std::unique_ptr& outputManager ); }; diff --git a/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h index 389f967b69..d9c63b682d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h @@ -5,7 +5,7 @@ #include "stdafx.h" -class NullOutputManager : public IOutputManager +class NullOutputManager : public BaseOutputManager { public: @@ -13,19 +13,17 @@ public: ~NullOutputManager() = default; - HRESULT Start() + void Start() { - return S_OK; } - HRESULT Stop() + void Stop() { - return S_OK; } - bool GetStdOutContent(STRA*) + std::wstring GetStdOutContent() { - return false; + return L""; } }; diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp index 60c2723fcb..8a9fe0612e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp @@ -1,12 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. -#include "stdafx.h" #include "PipeOutputManager.h" -#include "exceptions.h" + +#include "stdafx.h" +#include "Exceptions.h" #include "SRWExclusiveLock.h" #include "StdWrapper.h" #include "ntassert.h" +#include "StringHelpers.h" #define LOG_IF_DUPFAIL(err) do { if (err == -1) { LOG_IF_FAILED(HRESULT_FROM_WIN32(_doserrno)); } } while (0, 0); #define LOG_IF_ERRNO(err) do { if (err != 0) { LOG_IF_FAILED(HRESULT_FROM_WIN32(_doserrno)); } } while (0, 0); @@ -17,16 +19,12 @@ PipeOutputManager::PipeOutputManager() } PipeOutputManager::PipeOutputManager(bool fEnableNativeLogging) : + BaseOutputManager(fEnableNativeLogging), m_hErrReadPipe(INVALID_HANDLE_VALUE), m_hErrWritePipe(INVALID_HANDLE_VALUE), m_hErrThread(nullptr), - m_dwStdErrReadTotal(0), - m_disposed(FALSE), - m_fEnableNativeRedirection(fEnableNativeLogging), - stdoutWrapper(nullptr), - stderrWrapper(nullptr) + m_numBytesReadTotal(0) { - InitializeSRWLock(&m_srwLock); } PipeOutputManager::~PipeOutputManager() @@ -37,7 +35,7 @@ PipeOutputManager::~PipeOutputManager() // Start redirecting stdout and stderr into a pipe // Continuously read the pipe on a background thread // until Stop is called. -HRESULT PipeOutputManager::Start() +void PipeOutputManager::Start() { SECURITY_ATTRIBUTES saAttr = { 0 }; HANDLE hStdErrReadPipe; @@ -50,17 +48,17 @@ HRESULT PipeOutputManager::Start() // ERROR_ACCESS_DENIED means there is a console already present. if (GetLastError() != ERROR_ACCESS_DENIED) { - RETURN_LAST_ERROR(); + THROW_LAST_ERROR(); } } - RETURN_LAST_ERROR_IF(!CreatePipe(&hStdErrReadPipe, &hStdErrWritePipe, &saAttr, 0 /*nSize*/)); + THROW_LAST_ERROR_IF(!CreatePipe(&hStdErrReadPipe, &hStdErrWritePipe, &saAttr, 0 /*nSize*/)); m_hErrReadPipe = hStdErrReadPipe; m_hErrWritePipe = hStdErrWritePipe; - stdoutWrapper = std::make_unique(stdout, STD_OUTPUT_HANDLE, hStdErrWritePipe, m_fEnableNativeRedirection); - stderrWrapper = std::make_unique(stderr, STD_ERROR_HANDLE, hStdErrWritePipe, m_fEnableNativeRedirection); + stdoutWrapper = std::make_unique(stdout, STD_OUTPUT_HANDLE, hStdErrWritePipe, m_enableNativeRedirection); + stderrWrapper = std::make_unique(stderr, STD_ERROR_HANDLE, hStdErrWritePipe, m_enableNativeRedirection); LOG_IF_FAILED(stdoutWrapper->StartRedirection()); LOG_IF_FAILED(stderrWrapper->StartRedirection()); @@ -74,9 +72,7 @@ HRESULT PipeOutputManager::Start() 0, // default creation flags nullptr); // receive thread identifier - RETURN_LAST_ERROR_IF_NULL(m_hErrThread); - - return S_OK; + THROW_LAST_ERROR_IF_NULL(m_hErrThread); } // Stop redirecting stdout and stderr into a pipe @@ -84,21 +80,20 @@ HRESULT PipeOutputManager::Start() // and prints any output that was captured in the pipe. // If more than 30Kb was written to the pipe, that output will // be thrown away. -HRESULT PipeOutputManager::Stop() +void PipeOutputManager::Stop() { DWORD dwThreadStatus = 0; - STRA straStdOutput; if (m_disposed) { - return S_OK; + return; } SRWExclusiveLock lock(m_srwLock); if (m_disposed) { - return S_OK; + return; } m_disposed = true; @@ -108,7 +103,7 @@ HRESULT PipeOutputManager::Stop() if (m_hErrWritePipe != INVALID_HANDLE_VALUE) { // Flush the pipe writer before closing to capture all output - RETURN_LAST_ERROR_IF(!FlushFileBuffers(m_hErrWritePipe)); + THROW_LAST_ERROR_IF(!FlushFileBuffers(m_hErrWritePipe)); CloseHandle(m_hErrWritePipe); m_hErrWritePipe = INVALID_HANDLE_VALUE; } @@ -163,33 +158,22 @@ HRESULT PipeOutputManager::Stop() // If we captured any output, relog it to the original stdout // Useful for the IIS Express scenario as it is running with stdout and stderr - if (GetStdOutContent(&straStdOutput)) + m_stdOutContent = to_wide_string(std::string(m_pipeContents, m_numBytesReadTotal), GetConsoleOutputCP()); + + if (!m_stdOutContent.empty()) { // printf will fail in in full IIS - if (printf(straStdOutput.QueryStr()) != -1) + if (wprintf(m_stdOutContent.c_str()) != -1) { // Need to flush contents for the new stdout and stderr _flushall(); } } - - return S_OK; } -bool PipeOutputManager::GetStdOutContent(STRA* straStdOutput) +std::wstring PipeOutputManager::GetStdOutContent() { - bool fLogged = false; - - // TODO consider returning the file contents rather than copying. - if (m_dwStdErrReadTotal > 0) - { - if (SUCCEEDED(straStdOutput->Copy(m_pzFileContents, m_dwStdErrReadTotal))) - { - fLogged = TRUE; - } - } - - return fLogged; + return m_stdOutContent; } void @@ -211,13 +195,13 @@ PipeOutputManager::ReadStdErrHandleInternal() { // Fill a maximum of MAX_PIPE_READ_SIZE into a buffer. if (ReadFile(m_hErrReadPipe, - &m_pzFileContents[m_dwStdErrReadTotal], - MAX_PIPE_READ_SIZE - m_dwStdErrReadTotal, + &m_pipeContents[m_numBytesReadTotal], + MAX_PIPE_READ_SIZE - m_numBytesReadTotal, &dwNumBytesRead, nullptr)) { - m_dwStdErrReadTotal += dwNumBytesRead; - if (m_dwStdErrReadTotal >= MAX_PIPE_READ_SIZE) + m_numBytesReadTotal += dwNumBytesRead; + if (m_numBytesReadTotal >= MAX_PIPE_READ_SIZE) { break; } diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h index 0b51ff4038..3a1a74cd43 100644 --- a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h +++ b/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h @@ -3,11 +3,11 @@ #pragma once -#include "IOutputManager.h" #include "StdWrapper.h" #include "stringu.h" +#include "BaseOutputManager.h" -class PipeOutputManager : public IOutputManager +class PipeOutputManager : public BaseOutputManager { // Timeout to be used if a thread never exits #define PIPE_OUTPUT_THREAD_TIMEOUT 2000 @@ -19,9 +19,9 @@ public: PipeOutputManager(bool fEnableNativeLogging); ~PipeOutputManager(); - HRESULT Start() override; - HRESULT Stop() override; - bool GetStdOutContent(STRA* straStdOutput) override; + void Start() override; + void Stop() override; + std::wstring GetStdOutContent() override; // Thread functions void ReadStdErrHandleInternal(); @@ -32,13 +32,7 @@ private: HANDLE m_hErrReadPipe; HANDLE m_hErrWritePipe; - STRU m_struLogFilePath; HANDLE m_hErrThread; - CHAR m_pzFileContents[MAX_PIPE_READ_SIZE] = { 0 }; - DWORD m_dwStdErrReadTotal; - SRWLOCK m_srwLock {}; - BOOL m_disposed; - BOOL m_fEnableNativeRedirection; - std::unique_ptr stdoutWrapper; - std::unique_ptr stderrWrapper; + CHAR m_pipeContents[MAX_PIPE_READ_SIZE] = { 0 }; + DWORD m_numBytesReadTotal; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp b/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp index 432e48a163..809864f06a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp @@ -12,7 +12,7 @@ StdWrapper::StdWrapper(FILE* stdStream, DWORD stdHandleNumber, HANDLE handleToRe : m_previousFileDescriptor(0), m_stdStream(stdStream), m_stdHandleNumber(stdHandleNumber), - m_fEnableNativeRedirection(fEnableNativeRedirection), + m_enableNativeRedirection(fEnableNativeRedirection), m_handleToRedirectTo(handleToRedirectTo), m_redirectedFile(nullptr) { @@ -48,7 +48,7 @@ StdWrapper::StartRedirection() m_previousFileDescriptor = _dup(_fileno(m_stdStream)); } - if (!m_fEnableNativeRedirection) + if (!m_enableNativeRedirection) { RETURN_LAST_ERROR_IF(!SetStdHandle(m_stdHandleNumber, m_handleToRedirectTo)); @@ -122,7 +122,7 @@ StdWrapper::StopRedirection() const RETURN_LAST_ERROR_IF(!SetStdHandle(m_stdHandleNumber, reinterpret_cast(_get_osfhandle(m_previousFileDescriptor)))); - if (!m_fEnableNativeRedirection) + if (!m_enableNativeRedirection) { return S_OK; } diff --git a/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h b/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h index f03b2ff060..17373f093e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h +++ b/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h @@ -18,7 +18,7 @@ private: int m_previousFileDescriptor; FILE* m_stdStream; DWORD m_stdHandleNumber; - BOOL m_fEnableNativeRedirection; + BOOL m_enableNativeRedirection; HANDLE m_handleToRedirectTo; FILE* m_redirectedFile; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp index 5e251f69ed..736597b9a5 100644 --- a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. #include "StringHelpers.h" +#include "exceptions.h" bool ends_with(const std::wstring &source, const std::wstring &suffix, bool ignoreCase) { @@ -18,3 +19,25 @@ bool equals_ignore_case(const std::wstring& s1, const std::wstring& s2) { return CSTR_EQUAL == CompareStringOrdinal(s1.c_str(), static_cast(s1.length()), s2.c_str(), static_cast(s2.length()), true); } + +std::wstring to_wide_string(const std::string &source, const unsigned int codePage) +{ + // MultiByteToWideChar returns 0 on failure, which is also the same return value + // for empty strings. Preemptive return. + if (source.length() == 0) + { + return L""; + } + + std::wstring destination; + + int nChars = MultiByteToWideChar(codePage, 0, source.data(), static_cast(source.length()), NULL, 0); + THROW_LAST_ERROR_IF(nChars == 0); + + destination.resize(nChars); + + nChars = MultiByteToWideChar(codePage, 0, source.data(), static_cast(source.length()), destination.data(), nChars); + THROW_LAST_ERROR_IF(nChars == 0); + + return destination; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h index e6cda03ff7..40b3b821c7 100644 --- a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h +++ b/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h @@ -11,6 +11,9 @@ bool ends_with(const std::wstring &source, const std::wstring &suffix, bool igno [[nodiscard]] bool equals_ignore_case(const std::wstring& s1, const std::wstring& s2); +[[nodiscard]] +std::wstring to_wide_string(const std::string &source, const unsigned int codePage); + template [[nodiscard]] std::wstring format(const std::wstring& format, Args ... args) diff --git a/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/AspNetCoreModuleV2/CommonLib/exceptions.h index 109f76ce87..f79b9e99e5 100644 --- a/src/AspNetCoreModuleV2/CommonLib/exceptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/exceptions.h @@ -59,6 +59,7 @@ #define FINISHED_LAST_ERROR_IF(condition) do { if (condition) { hr = LogLastError(LOCATION_INFO); _GOTO_FINISHED(); }} while (0, 0) #define FINISHED_LAST_ERROR_IF_NULL(ptr) do { if ((ptr) == nullptr) { hr = LogLastError(LOCATION_INFO); _GOTO_FINISHED(); }} while (0, 0) +#define THROW_HR(hr) do { _HR_RET(hr); ThrowResultException(LOCATION_INFO, LogHResultFailed(LOCATION_INFO, __hrRet)); } while (0, 0) #define THROW_LAST_ERROR() do { ThrowResultException(LOCATION_INFO, LogLastError(LOCATION_INFO)); } while (0, 0) #define THROW_IF_FAILED(hr) do { _HR_RET(hr); if (FAILED(__hrRet)) { ThrowResultException(LOCATION_INFO, __hrRet); }} while (0, 0) #define THROW_LAST_ERROR_IF(condition) do { if (condition) { ThrowResultException(LOCATION_INFO, LogLastError(LOCATION_INFO)); }} while (0, 0) diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index 790e849516..d44c6a25f8 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -39,8 +39,8 @@ #define ASPNETCORE_EVENT_RECYCLE_FAILURE_CONFIGURATION_MSG L"Failed to recycle application due to a configuration change at '%s'. Recycling worker process." #define ASPNETCORE_EVENT_MODULE_DISABLED_MSG L"AspNetCore Module is disabled" #define ASPNETCORE_EVENT_HOSTFXR_DLL_INVALID_VERSION_MSG L"Hostfxr version used does not support 'hostfxr_get_native_search_directories', update the version of hostfxr to a higher version. Path to hostfxr: '%s'." -#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, exception code = '0x%x. Please check the stderr logs for more information." -#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, exception code = '0x%x. Last 4KB characters of captured stdout and stderr logs:\r\n%s" +#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, exception code = '0x%x'. Please check the stderr logs for more information." +#define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, exception code = '0x%x'. Last 4KB characters of captured stdout and stderr logs:\r\n%s" #define ASPNETCORE_EVENT_INPROCESS_RH_ERROR_MSG L"Could not find the assembly '%s' for in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application. Captured output: %s" #define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for out-of-process application. Please confirm the assembly is installed correctly for IIS or IISExpress." #define ASPNETCORE_EVENT_INPROCESS_START_SUCCESS_MSG L"Application '%s' started the coreclr in-process successfully." diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 942bfe44b0..6f37a1a3b9 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -207,7 +207,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication() QueryApplicationPhysicalPath().c_str(), m_pLoggerProvider)); - LOG_IF_FAILED(m_pLoggerProvider->Start()); + m_pLoggerProvider->TryStartRedirection(); } // There can only ever be a single instance of .NET Core @@ -246,7 +246,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication() // At this point CLR thread either finished or timed out, abandon it. m_clrThread.detach(); - LOG_IF_FAILED(m_pLoggerProvider->Stop()); + m_pLoggerProvider->TryStopRedirection(); if (m_fStopCalled) { @@ -391,8 +391,6 @@ IN_PROCESS_APPLICATION::ExecuteClr(const std::shared_ptr& con VOID IN_PROCESS_APPLICATION::ClrThreadEntryPoint(const std::shared_ptr &context) { - LOG_INFO(L"Starting CLR thread"); - // Keep aspnetcorev2_inprocess.dll loaded while this thread is running // this is required because thread might be abandoned HandleWrapper moduleHandle; @@ -441,14 +439,11 @@ IN_PROCESS_APPLICATION::SetEnvironmentVariablesOnWorkerProcess() VOID IN_PROCESS_APPLICATION::UnexpectedThreadExit(const ExecuteClrContext& context) const { - STRA straStdErrOutput; - STRU struStdMsg; - auto hasStdOut = m_pLoggerProvider->GetStdOutContent(&straStdErrOutput) && - SUCCEEDED(struStdMsg.CopyA(straStdErrOutput.QueryStr())); + auto content = m_pLoggerProvider->GetStdOutContent(); if (context.m_exceptionCode != 0) { - if (hasStdOut) + if (!content.empty()) { EventLog::Error( ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION, @@ -456,7 +451,7 @@ IN_PROCESS_APPLICATION::UnexpectedThreadExit(const ExecuteClrContext& context) c QueryApplicationId().c_str(), QueryApplicationPhysicalPath().c_str(), context.m_exceptionCode, - struStdMsg.QueryStr()); + content.c_str()); } else { @@ -476,7 +471,8 @@ IN_PROCESS_APPLICATION::UnexpectedThreadExit(const ExecuteClrContext& context) c // This will be a common place for errors as it means the hostfxr_main returned // or there was an exception. // - if (hasStdOut) + + if (!content.empty()) { EventLog::Error( ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT, @@ -484,7 +480,7 @@ IN_PROCESS_APPLICATION::UnexpectedThreadExit(const ExecuteClrContext& context) c QueryApplicationId().c_str(), QueryApplicationPhysicalPath().c_str(), context.m_exitCode, - struStdMsg.QueryStr()); + content.c_str()); } else { diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index cab7a49e9b..e2488d71e7 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -5,8 +5,8 @@ #include #include "InProcessApplicationBase.h" -#include "IOutputManager.h" #include "InProcessOptions.h" +#include "BaseOutputManager.h" class IN_PROCESS_HANDLER; typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_REQUEST_HANDLER) (IN_PROCESS_HANDLER* pInProcessHandler, void* pvRequestHandlerContext); @@ -155,7 +155,7 @@ private: static IN_PROCESS_APPLICATION* s_Application; - std::unique_ptr m_pLoggerProvider; + std::unique_ptr m_pLoggerProvider; inline static const LPCSTR s_exeLocationParameterName = "InProcessExeLocation"; diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs index e574d4f96f..d26088b018 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LoggingTests.cs @@ -4,6 +4,7 @@ using System; using System.IO; using System.Linq; +using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; @@ -68,6 +69,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); await Helpers.AssertStarts(deploymentResult, "HelloWorld"); + + StopServer(); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Could not start stdout redirection in (.*)aspnetcorev2.dll. Exception message: HRESULT 0x80070003"); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Could not stop stdout redirection in (.*)aspnetcorev2.dll. Exception message: HRESULT 0x80070002"); } [ConditionalFact] @@ -222,6 +227,48 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Contains("FORWARDING_HANDLER::", logContents); } + [ConditionalFact] + public async Task CheckUnicodePipe() + { + var path = "CheckConsoleFunctions"; + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync(path); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", "(.*)彡⾔(.*)")); + } + + [ConditionalFact] + public async Task CheckUTF8File() + { + var path = "CheckConsoleFunctions"; + + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); + + deploymentParameters.EnableLogging(_logFolderPath); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync(path); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + var contents = File.ReadAllText(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath)); + + Assert.Contains("彡⾔", contents); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", "(.*)彡⾔(.*)")); + } + private static string ReadLogs(string logPath) { using (var stream = File.Open(logPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) diff --git a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs index dbbf09f1ac..ef5b6a3a2c 100644 --- a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await AssertFailsToStart(deploymentParameters); - Assert.Contains(TestSink.Writes, context => context.Message.Contains(new string('a', 4096))); + Assert.Contains(TestSink.Writes, context => context.Message.Contains(new string('a', 30000))); } [ConditionalFact] diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index 4fb129feaf..e385f281d8 100644 --- a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -121,7 +121,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { return $"Application '/LM/W3SVC/1/ROOT' with physical root '{EscapedContentRoot(deploymentResult)}' hit unexpected managed background thread exit, exit code = '{code}'."; } - + public static string InProcessThreadExitStdOut(IISDeploymentResult deploymentResult, string code, string output) + { + return $"Application '/LM/W3SVC/1/ROOT' with physical root '{EscapedContentRoot(deploymentResult)}' hit unexpected managed background thread exit, exit code = '{code}'. Last 4KB characters of captured stdout and stderr logs:\r\n{output}"; + } + public static string FailedToStartApplication(IISDeploymentResult deploymentResult, string code) { return $"Failed to start application '/LM/W3SVC/1/ROOT', ErrorCode '{code}'."; diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/test/CommonLibTests/FileOutputManagerTests.cpp index bba9e22704..66a9ff7f0b 100644 --- a/test/CommonLibTests/FileOutputManagerTests.cpp +++ b/test/CommonLibTests/FileOutputManagerTests.cpp @@ -33,9 +33,8 @@ namespace FileOutManagerStartupTests PCWSTR expected = L"test"; auto tempDirectory = TempDirectory(); - FileOutputManager* pManager = new FileOutputManager; + FileOutputManager* pManager = new FileOutputManager(fileNamePrefix, tempDirectory.path()); - pManager->Initialize(fileNamePrefix.c_str(), tempDirectory.path().c_str()); { FileManagerWrapper wrapper(pManager); @@ -69,89 +68,84 @@ namespace FileOutManagerOutputTests { TEST(FileOutManagerOutputTest, StdOut) { - PCSTR expected = "test"; + PCWSTR expected = L"test"; auto tempDirectory = TempDirectory(); - FileOutputManager* pManager = new FileOutputManager; - pManager->Initialize(L"", tempDirectory.path().c_str()); + FileOutputManager* pManager = new FileOutputManager(L"", tempDirectory.path()); { FileManagerWrapper wrapper(pManager); - fprintf(stdout, expected); + fwprintf(stdout, expected); pManager->Stop(); - STRA straContent; - ASSERT_TRUE(pManager->GetStdOutContent(&straContent)); + auto output = pManager->GetStdOutContent(); + ASSERT_FALSE(output.empty()); - ASSERT_STREQ(straContent.QueryStr(), expected); + ASSERT_STREQ(output.c_str(), expected); } } TEST(FileOutManagerOutputTest, StdErr) { - PCSTR expected = "test"; + PCWSTR expected = L"test"; auto tempDirectory = TempDirectory(); - FileOutputManager* pManager = new FileOutputManager; - pManager->Initialize(L"", tempDirectory.path().c_str()); + FileOutputManager* pManager = new FileOutputManager(L"", tempDirectory.path().c_str()); { FileManagerWrapper wrapper(pManager); - fprintf(stderr, expected); + fwprintf(stderr, expected); pManager->Stop(); - STRA straContent; - ASSERT_TRUE(pManager->GetStdOutContent(&straContent)); + auto output = pManager->GetStdOutContent(); + ASSERT_FALSE(output.empty()); - ASSERT_STREQ(straContent.QueryStr(), expected); + ASSERT_STREQ(output.c_str(), expected); } } TEST(FileOutManagerOutputTest, CapAt30KB) { - PCSTR expected = "hello world"; + PCWSTR expected = L"hello world"; auto tempDirectory = TempDirectory(); - FileOutputManager* pManager = new FileOutputManager; - pManager->Initialize(L"", tempDirectory.path().c_str()); + FileOutputManager* pManager = new FileOutputManager(L"", tempDirectory.path()); { FileManagerWrapper wrapper(pManager); for (int i = 0; i < 3000; i++) { - printf(expected); + wprintf(expected); } pManager->Stop(); - STRA straContent; - ASSERT_TRUE(pManager->GetStdOutContent(&straContent)); + auto output = pManager->GetStdOutContent(); + ASSERT_FALSE(output.empty()); - ASSERT_EQ(straContent.QueryCCH(), 30000); + ASSERT_EQ(output.size(), 30000); } } - TEST(FileOutManagerOutputTest, StartStopRestoresCorrectly) { - PCSTR expected = "test"; + PCWSTR expected = L"test"; auto tempDirectory = TempDirectory(); for (int i = 0; i < 10; i++) { - FileOutputManager* pManager = new FileOutputManager; - pManager->Initialize(L"", tempDirectory.path().c_str()); + FileOutputManager* pManager = new FileOutputManager(L"", tempDirectory.path()); { FileManagerWrapper wrapper(pManager); - printf(expected); + wprintf(expected); pManager->Stop(); - STRA straContent; - ASSERT_TRUE(pManager->GetStdOutContent(&straContent)); + auto output = pManager->GetStdOutContent(); + ASSERT_FALSE(output.empty()); - ASSERT_STREQ(straContent.QueryStr(), expected); + ASSERT_STREQ(output.c_str(), expected); } } } diff --git a/test/CommonLibTests/PipeOutputManagerTests.cpp b/test/CommonLibTests/PipeOutputManagerTests.cpp index 20609adf72..385d6df9e0 100644 --- a/test/CommonLibTests/PipeOutputManagerTests.cpp +++ b/test/CommonLibTests/PipeOutputManagerTests.cpp @@ -26,40 +26,49 @@ namespace PipeOutputManagerTests TEST(PipeManagerOutputTest, StdOut) { PCWSTR expected = L"test"; - STRA output; PipeOutputManager* pManager = new PipeOutputManager(true); - ASSERT_EQ(S_OK, pManager->Start()); + pManager->Start(); fwprintf(stdout, expected); + pManager->Stop(); - ASSERT_EQ(S_OK, pManager->Stop()); + auto output = pManager->GetStdOutContent(); + ASSERT_STREQ(output.c_str(), expected); + delete pManager; + } - pManager->GetStdOutContent(&output); - ASSERT_STREQ(output.QueryStr(), "test"); + TEST(PipeManagerOutputTest, StdOutMultiToWide) + { + PipeOutputManager* pManager = new PipeOutputManager(true); + + pManager->Start(); + fprintf(stdout, "test"); + pManager->Stop(); + + auto output = pManager->GetStdOutContent(); + ASSERT_STREQ(output.c_str(), L"test"); delete pManager; } TEST(PipeManagerOutputTest, StdErr) { PCWSTR expected = L"test"; - STRA output; PipeOutputManager* pManager = new PipeOutputManager(); - ASSERT_EQ(S_OK, pManager->Start()); + pManager->Start(); fwprintf(stderr, expected); - ASSERT_EQ(S_OK, pManager->Stop()); + pManager->Stop(); - pManager->GetStdOutContent(&output); - ASSERT_STREQ(output.QueryStr(), "test"); + auto output = pManager->GetStdOutContent(); + ASSERT_STREQ(output.c_str(), expected); delete pManager; } TEST(PipeManagerOutputTest, CheckMaxPipeSize) { std::wstring test; - STRA output; for (int i = 0; i < 3000; i++) { test.append(L"hello world"); @@ -67,14 +76,15 @@ namespace PipeOutputManagerTests PipeOutputManager* pManager = new PipeOutputManager(); - ASSERT_EQ(S_OK, pManager->Start()); + pManager->Start(); wprintf(test.c_str()); - ASSERT_EQ(S_OK, pManager->Stop()); + pManager->Stop(); - pManager->GetStdOutContent(&output); - ASSERT_EQ(output.QueryCCH(), (DWORD)30000); + auto output = pManager->GetStdOutContent(); + ASSERT_EQ(output.size(), (DWORD)30000); delete pManager; } + TEST(PipeManagerOutputTest, SetInvalidHandlesForErrAndOut) { auto m_fdPreviousStdOut = _dup(_fileno(stdout)); @@ -86,7 +96,7 @@ namespace PipeOutputManagerTests PCWSTR expected = L"test"; PipeOutputManager* pManager = new PipeOutputManager(); - ASSERT_EQ(S_OK, pManager->Start()); + pManager->Start(); _dup2(m_fdPreviousStdOut, _fileno(stdout)); _dup2(m_fdPreviousStdErr, _fileno(stderr)); @@ -104,17 +114,16 @@ namespace PipeOutputManagerTests auto stdoutBefore = _fileno(stdout); auto stderrBefore = _fileno(stderr); PCWSTR expected = L"test"; - STRA output; PipeOutputManager* pManager = new PipeOutputManager(); - ASSERT_EQ(S_OK, pManager->Start()); + pManager->Start(); fwprintf(stdout, expected); - ASSERT_EQ(S_OK, pManager->Stop()); + pManager->Stop(); - pManager->GetStdOutContent(&output); - ASSERT_STREQ(output.QueryStr(), "test"); + auto output = pManager->GetStdOutContent(); + ASSERT_STREQ(output.c_str(), expected); ASSERT_EQ(stdoutBefore, _fileno(stdout)); ASSERT_EQ(stderrBefore, _fileno(stderr)); delete pManager; @@ -131,16 +140,15 @@ namespace PipeOutputManagerTests auto stdoutHandle = GetStdHandle(STD_OUTPUT_HANDLE); auto stderrHandle = GetStdHandle(STD_ERROR_HANDLE); PCWSTR expected = L"test"; - STRA output; PipeOutputManager* pManager = new PipeOutputManager(); - ASSERT_EQ(S_OK, pManager->Start()); + pManager->Start(); fwprintf(stderr, expected); - ASSERT_EQ(S_OK, pManager->Stop()); + pManager->Stop(); - pManager->GetStdOutContent(&output); - ASSERT_STREQ(output.QueryStr(), "test"); + auto output = pManager->GetStdOutContent(); + ASSERT_STREQ(output.c_str(), expected); ASSERT_EQ(stdoutBefore, _fileno(stdout)); ASSERT_EQ(stderrBefore, _fileno(stderr)); diff --git a/test/WebSites/StartupExceptionWebSite/Program.cs b/test/WebSites/StartupExceptionWebSite/Program.cs index 750f247481..70c0ac0108 100644 --- a/test/WebSites/StartupExceptionWebSite/Program.cs +++ b/test/WebSites/StartupExceptionWebSite/Program.cs @@ -21,10 +21,10 @@ namespace IISTestSite { // Semicolons are appended to env variables; removing them. case "CheckLargeStdOutWrites": - Console.WriteLine(new string('a', 4096)); + Console.WriteLine(new string('a', 30000)); break; case "CheckLargeStdErrWrites": - Console.Error.WriteLine(new string('a', 4096)); + Console.Error.WriteLine(new string('a', 30000)); Console.Error.Flush(); break; case "CheckLogFile": @@ -35,17 +35,16 @@ namespace IISTestSite Console.Error.Flush(); break; case "CheckOversizedStdErrWrites": - Console.WriteLine(new string('a', 5000)); + Console.WriteLine(new string('a', 31000)); break; case "CheckOversizedStdOutWrites": - Console.Error.WriteLine(new string('a', 4096)); + Console.Error.WriteLine(new string('a', 31000)); Console.Error.Flush(); break; case "Hang": Thread.Sleep(Timeout.Infinite); break; case "HangOnStop": - var host = new WebHostBuilder() .UseIIS() .UseStartup() @@ -60,6 +59,7 @@ namespace IISTestSite Console.Title = "Test"; Console.WriteLine($"Is Console redirection: {Console.IsOutputRedirected}"); Console.BackgroundColor = ConsoleColor.Blue; + Console.WriteLine("彡⾔"); break; } From 2597a2e0098daedf13787beb26f8de4d370848a1 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 6 Sep 2018 15:42:18 -0700 Subject: [PATCH 271/363] Merge QueryStatus and CreateHandler calls to make them atomic (#1359) --- .../AspNetCore/AppOfflineApplication.h | 2 +- .../AspNetCore/ApplicationFactory.h | 4 +- .../PollingAppOfflineApplication.cpp | 9 +- .../AspNetCore/PollingAppOfflineApplication.h | 8 +- .../AspNetCore/ServerErrorApplication.h | 2 +- .../AspNetCore/applicationinfo.cpp | 100 ++++++++++++------ .../AspNetCore/applicationinfo.h | 20 ++-- .../AspNetCore/proxymodule.cpp | 8 +- .../CommonLib/application.h | 27 +++-- .../CommonLib/iapplication.h | 12 +-- .../inprocesshandler.cpp | 3 +- .../forwardinghandler.cpp | 12 +-- .../forwardinghandler.h | 4 +- .../outprocessapplication.cpp | 2 +- 14 files changed, 132 insertions(+), 81 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h index 14399edaaa..2c81ae98b1 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h +++ b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h @@ -10,7 +10,7 @@ class AppOfflineApplication: public PollingAppOfflineApplication { public: - AppOfflineApplication(IHttpApplication& pApplication) + AppOfflineApplication(const IHttpApplication& pApplication) : PollingAppOfflineApplication(pApplication, PollingAppOfflineApplicationMode::StopWhenRemoved) { CheckAppOffline(); diff --git a/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h b/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h index 9d310438ef..30a0a3359b 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h +++ b/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h @@ -13,7 +13,7 @@ typedef HRESULT (WINAPI * PFN_ASPNETCORE_CREATE_APPLICATION)( _In_ IHttpServer *pServer, - _In_ IHttpApplication *pHttpApplication, + _In_ const IHttpApplication * pHttpApplication, _In_ APPLICATION_PARAMETER *pParameters, _In_ DWORD nParameters, _Out_ IAPPLICATION **pApplication @@ -31,7 +31,7 @@ public: HRESULT Execute( _In_ IHttpServer *pServer, - _In_ IHttpApplication *pHttpApplication, + _In_ const IHttpApplication *pHttpApplication, _Outptr_ IAPPLICATION **pApplication) const noexcept { std::array parameters { diff --git a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp index 382950fde4..cf2395e7b5 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp @@ -8,15 +8,20 @@ #include "HandleWrapper.h" #include "exceptions.h" -APPLICATION_STATUS PollingAppOfflineApplication::QueryStatus() +HRESULT PollingAppOfflineApplication::TryCreateHandler(_In_ IHttpContext* pHttpContext, _Outptr_result_maybenull_ IREQUEST_HANDLER** pRequestHandler) { CheckAppOffline(); - return APPLICATION::QueryStatus(); + return LOG_IF_FAILED(APPLICATION::TryCreateHandler(pHttpContext, pRequestHandler)); } void PollingAppOfflineApplication::CheckAppOffline() { + if (m_fStopCalled) + { + return; + } + const auto ulCurrentTime = GetTickCount64(); // // we only care about app offline presented. If not, it means the application has started diff --git a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h index eadd0da3b8..0f0eb58c8c 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h +++ b/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h @@ -14,7 +14,7 @@ enum PollingAppOfflineApplicationMode class PollingAppOfflineApplication: public APPLICATION { public: - PollingAppOfflineApplication(IHttpApplication& pApplication, PollingAppOfflineApplicationMode mode) + PollingAppOfflineApplication(const IHttpApplication& pApplication, PollingAppOfflineApplicationMode mode) : APPLICATION(pApplication), m_ulLastCheckTime(0), m_appOfflineLocation(GetAppOfflineLocation(pApplication)), @@ -23,8 +23,12 @@ public: { InitializeSRWLock(&m_statusLock); } + + HRESULT + TryCreateHandler( + _In_ IHttpContext *pHttpContext, + _Outptr_result_maybenull_ IREQUEST_HANDLER **pRequestHandler) override; - APPLICATION_STATUS QueryStatus() override; void CheckAppOffline(); virtual HRESULT OnAppOfflineFound() = 0; void StopInternal(bool fServerInitiated) override { UNREFERENCED_PARAMETER(fServerInitiated); } diff --git a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h index 86a9a1a0e3..df686adbc4 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h +++ b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h @@ -9,7 +9,7 @@ class ServerErrorApplication : public PollingAppOfflineApplication { public: - ServerErrorApplication(IHttpApplication& pApplication, HRESULT hr) + ServerErrorApplication(const IHttpApplication& pApplication, HRESULT hr) : m_HR(hr), PollingAppOfflineApplication(pApplication, PollingAppOfflineApplicationMode::StopWhenAdded) { diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index 225a82bdec..85bb5c6398 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -14,52 +14,77 @@ #include "AppOfflineApplication.h" HRESULT -APPLICATION_INFO::GetOrCreateApplication( +APPLICATION_INFO::CreateHandler( IHttpContext& pHttpContext, - std::unique_ptr& pApplication + std::unique_ptr& pHandler ) { HRESULT hr = S_OK; - SRWExclusiveLock lock(m_applicationLock); - - auto& httpApplication = *pHttpContext.GetApplication(); - - if (m_pApplication != nullptr) { - if (m_pApplication->QueryStatus() == RECYCLED) - { - LOG_INFO(L"Application went offline"); + SRWSharedLock lock(m_applicationLock); + + RETURN_IF_FAILED(hr = TryCreateHandler(pHttpContext, pHandler)); - // Call to wait for application to complete stopping - m_pApplication->Stop(/* fServerInitiated */ false); - m_pApplication = nullptr; - m_pApplicationFactory = nullptr; - } - else + if (hr == S_OK) { - // another thread created the application - FINISHED(S_OK); + return S_OK; + } + } + + { + SRWExclusiveLock lock(m_applicationLock); + + // check if other thread created application + RETURN_IF_FAILED(hr = TryCreateHandler(pHttpContext, pHandler)); + + // In some cases (adding and removing app_offline quickly) application might start and stop immediately + // so retry until we get valid handler or error + while (hr != S_OK) + { + // At this point application is either null or shutdown and is returning S_FALSE + + if (m_pApplication != nullptr) + { + LOG_INFO(L"Application went offline"); + + // Call to wait for application to complete stopping + m_pApplication->Stop(/* fServerInitiated */ false); + m_pApplication = nullptr; + m_pApplicationFactory = nullptr; + } + + RETURN_IF_FAILED(CreateApplication(*pHttpContext.GetApplication())); + + RETURN_IF_FAILED(hr = TryCreateHandler(pHttpContext, pHandler)); } } - if (AppOfflineApplication::ShouldBeStarted(httpApplication)) + return S_OK; +} + +HRESULT +APPLICATION_INFO::CreateApplication(const IHttpApplication& pHttpApplication) +{ + HRESULT hr = S_OK; + + if (AppOfflineApplication::ShouldBeStarted(pHttpApplication)) { LOG_INFO(L"Detected app_offline file, creating polling application"); #pragma warning( push ) #pragma warning ( disable : 26409 ) // Disable "Avoid using new", using custom deleter here - m_pApplication.reset(new AppOfflineApplication(httpApplication)); + m_pApplication.reset(new AppOfflineApplication(pHttpApplication)); #pragma warning( pop ) } else { - FINISHED_IF_FAILED(m_handlerResolver.GetApplicationFactory(httpApplication, m_pApplicationFactory)); + FINISHED_IF_FAILED(m_handlerResolver.GetApplicationFactory(pHttpApplication, m_pApplicationFactory)); LOG_INFO(L"Creating handler application"); IAPPLICATION * newApplication; FINISHED_IF_FAILED(m_pApplicationFactory->Execute( &m_pServer, - &httpApplication, + &pHttpApplication, &newApplication)); m_pApplication.reset(newApplication); @@ -67,29 +92,44 @@ APPLICATION_INFO::GetOrCreateApplication( Finished: - if (FAILED(hr)) + if (m_pApplication == nullptr || FAILED(hr)) { // Log the failure and update application info to not try again EventLog::Error( ASPNETCORE_EVENT_ADD_APPLICATION_ERROR, ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG, - httpApplication.GetApplicationId(), + pHttpApplication.GetApplicationId(), hr); #pragma warning( push ) #pragma warning ( disable : 26409 ) // Disable "Avoid using new", using custom deleter here - m_pApplication.reset(new ServerErrorApplication(httpApplication, hr)); + m_pApplication.reset(new ServerErrorApplication(pHttpApplication, hr)); #pragma warning( pop ) } - if (m_pApplication) - { - pApplication = ReferenceApplication(m_pApplication.get()); - } - return hr; } +HRESULT +APPLICATION_INFO::TryCreateHandler( + IHttpContext& pHttpContext, + std::unique_ptr& pHandler) +{ + if (m_pApplication != nullptr) + { + IREQUEST_HANDLER * newHandler; + const auto result = m_pApplication->TryCreateHandler(&pHttpContext, &newHandler); + RETURN_IF_FAILED(result); + + if (result == S_OK) + { + pHandler.reset(newHandler); + // another thread created the application + return S_OK; + } + } + return S_FALSE; +} VOID APPLICATION_INFO::ShutDownApplication(bool fServerInitiated) diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h index 998cdc5ae1..9c6d1b7cde 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h @@ -32,13 +32,13 @@ public: ~APPLICATION_INFO() = default; const std::wstring& - QueryApplicationInfoKey() const noexcept + QueryApplicationInfoKey() noexcept { return m_strInfoKey; } const std::wstring& - QueryConfigPath() const noexcept + QueryConfigPath() noexcept { return m_strConfigPath; } @@ -47,11 +47,10 @@ public: ShutDownApplication(bool fServerInitiated); HRESULT - GetOrCreateApplication( + CreateHandler( IHttpContext& pHttpContext, - std::unique_ptr& pApplication - ); - + std::unique_ptr& pHandler); + bool ConfigurationPathApplies(const std::wstring& path) { // We need to check that the last character of the config path @@ -68,6 +67,15 @@ public: } private: + + HRESULT + TryCreateHandler( + IHttpContext& pHttpContext, + std::unique_ptr& pHandler); + + HRESULT + CreateApplication(const IHttpApplication& pHttpApplication); + IHttpServer &m_pServer; HandlerResolver &m_handlerResolver; diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index c93c7c7602..8fafe13c1a 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -87,13 +87,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( *pHttpContext, m_pApplicationInfo)); - std::unique_ptr pApplication; - FINISHED_IF_FAILED(m_pApplicationInfo->GetOrCreateApplication(*pHttpContext, pApplication)); - - IREQUEST_HANDLER* pHandler; - // Create RequestHandler and process the request - FINISHED_IF_FAILED(pApplication->CreateHandler(pHttpContext, &pHandler)); - m_pHandler.reset(pHandler); + FINISHED_IF_FAILED(m_pApplicationInfo->CreateHandler(*pHttpContext, m_pHandler)); retVal = m_pHandler->OnExecuteRequestHandler(); } diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index c3d8eeb898..814be8aae6 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -7,7 +7,6 @@ #include "iapplication.h" #include "ntassert.h" #include "SRWExclusiveLock.h" -#include "SRWSharedLock.h" class APPLICATION : public IAPPLICATION { @@ -16,6 +15,26 @@ public: APPLICATION(const APPLICATION&) = delete; const APPLICATION& operator=(const APPLICATION&) = delete; + HRESULT + TryCreateHandler( + _In_ IHttpContext *pHttpContext, + _Outptr_result_maybenull_ IREQUEST_HANDLER **pRequestHandler) override + { + *pRequestHandler = nullptr; + + if (m_fStopCalled) + { + return S_FALSE; + } + + return CreateHandler(pHttpContext, pRequestHandler); + } + + virtual + HRESULT + CreateHandler( + _In_ IHttpContext *pHttpContext, + _Outptr_opt_ IREQUEST_HANDLER **pRequestHandler) = 0; APPLICATION(const IHttpApplication& pHttpApplication) : m_fStopCalled(false), @@ -28,12 +47,6 @@ public: m_applicationVirtualPath = ToVirtualPath(m_applicationConfigPath); } - APPLICATION_STATUS - QueryStatus() override - { - SRWSharedLock stateLock(m_stateLock); - return m_fStopCalled ? APPLICATION_STATUS::RECYCLED : APPLICATION_STATUS::RUNNING; - } VOID Stop(bool fServerInitiated) override diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h index 7c205ed68c..3349cb66fb 100644 --- a/src/AspNetCoreModuleV2/CommonLib/iapplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -6,12 +6,6 @@ #include #include "irequesthandler.h" -enum APPLICATION_STATUS -{ - RUNNING, - RECYCLED, -}; - struct APPLICATION_PARAMETER { LPCSTR pzName; @@ -28,10 +22,6 @@ public: virtual ~IAPPLICATION() = 0 { }; - virtual - APPLICATION_STATUS - QueryStatus() = 0; - virtual VOID ReferenceApplication() = 0; @@ -42,7 +32,7 @@ public: virtual HRESULT - CreateHandler( + TryCreateHandler( _In_ IHttpContext *pHttpContext, _Outptr_ IREQUEST_HANDLER **pRequestHandler) = 0; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 0b7357f5d2..9e7e84d7f1 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -59,8 +59,7 @@ IN_PROCESS_HANDLER::OnExecuteRequestHandler() return RQ_NOTIFICATION_FINISH_REQUEST; } - else if (m_pApplication->QueryStatus() != APPLICATION_STATUS::RUNNING || m_pApplication-> - QueryBlockCallbacksIntoManaged()) + else if (m_pApplication->QueryBlockCallbacksIntoManaged()) { return ServerShutdownMessage(); } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp index b0fa1aa03f..6dd018783b 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp @@ -24,8 +24,8 @@ RESPONSE_HEADER_HASH * FORWARDING_HANDLER::sm_pResponseHeaderHash = NULL; FORWARDING_HANDLER::FORWARDING_HANDLER( _In_ IHttpContext *pW3Context, - _In_ OUT_OF_PROCESS_APPLICATION *pApplication -) : IREQUEST_HANDLER(), + _In_ std::unique_ptr pApplication +) : REQUEST_HANDLER(), m_Signature(FORWARDING_HANDLER_SIGNATURE), m_RequestStatus(FORWARDER_START), m_fClientDisconnected(FALSE), @@ -46,7 +46,7 @@ FORWARDING_HANDLER::FORWARDING_HANDLER( m_fServerResetConn(FALSE), m_cRefs(1), m_pW3Context(pW3Context), - m_pApplication(pApplication) + m_pApplication(std::move(pApplication)) { LOG_TRACE(L"FORWARDING_HANDLER::FORWARDING_HANDLER"); @@ -100,7 +100,6 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() IHttpRequest *pRequest = m_pW3Context->GetRequest(); IHttpResponse *pResponse = m_pW3Context->GetResponse(); IHttpConnection *pClientConnection = NULL; - OUT_OF_PROCESS_APPLICATION *pApplication = NULL; PROTOCOL_CONFIG *pProtocol = &sm_ProtocolConfig; SERVER_PROCESS *pServerProcess = NULL; @@ -128,14 +127,13 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() goto Failure; } - pApplication = static_cast (m_pApplication); - if (pApplication == NULL) + if (m_pApplication == NULL) { hr = E_INVALIDARG; goto Failure; } - hr = pApplication->GetProcess(&pServerProcess); + hr = m_pApplication->GetProcess(&pServerProcess); if (FAILED_LOG(hr)) { fFailedToStartKestrel = TRUE; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h index 02516c4f71..a41b86fe50 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h @@ -22,7 +22,7 @@ class FORWARDING_HANDLER : public REQUEST_HANDLER public: FORWARDING_HANDLER( _In_ IHttpContext *pW3Context, - _In_ OUT_OF_PROCESS_APPLICATION *pApplication + _In_ std::unique_ptr pApplication ); ~FORWARDING_HANDLER(); @@ -238,6 +238,6 @@ private: mutable LONG m_cRefs; IHttpContext* m_pW3Context; - OUT_OF_PROCESS_APPLICATION* m_pApplication; + std::unique_ptr m_pApplication; HTTP_MODULE_ID m_pModuleId; }; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp index 8d3738d82f..22d0da50c9 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp @@ -72,7 +72,7 @@ OUT_OF_PROCESS_APPLICATION::CreateHandler( SetWebsocketStatus(pHttpContext); } - pHandler = new FORWARDING_HANDLER(pHttpContext, this); + pHandler = new FORWARDING_HANDLER(pHttpContext, ::ReferenceApplication(this)); *pRequestHandler = pHandler; return S_OK; } From eb6b6e58c2566ea951f77898087fdd96b236b78a Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 7 Sep 2018 10:12:38 -0700 Subject: [PATCH 272/363] Reenable tests that were throwing in Program.Main (#1379) --- build/dependencies.props | 56 +++++++++---------- .../Common.FunctionalTests/AppOfflineTests.cs | 2 +- .../InProcess/StartupTests.cs | 18 ++++++ .../StartupExceptionWebSite/Program.cs | 2 + 4 files changed, 49 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 5418510639..3377ec3b0a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,38 +5,38 @@ 0.10.13 2.2.0-preview1-20180821.1 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 0.6.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 0.6.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 15.6.82 15.6.82 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 + 2.2.0-preview3-35179 2.0.9 - 2.1.2 - 2.2.0-preview1-26618-02 + 2.1.3 + 2.2.0-preview2-26905-02 1.0.1 - 2.2.0-preview2-35143 + 2.2.0-preview3-35179 15.6.1 11.1.0 2.0.3 diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/test/Common.FunctionalTests/AppOfflineTests.cs index 53afd34504..41bf8874d9 100644 --- a/test/Common.FunctionalTests/AppOfflineTests.cs +++ b/test/Common.FunctionalTests/AppOfflineTests.cs @@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests DeletePublishOutput(deploymentResult); } - [ConditionalFact(Skip = "https://github.com/aspnet/IISIntegration/issues/933")] + [ConditionalFact] public async Task AppOfflineDroppedWhileSiteFailedToStartInRequestHandler_SiteStops_InProcess() { var deploymentResult = await DeployApp(HostingModel.InProcess); diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 4c288ef90e..0dc4e1acd6 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -145,6 +145,24 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EventLogHelpers.InProcessFailedToStart(deploymentResult, "CLR worker thread exited prematurely"), EventLogHelpers.InProcessThreadException(deploymentResult, ".*?Application is running inside IIS process but is not configured to use IIS server")); } + + [ConditionalFact] + public async Task LogsStartupExceptionExitError() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} Throw"); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/"); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.InProcessFailedToStart(deploymentResult, "CLR worker thread exited prematurely"), + EventLogHelpers.InProcessThreadException(deploymentResult, ", exception code = '0xe0434352'")); + } [ConditionalFact] public async Task LogsUnexpectedThreadExitError() diff --git a/test/WebSites/StartupExceptionWebSite/Program.cs b/test/WebSites/StartupExceptionWebSite/Program.cs index 70c0ac0108..95bac44503 100644 --- a/test/WebSites/StartupExceptionWebSite/Program.cs +++ b/test/WebSites/StartupExceptionWebSite/Program.cs @@ -44,6 +44,8 @@ namespace IISTestSite case "Hang": Thread.Sleep(Timeout.Infinite); break; + case "Throw": + throw new InvalidOperationException("Program.Main exception"); case "HangOnStop": var host = new WebHostBuilder() .UseIIS() From 9eb706e694d8b03521e16d941a983ff5af5a6541 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 9 Sep 2018 12:15:58 -0700 Subject: [PATCH 273/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 3377ec3b0a..5915e116b1 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,39 +4,39 @@ 0.10.13 - 2.2.0-preview1-20180821.1 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 0.6.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 + 2.2.0-preview1-20180907.8 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 0.6.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 15.6.82 15.6.82 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 - 2.2.0-preview3-35179 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 2.0.9 2.1.3 2.2.0-preview2-26905-02 1.0.1 - 2.2.0-preview3-35179 + 2.2.0-preview3-35202 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 524a2323d0..552300b0ce 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180821.1 -commithash:c8d0cc52cd1abb697be24e288ffd54f8fae8bf17 +version:2.2.0-preview1-20180907.8 +commithash:078918eb5c1f176ee1da351c584fb4a4d7491aa0 From 9173ec240f787459c06b9d335866c78627f2cc4e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 9 Sep 2018 19:17:04 +0000 Subject: [PATCH 274/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 70 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index a7b68a9006..231fbef9dd 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,51 +4,51 @@ 0.10.13 - 3.0.0-alpha1-20180821.3 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 0.7.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 + 3.0.0-alpha1-20180907.9 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 0.7.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 15.6.82 15.6.82 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 - 3.0.0-alpha1-10400 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 + 3.0.0-alpha1-10419 2.0.9 2.1.3 2.2.0-preview2-26905-02 1.0.1 - 3.0.0-alpha1-10400 + 3.0.0-alpha1-10419 15.6.1 11.1.0 2.0.3 - 4.6.0-preview1-26831-06 - 4.6.0-preview1-26831-06 - 4.6.0-preview1-26831-06 + 4.6.0-preview1-26905-03 + 4.6.0-preview1-26905-03 + 4.6.0-preview1-26905-03 4.6.0-preview1-26717-04 - 4.6.0-preview1-26831-06 - 4.6.0-preview1-26831-06 - 4.6.0-preview1-26831-06 - 4.6.0-preview1-26831-06 - 4.6.0-preview1-26831-06 + 4.6.0-preview1-26905-03 + 4.6.0-preview1-26905-03 + 4.6.0-preview1-26905-03 + 4.6.0-preview1-26905-03 + 4.6.0-preview1-26905-03 9.0.1 2.3.1 2.4.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 74c82096f1..86de522933 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20180821.3 -commithash:0939a90812deb1c604eb9a4768869687495fc1dd +version:3.0.0-alpha1-20180907.9 +commithash:f997365a8832ff0a3cbd9a98df45734ac2723fa0 From 3649f5bb81ef45e1e8b3ad1f9c312ed12c88d709 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 12 Sep 2018 23:20:52 -0700 Subject: [PATCH 275/363] Add OutOfProc logging tests/ merge all inproc test sites into a single site (#1384) --- IISIntegration.NoV1.sln | 28 - IISIntegration.sln | 42 - .../IIS.Performance/IIS.Performance.csproj | 8 +- .../IISDeployer.cs | 7 +- .../IISExpressDeployer.cs | 2 +- .../Inprocess/LogPipeTests.cs | 85 ++ .../Inprocess/StartupExceptionTests.cs | 18 +- .../LoggingTests.cs => LogFileTests.cs} | 205 ++- .../PublishedSitesFixture.cs | 4 - .../Utilities/EventLogHelpers.cs | 7 + .../Utilities/Helpers.cs | 10 +- .../IIS.FunctionalTests.csproj | 8 +- .../Inprocess/StdOutRedirectionTests.cs | 29 +- .../InProcess/StartupTests.cs | 21 +- .../DummyServer.cs} | 22 +- test/WebSites/InProcessWebSite/Program.cs | 111 +- .../InProcessWebSite/Startup.WebSockets.cs | 2 +- test/WebSites/InProcessWebSite/Startup.cs | 1236 ++++++++--------- test/WebSites/OutOfProcessWebSite/Program.cs | 2 +- test/WebSites/OutOfProcessWebSite/Startup.cs | 15 +- .../OverriddenServerWebSite.csproj | 18 - .../Properties/launchSettings.json | 41 - .../StartupExceptionWebSite/Program.cs | 79 -- .../Properties/launchSettings.json | 41 - .../StartupExceptionWebSite.csproj | 18 - .../StartupExceptionWebSite/web.config | 10 - .../shared/SharedStartup/Startup.shared.cs | 37 + 27 files changed, 933 insertions(+), 1173 deletions(-) create mode 100644 test/Common.FunctionalTests/Inprocess/LogPipeTests.cs rename test/Common.FunctionalTests/{Inprocess/LoggingTests.cs => LogFileTests.cs} (61%) rename test/WebSites/{OverriddenServerWebSite/Program.cs => InProcessWebSite/DummyServer.cs} (53%) delete mode 100644 test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj delete mode 100644 test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json delete mode 100644 test/WebSites/StartupExceptionWebSite/Program.cs delete mode 100644 test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json delete mode 100644 test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj delete mode 100644 test/WebSites/StartupExceptionWebSite/web.config create mode 100644 test/WebSites/shared/SharedStartup/Startup.shared.cs diff --git a/IISIntegration.NoV1.sln b/IISIntegration.NoV1.sln index 09ad7eac29..cbe801fc32 100644 --- a/IISIntegration.NoV1.sln +++ b/IISIntegration.NoV1.sln @@ -75,8 +75,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "test\TestTasks EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OverriddenServerWebSite", "test\WebSites\OverriddenServerWebSite\OverriddenServerWebSite.csproj", "{FC2A97F8-A749-4C04-97D1-97500066A820}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "test\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV2", "AspNetCoreModuleV2", "{06CA2C2B-83B0-4D83-905A-E0C74790009E}" @@ -103,8 +101,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartupExceptionWebSite", "test\WebSites\StartupExceptionWebSite\StartupExceptionWebSite.csproj", "{340C59FC-C682-4CBA-81F8-791821EC8EDE}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.vcxproj", "{CAC1267B-8778-4257-AAC6-CAF481723B01}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}" @@ -235,18 +231,6 @@ Global {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x64.Build.0 = Release|Any CPU {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x86.ActiveCfg = Release|Any CPU {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x86.Build.0 = Release|Any CPU - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|Any CPU.ActiveCfg = Debug|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|Any CPU.Build.0 = Debug|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x64.ActiveCfg = Debug|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x64.Build.0 = Debug|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x86.ActiveCfg = Debug|x86 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x86.Build.0 = Debug|x86 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.ActiveCfg = Release|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.Build.0 = Release|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x64.ActiveCfg = Release|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x64.Build.0 = Release|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x86.ActiveCfg = Release|x86 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x86.Build.0 = Release|x86 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.ActiveCfg = Debug|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.ActiveCfg = Debug|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64 @@ -331,16 +315,6 @@ Global {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.Build.0 = Release|x64 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.ActiveCfg = Release|Win32 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.Build.0 = Release|Win32 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|Any CPU.ActiveCfg = Debug|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x64.ActiveCfg = Debug|x64 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x64.Build.0 = Debug|x64 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x86.ActiveCfg = Debug|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x86.Build.0 = Debug|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|Any CPU.ActiveCfg = Release|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x64.ActiveCfg = Release|x64 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x64.Build.0 = Release|x64 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x86.ActiveCfg = Release|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x86.Build.0 = Release|x86 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.ActiveCfg = Debug|Win32 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.ActiveCfg = Debug|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.Build.0 = Debug|x64 @@ -424,7 +398,6 @@ Global {13FD8F12-FFBE-4D01-B4AC-444F2994B04F} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {064D860B-4D7C-4B1D-918F-E020F1B99E2A} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {FC2A97F8-A749-4C04-97D1-97500066A820} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {06CA2C2B-83B0-4D83-905A-E0C74790009E} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} @@ -434,7 +407,6 @@ Global {48F46909-E76A-4788-BCE1-E543C0E140FE} = {622D35C9-627B-466E-8D15-752968CC79AF} {D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} - {340C59FC-C682-4CBA-81F8-791821EC8EDE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {D182103F-8405-4647-B158-C36F598657EF} = {EF30B533-D715-421A-92B7-92FEF460AC9C} diff --git a/IISIntegration.sln b/IISIntegration.sln index b47fed50fa..34a5050f7e 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -77,8 +77,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "test\TestTasks EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OverriddenServerWebSite", "test\WebSites\OverriddenServerWebSite\OverriddenServerWebSite.csproj", "{FC2A97F8-A749-4C04-97D1-97500066A820}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "test\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModuleV1", "AspNetCoreModuleV1", "{16E521CE-77F1-4B1C-A183-520A41C4F372}" @@ -111,8 +109,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartupExceptionWebSite", "test\WebSites\StartupExceptionWebSite\StartupExceptionWebSite.csproj", "{340C59FC-C682-4CBA-81F8-791821EC8EDE}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.vcxproj", "{CAC1267B-8778-4257-AAC6-CAF481723B01}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}" @@ -321,26 +317,6 @@ Global {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x64.Build.0 = Release|Any CPU {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x86.ActiveCfg = Release|Any CPU {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x86.Build.0 = Release|Any CPU - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|Any CPU.ActiveCfg = Debug|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|Any CPU.Build.0 = Debug|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x64.ActiveCfg = Debug|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x64.Build.0 = Debug|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x86.ActiveCfg = Debug|x86 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x86.Build.0 = Debug|x86 - {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeDebug|Any CPU.ActiveCfg = Debug|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeDebug|Any CPU.Build.0 = Debug|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeDebug|x64.ActiveCfg = Debug|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeDebug|x86.ActiveCfg = Debug|x86 - {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeRelease|Any CPU.ActiveCfg = Release|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeRelease|Any CPU.Build.0 = Release|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeRelease|x64.ActiveCfg = Release|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.NativeRelease|x86.ActiveCfg = Release|x86 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.ActiveCfg = Release|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.Build.0 = Release|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x64.ActiveCfg = Release|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x64.Build.0 = Release|x64 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x86.ActiveCfg = Release|x86 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x86.Build.0 = Release|x86 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.ActiveCfg = Debug|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.ActiveCfg = Debug|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64 @@ -541,22 +517,6 @@ Global {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.Build.0 = Release|x64 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.ActiveCfg = Release|Win32 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.Build.0 = Release|Win32 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|Any CPU.ActiveCfg = Debug|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x64.ActiveCfg = Debug|x64 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x64.Build.0 = Debug|x64 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x86.ActiveCfg = Debug|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Debug|x86.Build.0 = Debug|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.NativeDebug|Any CPU.ActiveCfg = Debug|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.NativeDebug|x64.ActiveCfg = Debug|x64 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.NativeDebug|x86.ActiveCfg = Debug|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.NativeRelease|Any CPU.ActiveCfg = Release|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.NativeRelease|x64.ActiveCfg = Release|x64 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.NativeRelease|x86.ActiveCfg = Release|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|Any CPU.ActiveCfg = Release|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x64.ActiveCfg = Release|x64 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x64.Build.0 = Release|x64 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x86.ActiveCfg = Release|x86 - {340C59FC-C682-4CBA-81F8-791821EC8EDE}.Release|x86.Build.0 = Release|x86 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.ActiveCfg = Debug|Win32 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.ActiveCfg = Debug|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.Build.0 = Debug|x64 @@ -692,7 +652,6 @@ Global {13FD8F12-FFBE-4D01-B4AC-444F2994B04F} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {064D860B-4D7C-4B1D-918F-E020F1B99E2A} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} = {EF30B533-D715-421A-92B7-92FEF460AC9C} - {FC2A97F8-A749-4C04-97D1-97500066A820} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {16E521CE-77F1-4B1C-A183-520A41C4F372} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {06CA2C2B-83B0-4D83-905A-E0C74790009E} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} @@ -705,7 +664,6 @@ Global {48F46909-E76A-4788-BCE1-E543C0E140FE} = {622D35C9-627B-466E-8D15-752968CC79AF} {D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} - {340C59FC-C682-4CBA-81F8-791821EC8EDE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712} = {EF30B533-D715-421A-92B7-92FEF460AC9C} diff --git a/benchmarks/IIS.Performance/IIS.Performance.csproj b/benchmarks/IIS.Performance/IIS.Performance.csproj index b7aa1dc3ac..6373cfdfa7 100644 --- a/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -26,7 +26,13 @@ - + + False + + + False + + False diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index b1394bccb5..5a8519926c 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -115,6 +115,10 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS protected override IEnumerable> GetWebConfigActions() { + yield return WebConfigHelpers.AddOrModifyAspNetCoreSection( + key: "hostingModel", + value: DeploymentParameters.HostingModel.ToString()); + if (DeploymentParameters.ApplicationType == ApplicationType.Portable) { yield return WebConfigHelpers.AddOrModifyAspNetCoreSection( @@ -126,15 +130,12 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS key: "modules", value: DeploymentParameters.AncmVersion.ToString()); - foreach (var action in base.GetWebConfigActions()) { yield return action; } } - - private void GetLogsFromFile() { try diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index 56d4afb46b..8139a0f6b9 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -342,7 +342,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS // For published apps, prefer the content in the web.config, but update it. yield return WebConfigHelpers.AddOrModifyAspNetCoreSection( key: "hostingModel", - value: DeploymentParameters.HostingModel == HostingModel.InProcess ? "inprocess" : ""); + value: DeploymentParameters.HostingModel.ToString()); yield return WebConfigHelpers.AddOrModifyHandlerSection( key: "modules", diff --git a/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs b/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs new file mode 100644 index 0000000000..ed48204385 --- /dev/null +++ b/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs @@ -0,0 +1,85 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.IO; +using System.Net; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class LogPipeTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public LogPipeTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [InlineData("ConsoleErrorWrite")] + [InlineData("ConsoleWrite")] + public async Task CheckStdoutLoggingToPipe_DoesNotCrashProcess(string path) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var deploymentResult = await DeployAsync(deploymentParameters); + + await Helpers.AssertStarts(deploymentResult, path); + + StopServer(); + + if (deploymentParameters.ServerType == ServerType.IISExpress) + { + Assert.Contains(TestSink.Writes, context => context.Message.Contains("TEST MESSAGE")); + } + } + + [ConditionalTheory] + [InlineData("ConsoleErrorWrite")] + [InlineData("ConsoleWrite")] + public async Task CheckStdoutLoggingToPipeWithFirstWrite(string path) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + + var firstWriteString = path + path; + + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_INITIAL_WRITE"] = firstWriteString; + + var deploymentResult = await DeployAsync(deploymentParameters); + + await Helpers.AssertStarts(deploymentResult, path); + + StopServer(); + + if (deploymentParameters.ServerType == ServerType.IISExpress) + { + // We can't read stdout logs from IIS as they aren't redirected. + Assert.Contains(TestSink.Writes, context => context.Message.Contains(firstWriteString)); + Assert.Contains(TestSink.Writes, context => context.Message.Contains("TEST MESSAGE")); + } + } + + [ConditionalFact] + public async Task CheckUnicodePipe() + { + var path = "CheckConsoleFunctions"; + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync(path); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", "(.*)彡⾔(.*)")); + } + } +} diff --git a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs index ef5b6a3a2c..0c69f10c03 100644 --- a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -22,11 +22,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalTheory] - [InlineData("CheckLogFile")] - [InlineData("CheckErrLogFile")] + [InlineData("ConsoleWrite")] + [InlineData("ConsoleErrorWrite")] public async Task CheckStdoutWithRandomNumber(string mode) { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); var randomNumberString = new Random(Guid.NewGuid().GetHashCode()).Next(10000000).ToString(); deploymentParameters.TransformArguments((a, _) => $"{a} {mode} {randomNumberString}"); @@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [InlineData("CheckOversizedStdOutWrites")] public async Task CheckStdoutWithLargeWrites(string mode) { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); deploymentParameters.TransformArguments((a, _) => $"{a} {mode}"); await AssertFailsToStart(deploymentParameters); @@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task CheckValidConsoleFunctions() { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); deploymentParameters.TransformArguments((a, _) => $"{a} CheckConsoleFunctions"); await AssertFailsToStart(deploymentParameters); @@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Contains(TestSink.Writes, context => context.Message.Contains("Is Console redirection: True")); } - private async Task AssertFailsToStart(IntegrationTesting.IIS.IISDeploymentParameters deploymentParameters) + private async Task AssertFailsToStart(IISDeploymentParameters deploymentParameters) { var deploymentResult = await DeployAsync(deploymentParameters); @@ -76,17 +76,17 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task Gets500_30_ErrorPage() { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} EarlyReturn"); var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.HttpClient.GetAsync("/"); + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); Assert.False(response.IsSuccessStatusCode); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); var responseText = await response.Content.ReadAsStringAsync(); Assert.Contains("500.30 - ANCM In-Process Start Failure", responseText); } - } } diff --git a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs b/test/Common.FunctionalTests/LogFileTests.cs similarity index 61% rename from test/Common.FunctionalTests/Inprocess/LoggingTests.cs rename to test/Common.FunctionalTests/LogFileTests.cs index d26088b018..be8d8e700c 100644 --- a/test/Common.FunctionalTests/Inprocess/LoggingTests.cs +++ b/test/Common.FunctionalTests/LogFileTests.cs @@ -3,7 +3,6 @@ using System; using System.IO; -using System.Linq; using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; @@ -35,31 +34,49 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } - [ConditionalTheory] - [InlineData("CheckErrLogFile")] - [InlineData("CheckLogFile")] - public async Task CheckStdoutLoggingToFile(string path) - { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22) + .WithAllApplicationTypes() + .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) + .WithAllHostingModels(); + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task CheckStdoutLoggingToFile(TestVariant variant) + { + await CheckStdoutToFile(variant, "ConsoleWrite"); + } + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task CheckStdoutErrLoggingToFile(TestVariant variant) + { + await CheckStdoutToFile(variant, "ConsoleErrorWrite"); + } + + private async Task CheckStdoutToFile(TestVariant variant, string path) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); deploymentParameters.EnableLogging(_logFolderPath); var deploymentResult = await DeployAsync(deploymentParameters); - - await Helpers.AssertStarts(deploymentResult, path); + await Helpers.AssertStarts(deploymentResult, path); + StopServer(); var contents = File.ReadAllText(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath)); - Assert.NotNull(contents); Assert.Contains("TEST MESSAGE", contents); } - [ConditionalFact] - public async Task InvalidFilePathForLogs_ServerStillRuns() + // Move to separate file + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task InvalidFilePathForLogs_ServerStillRuns(TestVariant variant) { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); deploymentParameters.WebConfigActionList.Add( WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogEnabled", "true")); @@ -71,29 +88,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await Helpers.AssertStarts(deploymentResult, "HelloWorld"); StopServer(); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Could not start stdout redirection in (.*)aspnetcorev2.dll. Exception message: HRESULT 0x80070003"); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Could not stop stdout redirection in (.*)aspnetcorev2.dll. Exception message: HRESULT 0x80070002"); + if (variant.HostingModel == HostingModel.InProcess) + { + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Could not start stdout redirection in (.*)aspnetcorev2.dll. Exception message: HRESULT 0x80070003"); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Could not stop stdout redirection in (.*)aspnetcorev2.dll. Exception message: HRESULT 0x80070002"); + } } - [ConditionalFact] - public async Task OnlyOneFileCreatedWithProcessStartTime() + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task StartupMessagesAreLoggedIntoDebugLogFile(TestVariant variant) { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); - - deploymentParameters.EnableLogging(_logFolderPath); - - var deploymentResult = await DeployAsync(deploymentParameters); - await Helpers.AssertStarts(deploymentResult, "CheckLogFile"); - - StopServer(); - - Assert.Single(Directory.GetFiles(_logFolderPath), Helpers.GetExpectedLogName(deploymentResult, _logFolderPath)); - } - - [ConditionalFact] - public async Task StartupMessagesAreLoggedIntoDebugLogFile() - { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); deploymentParameters.HandlerSettings["debugLevel"] = "file"; deploymentParameters.HandlerSettings["debugFile"] = "debug.txt"; @@ -104,10 +110,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests AssertLogs(Path.Combine(deploymentResult.ContentRoot, "debug.txt")); } - [ConditionalFact] - public async Task StartupMessagesAreLoggedIntoDefaultDebugLogFile() + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task StartupMessagesAreLoggedIntoDefaultDebugLogFile(TestVariant variant) { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); deploymentParameters.HandlerSettings["debugLevel"] = "file"; var deploymentResult = await DeployAsync(deploymentParameters); @@ -117,11 +124,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests AssertLogs(Path.Combine(deploymentResult.ContentRoot, "aspnetcore-debug.log")); } - [ConditionalFact] + [ConditionalTheory] [RequiresIIS(IISCapability.PoolEnvironmentVariables)] - public async Task StartupMessagesAreLoggedIntoDefaultDebugLogFileWhenEnabledWithEnvVar() + [MemberData(nameof(TestVariants))] + public async Task StartupMessagesAreLoggedIntoDefaultDebugLogFileWhenEnabledWithEnvVar(TestVariant variant) { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG"] = "file"; // Add empty debugFile handler setting to prevent IIS deployer from overriding debug settings deploymentParameters.HandlerSettings["debugFile"] = ""; @@ -133,58 +141,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalTheory] - [InlineData("CheckErrLogFile")] - [InlineData("CheckLogFile")] - public async Task CheckStdoutLoggingToPipe_DoesNotCrashProcess(string path) - { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); - var deploymentResult = await DeployAsync(deploymentParameters); - - await Helpers.AssertStarts(deploymentResult, path); - - StopServer(); - - if (deploymentParameters.ServerType == ServerType.IISExpress) - { - Assert.Contains(TestSink.Writes, context => context.Message.Contains("TEST MESSAGE")); - } - } - - [ConditionalTheory] - [InlineData("CheckErrLogFile")] - [InlineData("CheckLogFile")] - public async Task CheckStdoutLoggingToPipeWithFirstWrite(string path) - { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); - - var firstWriteString = path + path; - - deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_INITIAL_WRITE"] = firstWriteString; - - var deploymentResult = await DeployAsync(deploymentParameters); - - await Helpers.AssertStarts(deploymentResult, path); - - StopServer(); - - if (deploymentParameters.ServerType == ServerType.IISExpress) - { - // We can't read stdout logs from IIS as they aren't redirected. - Assert.Contains(TestSink.Writes, context => context.Message.Contains(firstWriteString)); - Assert.Contains(TestSink.Writes, context => context.Message.Contains("TEST MESSAGE")); - } - } - - [ConditionalFact] [RequiresIIS(IISCapability.PoolEnvironmentVariables)] - public async Task StartupMessagesLogFileSwitchedWhenLogFilePresentInWebConfig() + [MemberData(nameof(TestVariants))] + public async Task StartupMessagesLogFileSwitchedWhenLogFilePresentInWebConfig(TestVariant variant) { var firstTempFile = Path.GetTempFileName(); var secondTempFile = Path.GetTempFileName(); try { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"] = firstTempFile; deploymentParameters.AddDebugLogToWebConfig(secondTempFile); @@ -205,68 +171,65 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } - [ConditionalFact] - public async Task DebugLogsAreWrittenToEventLog() + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + + public async Task DebugLogsAreWrittenToEventLog(TestVariant variant) { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); deploymentParameters.HandlerSettings["debugLevel"] = "file,eventlog"; var deploymentResult = await StartAsync(deploymentParameters); StopServer(); EventLogHelpers.VerifyEventLogEvent(deploymentResult, @"\[aspnetcorev2.dll\] Initializing logs for .*?Description: IIS ASP.NET Core Module V2"); } - [ConditionalFact] - public async Task OutOfProcessReadsLogConfiguration() - { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel:HostingModel.OutOfProcess, publish: true); - deploymentParameters.HandlerSettings["debugLevel"] = "file,trace"; - deploymentParameters.HandlerSettings["debugFile"] = ""; - var deploymentResult = await StartAsync(deploymentParameters); - - var logContents = ReadLogs(Path.Combine(deploymentResult.ContentRoot, "aspnetcore-debug.log")); - Assert.Contains("FORWARDING_HANDLER::", logContents); - } - - [ConditionalFact] - public async Task CheckUnicodePipe() + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task CheckUTF8File(TestVariant variant) { var path = "CheckConsoleFunctions"; - var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); - deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); + + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, variant.HostingModel, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); // For standalone this will need to remove space + + var logFolderPath = _logFolderPath + "\\彡⾔"; + deploymentParameters.EnableLogging(logFolderPath); var deploymentResult = await DeployAsync(deploymentParameters); var response = await deploymentResult.HttpClient.GetAsync(path); - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.False(response.IsSuccessStatusCode); StopServer(); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", "(.*)彡⾔(.*)")); + + var contents = File.ReadAllText(Helpers.GetExpectedLogName(deploymentResult, logFolderPath)); + Assert.Contains("彡⾔", contents); + + if (variant.HostingModel == HostingModel.InProcess) + { + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", "(.*)彡⾔(.*)")); + } + else + { + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.OutOfProcessFailedToStart(deploymentResult)); + } } - [ConditionalFact] - public async Task CheckUTF8File() + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task OnlyOneFileCreatedWithProcessStartTime(TestVariant variant) { - var path = "CheckConsoleFunctions"; - - var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); - deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); deploymentParameters.EnableLogging(_logFolderPath); var deploymentResult = await DeployAsync(deploymentParameters); - - var response = await deploymentResult.HttpClient.GetAsync(path); - - Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + await Helpers.AssertStarts(deploymentResult, "ConsoleWrite"); StopServer(); - var contents = File.ReadAllText(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath)); - - Assert.Contains("彡⾔", contents); - - EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", "(.*)彡⾔(.*)")); + Assert.Single(Directory.GetFiles(_logFolderPath), Helpers.GetExpectedLogName(deploymentResult, _logFolderPath)); } private static string ReadLogs(string logPath) @@ -282,7 +245,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var logContents = ReadLogs(logPath); Assert.Contains("[aspnetcorev2.dll]", logContents); - Assert.Contains("[aspnetcorev2_inprocess.dll]", logContents); + Assert.True(logContents.Contains("[aspnetcorev2_inprocess.dll]") || logContents.Contains("[aspnetcorev2_outofprocess.dll]")); Assert.Contains("Description: IIS ASP.NET Core Module V2. Commit:", logContents); Assert.Contains("Description: IIS ASP.NET Core Module V2 Request Handler. Commit:", logContents); } diff --git a/test/Common.FunctionalTests/PublishedSitesFixture.cs b/test/Common.FunctionalTests/PublishedSitesFixture.cs index 64e39e68df..1ebfdab38e 100644 --- a/test/Common.FunctionalTests/PublishedSitesFixture.cs +++ b/test/Common.FunctionalTests/PublishedSitesFixture.cs @@ -21,15 +21,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public CachingApplicationPublisher InProcessTestSite { get; } = new CachingApplicationPublisher(Helpers.GetInProcessTestSitesPath()); public CachingApplicationPublisher OutOfProcessTestSite { get; } = new CachingApplicationPublisher(Helpers.GetOutOfProcessTestSitesPath()); - public CachingApplicationPublisher StartupExceptionWebsite { get; } = new CachingApplicationPublisher(Helpers.GetTestWebSitePath("StartupExceptionWebsite")); - public CachingApplicationPublisher OverriddenServerWebSite { get; } = new CachingApplicationPublisher(Helpers.GetTestWebSitePath("OverriddenServerWebSite")); public void Dispose() { InProcessTestSite.Dispose(); OutOfProcessTestSite.Dispose(); - StartupExceptionWebsite.Dispose(); - OverriddenServerWebSite.Dispose(); } public IISDeploymentParameters GetBaseDeploymentParameters(HostingModel hostingModel = HostingModel.InProcess, bool publish = false) diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index e385f281d8..aa3453fe9b 100644 --- a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -136,6 +136,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return $"Configuration load error. {reason}"; } + public static string OutOfProcessFailedToStart(IISDeploymentResult deploymentResult) + { + return $"Application '/LM/W3SVC/1/ROOT' with physical root '{EscapedContentRoot(deploymentResult)}' failed to start process with " + + $"commandline '(.*)' with multiple retries. " + + $"The last try of listening port is '(.*)'. See previous warnings for details."; + } + private static string EscapedContentRoot(IISDeploymentResult deploymentResult) { var contentRoot = deploymentResult.ContentRoot; diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 27155effcc..ccaecbceff 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -146,10 +146,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string GetExpectedLogName(IISDeploymentResult deploymentResult, string logFolderPath) { var startTime = deploymentResult.HostProcess.StartTime.ToUniversalTime(); - return Path.Combine(logFolderPath, $"std_{startTime.Year}{startTime.Month:D2}" + + + if (deploymentResult.DeploymentParameters.HostingModel == HostingModel.InProcess) + { + return Path.Combine(logFolderPath, $"std_{startTime.Year}{startTime.Month:D2}" + $"{startTime.Day:D2}{startTime.Hour:D2}" + $"{startTime.Minute:D2}{startTime.Second:D2}_" + $"{deploymentResult.HostProcess.Id}.log"); + } + else + { + return Directory.GetFiles(logFolderPath).Single(); + } } } } diff --git a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index 723433b707..0114f027ca 100644 --- a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -13,7 +13,13 @@ - + + False + + + False + + False diff --git a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs index fea6d3b5fb..1098384c9b 100644 --- a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs +++ b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; -using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Newtonsoft.Json; @@ -40,13 +39,13 @@ namespace IIS.FunctionalTests.Inprocess [SkipIfDebug] public async Task FrameworkNotFoundExceptionLogged_Pipe() { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); var deploymentResult = await DeployAsync(deploymentParameters); InvalidateRuntimeConfig(deploymentResult); - var response = await deploymentResult.HttpClient.GetAsync("/"); + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); Assert.False(response.IsSuccessStatusCode); StopServer(); @@ -60,7 +59,7 @@ namespace IIS.FunctionalTests.Inprocess public async Task FrameworkNotFoundExceptionLogged_File() { var deploymentParameters = - _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); deploymentParameters.EnableLogging(_logFolderPath); @@ -68,7 +67,7 @@ namespace IIS.FunctionalTests.Inprocess InvalidateRuntimeConfig(deploymentResult); - var response = await deploymentResult.HttpClient.GetAsync("/"); + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); Assert.False(response.IsSuccessStatusCode); StopServer(); @@ -85,14 +84,16 @@ namespace IIS.FunctionalTests.Inprocess public async Task EnableCoreHostTraceLogging_TwoLogFilesCreated() { var deploymentParameters = - _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} CheckLargeStdOutWrites"); + deploymentParameters.EnvironmentVariables["COREHOST_TRACE"] = "1"; deploymentParameters.EnableLogging(_logFolderPath); var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.HttpClient.GetAsync("/"); + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); Assert.False(response.IsSuccessStatusCode); StopServer(); @@ -112,13 +113,13 @@ namespace IIS.FunctionalTests.Inprocess [InlineData("CheckOversizedStdOutWrites")] public async Task EnableCoreHostTraceLogging_PipeCaptureNativeLogs(string path) { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); deploymentParameters.EnvironmentVariables["COREHOST_TRACE"] = "1"; - deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.HttpClient.GetAsync("/"); + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); Assert.False(response.IsSuccessStatusCode); @@ -137,15 +138,15 @@ namespace IIS.FunctionalTests.Inprocess public async Task EnableCoreHostTraceLogging_FileCaptureNativeLogs(string path) { var deploymentParameters = - _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); deploymentParameters.EnvironmentVariables["COREHOST_TRACE"] = "1"; - deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path; + deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); deploymentParameters.EnableLogging(_logFolderPath); var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.HttpClient.GetAsync("/"); + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); Assert.False(response.IsSuccessStatusCode); StopServer(); @@ -159,7 +160,7 @@ namespace IIS.FunctionalTests.Inprocess private static void InvalidateRuntimeConfig(IISDeploymentResult deploymentResult) { - var path = Path.Combine(deploymentResult.ContentRoot, "StartupExceptionWebSite.runtimeconfig.json"); + var path = Path.Combine(deploymentResult.ContentRoot, "InProcessWebSite.runtimeconfig.json"); dynamic depsFileContent = JsonConvert.DeserializeObject(File.ReadAllText(path)); depsFileContent["runtimeOptions"]["framework"]["version"] = "2.9.9"; var output = JsonConvert.SerializeObject(depsFileContent); diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 0dc4e1acd6..9f115e324f 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -133,9 +133,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] - public async Task DetectsOveriddenServer() + public async Task DetectsOverriddenServer() { - var deploymentResult = await DeployAsync(_fixture.GetBaseDeploymentParameters(_fixture.OverriddenServerWebSite, publish: true)); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} OverriddenServer"); + + var deploymentResult = await DeployAsync(deploymentParameters); var response = await deploymentResult.HttpClient.GetAsync("/"); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); @@ -149,7 +152,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task LogsStartupExceptionExitError() { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); deploymentParameters.TransformArguments((a, _) => $"{a} Throw"); var deploymentResult = await DeployAsync(deploymentParameters); @@ -167,9 +170,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task LogsUnexpectedThreadExitError() { - var deploymentResult = await DeployAsync(_fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true)); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} EarlyReturn"); + var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.HttpClient.GetAsync("/"); + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); StopServer(); @@ -182,7 +187,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task StartupTimeoutIsApplied() { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); deploymentParameters.TransformArguments((a, _) => $"{a} Hang"); deploymentParameters.WebConfigActionList.Add( WebConfigHelpers.AddOrModifyAspNetCoreSection("startupTimeLimit", "1")); @@ -202,14 +207,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task ShutdownTimeoutIsApplied() { - var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); deploymentParameters.TransformArguments((a, _) => $"{a} HangOnStop"); deploymentParameters.WebConfigActionList.Add( WebConfigHelpers.AddOrModifyAspNetCoreSection("shutdownTimeLimit", "1")); var deploymentResult = await DeployAsync(deploymentParameters); - Assert.Equal("OK", await deploymentResult.HttpClient.GetStringAsync("/")); + Assert.Equal("Hello World", await deploymentResult.HttpClient.GetStringAsync("/HelloWorld")); StopServer(); diff --git a/test/WebSites/OverriddenServerWebSite/Program.cs b/test/WebSites/InProcessWebSite/DummyServer.cs similarity index 53% rename from test/WebSites/OverriddenServerWebSite/Program.cs rename to test/WebSites/InProcessWebSite/DummyServer.cs index 2b68c93af4..d122f05776 100644 --- a/test/WebSites/OverriddenServerWebSite/Program.cs +++ b/test/WebSites/InProcessWebSite/DummyServer.cs @@ -4,30 +4,12 @@ using System; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; -using Microsoft.Extensions.DependencyInjection; -namespace IISTestSite +namespace TestSite { - public static class Program - { - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .UseIIS() - .ConfigureServices(services => services.AddSingleton()) - .Configure(builder => builder.Run(async context => { await context.Response.WriteAsync("I shouldn't work"); })) - .Build(); - - host.Run(); - } - } - - public class DummyServer: IServer + public class DummyServer : IServer { public void Dispose() { diff --git a/test/WebSites/InProcessWebSite/Program.cs b/test/WebSites/InProcessWebSite/Program.cs index ec9ed04f87..f7abe535ae 100644 --- a/test/WebSites/InProcessWebSite/Program.cs +++ b/test/WebSites/InProcessWebSite/Program.cs @@ -2,33 +2,108 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Linq; +using System.Text; +using System.Threading; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace IISTestSite +namespace TestSite { public static class Program { - public static void Main(string[] args) + public static int Main(string[] args) { - var envVariable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_INITIAL_WRITE"); - if (!string.IsNullOrEmpty(envVariable)) + var mode = args.FirstOrDefault(); + switch (mode) { - Console.WriteLine(envVariable); - Console.Error.WriteLine(envVariable); + // Semicolons are appended to env variables; removing them. + case "CheckLargeStdOutWrites": + Console.WriteLine(new string('a', 30000)); + break; + case "CheckLargeStdErrWrites": + Console.Error.WriteLine(new string('a', 30000)); + Console.Error.Flush(); + break; + case "ConsoleWrite": + Console.WriteLine($"Random number: {args[1]}"); + break; + case "ConsoleErrorWrite": + Console.Error.WriteLine($"Random number: {args[1]}"); + Console.Error.Flush(); + break; + case "CheckOversizedStdErrWrites": + Console.WriteLine(new string('a', 31000)); + break; + case "CheckOversizedStdOutWrites": + Console.Error.WriteLine(new string('a', 31000)); + Console.Error.Flush(); + break; + case "Hang": + Thread.Sleep(Timeout.Infinite); + break; + case "Throw": + throw new InvalidOperationException("Program.Main exception"); + case "EarlyReturn": + return 12; + case "HangOnStop": + { + var host = new WebHostBuilder() + .UseIIS() + .UseStartup() + .Build(); + host.Run(); + + Thread.Sleep(Timeout.Infinite); + } + break; + case "CheckConsoleFunctions": + // Call a bunch of console functions and make sure none return invalid handle. + Console.OutputEncoding = Encoding.UTF8; + Console.Title = "Test"; + Console.WriteLine($"Is Console redirection: {Console.IsOutputRedirected}"); + Console.BackgroundColor = ConsoleColor.Blue; + Console.WriteLine("彡⾔"); + break; + case "OverriddenServer": + { + var host = new WebHostBuilder() + .UseIIS() + .ConfigureServices(services => services.AddSingleton()) + .Configure(builder => builder.Run(async context => { await context.Response.WriteAsync("I shouldn't work"); })) + .Build(); + host.Run(); + } + break; + default: + { + + var envVariable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_INITIAL_WRITE"); + if (!string.IsNullOrEmpty(envVariable)) + { + Console.WriteLine(envVariable); + Console.Error.WriteLine(envVariable); + } + + var host = new WebHostBuilder() + .ConfigureLogging((_, factory) => + { + factory.AddConsole(); + factory.AddFilter("Console", level => level >= LogLevel.Information); + }) + .UseIIS() + .UseStartup() + .Build(); + + host.Run(); + return 0; + } } - - var host = new WebHostBuilder() - .ConfigureLogging((_, factory) => - { - factory.AddConsole(); - factory.AddFilter("Console", level => level >= LogLevel.Information); - }) - .UseIIS() - .UseStartup() - .Build(); - - host.Run(); + return 12; } } } diff --git a/test/WebSites/InProcessWebSite/Startup.WebSockets.cs b/test/WebSites/InProcessWebSite/Startup.WebSockets.cs index e83ae2a72f..d658ebd03f 100644 --- a/test/WebSites/InProcessWebSite/Startup.WebSockets.cs +++ b/test/WebSites/InProcessWebSite/Startup.WebSockets.cs @@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.DependencyInjection; using Xunit; -namespace IISTestSite +namespace TestSite { public partial class Startup { diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index 08837417bf..7bd530a9f9 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -18,7 +18,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Primitives; using Xunit; -namespace IISTestSite +namespace TestSite { public partial class Startup { @@ -27,746 +27,622 @@ namespace IISTestSite TestStartup.Register(app, this); } - private void ServerVariable(IApplicationBuilder app) + private async Task ServerVariable(HttpContext ctx) { - app.Run(async ctx => + var varName = ctx.Request.Query["q"]; + await ctx.Response.WriteAsync($"{varName}: {ctx.GetIISServerVariable(varName) ?? "(null)"}"); + } + + private async Task AuthenticationAnonymous(HttpContext ctx) + { + await ctx.Response.WriteAsync("Anonymous?" + !ctx.User.Identity.IsAuthenticated); + } + + private async Task AuthenticationRestricted(HttpContext ctx) + { + if (ctx.User.Identity.IsAuthenticated) { - var varName = ctx.Request.Query["q"]; - await ctx.Response.WriteAsync($"{varName}: {ctx.GetIISServerVariable(varName) ?? "(null)"}"); - }); - } - - public void AuthenticationAnonymous(IApplicationBuilder app) - { - app.Run(async ctx => + await ctx.Response.WriteAsync(ctx.User.Identity.AuthenticationType); + } + else { - await ctx.Response.WriteAsync("Anonymous?" + !ctx.User.Identity.IsAuthenticated); - }); - } - - private async Task HostingEnvironment(HttpContext context) - { - var hostingEnv = context.RequestServices.GetService(); - - await context.Response.WriteAsync("ContentRootPath "+hostingEnv.ContentRootPath + Environment.NewLine); - await context.Response.WriteAsync("WebRootPath "+hostingEnv.WebRootPath + Environment.NewLine); - await context.Response.WriteAsync("CurrentDirectory "+Environment.CurrentDirectory); - } - - private void AuthenticationRestricted(IApplicationBuilder app) - { - app.Run(async ctx => - { - if (ctx.User.Identity.IsAuthenticated) - { - await ctx.Response.WriteAsync(ctx.User.Identity.AuthenticationType); - } - else - { - await ctx.ChallengeAsync(IISServerDefaults.AuthenticationScheme); - } - }); - } - - public void AuthenticationForbidden(IApplicationBuilder app) - { - app.Run(async ctx => - { - await ctx.ForbidAsync(IISServerDefaults.AuthenticationScheme); - }); - } - - public void AuthenticationRestrictedNTLM(IApplicationBuilder app) - { - app.Run(async ctx => - { - if (string.Equals("NTLM", ctx.User.Identity.AuthenticationType, StringComparison.Ordinal)) - { - await ctx.Response.WriteAsync("NTLM"); - } - else - { - await ctx.ChallengeAsync(IISServerDefaults.AuthenticationScheme); - } - }); - } - - private void FeatureCollectionSetRequestFeatures(IApplicationBuilder app) - { - app.Run(async context => - { - try - { - Assert.Equal("GET", context.Request.Method); - context.Request.Method = "test"; - Assert.Equal("test", context.Request.Method); - - Assert.Equal("http", context.Request.Scheme); - context.Request.Scheme = "test"; - Assert.Equal("test", context.Request.Scheme); - - Assert.Equal("/FeatureCollectionSetRequestFeatures", context.Request.PathBase); - context.Request.PathBase = "/base"; - Assert.Equal("/base", context.Request.PathBase); - - Assert.Equal("/path", context.Request.Path); - context.Request.Path = "/path"; - Assert.Equal("/path", context.Request.Path); - - Assert.Equal("?query", context.Request.QueryString.Value); - context.Request.QueryString = QueryString.Empty; - Assert.Equal("", context.Request.QueryString.Value); - - Assert.Equal("HTTP/1.1", context.Request.Protocol); - context.Request.Protocol = "HTTP/1.0"; - Assert.Equal("HTTP/1.0", context.Request.Protocol); - - Assert.NotNull(context.Request.Headers); - var headers = new HeaderDictionary(); - context.Features.Get().Headers = headers; - Assert.Same(headers, context.Features.Get().Headers); - - Assert.NotNull(context.Request.Body); - var body = new MemoryStream(); - context.Request.Body = body; - Assert.Same(body, context.Request.Body); - - //Assert.NotNull(context.Features.Get().TraceIdentifier); - //Assert.NotEqual(CancellationToken.None, context.RequestAborted); - //var token = new CancellationTokenSource().Token; - //context.RequestAborted = token; - //Assert.Equal(token, context.RequestAborted); - - await context.Response.WriteAsync("Success"); - return; - } - catch (Exception exception) - { - context.Response.StatusCode = 500; - await context.Response.WriteAsync(exception.ToString()); - } - await context.Response.WriteAsync("_Failure"); - }); - } - - private void FeatureCollectionSetResponseFeatures(IApplicationBuilder app) - { - app.Run(async context => - { - try - { - Assert.Equal(200, context.Response.StatusCode); - context.Response.StatusCode = 404; - Assert.Equal(404, context.Response.StatusCode); - context.Response.StatusCode = 200; - - Assert.Null(context.Features.Get().ReasonPhrase); - context.Features.Get().ReasonPhrase = "Set Response"; - Assert.Equal("Set Response", context.Features.Get().ReasonPhrase); - - Assert.NotNull(context.Response.Headers); - var headers = new HeaderDictionary(); - context.Features.Get().Headers = headers; - Assert.Same(headers, context.Features.Get().Headers); - - var originalBody = context.Response.Body; - Assert.NotNull(originalBody); - var body = new MemoryStream(); - context.Response.Body = body; - Assert.Same(body, context.Response.Body); - context.Response.Body = originalBody; - - await context.Response.WriteAsync("Success"); - return; - } - catch (Exception exception) - { - context.Response.StatusCode = 500; - await context.Response.WriteAsync(exception.ToString()); - } - await context.Response.WriteAsync("_Failure"); - }); - } - - private void FeatureCollectionSetConnectionFeatures(IApplicationBuilder app) - { - app.Run(async context => - { - try - { - Assert.True(IPAddress.IsLoopback(context.Connection.LocalIpAddress)); - context.Connection.LocalIpAddress = IPAddress.IPv6Any; - Assert.Equal(IPAddress.IPv6Any, context.Connection.LocalIpAddress); - - Assert.True(IPAddress.IsLoopback(context.Connection.RemoteIpAddress)); - context.Connection.RemoteIpAddress = IPAddress.IPv6Any; - Assert.Equal(IPAddress.IPv6Any, context.Connection.RemoteIpAddress); - await context.Response.WriteAsync("Success"); - return; - } - catch (Exception exception) - { - context.Response.StatusCode = 500; - await context.Response.WriteAsync(exception.ToString()); - } - await context.Response.WriteAsync("_Failure"); - }); - } - - private void Throw(IApplicationBuilder app) - { - app.Run(ctx => { throw new Exception(); }); - } - - private void SetCustomErorCode(IApplicationBuilder app) - { - app.Run(async ctx => { - var feature = ctx.Features.Get(); - feature.ReasonPhrase = ctx.Request.Query["reason"]; - feature.StatusCode = int.Parse(ctx.Request.Query["code"]); - if (ctx.Request.Query["writeBody"] == "True") - { - await ctx.Response.WriteAsync(ctx.Request.Query["body"]); - } - }); - } - - private void HelloWorld(IApplicationBuilder app) - { - app.Run(async ctx => - { - if (ctx.Request.Path.Value.StartsWith("/Path")) - { - await ctx.Response.WriteAsync(ctx.Request.Path.Value); - return; - } - if (ctx.Request.Path.Value.StartsWith("/Query")) - { - await ctx.Response.WriteAsync(ctx.Request.QueryString.Value); - return; - } - - await ctx.Response.WriteAsync("Hello World"); - }); - } - - private void LargeResponseBody(IApplicationBuilder app) - { - app.Run(async context => - { - if (int.TryParse(context.Request.Query["length"], out var length)) - { - await context.Response.WriteAsync(new string('a', length)); - } - }); - } - - private void ResponseHeaders(IApplicationBuilder app) - { - app.Run(async context => - { - context.Response.Headers["UnknownHeader"] = "test123=foo"; - context.Response.ContentType = "text/plain"; - context.Response.Headers["MultiHeader"] = new StringValues(new string[] { "1", "2" }); - await context.Response.WriteAsync("Request Complete"); - }); - } - - private void ResponseInvalidOrdering(IApplicationBuilder app) - { - app.Run(async context => - { - if (context.Request.Path.Equals("/SetStatusCodeAfterWrite")) - { - await context.Response.WriteAsync("Started_"); - try - { - context.Response.StatusCode = 200; - } - catch (InvalidOperationException) - { - await context.Response.WriteAsync("SetStatusCodeAfterWriteThrew_"); - } - await context.Response.WriteAsync("Finished"); - return; - } - else if (context.Request.Path.Equals("/SetHeaderAfterWrite")) - { - await context.Response.WriteAsync("Started_"); - try - { - context.Response.Headers["This will fail"] = "some value"; - } - catch (InvalidOperationException) - { - await context.Response.WriteAsync("SetHeaderAfterWriteThrew_"); - } - await context.Response.WriteAsync("Finished"); - return; - } - }); - } - - private void CheckEnvironmentVariable(IApplicationBuilder app) - { - app.Run(async context => - { - var variable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_TESTING_VALUE"); - await context.Response.WriteAsync(variable); - }); - } - - private void CheckEnvironmentLongValueVariable(IApplicationBuilder app) - { - app.Run(async context => - { - var variable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_TESTING_LONG_VALUE"); - await context.Response.WriteAsync(variable); - }); - } - - private void CheckAppendedEnvironmentVariable(IApplicationBuilder app) - { - app.Run(async context => - { - var variable = Environment.GetEnvironmentVariable("ProgramFiles"); - await context.Response.WriteAsync(variable); - }); - } - - private void CheckRemoveAuthEnvironmentVariable(IApplicationBuilder app) - { - app.Run(async context => - { - var variable = Environment.GetEnvironmentVariable("ASPNETCORE_IIS_HTTPAUTH"); - await context.Response.WriteAsync(variable); - }); - } - private void ReadAndWriteSynchronously(IApplicationBuilder app) - { - app.Run(async context => - { - var t2 = Task.Run(() => WriteManyTimesToResponseBody(context)); - var t1 = Task.Run(() => ReadRequestBody(context)); - await Task.WhenAll(t1, t2); - }); - } - - private async Task ReadRequestBody(HttpContext context) - { - var readBuffer = new byte[1]; - var result = await context.Request.Body.ReadAsync(readBuffer, 0, 1); - while (result != 0) - { - result = await context.Request.Body.ReadAsync(readBuffer, 0, 1); + await ctx.ChallengeAsync(IISServerDefaults.AuthenticationScheme); } } - private async Task WriteManyTimesToResponseBody(HttpContext context) + private async Task AuthenticationForbidden(HttpContext ctx) + { + await ctx.ForbidAsync(IISServerDefaults.AuthenticationScheme); + } + + private async Task AuthenticationRestrictedNTLM(HttpContext ctx) + { + if (string.Equals("NTLM", ctx.User.Identity.AuthenticationType, StringComparison.Ordinal)) + { + await ctx.Response.WriteAsync("NTLM"); + } + else + { + await ctx.ChallengeAsync(IISServerDefaults.AuthenticationScheme); + } + } + + private async Task FeatureCollectionSetRequestFeatures(HttpContext ctx) + { + try + { + Assert.Equal("GET", ctx.Request.Method); + ctx.Request.Method = "test"; + Assert.Equal("test", ctx.Request.Method); + + Assert.Equal("http", ctx.Request.Scheme); + ctx.Request.Scheme = "test"; + Assert.Equal("test", ctx.Request.Scheme); + + Assert.Equal("/FeatureCollectionSetRequestFeatures", ctx.Request.PathBase); + ctx.Request.PathBase = "/base"; + Assert.Equal("/base", ctx.Request.PathBase); + + Assert.Equal("/path", ctx.Request.Path); + ctx.Request.Path = "/path"; + Assert.Equal("/path", ctx.Request.Path); + + Assert.Equal("?query", ctx.Request.QueryString.Value); + ctx.Request.QueryString = QueryString.Empty; + Assert.Equal("", ctx.Request.QueryString.Value); + + Assert.Equal("HTTP/1.1", ctx.Request.Protocol); + ctx.Request.Protocol = "HTTP/1.0"; + Assert.Equal("HTTP/1.0", ctx.Request.Protocol); + + Assert.NotNull(ctx.Request.Headers); + var headers = new HeaderDictionary(); + ctx.Features.Get().Headers = headers; + Assert.Same(headers, ctx.Features.Get().Headers); + + Assert.NotNull(ctx.Request.Body); + var body = new MemoryStream(); + ctx.Request.Body = body; + Assert.Same(body, ctx.Request.Body); + + //Assert.NotNull(ctx.Features.Get().TraceIdentifier); + //Assert.NotEqual(CancellationToken.None, ctx.RequestAborted); + //var token = new CancellationTokenSource().Token; + //ctx.RequestAborted = token; + //Assert.Equal(token, ctx.RequestAborted); + + await ctx.Response.WriteAsync("Success"); + return; + } + catch (Exception exception) + { + ctx.Response.StatusCode = 500; + await ctx.Response.WriteAsync(exception.ToString()); + } + await ctx.Response.WriteAsync("_Failure"); + } + + private async Task FeatureCollectionSetResponseFeatures(HttpContext ctx) + { + try + { + Assert.Equal(200, ctx.Response.StatusCode); + ctx.Response.StatusCode = 404; + Assert.Equal(404, ctx.Response.StatusCode); + ctx.Response.StatusCode = 200; + + Assert.Null(ctx.Features.Get().ReasonPhrase); + ctx.Features.Get().ReasonPhrase = "Set Response"; + Assert.Equal("Set Response", ctx.Features.Get().ReasonPhrase); + + Assert.NotNull(ctx.Response.Headers); + var headers = new HeaderDictionary(); + ctx.Features.Get().Headers = headers; + Assert.Same(headers, ctx.Features.Get().Headers); + + var originalBody = ctx.Response.Body; + Assert.NotNull(originalBody); + var body = new MemoryStream(); + ctx.Response.Body = body; + Assert.Same(body, ctx.Response.Body); + ctx.Response.Body = originalBody; + + await ctx.Response.WriteAsync("Success"); + return; + } + catch (Exception exception) + { + ctx.Response.StatusCode = 500; + await ctx.Response.WriteAsync(exception.ToString()); + } + await ctx.Response.WriteAsync("_Failure"); + } + + private async Task FeatureCollectionSetConnectionFeatures(HttpContext ctx) + { + try + { + Assert.True(IPAddress.IsLoopback(ctx.Connection.LocalIpAddress)); + ctx.Connection.LocalIpAddress = IPAddress.IPv6Any; + Assert.Equal(IPAddress.IPv6Any, ctx.Connection.LocalIpAddress); + + Assert.True(IPAddress.IsLoopback(ctx.Connection.RemoteIpAddress)); + ctx.Connection.RemoteIpAddress = IPAddress.IPv6Any; + Assert.Equal(IPAddress.IPv6Any, ctx.Connection.RemoteIpAddress); + await ctx.Response.WriteAsync("Success"); + return; + } + catch (Exception exception) + { + ctx.Response.StatusCode = 500; + await ctx.Response.WriteAsync(exception.ToString()); + } + await ctx.Response.WriteAsync("_Failure"); + } + + private void Throw(HttpContext ctx) + { + throw new Exception(); + } + + private async Task SetCustomErorCode(HttpContext ctx) + { + var feature = ctx.Features.Get(); + feature.ReasonPhrase = ctx.Request.Query["reason"]; + feature.StatusCode = int.Parse(ctx.Request.Query["code"]); + if (ctx.Request.Query["writeBody"] == "True") + { + await ctx.Response.WriteAsync(ctx.Request.Query["body"]); + } + } + + private async Task HelloWorld(HttpContext ctx) + { + if (ctx.Request.Path.Value.StartsWith("/Path")) + { + await ctx.Response.WriteAsync(ctx.Request.Path.Value); + return; + } + if (ctx.Request.Path.Value.StartsWith("/Query")) + { + await ctx.Response.WriteAsync(ctx.Request.QueryString.Value); + return; + } + + await ctx.Response.WriteAsync("Hello World"); + } + + private async Task LargeResponseBody(HttpContext ctx) + { + if (int.TryParse(ctx.Request.Query["length"], out var length)) + { + await ctx.Response.WriteAsync(new string('a', length)); + } + } + + private async Task ResponseHeaders(HttpContext ctx) + { + ctx.Response.Headers["UnknownHeader"] = "test123=foo"; + ctx.Response.ContentType = "text/plain"; + ctx.Response.Headers["MultiHeader"] = new StringValues(new string[] { "1", "2" }); + await ctx.Response.WriteAsync("Request Complete"); + } + + private async Task ResponseInvalidOrdering(HttpContext ctx) + { + if (ctx.Request.Path.Equals("/SetStatusCodeAfterWrite")) + { + await ctx.Response.WriteAsync("Started_"); + try + { + ctx.Response.StatusCode = 200; + } + catch (InvalidOperationException) + { + await ctx.Response.WriteAsync("SetStatusCodeAfterWriteThrew_"); + } + await ctx.Response.WriteAsync("Finished"); + return; + } + else if (ctx.Request.Path.Equals("/SetHeaderAfterWrite")) + { + await ctx.Response.WriteAsync("Started_"); + try + { + ctx.Response.Headers["This will fail"] = "some value"; + } + catch (InvalidOperationException) + { + await ctx.Response.WriteAsync("SetHeaderAfterWriteThrew_"); + } + await ctx.Response.WriteAsync("Finished"); + return; + } + } + + private async Task CheckEnvironmentVariable(HttpContext ctx) + { + var variable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_TESTING_VALUE"); + await ctx.Response.WriteAsync(variable); + } + + private async Task CheckEnvironmentLongValueVariable(HttpContext ctx) + { + var variable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_TESTING_LONG_VALUE"); + await ctx.Response.WriteAsync(variable); + } + + private async Task CheckAppendedEnvironmentVariable(HttpContext ctx) + { + var variable = Environment.GetEnvironmentVariable("ProgramFiles"); + await ctx.Response.WriteAsync(variable); + } + + private async Task CheckRemoveAuthEnvironmentVariable(HttpContext ctx) + { + var variable = Environment.GetEnvironmentVariable("ASPNETCORE_IIS_HTTPAUTH"); + await ctx.Response.WriteAsync(variable); + } + private async Task ReadAndWriteSynchronously(HttpContext ctx) + { + var t2 = Task.Run(() => WriteManyTimesToResponseBody(ctx)); + var t1 = Task.Run(() => ReadRequestBody(ctx)); + await Task.WhenAll(t1, t2); + } + + private async Task ReadRequestBody(HttpContext ctx) + { + var readBuffer = new byte[1]; + var result = await ctx.Request.Body.ReadAsync(readBuffer, 0, 1); + while (result != 0) + { + result = await ctx.Request.Body.ReadAsync(readBuffer, 0, 1); + } + } + + private async Task WriteManyTimesToResponseBody(HttpContext ctx) { for (var i = 0; i < 10000; i++) { - await context.Response.WriteAsync("hello world"); + await ctx.Response.WriteAsync("hello world"); } } - private void ReadAndWriteEcho(IApplicationBuilder app) + private async Task ReadAndWriteEcho(HttpContext ctx) { - app.Run(async context => { - var readBuffer = new byte[4096]; - var result = await context.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); - while (result != 0) - { - await context.Response.WriteAsync(Encoding.UTF8.GetString(readBuffer, 0, result)); - result = await context.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); - } - }); - } - - private void ReadAndWriteEchoLines(IApplicationBuilder app) - { - app.Run(async context => { - //Send headers - await context.Response.Body.FlushAsync(); - - var reader = new StreamReader(context.Request.Body); - while (!reader.EndOfStream) - { - var line = await reader.ReadLineAsync(); - if (line == "") - { - return; - } - await context.Response.WriteAsync(line + Environment.NewLine); - await context.Response.Body.FlushAsync(); - } - }); - } - - private void ReadPartialBody(IApplicationBuilder app) - { - app.Run(async context => { - var data = new byte[5]; - var count = 0; - do - { - count += await context.Request.Body.ReadAsync(data, count, data.Length - count); - } while (count != data.Length); - await context.Response.Body.WriteAsync(data, 0, data.Length); - }); - } - - private void SetHeaderFromBody(IApplicationBuilder app) - { - app.Run(async context => { - using (var reader = new StreamReader(context.Request.Body)) - { - var value = await reader.ReadToEndAsync(); - context.Response.Headers["BodyAsString"] = value; - await context.Response.WriteAsync(value); - } - }); - } - - private void ReadAndWriteEchoTwice(IApplicationBuilder app) - { - app.Run(async context => + var readBuffer = new byte[4096]; + var result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + while (result != 0) { - var readBuffer = new byte[4096]; - var result = await context.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); - while (result != 0) - { - await context.Response.WriteAsync(Encoding.UTF8.GetString(readBuffer, 0, result)); - await context.Response.Body.FlushAsync(); - await context.Response.WriteAsync(Encoding.UTF8.GetString(readBuffer, 0, result)); - await context.Response.Body.FlushAsync(); - result = await context.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); - } - }); + await ctx.Response.WriteAsync(Encoding.UTF8.GetString(readBuffer, 0, result)); + result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + } } - private void ReadAndWriteSlowConnection(IApplicationBuilder app) + private async Task ReadAndWriteEchoLines(HttpContext ctx) { - app.Run(async context => + //Send headers + await ctx.Response.Body.FlushAsync(); + + var reader = new StreamReader(ctx.Request.Body); + while (!reader.EndOfStream) { - var t2 = Task.Run(() => WriteResponseBodyAFewTimes(context)); - var t1 = Task.Run(() => ReadRequestBody(context)); - await Task.WhenAll(t1, t2); - }); + var line = await reader.ReadLineAsync(); + if (line == "") + { + return; + } + await ctx.Response.WriteAsync(line + Environment.NewLine); + await ctx.Response.Body.FlushAsync(); + } } - private async Task WriteResponseBodyAFewTimes(HttpContext context) + private async Task ReadPartialBody(HttpContext ctx) + { + var data = new byte[5]; + var count = 0; + do + { + count += await ctx.Request.Body.ReadAsync(data, count, data.Length - count); + } while (count != data.Length); + await ctx.Response.Body.WriteAsync(data, 0, data.Length); + } + + private async Task SetHeaderFromBody(HttpContext ctx) + { + using (var reader = new StreamReader(ctx.Request.Body)) + { + var value = await reader.ReadToEndAsync(); + ctx.Response.Headers["BodyAsString"] = value; + await ctx.Response.WriteAsync(value); + } + } + + private async Task ReadAndWriteEchoTwice(HttpContext ctx) + { + var readBuffer = new byte[4096]; + var result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + while (result != 0) + { + await ctx.Response.WriteAsync(Encoding.UTF8.GetString(readBuffer, 0, result)); + await ctx.Response.Body.FlushAsync(); + await ctx.Response.WriteAsync(Encoding.UTF8.GetString(readBuffer, 0, result)); + await ctx.Response.Body.FlushAsync(); + result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + } + } + + private async Task ReadAndWriteSlowConnection(HttpContext ctx) + { + var t2 = Task.Run(() => WriteResponseBodyAFewTimes(ctx)); + var t1 = Task.Run(() => ReadRequestBody(ctx)); + await Task.WhenAll(t1, t2); + } + + private async Task WriteResponseBodyAFewTimes(HttpContext ctx) { for (var i = 0; i < 100; i++) { - await context.Response.WriteAsync("hello world"); + await ctx.Response.WriteAsync("hello world"); } } - private void ReadAndWriteCopyToAsync(IApplicationBuilder app) + private async Task ReadAndWriteCopyToAsync(HttpContext ctx) { - app.Run(async context => - { - await context.Request.Body.CopyToAsync(context.Response.Body); - }); + await ctx.Request.Body.CopyToAsync(ctx.Response.Body); } - private void UpgradeFeatureDetection(IApplicationBuilder app) + private async Task UpgradeFeatureDetection(HttpContext ctx) { - app.Run(async ctx => + if (ctx.Features.Get() != null) { - if (ctx.Features.Get() != null) - { - await ctx.Response.WriteAsync("Enabled"); - } - else - { - await ctx.Response.WriteAsync("Disabled"); - } - }); + await ctx.Response.WriteAsync("Enabled"); + } + else + { + await ctx.Response.WriteAsync("Disabled"); + } } - private void TestReadOffsetWorks(IApplicationBuilder app) + private async Task TestReadOffsetWorks(HttpContext ctx) { - app.Run(async ctx => - { - var buffer = new byte[11]; - ctx.Request.Body.Read(buffer, 0, 6); - ctx.Request.Body.Read(buffer, 6, 5); + var buffer = new byte[11]; + ctx.Request.Body.Read(buffer, 0, 6); + ctx.Request.Body.Read(buffer, 6, 5); - await ctx.Response.WriteAsync(Encoding.UTF8.GetString(buffer)); - }); + await ctx.Response.WriteAsync(Encoding.UTF8.GetString(buffer)); } - private void TestInvalidReadOperations(IApplicationBuilder app) + private async Task TestInvalidReadOperations(HttpContext ctx) { - app.Run(async context => + var success = false; + if (ctx.Request.Path.StartsWithSegments("/NullBuffer")) { - var success = false; - if (context.Request.Path.StartsWithSegments("/NullBuffer")) - { - try - { - await context.Request.Body.ReadAsync(null, 0, 0); - } - catch (Exception) - { - success = true; - } - } - else if (context.Request.Path.StartsWithSegments("/InvalidOffsetSmall")) - { - try - { - await context.Request.Body.ReadAsync(new byte[1], -1, 0); - } - catch (ArgumentOutOfRangeException) - { - success = true; - } - } - else if (context.Request.Path.StartsWithSegments("/InvalidOffsetLarge")) - { - try - { - await context.Request.Body.ReadAsync(new byte[1], 2, 0); - } - catch (ArgumentOutOfRangeException) - { - success = true; - } - } - else if (context.Request.Path.StartsWithSegments("/InvalidCountSmall")) - { - try - { - await context.Request.Body.ReadAsync(new byte[1], 0, -1); - } - catch (ArgumentOutOfRangeException) - { - success = true; - } - } - else if (context.Request.Path.StartsWithSegments("/InvalidCountLarge")) - { - try - { - await context.Request.Body.ReadAsync(new byte[1], 0, -1); - } - catch (ArgumentOutOfRangeException) - { - success = true; - } - } - else if (context.Request.Path.StartsWithSegments("/InvalidCountWithOffset")) - { - try - { - await context.Request.Body.ReadAsync(new byte[3], 1, 3); - } - catch (ArgumentOutOfRangeException) - { - success = true; - } - } - - - await context.Response.WriteAsync(success ? "Success" : "Failure"); - }); - } - - private void TestValidReadOperations(IApplicationBuilder app) - { - app.Run(async context => - { - var count = -1; - - if (context.Request.Path.StartsWithSegments("/NullBuffer")) - { - count = await context.Request.Body.ReadAsync(null, 0, 0); - } - else if (context.Request.Path.StartsWithSegments("/NullBufferPost")) - { - count = await context.Request.Body.ReadAsync(null, 0, 0); - } - else if (context.Request.Path.StartsWithSegments("/InvalidCountZeroRead")) - { - count = await context.Request.Body.ReadAsync(new byte[1], 0, 0); - } - else if (context.Request.Path.StartsWithSegments("/InvalidCountZeroReadPost")) - { - count = await context.Request.Body.ReadAsync(new byte[1], 0, 0); - } - - await context.Response.WriteAsync(count == 0 ? "Success" : "Failure"); - }); - } - - private void TestInvalidWriteOperations(IApplicationBuilder app) - { - app.Run(async context => - { - var success = false; - - if (context.Request.Path.StartsWithSegments("/InvalidOffsetSmall")) - { - try - { - await context.Response.Body.WriteAsync(new byte[1], -1, 0); - } - catch (ArgumentOutOfRangeException) - { - success = true; - } - } - else if (context.Request.Path.StartsWithSegments("/InvalidOffsetLarge")) - { - try - { - await context.Response.Body.WriteAsync(new byte[1], 2, 0); - } - catch (ArgumentOutOfRangeException) - { - success = true; - } - } - else if (context.Request.Path.StartsWithSegments("/InvalidCountSmall")) - { - try - { - await context.Response.Body.WriteAsync(new byte[1], 0, -1); - } - catch (ArgumentOutOfRangeException) - { - success = true; - } - } - else if (context.Request.Path.StartsWithSegments("/InvalidCountLarge")) - { - try - { - await context.Response.Body.WriteAsync(new byte[1], 0, -1); - } - catch (ArgumentOutOfRangeException) - { - success = true; - } - } - else if (context.Request.Path.StartsWithSegments("/InvalidCountWithOffset")) - { - try - { - await context.Response.Body.WriteAsync(new byte[3], 1, 3); - } - catch (ArgumentOutOfRangeException) - { - success = true; - } - } - - await context.Response.WriteAsync(success ? "Success" : "Failure"); - }); - } - - private void TestValidWriteOperations(IApplicationBuilder app) - { - app.Run(async context => - { - if (context.Request.Path.StartsWithSegments("/NullBuffer")) - { - await context.Response.Body.WriteAsync(null, 0, 0); - } - else if (context.Request.Path.StartsWithSegments("/NullBufferPost")) - { - await context.Response.Body.WriteAsync(null, 0, 0); - } - - await context.Response.WriteAsync("Success"); - }); - } - - private void LargeResponseFile(IApplicationBuilder app) - { - app.Run(async ctx => - { - var tempFile = Path.GetTempFileName(); - var fileContent = new string('a', 200000); - var fileStream = File.OpenWrite(tempFile); - - for (var i = 0; i < 1000; i++) - { - await fileStream.WriteAsync(Encoding.UTF8.GetBytes(fileContent), 0, fileContent.Length); - } - fileStream.Close(); - - await ctx.Response.SendFileAsync(tempFile, 0, null); - - // Try to delete the file from the temp directory. If it fails, don't report an error - // to the application. File should eventually be cleaned up from the temp directory - // by OS. try { - File.Delete(tempFile); + await ctx.Request.Body.ReadAsync(null, 0, 0); } catch (Exception) { + success = true; } - }); - } - - private void BasePath(IApplicationBuilder app) - { - app.Run(async ctx => { await ctx.Response.WriteAsync(AppDomain.CurrentDomain.BaseDirectory); }); - } - - private void CheckLogFile(IApplicationBuilder app) - { - app.Run(async ctx => + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidOffsetSmall")) { - Console.WriteLine("TEST MESSAGE"); - - await ctx.Response.WriteAsync("Hello World"); - }); - } - - private void CheckErrLogFile(IApplicationBuilder app) - { - app.Run(async ctx => + try + { + await ctx.Request.Body.ReadAsync(new byte[1], -1, 0); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidOffsetLarge")) { - Console.Error.WriteLine("TEST MESSAGE"); - Console.Error.Flush(); - - await ctx.Response.WriteAsync("Hello World"); - }); - } - - private void Shutdown(IApplicationBuilder app) - { - app.Run(async ctx => + try + { + await ctx.Request.Body.ReadAsync(new byte[1], 2, 0); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountSmall")) { - await ctx.Response.WriteAsync("Shutting down"); - ctx.RequestServices.GetService().StopApplication(); - }); + try + { + await ctx.Request.Body.ReadAsync(new byte[1], 0, -1); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountLarge")) + { + try + { + await ctx.Request.Body.ReadAsync(new byte[1], 0, -1); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountWithOffset")) + { + try + { + await ctx.Request.Body.ReadAsync(new byte[3], 1, 3); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + + + await ctx.Response.WriteAsync(success ? "Success" : "Failure"); } - private async Task GetServerVariableStress(HttpContext context) + private async Task TestValidReadOperations(HttpContext ctx) + { + var count = -1; + + if (ctx.Request.Path.StartsWithSegments("/NullBuffer")) + { + count = await ctx.Request.Body.ReadAsync(null, 0, 0); + } + else if (ctx.Request.Path.StartsWithSegments("/NullBufferPost")) + { + count = await ctx.Request.Body.ReadAsync(null, 0, 0); + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountZeroRead")) + { + count = await ctx.Request.Body.ReadAsync(new byte[1], 0, 0); + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountZeroReadPost")) + { + count = await ctx.Request.Body.ReadAsync(new byte[1], 0, 0); + } + + await ctx.Response.WriteAsync(count == 0 ? "Success" : "Failure"); + } + + private async Task TestInvalidWriteOperations(HttpContext ctx) + { + var success = false; + + if (ctx.Request.Path.StartsWithSegments("/InvalidOffsetSmall")) + { + try + { + await ctx.Response.Body.WriteAsync(new byte[1], -1, 0); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidOffsetLarge")) + { + try + { + await ctx.Response.Body.WriteAsync(new byte[1], 2, 0); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountSmall")) + { + try + { + await ctx.Response.Body.WriteAsync(new byte[1], 0, -1); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountLarge")) + { + try + { + await ctx.Response.Body.WriteAsync(new byte[1], 0, -1); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountWithOffset")) + { + try + { + await ctx.Response.Body.WriteAsync(new byte[3], 1, 3); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + + await ctx.Response.WriteAsync(success ? "Success" : "Failure"); + } + + private async Task TestValidWriteOperations(HttpContext ctx) + { + if (ctx.Request.Path.StartsWithSegments("/NullBuffer")) + { + await ctx.Response.Body.WriteAsync(null, 0, 0); + } + else if (ctx.Request.Path.StartsWithSegments("/NullBufferPost")) + { + await ctx.Response.Body.WriteAsync(null, 0, 0); + } + + await ctx.Response.WriteAsync("Success"); + } + + private async Task LargeResponseFile(HttpContext ctx) + { + var tempFile = Path.GetTempFileName(); + var fileContent = new string('a', 200000); + var fileStream = File.OpenWrite(tempFile); + + for (var i = 0; i < 1000; i++) + { + await fileStream.WriteAsync(Encoding.UTF8.GetBytes(fileContent), 0, fileContent.Length); + } + fileStream.Close(); + + await ctx.Response.SendFileAsync(tempFile, 0, null); + + // Try to delete the file from the temp directory. If it fails, don't report an error + // to the application. File should eventually be cleaned up from the temp directory + // by OS. + try + { + File.Delete(tempFile); + } + catch (Exception) + { + } + } + + private async Task BasePath(HttpContext ctx) + { + await ctx.Response.WriteAsync(AppDomain.CurrentDomain.BaseDirectory); + } + + private async Task Shutdown(HttpContext ctx) + { + await ctx.Response.WriteAsync("Shutting down"); + ctx.RequestServices.GetService().StopApplication(); + } + + private async Task GetServerVariableStress(HttpContext ctx) { // This test simulates the scenario where native Flush call is being // executed on background thread while request thread calls GetServerVariable // concurrent native calls may cause native object corruption - await context.Response.WriteAsync("Response Begin"); + await ctx.Response.WriteAsync("Response Begin"); for (int i = 0; i < 1000; i++) { - await context.Response.WriteAsync(context.GetIISServerVariable("REMOTE_PORT")); - await context.Response.Body.FlushAsync(); + await ctx.Response.WriteAsync(ctx.GetIISServerVariable("REMOTE_PORT")); + await ctx.Response.Body.FlushAsync(); } - await context.Response.WriteAsync("Response End"); + await ctx.Response.WriteAsync("Response End"); } - private async Task CommandLineArgs(HttpContext context) + private async Task CommandLineArgs(HttpContext ctx) { - await context.Response.WriteAsync(string.Join("|", Environment.GetCommandLineArgs().Skip(1))); + await ctx.Response.WriteAsync(string.Join("|", Environment.GetCommandLineArgs().Skip(1))); } } } diff --git a/test/WebSites/OutOfProcessWebSite/Program.cs b/test/WebSites/OutOfProcessWebSite/Program.cs index a5943f5f00..e5ce65cba1 100644 --- a/test/WebSites/OutOfProcessWebSite/Program.cs +++ b/test/WebSites/OutOfProcessWebSite/Program.cs @@ -5,7 +5,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Logging; -namespace TestSites +namespace TestSite { public static class Program { diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/test/WebSites/OutOfProcessWebSite/Startup.cs index 8a8358d364..2547eb5735 100644 --- a/test/WebSites/OutOfProcessWebSite/Startup.cs +++ b/test/WebSites/OutOfProcessWebSite/Startup.cs @@ -5,12 +5,10 @@ using System; using System.Diagnostics; using System.IO; using System.Linq; -using System.Runtime.InteropServices; using System.Security.Principal; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; @@ -19,9 +17,9 @@ using Microsoft.AspNetCore.Server.IISIntegration; using Microsoft.Extensions.DependencyInjection; using Xunit; -namespace TestSites +namespace TestSite { - public class Startup + public partial class Startup { private IServerAddressesFeature _serverAddresses; @@ -112,15 +110,6 @@ namespace TestSites return context.Response.WriteAsync(context.Request.Headers["ANCMRHPath"]); } - private async Task HostingEnvironment(HttpContext context) - { - var hostingEnv = context.RequestServices.GetService(); - - await context.Response.WriteAsync("ContentRootPath "+hostingEnv.ContentRootPath + Environment.NewLine); - await context.Response.WriteAsync("WebRootPath "+hostingEnv.WebRootPath + Environment.NewLine); - await context.Response.WriteAsync("CurrentDirectory "+Environment.CurrentDirectory); - } - private async Task ProcessId(HttpContext context) { await context.Response.WriteAsync(Process.GetCurrentProcess().Id.ToString()); diff --git a/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj b/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj deleted file mode 100644 index f7108dadc4..0000000000 --- a/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netcoreapp2.2 - true - - - - - - - - - - - - - diff --git a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json b/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json deleted file mode 100644 index 9c963c0100..0000000000 --- a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": true, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:5762/", - "sslPort": 0 - } - }, - "profiles": { - "ANCM IIS Express": { - "commandName": "Executable", - "executablePath": "$(IISExpressPath)", - "commandLineArgs": "$(IISExpressArguments)", - "nativeDebugging": true, - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - }, - "ANCM IIS": { - "commandName": "Executable", - "executablePath": "$(IISPath)", - "commandLineArgs": "$(IISArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - } - } -} diff --git a/test/WebSites/StartupExceptionWebSite/Program.cs b/test/WebSites/StartupExceptionWebSite/Program.cs deleted file mode 100644 index 95bac44503..0000000000 --- a/test/WebSites/StartupExceptionWebSite/Program.cs +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Text; -using System.Threading; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; - -namespace IISTestSite -{ - public static class Program - { - public static int Main(string[] args) - { - var mode = args.FirstOrDefault(); - - switch (mode) - { - // Semicolons are appended to env variables; removing them. - case "CheckLargeStdOutWrites": - Console.WriteLine(new string('a', 30000)); - break; - case "CheckLargeStdErrWrites": - Console.Error.WriteLine(new string('a', 30000)); - Console.Error.Flush(); - break; - case "CheckLogFile": - Console.WriteLine($"Random number: {args[1]}"); - break; - case "CheckErrLogFile": - Console.Error.WriteLine($"Random number: {args[1]}"); - Console.Error.Flush(); - break; - case "CheckOversizedStdErrWrites": - Console.WriteLine(new string('a', 31000)); - break; - case "CheckOversizedStdOutWrites": - Console.Error.WriteLine(new string('a', 31000)); - Console.Error.Flush(); - break; - case "Hang": - Thread.Sleep(Timeout.Infinite); - break; - case "Throw": - throw new InvalidOperationException("Program.Main exception"); - case "HangOnStop": - var host = new WebHostBuilder() - .UseIIS() - .UseStartup() - .Build(); - host.Run(); - - Thread.Sleep(Timeout.Infinite); - break; - case "CheckConsoleFunctions": - // Call a bunch of console functions and make sure none return invalid handle. - Console.OutputEncoding = Encoding.UTF8; - Console.Title = "Test"; - Console.WriteLine($"Is Console redirection: {Console.IsOutputRedirected}"); - Console.BackgroundColor = ConsoleColor.Blue; - Console.WriteLine("彡⾔"); - break; - } - - return 12; - } - - public partial class Startup - { - public void Configure(IApplicationBuilder app) - { - app.Run(async context => await context.Response.WriteAsync("OK")); - } - } - } -} diff --git a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json b/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json deleted file mode 100644 index 9c963c0100..0000000000 --- a/test/WebSites/StartupExceptionWebSite/Properties/launchSettings.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": true, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:5762/", - "sslPort": 0 - } - }, - "profiles": { - "ANCM IIS Express": { - "commandName": "Executable", - "executablePath": "$(IISExpressPath)", - "commandLineArgs": "$(IISExpressArguments)", - "nativeDebugging": true, - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - }, - "ANCM IIS": { - "commandName": "Executable", - "executablePath": "$(IISPath)", - "commandLineArgs": "$(IISArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - } - } -} diff --git a/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj b/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj deleted file mode 100644 index 922196815f..0000000000 --- a/test/WebSites/StartupExceptionWebSite/StartupExceptionWebSite.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netcoreapp2.2 - true - - - - - - - - - - - - - diff --git a/test/WebSites/StartupExceptionWebSite/web.config b/test/WebSites/StartupExceptionWebSite/web.config deleted file mode 100644 index 0c7405e4d1..0000000000 --- a/test/WebSites/StartupExceptionWebSite/web.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/test/WebSites/shared/SharedStartup/Startup.shared.cs b/test/WebSites/shared/SharedStartup/Startup.shared.cs new file mode 100644 index 0000000000..eef8f8bf7e --- /dev/null +++ b/test/WebSites/shared/SharedStartup/Startup.shared.cs @@ -0,0 +1,37 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; + +namespace TestSite +{ + public partial class Startup + { + private async Task HostingEnvironment(HttpContext ctx) + { + var hostingEnv = ctx.RequestServices.GetService(); + + await ctx.Response.WriteAsync("ContentRootPath " + hostingEnv.ContentRootPath + Environment.NewLine); + await ctx.Response.WriteAsync("WebRootPath " + hostingEnv.WebRootPath + Environment.NewLine); + await ctx.Response.WriteAsync("CurrentDirectory " + Environment.CurrentDirectory); + } + + private async Task ConsoleWrite(HttpContext ctx) + { + Console.WriteLine("TEST MESSAGE"); + + await ctx.Response.WriteAsync("Hello World"); + } + + private async Task ConsoleErrorWrite(HttpContext ctx) + { + Console.Error.WriteLine("TEST MESSAGE"); + + await ctx.Response.WriteAsync("Hello World"); + } + } +} From 1a0f98806442471f13574a8333d177c6427a1571 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 13 Sep 2018 11:22:11 -0700 Subject: [PATCH 276/363] Skip AppOfflineDroppedWhileSiteFailedToStartInRequestHandler_SiteStops_InProcess (#1396) --- test/Common.FunctionalTests/AppOfflineTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/test/Common.FunctionalTests/AppOfflineTests.cs index 41bf8874d9..53afd34504 100644 --- a/test/Common.FunctionalTests/AppOfflineTests.cs +++ b/test/Common.FunctionalTests/AppOfflineTests.cs @@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests DeletePublishOutput(deploymentResult); } - [ConditionalFact] + [ConditionalFact(Skip = "https://github.com/aspnet/IISIntegration/issues/933")] public async Task AppOfflineDroppedWhileSiteFailedToStartInRequestHandler_SiteStops_InProcess() { var deploymentResult = await DeployApp(HostingModel.InProcess); From c93c974dbcee18c49d9127674a1e12fd0febd2a8 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 13 Sep 2018 12:15:38 -0700 Subject: [PATCH 277/363] Update certs on Jenkins (#1397) --- build/buildpipeline/windows.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy index 3aa3d99283..eb1a95bca3 100644 --- a/build/buildpipeline/windows.groovy +++ b/build/buildpipeline/windows.groovy @@ -10,6 +10,6 @@ simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { stage ('Build') { def logFolder = getLogFolder() def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" - bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"&.\\tools\\update_schema.ps1;${environment};&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\"" + bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;${environment};&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\"" } } From 6172677a0a748ecd4a7d3b989b0f5ee75f6e8b86 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 16 Sep 2018 12:14:36 -0700 Subject: [PATCH 278/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 5915e116b1..784065f4b9 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,39 +4,39 @@ 0.10.13 - 2.2.0-preview1-20180907.8 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 0.6.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 + 2.2.0-preview1-20180911.1 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 0.6.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 15.6.82 15.6.82 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 2.0.9 2.1.3 2.2.0-preview2-26905-02 1.0.1 - 2.2.0-preview3-35202 + 2.2.0-preview3-35252 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 552300b0ce..1090ad6a92 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180907.8 -commithash:078918eb5c1f176ee1da351c584fb4a4d7491aa0 +version:2.2.0-preview1-20180911.1 +commithash:ddfecdfc6e8e4859db5a0daea578070b862aac65 From 2d23ed73e7c7d263acf142c7d30353811a9f3715 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 16 Sep 2018 19:16:11 +0000 Subject: [PATCH 279/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 70 ++++++++++++++++++++-------------------- korebuild-lock.txt | 9 ++---- 2 files changed, 37 insertions(+), 42 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 231fbef9dd..bb2f9074f1 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,51 +4,51 @@ 0.10.13 - 3.0.0-alpha1-20180907.9 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 0.7.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 + 3.0.0-alpha1-20180911.2 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 0.7.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 15.6.82 15.6.82 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 - 3.0.0-alpha1-10419 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 + 3.0.0-alpha1-10454 2.0.9 2.1.3 2.2.0-preview2-26905-02 1.0.1 - 3.0.0-alpha1-10419 + 3.0.0-alpha1-10454 15.6.1 11.1.0 2.0.3 - 4.6.0-preview1-26905-03 - 4.6.0-preview1-26905-03 - 4.6.0-preview1-26905-03 + 4.6.0-preview1-26907-04 + 4.6.0-preview1-26907-04 + 4.6.0-preview1-26907-04 4.6.0-preview1-26717-04 - 4.6.0-preview1-26905-03 - 4.6.0-preview1-26905-03 - 4.6.0-preview1-26905-03 - 4.6.0-preview1-26905-03 - 4.6.0-preview1-26905-03 + 4.6.0-preview1-26907-04 + 4.6.0-preview1-26907-04 + 4.6.0-preview1-26907-04 + 4.6.0-preview1-26907-04 + 4.6.0-preview1-26907-04 9.0.1 2.3.1 2.4.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 58059d1ff4..a3511df82d 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,7 +1,2 @@ -<<<<<<< HEAD -version:3.0.0-alpha1-20180907.9 -commithash:f997365a8832ff0a3cbd9a98df45734ac2723fa0 -======= -version:2.2.0-preview1-20180907.8 -commithash:078918eb5c1f176ee1da351c584fb4a4d7491aa0 ->>>>>>> merge/release/2.2-to-master +version:3.0.0-alpha1-20180911.2 +commithash:2a2b7dbea1b247930c41da497f4ea0b2bb756818 From e477f47ba82b4c3e5555ae34739ccfdf54850076 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 17 Sep 2018 08:07:16 -0700 Subject: [PATCH 280/363] Cleanup log file tests (#1398) --- .../Inprocess/StartupExceptionTests.cs | 46 +++++++++++-------- .../Utilities/LogFileTestBase.cs | 34 ++++++++++++++ .../Inprocess/StdOutRedirectionTests.cs | 13 +----- 3 files changed, 62 insertions(+), 31 deletions(-) create mode 100644 test/Common.FunctionalTests/Utilities/LogFileTestBase.cs diff --git a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs index 0c69f10c03..cadfed9781 100644 --- a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; @@ -12,7 +11,7 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(PublishedSitesCollection.Name)] - public class StartupExceptionTests : IISFunctionalTestBase + public class StartupExceptionTests : LogFileTestBase { private readonly PublishedSitesFixture _fixture; @@ -22,18 +21,20 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalTheory] - [InlineData("ConsoleWrite")] - [InlineData("ConsoleErrorWrite")] - public async Task CheckStdoutWithRandomNumber(string mode) + [InlineData("CheckLargeStdErrWrites")] + [InlineData("CheckLargeStdOutWrites")] + [InlineData("CheckOversizedStdErrWrites")] + [InlineData("CheckOversizedStdOutWrites")] + public async Task CheckStdoutWithLargeWrites_TestSink(string mode) { var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} {mode}"); + var deploymentResult = await DeployAsync(deploymentParameters); - var randomNumberString = new Random(Guid.NewGuid().GetHashCode()).Next(10000000).ToString(); - deploymentParameters.TransformArguments((a, _) => $"{a} {mode} {randomNumberString}"); - - await AssertFailsToStart(deploymentParameters); - - Assert.Contains(TestSink.Writes, context => context.Message.Contains($"Random number: {randomNumberString}")); + await AssertFailsToStart(deploymentResult); + var expectedString = new string('a', 30000); + Assert.Contains(TestSink.Writes, context => context.Message.Contains(expectedString)); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", expectedString)); } [ConditionalTheory] @@ -41,14 +42,21 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [InlineData("CheckLargeStdOutWrites")] [InlineData("CheckOversizedStdErrWrites")] [InlineData("CheckOversizedStdOutWrites")] - public async Task CheckStdoutWithLargeWrites(string mode) + public async Task CheckStdoutWithLargeWrites_LogFile(string mode) { var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); deploymentParameters.TransformArguments((a, _) => $"{a} {mode}"); + deploymentParameters.EnableLogging(_logFolderPath); - await AssertFailsToStart(deploymentParameters); + var deploymentResult = await DeployAsync(deploymentParameters); - Assert.Contains(TestSink.Writes, context => context.Message.Contains(new string('a', 30000))); + await AssertFailsToStart(deploymentResult); + + var contents = GetLogFileContent(deploymentResult); + var expectedString = new string('a', 30000); + + Assert.Contains(expectedString, contents); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", expectedString)); } [ConditionalFact] @@ -57,16 +65,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); deploymentParameters.TransformArguments((a, _) => $"{a} CheckConsoleFunctions"); - await AssertFailsToStart(deploymentParameters); + var deploymentResult = await DeployAsync(deploymentParameters); + + await AssertFailsToStart(deploymentResult); Assert.Contains(TestSink.Writes, context => context.Message.Contains("Is Console redirection: True")); } - private async Task AssertFailsToStart(IISDeploymentParameters deploymentParameters) + private async Task AssertFailsToStart(IISDeploymentResult deploymentResult) { - var deploymentResult = await DeployAsync(deploymentParameters); - - var response = await deploymentResult.HttpClient.GetAsync("/"); + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); diff --git a/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs b/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs new file mode 100644 index 0000000000..395ddfd40f --- /dev/null +++ b/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs @@ -0,0 +1,34 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Xunit.Abstractions; + +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities +{ + public class LogFileTestBase : IISFunctionalTestBase + { + protected string _logFolderPath; + + public LogFileTestBase(ITestOutputHelper output = null) : base(output) + { + _logFolderPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); + } + public override void Dispose() + { + base.Dispose(); + if (Directory.Exists(_logFolderPath)) + { + Directory.Delete(_logFolderPath, true); + } + } + + public string GetLogFileContent(IISDeploymentResult deploymentResult) + { + return File.ReadAllText(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath)); + } + } +} diff --git a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs index 1098384c9b..deab1d756b 100644 --- a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs +++ b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs @@ -15,26 +15,15 @@ using Xunit; namespace IIS.FunctionalTests.Inprocess { [Collection(PublishedSitesCollection.Name)] - public class StdOutRedirectionTests : IISFunctionalTestBase + public class StdOutRedirectionTests : LogFileTestBase { private readonly PublishedSitesFixture _fixture; - private readonly string _logFolderPath; public StdOutRedirectionTests(PublishedSitesFixture fixture) { - _logFolderPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); _fixture = fixture; } - public override void Dispose() - { - base.Dispose(); - if (Directory.Exists(_logFolderPath)) - { - Directory.Delete(_logFolderPath, true); - } - } - [ConditionalFact] [SkipIfDebug] public async Task FrameworkNotFoundExceptionLogged_Pipe() From 2cd6ad6d50cab4f4be52b652e355417c4880ede2 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 17 Sep 2018 11:57:46 -0700 Subject: [PATCH 281/363] Add windows auth tests for inproc (#1385) --- .../IISExpressDeployer.cs | 3 ++- .../OutOfProcess/HelloWorldTest.cs | 2 +- .../{OutOfProcess => }/WindowsAuthTests.cs | 5 +++-- test/WebSites/OutOfProcessWebSite/Startup.cs | 14 -------------- .../shared/SharedStartup/Startup.shared.cs | 10 ++++++++++ 5 files changed, 16 insertions(+), 18 deletions(-) rename test/IISExpress.FunctionalTests/{OutOfProcess => }/WindowsAuthTests.cs (91%) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs index 8139a0f6b9..8fe8c66585 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs @@ -293,7 +293,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS ConfigureModuleAndBinding(config.Root, contentRoot, port); - if (!DeploymentParameters.PublishApplicationBeforeDeployment) + var webConfigPath = Path.Combine(contentRoot, "web.config"); + if (!DeploymentParameters.PublishApplicationBeforeDeployment && !File.Exists(webConfigPath)) { // The elements normally in the web.config are in the applicationhost.config for unpublished apps. AddAspNetCoreElement(config.Root); diff --git a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 3f748f2314..edfd603e4c 100644 --- a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests response = await deploymentResult.HttpClient.GetAsync("/Auth"); responseText = await response.Content.ReadAsStringAsync(); - Assert.True("backcompat;Windows".Equals(responseText) || "latest;null".Equals(responseText), "Auth"); + Assert.True("null".Equals(responseText), "Auth"); Assert.Equal( $"ContentRootPath {deploymentResult.ContentRoot}" + Environment.NewLine + diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs b/test/IISExpress.FunctionalTests/WindowsAuthTests.cs similarity index 91% rename from test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs rename to test/IISExpress.FunctionalTests/WindowsAuthTests.cs index b46b314d08..3720385d4c 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs +++ b/test/IISExpress.FunctionalTests/WindowsAuthTests.cs @@ -26,7 +26,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) .WithAllApplicationTypes() - .WithAllAncmVersions(); + .WithAllAncmVersions() + .WithAllHostingModels(); [ConditionalTheory] [MemberData(nameof(TestVariants))] @@ -41,7 +42,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var response = await deploymentResult.HttpClient.GetAsync("/Auth"); var responseText = await response.Content.ReadAsStringAsync(); - Assert.True("backcompat;Windows".Equals(responseText) || "latest;Windows".Equals(responseText), "Auth"); + Assert.Equal("Windows", responseText); } } } diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/test/WebSites/OutOfProcessWebSite/Startup.cs index 2547eb5735..a796f9a7a3 100644 --- a/test/WebSites/OutOfProcessWebSite/Startup.cs +++ b/test/WebSites/OutOfProcessWebSite/Startup.cs @@ -36,20 +36,6 @@ namespace TestSite public Task BodyLimit(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Features.Get()?.MaxRequestBodySize?.ToString() ?? "null"); - public async Task Auth(HttpContext ctx) - { - var iisAuth = Environment.GetEnvironmentVariable("ASPNETCORE_IIS_HTTPAUTH"); - var authProvider = ctx.RequestServices.GetService(); - var authScheme = (await authProvider.GetAllSchemesAsync()).SingleOrDefault(); - if (string.IsNullOrEmpty(iisAuth)) - { - await ctx.Response.WriteAsync("backcompat;" + (authScheme?.Name ?? "null")); - } - else - { - await ctx.Response.WriteAsync("latest;" + (authScheme?.Name ?? "null")); - } - } public Task HelloWorld(HttpContext ctx) => ctx.Response.WriteAsync("Hello World"); diff --git a/test/WebSites/shared/SharedStartup/Startup.shared.cs b/test/WebSites/shared/SharedStartup/Startup.shared.cs index eef8f8bf7e..a804449029 100644 --- a/test/WebSites/shared/SharedStartup/Startup.shared.cs +++ b/test/WebSites/shared/SharedStartup/Startup.shared.cs @@ -2,7 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; @@ -33,5 +35,13 @@ namespace TestSite await ctx.Response.WriteAsync("Hello World"); } + + public async Task Auth(HttpContext ctx) + { + var authProvider = ctx.RequestServices.GetService(); + var authScheme = (await authProvider.GetAllSchemesAsync()).SingleOrDefault(); + + await ctx.Response.WriteAsync(authScheme?.Name ?? "null"); + } } } From 5e896ca50678547ce5a71a23edd7dcc5bab45ba7 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 17 Sep 2018 12:04:12 -0700 Subject: [PATCH 282/363] Implement IHttpBufferingFeature (#1391) --- .../managedexports.cpp | 24 +++++ .../Core/IISHttpContext.FeatureCollection.cs | 34 ++++++- .../Core/IISHttpContext.Features.cs | 24 +++-- .../IServerVariableFeature.cs | 4 +- .../NativeMethods.cs | 19 ++++ .../IISDeploymentParameterExtensions.cs | 26 +++++ .../Inprocess/CompressionTests.cs | 96 +++++++++++++++++++ .../Inprocess/ServerVariablesTest.cs | 6 ++ .../Utilities/IISCapability.cs | 3 +- .../Utilities/IISCompressionSiteCollection.cs | 13 +++ .../Utilities/IISCompressionSiteFixture.cs | 44 +++++++++ .../Utilities/IISTestSiteFixture.cs | 82 ++++++++++------ .../Common.Tests/Utilities/TestConnections.cs | 78 +++++++++++---- .../RequiresIISAttribute.cs | 41 ++++---- .../InProcess/WebSocketTests.cs | 2 +- test/WebSites/InProcessWebSite/Startup.cs | 41 +++++++- 16 files changed, 457 insertions(+), 80 deletions(-) create mode 100644 test/Common.FunctionalTests/Inprocess/CompressionTests.cs create mode 100644 test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs create mode 100644 test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp index c1444a8571..27a41da909 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp @@ -86,6 +86,19 @@ Finished: return hr; } +EXTERN_C __MIDL_DECLSPEC_DLLEXPORT +HRESULT +http_set_server_variable( + _In_ IN_PROCESS_HANDLER* pInProcessHandler, + _In_ PCSTR pszVariableName, + _In_ PCWSTR pszVariableValue +) +{ + return pInProcessHandler + ->QueryHttpContext() + ->SetServerVariable(pszVariableName, pszVariableValue); +} + EXTERN_C __MIDL_DECLSPEC_DLLEXPORT HRESULT http_set_response_status_code( @@ -400,6 +413,17 @@ http_cancel_io( return pInProcessHandler->QueryHttpContext()->CancelIo(); } +EXTERN_C __MIDL_DECLSPEC_DLLEXPORT +HRESULT +http_disable_buffering( + _In_ IN_PROCESS_HANDLER* pInProcessHandler +) +{ + pInProcessHandler->QueryHttpContext()->GetResponse()->DisableBuffering(); + + return S_OK; +} + EXTERN_C __MIDL_DECLSPEC_DLLEXPORT HRESULT http_response_set_unknown_header( diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs index 4c2d4342b9..df6ba267d0 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs @@ -23,7 +23,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core IHttpUpgradeFeature, IHttpRequestLifetimeFeature, IHttpAuthenticationFeature, - IServerVariablesFeature + IServerVariablesFeature, + IHttpBufferingFeature { // NOTE: When feature interfaces are added to or removed from this HttpProtocol implementation, // then the list of `implementedFeatures` in the generated code project MUST also be updated. @@ -202,7 +203,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { if (string.IsNullOrEmpty(variableName)) { - return null; + throw new ArgumentException($"{nameof(variableName)} should be non-empty string"); } // Synchronize access to native methods that might run in parallel with IO loops @@ -211,6 +212,19 @@ namespace Microsoft.AspNetCore.Server.IIS.Core return NativeMethods.HttpTryGetServerVariable(_pInProcessHandler, variableName, out var value) ? value : null; } } + set + { + if (string.IsNullOrEmpty(variableName)) + { + throw new ArgumentException($"{nameof(variableName)} should be non-empty string"); + } + + // Synchronize access to native methods that might run in parallel with IO loops + lock (_contextLock) + { + NativeMethods.HttpSetServerVariable(_pInProcessHandler, variableName, value); + } + } } object IFeatureCollection.this[Type key] @@ -284,5 +298,21 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { Abort(); } + + void IHttpBufferingFeature.DisableRequestBuffering() + { + } + + void IHttpBufferingFeature.DisableResponseBuffering() + { + NativeMethods.HttpDisableBuffering(_pInProcessHandler); + DisableCompression(); + } + + private void DisableCompression() + { + var serverVariableFeature = (IServerVariablesFeature)this; + serverVariableFeature["IIS_EnableDynamicCompression"] = "0"; + } } } diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs index 0064899340..f2a0016c0a 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs @@ -27,6 +27,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private static readonly Type IHttpSendFileFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpSendFileFeature); private static readonly Type IISHttpContextType = typeof(IISHttpContext); private static readonly Type IServerVariablesFeature = typeof(global::Microsoft.AspNetCore.Http.Features.IServerVariablesFeature); + private static readonly Type IHttpBufferingFeature = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpBufferingFeature); private object _currentIHttpRequestFeature; private object _currentIHttpResponseFeature; @@ -41,14 +42,12 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private object _currentIResponseCookiesFeature; private object _currentIItemsFeature; private object _currentITlsConnectionFeature; - private object _currentIHttpMaxRequestBodySizeFeature; - private object _currentIHttpMinRequestBodyDataRateFeature; - private object _currentIHttpMinResponseDataRateFeature; private object _currentIHttpWebSocketFeature; private object _currentISessionFeature; private object _currentIHttpBodyControlFeature; private object _currentIHttpSendFileFeature; private object _currentIServerVariablesFeature; + private object _currentIHttpBufferingFeature; private void Initialize() { @@ -58,12 +57,10 @@ namespace Microsoft.AspNetCore.Server.IIS.Core _currentIHttpRequestIdentifierFeature = this; _currentIHttpRequestLifetimeFeature = this; _currentIHttpConnectionFeature = this; - _currentIHttpMaxRequestBodySizeFeature = this; - _currentIHttpMinRequestBodyDataRateFeature = this; - _currentIHttpMinResponseDataRateFeature = this; _currentIHttpBodyControlFeature = this; _currentIHttpAuthenticationFeature = this; _currentIServerVariablesFeature = this; + _currentIHttpBufferingFeature = this; } internal object FastFeatureGet(Type key) @@ -142,7 +139,11 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } if (key == IServerVariablesFeature) { - return this; + return _currentIServerVariablesFeature; + } + if (key == IHttpBufferingFeature) + { + return _currentIHttpBufferingFeature; } return ExtraFeatureGet(key); @@ -242,6 +243,11 @@ namespace Microsoft.AspNetCore.Server.IIS.Core _currentIServerVariablesFeature = feature; return; } + if (key == IHttpBufferingFeature) + { + _currentIHttpBufferingFeature = feature; + return; + } if (key == IISHttpContextType) { throw new InvalidOperationException("Cannot set IISHttpContext in feature collection"); @@ -323,6 +329,10 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { yield return new KeyValuePair(IServerVariablesFeature, _currentIServerVariablesFeature as global::Microsoft.AspNetCore.Http.Features.IServerVariablesFeature); } + if (_currentIHttpBufferingFeature != null) + { + yield return new KeyValuePair(IHttpBufferingFeature, _currentIHttpBufferingFeature as global::Microsoft.AspNetCore.Http.Features.IHttpBufferingFeature); + } if (MaybeExtra != null) { diff --git a/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs b/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs index 3b54733a03..44f667cb41 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs @@ -15,10 +15,10 @@ namespace Microsoft.AspNetCore.Http.Features public interface IServerVariablesFeature { /// - /// Gets the value of a server variable for the current request. + /// Gets or sets the value of a server variable for the current request. /// /// The variable name /// May return null or empty if the variable does not exist or is not set. - string this[string variableName] { get; } + string this[string variableName] { get; set; } } } diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs index e8aa17a430..c8feb2ef40 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs @@ -76,6 +76,9 @@ namespace Microsoft.AspNetCore.Server.IIS [DllImport(AspNetCoreModuleDll)] private static extern int http_stop_incoming_requests(IntPtr pInProcessApplication); + [DllImport(AspNetCoreModuleDll)] + private static extern int http_disable_buffering(IntPtr pInProcessApplication); + [DllImport(AspNetCoreModuleDll, CharSet = CharSet.Ansi)] private static extern int http_set_response_status_code(IntPtr pInProcessHandler, ushort statusCode, string pszReason); @@ -97,6 +100,12 @@ namespace Microsoft.AspNetCore.Server.IIS [MarshalAs(UnmanagedType.LPStr)] string variableName, [MarshalAs(UnmanagedType.BStr)] out string value); + [DllImport(AspNetCoreModuleDll)] + private static extern int http_set_server_variable( + IntPtr pInProcessHandler, + [MarshalAs(UnmanagedType.LPStr)] string variableName, + [MarshalAs(UnmanagedType.LPWStr)] string value); + [DllImport(AspNetCoreModuleDll)] private static extern unsafe int http_websockets_read_bytes( IntPtr pInProcessHandler, @@ -176,6 +185,11 @@ namespace Microsoft.AspNetCore.Server.IIS Validate(http_stop_incoming_requests(pInProcessApplication)); } + public static void HttpDisableBuffering(IntPtr pInProcessApplication) + { + Validate(http_disable_buffering(pInProcessApplication)); + } + public static void HttpSetResponseStatusCode(IntPtr pInProcessHandler, ushort statusCode, string pszReason) { Validate(http_set_response_status_code(pInProcessHandler, statusCode, pszReason)); @@ -208,6 +222,11 @@ namespace Microsoft.AspNetCore.Server.IIS return http_get_server_variable(pInProcessHandler, variableName, out value) == 0; } + public static void HttpSetServerVariable(IntPtr pInProcessHandler, string variableName, string value) + { + Validate(http_set_server_variable(pInProcessHandler, variableName, value)); + } + public static unsafe int HttpWebsocketsReadBytes( IntPtr pInProcessHandler, byte* pvBuffer, diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs index 2d45f036a7..594e373b08 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs @@ -80,5 +80,31 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS aspNetCoreElement.SetAttributeValue("arguments", transformation((string)aspNetCoreElement.Attribute("arguments"), contentRoot)); }); } + + public static void EnableModule(this IISDeploymentParameters parameters, string moduleName, string modulePath) + { + if (parameters.ServerType == ServerType.IIS) + { + modulePath = modulePath.Replace("%IIS_BIN%", "%windir%\\System32\\inetsrv"); + } + + parameters.ServerConfigActionList.Add( + (element, _) => { + var webServerElement = element + .RequiredElement("system.webServer"); + + webServerElement + .RequiredElement("globalModules") + .GetOrAdd("add", "name", moduleName) + .SetAttributeValue("image", modulePath); + + (webServerElement.Element("modules") ?? + element + .Element("location") + .RequiredElement("system.webServer") + .RequiredElement("modules")) + .GetOrAdd("add", "name", moduleName); + }); + } } } diff --git a/test/Common.FunctionalTests/Inprocess/CompressionTests.cs b/test/Common.FunctionalTests/Inprocess/CompressionTests.cs new file mode 100644 index 0000000000..1a1218a526 --- /dev/null +++ b/test/Common.FunctionalTests/Inprocess/CompressionTests.cs @@ -0,0 +1,96 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Net; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISCompressionSiteCollection.Name)] + public class CompressionTests : FixtureLoggedTest + { + private readonly IISCompressionSiteFixture _fixture; + + public CompressionTests(IISCompressionSiteFixture fixture): base(fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [RequiresIIS(IISCapability.DynamicCompression)] + [InlineData(true)] + [InlineData(false)] + public async Task BufferingDisabled(bool compression) + { + using (var connection = _fixture.CreateTestConnection()) + { + var requestLength = 0; + var messages = new List(); + for (var i = 1; i < 100; i++) + { + var message = i + Environment.NewLine; + requestLength += message.Length; + messages.Add(message); + } + + await connection.Send( + "POST /ReadAndWriteEchoLinesNoBuffering HTTP/1.1", + $"Content-Length: {requestLength}", + "Accept-Encoding: " + (compression ? "gzip": "identity"), + "Response-Content-Type: text/event-stream", + "Host: localhost", + "Connection: close", + "", + ""); + + await connection.Receive( + "HTTP/1.1 200 OK", + ""); + await connection.ReceiveHeaders(); + + foreach (var message in messages) + { + await connection.Send(message); + await connection.ReceiveChunk(message); + } + + await connection.Send("\r\n"); + await connection.ReceiveChunk(""); + await connection.WaitForConnectionClose(); + } + } + + [ConditionalFact] + [RequiresIIS(IISCapability.DynamicCompression)] + public async Task DynamicResponsesAreCompressed() + { + var handler = new HttpClientHandler + { + AutomaticDecompression = DecompressionMethods.GZip + }; + var client = new HttpClient(handler) + { + BaseAddress = _fixture.Client.BaseAddress, + }; + client.DefaultRequestHeaders.AcceptEncoding.Add(new StringWithQualityHeaderValue("gzip")); + client.DefaultRequestHeaders.AcceptEncoding.Add(new StringWithQualityHeaderValue("identity", 0)); + client.DefaultRequestHeaders.Add("Response-Content-Type", "text/event-stream"); + var messages = "Message1\r\nMessage2\r\n"; + + // Send messages with terminator + var response = await client.PostAsync("ReadAndWriteEchoLines", new StringContent(messages + "\r\n")); + Assert.Equal(messages, await response.Content.ReadAsStringAsync()); + Assert.True(response.Content.Headers.TryGetValues("Content-Type", out var contentTypes)); + Assert.Single(contentTypes, "text/event-stream"); + // Not the cleanest check but I wasn't able to figure out other way to check + // that response was compressed + Assert.Contains("gzip", response.Content.GetType().FullName, StringComparison.OrdinalIgnoreCase); + } + } +} diff --git a/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs b/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs index aa79727e19..d18c4c7f09 100644 --- a/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs +++ b/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs @@ -34,6 +34,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal("THIS_VAR_IS_UNDEFINED: (null)", await _fixture.Client.GetStringAsync("/ServerVariable?q=THIS_VAR_IS_UNDEFINED")); } + [ConditionalFact] + public async Task CanSetAndReadVariable() + { + Assert.Equal("ROUNDTRIP: 1", await _fixture.Client.GetStringAsync("/ServerVariable?v=1&q=ROUNDTRIP")); + } + [ConditionalFact] public async Task BasePathIsNotPrefixedBySlashSlashQuestionMark() { diff --git a/test/Common.FunctionalTests/Utilities/IISCapability.cs b/test/Common.FunctionalTests/Utilities/IISCapability.cs index d62716db09..e96127ea9f 100644 --- a/test/Common.FunctionalTests/Utilities/IISCapability.cs +++ b/test/Common.FunctionalTests/Utilities/IISCapability.cs @@ -12,6 +12,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Websockets = 1, WindowsAuthentication = 2, PoolEnvironmentVariables = 4, - ShutdownToken = 8 + ShutdownToken = 8, + DynamicCompression = 16 } } diff --git a/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs b/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs new file mode 100644 index 0000000000..2c424943f3 --- /dev/null +++ b/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs @@ -0,0 +1,13 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [CollectionDefinition(Name)] + public class IISCompressionSiteCollection : ICollectionFixture + { + public const string Name = nameof(IISCompressionSiteCollection); + } +} diff --git a/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs b/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs new file mode 100644 index 0000000000..3aff68d11b --- /dev/null +++ b/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs @@ -0,0 +1,44 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Net.Http; +using System.Threading; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class IISCompressionSiteFixture : IISTestSiteFixture + { + public IISCompressionSiteFixture() : base(Configure) + { + } + + private static void Configure(IISDeploymentParameters deploymentParameters) + { + // Enable dynamic compression + deploymentParameters.ServerConfigActionList.Add( + (element, _) => { + var webServerElement = element + .RequiredElement("system.webServer"); + + webServerElement + .GetOrAdd("urlCompression") + .SetAttributeValue("doDynamicCompression", "true"); + + webServerElement + .GetOrAdd("httpCompression") + .GetOrAdd("dynamicTypes") + .GetOrAdd("add", "mimeType", "text/*") + .SetAttributeValue("enabled", "true"); + + }); + + deploymentParameters.EnableModule("DynamicCompressionModule", "%IIS_BIN%\\compdyn.dll"); + } + } +} diff --git a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs index fc5a3b6df1..5628a1acfb 100644 --- a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -14,40 +14,36 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class IISTestSiteFixture : IDisposable { - private readonly ApplicationDeployer _deployer; - private readonly ForwardingProvider _forwardingProvider; + private ApplicationDeployer _deployer; + private ILoggerFactory _loggerFactory; + private ForwardingProvider _forwardingProvider; + private IISDeploymentResult _deploymentResult; + private readonly Action _configure; - public IISTestSiteFixture() + public IISTestSiteFixture() : this(_ => { }) { - var logging = AssemblyTestLog.ForAssembly(typeof(IISTestSiteFixture).Assembly); - - var deploymentParameters = new IISDeploymentParameters(Helpers.GetInProcessTestSitesPath(), - DeployerSelector.ServerType, - RuntimeFlavor.CoreClr, - RuntimeArchitecture.x64) - { - TargetFramework = Tfm.NetCoreApp22, - AncmVersion = AncmVersion.AspNetCoreModuleV2, - HostingModel = HostingModel.InProcess, - PublishApplicationBeforeDeployment = true, - }; - - _forwardingProvider = new ForwardingProvider(); - var loggerFactory = logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture)); - loggerFactory.AddProvider(_forwardingProvider); - - _deployer = IISApplicationDeployerFactory.Create(deploymentParameters, loggerFactory); - - DeploymentResult = (IISDeploymentResult)_deployer.DeployAsync().Result; - Client = DeploymentResult.HttpClient; - BaseUri = DeploymentResult.ApplicationBaseUri; - ShutdownToken = DeploymentResult.HostShutdownToken; } - public string BaseUri { get; } - public HttpClient Client { get; } - public CancellationToken ShutdownToken { get; } - public IISDeploymentResult DeploymentResult { get; } + public IISTestSiteFixture(Action configure) + { + var logging = AssemblyTestLog.ForAssembly(typeof(IISTestSiteFixture).Assembly); + _loggerFactory = logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture)); + + _forwardingProvider = new ForwardingProvider(); + _loggerFactory.AddProvider(_forwardingProvider); + + _configure = configure; + } + + public HttpClient Client => DeploymentResult.HttpClient; + public IISDeploymentResult DeploymentResult + { + get + { + EnsureInitialized(); + return _deploymentResult; + } + } public TestConnection CreateTestConnection() { @@ -56,7 +52,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public void Dispose() { - _deployer.Dispose(); + _deployer?.Dispose(); } public void Attach(LoggedTest test) @@ -79,6 +75,30 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _forwardingProvider.LoggerFactory = null; } + private void EnsureInitialized() + { + if (_deployer != null) + { + return; + } + + var deploymentParameters = new IISDeploymentParameters(Helpers.GetInProcessTestSitesPath(), + DeployerSelector.ServerType, + RuntimeFlavor.CoreClr, + RuntimeArchitecture.x64) + { + TargetFramework = Tfm.NetCoreApp22, + AncmVersion = AncmVersion.AspNetCoreModuleV2, + HostingModel = HostingModel.InProcess, + PublishApplicationBeforeDeployment = true, + }; + + _configure(deploymentParameters); + + _deployer = IISApplicationDeployerFactory.Create(deploymentParameters, _loggerFactory); + _deploymentResult = (IISDeploymentResult)_deployer.DeployAsync().Result; + } + private class ForwardingProvider : ILoggerProvider { private readonly List _loggers = new List(); diff --git a/test/Common.Tests/Utilities/TestConnections.cs b/test/Common.Tests/Utilities/TestConnections.cs index 3c234a0f4d..722abc5b96 100644 --- a/test/Common.Tests/Utilities/TestConnections.cs +++ b/test/Common.Tests/Utilities/TestConnections.cs @@ -24,7 +24,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting private readonly bool _ownsSocket; private readonly Socket _socket; private readonly NetworkStream _stream; - private readonly StreamReader _reader; public TestConnection(int port) : this(port, AddressFamily.InterNetwork) @@ -46,13 +45,10 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting _ownsSocket = ownsSocket; _socket = socket; _stream = new NetworkStream(_socket, ownsSocket: false); - _reader = new StreamReader(_stream, Encoding.ASCII); } public Socket Socket => _socket; - public StreamReader Reader => _reader; - public void Dispose() { _stream.Dispose(); @@ -79,50 +75,96 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting await _stream.FlushAsync().ConfigureAwait(false); } + public async Task ReadCharAsync() + { + var bytes = new byte[1]; + return (await _stream.ReadAsync(bytes, 0, 1) == 1) ? bytes[0] : -1; + } + + public async Task ReadLineAsync() + { + var builder = new StringBuilder(); + var current = await ReadCharAsync(); + while (current != '\r') + { + builder.Append((char)current); + current = await ReadCharAsync(); + } + + // Consume \n + await ReadCharAsync(); + + return builder.ToString(); + } + + public async Task> ReceiveChunk() + { + var length = int.Parse(await ReadLineAsync(), System.Globalization.NumberStyles.HexNumber); + + var bytes = await Receive(length); + + await ReadLineAsync(); + + return bytes; + } + + public async Task ReceiveChunk(string expected) + { + Assert.Equal(expected, Encoding.ASCII.GetString((await ReceiveChunk()).Span)); + } + public async Task Receive(params string[] lines) { var expected = string.Join("\r\n", lines); - var actual = new char[expected.Length]; - var offset = 0; + var actual = await Receive(expected.Length); + Assert.Equal(expected, Encoding.ASCII.GetString(actual.Span)); + } + + private async Task> Receive(int length) + { + var actual = new byte[length]; + int offset = 0; try { - while (offset < expected.Length) + while (offset < length) { - var data = new byte[expected.Length]; - var task = _reader.ReadAsync(actual, offset, actual.Length - offset); + var task = _stream.ReadAsync(actual, offset, actual.Length - offset); if (!Debugger.IsAttached) { task = task.TimeoutAfter(Timeout); } + var count = await task.ConfigureAwait(false); if (count == 0) { break; } + offset += count; } } catch (TimeoutException ex) when (offset != 0) { - throw new TimeoutException($"Did not receive a complete response within {Timeout}.{Environment.NewLine}{Environment.NewLine}" + - $"Expected:{Environment.NewLine}{expected}{Environment.NewLine}{Environment.NewLine}" + - $"Actual:{Environment.NewLine}{new string(actual, 0, offset)}{Environment.NewLine}", + throw new TimeoutException( + $"Did not receive a complete response within {Timeout}.{Environment.NewLine}{Environment.NewLine}" + + $"Expected:{Environment.NewLine}{length} bytes of data{Environment.NewLine}{Environment.NewLine}" + + $"Actual:{Environment.NewLine}{Encoding.ASCII.GetString(actual, 0, offset)}{Environment.NewLine}", ex); } - Assert.Equal(expected, new string(actual, 0, offset)); + return actual.AsMemory(0, offset); } public async Task ReceiveStartsWith(string prefix, int maxLineLength = 1024) { - var actual = new char[maxLineLength]; + var actual = new byte[maxLineLength]; var offset = 0; while (offset < maxLineLength) { // Read one char at a time so we don't read past the end of the line. - var task = _reader.ReadAsync(actual, offset, 1); + var task = _stream.ReadAsync(actual, offset, 1); if (!Debugger.IsAttached) { Assert.True(task.Wait(4000), "timeout"); @@ -142,7 +184,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting } } - var actualLine = new string(actual, 0, offset); + var actualLine = Encoding.ASCII.GetString(actual, 0, offset); Assert.StartsWith(prefix, actualLine); } @@ -152,7 +194,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting string line; do { - line = await _reader.ReadLineAsync(); + line = await ReadLineAsync(); headers.Add(line); } while (line != ""); @@ -190,7 +232,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting else { tcs.SetException(new IOException( - $"Expected connection close, received data instead: \"{_reader.CurrentEncoding.GetString(e.Buffer, 0, e.BytesTransferred)}\"")); + $"Expected connection close, received data instead: \"{Encoding.ASCII.GetString(e.Buffer, 0, e.BytesTransferred)}\"")); } } diff --git a/test/IIS.FunctionalTests/RequiresIISAttribute.cs b/test/IIS.FunctionalTests/RequiresIISAttribute.cs index f94459fd8f..dc374293b8 100644 --- a/test/IIS.FunctionalTests/RequiresIISAttribute.cs +++ b/test/IIS.FunctionalTests/RequiresIISAttribute.cs @@ -18,12 +18,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private static readonly bool _isMetStatic; private static readonly string _skipReasonStatic; - private readonly bool _isMet; - private readonly string _skipReason; - private static readonly bool _websocketsAvailable; private static readonly bool _windowsAuthAvailable; private static readonly bool _poolEnvironmentVariablesAvailable; + private static readonly bool _dynamicCompressionAvailable; static RequiresIISAttribute() { @@ -84,6 +82,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _windowsAuthAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "authsspi.dll")); + _dynamicCompressionAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "compdyn.dll")); + var iisRegistryKey = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\InetStp", writable: false); if (iisRegistryKey == null) { @@ -98,47 +98,56 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } - public RequiresIISAttribute() + public RequiresIISAttribute() : this (IISCapability.None) { } public RequiresIISAttribute(IISCapability capabilities) { - _isMet = _isMetStatic; - _skipReason = _skipReasonStatic; + IsMet = _isMetStatic; + SkipReason = _skipReasonStatic; if (capabilities.HasFlag(IISCapability.Websockets)) { - _isMet &= _websocketsAvailable; + IsMet &= _websocketsAvailable; if (!_websocketsAvailable) { - _skipReason += "The machine does not have IIS websockets installed."; + SkipReason += "The machine does not have IIS websockets installed."; } } if (capabilities.HasFlag(IISCapability.WindowsAuthentication)) { - _isMet &= _windowsAuthAvailable; + IsMet &= _windowsAuthAvailable; if (!_windowsAuthAvailable) { - _skipReason += "The machine does not have IIS windows authentication installed."; + SkipReason += "The machine does not have IIS windows authentication installed."; } } if (capabilities.HasFlag(IISCapability.PoolEnvironmentVariables)) { - _isMet &= _poolEnvironmentVariablesAvailable; + IsMet &= _poolEnvironmentVariablesAvailable; if (!_poolEnvironmentVariablesAvailable) { - _skipReason += "The machine does allow for setting environment variables on application pools."; + SkipReason += "The machine does allow for setting environment variables on application pools."; } } if (capabilities.HasFlag(IISCapability.ShutdownToken)) { - _isMet = false; - _skipReason += "https://github.com/aspnet/IISIntegration/issues/1074"; + IsMet = false; + SkipReason += "https://github.com/aspnet/IISIntegration/issues/1074"; + } + + if (capabilities.HasFlag(IISCapability.DynamicCompression)) + { + IsMet &= _dynamicCompressionAvailable; + if (!_dynamicCompressionAvailable) + { + SkipReason += "The machine does not have IIS dynamic compression installed."; + } } } - public bool IsMet => _isMet; - public string SkipReason => _skipReason; + public bool IsMet { get; } + public string SkipReason { get; } } } diff --git a/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs b/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs index 2d97455d31..826001c96d 100644 --- a/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public WebSocketsTests(IISTestSiteFixture fixture) { - _webSocketUri = fixture.BaseUri.Replace("http:", "ws:"); + _webSocketUri = fixture.DeploymentResult.ApplicationBaseUri.Replace("http:", "ws:"); } [ConditionalFact] diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index 7bd530a9f9..ef1863ef2b 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -30,7 +30,13 @@ namespace TestSite private async Task ServerVariable(HttpContext ctx) { var varName = ctx.Request.Query["q"]; - await ctx.Response.WriteAsync($"{varName}: {ctx.GetIISServerVariable(varName) ?? "(null)"}"); + var newValue = ctx.Request.Query["v"]; + var feature = ctx.Features.Get(); + if (newValue.Count != 0) + { + feature[varName] = newValue; + } + await ctx.Response.WriteAsync($"{varName}: {feature[varName] ?? "(null)"}"); } private async Task AuthenticationAnonymous(HttpContext ctx) @@ -321,6 +327,11 @@ namespace TestSite private async Task ReadAndWriteEchoLines(HttpContext ctx) { + if (ctx.Request.Headers.TryGetValue("Response-Content-Type", out var contentType)) + { + ctx.Response.ContentType = contentType; + } + //Send headers await ctx.Response.Body.FlushAsync(); @@ -337,6 +348,31 @@ namespace TestSite } } + private async Task ReadAndWriteEchoLinesNoBuffering(HttpContext ctx) + { + var feature = ctx.Features.Get(); + feature.DisableResponseBuffering(); + + if (ctx.Request.Headers.TryGetValue("Response-Content-Type", out var contentType)) + { + ctx.Response.ContentType = contentType; + } + + //Send headers + await ctx.Response.Body.FlushAsync(); + + var reader = new StreamReader(ctx.Request.Body); + while (!reader.EndOfStream) + { + var line = await reader.ReadLineAsync(); + if (line == "") + { + return; + } + await ctx.Response.WriteAsync(line + Environment.NewLine); + } + } + private async Task ReadPartialBody(HttpContext ctx) { var data = new byte[5]; @@ -631,10 +667,11 @@ namespace TestSite // executed on background thread while request thread calls GetServerVariable // concurrent native calls may cause native object corruption + var serverVariableFeature = ctx.Features.Get(); await ctx.Response.WriteAsync("Response Begin"); for (int i = 0; i < 1000; i++) { - await ctx.Response.WriteAsync(ctx.GetIISServerVariable("REMOTE_PORT")); + await ctx.Response.WriteAsync(serverVariableFeature["REMOTE_PORT"]); await ctx.Response.Body.FlushAsync(); } await ctx.Response.WriteAsync("Response End"); From ece5ad36e22daea23e7428d744238ea146e47fd5 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 18 Sep 2018 14:22:56 -0700 Subject: [PATCH 283/363] Implement ITlsConnectionFeature (#1390) --- .../Core/IISHttpContext.FeatureCollection.cs | 37 ++++- .../Core/IISHttpContext.Features.cs | 1 + .../NativeMethods.cs | 1 - .../ClientCertificateFixture.cs | 91 +++++++++++ .../ClientCertificateTests.cs | 85 ++++++++++ .../CommonStartupTests.cs | 4 - .../PublishedSitesFixture.cs | 2 +- .../SkipIfNotAdminAttribute.cs | 25 +++ test/IISExpress.FunctionalTests/HttpsTests.cs | 60 +++++++ .../OutOfProcess/HttpsTest.cs | 148 ------------------ test/WebSites/InProcessWebSite/Startup.cs | 3 + test/WebSites/OutOfProcessWebSite/Startup.cs | 4 - .../shared/SharedStartup/Startup.shared.cs | 6 + 13 files changed, 307 insertions(+), 160 deletions(-) create mode 100644 test/Common.FunctionalTests/ClientCertificateFixture.cs create mode 100644 test/Common.FunctionalTests/ClientCertificateTests.cs create mode 100644 test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs create mode 100644 test/IISExpress.FunctionalTests/HttpsTests.cs delete mode 100644 test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs index df6ba267d0..19f65bc900 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs @@ -6,7 +6,9 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Runtime.InteropServices; using System.Security.Claims; +using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; @@ -24,13 +26,15 @@ namespace Microsoft.AspNetCore.Server.IIS.Core IHttpRequestLifetimeFeature, IHttpAuthenticationFeature, IServerVariablesFeature, - IHttpBufferingFeature + IHttpBufferingFeature, + ITlsConnectionFeature { // NOTE: When feature interfaces are added to or removed from this HttpProtocol implementation, // then the list of `implementedFeatures` in the generated code project MUST also be updated. private int _featureRevision; private string _httpProtocolVersion = null; + private X509Certificate2 _certificate; private List> MaybeExtra; public void ResetFeatureCollection() @@ -276,7 +280,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core ReasonPhrase = ReasonPhrases.GetReasonPhrase(StatusCodes.Status101SwitchingProtocols); // If we started reading before calling Upgrade Task should be completed at this point - // because read would return 0 syncronosly + // because read would return 0 synchronously Debug.Assert(_readBodyTask == null || _readBodyTask.IsCompleted); // Reset reading status to allow restarting with new IO @@ -290,6 +294,35 @@ namespace Microsoft.AspNetCore.Server.IIS.Core return new DuplexStream(RequestBody, ResponseBody); } + Task ITlsConnectionFeature.GetClientCertificateAsync(CancellationToken cancellationToken) + { + return Task.FromResult(((ITlsConnectionFeature)this).ClientCertificate); + } + + unsafe X509Certificate2 ITlsConnectionFeature.ClientCertificate + { + get + { + if (_certificate == null && + NativeRequest->pSslInfo != null && + NativeRequest->pSslInfo->pClientCertInfo != null && + NativeRequest->pSslInfo->pClientCertInfo->pCertEncoded != null && + NativeRequest->pSslInfo->pClientCertInfo->CertEncodedSize != 0) + { + // Based off of from https://referencesource.microsoft.com/#system/net/System/Net/HttpListenerRequest.cs,1037c8ec82879ba0,references + var rawCertificateCopy = new byte[NativeRequest->pSslInfo->pClientCertInfo->CertEncodedSize]; + Marshal.Copy((IntPtr)NativeRequest->pSslInfo->pClientCertInfo->pCertEncoded, rawCertificateCopy, 0, rawCertificateCopy.Length); + _certificate = new X509Certificate2(rawCertificateCopy); + } + + return _certificate; + } + set + { + _certificate = value; + } + } + IEnumerator> IEnumerable>.GetEnumerator() => FastEnumerable().GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => FastEnumerable().GetEnumerator(); diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs index f2a0016c0a..6e107e03f0 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs @@ -61,6 +61,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core _currentIHttpAuthenticationFeature = this; _currentIServerVariablesFeature = this; _currentIHttpBufferingFeature = this; + _currentITlsConnectionFeature = this; } internal object FastFeatureGet(Type key) diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs index c8feb2ef40..906a86cdda 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs @@ -23,7 +23,6 @@ namespace Microsoft.AspNetCore.Server.IIS public static extern bool CloseHandle(IntPtr handle); - [DllImport("kernel32.dll")] private static extern IntPtr GetModuleHandle(string lpModuleName); diff --git a/test/Common.FunctionalTests/ClientCertificateFixture.cs b/test/Common.FunctionalTests/ClientCertificateFixture.cs new file mode 100644 index 0000000000..c3fa927b46 --- /dev/null +++ b/test/Common.FunctionalTests/ClientCertificateFixture.cs @@ -0,0 +1,91 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Security.Cryptography; +using System.Security.Cryptography.X509Certificates; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class ClientCertificateFixture : IDisposable + { + public ClientCertificateFixture() + { + using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) + { + store.Open(OpenFlags.ReadWrite); + + foreach (var cert in store.Certificates) + { + if (cert.Issuer != "CN=IISIntegrationTest_Root") + { + continue; + } + Certificate = cert; + store.Close(); + return; + } + + var parentKey = CreateKeyMaterial(2048); + + // On first run of the test, creates the certificate in the trusted root certificate authorities. + var parentRequest = new CertificateRequest("CN=IISIntegrationTest_Root", parentKey, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); + + parentRequest.CertificateExtensions.Add( + new X509BasicConstraintsExtension( + certificateAuthority: true, + hasPathLengthConstraint: false, + pathLengthConstraint: 0, + critical: true)); + + parentRequest.CertificateExtensions.Add( + new X509KeyUsageExtension(X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.NonRepudiation, critical: true)); + + parentRequest.CertificateExtensions.Add( + new X509SubjectKeyIdentifierExtension(parentRequest.PublicKey, false)); + + var notBefore = DateTimeOffset.Now.AddDays(-1); + var notAfter = DateTimeOffset.Now.AddYears(5); + + var parentCert = parentRequest.CreateSelfSigned(notBefore, notAfter); + + // Need to export/import the certificate to associate the private key with the cert. + var imported = parentCert; + + var export = parentCert.Export(X509ContentType.Pkcs12, ""); + imported = new X509Certificate2(export, "", X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable); + Array.Clear(export, 0, export.Length); + + // Add the cert to the cert store + Certificate = imported; + + store.Add(certificate: imported); + store.Close(); + } + } + + public X509Certificate2 Certificate { get; } + + public void Dispose() + { + using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) + { + store.Open(OpenFlags.ReadWrite); + store.Remove(Certificate); + store.Close(); + } + } + + private RSA CreateKeyMaterial(int minimumKeySize) + { + var rsa = RSA.Create(minimumKeySize); + if (rsa.KeySize < minimumKeySize) + { + throw new InvalidOperationException($"Failed to create a key with a size of {minimumKeySize} bits"); + } + + return rsa; + } + } +} diff --git a/test/Common.FunctionalTests/ClientCertificateTests.cs b/test/Common.FunctionalTests/ClientCertificateTests.cs new file mode 100644 index 0000000000..289fb18c2f --- /dev/null +++ b/test/Common.FunctionalTests/ClientCertificateTests.cs @@ -0,0 +1,85 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.Common; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + [SkipIfNotAdmin] + public class ClientCertificateTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + private readonly ClientCertificateFixture _certFixture; + + public ClientCertificateTests(PublishedSitesFixture fixture, ClientCertificateFixture certFixture) + { + _fixture = fixture; + _certFixture = certFixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithAllApplicationTypes() + .WithAllAncmVersions() + .WithAllHostingModels(); + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public Task HttpsNoClientCert_NoClientCert(TestVariant variant) + { + return ClientCertTest(variant, sendClientCert: false); + } + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public Task HttpsClientCert_GetCertInformation(TestVariant variant) + { + return ClientCertTest(variant, sendClientCert: true); + } + + private async Task ClientCertTest(TestVariant variant, bool sendClientCert) + { + var port = TestPortHelper.GetNextSSLPort(); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); + deploymentParameters.ApplicationBaseUriHint = $"https://localhost:{port}/"; + deploymentParameters.AddHttpsToServerConfig(); + + var deploymentResult = await DeployAsync(deploymentParameters); + var handler = new HttpClientHandler + { + ServerCertificateCustomValidationCallback = (a, b, c, d) => true, + ClientCertificateOptions = ClientCertificateOption.Manual, + }; + + if (sendClientCert) + { + Assert.NotNull(_certFixture.Certificate); + handler.ClientCertificates.Add(_certFixture.Certificate); + } + + var client = deploymentResult.CreateClient(handler); + var response = await client.GetAsync("GetClientCert"); + + var responseText = await response.Content.ReadAsStringAsync(); + + if (sendClientCert) + { + Assert.Equal($"Enabled;{_certFixture.Certificate.GetCertHashString()}", responseText); + } + else + { + Assert.Equal("Disabled", responseText); + } + } + } +} diff --git a/test/Common.FunctionalTests/CommonStartupTests.cs b/test/Common.FunctionalTests/CommonStartupTests.cs index 760c1ad04b..e2bcf2a8f9 100644 --- a/test/Common.FunctionalTests/CommonStartupTests.cs +++ b/test/Common.FunctionalTests/CommonStartupTests.cs @@ -1,14 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; -using System.IO; -using System.Linq; using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; diff --git a/test/Common.FunctionalTests/PublishedSitesFixture.cs b/test/Common.FunctionalTests/PublishedSitesFixture.cs index 1ebfdab38e..282ee26109 100644 --- a/test/Common.FunctionalTests/PublishedSitesFixture.cs +++ b/test/Common.FunctionalTests/PublishedSitesFixture.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests /// This type just maps collection names to available fixtures /// [CollectionDefinition(Name)] - public class PublishedSitesCollection : ICollectionFixture + public class PublishedSitesCollection : ICollectionFixture, ICollectionFixture { public const string Name = nameof(PublishedSitesCollection); } diff --git a/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs b/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs new file mode 100644 index 0000000000..d2acb70415 --- /dev/null +++ b/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs @@ -0,0 +1,25 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Security.Principal; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class SkipIfNotAdminAttribute : Attribute, ITestCondition + { + public bool IsMet + { + get + { + var identity = WindowsIdentity.GetCurrent(); + var principal = new WindowsPrincipal(identity); + return principal.IsInRole(WindowsBuiltInRole.Administrator); + } + } + + public string SkipReason => "The current process is not running as admin."; + } +} diff --git a/test/IISExpress.FunctionalTests/HttpsTests.cs b/test/IISExpress.FunctionalTests/HttpsTests.cs new file mode 100644 index 0000000000..ac58f73c0e --- /dev/null +++ b/test/IISExpress.FunctionalTests/HttpsTests.cs @@ -0,0 +1,60 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.Common; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class HttpsTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public HttpsTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithAllApplicationTypes() + .WithAllAncmVersions() + .WithAllHostingModels(); + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task HttpsHelloWorld(TestVariant variant) + { + var port = TestPortHelper.GetNextSSLPort(); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); + deploymentParameters.ApplicationBaseUriHint = $"https://localhost:{port}/"; + deploymentParameters.AddHttpsToServerConfig(); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var handler = new HttpClientHandler + { + ServerCertificateCustomValidationCallback = (a, b, c, d) => true + }; + var client = deploymentResult.CreateClient(handler); + var response = await client.GetAsync("HttpsHelloWorld"); + var responseText = await response.Content.ReadAsStringAsync(); + if (variant.HostingModel == HostingModel.OutOfProcess) + { + Assert.Equal("Scheme:https; Original:http", responseText); + } + else + { + Assert.Equal("Scheme:https; Original:", responseText); + } + } + } +} diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs deleted file mode 100644 index 5735393c57..0000000000 --- a/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs +++ /dev/null @@ -1,148 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Net.Http; -using System.Security.Cryptography.X509Certificates; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Server.IntegrationTesting.Common; -using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; -using Microsoft.AspNetCore.Testing.xunit; -using Xunit; -using Xunit.Abstractions; - -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests -{ - // IIS Express preregisteres 44300-44399 ports with SSL bindings. - // So these tests always have to use ports in this range, and we can't rely on OS-allocated ports without a whole lot of ceremony around - // creating self-signed certificates and registering SSL bindings with HTTP.sys - // Test specific to IISExpress - [Collection(PublishedSitesCollection.Name)] - public class HttpsTest : IISFunctionalTestBase - { - private readonly PublishedSitesFixture _fixture; - - public HttpsTest(PublishedSitesFixture fixture) - { - _fixture = fixture; - } - - public static TestMatrix TestVariants - => TestMatrix.ForServers(DeployerSelector.ServerType) - .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) - .WithAllAncmVersions(); - - [ConditionalTheory] - [MemberData(nameof(TestVariants))] - public async Task HttpsHelloWorld(TestVariant variant) - { - var port = TestPortHelper.GetNextSSLPort(); - var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); - deploymentParameters.ApplicationBaseUriHint = $"https://localhost:{port}/"; - deploymentParameters.AddHttpsToServerConfig(); - - var deploymentResult = await DeployAsync(deploymentParameters); - - var handler = new HttpClientHandler - { - ServerCertificateCustomValidationCallback = (a, b, c, d) => true - }; - var client = deploymentResult.CreateClient(handler); - var response = await client.GetAsync("HttpsHelloWorld"); - var responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal("Scheme:https; Original:http", responseText); - } - - [ConditionalTheory] - [MemberData(nameof(TestVariants))] - public Task HttpsHelloWorld_NoClientCert(TestVariant variant) - { - return HttpsHelloWorldCerts(variant, sendClientCert: false); - } - -#pragma warning disable xUnit1004 // Test methods should not be skipped - [ConditionalTheory(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")] - [MemberData(nameof(TestVariants))] -#pragma warning restore xUnit1004 // Test methods should not be skipped - public Task HttpsHelloWorld_ClientCert(TestVariant variant) - { - return HttpsHelloWorldCerts(variant, sendClientCert: true); - } - - private async Task HttpsHelloWorldCerts(TestVariant variant, bool sendClientCert) - { - var port = TestPortHelper.GetNextSSLPort(); - var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); - deploymentParameters.ApplicationBaseUriHint = $"https://localhost:{port}/"; - deploymentParameters.AddHttpsToServerConfig(); - - var deploymentResult = await DeployAsync(deploymentParameters); - - var handler = new HttpClientHandler - { - ServerCertificateCustomValidationCallback = (a, b, c, d) => true, - ClientCertificateOptions = ClientCertificateOption.Manual - }; - - if (sendClientCert) - { - X509Certificate2 clientCert = FindClientCert(); - Assert.NotNull(clientCert); - handler.ClientCertificates.Add(clientCert); - } - - var client = deploymentResult.CreateClient(handler); - - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. - var response = await client.GetAsync("checkclientcert"); - - var responseText = await response.Content.ReadAsStringAsync(); - if (sendClientCert) - { - Assert.Equal("Scheme:https; Original:http; has cert? True", responseText); - } - else - { - Assert.Equal("Scheme:https; Original:http; has cert? False", responseText); - } - } - - private X509Certificate2 FindClientCert() - { - var store = new X509Store(); - store.Open(OpenFlags.ReadOnly); - - foreach (var cert in store.Certificates) - { - bool isClientAuth = false; - bool isSmartCard = false; - foreach (var extension in cert.Extensions) - { - var eku = extension as X509EnhancedKeyUsageExtension; - if (eku != null) - { - foreach (var oid in eku.EnhancedKeyUsages) - { - if (oid.FriendlyName == "Client Authentication") - { - isClientAuth = true; - } - else if (oid.FriendlyName == "Smart Card Logon") - { - isSmartCard = true; - break; - } - } - } - } - - if (isClientAuth && !isSmartCard) - { - return cert; - } - } - return null; - } - } -} diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index ef1863ef2b..39d3b9f765 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -681,5 +681,8 @@ namespace TestSite { await ctx.Response.WriteAsync(string.Join("|", Environment.GetCommandLineArgs().Skip(1))); } + + public Task HttpsHelloWorld(HttpContext ctx) => + ctx.Response.WriteAsync("Scheme:" + ctx.Request.Scheme + "; Original:" + ctx.Request.Headers["x-original-proto"]); } } diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/test/WebSites/OutOfProcessWebSite/Startup.cs index a796f9a7a3..de54a85a8a 100644 --- a/test/WebSites/OutOfProcessWebSite/Startup.cs +++ b/test/WebSites/OutOfProcessWebSite/Startup.cs @@ -42,10 +42,6 @@ namespace TestSite public Task HttpsHelloWorld(HttpContext ctx) => ctx.Response.WriteAsync("Scheme:" + ctx.Request.Scheme + "; Original:" + ctx.Request.Headers["x-original-proto"]); - public Task CheckClientCert(HttpContext ctx) => - ctx.Response.WriteAsync("Scheme:" + ctx.Request.Scheme + "; Original:" + ctx.Request.Headers["x-original-proto"] - + "; has cert? " + (ctx.Connection.ClientCertificate != null)); - public Task Anonymous(HttpContext context) => context.Response.WriteAsync("Anonymous?" + !context.User.Identity.IsAuthenticated); public Task Restricted(HttpContext context) diff --git a/test/WebSites/shared/SharedStartup/Startup.shared.cs b/test/WebSites/shared/SharedStartup/Startup.shared.cs index a804449029..4c6d2eb4cf 100644 --- a/test/WebSites/shared/SharedStartup/Startup.shared.cs +++ b/test/WebSites/shared/SharedStartup/Startup.shared.cs @@ -43,5 +43,11 @@ namespace TestSite await ctx.Response.WriteAsync(authScheme?.Name ?? "null"); } + + public async Task GetClientCert(HttpContext context) + { + var clientCert = context.Connection.ClientCertificate; + await context.Response.WriteAsync(clientCert != null ? $"Enabled;{clientCert.GetCertHashString()}" : "Disabled"); + } } } From b6c311c14d3c3cf89b1b28d52efa0088a580213e Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 18 Sep 2018 16:36:52 -0700 Subject: [PATCH 284/363] Add client disconnect and connection abort support (#1388) --- build/testsite.props | 4 +- .../AspNetCore/AspNetCore.vcxproj | 2 + .../AspNetCore/DisconnectHandler.cpp | 33 +++ .../AspNetCore/DisconnectHandler.h | 35 +++ src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp | 10 +- .../AspNetCore/proxymodule.cpp | 50 ++++- .../AspNetCore/proxymodule.h | 15 +- .../CommonLib/irequesthandler.h | 4 +- .../CommonLib/requesthandler.h | 8 +- .../inprocessapplication.cpp | 30 +-- .../inprocessapplication.h | 17 +- .../inprocesshandler.cpp | 22 +- .../inprocesshandler.h | 9 +- .../managedexports.cpp | 12 + .../OutOfProcessRequestHandler.vcxproj | 1 - .../disconnectcontext.h | 78 ------- .../forwardinghandler.cpp | 51 +---- .../forwardinghandler.h | 7 +- .../OutOfProcessRequestHandler/stdafx.h | 1 - .../Core/DuplexStream.cs | 1 - .../Core/EmptyStream.cs | 94 ++++++++ .../Core/HttpRequestStream.cs | 160 ++++++++++++++ .../Core/HttpResponseStream.cs | 151 +++++++++++++ .../Core/HttpStreamState.cs | 12 + .../Core/HttpUpgradeStream.cs | 208 ++++++++++++++++++ .../Core/IISHttpContext.FeatureCollection.cs | 24 +- ...HttpContext.IHttpRequestLifetimeFeature.cs | 71 ++++++ ...text.ReadWrite.cs => IISHttpContext.IO.cs} | 57 ++++- .../Core/IISHttpContext.cs | 37 ++-- .../Core/IISHttpContextOfT.cs | 4 +- .../Core/IISHttpResponseBody.cs | 65 ------ .../Core/IISHttpServer.cs | 19 +- .../Core/IISNativeApplication.cs | 4 +- .../Core/OutputProducer.cs | 17 +- .../Core/ReadOnlyStream.cs | 63 ++++++ .../Core/Streams.cs | 68 ++++++ .../ThrowingWasUpgradedWriteOnlyStream.cs | 28 +++ .../Core/WrappingStream.cs | 144 ++++++++++++ ...SHttpRequestBody.cs => WriteOnlyStream.cs} | 33 +-- .../CoreStrings.resx | 150 +++++++++++++ .../NativeMethods.cs | 13 +- .../Properties/CoreStrings.Designer.cs | 170 ++++++++++++++ .../Common.FunctionalTests/AppOfflineTests.cs | 2 +- .../Utilities/Helpers.cs | 2 +- .../Common.Tests/Utilities/TestConnections.cs | 1 + .../Utilities/TimeoutExtensions.cs | 11 +- test/IIS.Tests/ClientDisconnectTests.cs | 105 +++++++-- test/IIS.Tests/ConnectionIdFeatureTests.cs | 54 +++++ test/IIS.Tests/HttpBodyControlFeatureTests.cs | 31 +++ test/IIS.Tests/ResponseAbortTests.cs | 152 +++++++++++++ test/IIS.Tests/StrictTestServerTests.cs | 24 ++ .../InProcessWebSite/InProcessWebSite.csproj | 6 +- 52 files changed, 2021 insertions(+), 349 deletions(-) create mode 100644 src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp create mode 100644 src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h delete mode 100644 src/AspNetCoreModuleV2/OutOfProcessRequestHandler/disconnectcontext.h create mode 100644 src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs create mode 100644 src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs create mode 100644 src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs create mode 100644 src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs create mode 100644 src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs create mode 100644 src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs rename src/Microsoft.AspNetCore.Server.IIS/Core/{IISHttpContext.ReadWrite.cs => IISHttpContext.IO.cs} (81%) delete mode 100644 src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpResponseBody.cs create mode 100644 src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs create mode 100644 src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs create mode 100644 src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs create mode 100644 src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs rename src/Microsoft.AspNetCore.Server.IIS/Core/{IISHttpRequestBody.cs => WriteOnlyStream.cs} (57%) create mode 100644 src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx create mode 100644 src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs create mode 100644 test/IIS.Tests/ConnectionIdFeatureTests.cs create mode 100644 test/IIS.Tests/HttpBodyControlFeatureTests.cs create mode 100644 test/IIS.Tests/ResponseAbortTests.cs create mode 100644 test/IIS.Tests/StrictTestServerTests.cs diff --git a/build/testsite.props b/build/testsite.props index ad7204aab4..861d44a563 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -36,8 +36,8 @@ /config:"$(IISExpressAppHostConfig)" /systray:false -h "$(IISAppHostConfig)" - $(NativePlatform)\aspnetcore.dll - $(NativePlatform)\aspnetcorev2.dll + $(AspNetCoreModuleV1ShimDll) + $(AspNetCoreModuleV2ShimDll) aspnetcorev2_inprocess.dll $(userprofile)\.dotnet\$(NativePlatform)\dotnet.exe diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index b71ab41c83..bd0129be53 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -231,6 +231,7 @@ + @@ -246,6 +247,7 @@ + diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp new file mode 100644 index 0000000000..b921994850 --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp @@ -0,0 +1,33 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "DisconnectHandler.h" +#include "exceptions.h" +#include "proxymodule.h" + +void DisconnectHandler::NotifyDisconnect() +{ + try + { + const auto module = m_pModule.exchange(nullptr); + if (module != nullptr) + { + module ->NotifyDisconnect(); + } + } + catch (...) + { + OBSERVE_CAUGHT_EXCEPTION(); + } +} + +void DisconnectHandler::CleanupStoredContext() noexcept +{ + SetHandler(nullptr); + delete this; +} + +void DisconnectHandler::SetHandler(ASPNET_CORE_PROXY_MODULE * module) noexcept +{ + m_pModule = module; +} diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h new file mode 100644 index 0000000000..34c8a24a63 --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h @@ -0,0 +1,35 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#pragma once +#include + +class ASPNET_CORE_PROXY_MODULE; + +class DisconnectHandler final: public IHttpConnectionStoredContext +{ +public: + DisconnectHandler() + : m_pModule(nullptr) + { + } + + virtual + ~DisconnectHandler() + { + SetHandler(nullptr); + } + + void + NotifyDisconnect() override; + + void + CleanupStoredContext() noexcept override; + + void + SetHandler(ASPNET_CORE_PROXY_MODULE * module) noexcept; + +private: + std::atomic m_pModule; +}; + diff --git a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp index 4ec0d774dd..3fce85afdd 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp @@ -41,7 +41,7 @@ BOOL WINAPI DllMain(HMODULE hModule, switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: - + ALLOC_CACHE_HANDLER::StaticInitialize(); g_hServerModule = hModule; DisableThreadLibraryCalls(hModule); @@ -101,7 +101,7 @@ HRESULT { g_hEventLog = RegisterEventSource(nullptr, ASPNETCORE_EVENT_PROVIDER); } - + // check whether the feature is disabled due to security reason if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters", @@ -144,9 +144,9 @@ HRESULT // The ASPNET_CORE_PROXY_MODULE_FACTORY::Terminate method will clean any // static object initialized. // - + auto applicationManager = std::make_shared(g_hServerModule, *pHttpServer); - auto moduleFactory = std::make_unique(applicationManager); + auto moduleFactory = std::make_unique(pModuleInfo->GetId(), applicationManager); RETURN_IF_FAILED(pModuleInfo->SetRequestNotifications( moduleFactory.release(), @@ -159,7 +159,7 @@ HRESULT pGlobalModule.release(), GL_CONFIGURATION_CHANGE | // Configuration change trigers IIS application stop GL_STOP_LISTENING)); // worker process stop or recycle - + return S_OK; } CATCH_RETURN() diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index 8fafe13c1a..d3d71e8b4b 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -6,13 +6,15 @@ #include "applicationmanager.h" #include "applicationinfo.h" #include "exceptions.h" +#include "DisconnectHandler.h" extern BOOL g_fInShutdown; __override -ASPNET_CORE_PROXY_MODULE_FACTORY::ASPNET_CORE_PROXY_MODULE_FACTORY(std::shared_ptr applicationManager) noexcept - :m_pApplicationManager(std::move(applicationManager)) +ASPNET_CORE_PROXY_MODULE_FACTORY::ASPNET_CORE_PROXY_MODULE_FACTORY(HTTP_MODULE_ID moduleId, std::shared_ptr applicationManager) noexcept + : m_pApplicationManager(std::move(applicationManager)), + m_moduleId(moduleId) { } @@ -22,10 +24,10 @@ ASPNET_CORE_PROXY_MODULE_FACTORY::GetHttpModule( IModuleAllocator * pAllocator ) { - + #pragma warning( push ) #pragma warning ( disable : 26409 ) // Disable "Avoid using new" - *ppModule = new (pAllocator) ASPNET_CORE_PROXY_MODULE(m_pApplicationManager); + *ppModule = new (pAllocator) ASPNET_CORE_PROXY_MODULE(m_moduleId, m_pApplicationManager); #pragma warning( push ) if (*ppModule == nullptr) { @@ -58,13 +60,23 @@ Return value: delete this; } -ASPNET_CORE_PROXY_MODULE::ASPNET_CORE_PROXY_MODULE(std::shared_ptr applicationManager) noexcept +ASPNET_CORE_PROXY_MODULE::ASPNET_CORE_PROXY_MODULE(HTTP_MODULE_ID moduleId, std::shared_ptr applicationManager) noexcept : m_pApplicationManager(std::move(applicationManager)), m_pApplicationInfo(nullptr), - m_pHandler(nullptr) + m_pHandler(nullptr), + m_moduleId(moduleId), + m_pDisconnectHandler(nullptr) { } +ASPNET_CORE_PROXY_MODULE::~ASPNET_CORE_PROXY_MODULE() +{ + if (m_pDisconnectHandler != nullptr) + { + m_pDisconnectHandler->SetHandler(nullptr); + } +} + __override REQUEST_NOTIFICATION_STATUS ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( @@ -77,12 +89,31 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( try { - if (g_fInShutdown) { FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); } + auto moduleContainer = pHttpContext + ->GetConnection() + ->GetModuleContextContainer(); + + #pragma warning( push ) + #pragma warning ( disable : 26466 ) // Disable "Don't use static_cast downcasts". We build without RTTI support so dynamic_cast is not available + m_pDisconnectHandler = static_cast(moduleContainer->GetConnectionModuleContext(m_moduleId)); + #pragma warning( push ) + + if (m_pDisconnectHandler == nullptr) + { + auto disconnectHandler = std::make_unique(); + m_pDisconnectHandler = disconnectHandler.get(); + // ModuleContextContainer takes ownership of disconnectHandler + // we are trusting that it would not release it before deleting the context + FINISHED_IF_FAILED(moduleContainer->SetConnectionModuleContext(static_cast(disconnectHandler.release()), m_moduleId)); + } + + m_pDisconnectHandler->SetHandler(this); + FINISHED_IF_FAILED(m_pApplicationManager->GetOrCreateApplicationInfo( *pHttpContext, m_pApplicationInfo)); @@ -135,3 +166,8 @@ ASPNET_CORE_PROXY_MODULE::OnAsyncCompletion( return RQ_NOTIFICATION_FINISH_REQUEST; } } + +void ASPNET_CORE_PROXY_MODULE::NotifyDisconnect() const +{ + m_pHandler->NotifyDisconnect(); +} diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h index 7c67712bab..97c126b0f9 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h @@ -7,6 +7,7 @@ #include "applicationinfo.h" #include "irequesthandler.h" #include "applicationmanager.h" +#include "DisconnectHandler.h" extern HTTP_MODULE_ID g_pModuleId; @@ -14,9 +15,9 @@ class ASPNET_CORE_PROXY_MODULE : NonCopyable, public CHttpModule { public: - ASPNET_CORE_PROXY_MODULE(std::shared_ptr applicationManager) noexcept; + ASPNET_CORE_PROXY_MODULE(HTTP_MODULE_ID moduleId, std::shared_ptr applicationManager) noexcept; - ~ASPNET_CORE_PROXY_MODULE() = default; + ~ASPNET_CORE_PROXY_MODULE(); void * operator new(size_t size, IModuleAllocator * pPlacement) { @@ -46,16 +47,21 @@ class ASPNET_CORE_PROXY_MODULE : NonCopyable, public CHttpModule IHttpCompletionInfo * pCompletionInfo ) override; + void + NotifyDisconnect() const; + private: std::shared_ptr m_pApplicationManager; std::shared_ptr m_pApplicationInfo; std::unique_ptr m_pHandler; + HTTP_MODULE_ID m_moduleId; + DisconnectHandler * m_pDisconnectHandler; }; class ASPNET_CORE_PROXY_MODULE_FACTORY : NonCopyable, public IHttpModuleFactory { public: - ASPNET_CORE_PROXY_MODULE_FACTORY(std::shared_ptr applicationManager) noexcept; + ASPNET_CORE_PROXY_MODULE_FACTORY(HTTP_MODULE_ID moduleId, std::shared_ptr applicationManager) noexcept; virtual ~ASPNET_CORE_PROXY_MODULE_FACTORY() = default; HRESULT @@ -66,7 +72,8 @@ class ASPNET_CORE_PROXY_MODULE_FACTORY : NonCopyable, public IHttpModuleFactory VOID Terminate() noexcept override; - + private: std::shared_ptr m_pApplicationManager; + HTTP_MODULE_ID m_moduleId; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h index 5f9b415794..8bd2076072 100644 --- a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h @@ -26,9 +26,7 @@ public: virtual VOID - TerminateRequest( - bool fClientInitiated - ) = 0; + NotifyDisconnect() noexcept(false) = 0; virtual ~IREQUEST_HANDLER( diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h index 7de54e4c77..a5e16bf022 100644 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h @@ -14,7 +14,7 @@ class REQUEST_HANDLER: public virtual IREQUEST_HANDLER public: VOID - ReferenceRequestHandler() noexcept override + ReferenceRequestHandler() noexcept override { InterlockedIncrement(&m_cRefs); } @@ -39,9 +39,11 @@ public: return RQ_NOTIFICATION_FINISH_REQUEST; } - VOID TerminateRequest(bool fClientInitiated) override + #pragma warning( push ) + #pragma warning ( disable : 26440 ) // Disable "Can be marked with noexcept" + VOID NotifyDisconnect() override + #pragma warning( pop ) { - UNREFERENCED_PARAMETER(fClientInitiated); } private: diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 6f37a1a3b9..7fd934ae87 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -44,14 +44,14 @@ IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION() VOID IN_PROCESS_APPLICATION::StopInternal(bool fServerInitiated) -{ +{ StopClr(); InProcessApplicationBase::StopInternal(fServerInitiated); } VOID IN_PROCESS_APPLICATION::StopClr() -{ +{ LOG_INFO(L"Stopping CLR"); if (!m_blockManagedCallbacks) @@ -86,6 +86,7 @@ VOID IN_PROCESS_APPLICATION::SetCallbackHandles( _In_ PFN_REQUEST_HANDLER request_handler, _In_ PFN_SHUTDOWN_HANDLER shutdown_handler, + _In_ PFN_DISCONNECT_HANDLER disconnect_callback, _In_ PFN_ASYNC_COMPLETION_HANDLER async_completion_handler, _In_ VOID* pvRequstHandlerContext, _In_ VOID* pvShutdownHandlerContext @@ -95,6 +96,7 @@ IN_PROCESS_APPLICATION::SetCallbackHandles( m_RequestHandler = request_handler; m_RequestHandlerContext = pvRequstHandlerContext; + m_DisconnectHandler = disconnect_callback; m_ShutdownHandler = shutdown_handler; m_ShutdownHandlerContext = pvShutdownHandlerContext; m_AsyncCompletionHandler = async_completion_handler; @@ -135,13 +137,13 @@ IN_PROCESS_APPLICATION::LoadManagedApplication() }, ::ReferenceApplication(this)); LOG_INFO(L"Waiting for initialization"); - + const HANDLE waitHandles[2] = { m_pInitializeEvent, m_workerThread.native_handle() }; - + // Wait for shutdown request const auto waitResult = WaitForMultipleObjects(2, waitHandles, FALSE, m_pConfig->QueryStartupTimeLimitInMS()); THROW_LAST_ERROR_IF(waitResult == WAIT_FAILED); - + if (waitResult == WAIT_TIMEOUT) { // If server wasn't initialized in time shut application down without waiting for CLR thread to exit @@ -168,9 +170,9 @@ void IN_PROCESS_APPLICATION::ExecuteApplication() { try - { + { std::unique_ptr hostFxrOptions; - + auto context = std::make_shared(); auto pProc = s_fMainCallback; @@ -184,7 +186,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication() // Get the entry point for main pProc = reinterpret_cast(GetProcAddress(hModule, "hostfxr_main")); THROW_LAST_ERROR_IF_NULL(pProc); - + THROW_IF_FAILED(HOSTFXR_OPTIONS::Create( m_dotnetExeKnownLocation, m_pConfig->QueryProcessPath(), @@ -217,7 +219,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication() // We set a static so that managed code can call back into this instance and // set the callbacks s_Application = this; - + //Start CLR thread m_clrThread = std::thread(ClrThreadEntryPoint, context); @@ -237,7 +239,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication() { const auto clrWaitResult = WaitForSingleObject(m_clrThread.native_handle(), m_pConfig->QueryShutdownTimeLimitInMS()); THROW_LAST_ERROR_IF(waitResult == WAIT_FAILED); - + clrThreadExited = clrWaitResult != WAIT_TIMEOUT; } @@ -274,7 +276,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication() // in case when it was not initialized we need to keep server running to serve 502 page if (m_Initialized) { - QueueStop(); + QueueStop(); } } } @@ -298,7 +300,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication() QueryApplicationId().c_str(), QueryApplicationPhysicalPath().c_str(), GetUnexpectedExceptionMessage(ex).c_str()); - + OBSERVE_CAUGHT_EXCEPTION(); } } @@ -500,9 +502,9 @@ IN_PROCESS_APPLICATION::CreateHandler( { try { - *pRequestHandler = new IN_PROCESS_HANDLER(::ReferenceApplication(this), pHttpContext, m_RequestHandler, m_RequestHandlerContext, m_AsyncCompletionHandler); + *pRequestHandler = new IN_PROCESS_HANDLER(::ReferenceApplication(this), pHttpContext, m_RequestHandler, m_RequestHandlerContext, m_DisconnectHandler, m_AsyncCompletionHandler); } CATCH_RETURN(); - + return S_OK; } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index e2488d71e7..caf16193d6 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -10,6 +10,7 @@ class IN_PROCESS_HANDLER; typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_REQUEST_HANDLER) (IN_PROCESS_HANDLER* pInProcessHandler, void* pvRequestHandlerContext); +typedef VOID(WINAPI * PFN_DISCONNECT_HANDLER) (void *pvManagedHttpContext); typedef BOOL(WINAPI * PFN_SHUTDOWN_HANDLER) (void* pvShutdownHandlerContext); typedef REQUEST_NOTIFICATION_STATUS(WINAPI * PFN_ASYNC_COMPLETION_HANDLER)(void *pvManagedHttpContext, HRESULT hrCompletionStatus, DWORD cbCompletion); @@ -33,6 +34,7 @@ public: SetCallbackHandles( _In_ PFN_REQUEST_HANDLER request_callback, _In_ PFN_SHUTDOWN_HANDLER shutdown_callback, + _In_ PFN_DISCONNECT_HANDLER disconnect_callback, _In_ PFN_ASYNC_COMPLETION_HANDLER managed_context_callback, _In_ VOID* pvRequstHandlerContext, _In_ VOID* pvShutdownHandlerContext @@ -48,14 +50,14 @@ public: // Executes the .NET Core process void ExecuteApplication(); - + HRESULT LoadManagedApplication(); void QueueStop(); - + void StopIncomingRequests() { @@ -110,7 +112,7 @@ public: private: struct ExecuteClrContext: std::enable_shared_from_this { - ExecuteClrContext(): + ExecuteClrContext(): m_argc(0), m_pProc(nullptr), m_exitCode(0), @@ -121,11 +123,11 @@ private: DWORD m_argc; std::unique_ptr m_argv; hostfxr_main_fn m_pProc; - + int m_exitCode; int m_exceptionCode; }; - + // Thread executing the .NET Core process this might be abandoned in timeout cases std::thread m_clrThread; // Thread tracking the CLR thread, this one is always joined on shutdown @@ -144,6 +146,7 @@ private: VOID* m_ShutdownHandlerContext; PFN_ASYNC_COMPLETION_HANDLER m_AsyncCompletionHandler; + PFN_DISCONNECT_HANDLER m_DisconnectHandler; std::wstring m_dotnetExeKnownLocation; @@ -164,7 +167,7 @@ private: HRESULT SetEnvironmentVariablesOnWorkerProcess(); - + void StopClr(); @@ -175,7 +178,7 @@ private: static void ExecuteClr(const std::shared_ptr &context); - + // Allows to override call to hostfxr_main with custom callback // used in testing inline static hostfxr_main_fn s_fMainCallback = nullptr; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 9e7e84d7f1..c8fc89956e 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -6,6 +6,7 @@ #include "aspnetcore_event.h" #include "IOutputManager.h" #include "ShuttingDownApplication.h" +#include "ntassert.h" ALLOC_CACHE_HANDLER * IN_PROCESS_HANDLER::sm_pAlloc = NULL; @@ -14,6 +15,7 @@ IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( _In_ IHttpContext *pW3Context, _In_ PFN_REQUEST_HANDLER pRequestHandler, _In_ void * pRequestHandlerContext, + _In_ PFN_DISCONNECT_HANDLER pDisconnectHandler, _In_ PFN_ASYNC_COMPLETION_HANDLER pAsyncCompletion ): m_pManagedHttpContext(nullptr), m_requestNotificationStatus(RQ_NOTIFICATION_PENDING), @@ -22,7 +24,8 @@ IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( m_pApplication(std::move(pApplication)), m_pRequestHandler(pRequestHandler), m_pRequestHandlerContext(pRequestHandlerContext), - m_pAsyncCompletionHandler(pAsyncCompletion) + m_pAsyncCompletionHandler(pAsyncCompletion), + m_pDisconnectHandler(pDisconnectHandler) { } @@ -63,7 +66,7 @@ IN_PROCESS_HANDLER::OnExecuteRequestHandler() { return ServerShutdownMessage(); } - + return m_pRequestHandler(this, m_pRequestHandlerContext); } @@ -87,6 +90,7 @@ IN_PROCESS_HANDLER::OnAsyncCompletion( return ServerShutdownMessage(); } + assert(m_pManagedHttpContext != nullptr); // Call the managed handler for async completion. return m_pAsyncCompletionHandler(m_pManagedHttpContext, hrCompletionStatus, cbCompletion); } @@ -97,11 +101,16 @@ REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::ServerShutdownMessage() const } VOID -IN_PROCESS_HANDLER::TerminateRequest( - bool fClientInitiated -) +IN_PROCESS_HANDLER::NotifyDisconnect() { - UNREFERENCED_PARAMETER(fClientInitiated); + if (m_pApplication->QueryBlockCallbacksIntoManaged() || + m_fManagedRequestComplete) + { + return; + } + + assert(m_pManagedHttpContext != nullptr); + m_pDisconnectHandler(m_pManagedHttpContext); } VOID @@ -110,6 +119,7 @@ IN_PROCESS_HANDLER::IndicateManagedRequestComplete( ) { m_fManagedRequestComplete = TRUE; + m_pManagedHttpContext = nullptr; } VOID diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h index 6089adc3ca..c1fae5dfc7 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h @@ -18,6 +18,7 @@ public: _In_ IHttpContext *pW3Context, _In_ PFN_REQUEST_HANDLER pRequestHandler, _In_ void * pRequestHandlerContext, + _In_ PFN_DISCONNECT_HANDLER m_DisconnectHandler, _In_ PFN_ASYNC_COMPLETION_HANDLER pAsyncCompletion); ~IN_PROCESS_HANDLER() override = default; @@ -35,10 +36,8 @@ public: __override VOID - TerminateRequest( - bool fClientInitiated - ) override; - + NotifyDisconnect() override; + IHttpContext* QueryHttpContext() const { @@ -82,6 +81,6 @@ private: PFN_REQUEST_HANDLER m_pRequestHandler; void* m_pRequestHandlerContext; PFN_ASYNC_COMPLETION_HANDLER m_pAsyncCompletionHandler; - + PFN_DISCONNECT_HANDLER m_pDisconnectHandler; static ALLOC_CACHE_HANDLER * sm_pAlloc; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp index 27a41da909..2185f975a4 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp @@ -16,6 +16,7 @@ register_callbacks( _In_ IN_PROCESS_APPLICATION* pInProcessApplication, _In_ PFN_REQUEST_HANDLER request_handler, _In_ PFN_SHUTDOWN_HANDLER shutdown_handler, + _In_ PFN_DISCONNECT_HANDLER disconnect_handler, _In_ PFN_ASYNC_COMPLETION_HANDLER async_completion_handler, _In_ VOID* pvRequstHandlerContext, _In_ VOID* pvShutdownHandlerContext @@ -29,6 +30,7 @@ register_callbacks( pInProcessApplication->SetCallbackHandles( request_handler, shutdown_handler, + disconnect_handler, async_completion_handler, pvRequstHandlerContext, pvShutdownHandlerContext @@ -424,6 +426,16 @@ http_disable_buffering( return S_OK; } +EXTERN_C __MIDL_DECLSPEC_DLLEXPORT +HRESULT +http_close_connection( + _In_ IN_PROCESS_HANDLER* pInProcessHandler +) +{ + pInProcessHandler->QueryHttpContext()->GetResponse()->ResetConnection(); + return S_OK; +} + EXTERN_C __MIDL_DECLSPEC_DLLEXPORT HRESULT http_response_set_unknown_header( diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index df9c00ebb1..3c4ee3b264 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -224,7 +224,6 @@ - diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/disconnectcontext.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/disconnectcontext.h deleted file mode 100644 index e421fe11e3..0000000000 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/disconnectcontext.h +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#pragma once - -class ASYNC_DISCONNECT_CONTEXT : public IHttpConnectionStoredContext -{ -public: - ASYNC_DISCONNECT_CONTEXT() - { - m_pHandler = NULL; - } - - VOID - CleanupStoredContext() - { - DBG_ASSERT(m_pHandler == NULL); - delete this; - } - - VOID - NotifyDisconnect() - { - IREQUEST_HANDLER *pInitialValue = (IREQUEST_HANDLER*) - InterlockedExchangePointer((PVOID*)&m_pHandler, NULL); - - if (pInitialValue != NULL) - { - pInitialValue->TerminateRequest(TRUE); - pInitialValue->DereferenceRequestHandler(); - } - } - - VOID - SetHandler( - IREQUEST_HANDLER *pHandler - ) - { - // - // Take a reference on the forwarding handler. - // This reference will be released on either of two conditions: - // - // 1. When the request processing ends, in which case a ResetHandler() - // is called. - // - // 2. When a disconnect notification arrives. - // - // We need to make sure that only one of them ends up dereferencing - // the object. - // - - DBG_ASSERT(pHandler != NULL); - DBG_ASSERT(m_pHandler == NULL); - - pHandler->ReferenceRequestHandler(); - InterlockedExchangePointer((PVOID*)&m_pHandler, pHandler); - } - - VOID - ResetHandler( - VOID - ) - { - IREQUEST_HANDLER *pInitialValue = (IREQUEST_HANDLER*) - InterlockedExchangePointer((PVOID*)&m_pHandler, NULL); - - if (pInitialValue != NULL) - { - pInitialValue->DereferenceRequestHandler(); - } - } - -private: - ~ASYNC_DISCONNECT_CONTEXT() - {} - - IREQUEST_HANDLER * m_pHandler; -}; \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp index 6dd018783b..c43241495d 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp @@ -46,7 +46,8 @@ FORWARDING_HANDLER::FORWARDING_HANDLER( m_fServerResetConn(FALSE), m_cRefs(1), m_pW3Context(pW3Context), - m_pApplication(std::move(pApplication)) + m_pApplication(std::move(pApplication)), + m_fReactToDisconnect(FALSE) { LOG_TRACE(L"FORWARDING_HANDLER::FORWARDING_HANDLER"); @@ -73,7 +74,7 @@ FORWARDING_HANDLER::~FORWARDING_HANDLER( // The m_pServer cleanup would happen afterwards, since there may be a // call pending from SHARED_HANDLER to FORWARDING_HANDLER::SetStatusAndHeaders() // - DBG_ASSERT(m_pDisconnect == NULL); + DBG_ASSERT(!m_fReactToDisconnect); RemoveRequest(); @@ -93,7 +94,6 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; HRESULT hr = S_OK; BOOL fRequestLocked = FALSE; - BOOL fHandleSet = FALSE; BOOL fFailedToStartKestrel = FALSE; BOOL fSecure = FALSE; HINTERNET hConnect = NULL; @@ -199,31 +199,7 @@ FORWARDING_HANDLER::OnExecuteRequestHandler() goto Failure; } - // Set client disconnect callback contract with IIS - m_pDisconnect = static_cast( - pClientConnection->GetModuleContextContainer()-> - GetConnectionModuleContext(m_pModuleId)); - if (m_pDisconnect == NULL) - { - m_pDisconnect = new ASYNC_DISCONNECT_CONTEXT(); - if (m_pDisconnect == NULL) - { - hr = E_OUTOFMEMORY; - goto Failure; - } - - hr = pClientConnection->GetModuleContextContainer()-> - SetConnectionModuleContext(m_pDisconnect, - m_pModuleId); - DBG_ASSERT(hr != HRESULT_FROM_WIN32(ERROR_ALREADY_ASSIGNED)); - if (FAILED_LOG(hr)) - { - goto Failure; - } - } - - m_pDisconnect->SetHandler(this); - fHandleSet = TRUE; + m_fReactToDisconnect = TRUE; // require lock as client disconnect callback may happen AcquireSRWLockShared(&m_RequestLock); @@ -2705,21 +2681,16 @@ FORWARDING_HANDLER::RemoveRequest( VOID ) { - ASYNC_DISCONNECT_CONTEXT * pDisconnect; - pDisconnect = (ASYNC_DISCONNECT_CONTEXT *)InterlockedExchangePointer((PVOID*)&m_pDisconnect, NULL); - if (pDisconnect != NULL) - { - pDisconnect->ResetHandler(); - pDisconnect = NULL; - } + m_fReactToDisconnect = FALSE; } VOID -FORWARDING_HANDLER::TerminateRequest( - bool fClientInitiated -) +FORWARDING_HANDLER::NotifyDisconnect() { - UNREFERENCED_PARAMETER(fClientInitiated); + if (!m_fReactToDisconnect) + { + return; + } BOOL fLocked = FALSE; if (TlsGetValue(g_dwTlsIndex) != this) @@ -2740,7 +2711,7 @@ FORWARDING_HANDLER::TerminateRequest( if (!m_fHttpHandleInClose) { - m_fClientDisconnected = fClientInitiated; + m_fClientDisconnected = true; } if (fLocked) diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h index a41b86fe50..cb9255e16d 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h @@ -68,9 +68,7 @@ public: StaticTerminate(); VOID - TerminateRequest( - bool fClientInitiated - ); + NotifyDisconnect() override; static void * operator new(size_t size); @@ -220,7 +218,6 @@ private: DWORD m_cMinBufferLimit; ULONGLONG m_cContentLength; WEBSOCKET_HANDLER * m_pWebSocket; - ASYNC_DISCONNECT_CONTEXT * m_pDisconnect; BYTE * m_pEntityBuffer; static const SIZE_T INLINE_ENTITY_BUFFERS = 8; @@ -239,5 +236,5 @@ private: mutable LONG m_cRefs; IHttpContext* m_pW3Context; std::unique_ptr m_pApplication; - HTTP_MODULE_ID m_pModuleId; + bool m_fReactToDisconnect; }; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h index 83498f3057..0134ac111e 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h @@ -59,7 +59,6 @@ #include "resources.h" #include "aspnetcore_event.h" #include "aspnetcore_msg.h" -#include "disconnectcontext.h" #include "requesthandler_config.h" #include "sttimer.h" diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs index 46cda59046..8ff01c778f 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; namespace Microsoft.AspNetCore.Server.IIS.Core { - // TODO redudant file, remove // See https://github.com/aspnet/IISIntegration/issues/426 internal class DuplexStream : Stream { diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs new file mode 100644 index 0000000000..dfc804df42 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs @@ -0,0 +1,94 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Runtime.ExceptionServices; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http.Features; + +namespace Microsoft.AspNetCore.Server.IIS.Core +{ + internal class EmptyStream : ReadOnlyStream + { + private readonly IHttpBodyControlFeature _bodyControl; + private HttpStreamState _state; + private Exception _error; + + public EmptyStream(IHttpBodyControlFeature bodyControl) + { + _bodyControl = bodyControl; + _state = HttpStreamState.Open; + } + + public override void Flush() + { + } + + public override Task FlushAsync(CancellationToken cancellationToken) + { + return Task.CompletedTask; + } + + public override int Read(byte[] buffer, int offset, int count) + { + if (!_bodyControl.AllowSynchronousIO) + { + throw new InvalidOperationException(CoreStrings.SynchronousReadsDisallowed); + } + + return 0; + } + + public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + ValidateState(cancellationToken); + + return Task.FromResult(0); + } + + public void StopAcceptingReads() + { + // Can't use dispose (or close) as can be disposed too early by user code + // As exampled in EngineTests.ZeroContentLengthNotSetAutomaticallyForCertainStatusCodes + _state = HttpStreamState.Closed; + } + + public void Abort(Exception error = null) + { + // We don't want to throw an ODE until the app func actually completes. + // If the request is aborted, we throw a TaskCanceledException instead, + // unless error is not null, in which case we throw it. + if (_state != HttpStreamState.Closed) + { + _state = HttpStreamState.Aborted; + _error = error; + } + } + + private void ValidateState(CancellationToken cancellationToken) + { + switch (_state) + { + case HttpStreamState.Open: + if (cancellationToken.IsCancellationRequested) + { + cancellationToken.ThrowIfCancellationRequested(); + } + break; + case HttpStreamState.Closed: + throw new ObjectDisposedException(nameof(HttpRequestStream)); + case HttpStreamState.Aborted: + if (_error != null) + { + ExceptionDispatchInfo.Capture(_error).Throw(); + } + else + { + throw new TaskCanceledException(); + } + break; + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs new file mode 100644 index 0000000000..8a9d37b146 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs @@ -0,0 +1,160 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Runtime.ExceptionServices; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Http.Features; + +namespace Microsoft.AspNetCore.Server.IIS.Core +{ + internal class HttpRequestStream : ReadOnlyStream + { + private readonly IHttpBodyControlFeature _bodyControl; + private IISHttpContext _body; + private HttpStreamState _state; + private Exception _error; + + public HttpRequestStream(IHttpBodyControlFeature bodyControl) + { + _bodyControl = bodyControl; + _state = HttpStreamState.Closed; + } + + public override int Read(byte[] buffer, int offset, int count) + { + if (!_bodyControl.AllowSynchronousIO) + { + throw new InvalidOperationException(CoreStrings.SynchronousReadsDisallowed); + } + + return ReadAsync(buffer, offset, count).GetAwaiter().GetResult(); + } + + public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) + { + var task = ReadAsync(buffer, offset, count, default(CancellationToken), state); + if (callback != null) + { + task.ContinueWith(t => callback.Invoke(t)); + } + return task; + } + + public override int EndRead(IAsyncResult asyncResult) + { + return ((Task)asyncResult).GetAwaiter().GetResult(); + } + + private Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken, object state) + { + var tcs = new TaskCompletionSource(state); + var task = ReadAsync(buffer, offset, count, cancellationToken); + task.ContinueWith((task2, state2) => + { + var tcs2 = (TaskCompletionSource)state2; + if (task2.IsCanceled) + { + tcs2.SetCanceled(); + } + else if (task2.IsFaulted) + { + tcs2.SetException(task2.Exception); + } + else + { + tcs2.SetResult(task2.Result); + } + }, tcs, cancellationToken); + return tcs.Task; + } + + public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + ValidateState(cancellationToken); + + return ReadAsyncInternal(new Memory(buffer, offset, count), cancellationToken).AsTask(); + } + +#if NETCOREAPP2_1 + public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) + { + ValidateState(cancellationToken); + + return ReadAsyncInternal(destination, cancellationToken); + } +#elif NETSTANDARD2_0 +#else +#error TFMs need to be updated +#endif + + private async ValueTask ReadAsyncInternal(Memory buffer, CancellationToken cancellationToken) + { + try + { + return await _body.ReadAsync(buffer, cancellationToken); + } + catch (ConnectionAbortedException ex) + { + throw new TaskCanceledException("The request was aborted", ex); + } + } + + public void StartAcceptingReads(IISHttpContext body) + { + // Only start if not aborted + if (_state == HttpStreamState.Closed) + { + _state = HttpStreamState.Open; + _body = body; + } + } + + public void StopAcceptingReads() + { + // Can't use dispose (or close) as can be disposed too early by user code + // As exampled in EngineTests.ZeroContentLengthNotSetAutomaticallyForCertainStatusCodes + _state = HttpStreamState.Closed; + _body = null; + } + + public void Abort(Exception error = null) + { + // We don't want to throw an ODE until the app func actually completes. + // If the request is aborted, we throw a TaskCanceledException instead, + // unless error is not null, in which case we throw it. + if (_state != HttpStreamState.Closed) + { + _state = HttpStreamState.Aborted; + _error = error; + } + } + + private void ValidateState(CancellationToken cancellationToken) + { + switch (_state) + { + case HttpStreamState.Open: + if (cancellationToken.IsCancellationRequested) + { + cancellationToken.ThrowIfCancellationRequested(); + } + break; + case HttpStreamState.Closed: + throw new ObjectDisposedException(nameof(HttpRequestStream)); + case HttpStreamState.Aborted: + if (_error != null) + { + ExceptionDispatchInfo.Capture(_error).Throw(); + } + else + { + throw new TaskCanceledException(); + } + break; + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs new file mode 100644 index 0000000000..1a04535448 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs @@ -0,0 +1,151 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http.Features; + +namespace Microsoft.AspNetCore.Server.IIS.Core +{ + internal class HttpResponseStream : WriteOnlyStream + { + private readonly IHttpBodyControlFeature _bodyControl; + private readonly IISHttpContext _context; + private HttpStreamState _state; + + public HttpResponseStream(IHttpBodyControlFeature bodyControl, IISHttpContext context) + { + _bodyControl = bodyControl; + _context = context; + _state = HttpStreamState.Closed; + } + + public override void Flush() + { + FlushAsync(default(CancellationToken)).GetAwaiter().GetResult(); + } + + public override Task FlushAsync(CancellationToken cancellationToken) + { + ValidateState(cancellationToken); + + return _context.FlushAsync(cancellationToken); + } + + public override void Write(byte[] buffer, int offset, int count) + { + if (!_bodyControl.AllowSynchronousIO) + { + throw new InvalidOperationException(CoreStrings.SynchronousWritesDisallowed); + } + + WriteAsync(buffer, offset, count, default(CancellationToken)).GetAwaiter().GetResult(); + } + + public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) + { + var task = WriteAsync(buffer, offset, count, default(CancellationToken), state); + if (callback != null) + { + task.ContinueWith(t => callback.Invoke(t)); + } + return task; + } + + public override void EndWrite(IAsyncResult asyncResult) + { + ((Task)asyncResult).GetAwaiter().GetResult(); + } + + private Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken, object state) + { + var tcs = new TaskCompletionSource(state); + var task = WriteAsync(buffer, offset, count, cancellationToken); + task.ContinueWith((task2, state2) => + { + var tcs2 = (TaskCompletionSource)state2; + if (task2.IsCanceled) + { + tcs2.SetCanceled(); + } + else if (task2.IsFaulted) + { + tcs2.SetException(task2.Exception); + } + else + { + tcs2.SetResult(null); + } + }, tcs, cancellationToken); + return tcs.Task; + } + + public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + ValidateState(cancellationToken); + + return _context.WriteAsync(new ReadOnlyMemory(buffer, offset, count), cancellationToken); + } + +#if NETCOREAPP2_1 + public override ValueTask WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) + { + ValidateState(cancellationToken); + + return new ValueTask(_httpResponseControl.WriteAsync(source, cancellationToken)); + } +#elif NETSTANDARD2_0 +#else +#error TFMs need to be updated +#endif + + public void StartAcceptingWrites() + { + // Only start if not aborted + if (_state == HttpStreamState.Closed) + { + _state = HttpStreamState.Open; + } + } + + public void StopAcceptingWrites() + { + // Can't use dispose (or close) as can be disposed too early by user code + // As exampled in EngineTests.ZeroContentLengthNotSetAutomaticallyForCertainStatusCodes + _state = HttpStreamState.Closed; + } + + public void Abort() + { + // We don't want to throw an ODE until the app func actually completes. + if (_state != HttpStreamState.Closed) + { + _state = HttpStreamState.Aborted; + } + } + + private void ValidateState(CancellationToken cancellationToken) + { + switch (_state) + { + case HttpStreamState.Open: + if (cancellationToken.IsCancellationRequested) + { + cancellationToken.ThrowIfCancellationRequested(); + } + break; + case HttpStreamState.Closed: + throw new ObjectDisposedException(nameof(HttpResponseStream), CoreStrings.WritingToResponseBodyAfterResponseCompleted); + case HttpStreamState.Aborted: + if (cancellationToken.IsCancellationRequested) + { + // Aborted state only throws on write if cancellationToken requests it + cancellationToken.ThrowIfCancellationRequested(); + } + break; + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs new file mode 100644 index 0000000000..231db99409 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs @@ -0,0 +1,12 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +namespace Microsoft.AspNetCore.Server.IIS.Core +{ + enum HttpStreamState + { + Open, + Closed, + Aborted + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs new file mode 100644 index 0000000000..c8b481f948 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs @@ -0,0 +1,208 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.Server.IIS.Core +{ + internal class HttpUpgradeStream : Stream + { + private readonly Stream _requestStream; + private readonly Stream _responseStream; + + public HttpUpgradeStream(Stream requestStream, Stream responseStream) + { + _requestStream = requestStream; + _responseStream = responseStream; + } + + public override bool CanRead + { + get + { + return _requestStream.CanRead; + } + } + + public override bool CanSeek + { + get + { + return _requestStream.CanSeek; + } + } + + public override bool CanTimeout + { + get + { + return _responseStream.CanTimeout || _requestStream.CanTimeout; + } + } + + public override bool CanWrite + { + get + { + return _responseStream.CanWrite; + } + } + + public override long Length + { + get + { + return _requestStream.Length; + } + } + + public override long Position + { + get + { + return _requestStream.Position; + } + set + { + _requestStream.Position = value; + } + } + + public override int ReadTimeout + { + get + { + return _requestStream.ReadTimeout; + } + set + { + _requestStream.ReadTimeout = value; + } + } + + public override int WriteTimeout + { + get + { + return _responseStream.WriteTimeout; + } + set + { + _responseStream.WriteTimeout = value; + } + } + + protected override void Dispose(bool disposing) + { + if (disposing) + { + _requestStream.Dispose(); + _responseStream.Dispose(); + } + } + + public override void Flush() + { + _responseStream.Flush(); + } + + public override Task FlushAsync(CancellationToken cancellationToken) + { + return _responseStream.FlushAsync(cancellationToken); + } + + public override void Close() + { + _requestStream.Close(); + _responseStream.Close(); + } + + public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) + { + return _requestStream.BeginRead(buffer, offset, count, callback, state); + } + + public override int EndRead(IAsyncResult asyncResult) + { + return _requestStream.EndRead(asyncResult); + } + + public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) + { + return _responseStream.BeginWrite(buffer, offset, count, callback, state); + } + + public override void EndWrite(IAsyncResult asyncResult) + { + _responseStream.EndWrite(asyncResult); + } + + public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + return _requestStream.ReadAsync(buffer, offset, count, cancellationToken); + } + +#if NETCOREAPP2_1 + public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) + { + return _requestStream.ReadAsync(destination, cancellationToken); + } +#elif NETSTANDARD2_0 +#else +#error TFMs need to be updated +#endif + + public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) + { + return _requestStream.CopyToAsync(destination, bufferSize, cancellationToken); + } + + public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + return _responseStream.WriteAsync(buffer, offset, count, cancellationToken); + } + +#if NETCOREAPP2_1 + public override ValueTask WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) + { + return _responseStream.WriteAsync(source, cancellationToken); + } +#elif NETSTANDARD2_0 +#else +#error TFMs need to be updated +#endif + + public override long Seek(long offset, SeekOrigin origin) + { + return _requestStream.Seek(offset, origin); + } + + public override void SetLength(long value) + { + _requestStream.SetLength(value); + } + + public override int Read(byte[] buffer, int offset, int count) + { + return _requestStream.Read(buffer, offset, count); + } + + public override int ReadByte() + { + return _requestStream.ReadByte(); + } + + public override void Write(byte[] buffer, int offset, int count) + { + _responseStream.Write(buffer, offset, count); + } + + public override void WriteByte(byte value) + { + _responseStream.WriteByte(value); + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs index 19f65bc900..6e1656a487 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs @@ -27,7 +27,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core IHttpAuthenticationFeature, IServerVariablesFeature, IHttpBufferingFeature, - ITlsConnectionFeature + ITlsConnectionFeature, + IHttpBodyControlFeature { // NOTE: When feature interfaces are added to or removed from this HttpProtocol implementation, // then the list of `implementedFeatures` in the generated code project MUST also be updated. @@ -37,6 +38,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private X509Certificate2 _certificate; private List> MaybeExtra; + public void ResetFeatureCollection() { Initialize(); @@ -179,12 +181,6 @@ namespace Microsoft.AspNetCore.Server.IIS.Core set => ResponseBody = value; } - CancellationToken IHttpRequestLifetimeFeature.RequestAborted - { - get => RequestAborted; - set => RequestAborted = value; - } - bool IHttpResponseFeature.HasStarted => HasResponseStarted; bool IHttpUpgradeFeature.IsUpgradableRequest => true; @@ -259,19 +255,18 @@ namespace Microsoft.AspNetCore.Server.IIS.Core async Task IHttpUpgradeFeature.UpgradeAsync() { - // TODO fix these exceptions strings if (!((IHttpUpgradeFeature)this).IsUpgradableRequest) { - throw new InvalidOperationException("CoreStrings.CannotUpgradeNonUpgradableRequest"); + throw new InvalidOperationException(CoreStrings.CannotUpgradeNonUpgradableRequest); } if (_wasUpgraded) { - throw new InvalidOperationException("CoreStrings.UpgradeCannotBeCalledMultipleTimes"); + throw new InvalidOperationException(CoreStrings.UpgradeCannotBeCalledMultipleTimes); } if (HasResponseStarted) { - throw new InvalidOperationException("CoreStrings.UpgradeCannotBeCalledMultipleTimes"); + throw new InvalidOperationException(CoreStrings.UpgradeCannotBeCalledMultipleTimes); } _wasUpgraded = true; @@ -291,7 +286,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core await InitializeResponse(flushHeaders: true); - return new DuplexStream(RequestBody, ResponseBody); + return _streams.Upgrade(); } Task ITlsConnectionFeature.GetClientCertificateAsync(CancellationToken cancellationToken) @@ -327,10 +322,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core IEnumerator IEnumerable.GetEnumerator() => FastEnumerable().GetEnumerator(); - void IHttpRequestLifetimeFeature.Abort() - { - Abort(); - } + bool IHttpBodyControlFeature.AllowSynchronousIO { get; set; } = true; void IHttpBufferingFeature.DisableRequestBuffering() { diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs new file mode 100644 index 0000000000..ab46f8df5c --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs @@ -0,0 +1,71 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Threading; +using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Http.Features; + +namespace Microsoft.AspNetCore.Server.IIS.Core +{ + internal partial class IISHttpContext : IHttpRequestLifetimeFeature + { + private CancellationTokenSource _abortedCts; + private CancellationToken? _manuallySetRequestAbortToken; + + CancellationToken IHttpRequestLifetimeFeature.RequestAborted + { + get + { + // If a request abort token was previously explicitly set, return it. + if (_manuallySetRequestAbortToken.HasValue) + { + return _manuallySetRequestAbortToken.Value; + } + // Otherwise, get the abort CTS. If we have one, which would mean that someone previously + // asked for the RequestAborted token, simply return its token. If we don't, + // check to see whether we've already aborted, in which case just return an + // already canceled token. Finally, force a source into existence if we still + // don't have one, and return its token. + var cts = _abortedCts; + return + cts != null ? cts.Token : + (_requestAborted == 1) ? new CancellationToken(true) : + RequestAbortedSource.Token; + } + set + { + // Set an abort token, overriding one we create internally. This setter and associated + // field exist purely to support IHttpRequestLifetimeFeature.set_RequestAborted. + _manuallySetRequestAbortToken = value; + } + } + + private CancellationTokenSource RequestAbortedSource + { + get + { + // Get the abort token, lazily-initializing it if necessary. + // Make sure it's canceled if an abort request already came in. + + // EnsureInitialized can return null since _abortedCts is reset to null + // after it's already been initialized to a non-null value. + // If EnsureInitialized does return null, this property was accessed between + // requests so it's safe to return an ephemeral CancellationTokenSource. + var cts = LazyInitializer.EnsureInitialized(ref _abortedCts, () => new CancellationTokenSource()) + ?? new CancellationTokenSource(); + + if (_requestAborted == 1) + { + cts.Cancel(); + } + return cts; + } + } + + void IHttpRequestLifetimeFeature.Abort() + { + Abort(new ConnectionAbortedException(CoreStrings.ConnectionAbortedByApplication)); + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.ReadWrite.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs similarity index 81% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.ReadWrite.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs index 26315971ef..09c205d8de 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.ReadWrite.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs @@ -3,9 +3,9 @@ using System; using System.Buffers; -using System.IO; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; namespace Microsoft.AspNetCore.Server.IIS.Core { @@ -84,6 +84,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private async Task ReadBody() { + Exception error = null; try { while (true) @@ -112,18 +113,24 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } } } + catch (ConnectionResetException ex) + { + ConnectionReset(); + error = ex; + } catch (Exception ex) { - _bodyInputPipe.Writer.Complete(ex); + error = ex; } finally { - _bodyInputPipe.Writer.Complete(); + _bodyInputPipe.Writer.Complete(error); } } private async Task WriteBody(bool flush = false) { + Exception error = null; try { while (true) @@ -160,17 +167,51 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } } // We want to swallow IO exception and allow app to finish writing + catch (ConnectionResetException) + { + ConnectionReset(); + } catch (Exception ex) { - if (!(ex is IOException)) - { - _bodyOutput.Reader.Complete(ex); - } + error = ex; } finally { - _bodyOutput.Reader.Complete(); + _bodyOutput.Reader.Complete(error); } } + + private void AbortIO() + { + if (Interlocked.CompareExchange(ref _requestAborted, 1, 0) != 0) + { + return; + } + + _bodyOutput.Dispose(); + + try + { + _abortedCts?.Cancel(); + } + catch (Exception) + { + // ignore + } + } + + public void Abort(Exception reason) + { + _bodyOutput.Abort(reason); + _streams.Abort(reason); + NativeMethods.HttpCloseConnection(_pInProcessHandler); + + AbortIO(); + } + + internal void ConnectionReset() + { + AbortIO(); + } } } diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs index ab977c4e82..a9eecba00b 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs @@ -15,6 +15,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpSys.Internal; using Microsoft.AspNetCore.Server.IIS.Core.IO; @@ -32,6 +33,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private readonly IISServerOptions _options; + protected Streams _streams; + private volatile bool _hasResponseStarted; private volatile bool _hasRequestReadingStarted; @@ -62,7 +65,11 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private const string BasicString = "Basic"; - internal unsafe IISHttpContext(MemoryPool memoryPool, IntPtr pInProcessHandler, IISServerOptions options, IISHttpServer server) + internal unsafe IISHttpContext( + MemoryPool memoryPool, + IntPtr pInProcessHandler, + IISServerOptions options, + IISHttpServer server) : base((HttpApiTypes.HTTP_REQUEST*)NativeMethods.HttpGetRawRequest(pInProcessHandler)) { _memoryPool = memoryPool; @@ -78,7 +85,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core public string Path { get; set; } public string QueryString { get; set; } public string RawTarget { get; set; } - public CancellationToken RequestAborted { get; set; } + public bool HasResponseStarted => _hasResponseStarted; public IPAddress RemoteIpAddress { get; set; } public int RemotePort { get; set; } @@ -151,9 +158,9 @@ namespace Microsoft.AspNetCore.Server.IIS.Core _currentIHttpUpgradeFeature = null; } - RequestBody = new IISHttpRequestBody(this); - ResponseBody = new IISHttpResponseBody(this); + _streams = new Streams(this); + (RequestBody, ResponseBody) = _streams.Start(); var pipe = new Pipe( new PipeOptions( @@ -223,9 +230,9 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } // Client might be disconnected at this point // don't leak the exception - catch (IOException) + catch (ConnectionResetException) { - // ignore + ConnectionReset(); } } @@ -255,7 +262,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private void ThrowResponseAbortedException() { - throw new ObjectDisposedException("Unhandled application exception", _applicationException); + throw new ObjectDisposedException(CoreStrings.UnhandledApplicationException, _applicationException); } protected Task ProduceEnd() @@ -340,11 +347,6 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } } - public void Abort() - { - // TODO - } - public abstract Task ProcessRequestAsync(); public void OnStarting(Func callback, object state) @@ -459,27 +461,28 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { if (disposing) { - // TODO: dispose managed state (managed objects). _thisHandle.Free(); } + if (WindowsUser?.Identity is WindowsIdentity wi) { wi.Dispose(); } + + _abortedCts?.Dispose(); + disposedValue = true; } } - // This code added to correctly implement the disposable pattern. public override void Dispose() { - // Do not change this code. Put cleanup code in Dispose(bool disposing) above. Dispose(disposing: true); } - private void ThrowResponseAlreadyStartedException(string value) + private void ThrowResponseAlreadyStartedException(string name) { - throw new InvalidOperationException("Response already started"); + throw new InvalidOperationException(CoreStrings.FormatParameterReadOnlyAfterResponseStarted(name)); } private WindowsPrincipal GetWindowsPrincipal() diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs index 8fb2d75363..ec3fc006b2 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs @@ -44,6 +44,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } finally { + _streams.Stop(); + if (!HasResponseStarted && _applicationException == null && _onStarting != null) { await FireOnStarting(); @@ -91,7 +93,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } // Cancel all remaining IO, there might be reads pending if not entire request body was sent by client - AsyncIO.Dispose(); + AsyncIO?.Dispose(); if (_readBodyTask != null) { diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpResponseBody.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpResponseBody.cs deleted file mode 100644 index 76e913bb4b..0000000000 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpResponseBody.cs +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Threading; -using System.Threading.Tasks; - -namespace Microsoft.AspNetCore.Server.IIS.Core -{ - internal class IISHttpResponseBody : Stream - { - private readonly IISHttpContext _httpContext; - - public IISHttpResponseBody(IISHttpContext httpContext) - { - _httpContext = httpContext; - } - - public override bool CanRead => false; - - public override bool CanSeek => false; - - public override bool CanWrite => true; - - public override long Length => throw new NotSupportedException(); - - public override long Position { get => throw new NotSupportedException(); set => throw new NotSupportedException(); } - - public override void Flush() - { - FlushAsync(CancellationToken.None).GetAwaiter().GetResult(); - } - - public override int Read(byte[] buffer, int offset, int count) - { - throw new NotSupportedException(); - } - - public override long Seek(long offset, SeekOrigin origin) - { - throw new NotSupportedException(); - } - - public override void SetLength(long value) - { - throw new NotSupportedException(); - } - - public unsafe override void Write(byte[] buffer, int offset, int count) - { - WriteAsync(buffer, offset, count, CancellationToken.None).GetAwaiter().GetResult(); - } - - public override unsafe Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - return _httpContext.WriteAsync(new ReadOnlyMemory(buffer, offset, count), cancellationToken); - } - - public override Task FlushAsync(CancellationToken cancellationToken) - { - return _httpContext.FlushAsync(cancellationToken); - } - } -} diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs index ddf16f269d..7e540ddd83 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs @@ -22,6 +22,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private static readonly NativeMethods.PFN_REQUEST_HANDLER _requestHandler = HandleRequest; private static readonly NativeMethods.PFN_SHUTDOWN_HANDLER _shutdownHandler = HandleShutdown; + private static readonly NativeMethods.PFN_DISCONNECT_HANDLER _onDisconnect = OnDisconnect; private static readonly NativeMethods.PFN_ASYNC_COMPLETION _onAsyncCompletion = OnAsyncCompletion; private IISContextFactory _iisContextFactory; @@ -82,7 +83,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core _httpServerHandle = GCHandle.Alloc(this); _iisContextFactory = new IISContextFactory(_memoryPool, application, _options, this); - _nativeApplication.RegisterCallbacks(_requestHandler, _shutdownHandler, _onAsyncCompletion, (IntPtr)_httpServerHandle, (IntPtr)_httpServerHandle); + _nativeApplication.RegisterCallbacks(_requestHandler, _shutdownHandler, _onDisconnect, _onAsyncCompletion, (IntPtr)_httpServerHandle, (IntPtr)_httpServerHandle); return Task.CompletedTask; } @@ -199,6 +200,22 @@ namespace Microsoft.AspNetCore.Server.IIS.Core return true; } + + private static void OnDisconnect(IntPtr pvManagedHttpContext) + { + IISHttpContext context = null; + try + { + context = (IISHttpContext)GCHandle.FromIntPtr(pvManagedHttpContext).Target; + context.ConnectionReset(); + } + catch (Exception ex) + { + context?.Server._logger.LogError(0, ex, $"Unexpected exception in {nameof(IISHttpServer)}.{nameof(OnDisconnect)}."); + } + + } + private static NativeMethods.REQUEST_NOTIFICATION_STATUS OnAsyncCompletion(IntPtr pvManagedHttpContext, int hr, int bytes) { IISHttpContext context = null; diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs index d8544239c5..1be8e888fd 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs @@ -28,6 +28,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core public void RegisterCallbacks( NativeMethods.PFN_REQUEST_HANDLER requestHandler, NativeMethods.PFN_SHUTDOWN_HANDLER shutdownHandler, + NativeMethods.PFN_DISCONNECT_HANDLER disconnectHandler, NativeMethods.PFN_ASYNC_COMPLETION onAsyncCompletion, IntPtr requestContext, IntPtr shutdownContext) @@ -36,7 +37,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core _nativeApplication, requestHandler, shutdownHandler, - onAsyncCompletion, + disconnectHandler, + onAsyncCompletion, requestContext, shutdownContext); } diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs index 4b90abb006..431f5c809a 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs @@ -3,9 +3,11 @@ using System; using System.Buffers; +using System.Diagnostics; using System.IO.Pipelines; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; namespace Microsoft.AspNetCore.Server.IIS.Core { @@ -67,7 +69,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core _completed = true; _pipe.Reader.CancelPendingRead(); - _pipe.Writer.Complete(error); + _pipe.Writer.Complete(); } } @@ -77,7 +79,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { if (_completed) { - throw new ObjectDisposedException("Response is already completed"); + return Task.CompletedTask; } _pipe.Writer.Write(buffer.Span); @@ -119,11 +121,14 @@ namespace Microsoft.AspNetCore.Server.IIS.Core await _flushTcs.Task; cancellationToken.ThrowIfCancellationRequested(); } - catch (OperationCanceledException) + catch (OperationCanceledException ex) { - _pipe.Writer.Complete(); - _completed = true; - throw; + Abort(new ConnectionAbortedException(CoreStrings.ConnectionOrStreamAbortedByCancellationToken, ex)); + } + catch + { + // A canceled token is the only reason flush should ever throw. + Debug.Assert(false); } } diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs new file mode 100644 index 0000000000..b5bbbf6199 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs @@ -0,0 +1,63 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.Server.IIS.Core +{ + internal abstract class ReadOnlyStream : Stream + { + public override bool CanRead => true; + + public override bool CanWrite => false; + + public override int WriteTimeout + { + get => throw new NotSupportedException(); + set => throw new NotSupportedException(); + } + + public override bool CanSeek => false; + + public override long Length + => throw new NotSupportedException(); + + public override long Position + { + get => throw new NotSupportedException(); + set => throw new NotSupportedException(); + } + + public override void Flush() + { + } + + public override Task FlushAsync(CancellationToken cancellationToken) + { + return Task.CompletedTask; + } + + public override long Seek(long offset, SeekOrigin origin) + { + throw new NotSupportedException(); + } + + public override void SetLength(long value) + { + throw new NotSupportedException(); + } + + public override void Write(byte[] buffer, int offset, int count) + { + throw new NotSupportedException(); + } + + public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + throw new NotSupportedException(); + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs new file mode 100644 index 0000000000..bc50edd01b --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs @@ -0,0 +1,68 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using Microsoft.AspNetCore.Http.Features; + +namespace Microsoft.AspNetCore.Server.IIS.Core +{ + internal class Streams + { + private static readonly ThrowingWasUpgradedWriteOnlyStream _throwingResponseStream + = new ThrowingWasUpgradedWriteOnlyStream(); + + private readonly IISHttpContext _context; + private readonly HttpResponseStream _response; + private readonly HttpRequestStream _request; + private readonly WrappingStream _upgradeableRequest; + private readonly WrappingStream _upgradeableResponse; + private EmptyStream _emptyRequest; + private Stream _upgradeStream; + + public Streams(IISHttpContext context) + { + _context = context; + _request = new HttpRequestStream(_context); + _response = new HttpResponseStream(_context, _context); + _upgradeableResponse = new WrappingStream(_response); + _upgradeableRequest = new WrappingStream(_request); + } + + public Stream Upgrade() + { + _upgradeStream = new HttpUpgradeStream(_request, _response); + + // causes writes to context.Response.Body to throw + _upgradeableResponse.SetInnerStream(_throwingResponseStream); + + _emptyRequest = new EmptyStream(_context); + + _upgradeableRequest.SetInnerStream(_emptyRequest); + // _upgradeStream always uses _response + return _upgradeStream; + } + + public (Stream request, Stream response) Start() + { + _request.StartAcceptingReads(_context); + _response.StartAcceptingWrites(); + + return (_upgradeableRequest, _upgradeableResponse); + } + + public void Stop() + { + _request.StopAcceptingReads(); + _emptyRequest?.StopAcceptingReads(); + _response.StopAcceptingWrites(); + } + + public void Abort(Exception error) + { + _request.Abort(error); + _emptyRequest?.Abort(error); + _response.Abort(); + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs new file mode 100644 index 0000000000..3990cd9865 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs @@ -0,0 +1,28 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.Server.IIS.Core +{ + public class ThrowingWasUpgradedWriteOnlyStream : WriteOnlyStream + { + public override void Write(byte[] buffer, int offset, int count) + => throw new InvalidOperationException(CoreStrings.ResponseStreamWasUpgraded); + + public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + => throw new InvalidOperationException(CoreStrings.ResponseStreamWasUpgraded); + + public override void Flush() + => throw new InvalidOperationException(CoreStrings.ResponseStreamWasUpgraded); + + public override long Seek(long offset, SeekOrigin origin) + => throw new NotSupportedException(); + + public override void SetLength(long value) + => throw new NotSupportedException(); + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs new file mode 100644 index 0000000000..18ae443711 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs @@ -0,0 +1,144 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Threading; +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.Server.IIS.Core +{ + internal class WrappingStream : Stream + { + private Stream _inner; + private bool _disposed; + + public WrappingStream(Stream inner) + { + _inner = inner; + } + + public void SetInnerStream(Stream inner) + { + if (_disposed) + { + throw new ObjectDisposedException(nameof(WrappingStream)); + } + + _inner = inner; + } + + public override bool CanRead => _inner.CanRead; + + public override bool CanSeek => _inner.CanSeek; + + public override bool CanWrite => _inner.CanWrite; + + public override bool CanTimeout => _inner.CanTimeout; + + public override long Length => _inner.Length; + + public override long Position + { + get => _inner.Position; + set => _inner.Position = value; + } + + public override int ReadTimeout + { + get => _inner.ReadTimeout; + set => _inner.ReadTimeout = value; + } + + public override int WriteTimeout + { + get => _inner.WriteTimeout; + set => _inner.WriteTimeout = value; + } + + public override void Flush() + => _inner.Flush(); + + public override Task FlushAsync(CancellationToken cancellationToken) + => _inner.FlushAsync(cancellationToken); + + public override int Read(byte[] buffer, int offset, int count) + => _inner.Read(buffer, offset, count); + + public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + => _inner.ReadAsync(buffer, offset, count, cancellationToken); + +#if NETCOREAPP2_1 + public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) + => _inner.ReadAsync(destination, cancellationToken); +#elif NETSTANDARD2_0 +#else +#error TFMs need to be updated +#endif + + public override int ReadByte() + => _inner.ReadByte(); + + public override long Seek(long offset, SeekOrigin origin) + => _inner.Seek(offset, origin); + + public override void SetLength(long value) + => _inner.SetLength(value); + + public override void Write(byte[] buffer, int offset, int count) + => _inner.Write(buffer, offset, count); + + public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + => _inner.WriteAsync(buffer, offset, count, cancellationToken); + +#if NETCOREAPP2_1 + public override ValueTask WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) + => _inner.WriteAsync(source, cancellationToken); +#elif NETSTANDARD2_0 +#else +#error TFMs need to be updated +#endif + + public override void WriteByte(byte value) + => _inner.WriteByte(value); + + public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) + => _inner.CopyToAsync(destination, bufferSize, cancellationToken); + + public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) + => _inner.BeginRead(buffer, offset, count, callback, state); + + public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) + => _inner.BeginWrite(buffer, offset, count, callback, state); + + public override int EndRead(IAsyncResult asyncResult) + => _inner.EndRead(asyncResult); + + public override void EndWrite(IAsyncResult asyncResult) + => _inner.EndWrite(asyncResult); + + public override object InitializeLifetimeService() + => _inner.InitializeLifetimeService(); + + public override void Close() + => _inner.Close(); + + public override bool Equals(object obj) + => _inner.Equals(obj); + + public override int GetHashCode() + => _inner.GetHashCode(); + + public override string ToString() + => _inner.ToString(); + + protected override void Dispose(bool disposing) + { + if (disposing) + { + _disposed = true; + _inner.Dispose(); + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpRequestBody.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs similarity index 57% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpRequestBody.cs rename to src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs index d4f6241f98..9ccf9c9cd1 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpRequestBody.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs @@ -8,40 +8,36 @@ using System.Threading.Tasks; namespace Microsoft.AspNetCore.Server.IIS.Core { - internal class IISHttpRequestBody : Stream + public abstract class WriteOnlyStream : Stream { - private readonly IISHttpContext _httpContext; + public override bool CanRead => false; - public IISHttpRequestBody(IISHttpContext httpContext) + public override bool CanWrite => true; + + public override int ReadTimeout { - _httpContext = httpContext; + get => throw new NotSupportedException(); + set => throw new NotSupportedException(); } - public override bool CanRead => true; - public override bool CanSeek => false; - public override bool CanWrite => false; - public override long Length => throw new NotSupportedException(); - public override long Position { get => throw new NotSupportedException(); set => throw new NotSupportedException(); } - - public override void Flush() + public override long Position { - throw new NotSupportedException(); + get => throw new NotSupportedException(); + set => throw new NotSupportedException(); } public override int Read(byte[] buffer, int offset, int count) { - return ReadAsync(buffer, offset, count, CancellationToken.None).GetAwaiter().GetResult(); + throw new NotSupportedException(); } public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { - var memory = new Memory(buffer, offset, count); - - return _httpContext.ReadAsync(memory, cancellationToken); + throw new NotSupportedException(); } public override long Seek(long offset, SeekOrigin origin) @@ -53,10 +49,5 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { throw new NotSupportedException(); } - - public override void Write(byte[] buffer, int offset, int count) - { - throw new NotSupportedException(); - } } } diff --git a/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx b/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx new file mode 100644 index 0000000000..d6c2e7b974 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Cannot write to response body after connection has been upgraded. + + + The response has been aborted due to an unhandled application exception. + + + Cannot upgrade a non-upgradable request. Check IHttpUpgradeFeature.IsUpgradableRequest to determine if a request can be upgraded. + + + IHttpUpgradeFeature.UpgradeAsync was already called and can only be called once per connection. + + + Synchronous operations are disallowed. Call ReadAsync or set AllowSynchronousIO to true instead. + + + Synchronous operations are disallowed. Call WriteAsync or set AllowSynchronousIO to true instead. + + + Cannot write to the response body, the response has completed. + + + The connection was aborted by the application. + + + The connection or stream was aborted because a write operation was aborted with a CancellationToken. + + + {name} cannot be set because the response has already started. + + diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs index 906a86cdda..51f4ad448f 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs @@ -39,6 +39,7 @@ namespace Microsoft.AspNetCore.Server.IIS } public delegate REQUEST_NOTIFICATION_STATUS PFN_REQUEST_HANDLER(IntPtr pInProcessHandler, IntPtr pvRequestContext); + public delegate void PFN_DISCONNECT_HANDLER(IntPtr pvManagedHttpContext); public delegate bool PFN_SHUTDOWN_HANDLER(IntPtr pvRequestContext); public delegate REQUEST_NOTIFICATION_STATUS PFN_ASYNC_COMPLETION(IntPtr pvManagedHttpContext, int hr, int bytes); public delegate REQUEST_NOTIFICATION_STATUS PFN_WEBSOCKET_ASYNC_COMPLETION(IntPtr pInProcessHandler, IntPtr completionInfo, IntPtr pvCompletionContext); @@ -56,6 +57,7 @@ namespace Microsoft.AspNetCore.Server.IIS private static extern int register_callbacks(IntPtr pInProcessApplication, PFN_REQUEST_HANDLER requestCallback, PFN_SHUTDOWN_HANDLER shutdownCallback, + PFN_DISCONNECT_HANDLER disconnectCallback, PFN_ASYNC_COMPLETION asyncCallback, IntPtr pvRequestContext, IntPtr pvShutdownContext); @@ -130,6 +132,9 @@ namespace Microsoft.AspNetCore.Server.IIS [DllImport(AspNetCoreModuleDll)] private static extern int http_cancel_io(IntPtr pInProcessHandler); + [DllImport(AspNetCoreModuleDll)] + private static extern int http_close_connection(IntPtr pInProcessHandler); + [DllImport(AspNetCoreModuleDll)] private static extern unsafe int http_response_set_unknown_header(IntPtr pInProcessHandler, byte* pszHeaderName, byte* pszHeaderValue, ushort usHeaderValueLength, bool fReplace); @@ -152,11 +157,12 @@ namespace Microsoft.AspNetCore.Server.IIS public static void HttpRegisterCallbacks(IntPtr pInProcessApplication, PFN_REQUEST_HANDLER requestCallback, PFN_SHUTDOWN_HANDLER shutdownCallback, + PFN_DISCONNECT_HANDLER disconnectCallback, PFN_ASYNC_COMPLETION asyncCallback, IntPtr pvRequestContext, IntPtr pvShutdownContext) { - Validate(register_callbacks(pInProcessApplication, requestCallback, shutdownCallback, asyncCallback, pvRequestContext, pvShutdownContext)); + Validate(register_callbacks(pInProcessApplication, requestCallback, shutdownCallback, disconnectCallback, asyncCallback, pvRequestContext, pvShutdownContext)); } public static unsafe int HttpWriteResponseBytes(IntPtr pInProcessHandler, HttpApiTypes.HTTP_DATA_CHUNK* pDataChunks, int nChunks, out bool fCompletionExpected) @@ -266,6 +272,11 @@ namespace Microsoft.AspNetCore.Server.IIS return true; } + public static void HttpCloseConnection(IntPtr pInProcessHandler) + { + Validate(http_close_connection(pInProcessHandler)); + } + public static unsafe void HttpResponseSetUnknownHeader(IntPtr pInProcessHandler, byte* pszHeaderName, byte* pszHeaderValue, ushort usHeaderValueLength, bool fReplace) { Validate(http_response_set_unknown_header(pInProcessHandler, pszHeaderName, pszHeaderValue, usHeaderValueLength, fReplace)); diff --git a/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs b/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs new file mode 100644 index 0000000000..639480f4a5 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs @@ -0,0 +1,170 @@ +// +namespace Microsoft.AspNetCore.Server.IIS +{ + using System.Globalization; + using System.Reflection; + using System.Resources; + + internal static class CoreStrings + { + private static readonly ResourceManager _resourceManager + = new ResourceManager("Microsoft.AspNetCore.Server.IIS.CoreStrings", typeof(CoreStrings).GetTypeInfo().Assembly); + + /// + /// Cannot write to response body after connection has been upgraded. + /// + internal static string ResponseStreamWasUpgraded + { + get => GetString("ResponseStreamWasUpgraded"); + } + + /// + /// Cannot write to response body after connection has been upgraded. + /// + internal static string FormatResponseStreamWasUpgraded() + => GetString("ResponseStreamWasUpgraded"); + + /// + /// The response has been aborted due to an unhandled application exception. + /// + internal static string UnhandledApplicationException + { + get => GetString("UnhandledApplicationException"); + } + + /// + /// The response has been aborted due to an unhandled application exception. + /// + internal static string FormatUnhandledApplicationException() + => GetString("UnhandledApplicationException"); + + /// + /// Cannot upgrade a non-upgradable request. Check IHttpUpgradeFeature.IsUpgradableRequest to determine if a request can be upgraded. + /// + internal static string CannotUpgradeNonUpgradableRequest + { + get => GetString("CannotUpgradeNonUpgradableRequest"); + } + + /// + /// Cannot upgrade a non-upgradable request. Check IHttpUpgradeFeature.IsUpgradableRequest to determine if a request can be upgraded. + /// + internal static string FormatCannotUpgradeNonUpgradableRequest() + => GetString("CannotUpgradeNonUpgradableRequest"); + + /// + /// IHttpUpgradeFeature.UpgradeAsync was already called and can only be called once per connection. + /// + internal static string UpgradeCannotBeCalledMultipleTimes + { + get => GetString("UpgradeCannotBeCalledMultipleTimes"); + } + + /// + /// IHttpUpgradeFeature.UpgradeAsync was already called and can only be called once per connection. + /// + internal static string FormatUpgradeCannotBeCalledMultipleTimes() + => GetString("UpgradeCannotBeCalledMultipleTimes"); + + /// + /// Synchronous operations are disallowed. Call ReadAsync or set AllowSynchronousIO to true instead. + /// + internal static string SynchronousReadsDisallowed + { + get => GetString("SynchronousReadsDisallowed"); + } + + /// + /// Synchronous operations are disallowed. Call ReadAsync or set AllowSynchronousIO to true instead. + /// + internal static string FormatSynchronousReadsDisallowed() + => GetString("SynchronousReadsDisallowed"); + + /// + /// Synchronous operations are disallowed. Call WriteAsync or set AllowSynchronousIO to true instead. + /// + internal static string SynchronousWritesDisallowed + { + get => GetString("SynchronousWritesDisallowed"); + } + + /// + /// Synchronous operations are disallowed. Call WriteAsync or set AllowSynchronousIO to true instead. + /// + internal static string FormatSynchronousWritesDisallowed() + => GetString("SynchronousWritesDisallowed"); + + /// + /// Cannot write to the response body, the response has completed. + /// + internal static string WritingToResponseBodyAfterResponseCompleted + { + get => GetString("WritingToResponseBodyAfterResponseCompleted"); + } + + /// + /// Cannot write to the response body, the response has completed. + /// + internal static string FormatWritingToResponseBodyAfterResponseCompleted() + => GetString("WritingToResponseBodyAfterResponseCompleted"); + + /// + /// The connection was aborted by the application. + /// + internal static string ConnectionAbortedByApplication + { + get => GetString("ConnectionAbortedByApplication"); + } + + /// + /// The connection was aborted by the application. + /// + internal static string FormatConnectionAbortedByApplication() + => GetString("ConnectionAbortedByApplication"); + + /// + /// The connection or stream was aborted because a write operation was aborted with a CancellationToken. + /// + internal static string ConnectionOrStreamAbortedByCancellationToken + { + get => GetString("ConnectionOrStreamAbortedByCancellationToken"); + } + + /// + /// The connection or stream was aborted because a write operation was aborted with a CancellationToken. + /// + internal static string FormatConnectionOrStreamAbortedByCancellationToken() + => GetString("ConnectionOrStreamAbortedByCancellationToken"); + + /// + /// {name} cannot be set because the response has already started. + /// + internal static string ParameterReadOnlyAfterResponseStarted + { + get => GetString("ParameterReadOnlyAfterResponseStarted"); + } + + /// + /// {name} cannot be set because the response has already started. + /// + internal static string FormatParameterReadOnlyAfterResponseStarted(object name) + => string.Format(CultureInfo.CurrentCulture, GetString("ParameterReadOnlyAfterResponseStarted", "name"), name); + + private static string GetString(string name, params string[] formatterNames) + { + var value = _resourceManager.GetString(name); + + System.Diagnostics.Debug.Assert(value != null); + + if (formatterNames != null) + { + for (var i = 0; i < formatterNames.Length; i++) + { + value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}"); + } + } + + return value; + } + } +} diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/test/Common.FunctionalTests/AppOfflineTests.cs index 53afd34504..c314a9dfab 100644 --- a/test/Common.FunctionalTests/AppOfflineTests.cs +++ b/test/Common.FunctionalTests/AppOfflineTests.cs @@ -122,7 +122,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests try { - await runningTask.TimeoutAfterDefault(); + await runningTask.DefaultTimeout(); // if AssertAppOffline succeeded ANCM have picked up app_offline before starting the app // try again diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index ccaecbceff..176805cbad 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -114,7 +114,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static void AssertWorkerProcessStop(this IISDeploymentResult deploymentResult) { var hostProcess = deploymentResult.HostProcess; - Assert.True(hostProcess.WaitForExit((int)TimeoutExtensions.DefaultTimeout.TotalMilliseconds)); + Assert.True(hostProcess.WaitForExit((int)TimeoutExtensions.DefaultTimeoutValue.TotalMilliseconds)); if (deploymentResult.DeploymentParameters.ServerType == ServerType.IISExpress) { diff --git a/test/Common.Tests/Utilities/TestConnections.cs b/test/Common.Tests/Utilities/TestConnections.cs index 722abc5b96..3364a0e021 100644 --- a/test/Common.Tests/Utilities/TestConnections.cs +++ b/test/Common.Tests/Utilities/TestConnections.cs @@ -48,6 +48,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting } public Socket Socket => _socket; + public Stream Stream => _stream; public void Dispose() { diff --git a/test/Common.Tests/Utilities/TimeoutExtensions.cs b/test/Common.Tests/Utilities/TimeoutExtensions.cs index c2d5192dbe..ce7175dff9 100644 --- a/test/Common.Tests/Utilities/TimeoutExtensions.cs +++ b/test/Common.Tests/Utilities/TimeoutExtensions.cs @@ -11,11 +11,16 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting public static class TimeoutExtensions { - public static TimeSpan DefaultTimeout = TimeSpan.FromSeconds(300); + public static TimeSpan DefaultTimeoutValue = TimeSpan.FromSeconds(300); - public static Task TimeoutAfterDefault(this Task task, [CallerFilePath] string filePath = null, [CallerLineNumber] int lineNumber = -1) + public static Task DefaultTimeout(this Task task, [CallerFilePath] string filePath = null, [CallerLineNumber] int lineNumber = -1) { - return task.TimeoutAfter(DefaultTimeout, filePath, lineNumber); + return task.TimeoutAfter(DefaultTimeoutValue, filePath, lineNumber); + } + + public static Task DefaultTimeout(this Task task, [CallerFilePath] string filePath = null, [CallerLineNumber] int lineNumber = -1) + { + return task.TimeoutAfter(DefaultTimeoutValue, filePath, lineNumber); } } } diff --git a/test/IIS.Tests/ClientDisconnectTests.cs b/test/IIS.Tests/ClientDisconnectTests.cs index c1b2c25062..ee55959a93 100644 --- a/test/IIS.Tests/ClientDisconnectTests.cs +++ b/test/IIS.Tests/ClientDisconnectTests.cs @@ -15,15 +15,15 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [SkipIfHostableWebCoreNotAvailable] [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] - public class ClientDisconnectTests : LoggedTest + public class ClientDisconnectTests : StrictTestServerTests { - + [ConditionalFact] public async Task WritesSucceedAfterClientDisconnect() { - var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var clientDisconnectedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var requestCompletedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var requestStartedCompletionSource = CreateTaskCompletionSource(); + var clientDisconnectedCompletionSource = CreateTaskCompletionSource(); + var requestCompletedCompletionSource = CreateTaskCompletionSource(); var data = new byte[1024]; using (var testServer = await TestServer.Create( @@ -42,19 +42,59 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests using (var connection = testServer.CreateConnection()) { await SendContentLength1Post(connection); - await requestStartedCompletionSource.Task.TimeoutAfterDefault(); + await requestStartedCompletionSource.Task.DefaultTimeout(); } clientDisconnectedCompletionSource.SetResult(true); - await requestCompletedCompletionSource.Task.TimeoutAfterDefault(); + await requestCompletedCompletionSource.Task.DefaultTimeout(); + } + } + + [ConditionalFact] + public async Task WritesCancelledWhenUsingAbortedToken() + { + var requestStartedCompletionSource = CreateTaskCompletionSource(); + var requestCompletedCompletionSource = CreateTaskCompletionSource(); + + Exception exception = null; + + var data = new byte[1]; + using (var testServer = await TestServer.Create(async ctx => + { + requestStartedCompletionSource.SetResult(true); + try + { + while (true) + { + await ctx.Response.Body.WriteAsync(data, ctx.RequestAborted); + } + } + catch (Exception e) + { + exception = e; + } + + requestCompletedCompletionSource.SetResult(true); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + + await requestStartedCompletionSource.Task.DefaultTimeout(); + } + + await requestCompletedCompletionSource.Task.DefaultTimeout(); + + Assert.IsType(exception); } } [ConditionalFact] public async Task ReadThrowsAfterClientDisconnect() { - var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var requestCompletedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var requestStartedCompletionSource = CreateTaskCompletionSource(); + var requestCompletedCompletionSource = CreateTaskCompletionSource(); Exception exception = null; @@ -77,10 +117,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests using (var connection = testServer.CreateConnection()) { await SendContentLength1Post(connection); - await requestStartedCompletionSource.Task.TimeoutAfterDefault(); + await requestStartedCompletionSource.Task.DefaultTimeout(); } - await requestCompletedCompletionSource.Task.TimeoutAfterDefault(); + await requestCompletedCompletionSource.Task.DefaultTimeout(); } Assert.IsType(exception); @@ -90,8 +130,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/1075")] public async Task WriterThrowsCancelledException() { - var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var requestCompletedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var requestStartedCompletionSource = CreateTaskCompletionSource(); + var requestCompletedCompletionSource = CreateTaskCompletionSource(); Exception exception = null; var cancellationTokenSource = new CancellationTokenSource(); @@ -104,7 +144,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { while (true) { - await ctx.Response.Body.WriteAsync(data, cancellationTokenSource.Token); + await ctx.Response.Body.WriteAsync(data, cancellationTokenSource.Token); } } catch (Exception e) @@ -119,9 +159,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { await SendContentLength1Post(connection); - await requestStartedCompletionSource.Task.TimeoutAfterDefault(); + await requestStartedCompletionSource.Task.DefaultTimeout(); cancellationTokenSource.Cancel(); - await requestCompletedCompletionSource.Task.TimeoutAfterDefault(); + await requestCompletedCompletionSource.Task.DefaultTimeout(); } Assert.IsType(exception); @@ -130,8 +170,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/1075")] public async Task ReaderThrowsCancelledException() { - var requestStartedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var requestCompletedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var requestStartedCompletionSource = CreateTaskCompletionSource(); + var requestCompletedCompletionSource = CreateTaskCompletionSource(); Exception exception = null; var cancellationTokenSource = new CancellationTokenSource(); @@ -155,9 +195,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests using (var connection = testServer.CreateConnection()) { await SendContentLength1Post(connection); - await requestStartedCompletionSource.Task.TimeoutAfterDefault(); + await requestStartedCompletionSource.Task.DefaultTimeout(); cancellationTokenSource.Cancel(); - await requestCompletedCompletionSource.Task.TimeoutAfterDefault(); + await requestCompletedCompletionSource.Task.DefaultTimeout(); } Assert.IsType(exception); } @@ -166,7 +206,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task ReaderThrowsResetExceptionOnInvalidBody() { - var requestCompletedCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var requestCompletedCompletionSource = CreateTaskCompletionSource(); Exception exception = null; @@ -195,7 +235,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests "", "ZZZ", ""); - await requestCompletedCompletionSource.Task.TimeoutAfterDefault(); + await requestCompletedCompletionSource.Task.DefaultTimeout(); } } @@ -203,6 +243,27 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal("The client has disconnected", exception.Message); } + [ConditionalFact] + public async Task RequestAbortedIsTrippedWithoutIO() + { + var requestStarted = CreateTaskCompletionSource(); + var requestAborted = CreateTaskCompletionSource(); + + using (var testServer = await TestServer.Create( + async ctx => { + ctx.RequestAborted.Register(() => requestAborted.SetResult(true)); + requestStarted.SetResult(true); + await requestAborted.Task; + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await requestStarted.Task; + } + await requestAborted.Task; + } + } private static async Task SendContentLength1Post(TestConnection connection) { await connection.Send( diff --git a/test/IIS.Tests/ConnectionIdFeatureTests.cs b/test/IIS.Tests/ConnectionIdFeatureTests.cs new file mode 100644 index 0000000000..37e69b3a32 --- /dev/null +++ b/test/IIS.Tests/ConnectionIdFeatureTests.cs @@ -0,0 +1,54 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [SkipIfHostableWebCoreNotAvailable] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] + public class HttpBodyControlFeatureTests : StrictTestServerTests + { + [ConditionalFact] + public async Task ThrowsOnSyncReadOrWrite() + { + Exception writeException = null; + Exception readException = null; + using (var testServer = await TestServer.Create( + ctx => { + var bodyControl = ctx.Features.Get(); + bodyControl.AllowSynchronousIO = false; + + try + { + ctx.Response.Body.Write(new byte[10]); + } + catch (Exception ex) + { + writeException = ex; + } + + try + { + ctx.Request.Body.Read(new byte[10]); + } + catch (Exception ex) + { + readException = ex; + } + + return Task.CompletedTask; + }, LoggerFactory)) + { + await testServer.HttpClient.GetStringAsync("/"); + } + + Assert.IsType(readException); + Assert.IsType(writeException); + } + } +} diff --git a/test/IIS.Tests/HttpBodyControlFeatureTests.cs b/test/IIS.Tests/HttpBodyControlFeatureTests.cs new file mode 100644 index 0000000000..3d91c445ca --- /dev/null +++ b/test/IIS.Tests/HttpBodyControlFeatureTests.cs @@ -0,0 +1,31 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// 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.Features; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [SkipIfHostableWebCoreNotAvailable] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] + public class ConnectionIdFeatureTests : StrictTestServerTests + { + [ConditionalFact] + public async Task ProvidesConnectionId() + { + string connectionId = null; + using (var testServer = await TestServer.Create(ctx => { + var connectionIdFeature = ctx.Features.Get(); + connectionId = connectionIdFeature.ConnectionId; + return Task.CompletedTask; + }, LoggerFactory)) + { + await testServer.HttpClient.GetStringAsync("/"); + } + + Assert.NotNull(connectionId); + } + } +} diff --git a/test/IIS.Tests/ResponseAbortTests.cs b/test/IIS.Tests/ResponseAbortTests.cs new file mode 100644 index 0000000000..f902748604 --- /dev/null +++ b/test/IIS.Tests/ResponseAbortTests.cs @@ -0,0 +1,152 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [SkipIfHostableWebCoreNotAvailable] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] + public class ResponseAbortTests : StrictTestServerTests + { + [ConditionalFact] + public async Task ClosesWithoutSendingAnything() + { + using (var testServer = await TestServer.Create( + ctx => { + ctx.Abort(); + return Task.CompletedTask; + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await connection.WaitForConnectionClose(); + } + } + } + + [ConditionalFact] + public async Task ClosesAfterDataSent() + { + var bodyReceived = CreateTaskCompletionSource(); + using (var testServer = await TestServer.Create( + async ctx => { + await ctx.Response.WriteAsync("Abort"); + await ctx.Response.Body.FlushAsync(); + await bodyReceived.Task.DefaultTimeout(); + ctx.Abort(); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await connection.Receive( + "HTTP/1.1 200 OK", + ""); + await connection.ReceiveHeaders( + "Transfer-Encoding: chunked", + "Server: Microsoft-IIS/10.0"); + + await connection.ReceiveChunk("Abort"); + bodyReceived.SetResult(true); + await connection.WaitForConnectionClose(); + } + } + } + + [ConditionalFact] + public async Task ReadsThrowAfterAbort() + { + Exception exception = null; + + using (var testServer = await TestServer.Create( + async ctx => { + ctx.Abort(); + try + { + var a = new byte[10]; + await ctx.Request.Body.ReadAsync(a); + } + catch (Exception e) + { + exception = e; + } + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await connection.WaitForConnectionClose(); + } + } + + Assert.IsType(exception); + } + + [ConditionalFact] + public async Task WritesNoopAfterAbort() + { + Exception exception = null; + + using (var testServer = await TestServer.Create( + async ctx => { + ctx.Abort(); + try + { + await ctx.Response.Body.WriteAsync(new byte[10]); + } + catch (Exception e) + { + exception = e; + } + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await connection.WaitForConnectionClose(); + } + } + + Assert.Null(exception); + } + + [ConditionalFact] + public async Task RequestAbortedIsTrippedAfterAbort() + { + bool tokenAborted = false; + using (var testServer = await TestServer.Create( + ctx => { + ctx.Abort(); + tokenAborted = ctx.RequestAborted.IsCancellationRequested; + return Task.CompletedTask; + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await connection.WaitForConnectionClose(); + } + } + + Assert.True(tokenAborted); + } + + private static async Task SendContentLength1Post(TestConnection connection) + { + await connection.Send( + "POST / HTTP/1.1", + "Content-Length: 1", + "Host: localhost", + "", + ""); + } + } +} diff --git a/test/IIS.Tests/StrictTestServerTests.cs b/test/IIS.Tests/StrictTestServerTests.cs new file mode 100644 index 0000000000..c8f62beedb --- /dev/null +++ b/test/IIS.Tests/StrictTestServerTests.cs @@ -0,0 +1,24 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class StrictTestServerTests: LoggedTest + { + public override void Dispose() + { + base.Dispose(); + Assert.DoesNotContain(TestSink.Writes, w => w.LogLevel > LogLevel.Information); + } + + protected static TaskCompletionSource CreateTaskCompletionSource() + { + return new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + } + } +} diff --git a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj index 393574d9c8..a8e89bf438 100644 --- a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj +++ b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj @@ -1,12 +1,12 @@ - + + + netcoreapp2.2 true - - From 608889b1100dcf8a49c47446d252162beb0aca3b Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 19 Sep 2018 10:06:23 -0700 Subject: [PATCH 285/363] Remove server header assert (#1407) --- test/IIS.Tests/ResponseAbortTests.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/IIS.Tests/ResponseAbortTests.cs b/test/IIS.Tests/ResponseAbortTests.cs index f902748604..c7ec472586 100644 --- a/test/IIS.Tests/ResponseAbortTests.cs +++ b/test/IIS.Tests/ResponseAbortTests.cs @@ -51,8 +51,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests "HTTP/1.1 200 OK", ""); await connection.ReceiveHeaders( - "Transfer-Encoding: chunked", - "Server: Microsoft-IIS/10.0"); + "Transfer-Encoding: chunked"); await connection.ReceiveChunk("Abort"); bodyReceived.SetResult(true); From 4e57b0e1f1e14a190d33427286231f9566aa3863 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 19 Sep 2018 10:09:44 -0700 Subject: [PATCH 286/363] Add functional style request aborted test (#1406) --- .../Inprocess/ClientDisconnectTests.cs | 18 +++++++++++++++ .../shared/SharedStartup/Startup.shared.cs | 22 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs b/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs index fc5f60b26e..761c389d48 100644 --- a/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs +++ b/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs @@ -43,5 +43,23 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var responseText = await response.Content.ReadAsStringAsync(); Assert.Equal("Hello World", responseText); } + + [ConditionalFact] + public async Task RequestAbortedTokenFires() + { + using (var connection = _fixture.CreateTestConnection()) + { + await connection.Send( + "GET /WaitForAbort HTTP/1.1", + "Host: localhost", + "Connection: close", + "", + ""); + + await _fixture.Client.RetryRequestAsync("/WaitingRequestCount", async message => await message.Content.ReadAsStringAsync() == "1"); + } + + await _fixture.Client.RetryRequestAsync("/WaitingRequestCount", async message => await message.Content.ReadAsStringAsync() == "0"); + } } } diff --git a/test/WebSites/shared/SharedStartup/Startup.shared.cs b/test/WebSites/shared/SharedStartup/Startup.shared.cs index 4c6d2eb4cf..1db25d5905 100644 --- a/test/WebSites/shared/SharedStartup/Startup.shared.cs +++ b/test/WebSites/shared/SharedStartup/Startup.shared.cs @@ -3,6 +3,7 @@ using System; using System.Linq; +using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Hosting; @@ -49,5 +50,26 @@ namespace TestSite var clientCert = context.Connection.ClientCertificate; await context.Response.WriteAsync(clientCert != null ? $"Enabled;{clientCert.GetCertHashString()}" : "Disabled"); } + + private static int _waitingRequestCount; + + public Task WaitForAbort(HttpContext context) + { + Interlocked.Increment(ref _waitingRequestCount); + try + { + context.RequestAborted.WaitHandle.WaitOne(); + return Task.CompletedTask; + } + finally + { + Interlocked.Decrement(ref _waitingRequestCount); + } + } + + public async Task WaitingRequestCount(HttpContext context) + { + await context.Response.WriteAsync(_waitingRequestCount.ToString()); + } } } From b41f1f0caed0013142646ce5ad3572aa9a4a6b0c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 19 Sep 2018 12:26:14 -0700 Subject: [PATCH 287/363] Make cert fixture lazy (#1412) --- .../ClientCertificateFixture.cs | 94 +++++++++++-------- 1 file changed, 54 insertions(+), 40 deletions(-) diff --git a/test/Common.FunctionalTests/ClientCertificateFixture.cs b/test/Common.FunctionalTests/ClientCertificateFixture.cs index c3fa927b46..f1498d0b05 100644 --- a/test/Common.FunctionalTests/ClientCertificateFixture.cs +++ b/test/Common.FunctionalTests/ClientCertificateFixture.cs @@ -10,65 +10,79 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public class ClientCertificateFixture : IDisposable { - public ClientCertificateFixture() - { - using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) - { - store.Open(OpenFlags.ReadWrite); + private X509Certificate2 _certificate; - foreach (var cert in store.Certificates) + public X509Certificate2 Certificate + { + get + { + if (_certificate != null) { - if (cert.Issuer != "CN=IISIntegrationTest_Root") - { - continue; - } - Certificate = cert; - store.Close(); - return; + return _certificate; } - var parentKey = CreateKeyMaterial(2048); + using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) + { + store.Open(OpenFlags.ReadWrite); - // On first run of the test, creates the certificate in the trusted root certificate authorities. - var parentRequest = new CertificateRequest("CN=IISIntegrationTest_Root", parentKey, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); + foreach (var cert in store.Certificates) + { + if (cert.Issuer != "CN=IISIntegrationTest_Root") + { + continue; + } + _certificate = cert; + store.Close(); + return cert; + } - parentRequest.CertificateExtensions.Add( - new X509BasicConstraintsExtension( - certificateAuthority: true, - hasPathLengthConstraint: false, - pathLengthConstraint: 0, - critical: true)); + var parentKey = CreateKeyMaterial(2048); - parentRequest.CertificateExtensions.Add( - new X509KeyUsageExtension(X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.NonRepudiation, critical: true)); + // On first run of the test, creates the certificate in the trusted root certificate authorities. + var parentRequest = new CertificateRequest("CN=IISIntegrationTest_Root", parentKey, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); - parentRequest.CertificateExtensions.Add( - new X509SubjectKeyIdentifierExtension(parentRequest.PublicKey, false)); + parentRequest.CertificateExtensions.Add( + new X509BasicConstraintsExtension( + certificateAuthority: true, + hasPathLengthConstraint: false, + pathLengthConstraint: 0, + critical: true)); - var notBefore = DateTimeOffset.Now.AddDays(-1); - var notAfter = DateTimeOffset.Now.AddYears(5); + parentRequest.CertificateExtensions.Add( + new X509KeyUsageExtension(X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.NonRepudiation, critical: true)); - var parentCert = parentRequest.CreateSelfSigned(notBefore, notAfter); + parentRequest.CertificateExtensions.Add( + new X509SubjectKeyIdentifierExtension(parentRequest.PublicKey, false)); - // Need to export/import the certificate to associate the private key with the cert. - var imported = parentCert; + var notBefore = DateTimeOffset.Now.AddDays(-1); + var notAfter = DateTimeOffset.Now.AddYears(5); - var export = parentCert.Export(X509ContentType.Pkcs12, ""); - imported = new X509Certificate2(export, "", X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable); - Array.Clear(export, 0, export.Length); + var parentCert = parentRequest.CreateSelfSigned(notBefore, notAfter); - // Add the cert to the cert store - Certificate = imported; + // Need to export/import the certificate to associate the private key with the cert. + var imported = parentCert; - store.Add(certificate: imported); - store.Close(); + var export = parentCert.Export(X509ContentType.Pkcs12, ""); + imported = new X509Certificate2(export, "", X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable); + Array.Clear(export, 0, export.Length); + + // Add the cert to the cert store + _certificate = imported; + + store.Add(certificate: imported); + store.Close(); + return imported; + } } } - public X509Certificate2 Certificate { get; } - public void Dispose() { + if (_certificate == null) + { + return; + } + using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) { store.Open(OpenFlags.ReadWrite); From 375d03794622d5665aaa09994b4bf1575b3a4ebf Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 19 Sep 2018 16:32:24 -0700 Subject: [PATCH 288/363] Add applicationInitialization tests (#1402) --- .../IISDeployer.cs | 23 +++++- .../ClientCertificateFixture.cs | 2 +- .../Utilities/EventLogHelpers.cs | 24 +++++- .../Utilities/Helpers.cs | 4 +- .../Utilities/IISCapability.cs | 3 +- .../RequiresIISAttribute.cs | 12 +++ test/IIS.FunctionalTests/ServicesTests.cs | 73 +++++++++++++++++++ .../shared/SharedStartup/Startup.shared.cs | 11 +++ 8 files changed, 141 insertions(+), 11 deletions(-) create mode 100644 test/IIS.FunctionalTests/ServicesTests.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 5a8519926c..76ce9a3800 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -357,10 +357,27 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS throw new InvalidOperationException("Site not stopped yet"); } - if (appPool.WorkerProcesses != null && appPool.WorkerProcesses.Any(wp => wp.State == WorkerProcessState.Running || - wp.State == WorkerProcessState.Stopping)) + try { - throw new InvalidOperationException("WorkerProcess not stopped yet"); + if (appPool.WorkerProcesses != null && + appPool.WorkerProcesses.Any(wp => + wp.State == WorkerProcessState.Running || + wp.State == WorkerProcessState.Stopping)) + { + throw new InvalidOperationException("WorkerProcess not stopped yet"); + } + + } + // If WAS was stopped for some reason appPool.WorkerProcesses + // would throw UnauthorizedAccessException. + // check if it's the case and continue shutting down deployer + catch (UnauthorizedAccessException) + { + var serviceController = new ServiceController("was"); + if (serviceController.Status != ServiceControllerStatus.Stopped) + { + throw; + } } if (!HostProcess.HasExited) diff --git a/test/Common.FunctionalTests/ClientCertificateFixture.cs b/test/Common.FunctionalTests/ClientCertificateFixture.cs index f1498d0b05..4979865e8b 100644 --- a/test/Common.FunctionalTests/ClientCertificateFixture.cs +++ b/test/Common.FunctionalTests/ClientCertificateFixture.cs @@ -8,7 +8,7 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { - public class ClientCertificateFixture : IDisposable + public class ClientCertificateFixture : IDisposable { private X509Certificate2 _certificate; diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index aa3453fe9b..2d7de2a8f1 100644 --- a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var entries = GetEntries(deploymentResult); AssertSingleEntry(expectedRegexMatchString, entries); } - + public static void VerifyEventLogEvents(IISDeploymentResult deploymentResult, params string[] expectedRegexMatchString) { Assert.True(deploymentResult.HostProcess.HasExited); @@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests entries.Remove(matchedEntry); } } - + Assert.True(0 == entries.Count, $"Some entries were not matched by any regex {FormatEntries(entries)}"); } @@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { continue; } - + // ReplacementStings == EventData collection in EventLog // This is unaffected if event providers are not registered correctly if (eventLogEntry.Source == AncmVersionToMatch(deploymentResult) && @@ -96,12 +96,28 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests (deploymentResult.DeploymentParameters.AncmVersion == AncmVersion.AspNetCoreModuleV2 ? " V2" : ""); } - + public static string Started(IISDeploymentResult deploymentResult) + { + if (deploymentResult.DeploymentParameters.HostingModel == HostingModel.InProcess) + { + return InProcessStarted(deploymentResult); + } + else + { + return OutOfProcessStarted(deploymentResult); + } + } + public static string InProcessStarted(IISDeploymentResult deploymentResult) { return $"Application '{EscapedContentRoot(deploymentResult)}' started the coreclr in-process successfully"; } + public static string OutOfProcessStarted(IISDeploymentResult deploymentResult) + { + return $"Application '/LM/W3SVC/1/ROOT' started process '\\d+' successfully and process '\\d+' is listening on port '\\d+'."; + } + public static string InProcessFailedToStart(IISDeploymentResult deploymentResult, string reason) { return $"Application '/LM/W3SVC/1/ROOT' with physical root '{EscapedContentRoot(deploymentResult)}' failed to load clr and managed application. {reason}"; diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 176805cbad..cb6779210a 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -111,10 +111,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return response; } - public static void AssertWorkerProcessStop(this IISDeploymentResult deploymentResult) + public static void AssertWorkerProcessStop(this IISDeploymentResult deploymentResult, int? timeout = null) { var hostProcess = deploymentResult.HostProcess; - Assert.True(hostProcess.WaitForExit((int)TimeoutExtensions.DefaultTimeoutValue.TotalMilliseconds)); + Assert.True(hostProcess.WaitForExit(timeout ?? (int)TimeoutExtensions.DefaultTimeoutValue.TotalMilliseconds)); if (deploymentResult.DeploymentParameters.ServerType == ServerType.IISExpress) { diff --git a/test/Common.FunctionalTests/Utilities/IISCapability.cs b/test/Common.FunctionalTests/Utilities/IISCapability.cs index e96127ea9f..9550eac3e5 100644 --- a/test/Common.FunctionalTests/Utilities/IISCapability.cs +++ b/test/Common.FunctionalTests/Utilities/IISCapability.cs @@ -13,6 +13,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests WindowsAuthentication = 2, PoolEnvironmentVariables = 4, ShutdownToken = 8, - DynamicCompression = 16 + DynamicCompression = 16, + ApplicationInitialization = 32 } } diff --git a/test/IIS.FunctionalTests/RequiresIISAttribute.cs b/test/IIS.FunctionalTests/RequiresIISAttribute.cs index dc374293b8..507de60279 100644 --- a/test/IIS.FunctionalTests/RequiresIISAttribute.cs +++ b/test/IIS.FunctionalTests/RequiresIISAttribute.cs @@ -22,6 +22,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private static readonly bool _windowsAuthAvailable; private static readonly bool _poolEnvironmentVariablesAvailable; private static readonly bool _dynamicCompressionAvailable; + private static readonly bool _applicationInitializationModule; static RequiresIISAttribute() { @@ -84,6 +85,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _dynamicCompressionAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "compdyn.dll")); + _applicationInitializationModule = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "warmup.dll")); + var iisRegistryKey = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\InetStp", writable: false); if (iisRegistryKey == null) { @@ -145,6 +148,15 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests SkipReason += "The machine does not have IIS dynamic compression installed."; } } + + if (capabilities.HasFlag(IISCapability.ApplicationInitialization)) + { + IsMet &= _dynamicCompressionAvailable; + if (!_dynamicCompressionAvailable) + { + SkipReason += "The machine does not have IIS ApplicationInitialization installed."; + } + } } public bool IsMet { get; } diff --git a/test/IIS.FunctionalTests/ServicesTests.cs b/test/IIS.FunctionalTests/ServicesTests.cs new file mode 100644 index 0000000000..0fe723eae9 --- /dev/null +++ b/test/IIS.FunctionalTests/ServicesTests.cs @@ -0,0 +1,73 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.ServiceProcess; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace IIS.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class ApplicationInitializationTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public ApplicationInitializationTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [RequiresIIS(IISCapability.ApplicationInitialization)] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task ApplicationInitializationInitializedInProc(HostingModel hostingModel) + { + var baseDeploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel); + EnableAppInitialization(baseDeploymentParameters); + + var result = await DeployAsync(baseDeploymentParameters); + + // Allow IIS a bit of time to complete starting before we start checking + await Task.Delay(100); + // There is always a race between which Init request arrives first + // retry couple times to see if we ever get the one comming from ApplicationInitialization module + await result.HttpClient.RetryRequestAsync("/ApplicationInitialization", async message => await message.Content.ReadAsStringAsync() == "True"); + + StopServer(); + EventLogHelpers.VerifyEventLogEvent(result, EventLogHelpers.Started(result)); + } + + private static void EnableAppInitialization(IISDeploymentParameters baseDeploymentParameters) + { + baseDeploymentParameters.ServerConfigActionList.Add( + (config, _) => { + config + .RequiredElement("configSections") + .GetOrAdd("sectionGroup", "name", "system.webServer") + .GetOrAdd("section", "name", "applicationInitialization") + .SetAttributeValue("overrideModeDefault", "Allow"); + + config + .RequiredElement("system.applicationHost") + .RequiredElement("sites") + .RequiredElement("site") + .RequiredElement("application") + .SetAttributeValue("preloadEnabled", true); + + config + .RequiredElement("system.webServer") + .GetOrAdd("applicationInitialization") + .GetOrAdd("add", "initializationPage", "/ApplicationInitialization?IISInit=true"); + }); + + baseDeploymentParameters.EnableModule("ApplicationInitializationModule", "%IIS_BIN%\\warmup.dll"); + } + } +} diff --git a/test/WebSites/shared/SharedStartup/Startup.shared.cs b/test/WebSites/shared/SharedStartup/Startup.shared.cs index 1db25d5905..bf9e3bb7fd 100644 --- a/test/WebSites/shared/SharedStartup/Startup.shared.cs +++ b/test/WebSites/shared/SharedStartup/Startup.shared.cs @@ -71,5 +71,16 @@ namespace TestSite { await context.Response.WriteAsync(_waitingRequestCount.ToString()); } + + private static bool _applicationInitializationCalled; + + public async Task ApplicationInitialization(HttpContext context) + { + if (context.Request.Query["IISInit"] == "true") + { + _applicationInitializationCalled = true; + } + await context.Response.WriteAsync(_applicationInitializationCalled.ToString()); + } } } From b08b2379279fda196f5e423a14deb0bf29170026 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 19 Sep 2018 17:20:29 -0700 Subject: [PATCH 289/363] StopServer before asserting TestSink (#1416) --- .../InProcess/StartupTests.cs | 11 ++++++----- .../OutOfProcess/GlobalVersionTests.cs | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 9f115e324f..227722e6ca 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -97,6 +97,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); await deploymentResult.AssertStarts(); + StopServer(); // Verify that in this scenario where.exe was invoked only once by shim and request handler uses cached value Assert.Equal(1, TestSink.Writes.Count(w => w.Message.Contains("Invoking where.exe to find dotnet.exe"))); } @@ -143,7 +144,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); StopServer(); - + EventLogHelpers.VerifyEventLogEvents(deploymentResult, EventLogHelpers.InProcessFailedToStart(deploymentResult, "CLR worker thread exited prematurely"), EventLogHelpers.InProcessThreadException(deploymentResult, ".*?Application is running inside IIS process but is not configured to use IIS server")); @@ -154,7 +155,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); deploymentParameters.TransformArguments((a, _) => $"{a} Throw"); - + var deploymentResult = await DeployAsync(deploymentParameters); var response = await deploymentResult.HttpClient.GetAsync("/"); @@ -166,7 +167,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EventLogHelpers.InProcessFailedToStart(deploymentResult, "CLR worker thread exited prematurely"), EventLogHelpers.InProcessThreadException(deploymentResult, ", exception code = '0xe0434352'")); } - + [ConditionalFact] public async Task LogsUnexpectedThreadExitError() { @@ -193,7 +194,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests WebConfigHelpers.AddOrModifyAspNetCoreSection("startupTimeLimit", "1")); var deploymentResult = await DeployAsync(deploymentParameters); - + var response = await deploymentResult.HttpClient.GetAsync("/"); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); @@ -213,7 +214,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests WebConfigHelpers.AddOrModifyAspNetCoreSection("shutdownTimeLimit", "1")); var deploymentResult = await DeployAsync(deploymentParameters); - + Assert.Equal("Hello World", await deploymentResult.HttpClient.GetStringAsync("/HelloWorld")); StopServer(); diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index d1096738f1..674550f6fc 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -184,6 +184,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private void AssertLoadedVersion(string version) { + StopServer(); Assert.Contains(TestSink.Writes, context => context.Message.Contains(version + @"\aspnetcorev2_outofprocess.dll")); } From d28468ca8f3327ae747b3377559ccfc4922d7baf Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 20 Sep 2018 09:21:34 -0700 Subject: [PATCH 290/363] Override IIS headers in inproc (#1409) --- .../Core/IISHttpContext.cs | 26 +++++++------------ .../Inprocess/ResponseHeaderTests.cs | 7 +++++ .../shared/SharedStartup/Startup.shared.cs | 6 +++++ 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs index a9eecba00b..45848183ba 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs @@ -318,29 +318,23 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { var headerValues = headerPair.Value; var knownHeaderIndex = HttpApiTypes.HTTP_RESPONSE_HEADER_ID.IndexOfKnownHeader(headerPair.Key); - if (knownHeaderIndex == -1) + for (var i = 0; i < headerValues.Count; i++) { - var headerNameBytes = Encoding.UTF8.GetBytes(headerPair.Key); - for (var i = 0; i < headerValues.Count; i++) + var isFirst = i == 0; + var headerValueBytes = Encoding.UTF8.GetBytes(headerValues[i]); + fixed (byte* pHeaderValue = headerValueBytes) { - var headerValueBytes = Encoding.UTF8.GetBytes(headerValues[i]); - fixed (byte* pHeaderName = headerNameBytes) + if (knownHeaderIndex == -1) { - fixed (byte* pHeaderValue = headerValueBytes) + var headerNameBytes = Encoding.UTF8.GetBytes(headerPair.Key); + fixed (byte* pHeaderName = headerNameBytes) { - NativeMethods.HttpResponseSetUnknownHeader(_pInProcessHandler, pHeaderName, pHeaderValue, (ushort)headerValueBytes.Length, fReplace: false); + NativeMethods.HttpResponseSetUnknownHeader(_pInProcessHandler, pHeaderName, pHeaderValue, (ushort)headerValueBytes.Length, fReplace: isFirst); } } - } - } - else - { - for (var i = 0; i < headerValues.Count; i++) - { - var headerValueBytes = Encoding.UTF8.GetBytes(headerValues[i]); - fixed (byte* pHeaderValue = headerValueBytes) + else { - NativeMethods.HttpResponseSetKnownHeader(_pInProcessHandler, knownHeaderIndex, pHeaderValue, (ushort)headerValueBytes.Length, fReplace: false); + NativeMethods.HttpResponseSetKnownHeader(_pInProcessHandler, knownHeaderIndex, pHeaderValue, (ushort)headerValueBytes.Length, fReplace: isFirst); } } } diff --git a/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs b/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs index 3f433b155f..fec5c227ec 100644 --- a/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs +++ b/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs @@ -74,5 +74,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // ReadAsStringAsync returns empty string for empty results Assert.Equal(body ?? string.Empty, await response.Content.ReadAsStringAsync()); } + + [ConditionalFact] + public async Task ServerHeaderIsOverriden() + { + var response = await _fixture.Client.GetAsync("OverrideServer"); + Assert.Equal("MyServer/7.8", response.Headers.Server.Single().Product.ToString()); + } } } diff --git a/test/WebSites/shared/SharedStartup/Startup.shared.cs b/test/WebSites/shared/SharedStartup/Startup.shared.cs index bf9e3bb7fd..375902faea 100644 --- a/test/WebSites/shared/SharedStartup/Startup.shared.cs +++ b/test/WebSites/shared/SharedStartup/Startup.shared.cs @@ -82,5 +82,11 @@ namespace TestSite } await context.Response.WriteAsync(_applicationInitializationCalled.ToString()); } + + public Task OverrideServer(HttpContext context) + { + context.Response.Headers["Server"] = "MyServer/7.8"; + return Task.CompletedTask; + } } } From d463b5e613f829c7147c7dea8764a6bd22c54aca Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 20 Sep 2018 12:38:35 -0700 Subject: [PATCH 291/363] Fix ReaderThrowsResetExceptionOnInvalidBody (#1420) --- test/Common.Tests/Utilities/TestConnections.cs | 13 +++++-------- test/IIS.Tests/ClientDisconnectTests.cs | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/test/Common.Tests/Utilities/TestConnections.cs b/test/Common.Tests/Utilities/TestConnections.cs index 3364a0e021..3b7a870cf3 100644 --- a/test/Common.Tests/Utilities/TestConnections.cs +++ b/test/Common.Tests/Utilities/TestConnections.cs @@ -62,18 +62,15 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting public async Task Send(params string[] lines) { - var text = string.Join("\r\n", lines); - var writer = new StreamWriter(_stream, Encoding.GetEncoding("iso-8859-1")); - for (var index = 0; index < text.Length; index++) + var bytes = Encoding.ASCII.GetBytes(string.Join("\r\n", lines)); + + for (var index = 0; index < bytes.Length; index++) { - var ch = text[index]; - writer.Write(ch); - await writer.FlushAsync().ConfigureAwait(false); + await _stream.WriteAsync(bytes, index, 1).ConfigureAwait(false); + await _stream.FlushAsync().ConfigureAwait(false); // Re-add delay to help find socket input consumption bugs more consistently //await Task.Delay(TimeSpan.FromMilliseconds(5)); } - await writer.FlushAsync().ConfigureAwait(false); - await _stream.FlushAsync().ConfigureAwait(false); } public async Task ReadCharAsync() diff --git a/test/IIS.Tests/ClientDisconnectTests.cs b/test/IIS.Tests/ClientDisconnectTests.cs index ee55959a93..9c8855be47 100644 --- a/test/IIS.Tests/ClientDisconnectTests.cs +++ b/test/IIS.Tests/ClientDisconnectTests.cs @@ -206,6 +206,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task ReaderThrowsResetExceptionOnInvalidBody() { + var requestStartedCompletionSource = CreateTaskCompletionSource(); var requestCompletedCompletionSource = CreateTaskCompletionSource(); Exception exception = null; @@ -213,6 +214,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var data = new byte[1024]; using (var testServer = await TestServer.Create(async ctx => { + requestStartedCompletionSource.SetResult(true); try { await ctx.Request.Body.ReadAsync(data); @@ -233,10 +235,19 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests "Host: localhost", "Connection: close", "", - "ZZZ", ""); - await requestCompletedCompletionSource.Task.DefaultTimeout(); + + await requestStartedCompletionSource.Task; + await connection.Send( + "ZZZZZZZZZZZZZ"); + + await connection.Receive( + "HTTP/1.1 400 Bad Request", + "" + ); + } + await requestCompletedCompletionSource.Task.DefaultTimeout(); } Assert.IsType(exception); From 14aebebbaaabc64cfd737e9d66225b735cf52276 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 21 Sep 2018 08:26:20 -0700 Subject: [PATCH 292/363] Remove using environment variables for specifying tests. (#1410) --- .../Inprocess/LogPipeTests.cs | 12 +++-- test/Common.FunctionalTests/LogFileTests.cs | 1 - test/WebSites/InProcessWebSite/Program.cs | 44 ++++++++++--------- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs b/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs index ed48204385..4d34c3154f 100644 --- a/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs +++ b/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.IO; using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; @@ -41,19 +40,19 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalTheory] - [InlineData("ConsoleErrorWrite")] - [InlineData("ConsoleWrite")] + [InlineData("ConsoleErrorWriteStartServer")] + [InlineData("ConsoleWriteStartServer")] public async Task CheckStdoutLoggingToPipeWithFirstWrite(string path) { var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); - var firstWriteString = path + path; + var firstWriteString = "TEST MESSAGE"; - deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_INITIAL_WRITE"] = firstWriteString; + deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); var deploymentResult = await DeployAsync(deploymentParameters); - await Helpers.AssertStarts(deploymentResult, path); + await Helpers.AssertStarts(deploymentResult); StopServer(); @@ -61,7 +60,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { // We can't read stdout logs from IIS as they aren't redirected. Assert.Contains(TestSink.Writes, context => context.Message.Contains(firstWriteString)); - Assert.Contains(TestSink.Writes, context => context.Message.Contains("TEST MESSAGE")); } } diff --git a/test/Common.FunctionalTests/LogFileTests.cs b/test/Common.FunctionalTests/LogFileTests.cs index be8d8e700c..17f9def2d7 100644 --- a/test/Common.FunctionalTests/LogFileTests.cs +++ b/test/Common.FunctionalTests/LogFileTests.cs @@ -3,7 +3,6 @@ using System; using System.IO; -using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; diff --git a/test/WebSites/InProcessWebSite/Program.cs b/test/WebSites/InProcessWebSite/Program.cs index f7abe535ae..43e9a563b2 100644 --- a/test/WebSites/InProcessWebSite/Program.cs +++ b/test/WebSites/InProcessWebSite/Program.cs @@ -79,31 +79,33 @@ namespace TestSite host.Run(); } break; + case "ConsoleErrorWriteStartServer": + Console.Error.WriteLine("TEST MESSAGE"); + return StartServer(); + case "ConsoleWriteStartServer": + Console.WriteLine("TEST MESSAGE"); + return StartServer(); default: - { + return StartServer(); - var envVariable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_INITIAL_WRITE"); - if (!string.IsNullOrEmpty(envVariable)) - { - Console.WriteLine(envVariable); - Console.Error.WriteLine(envVariable); - } - - var host = new WebHostBuilder() - .ConfigureLogging((_, factory) => - { - factory.AddConsole(); - factory.AddFilter("Console", level => level >= LogLevel.Information); - }) - .UseIIS() - .UseStartup() - .Build(); - - host.Run(); - return 0; - } } return 12; } + + private static int StartServer() + { + var host = new WebHostBuilder() + .ConfigureLogging((_, factory) => + { + factory.AddConsole(); + factory.AddFilter("Console", level => level >= LogLevel.Information); + }) + .UseIIS() + .UseStartup() + .Build(); + + host.Run(); + return 0; + } } } From f808bdc331ed9e5555c315d44bcc9559695f041c Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 21 Sep 2018 09:13:39 -0700 Subject: [PATCH 293/363] Disconnect the disconnect handler when request processing ends (#1413) --- .../AspNetCore/DisconnectHandler.cpp | 15 +++-- .../AspNetCore/DisconnectHandler.h | 12 ++-- .../AspNetCore/proxymodule.cpp | 29 ++++++--- .../AspNetCore/proxymodule.h | 4 +- .../CommonLib/SRWExclusiveLock.cpp | 2 +- .../CommonLib/SRWExclusiveLock.h | 2 +- .../CommonLib/irequesthandler.h | 6 ++ .../ClientDisconnectStress.cs | 65 +++++++++++++++++++ test/WebSites/InProcessWebSite/Startup.cs | 11 ++++ 9 files changed, 126 insertions(+), 20 deletions(-) create mode 100644 test/Common.FunctionalTests/ClientDisconnectStress.cs diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp index b921994850..3e8e7754aa 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp @@ -4,15 +4,21 @@ #include "DisconnectHandler.h" #include "exceptions.h" #include "proxymodule.h" +#include "SRWExclusiveLock.h" void DisconnectHandler::NotifyDisconnect() { try { - const auto module = m_pModule.exchange(nullptr); + std::unique_ptr module; + { + SRWExclusiveLock lock(m_handlerLock); + m_pHandler.swap(module); + } + if (module != nullptr) { - module ->NotifyDisconnect(); + module->NotifyDisconnect(); } } catch (...) @@ -27,7 +33,8 @@ void DisconnectHandler::CleanupStoredContext() noexcept delete this; } -void DisconnectHandler::SetHandler(ASPNET_CORE_PROXY_MODULE * module) noexcept +void DisconnectHandler::SetHandler(std::unique_ptr handler) noexcept { - m_pModule = module; + SRWExclusiveLock lock(m_handlerLock); + handler.swap(m_pHandler); } diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h index 34c8a24a63..63b7525356 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h +++ b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h @@ -2,7 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. #pragma once -#include + +#include +#include "irequesthandler.h" class ASPNET_CORE_PROXY_MODULE; @@ -10,8 +12,9 @@ class DisconnectHandler final: public IHttpConnectionStoredContext { public: DisconnectHandler() - : m_pModule(nullptr) + : m_pHandler(nullptr) { + InitializeSRWLock(&m_handlerLock); } virtual @@ -27,9 +30,10 @@ public: CleanupStoredContext() noexcept override; void - SetHandler(ASPNET_CORE_PROXY_MODULE * module) noexcept; + SetHandler(std::unique_ptr handler) noexcept; private: - std::atomic m_pModule; + SRWLOCK m_handlerLock {}; + std::unique_ptr m_pHandler; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index d3d71e8b4b..6f879f2e35 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -71,6 +71,10 @@ ASPNET_CORE_PROXY_MODULE::ASPNET_CORE_PROXY_MODULE(HTTP_MODULE_ID moduleId, std: ASPNET_CORE_PROXY_MODULE::~ASPNET_CORE_PROXY_MODULE() { + // At this point m_pDisconnectHandler should be disconnected in + // HandleNotificationStatus + assert(m_pDisconnectHandler == nullptr); + if (m_pDisconnectHandler != nullptr) { m_pDisconnectHandler->SetHandler(nullptr); @@ -112,8 +116,6 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( FINISHED_IF_FAILED(moduleContainer->SetConnectionModuleContext(static_cast(disconnectHandler.release()), m_moduleId)); } - m_pDisconnectHandler->SetHandler(this); - FINISHED_IF_FAILED(m_pApplicationManager->GetOrCreateApplicationInfo( *pHttpContext, m_pApplicationInfo)); @@ -121,6 +123,8 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( FINISHED_IF_FAILED(m_pApplicationInfo->CreateHandler(*pHttpContext, m_pHandler)); retVal = m_pHandler->OnExecuteRequestHandler(); + + m_pDisconnectHandler->SetHandler(::ReferenceRequestHandler(m_pHandler.get())); } catch (...) { @@ -141,7 +145,7 @@ Finished: } } - return retVal; + return HandleNotificationStatus(retVal); } __override @@ -156,18 +160,27 @@ ASPNET_CORE_PROXY_MODULE::OnAsyncCompletion( { try { - return m_pHandler->OnAsyncCompletion( + return HandleNotificationStatus(m_pHandler->OnAsyncCompletion( pCompletionInfo->GetCompletionBytes(), - pCompletionInfo->GetCompletionStatus()); + pCompletionInfo->GetCompletionStatus())); } catch (...) { OBSERVE_CAUGHT_EXCEPTION(); - return RQ_NOTIFICATION_FINISH_REQUEST; + return HandleNotificationStatus(RQ_NOTIFICATION_FINISH_REQUEST); } } -void ASPNET_CORE_PROXY_MODULE::NotifyDisconnect() const +REQUEST_NOTIFICATION_STATUS ASPNET_CORE_PROXY_MODULE::HandleNotificationStatus(REQUEST_NOTIFICATION_STATUS status) noexcept { - m_pHandler->NotifyDisconnect(); + if (status != RQ_NOTIFICATION_PENDING) + { + if (m_pDisconnectHandler != nullptr) + { + m_pDisconnectHandler->SetHandler(nullptr); + m_pDisconnectHandler = nullptr; + } + } + + return status; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h index 97c126b0f9..24f4794c68 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h @@ -47,8 +47,8 @@ class ASPNET_CORE_PROXY_MODULE : NonCopyable, public CHttpModule IHttpCompletionInfo * pCompletionInfo ) override; - void - NotifyDisconnect() const; + REQUEST_NOTIFICATION_STATUS + HandleNotificationStatus(REQUEST_NOTIFICATION_STATUS status) noexcept; private: std::shared_ptr m_pApplicationManager; diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp index 0bc46b8cf5..896189c8a8 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp @@ -3,7 +3,7 @@ #include "SRWExclusiveLock.h" -SRWExclusiveLock::SRWExclusiveLock(const SRWLOCK& lock) +SRWExclusiveLock::SRWExclusiveLock(const SRWLOCK& lock) noexcept : m_lock(lock) { AcquireSRWLockExclusive(const_cast(&m_lock)); diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h index 7ff977f70d..6c17e13111 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h +++ b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h @@ -8,7 +8,7 @@ class SRWExclusiveLock { public: - SRWExclusiveLock(const SRWLOCK& lock); + SRWExclusiveLock(const SRWLOCK& lock) noexcept; ~SRWExclusiveLock(); private: const SRWLOCK& m_lock; diff --git a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h index 8bd2076072..c89411f8a0 100644 --- a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h @@ -54,3 +54,9 @@ struct IREQUEST_HANDLER_DELETER application->DereferenceRequestHandler(); } }; + +inline std::unique_ptr ReferenceRequestHandler(IREQUEST_HANDLER* handler) +{ + handler->ReferenceRequestHandler(); + return std::unique_ptr(handler); +}; diff --git a/test/Common.FunctionalTests/ClientDisconnectStress.cs b/test/Common.FunctionalTests/ClientDisconnectStress.cs new file mode 100644 index 0000000000..9deeae3f92 --- /dev/null +++ b/test/Common.FunctionalTests/ClientDisconnectStress.cs @@ -0,0 +1,65 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class ClientDisconnectStressTests: FunctionalTestsBase + { + private readonly PublishedSitesFixture _fixture; + + public ClientDisconnectStressTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task ClientDisconnectStress(HostingModel hostingModel) + { + var site = await StartAsync(_fixture.GetBaseDeploymentParameters(hostingModel)); + var maxRequestSize = 1000; + var blockSize = 40; + var random = new Random(); + async Task RunRequests() + { + using (var connection = new TestConnection(site.HttpClient.BaseAddress.Port)) + { + await connection.Send( + "POST /ReadAndFlushEcho HTTP/1.1", + $"Content-Length: {maxRequestSize}", + "Host: localhost", + "Connection: close", + "", + ""); + + var disconnectAfter = random.Next(maxRequestSize); + var data = new byte[blockSize]; + for (int i = 0; i < disconnectAfter / blockSize; i++) + { + await connection.Stream.WriteAsync(data); + } + } + } + + List tasks = new List(); + for (int i = 0; i < 100; i++) + { + tasks.Add(Task.Run(RunRequests)); + } + + await Task.WhenAll(tasks); + + StopServer(); + } + } +} diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index 39d3b9f765..eb84272b76 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -324,6 +324,17 @@ namespace TestSite result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); } } + private async Task ReadAndFlushEcho(HttpContext ctx) + { + var readBuffer = new byte[4096]; + var result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + while (result != 0) + { + await ctx.Response.WriteAsync(Encoding.UTF8.GetString(readBuffer, 0, result)); + await ctx.Response.Body.FlushAsync(); + result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + } + } private async Task ReadAndWriteEchoLines(HttpContext ctx) { From a8f61f7d7d7aaed1c1002a6c1f1ef4df627d0099 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 23 Sep 2018 12:15:25 -0700 Subject: [PATCH 294/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 56 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index bb2f9074f1..468dfa74fa 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,46 +4,46 @@ 0.10.13 - 3.0.0-alpha1-20180911.2 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 0.7.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 + 3.0.0-alpha1-20180919.1 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 0.7.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 15.6.82 15.6.82 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 - 3.0.0-alpha1-10454 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 + 3.0.0-alpha1-10495 2.0.9 2.1.3 2.2.0-preview2-26905-02 1.0.1 - 3.0.0-alpha1-10454 + 3.0.0-alpha1-10495 15.6.1 11.1.0 2.0.3 4.6.0-preview1-26907-04 4.6.0-preview1-26907-04 4.6.0-preview1-26907-04 - 4.6.0-preview1-26717-04 + 4.5.0 4.6.0-preview1-26907-04 4.6.0-preview1-26907-04 4.6.0-preview1-26907-04 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a3511df82d..9a87e4ccb7 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20180911.2 -commithash:2a2b7dbea1b247930c41da497f4ea0b2bb756818 +version:3.0.0-alpha1-20180919.1 +commithash:3066ae0a230870ea07e3f132605b5e5493f8bbd4 From 2018a43d63d2dd8896443b2f51db725f4c9b0b4d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 23 Sep 2018 19:16:57 +0000 Subject: [PATCH 295/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 784065f4b9..8a43fc832e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,39 +4,39 @@ 0.10.13 - 2.2.0-preview1-20180911.1 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 0.6.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 + 2.2.0-preview1-20180918.1 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 0.6.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 15.6.82 15.6.82 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 2.0.9 2.1.3 2.2.0-preview2-26905-02 1.0.1 - 2.2.0-preview3-35252 + 2.2.0-preview3-35301 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 1090ad6a92..8491de70e6 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180911.1 -commithash:ddfecdfc6e8e4859db5a0daea578070b862aac65 +version:2.2.0-preview1-20180918.1 +commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800 From 1eb5da31e5e37efe1c0f3b43f6f8f701d4a284e1 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 25 Sep 2018 15:40:15 -0700 Subject: [PATCH 296/363] Improve error messages and add static html pages for failure to start site. (#1421) --- .../AspNetCore/AspNetCore.vcxproj | 19 ++- .../AspNetCore/HandlerResolver.cpp | 109 +++++++++--------- .../AspNetCore/HandlerResolver.h | 5 +- .../AspNetCore/HtmlResponses.rc | Bin 0 -> 3324 bytes .../AspNetCore/InProcessShimStaticHtml.htm | 45 ++++++++ .../AspNetCore/OutOfProcessShimStaticHtml.htm | 44 +++++++ .../AspNetCore/ServerErrorApplication.h | 15 ++- .../AspNetCore/ServerErrorHandler.h | 23 ---- .../AspNetCore/ShimOptions.cpp | 1 + .../AspNetCore/ShimOptions.h | 7 ++ .../AspNetCore/applicationinfo.cpp | 103 +++++++++++------ .../AspNetCore/applicationinfo.h | 3 + .../AspNetCore/applicationmanager.cpp | 3 +- src/AspNetCoreModuleV2/AspNetCore/resource.h | 19 +++ .../CommonLib/CommonLib.vcxproj | 4 +- .../CommonLib/FileOutputManager.cpp | 2 - .../CommonLib/ServerErrorHandler.h | 32 +++++ .../CommonLib/file_utility.cpp | 22 ++++ .../CommonLib/file_utility.h | 6 + .../CommonLib/iapplication.h | 10 ++ .../CommonLib/requesthandler.h | 26 +++++ src/AspNetCoreModuleV2/CommonLib/resources.h | 6 +- .../InProcessRequestHandler/HtmlResponses.rc | Bin 0 -> 3112 bytes .../InProcessRequestHandler.vcxproj | 8 +- .../InProcessRhStaticHtml.htm | 44 +++++++ .../StartupExceptionApplication.cpp | 10 -- .../StartupExceptionApplication.h | 18 ++- .../StartupExceptionHandler.cpp | 55 --------- .../StartupExceptionHandler.h | 31 +++-- .../InProcessRequestHandler/dllmain.cpp | 10 +- .../InProcessRequestHandler/resource.h | 16 +++ .../IISDeployer.cs | 2 +- .../ConfigurationChangeTests.cs | 2 +- .../Utilities/EventLogHelpers.cs | 40 ++++++- .../Utilities/Helpers.cs | 11 ++ .../Inprocess/StdOutRedirectionTests.cs | 13 +-- .../RequiresIISAttribute.cs | 4 +- .../InProcess/StartupTests.cs | 56 ++++++++- .../OutOfProcess/GlobalVersionTests.cs | 2 + 39 files changed, 596 insertions(+), 230 deletions(-) create mode 100644 src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc create mode 100644 src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm create mode 100644 src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm delete mode 100644 src/AspNetCoreModuleV2/AspNetCore/ServerErrorHandler.h create mode 100644 src/AspNetCoreModuleV2/AspNetCore/resource.h create mode 100644 src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm delete mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp delete mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp create mode 100644 src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index bd0129be53..4b2c6129e8 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -232,14 +232,14 @@ + + + - - - @@ -248,11 +248,11 @@ + - Create Create @@ -284,6 +284,17 @@ PreserveNewest + + + + + + true + + + true + + diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index 7414f51161..726229cc9e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -73,21 +73,18 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication pApplication.GetApplicationPhysicalPath(), outputManager)); - outputManager->TryStartRedirection(); - hr = FindNativeAssemblyFromHostfxr(*options.get(), pstrHandlerDllName, handlerDllPath); + hr = FindNativeAssemblyFromHostfxr(*options.get(), pstrHandlerDllName, handlerDllPath, outputManager.get()); - outputManager->TryStopRedirection(); - - if (FAILED(hr) && m_hHostFxrDll != nullptr) + if (FAILED_LOG(hr)) { auto output = outputManager->GetStdOutContent(); EventLog::Error( ASPNETCORE_EVENT_GENERAL_ERROR, ASPNETCORE_EVENT_INPROCESS_RH_ERROR_MSG, - handlerDllPath.empty()? s_pwzAspnetcoreInProcessRequestHandlerName : handlerDllPath.c_str(), output.c_str()); + return hr; } } else @@ -122,55 +119,38 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication } HRESULT -HandlerResolver::GetApplicationFactory(const IHttpApplication &pApplication, std::unique_ptr& pApplicationFactory) +HandlerResolver::GetApplicationFactory(const IHttpApplication &pApplication, std::unique_ptr& pApplicationFactory, const ShimOptions& options) { - try + SRWExclusiveLock lock(m_requestHandlerLoadLock); + if (m_loadedApplicationHostingModel != HOSTING_UNKNOWN) { - const WebConfigConfigurationSource configurationSource(m_pServer.GetAdminManager(), pApplication); - ShimOptions options(configurationSource); - - SRWExclusiveLock lock(m_requestHandlerLoadLock); - if (m_loadedApplicationHostingModel != HOSTING_UNKNOWN) + // Mixed hosting models + if (m_loadedApplicationHostingModel != options.QueryHostingModel()) { - // Mixed hosting models - if (m_loadedApplicationHostingModel != options.QueryHostingModel()) - { - EventLog::Error( - ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR, - ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG, - pApplication.GetApplicationId(), - options.QueryHostingModel()); + EventLog::Error( + ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR, + ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG, + pApplication.GetApplicationId(), + options.QueryHostingModel()); - return E_FAIL; - } - // Multiple in-process apps - if (m_loadedApplicationHostingModel == HOSTING_IN_PROCESS && m_loadedApplicationId != pApplication.GetApplicationId()) - { - EventLog::Error( - ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP, - ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG, - pApplication.GetApplicationId()); - - return E_FAIL; - } + return E_FAIL; } + // Multiple in-process apps + if (m_loadedApplicationHostingModel == HOSTING_IN_PROCESS && m_loadedApplicationId != pApplication.GetApplicationId()) + { + EventLog::Error( + ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP, + ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG, + pApplication.GetApplicationId()); - m_loadedApplicationHostingModel = options.QueryHostingModel(); - m_loadedApplicationId = pApplication.GetApplicationId(); - RETURN_IF_FAILED(LoadRequestHandlerAssembly(pApplication, options, pApplicationFactory)); - + return E_FAIL; + } } - catch(ConfigurationLoadException &ex) - { - EventLog::Error( - ASPNETCORE_CONFIGURATION_LOAD_ERROR, - ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG, - ex.get_message().c_str()); - - RETURN_HR(E_FAIL); - } - CATCH_RETURN(); + m_loadedApplicationHostingModel = options.QueryHostingModel(); + m_loadedApplicationId = pApplication.GetApplicationId(); + RETURN_IF_FAILED(LoadRequestHandlerAssembly(pApplication, options, pApplicationFactory)); + return S_OK; } @@ -222,7 +202,8 @@ HRESULT HandlerResolver::FindNativeAssemblyFromHostfxr( const HOSTFXR_OPTIONS& hostfxrOptions, PCWSTR libraryName, - std::wstring& handlerDllPath + std::wstring& handlerDllPath, + BaseOutputManager* outputManager ) { std::wstring struNativeSearchPaths; @@ -230,23 +211,29 @@ HandlerResolver::FindNativeAssemblyFromHostfxr( size_t intPrevIndex = 0; DWORD dwBufferSize = s_initialGetNativeSearchDirectoriesBufferSize; DWORD dwRequiredBufferSize = 0; + hostfxr_get_native_search_directories_fn pFnHostFxrSearchDirectories = nullptr; RETURN_LAST_ERROR_IF_NULL(m_hHostFxrDll = LoadLibraryW(hostfxrOptions.GetHostFxrLocation().c_str())); - const auto pFnHostFxrSearchDirectories = ModuleHelpers::GetKnownProcAddress(m_hHostFxrDll, "hostfxr_get_native_search_directories"); - if (pFnHostFxrSearchDirectories == nullptr) + try + { + pFnHostFxrSearchDirectories = ModuleHelpers::GetKnownProcAddress(m_hHostFxrDll, "hostfxr_get_native_search_directories"); + } + catch (...) { EventLog::Error( ASPNETCORE_EVENT_GENERAL_ERROR, ASPNETCORE_EVENT_HOSTFXR_DLL_INVALID_VERSION_MSG, hostfxrOptions.GetHostFxrLocation().c_str() - ); - RETURN_IF_FAILED(E_FAIL); + ); + return OBSERVE_CAUGHT_EXCEPTION(); } RETURN_LAST_ERROR_IF_NULL(pFnHostFxrSearchDirectories); struNativeSearchPaths.resize(dwBufferSize); + outputManager->TryStartRedirection(); + while (TRUE) { DWORD hostfxrArgc; @@ -273,11 +260,23 @@ HandlerResolver::FindNativeAssemblyFromHostfxr( } else { - // Log "Error finding native search directories from aspnetcore application. + // Stop redirecting before logging to event log to avoid logging debug logs + // twice. + outputManager->TryStopRedirection(); + + // If hostfxr didn't set the required buffer size, something in the app is misconfigured + // Ex: Framework not found. + EventLog::Error( + ASPNETCORE_EVENT_GENERAL_ERROR, + ASPNETCORE_EVENT_HOSTFXR_FAILURE_MSG + ); + return E_UNEXPECTED; } } + outputManager->TryStopRedirection(); + struNativeSearchPaths.resize(struNativeSearchPaths.find(L'\0')); auto fFound = FALSE; @@ -307,6 +306,10 @@ HandlerResolver::FindNativeAssemblyFromHostfxr( if (!fFound) { + EventLog::Error( + ASPNETCORE_EVENT_GENERAL_ERROR, + ASPNETCORE_EVENT_INPROCESS_RH_REFERENCE_MSG, + handlerDllPath.empty() ? s_pwzAspnetcoreInProcessRequestHandlerName : handlerDllPath.c_str()); return HRESULT_FROM_WIN32(ERROR_DLL_NOT_FOUND); } diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h index 7b230a928f..1cd9029347 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h @@ -9,18 +9,19 @@ #include "hostfxroptions.h" #include "HandleWrapper.h" #include "ApplicationFactory.h" +#include "BaseOutputManager.h" class HandlerResolver { public: HandlerResolver(HMODULE hModule, const IHttpServer &pServer); - HRESULT GetApplicationFactory(const IHttpApplication &pApplication, std::unique_ptr& pApplicationFactory); + HRESULT GetApplicationFactory(const IHttpApplication &pApplication, std::unique_ptr& pApplicationFactory, const ShimOptions& options); void ResetHostingModel(); private: HRESULT LoadRequestHandlerAssembly(const IHttpApplication &pApplication, const ShimOptions& pConfiguration, std::unique_ptr& pApplicationFactory); HRESULT FindNativeAssemblyFromGlobalLocation(const ShimOptions& pConfiguration, PCWSTR libraryName, std::wstring& handlerDllPath); - HRESULT FindNativeAssemblyFromHostfxr(const HOSTFXR_OPTIONS& hostfxrOptions, PCWSTR libraryName, std::wstring& handlerDllPath); + HRESULT FindNativeAssemblyFromHostfxr(const HOSTFXR_OPTIONS& hostfxrOptions, PCWSTR libraryName, std::wstring& handlerDllPath, BaseOutputManager* outputManager); HMODULE m_hModule; const IHttpServer &m_pServer; diff --git a/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc b/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc new file mode 100644 index 0000000000000000000000000000000000000000..d923a2121ce3d06fb24905f7322ee6080da33f16 GIT binary patch literal 3324 zcmds)ZEq4m5Xb+oP5cfgys^;~A3i~W3Pc_n4w{;f5K}xQp;yB}eB)a3U}4g zzBtY1n7z4~*_qjy|1Lj&)KpWXp60sLQrF6O60P8!!^^bRM=f}3=mjIvXMIx2vxL8b z&fqPfrnhEx$vooCtj+ZmnPWZG6IQ7?T7{ePb%FHE$yWCCkM%_rCvBQlCzm)qvwfm7 z#Tsd>raBsEs-aHdHktR;)dx5+zdhCAbeV_s&4==h;9a1RTI6Ln#|c@w))n!u$d2V< zMAR4jc8Iz`oR*JM_-}Z2cjV7|@Xh7d>)pS5`?0aUWJ2A@jj*xoGe% zVs}&eZ^2Gw)Ig-??0L#t=);(q@5)R^IaQEt_0-(u>)EZ|nql!o@2D!@Q!)KBrn?%f zJf*t2472;45fy5VurZ{Dr)c%jKXR*f;r8KHj9eX#*V&br z^3`{>uKppB_sE}PV6m*6eb+oA#3CzentCuQ_%$6no!Xm`!`+|dGz)`kM6rp)#34sPBV=0!!RNbZ}zJ# z>`}Q;W!oF`(B1=$=)w`_XZJTJ#9+})Ie&-rlc7S)u+z3pZS~yDy5G*E25-Si$XP!9 zJE@Is1?wq3*m-ETjf@e4hjUKHfPi+JX@iDWprxH=Hrw1N4An;XHvsD%E1LU9G2jNY z!iVHRu@u+ls52-uA{kEUxzyJh1;Q K`**;6O#TIKC57bx literal 0 HcmV?d00001 diff --git a/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm b/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm new file mode 100644 index 0000000000..b7e575552a --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm @@ -0,0 +1,45 @@ + + + + + + IIS 500 Error + + + + +
+
+

HTTP Error 500.0 - ANCM InProcess Startup Failure

+
+
+
+

Common causes of this issue:

+
    +
  • The specified version of Microsoft.NetCore.App or Microsoft.AspNetCore.App was not found.
    • +
  • The in process request handler, Microsoft.AspNetCore.Server.IIS, was not referenced in the application.
    • +
  • ANCM could not find dotnet.
    • +
+
+
+
+
+

Troubleshooting steps:

+
    +
  • Check the system event log for error messages
    • +
  • Enable logging the application process' stdout messages
    • +
  • Attach a debugger to the application process and inspect
    • +
+
+
+

For more information visit: + + https://go.microsoft.com/fwlink/?LinkID=808681 + +

+
+
+
+ + + diff --git a/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm b/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm new file mode 100644 index 0000000000..475ce26956 --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm @@ -0,0 +1,44 @@ + + + + + + IIS 500 Error + + + + +
+
+

HTTP Error 500.0 - ANCM OutOfProcess Startup Failure

+
+
+
+

Common causes of this issue:

+
    +
  • The out of process request handler, aspnetcorev2_outofprocess.dll, could not be found next to the aspnetcorev2.dll.
    • +
  • Could not read configuration correctly. Check the application's associated web.config.
    • +
+
+
+
+
+

Troubleshooting steps:

+
    +
  • Check the system event log for error messages
    • +
  • Enable logging the application process' stdout messages
    • +
  • Attach a debugger to the application process and inspect
    • +
+
+
+

For more information visit: + + https://go.microsoft.com/fwlink/?LinkID=808681 + +

+
+
+
+ + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h index df686adbc4..ac5bd85aaf 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h +++ b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h @@ -9,8 +9,16 @@ class ServerErrorApplication : public PollingAppOfflineApplication { public: - ServerErrorApplication(const IHttpApplication& pApplication, HRESULT hr) + ServerErrorApplication(const IHttpApplication& pApplication, HRESULT hr, HINSTANCE moduleInstance) + : ServerErrorApplication(pApplication, hr, moduleInstance, true /* disableStartupPage*/, 0 /* page */) + { + } + + ServerErrorApplication(const IHttpApplication& pApplication, HRESULT hr, HINSTANCE moduleInstance, bool disableStartupPage, int page) : m_HR(hr), + m_disableStartupPage(disableStartupPage), + m_page(page), + m_moduleInstance(moduleInstance), PollingAppOfflineApplication(pApplication, PollingAppOfflineApplicationMode::StopWhenAdded) { } @@ -19,7 +27,7 @@ public: HRESULT CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override { - auto handler = std::make_unique(*pHttpContext, m_HR); + auto handler = std::make_unique(*pHttpContext, m_HR, m_moduleInstance, m_disableStartupPage, m_page); *pRequestHandler = handler.release(); return S_OK; } @@ -27,5 +35,8 @@ public: HRESULT OnAppOfflineFound() noexcept override { return S_OK; } private: HRESULT m_HR; + bool m_disableStartupPage; + int m_page; + HINSTANCE m_moduleInstance; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorHandler.h b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorHandler.h deleted file mode 100644 index 10cf3ee049..0000000000 --- a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorHandler.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#pragma once -#include "requesthandler.h" - -class ServerErrorHandler : public REQUEST_HANDLER -{ -public: - ServerErrorHandler(IHttpContext &pContext, HRESULT hr) : m_pContext(pContext), m_HR(hr) - { - } - - REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override - { - m_pContext.GetResponse()->SetStatus(500, "Internal Server Error", 0, m_HR); - return RQ_NOTIFICATION_FINISH_REQUEST; - } - -private: - IHttpContext &m_pContext; - HRESULT m_HR; -}; diff --git a/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp b/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp index 3ba1db7889..cb7f1488d7 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp @@ -40,4 +40,5 @@ ShimOptions::ShimOptions(const ConfigurationSource &configurationSource) : m_strArguments = section->GetString(CS_ASPNETCORE_PROCESS_ARGUMENTS).value_or(CS_ASPNETCORE_PROCESS_ARGUMENTS_DEFAULT); m_fStdoutLogEnabled = section->GetRequiredBool(CS_ASPNETCORE_STDOUT_LOG_ENABLED); m_struStdoutLogFile = section->GetRequiredString(CS_ASPNETCORE_STDOUT_LOG_FILE); + m_fDisableStartupPage = section->GetRequiredBool(CS_ASPNETCORE_DISABLE_START_UP_ERROR_PAGE); } diff --git a/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h b/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h index 4b934ad9b4..3cfb47169e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h +++ b/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h @@ -53,6 +53,12 @@ public: return m_struStdoutLogFile; } + bool + QueryDisableStartupPage() const noexcept + { + return m_fDisableStartupPage; + } + ShimOptions(const ConfigurationSource &configurationSource); private: @@ -62,4 +68,5 @@ private: std::wstring m_strHandlerVersion; std::wstring m_struStdoutLogFile; bool m_fStdoutLogEnabled; + bool m_fDisableStartupPage; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index 85bb5c6398..9b95d94f16 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -12,6 +12,11 @@ #include "EventLog.h" #include "ServerErrorApplication.h" #include "AppOfflineApplication.h" +#include "WebConfigConfigurationSource.h" +#include "ConfigurationLoadException.h" +#include "resource.h" + +extern HINSTANCE g_hServerModule; HRESULT APPLICATION_INFO::CreateHandler( @@ -23,7 +28,7 @@ APPLICATION_INFO::CreateHandler( { SRWSharedLock lock(m_applicationLock); - + RETURN_IF_FAILED(hr = TryCreateHandler(pHttpContext, pHandler)); if (hr == S_OK) @@ -31,10 +36,10 @@ APPLICATION_INFO::CreateHandler( return S_OK; } } - + { SRWExclusiveLock lock(m_applicationLock); - + // check if other thread created application RETURN_IF_FAILED(hr = TryCreateHandler(pHttpContext, pHandler)); @@ -66,48 +71,78 @@ APPLICATION_INFO::CreateHandler( HRESULT APPLICATION_INFO::CreateApplication(const IHttpApplication& pHttpApplication) { - HRESULT hr = S_OK; - if (AppOfflineApplication::ShouldBeStarted(pHttpApplication)) { LOG_INFO(L"Detected app_offline file, creating polling application"); - #pragma warning( push ) - #pragma warning ( disable : 26409 ) // Disable "Avoid using new", using custom deleter here - m_pApplication.reset(new AppOfflineApplication(pHttpApplication)); - #pragma warning( pop ) + m_pApplication = make_application(pHttpApplication); + + return S_OK; } else { - FINISHED_IF_FAILED(m_handlerResolver.GetApplicationFactory(pHttpApplication, m_pApplicationFactory)); + try + { + const WebConfigConfigurationSource configurationSource(m_pServer.GetAdminManager(), pHttpApplication); + ShimOptions options(configurationSource); - LOG_INFO(L"Creating handler application"); - IAPPLICATION * newApplication; - FINISHED_IF_FAILED(m_pApplicationFactory->Execute( - &m_pServer, - &pHttpApplication, - &newApplication)); + const auto hr = TryCreateApplication(pHttpApplication, options); - m_pApplication.reset(newApplication); + if (FAILED_LOG(hr)) + { + // Log the failure and update application info to not try again + EventLog::Error( + ASPNETCORE_EVENT_ADD_APPLICATION_ERROR, + ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG, + pHttpApplication.GetApplicationId(), + hr); + + m_pApplication = make_application( + pHttpApplication, + hr, + g_hServerModule, + options.QueryDisableStartupPage(), + options.QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS ? IN_PROCESS_SHIM_STATIC_HTML : OUT_OF_PROCESS_SHIM_STATIC_HTML); + } + return S_OK; + } + catch (ConfigurationLoadException &ex) + { + EventLog::Error( + ASPNETCORE_CONFIGURATION_LOAD_ERROR, + ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG, + ex.get_message().c_str()); + } + catch (...) + { + EventLog::Error( + ASPNETCORE_CONFIGURATION_LOAD_ERROR, + ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG, + L""); + } + + m_pApplication = make_application( + pHttpApplication, + E_FAIL, + g_hServerModule); + + return S_OK; } +} -Finished: +HRESULT +APPLICATION_INFO::TryCreateApplication(const IHttpApplication& pHttpApplication, const ShimOptions& options) +{ + RETURN_IF_FAILED(m_handlerResolver.GetApplicationFactory(pHttpApplication, m_pApplicationFactory, options)); + LOG_INFO(L"Creating handler application"); - if (m_pApplication == nullptr || FAILED(hr)) - { - // Log the failure and update application info to not try again - EventLog::Error( - ASPNETCORE_EVENT_ADD_APPLICATION_ERROR, - ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG, - pHttpApplication.GetApplicationId(), - hr); - - #pragma warning( push ) - #pragma warning ( disable : 26409 ) // Disable "Avoid using new", using custom deleter here - m_pApplication.reset(new ServerErrorApplication(pHttpApplication, hr)); - #pragma warning( pop ) - } + IAPPLICATION * newApplication; + RETURN_IF_FAILED(m_pApplicationFactory->Execute( + &m_pServer, + &pHttpApplication, + &newApplication)); - return hr; + m_pApplication.reset(newApplication); + return S_OK; } HRESULT @@ -139,7 +174,7 @@ APPLICATION_INFO::ShutDownApplication(bool fServerInitiated) if (m_pApplication) { LOG_INFOF(L"Stopping application '%ls'", QueryApplicationInfoKey().c_str()); - m_pApplication ->Stop(fServerInitiated); + m_pApplication->Stop(fServerInitiated); m_pApplication = nullptr; m_pApplicationFactory = nullptr; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h index 9c6d1b7cde..4b190007dd 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h @@ -76,6 +76,9 @@ private: HRESULT CreateApplication(const IHttpApplication& pHttpApplication); + HRESULT + TryCreateApplication(const IHttpApplication& pHttpApplication, const ShimOptions& options); + IHttpServer &m_pServer; HandlerResolver &m_handlerResolver; diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp index 52d9730ec1..d1e2b12375 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp @@ -13,7 +13,7 @@ extern BOOL g_fInShutdown; // // Retrieves the application info from the application manager -// Will create the application info if it isn't initalized +// Will create the application info if it isn't initialized // HRESULT APPLICATION_MANAGER::GetOrCreateApplicationInfo( @@ -21,7 +21,6 @@ APPLICATION_MANAGER::GetOrCreateApplicationInfo( _Out_ std::shared_ptr& ppApplicationInfo ) { - auto &pApplication = *pHttpContext.GetApplication(); // The configuration path is unique for each application and is used for the diff --git a/src/AspNetCoreModuleV2/AspNetCore/resource.h b/src/AspNetCoreModuleV2/AspNetCore/resource.h new file mode 100644 index 0000000000..289df99bc3 --- /dev/null +++ b/src/AspNetCoreModuleV2/AspNetCore/resource.h @@ -0,0 +1,19 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by HtmlResponses.rc +// +#define IN_PROCESS_SHIM_STATIC_HTML 101 +#define OUT_OF_PROCESS_SHIM_STATIC_HTML 102 +#define UNKNOWN_HOSTING_STATIC_HTML 103 + + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 104 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 8628cc6529..caa53ff29d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -223,12 +223,14 @@ - + + + diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp index b0442e1a81..1b3772bb4f 100644 --- a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp @@ -11,8 +11,6 @@ #include "StdWrapper.h" #include "StringHelpers.h" -extern HINSTANCE g_hModule; - FileOutputManager::FileOutputManager(std::wstring pwzStdOutLogFileName, std::wstring pwzApplicationPath) : FileOutputManager(pwzStdOutLogFileName, pwzApplicationPath, /* fEnableNativeLogging */ true) { } diff --git a/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h b/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h new file mode 100644 index 0000000000..721c0d12eb --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h @@ -0,0 +1,32 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +#include "requesthandler.h" +#include "file_utility.h" + +class ServerErrorHandler : public REQUEST_HANDLER +{ +public: + + ServerErrorHandler(IHttpContext &pContext, HRESULT hr, HINSTANCE moduleInstance, bool disableStartupPage, int page) + : m_pContext(pContext), m_HR(hr), m_disableStartupPage(disableStartupPage), m_page(page), m_moduleInstance(moduleInstance) + { + } + + REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override + { + static std::string s_html500Page = FILE_UTILITY::GetHtml(m_moduleInstance, m_page); + + WriteStaticResponse(m_pContext, s_html500Page, m_HR, m_disableStartupPage); + + return RQ_NOTIFICATION_FINISH_REQUEST; + } + +private: + IHttpContext &m_pContext; + HRESULT m_HR; + bool m_disableStartupPage; + int m_page; + HINSTANCE m_moduleInstance; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp index a971821208..228c1c0d66 100644 --- a/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp @@ -5,6 +5,7 @@ #include #include "debugutil.h" +#include "exceptions.h" HRESULT FILE_UTILITY::IsPathUnc( @@ -165,3 +166,24 @@ FILE_UTILITY::EnsureDirectoryPathExist( Finished: return hr; } + +std::string +FILE_UTILITY::GetHtml(HMODULE module, int page) +{ + HRESULT hr = S_OK; + HRSRC rc = nullptr; + HGLOBAL rcData = nullptr; + const char* data = nullptr; + DWORD size = 0; + + FINISHED_LAST_ERROR_IF_NULL(rc = FindResource(module, MAKEINTRESOURCE(page), RT_HTML)); + FINISHED_LAST_ERROR_IF_NULL(rcData = LoadResource(module, rc)); + size = SizeofResource(module, rc); + FINISHED_LAST_ERROR_IF(size == 0); + FINISHED_LAST_ERROR_IF_NULL(data = static_cast(LockResource(rcData))); + + return data; +Finished: + + return ""; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/file_utility.h b/src/AspNetCoreModuleV2/CommonLib/file_utility.h index cc541b712a..686e810cbe 100644 --- a/src/AspNetCoreModuleV2/CommonLib/file_utility.h +++ b/src/AspNetCoreModuleV2/CommonLib/file_utility.h @@ -25,6 +25,11 @@ public: EnsureDirectoryPathExist( _In_ LPCWSTR pszPath ); + + static + std::string + GetHtml(HMODULE module, int page); + private: static HRESULT @@ -32,5 +37,6 @@ private: __in LPCWSTR pszPath, __out BOOL * pfIsUnc ); + }; diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h index 3349cb66fb..2e8660748f 100644 --- a/src/AspNetCoreModuleV2/CommonLib/iapplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -51,3 +51,13 @@ std::unique_ptr ReferenceApplication(APPLICAT application->ReferenceApplication(); return std::unique_ptr(application); }; + +template< class APPLICATION, typename ...Params > +std::unique_ptr make_application(Params&&... params) +{ +#pragma warning( push ) +#pragma warning ( disable : 26409 ) // Disable "Avoid using new", using custom deleter here + return std::unique_ptr(new APPLICATION(std::forward(params)...)); +#pragma warning( pop ) +} + diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h index a5e16bf022..b4cd3a0e35 100644 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h @@ -46,6 +46,32 @@ public: { } +protected: + + static + void WriteStaticResponse(IHttpContext& pContext, std::string &s_html500Page, HRESULT hr, bool disableStartupErrorPage) + { + if (disableStartupErrorPage) + { + pContext.GetResponse()->SetStatus(500, "Internal Server Error", 30, E_FAIL); + return; + } + + HTTP_DATA_CHUNK dataChunk = {}; + IHttpResponse* pResponse = pContext.GetResponse(); + pResponse->SetStatus(500, "Internal Server Error", 0, hr, nullptr, true); + pResponse->SetHeader("Content-Type", + "text/html", + (USHORT)strlen("text/html"), + FALSE + ); + dataChunk.DataChunkType = HttpDataChunkFromMemory; + + dataChunk.FromMemory.pBuffer = s_html500Page.data(); + dataChunk.FromMemory.BufferLength = static_cast(s_html500Page.size()); + pResponse->WriteEntityChunkByReference(&dataChunk); + } + private: mutable LONG m_cRefs = 1; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/AspNetCoreModuleV2/CommonLib/resources.h index d44c6a25f8..fdee8b9578 100644 --- a/src/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/AspNetCoreModuleV2/CommonLib/resources.h @@ -28,7 +28,7 @@ #define ASPNETCORE_EVENT_APP_SHUTDOWN_SUCCESSFUL_MSG L"Application '%s' has shutdown." #define ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG L"Only one inprocess application is allowed per IIS application pool. Please assign the application '%s' to a different IIS application pool." #define ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG L"Mixed hosting model is not supported. Application '%s' configured with different hostingModel value '%d' other than the one of running application(s)." -#define ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG L"Configuration load error. %s" +#define ASPNETCORE_CONFIGURATION_LOAD_ERROR_MSG L"Could not load configuration. Exception message: %s" #define ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG L"Failed to start application '%s', ErrorCode '0x%x'." #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, exit code = '%d'. Last 4KB characters of captured stdout and stderr logs:\r\n%s" #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXIT_MSG L"Application '%s' with physical root '%s' hit unexpected managed background thread exit, exit code = '%d'. Please check the stderr logs for more information." @@ -39,9 +39,11 @@ #define ASPNETCORE_EVENT_RECYCLE_FAILURE_CONFIGURATION_MSG L"Failed to recycle application due to a configuration change at '%s'. Recycling worker process." #define ASPNETCORE_EVENT_MODULE_DISABLED_MSG L"AspNetCore Module is disabled" #define ASPNETCORE_EVENT_HOSTFXR_DLL_INVALID_VERSION_MSG L"Hostfxr version used does not support 'hostfxr_get_native_search_directories', update the version of hostfxr to a higher version. Path to hostfxr: '%s'." +#define ASPNETCORE_EVENT_HOSTFXR_FAILURE_MSG L"Invoking hostfxr to find the inprocess request handler failed without finding any native dependencies. This most likely means the app is misconfigured, please check the versions of Microsoft.NetCore.App and Microsoft.AspNetCore.App that are targeted by the application and are installed on the machine." #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, exception code = '0x%x'. Please check the stderr logs for more information." #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, exception code = '0x%x'. Last 4KB characters of captured stdout and stderr logs:\r\n%s" -#define ASPNETCORE_EVENT_INPROCESS_RH_ERROR_MSG L"Could not find the assembly '%s' for in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application. Captured output: %s" +#define ASPNETCORE_EVENT_INPROCESS_RH_ERROR_MSG L"Could not find inprocess request handler. Captured output from invoking hostfxr: %s" +#define ASPNETCORE_EVENT_INPROCESS_RH_REFERENCE_MSG L"Could not find the assembly '%s' referenced for the in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application." #define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for out-of-process application. Please confirm the assembly is installed correctly for IIS or IISExpress." #define ASPNETCORE_EVENT_INPROCESS_START_SUCCESS_MSG L"Application '%s' started the coreclr in-process successfully." #define ASPNETCORE_EVENT_INPROCESS_START_ERROR_MSG L"Application '%s' wasn't able to start. %s" diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc b/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc new file mode 100644 index 0000000000000000000000000000000000000000..25a99683c5e9730bdb8e0b66e6a68d3229964283 GIT binary patch literal 3112 zcmdUxU2oGc6o%hxB>qE4Zwl_InfsMKYsX~hk{9e9pCkE}^S z6fS}+=Qzjq@%eo1@88;LE7G}Ey3$5BD(IQE@GjvM+UdR4{PpyN7U`otD5r1WZ=p+g z8>sEuF}h+L@n_Oj`plYBJ=6nEX*=42n=`v+_0p}4EBjCNNwHgPJ6mpD=JuKFjxLmF zrn&kW>5WoNbq2T3c%rf1!Aba@s|#n$IGk@fG_M8i0*y4lFZ({u@Y0R0v44wq%nviH ze#>`+)jjMqf1JU8LEn$a?_==A`Pc8e@Bij`ENJAjV~4LSlQQf+E;oYbgWP7(pj||C zbLwwRqzZB%(qm$t^B3wcVdSf_&`C`e6s4M4Ie$I6S6fRYcJzv@@->xEKXa<9$H^(# zHKv)|ue9jk&KWYMh + - @@ -247,8 +247,6 @@ Create Create - - @@ -262,9 +260,13 @@ + + + true + diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm new file mode 100644 index 0000000000..4675db7cdb --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm @@ -0,0 +1,44 @@ + + + + + + + IIS 500.30 Error + + + +
+ +

HTTP Error 500.30 - ANCM In-Process Start Failure

+
+ +
+

Common causes of this issue:

+
    +
  • The application failed to start
    • +
  • The application started but then stopped
    • +
  • The application started but threw an exception during startup
    • +
+
+
+
+ +
+

Troubleshooting steps:

+
    +
  • Check the system event log for error messages
    • +
  • Enable logging the application process' stdout messages
    • +
  • Attach a debugger to the application process and inspect
    • +
+
+
+

+ For more information visit: + https://go.microsoft.com/fwlink/?LinkID=808681 +

+
+
+
+ + diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp deleted file mode 100644 index b198e95909..0000000000 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#include "StartupExceptionApplication.h" - -HRESULT StartupExceptionApplication::CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler) -{ - *pRequestHandler = new StartupExceptionHandler(pHttpContext, m_disableLogs); - return S_OK; -} diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h index d3505315be..7d8acc4e7e 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h @@ -4,7 +4,8 @@ #pragma once #include "InProcessApplicationBase.h" -#include "StartupExceptionHandler.h" +#include "ServerErrorHandler.h" +#include "resource.h" class StartupExceptionApplication : public InProcessApplicationBase { @@ -12,15 +13,24 @@ public: StartupExceptionApplication( IHttpServer& pServer, IHttpApplication& pApplication, - BOOL disableLogs) + HINSTANCE moduleInstance, + BOOL disableLogs, + HRESULT hr) : m_disableLogs(disableLogs), + m_HR(hr), + m_moduleInstance(moduleInstance), InProcessApplicationBase(pServer, pApplication) { } ~StartupExceptionApplication() = default; - HRESULT CreateHandler(IHttpContext * pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override; + HRESULT + CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler) + { + *pRequestHandler = new ServerErrorHandler(*pHttpContext, m_HR,m_moduleInstance, m_disableLogs, IN_PROCESS_RH_STATIC_HTML); + return S_OK; + } std::string& GetStaticHtml500Content() @@ -31,5 +41,7 @@ public: private: std::string html500Page; BOOL m_disableLogs; + HRESULT m_HR; + HINSTANCE m_moduleInstance; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp deleted file mode 100644 index d180460898..0000000000 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.cpp +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -#include "StartupExceptionApplication.h" -#include "StartupExceptionHandler.h" - -std::string StartupExceptionHandler::s_html500Page = " \ - \ - \ - \ - IIS 500.30 Error \ -
\ -

HTTP Error 500.30 - ANCM In-Process Start Failure

\ -
\ -

Common causes of this issue:

\ -
  • The application failed to start
    • \ -
  • The application started but then stopped
    • \ -
  • The application started but threw an exception during startup
\ -
\ -
\ -

Troubleshooting steps:

\ -
  • Check the system event log for error messages
    • \ -
  • Enable logging the application process' stdout messages
    • \ -
  • Attach a debugger to the application process and inspect
\ -

For more information visit: \ - https://go.microsoft.com/fwlink/?LinkID=808681

\ -
\ -
\ -
"; - -REQUEST_NOTIFICATION_STATUS StartupExceptionHandler::OnExecuteRequestHandler() -{ - if (!m_disableLogs) - { - HTTP_DATA_CHUNK DataChunk; - IHttpResponse* pResponse = m_pContext->GetResponse(); - pResponse->SetStatus(500, "Internal Server Error", 30, E_FAIL, NULL, TRUE); - pResponse->SetHeader("Content-Type", - "text/html", - (USHORT)strlen("text/html"), - FALSE - ); - DataChunk.DataChunkType = HttpDataChunkFromMemory; - DataChunk.FromMemory.pBuffer = (PVOID)s_html500Page.c_str(); - DataChunk.FromMemory.BufferLength = (ULONG)s_html500Page.size(); - pResponse->WriteEntityChunkByReference(&DataChunk); - } - else - { - m_pContext->GetResponse()->SetStatus(500, "Internal Server Error", 30, E_FAIL); - } - - return REQUEST_NOTIFICATION_STATUS::RQ_NOTIFICATION_FINISH_REQUEST; -} - diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h index 266474e1b5..1d0f3b7cc9 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h @@ -3,31 +3,38 @@ #pragma once -#include #include "requesthandler.h" +#include "resource.h" +#include "file_utility.h" -class StartupExceptionApplication; class StartupExceptionHandler : public REQUEST_HANDLER { public: - StartupExceptionHandler(IHttpContext* pContext, BOOL disableLogs) - : - m_pContext(pContext), - m_disableLogs(disableLogs) + + StartupExceptionHandler(IHttpContext& pContext, BOOL disableLogs, HRESULT hr) + : m_pContext(pContext), + m_disableLogs(disableLogs), + m_HR(hr) { } + ~StartupExceptionHandler() { - } - REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override; + + REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() + { + static std::string s_html500Page = FILE_UTILITY::GetHtml(g_hModule, IN_PROCESS_SHIM_STATIC_HTML); + + WriteStaticResponse(m_pContext, s_html500Page, m_HR, m_disableLogs); + + return REQUEST_NOTIFICATION_STATUS::RQ_NOTIFICATION_FINISH_REQUEST; + } private: - IHttpContext * m_pContext; + IHttpContext& m_pContext; BOOL m_disableLogs; - - static - std::string s_html500Page; + HRESULT m_HR; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp index 32a314dd50..49f2142fd4 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp @@ -6,7 +6,6 @@ #include #include "inprocessapplication.h" -#include "StartupExceptionApplication.h" #include "inprocesshandler.h" #include "requesthandler_config.h" #include "debugutil.h" @@ -17,6 +16,7 @@ #include "EventLog.h" #include "WebConfigConfigurationSource.h" #include "ConfigurationLoadException.h" +#include "StartupExceptionApplication.h" DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_inprocess.dll"); @@ -28,6 +28,7 @@ HINSTANCE g_hWinHttpModule; HINSTANCE g_hAspNetCoreModule; HANDLE g_hEventLog = NULL; bool g_fInProcessApplicationCreated = false; +HINSTANCE g_hServerModule; HRESULT InitializeGlobalConfiguration( @@ -69,7 +70,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, ) { UNREFERENCED_PARAMETER(lpReserved); - + g_hServerModule = hModule; switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: @@ -100,6 +101,7 @@ CreateApplication( { try { + HRESULT hr = S_OK; RETURN_IF_FAILED(InitializeGlobalConfiguration(pServer, pHttpApplication)); // In process application was already created so another call to CreateApplication @@ -114,7 +116,7 @@ CreateApplication( g_fInProcessApplicationCreated = true; std::unique_ptr inProcessApplication; - if (!FAILED_LOG(IN_PROCESS_APPLICATION::Start(*pServer, *pHttpApplication, pParameters, nParameters, inProcessApplication))) + if (!FAILED_LOG(hr = IN_PROCESS_APPLICATION::Start(*pServer, *pHttpApplication, pParameters, nParameters, inProcessApplication))) { *ppApplication = inProcessApplication.release(); } @@ -123,7 +125,7 @@ CreateApplication( std::unique_ptr options; THROW_IF_FAILED(InProcessOptions::Create(*pServer, *pHttpApplication, options)); // Set the currently running application to a fake application that returns startup exceptions. - auto pErrorApplication = std::make_unique(*pServer, *pHttpApplication, options->QueryDisableStartUpErrorPage()); + auto pErrorApplication = std::make_unique(*pServer, *pHttpApplication, g_hServerModule, options->QueryDisableStartUpErrorPage(), hr); RETURN_IF_FAILED(pErrorApplication->StartMonitoringAppOffline()); *ppApplication = pErrorApplication.release(); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h new file mode 100644 index 0000000000..61f67c2833 --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by HtmlResponses.rc +// +#define IN_PROCESS_RH_STATIC_HTML 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index 76ce9a3800..a2c3360cf4 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { private const string DetailedErrorsEnvironmentVariable = "ASPNETCORE_DETAILEDERRORS"; - private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(10); + private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(60); private static readonly TimeSpan _retryDelay = TimeSpan.FromMilliseconds(200); private CancellationTokenSource _hostShutdownToken = new CancellationTokenSource(); diff --git a/test/Common.FunctionalTests/ConfigurationChangeTests.cs b/test/Common.FunctionalTests/ConfigurationChangeTests.cs index 014e2520c4..099cefb97a 100644 --- a/test/Common.FunctionalTests/ConfigurationChangeTests.cs +++ b/test/Common.FunctionalTests/ConfigurationChangeTests.cs @@ -83,7 +83,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await deploymentResult.HttpClient.RetryRequestAsync("/HelloWorld", r => r.StatusCode == HttpStatusCode.InternalServerError); StopServer(); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Could not find the assembly 'aspnetcorev2_inprocess.dll'"); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Could not find the assembly 'aspnetcorev2_inprocess.dll'", Logger); } [ConditionalTheory] diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index 2d7de2a8f1..cf977b76f4 100644 --- a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -1,12 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text.RegularExpressions; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.Extensions.Logging; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests @@ -21,6 +23,25 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests AssertSingleEntry(expectedRegexMatchString, entries); } + public static void VerifyEventLogEvent(IISDeploymentResult deploymentResult, string expectedRegexMatchString, ILogger logger) + { + Assert.True(deploymentResult.HostProcess.HasExited); + + var entries = GetEntries(deploymentResult); + try + { + AssertSingleEntry(expectedRegexMatchString, entries); + } + catch (Exception ex) + { + foreach (var entry in entries) + { + logger.LogInformation(entry.Message); + } + throw ex; + } + } + public static void VerifyEventLogEvents(IISDeploymentResult deploymentResult, params string[] expectedRegexMatchString) { Assert.True(deploymentResult.HostProcess.HasExited); @@ -149,7 +170,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string ConfigurationLoadError(IISDeploymentResult deploymentResult, string reason) { - return $"Configuration load error. {reason}"; + return $"Could not load configuration. Exception message: {reason}"; } public static string OutOfProcessFailedToStart(IISDeploymentResult deploymentResult) @@ -159,6 +180,23 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests $"The last try of listening port is '(.*)'. See previous warnings for details."; } + public static string InProcessHostfxrInvalid(IISDeploymentResult deploymentResult) + { + return $"Hostfxr version used does not support 'hostfxr_get_native_search_directories', update the version of hostfxr to a higher version. Path to hostfxr: '(.*)'."; + } + + public static string InProcessFailedToFindNativeDependencies(IISDeploymentResult deploymentResult) + { + return "Invoking hostfxr to find the inprocess request handler failed without finding any native dependencies. " + + "This most likely means the app is misconfigured, please check the versions of Microsoft.NetCore.App and Microsoft.AspNetCore.App that " + + "are targeted by the application and are installed on the machine."; + } + + public static string InProcessFailedToFindRequestHandler(IISDeploymentResult deploymentResult) + { + return "Could not find the assembly '(.*)' referenced for the in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application."; + } + private static string EscapedContentRoot(IISDeploymentResult deploymentResult) { var contentRoot = deploymentResult.ContentRoot; diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index cb6779210a..8087b67b1d 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -12,6 +12,8 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests @@ -159,5 +161,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return Directory.GetFiles(logFolderPath).Single(); } } + + public static void ModifyFrameworkVersionInRuntimeConfig(IISDeploymentResult deploymentResult) + { + var path = Path.Combine(deploymentResult.ContentRoot, "InProcessWebSite.runtimeconfig.json"); + dynamic depsFileContent = JsonConvert.DeserializeObject(File.ReadAllText(path)); + depsFileContent["runtimeOptions"]["framework"]["version"] = "2.9.9"; + var output = JsonConvert.SerializeObject(depsFileContent); + File.WriteAllText(path, output); + } } } diff --git a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs index deab1d756b..9c89249d1e 100644 --- a/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs +++ b/test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs @@ -32,7 +32,7 @@ namespace IIS.FunctionalTests.Inprocess var deploymentResult = await DeployAsync(deploymentParameters); - InvalidateRuntimeConfig(deploymentResult); + Helpers.ModifyFrameworkVersionInRuntimeConfig(deploymentResult); var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); Assert.False(response.IsSuccessStatusCode); @@ -54,7 +54,7 @@ namespace IIS.FunctionalTests.Inprocess var deploymentResult = await DeployAsync(deploymentParameters); - InvalidateRuntimeConfig(deploymentResult); + Helpers.ModifyFrameworkVersionInRuntimeConfig(deploymentResult); var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); Assert.False(response.IsSuccessStatusCode); @@ -146,14 +146,5 @@ namespace IIS.FunctionalTests.Inprocess EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Invoked hostfxr"); Assert.Contains("Invoked hostfxr", contents); } - - private static void InvalidateRuntimeConfig(IISDeploymentResult deploymentResult) - { - var path = Path.Combine(deploymentResult.ContentRoot, "InProcessWebSite.runtimeconfig.json"); - dynamic depsFileContent = JsonConvert.DeserializeObject(File.ReadAllText(path)); - depsFileContent["runtimeOptions"]["framework"]["version"] = "2.9.9"; - var output = JsonConvert.SerializeObject(depsFileContent); - File.WriteAllText(path, output); - } } } diff --git a/test/IIS.FunctionalTests/RequiresIISAttribute.cs b/test/IIS.FunctionalTests/RequiresIISAttribute.cs index 507de60279..9fa3a7c502 100644 --- a/test/IIS.FunctionalTests/RequiresIISAttribute.cs +++ b/test/IIS.FunctionalTests/RequiresIISAttribute.cs @@ -151,8 +151,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests if (capabilities.HasFlag(IISCapability.ApplicationInitialization)) { - IsMet &= _dynamicCompressionAvailable; - if (!_dynamicCompressionAvailable) + IsMet &= _applicationInitializationModule; + if (!_applicationInitializationModule) { SkipReason += "The machine does not have IIS ApplicationInitialization installed."; } diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 227722e6ca..662aba0727 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; +using Newtonsoft.Json; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests @@ -60,6 +61,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); EventLogHelpers.VerifyEventLogEvent(deploymentResult, $@"Application '{Regex.Escape(deploymentResult.ContentRoot)}\\' wasn't able to start. {subError}"); + + Assert.Contains("HTTP Error 500.0 - ANCM InProcess Startup Failure", await response.Content.ReadAsStringAsync()); } [ConditionalFact] @@ -185,6 +188,48 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EventLogHelpers.InProcessThreadExit(deploymentResult, "12")); } + [ConditionalFact] + public async Task RemoveHostfxrFromApp_InProcessHostfxrInvalid() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.ApplicationType = ApplicationType.Standalone; + var deploymentResult = await DeployAsync(deploymentParameters); + + File.Copy( + Path.Combine(deploymentResult.ContentRoot, "aspnetcorev2_inprocess.dll"), + Path.Combine(deploymentResult.ContentRoot, "hostfxr.dll"), + true); + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessHostfxrInvalid(deploymentResult), Logger); + } + + [ConditionalFact] + public async Task TargedDifferenceSharedFramework_FailedToFindNativeDependencies() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + var deploymentResult = await DeployAsync(deploymentParameters); + + Helpers.ModifyFrameworkVersionInRuntimeConfig(deploymentResult); + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessFailedToFindNativeDependencies(deploymentResult), Logger); + } + + [ConditionalFact] + public async Task RemoveInProcessReference_FailedToFindRequestHandler() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.ApplicationType = ApplicationType.Standalone; + var deploymentResult = await DeployAsync(deploymentParameters); + + File.Delete(Path.Combine(deploymentResult.ContentRoot, "aspnetcorev2_inprocess.dll")); + + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessFailedToFindRequestHandler(deploymentResult), Logger); + } + [ConditionalFact] public async Task StartupTimeoutIsApplied() { @@ -239,7 +284,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); EventLogHelpers.VerifyEventLogEvents(deploymentResult, - EventLogHelpers.FailedToStartApplication(deploymentResult, "0x80004005"), EventLogHelpers.ConfigurationLoadError(deploymentResult, "Unknown hosting model 'bogus'. Please specify either hostingModel=\"inprocess\" or hostingModel=\"outofprocess\" in the web.config file.") ); } @@ -259,8 +303,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(HttpStatusCode.InternalServerError, result.StatusCode); StopServer(); + EventLogHelpers.VerifyEventLogEvents(deploymentResult, - EventLogHelpers.FailedToStartApplication(deploymentResult, "0x80004005"), EventLogHelpers.ConfigurationLoadError(deploymentResult, expectedError) ); } @@ -407,5 +451,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } }); } + + private async Task AssertSiteFailsToStartWithInProcessStaticContent(IISDeploymentResult deploymentResult) + { + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.Contains("HTTP Error 500.0 - ANCM InProcess Startup Failure", await response.Content.ReadAsStringAsync()); + StopServer(); + } } } diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index 674550f6fc..855096e026 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -64,6 +64,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var response = await deploymentResult.HttpClient.GetAsync(_helloWorldRequest); Assert.False(response.IsSuccessStatusCode); + var responseString = await response.Content.ReadAsStringAsync(); + Assert.Contains("HTTP Error 500.0 - ANCM OutOfProcess Startup Failure", responseString); } [ConditionalTheory] From bac0f44fa7e102cf8dc6112c7dfd9f227d56708a Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 21 Sep 2018 09:13:39 -0700 Subject: [PATCH 297/363] Revert "Disconnect the disconnect handler when request processing ends (#1413)" This reverts commit f808bdc331ed9e5555c315d44bcc9559695f041c. --- .../AspNetCore/DisconnectHandler.cpp | 15 ++--- .../AspNetCore/DisconnectHandler.h | 12 ++-- .../AspNetCore/proxymodule.cpp | 29 +++------ .../AspNetCore/proxymodule.h | 4 +- .../CommonLib/SRWExclusiveLock.cpp | 2 +- .../CommonLib/SRWExclusiveLock.h | 2 +- .../CommonLib/irequesthandler.h | 6 -- .../ClientDisconnectStress.cs | 65 ------------------- test/WebSites/InProcessWebSite/Startup.cs | 11 ---- 9 files changed, 20 insertions(+), 126 deletions(-) delete mode 100644 test/Common.FunctionalTests/ClientDisconnectStress.cs diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp index 3e8e7754aa..b921994850 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp @@ -4,21 +4,15 @@ #include "DisconnectHandler.h" #include "exceptions.h" #include "proxymodule.h" -#include "SRWExclusiveLock.h" void DisconnectHandler::NotifyDisconnect() { try { - std::unique_ptr module; - { - SRWExclusiveLock lock(m_handlerLock); - m_pHandler.swap(module); - } - + const auto module = m_pModule.exchange(nullptr); if (module != nullptr) { - module->NotifyDisconnect(); + module ->NotifyDisconnect(); } } catch (...) @@ -33,8 +27,7 @@ void DisconnectHandler::CleanupStoredContext() noexcept delete this; } -void DisconnectHandler::SetHandler(std::unique_ptr handler) noexcept +void DisconnectHandler::SetHandler(ASPNET_CORE_PROXY_MODULE * module) noexcept { - SRWExclusiveLock lock(m_handlerLock); - handler.swap(m_pHandler); + m_pModule = module; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h index 63b7525356..34c8a24a63 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h +++ b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h @@ -2,9 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. #pragma once - -#include -#include "irequesthandler.h" +#include class ASPNET_CORE_PROXY_MODULE; @@ -12,9 +10,8 @@ class DisconnectHandler final: public IHttpConnectionStoredContext { public: DisconnectHandler() - : m_pHandler(nullptr) + : m_pModule(nullptr) { - InitializeSRWLock(&m_handlerLock); } virtual @@ -30,10 +27,9 @@ public: CleanupStoredContext() noexcept override; void - SetHandler(std::unique_ptr handler) noexcept; + SetHandler(ASPNET_CORE_PROXY_MODULE * module) noexcept; private: - SRWLOCK m_handlerLock {}; - std::unique_ptr m_pHandler; + std::atomic m_pModule; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index 6f879f2e35..d3d71e8b4b 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -71,10 +71,6 @@ ASPNET_CORE_PROXY_MODULE::ASPNET_CORE_PROXY_MODULE(HTTP_MODULE_ID moduleId, std: ASPNET_CORE_PROXY_MODULE::~ASPNET_CORE_PROXY_MODULE() { - // At this point m_pDisconnectHandler should be disconnected in - // HandleNotificationStatus - assert(m_pDisconnectHandler == nullptr); - if (m_pDisconnectHandler != nullptr) { m_pDisconnectHandler->SetHandler(nullptr); @@ -116,6 +112,8 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( FINISHED_IF_FAILED(moduleContainer->SetConnectionModuleContext(static_cast(disconnectHandler.release()), m_moduleId)); } + m_pDisconnectHandler->SetHandler(this); + FINISHED_IF_FAILED(m_pApplicationManager->GetOrCreateApplicationInfo( *pHttpContext, m_pApplicationInfo)); @@ -123,8 +121,6 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( FINISHED_IF_FAILED(m_pApplicationInfo->CreateHandler(*pHttpContext, m_pHandler)); retVal = m_pHandler->OnExecuteRequestHandler(); - - m_pDisconnectHandler->SetHandler(::ReferenceRequestHandler(m_pHandler.get())); } catch (...) { @@ -145,7 +141,7 @@ Finished: } } - return HandleNotificationStatus(retVal); + return retVal; } __override @@ -160,27 +156,18 @@ ASPNET_CORE_PROXY_MODULE::OnAsyncCompletion( { try { - return HandleNotificationStatus(m_pHandler->OnAsyncCompletion( + return m_pHandler->OnAsyncCompletion( pCompletionInfo->GetCompletionBytes(), - pCompletionInfo->GetCompletionStatus())); + pCompletionInfo->GetCompletionStatus()); } catch (...) { OBSERVE_CAUGHT_EXCEPTION(); - return HandleNotificationStatus(RQ_NOTIFICATION_FINISH_REQUEST); + return RQ_NOTIFICATION_FINISH_REQUEST; } } -REQUEST_NOTIFICATION_STATUS ASPNET_CORE_PROXY_MODULE::HandleNotificationStatus(REQUEST_NOTIFICATION_STATUS status) noexcept +void ASPNET_CORE_PROXY_MODULE::NotifyDisconnect() const { - if (status != RQ_NOTIFICATION_PENDING) - { - if (m_pDisconnectHandler != nullptr) - { - m_pDisconnectHandler->SetHandler(nullptr); - m_pDisconnectHandler = nullptr; - } - } - - return status; + m_pHandler->NotifyDisconnect(); } diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h index 24f4794c68..97c126b0f9 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h @@ -47,8 +47,8 @@ class ASPNET_CORE_PROXY_MODULE : NonCopyable, public CHttpModule IHttpCompletionInfo * pCompletionInfo ) override; - REQUEST_NOTIFICATION_STATUS - HandleNotificationStatus(REQUEST_NOTIFICATION_STATUS status) noexcept; + void + NotifyDisconnect() const; private: std::shared_ptr m_pApplicationManager; diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp index 896189c8a8..0bc46b8cf5 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp @@ -3,7 +3,7 @@ #include "SRWExclusiveLock.h" -SRWExclusiveLock::SRWExclusiveLock(const SRWLOCK& lock) noexcept +SRWExclusiveLock::SRWExclusiveLock(const SRWLOCK& lock) : m_lock(lock) { AcquireSRWLockExclusive(const_cast(&m_lock)); diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h index 6c17e13111..7ff977f70d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h +++ b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h @@ -8,7 +8,7 @@ class SRWExclusiveLock { public: - SRWExclusiveLock(const SRWLOCK& lock) noexcept; + SRWExclusiveLock(const SRWLOCK& lock); ~SRWExclusiveLock(); private: const SRWLOCK& m_lock; diff --git a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h index c89411f8a0..8bd2076072 100644 --- a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h @@ -54,9 +54,3 @@ struct IREQUEST_HANDLER_DELETER application->DereferenceRequestHandler(); } }; - -inline std::unique_ptr ReferenceRequestHandler(IREQUEST_HANDLER* handler) -{ - handler->ReferenceRequestHandler(); - return std::unique_ptr(handler); -}; diff --git a/test/Common.FunctionalTests/ClientDisconnectStress.cs b/test/Common.FunctionalTests/ClientDisconnectStress.cs deleted file mode 100644 index 9deeae3f92..0000000000 --- a/test/Common.FunctionalTests/ClientDisconnectStress.cs +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Net.Http; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Testing.xunit; -using Xunit; - -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests -{ - [Collection(PublishedSitesCollection.Name)] - public class ClientDisconnectStressTests: FunctionalTestsBase - { - private readonly PublishedSitesFixture _fixture; - - public ClientDisconnectStressTests(PublishedSitesFixture fixture) - { - _fixture = fixture; - } - - [ConditionalTheory] - [InlineData(HostingModel.InProcess)] - [InlineData(HostingModel.OutOfProcess)] - public async Task ClientDisconnectStress(HostingModel hostingModel) - { - var site = await StartAsync(_fixture.GetBaseDeploymentParameters(hostingModel)); - var maxRequestSize = 1000; - var blockSize = 40; - var random = new Random(); - async Task RunRequests() - { - using (var connection = new TestConnection(site.HttpClient.BaseAddress.Port)) - { - await connection.Send( - "POST /ReadAndFlushEcho HTTP/1.1", - $"Content-Length: {maxRequestSize}", - "Host: localhost", - "Connection: close", - "", - ""); - - var disconnectAfter = random.Next(maxRequestSize); - var data = new byte[blockSize]; - for (int i = 0; i < disconnectAfter / blockSize; i++) - { - await connection.Stream.WriteAsync(data); - } - } - } - - List tasks = new List(); - for (int i = 0; i < 100; i++) - { - tasks.Add(Task.Run(RunRequests)); - } - - await Task.WhenAll(tasks); - - StopServer(); - } - } -} diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index eb84272b76..39d3b9f765 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -324,17 +324,6 @@ namespace TestSite result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); } } - private async Task ReadAndFlushEcho(HttpContext ctx) - { - var readBuffer = new byte[4096]; - var result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); - while (result != 0) - { - await ctx.Response.WriteAsync(Encoding.UTF8.GetString(readBuffer, 0, result)); - await ctx.Response.Body.FlushAsync(); - result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); - } - } private async Task ReadAndWriteEchoLines(HttpContext ctx) { From 4eb9fc05a323f633cbd9c4bfb97610eef440d23b Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 27 Sep 2018 12:40:44 -0700 Subject: [PATCH 298/363] upgrade deps --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 468dfa74fa..032950b7a2 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,45 +5,45 @@ 0.10.13 3.0.0-alpha1-20180919.1 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 0.7.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 0.7.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 15.6.82 15.6.82 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 - 3.0.0-alpha1-10495 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 + 3.0.0-alpha1-10526 2.0.9 2.1.3 2.2.0-preview2-26905-02 1.0.1 - 3.0.0-alpha1-10495 + 3.0.0-alpha1-10526 15.6.1 11.1.0 2.0.3 4.6.0-preview1-26907-04 4.6.0-preview1-26907-04 4.6.0-preview1-26907-04 - 4.5.0 + 4.6.0-preview1-26717-04 4.6.0-preview1-26907-04 4.6.0-preview1-26907-04 4.6.0-preview1-26907-04 From c0de15cc45980457c66d507da209d4db37abc057 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 27 Sep 2018 12:42:01 -0700 Subject: [PATCH 299/363] Bad korebuild-lock file --- korebuild-lock.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 641b9b208d..9a87e4ccb7 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,7 +1,2 @@ -<<<<<<< HEAD version:3.0.0-alpha1-20180919.1 commithash:3066ae0a230870ea07e3f132605b5e5493f8bbd4 -======= -version:2.2.0-preview1-20180918.1 -commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800 ->>>>>>> merge/release/2.2-to-master From c6633e6ec53e6fc3dab10f13faaa36b228378c17 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 27 Sep 2018 15:08:18 -0700 Subject: [PATCH 300/363] Increase retry count (#1449) --- test/Common.FunctionalTests/Utilities/Helpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 8087b67b1d..87cb5c5898 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static class Helpers { private static readonly TimeSpan RetryRequestDelay = TimeSpan.FromMilliseconds(100); - private static readonly int RetryRequestCount = 5; + private static readonly int RetryRequestCount = 10; public static string GetTestWebSitePath(string name) { From e225a7ba09f899b7be8fc85c299a5389690235ee Mon Sep 17 00:00:00 2001 From: Eilon Lipton Date: Thu, 27 Sep 2018 15:47:35 -0700 Subject: [PATCH 301/363] Update LICENSE.txt --- LICENSE.txt | 212 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 201 insertions(+), 11 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index d50cef4a3f..1508c66d70 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,17 +1,207 @@ -Copyright (c) .NET Foundation and Contributors + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -All rights reserved. + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at + 1. Definitions. - http://www.apache.org/licenses/LICENSE-2.0 + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -Unless required by applicable law or agreed to in writing, software distributed -under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright (c) .NET Foundation and Contributors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +========================= ASP.NET Core Module @@ -35,4 +225,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 45a52ebff53082ee896caa5b92e27da4945b4ec6 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 28 Sep 2018 08:53:32 -0700 Subject: [PATCH 302/363] Move Log call before starting application (#1453) --- .../InProcessRequestHandler/inprocessapplication.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 7fd934ae87..44d2455251 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -129,6 +129,8 @@ IN_PROCESS_APPLICATION::LoadManagedApplication() FALSE, // not set nullptr)); // name + LOG_INFO(L"Waiting for initialization"); + m_workerThread = std::thread([](std::unique_ptr application) { LOG_INFO(L"Starting in-process worker thread"); @@ -136,8 +138,6 @@ IN_PROCESS_APPLICATION::LoadManagedApplication() LOG_INFO(L"Stopping in-process worker thread"); }, ::ReferenceApplication(this)); - LOG_INFO(L"Waiting for initialization"); - const HANDLE waitHandles[2] = { m_pInitializeEvent, m_workerThread.native_handle() }; // Wait for shutdown request From 89fccf3ac59162ff5c9cdfc1b064ca318c5d446b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 28 Sep 2018 10:37:18 -0700 Subject: [PATCH 303/363] Enable MicroBuild code signing (#1456) Fixup the paths to files to be signed. --- Directory.Build.props | 3 --- build/repo.targets | 3 --- .../Microsoft.AspNetCore.Server.IIS.csproj | 4 ++-- .../Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj | 4 ++-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index a328745f31..45a38d3e61 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,9 +14,6 @@ $(MSBuildThisFileDirectory) $(MSBuildThisFileDirectory)build\Key.snk true - Microsoft - MicrosoftNuGet - true true false diff --git a/build/repo.targets b/build/repo.targets index d8d4d5ab9e..62c02eabbf 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -65,9 +65,6 @@ - - - diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index d82d80f9a6..22d494a606 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -43,9 +43,9 @@ Pack="true" PackagePath="runtimes/win-%(InProcessComponents.Platform)/nativeassets/$(NativeAssetsTargetFramework)" /> - + Certificate="$(AssemblySigningCertName)" /> diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index d91d5c5a04..f0332ef10b 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -41,9 +41,9 @@ PackageCopyToOutput="true" PackagePath="contentFiles/any/any/%(ShimComponents.Platform)/%(ShimComponents.PackageSubPath)"/> - + Certificate="$(AssemblySigningCertName)" /> From 59d70ccb4e598fa67bc4fa47e58a76cbf316539a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 28 Sep 2018 17:10:35 -0700 Subject: [PATCH 304/363] automated: bulk infrastructure updates. Update bootstrapper scripts and remove unnecessary signing properties --- build/repo.props | 2 +- run.ps1 | 6 +++--- run.sh | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/repo.props b/build/repo.props index c1b78ebabd..32bbcb6814 100644 --- a/build/repo.props +++ b/build/repo.props @@ -2,7 +2,7 @@ - Microsoft + Microsoft400 $(BuildDir)AspNetCoreModule.zip $(BuildDir)StressTestWebSite.zip diff --git a/run.ps1 b/run.ps1 index 3b27382468..34604c7175 100644 --- a/run.ps1 +++ b/run.ps1 @@ -52,8 +52,8 @@ in the file are overridden by command line parameters. Example config file: ```json { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev", + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", + "channel": "master", "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" } ``` @@ -192,7 +192,7 @@ if (!$DotNetHome) { else { Join-Path $PSScriptRoot '.dotnet'} } -if (!$Channel) { $Channel = 'dev' } +if (!$Channel) { $Channel = 'master' } if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } # Execute diff --git a/run.sh b/run.sh index 02aac15874..4c1fed5646 100755 --- a/run.sh +++ b/run.sh @@ -220,7 +220,7 @@ if [ -f "$config_file" ]; then config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" else - _error "$config_file contains invalid JSON." + __error "$config_file contains invalid JSON." exit 1 fi elif __machine_has python ; then @@ -228,7 +228,7 @@ if [ -f "$config_file" ]; then config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" else - _error "$config_file contains invalid JSON." + __error "$config_file contains invalid JSON." exit 1 fi elif __machine_has python3 ; then @@ -236,11 +236,11 @@ if [ -f "$config_file" ]; then config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" else - _error "$config_file contains invalid JSON." + __error "$config_file contains invalid JSON." exit 1 fi else - _error 'Missing required command: jq or python. Could not parse the JSON file.' + __error 'Missing required command: jq or python. Could not parse the JSON file.' exit 1 fi @@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" fi -[ -z "$channel" ] && channel='dev' +[ -z "$channel" ] && channel='master' [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' get_korebuild From 47f8e6dd52a1aee91a285b21acfbb0a459227206 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 30 Sep 2018 12:16:06 -0700 Subject: [PATCH 305/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 52 ++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 032950b7a2..013a4d6a19 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,38 +5,38 @@ 0.10.13 3.0.0-alpha1-20180919.1 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 0.7.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 0.7.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 15.6.82 15.6.82 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 - 3.0.0-alpha1-10526 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 2.0.9 2.1.3 2.2.0-preview2-26905-02 1.0.1 - 3.0.0-alpha1-10526 + 3.0.0-alpha1-10549 15.6.1 11.1.0 2.0.3 From 2fea246b7142d2883c376345816572bb432b50e3 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 30 Sep 2018 12:17:12 -0700 Subject: [PATCH 306/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 56 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 8a43fc832e..adbc208975 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,39 +4,39 @@ 0.10.13 - 2.2.0-preview1-20180918.1 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 0.6.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview1-20180928.5 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 0.6.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 15.6.82 15.6.82 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 2.0.9 2.1.3 - 2.2.0-preview2-26905-02 + 2.2.0-preview3-26927-02 1.0.1 - 2.2.0-preview3-35301 + 2.2.0-preview3-35359 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 8491de70e6..0507680073 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180918.1 -commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800 +version:2.2.0-preview1-20180928.5 +commithash:43faa29f679f47b88689d645b39e6be5e0055d70 From 3ddc86a42800e933dfc53f993e6afc43ba6fcbe9 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 1 Oct 2018 08:00:44 -0700 Subject: [PATCH 307/363] Fix mof file (#1457) --- src/AspNetCoreModuleV2/AspNetCore/ancm.mof | 2 +- .../Utilities/IISCapability.cs | 3 ++- test/IIS.FunctionalTests/MofFileTests.cs | 26 +++++++++++++++++++ .../RequiresIISAttribute.cs | 12 +++++++++ .../WindowsAuthTests.cs | 2 -- 5 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 test/IIS.FunctionalTests/MofFileTests.cs diff --git a/src/AspNetCoreModuleV2/AspNetCore/ancm.mof b/src/AspNetCoreModuleV2/AspNetCore/ancm.mof index 5a50b19914..f3f7fcd15a 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ancm.mof +++ b/src/AspNetCoreModuleV2/AspNetCore/ancm.mof @@ -5,7 +5,7 @@ /* * AspNetCore module trace events layout * Uncomment the following class to run mof2trace to generate header file - * comment it back before checking it in */ + * comment it back before checking it in [Dynamic, Description("IIS: WWW Server"), Guid("{3a2a4e84-4c21-4981-ae10-3fda0d9b0f83}"), diff --git a/test/Common.FunctionalTests/Utilities/IISCapability.cs b/test/Common.FunctionalTests/Utilities/IISCapability.cs index 9550eac3e5..30c270fa77 100644 --- a/test/Common.FunctionalTests/Utilities/IISCapability.cs +++ b/test/Common.FunctionalTests/Utilities/IISCapability.cs @@ -14,6 +14,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests PoolEnvironmentVariables = 4, ShutdownToken = 8, DynamicCompression = 16, - ApplicationInitialization = 32 + ApplicationInitialization = 32, + TracingModule = 64 } } diff --git a/test/IIS.FunctionalTests/MofFileTests.cs b/test/IIS.FunctionalTests/MofFileTests.cs new file mode 100644 index 0000000000..a054225ac5 --- /dev/null +++ b/test/IIS.FunctionalTests/MofFileTests.cs @@ -0,0 +1,26 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Diagnostics; +using System.IO; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Testing; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace IIS.FunctionalTests +{ + public class MofFileTests + { + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [RequiresIIS(IISCapability.TracingModule)] + public void CheckMofFile() + { + var path = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "src", "aspnetcoremodulev2", "aspnetcore", "ancm.mof"); + var process = Process.Start("mofcomp.exe", path); + process.WaitForExit(); + Assert.Equal(0, process.ExitCode); + } + } +} diff --git a/test/IIS.FunctionalTests/RequiresIISAttribute.cs b/test/IIS.FunctionalTests/RequiresIISAttribute.cs index 9fa3a7c502..f78de73d47 100644 --- a/test/IIS.FunctionalTests/RequiresIISAttribute.cs +++ b/test/IIS.FunctionalTests/RequiresIISAttribute.cs @@ -23,6 +23,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private static readonly bool _poolEnvironmentVariablesAvailable; private static readonly bool _dynamicCompressionAvailable; private static readonly bool _applicationInitializationModule; + private static readonly bool _tracingModuleAvailable; static RequiresIISAttribute() { @@ -87,6 +88,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _applicationInitializationModule = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "warmup.dll")); + _tracingModuleAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "iisetw.dll")); + var iisRegistryKey = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\InetStp", writable: false); if (iisRegistryKey == null) { @@ -157,6 +160,15 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests SkipReason += "The machine does not have IIS ApplicationInitialization installed."; } } + + if (capabilities.HasFlag(IISCapability.TracingModule)) + { + IsMet &= _tracingModuleAvailable; + if (!_tracingModuleAvailable) + { + SkipReason += "The machine does not have IIS TracingModule installed."; + } + } } public bool IsMet { get; } diff --git a/test/IISExpress.FunctionalTests/WindowsAuthTests.cs b/test/IISExpress.FunctionalTests/WindowsAuthTests.cs index 3720385d4c..5511d017a1 100644 --- a/test/IISExpress.FunctionalTests/WindowsAuthTests.cs +++ b/test/IISExpress.FunctionalTests/WindowsAuthTests.cs @@ -1,14 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { From 4cbc969cd02700f7fccb8545ba9194fbf0bd8444 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 1 Oct 2018 22:15:14 -0700 Subject: [PATCH 308/363] Revert "Update dependencies.props" This reverts commit 2fea246b7142d2883c376345816572bb432b50e3. --- build/dependencies.props | 56 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index adbc208975..8a43fc832e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,39 +4,39 @@ 0.10.13 - 2.2.0-preview1-20180928.5 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 0.6.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 + 2.2.0-preview1-20180918.1 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 0.6.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 15.6.82 15.6.82 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 2.0.9 2.1.3 - 2.2.0-preview3-26927-02 + 2.2.0-preview2-26905-02 1.0.1 - 2.2.0-preview3-35359 + 2.2.0-preview3-35301 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 0507680073..8491de70e6 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180928.5 -commithash:43faa29f679f47b88689d645b39e6be5e0055d70 +version:2.2.0-preview1-20180918.1 +commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800 From a2d5d7a53ef53c3dea27d97e6de29a0f5f1e9411 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 3 Oct 2018 11:59:07 -0700 Subject: [PATCH 309/363] Remove un-needed runtime --- Directory.Build.targets | 1 - build/dependencies.props | 1 - build/repo.props | 2 -- 3 files changed, 4 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 78626b773e..73b97f2807 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,6 +1,5 @@ - $(MicrosoftNETCoreApp20PackageVersion) $(MicrosoftNETCoreApp21PackageVersion) $(MicrosoftNETCoreApp22PackageVersion) $(NETStandardLibrary20PackageVersion) diff --git a/build/dependencies.props b/build/dependencies.props index 8a43fc832e..3b4688b39b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -32,7 +32,6 @@ 2.2.0-preview3-35301 2.2.0-preview3-35301 2.2.0-preview3-35301 - 2.0.9 2.1.3 2.2.0-preview2-26905-02 1.0.1 diff --git a/build/repo.props b/build/repo.props index 32bbcb6814..77073056a2 100644 --- a/build/repo.props +++ b/build/repo.props @@ -21,11 +21,9 @@ - - From 1e8808c1c6b68fc9b42fdb90f7db2fcb440787c9 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 7 Oct 2018 12:16:43 -0700 Subject: [PATCH 310/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 013a4d6a19..14468a880f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,39 +4,39 @@ 0.10.13 - 3.0.0-alpha1-20180919.1 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 0.7.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 + 3.0.0-alpha1-20181004.7 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 0.7.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 15.6.82 15.6.82 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 + 3.0.0-alpha1-10584 2.0.9 2.1.3 2.2.0-preview2-26905-02 1.0.1 - 3.0.0-alpha1-10549 + 3.0.0-alpha1-10584 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 9a87e4ccb7..14c4ea8ed3 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20180919.1 -commithash:3066ae0a230870ea07e3f132605b5e5493f8bbd4 +version:3.0.0-alpha1-20181004.7 +commithash:27fabdaf2b1d4753c3d2749581694ca65d78f7f2 From b2e55456c705bbf57366ee8fcb88b9c52e4f96a5 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 7 Oct 2018 19:17:45 +0000 Subject: [PATCH 311/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 56 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 3b4688b39b..46f15d72cc 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,38 +4,38 @@ 0.10.13 - 2.2.0-preview1-20180918.1 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 0.6.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview2-20181004.6 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 0.6.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 15.6.82 15.6.82 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 2.1.3 - 2.2.0-preview2-26905-02 + 2.2.0-preview3-27001-02 1.0.1 - 2.2.0-preview3-35301 + 2.2.0-preview3-35425 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 8491de70e6..3e92dd5543 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180918.1 -commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800 +version:2.2.0-preview2-20181004.6 +commithash:c04c4b2f5018632647f96210ab01876661302dac From 71262846bf5aa26a767766a299689a42f1e77a37 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 8 Oct 2018 11:06:56 -0700 Subject: [PATCH 312/363] Revert "Update dependencies.props" (#1473) This reverts commit b2e55456c705bbf57366ee8fcb88b9c52e4f96a5. --- build/dependencies.props | 56 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 46f15d72cc..3b4688b39b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,38 +4,38 @@ 0.10.13 - 2.2.0-preview2-20181004.6 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 0.6.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 + 2.2.0-preview1-20180918.1 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 0.6.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 15.6.82 15.6.82 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 2.1.3 - 2.2.0-preview3-27001-02 + 2.2.0-preview2-26905-02 1.0.1 - 2.2.0-preview3-35425 + 2.2.0-preview3-35301 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 3e92dd5543..8491de70e6 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview2-20181004.6 -commithash:c04c4b2f5018632647f96210ab01876661302dac +version:2.2.0-preview1-20180918.1 +commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800 From 1be7cd1f74cbc160ba63c49b8ebd50a25c935bfc Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 8 Oct 2018 16:05:28 -0700 Subject: [PATCH 313/363] Disconnect the disconnect handler when request processing ends (#1471) --- .../AspNetCore/DisconnectHandler.cpp | 15 +++- .../AspNetCore/DisconnectHandler.h | 12 ++- .../AspNetCore/proxymodule.cpp | 82 ++++++++++++------- .../AspNetCore/proxymodule.h | 8 +- .../CommonLib/SRWExclusiveLock.cpp | 2 +- .../CommonLib/SRWExclusiveLock.h | 2 +- .../CommonLib/irequesthandler.h | 6 ++ .../ClientDisconnectStress.cs | 65 +++++++++++++++ test/WebSites/InProcessWebSite/Startup.cs | 11 +++ tools/SetupTestEnvironment.ps1 | 8 ++ 10 files changed, 170 insertions(+), 41 deletions(-) create mode 100644 test/Common.FunctionalTests/ClientDisconnectStress.cs diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp index b921994850..3e8e7754aa 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp @@ -4,15 +4,21 @@ #include "DisconnectHandler.h" #include "exceptions.h" #include "proxymodule.h" +#include "SRWExclusiveLock.h" void DisconnectHandler::NotifyDisconnect() { try { - const auto module = m_pModule.exchange(nullptr); + std::unique_ptr module; + { + SRWExclusiveLock lock(m_handlerLock); + m_pHandler.swap(module); + } + if (module != nullptr) { - module ->NotifyDisconnect(); + module->NotifyDisconnect(); } } catch (...) @@ -27,7 +33,8 @@ void DisconnectHandler::CleanupStoredContext() noexcept delete this; } -void DisconnectHandler::SetHandler(ASPNET_CORE_PROXY_MODULE * module) noexcept +void DisconnectHandler::SetHandler(std::unique_ptr handler) noexcept { - m_pModule = module; + SRWExclusiveLock lock(m_handlerLock); + handler.swap(m_pHandler); } diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h index 34c8a24a63..63b7525356 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h +++ b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h @@ -2,7 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. #pragma once -#include + +#include +#include "irequesthandler.h" class ASPNET_CORE_PROXY_MODULE; @@ -10,8 +12,9 @@ class DisconnectHandler final: public IHttpConnectionStoredContext { public: DisconnectHandler() - : m_pModule(nullptr) + : m_pHandler(nullptr) { + InitializeSRWLock(&m_handlerLock); } virtual @@ -27,9 +30,10 @@ public: CleanupStoredContext() noexcept override; void - SetHandler(ASPNET_CORE_PROXY_MODULE * module) noexcept; + SetHandler(std::unique_ptr handler) noexcept; private: - std::atomic m_pModule; + SRWLOCK m_handlerLock {}; + std::unique_ptr m_pHandler; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index d3d71e8b4b..b1fa5568a8 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -71,10 +71,7 @@ ASPNET_CORE_PROXY_MODULE::ASPNET_CORE_PROXY_MODULE(HTTP_MODULE_ID moduleId, std: ASPNET_CORE_PROXY_MODULE::~ASPNET_CORE_PROXY_MODULE() { - if (m_pDisconnectHandler != nullptr) - { - m_pDisconnectHandler->SetHandler(nullptr); - } + RemoveDisconnectHandler(); } __override @@ -94,25 +91,6 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); } - auto moduleContainer = pHttpContext - ->GetConnection() - ->GetModuleContextContainer(); - - #pragma warning( push ) - #pragma warning ( disable : 26466 ) // Disable "Don't use static_cast downcasts". We build without RTTI support so dynamic_cast is not available - m_pDisconnectHandler = static_cast(moduleContainer->GetConnectionModuleContext(m_moduleId)); - #pragma warning( push ) - - if (m_pDisconnectHandler == nullptr) - { - auto disconnectHandler = std::make_unique(); - m_pDisconnectHandler = disconnectHandler.get(); - // ModuleContextContainer takes ownership of disconnectHandler - // we are trusting that it would not release it before deleting the context - FINISHED_IF_FAILED(moduleContainer->SetConnectionModuleContext(static_cast(disconnectHandler.release()), m_moduleId)); - } - - m_pDisconnectHandler->SetHandler(this); FINISHED_IF_FAILED(m_pApplicationManager->GetOrCreateApplicationInfo( *pHttpContext, @@ -120,6 +98,8 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( FINISHED_IF_FAILED(m_pApplicationInfo->CreateHandler(*pHttpContext, m_pHandler)); + SetupDisconnectHandler(pHttpContext); + retVal = m_pHandler->OnExecuteRequestHandler(); } catch (...) @@ -141,7 +121,7 @@ Finished: } } - return retVal; + return HandleNotificationStatus(retVal); } __override @@ -156,18 +136,62 @@ ASPNET_CORE_PROXY_MODULE::OnAsyncCompletion( { try { - return m_pHandler->OnAsyncCompletion( + return HandleNotificationStatus(m_pHandler->OnAsyncCompletion( pCompletionInfo->GetCompletionBytes(), - pCompletionInfo->GetCompletionStatus()); + pCompletionInfo->GetCompletionStatus())); } catch (...) { OBSERVE_CAUGHT_EXCEPTION(); - return RQ_NOTIFICATION_FINISH_REQUEST; + return HandleNotificationStatus(RQ_NOTIFICATION_FINISH_REQUEST); } } -void ASPNET_CORE_PROXY_MODULE::NotifyDisconnect() const +REQUEST_NOTIFICATION_STATUS ASPNET_CORE_PROXY_MODULE::HandleNotificationStatus(REQUEST_NOTIFICATION_STATUS status) noexcept { - m_pHandler->NotifyDisconnect(); + if (status != RQ_NOTIFICATION_PENDING) + { + RemoveDisconnectHandler(); + } + + return status; +} + +void ASPNET_CORE_PROXY_MODULE::SetupDisconnectHandler(IHttpContext * pHttpContext) +{ + auto moduleContainer = pHttpContext + ->GetConnection() + ->GetModuleContextContainer(); + + #pragma warning( push ) + #pragma warning ( disable : 26466 ) // Disable "Don't use static_cast downcasts". We build without RTTI support so dynamic_cast is not available + auto pDisconnectHandler = static_cast(moduleContainer->GetConnectionModuleContext(m_moduleId)); + #pragma warning( push ) + + if (pDisconnectHandler == nullptr) + { + auto newHandler = std::make_unique(); + pDisconnectHandler = newHandler.get(); + // ModuleContextContainer takes ownership of disconnectHandler + // we are trusting that it would not release it before deleting the context + LOG_IF_FAILED(moduleContainer->SetConnectionModuleContext(static_cast(newHandler.release()), m_moduleId)); + } + + // make code analysis happy + if (pDisconnectHandler != nullptr) + { + pDisconnectHandler->SetHandler(::ReferenceRequestHandler(m_pHandler.get())); + m_pDisconnectHandler = pDisconnectHandler; + } +} + +void ASPNET_CORE_PROXY_MODULE::RemoveDisconnectHandler() noexcept +{ + auto handler = m_pDisconnectHandler; + m_pDisconnectHandler = nullptr; + + if (handler != nullptr) + { + handler->SetHandler(nullptr); + } } diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h index 97c126b0f9..c5b290a36e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h @@ -47,10 +47,14 @@ class ASPNET_CORE_PROXY_MODULE : NonCopyable, public CHttpModule IHttpCompletionInfo * pCompletionInfo ) override; - void - NotifyDisconnect() const; private: + REQUEST_NOTIFICATION_STATUS + HandleNotificationStatus(REQUEST_NOTIFICATION_STATUS status) noexcept; + + void SetupDisconnectHandler(IHttpContext * pHttpContext); + void RemoveDisconnectHandler() noexcept; + std::shared_ptr m_pApplicationManager; std::shared_ptr m_pApplicationInfo; std::unique_ptr m_pHandler; diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp index 0bc46b8cf5..896189c8a8 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp @@ -3,7 +3,7 @@ #include "SRWExclusiveLock.h" -SRWExclusiveLock::SRWExclusiveLock(const SRWLOCK& lock) +SRWExclusiveLock::SRWExclusiveLock(const SRWLOCK& lock) noexcept : m_lock(lock) { AcquireSRWLockExclusive(const_cast(&m_lock)); diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h index 7ff977f70d..6c17e13111 100644 --- a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h +++ b/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h @@ -8,7 +8,7 @@ class SRWExclusiveLock { public: - SRWExclusiveLock(const SRWLOCK& lock); + SRWExclusiveLock(const SRWLOCK& lock) noexcept; ~SRWExclusiveLock(); private: const SRWLOCK& m_lock; diff --git a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h index 8bd2076072..c89411f8a0 100644 --- a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h @@ -54,3 +54,9 @@ struct IREQUEST_HANDLER_DELETER application->DereferenceRequestHandler(); } }; + +inline std::unique_ptr ReferenceRequestHandler(IREQUEST_HANDLER* handler) +{ + handler->ReferenceRequestHandler(); + return std::unique_ptr(handler); +}; diff --git a/test/Common.FunctionalTests/ClientDisconnectStress.cs b/test/Common.FunctionalTests/ClientDisconnectStress.cs new file mode 100644 index 0000000000..9deeae3f92 --- /dev/null +++ b/test/Common.FunctionalTests/ClientDisconnectStress.cs @@ -0,0 +1,65 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class ClientDisconnectStressTests: FunctionalTestsBase + { + private readonly PublishedSitesFixture _fixture; + + public ClientDisconnectStressTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task ClientDisconnectStress(HostingModel hostingModel) + { + var site = await StartAsync(_fixture.GetBaseDeploymentParameters(hostingModel)); + var maxRequestSize = 1000; + var blockSize = 40; + var random = new Random(); + async Task RunRequests() + { + using (var connection = new TestConnection(site.HttpClient.BaseAddress.Port)) + { + await connection.Send( + "POST /ReadAndFlushEcho HTTP/1.1", + $"Content-Length: {maxRequestSize}", + "Host: localhost", + "Connection: close", + "", + ""); + + var disconnectAfter = random.Next(maxRequestSize); + var data = new byte[blockSize]; + for (int i = 0; i < disconnectAfter / blockSize; i++) + { + await connection.Stream.WriteAsync(data); + } + } + } + + List tasks = new List(); + for (int i = 0; i < 100; i++) + { + tasks.Add(Task.Run(RunRequests)); + } + + await Task.WhenAll(tasks); + + StopServer(); + } + } +} diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs index 39d3b9f765..eb84272b76 100644 --- a/test/WebSites/InProcessWebSite/Startup.cs +++ b/test/WebSites/InProcessWebSite/Startup.cs @@ -324,6 +324,17 @@ namespace TestSite result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); } } + private async Task ReadAndFlushEcho(HttpContext ctx) + { + var readBuffer = new byte[4096]; + var result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + while (result != 0) + { + await ctx.Response.WriteAsync(Encoding.UTF8.GetString(readBuffer, 0, result)); + await ctx.Response.Body.FlushAsync(); + result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + } + } private async Task ReadAndWriteEchoLines(HttpContext ctx) { diff --git a/tools/SetupTestEnvironment.ps1 b/tools/SetupTestEnvironment.ps1 index cc9fbed394..dcdaa84f57 100644 --- a/tools/SetupTestEnvironment.ps1 +++ b/tools/SetupTestEnvironment.ps1 @@ -62,6 +62,8 @@ if (!(Test-Path $cdb)) if ($Mode -eq "Setup") { + Move-Item $env:windir\System32\vsjitdebugger.exe $env:windir\System32\_vsjitdebugger.exe; + Setup-appverif w3wp.exe Setup-appverif iisexpress.exe @@ -70,6 +72,8 @@ if ($Mode -eq "Setup") New-Item -Path $werHive -Name LocalDumps } + New-ItemProperty $werHive -Name "DontShowUI" -Value 1 -PropertyType "DWORD" -Force; + New-ItemProperty $ldHive -Name "DumpFolder" -Value $DumpFolder -PropertyType "ExpandString" -Force; New-ItemProperty $ldHive -Name "DumpCount" -Value 15 -PropertyType "DWORD" -Force; New-ItemProperty $ldHive -Name "DumpType" -Value 2 -PropertyType "DWORD" -Force; @@ -79,8 +83,12 @@ if ($Mode -eq "Setup") if ($Mode -eq "Shutdown") { + Move-Item $env:windir\System32\_vsjitdebugger.exe $env:windir\System32\vsjitdebugger.exe; + Remove-Item $ldHive -Recurse -Force + New-ItemProperty $werHive -Name "DontShowUI" -Value 0 -PropertyType "DWORD" -Force; + Shutdown-appverif w3wp.exe Shutdown-appverif iisexpress.exe From 57f698da0b8da50fda60d90e61ed9e91d584c668 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 9 Oct 2018 09:34:07 -0700 Subject: [PATCH 314/363] Revert "Update dependencies.props" This reverts commit 1e8808c1c6b68fc9b42fdb90f7db2fcb440787c9. --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 14468a880f..013a4d6a19 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,39 +4,39 @@ 0.10.13 - 3.0.0-alpha1-20181004.7 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 0.7.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 + 3.0.0-alpha1-20180919.1 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 0.7.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 15.6.82 15.6.82 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 - 3.0.0-alpha1-10584 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 + 3.0.0-alpha1-10549 2.0.9 2.1.3 2.2.0-preview2-26905-02 1.0.1 - 3.0.0-alpha1-10584 + 3.0.0-alpha1-10549 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 14c4ea8ed3..9a87e4ccb7 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20181004.7 -commithash:27fabdaf2b1d4753c3d2749581694ca65d78f7f2 +version:3.0.0-alpha1-20180919.1 +commithash:3066ae0a230870ea07e3f132605b5e5493f8bbd4 From 23db53eae664db68ff3e8d3bd5051ae5a80988ca Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 9 Oct 2018 10:25:12 -0700 Subject: [PATCH 315/363] Add more FREB events/ tests for FREB events (#1461) --- src/AspNetCoreModuleV2/AspNetCore/ancm.mof | 116 ++- .../CommonLib/CommonLib.vcxproj | 3 +- .../CommonLib/ModuleTracer.h | 98 ++ .../CommonLib/aspnetcore_event.h | 908 ++++++++++++------ .../InProcessRhStaticHtml.htm | 2 +- .../InProcessRequestHandler/dllmain.cpp | 1 + .../inprocesshandler.cpp | 50 +- .../inprocesshandler.h | 4 +- .../IISDeploymentParameterExtensions.cs | 74 +- .../Inprocess/FrebTests.cs | 118 +++ .../Utilities/Helpers.cs | 33 + .../Utilities/IISCapability.cs | 3 +- .../RequiresIISAttribute.cs | 16 +- .../OutOfProcess/MultipleAppTests.cs | 24 +- 14 files changed, 1116 insertions(+), 334 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/ModuleTracer.h create mode 100644 test/Common.FunctionalTests/Inprocess/FrebTests.cs diff --git a/src/AspNetCoreModuleV2/AspNetCore/ancm.mof b/src/AspNetCoreModuleV2/AspNetCore/ancm.mof index f3f7fcd15a..289225477d 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ancm.mof +++ b/src/AspNetCoreModuleV2/AspNetCore/ancm.mof @@ -186,12 +186,28 @@ class ANCMWinHttpCallBack:ANCM_Events }; [Dynamic, - Description("Inprocess executing request failure") : amended, - EventType(7), - EventLevel(2), - EventTypeName("ANCM_EXECUTE_REQUEST_FAIL") : amended + Description("Starting inprocess execute request") : amended, + EventType(8), + EventLevel(4), + EventTypeName("ANCM_INPROC_EXECUTE_REQUEST_START") : amended ] -class ANCMExecuteFailed:ANCM_Events +class ANCMExecuteStart:ANCM_Events +{ + [WmiDataId(1), + Description("Context ID") : amended, + extension("Guid"), + ActivityID, + read] + object ContextId; +}; + +[Dynamic, + Description("Ending inprocess execute request") : amended, + EventType(10), + EventLevel(5), + EventTypeName("ANCM_INPROC_EXECUTE_REQUEST_COMPLETION") : amended +] +class ANCMExecuteEnd:ANCM_Events { [WmiDataId(1), Description("Context ID") : amended, @@ -200,9 +216,93 @@ class ANCMExecuteFailed:ANCM_Events read] object ContextId; [WmiDataId(2), - Description("InternetStatus") : amended, - format("x"), + Description("Notification status") : amended, + format("d"), read] - uint32 ErrorCode; + uint32 requestStatus; }; +[Dynamic, + Description("Starting inprocess async completion") : amended, + EventType(8), + EventLevel(5), + EventTypeName("ANCM_INPROC_ASYNC_COMPLETION_START") : amended +] +class ANCMAsyncStart:ANCM_Events +{ + [WmiDataId(1), + Description("Context ID") : amended, + extension("Guid"), + ActivityID, + read] + object ContextId; +}; + +[Dynamic, + Description("Ending inprocess async completion") : amended, + EventType(10), + EventLevel(5), + EventTypeName("ANCM_INPROC_ASYNC_COMPLETION_COMPLETION") : amended +] +class ANCMAsyncEnd:ANCM_Events +{ + [WmiDataId(1), + Description("Context ID") : amended, + extension("Guid"), + ActivityID, + read] + object ContextId; + [WmiDataId(2), + Description("Notification status") : amended, + format("d"), + read] + uint32 requestStatus; +}; + +[Dynamic, + Description("Inprocess app shutdown") : amended, + EventType(11), + EventLevel(4), + EventTypeName("ANCM_INPROC_REQUEST_SHUTDOWN") : amended +] +class ANCMRequestShutdown:ANCM_Events +{ + [WmiDataId(1), + Description("Context ID") : amended, + extension("Guid"), + ActivityID, + read] + object ContextId; +}; + +[Dynamic, + Description("Inprocess request disconnect") : amended, + EventType(12), + EventLevel(4), + EventTypeName("ANCM_INPROC_REQUEST_DISCONNECT") : amended +] +class ANCMRequestDisconnect:ANCM_Events +{ + [WmiDataId(1), + Description("Context ID") : amended, + extension("Guid"), + ActivityID, + read] + object ContextId; +}; + +[Dynamic, + Description("Indicate managed request complete") : amended, + EventType(12), + EventLevel(4), + EventTypeName("ANCM_INPROC_MANAGED_REQUEST_COMPLETION") : amended +] +class ANCMManagedRequestCompletion:ANCM_Events +{ + [WmiDataId(1), + Description("Context ID") : amended, + extension("Guid"), + ActivityID, + read] + object ContextId; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index caa53ff29d..7968238f90 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -219,7 +219,8 @@ - + + diff --git a/src/AspNetCoreModuleV2/CommonLib/ModuleTracer.h b/src/AspNetCoreModuleV2/CommonLib/ModuleTracer.h new file mode 100644 index 0000000000..6ef03fb53a --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/ModuleTracer.h @@ -0,0 +1,98 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#pragma once +#include "aspnetcore_event.h" + +class ModuleTracer +{ +public: + + ModuleTracer(IHttpTraceContext* traceContext) + { + m_traceContext = traceContext; + } + + VOID + ExecuteRequestStart() + { + if (ANCMEvents::ANCM_INPROC_EXECUTE_REQUEST_START::IsEnabled(m_traceContext)) + { + ANCMEvents::ANCM_INPROC_EXECUTE_REQUEST_START::RaiseEvent( + m_traceContext, + NULL); + } + } + + VOID + ExecuteRequestEnd(REQUEST_NOTIFICATION_STATUS status) + { + if (ANCMEvents::ANCM_INPROC_EXECUTE_REQUEST_COMPLETION::IsEnabled(m_traceContext)) + { + ANCMEvents::ANCM_INPROC_EXECUTE_REQUEST_COMPLETION::RaiseEvent( + m_traceContext, + NULL, + status); + } + } + + VOID + AsyncCompletionStart() + { + + if (ANCMEvents::ANCM_INPROC_ASYNC_COMPLETION_START::IsEnabled(m_traceContext)) + { + ANCMEvents::ANCM_INPROC_ASYNC_COMPLETION_START::RaiseEvent( + m_traceContext, + NULL); + } + } + + VOID + AsyncCompletionEnd(REQUEST_NOTIFICATION_STATUS status) + { + if (ANCMEvents::ANCM_INPROC_ASYNC_COMPLETION_COMPLETION::IsEnabled(m_traceContext)) + { + ANCMEvents::ANCM_INPROC_ASYNC_COMPLETION_COMPLETION::RaiseEvent( + m_traceContext, + NULL, + status); + } + } + + VOID + RequestShutdown() + { + if (ANCMEvents::ANCM_INPROC_REQUEST_SHUTDOWN::IsEnabled(m_traceContext)) + { + ANCMEvents::ANCM_INPROC_REQUEST_SHUTDOWN::RaiseEvent( + m_traceContext, + NULL); + } + } + + VOID + RequestDisconnect() + { + if (ANCMEvents::ANCM_INPROC_REQUEST_DISCONNECT::IsEnabled(m_traceContext)) + { + ANCMEvents::ANCM_INPROC_REQUEST_DISCONNECT::RaiseEvent( + m_traceContext, + NULL); + } + } + + VOID + ManagedCompletion() + { + if (ANCMEvents::ANCM_INPROC_MANAGED_REQUEST_COMPLETION::IsEnabled(m_traceContext)) + { + ANCMEvents::ANCM_INPROC_MANAGED_REQUEST_COMPLETION::RaiseEvent( + m_traceContext, + NULL); + } + } + +private: + IHttpTraceContext * m_traceContext; +}; diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h index 2c13d20d1e..f40dc0d2bb 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h +++ b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h @@ -1,37 +1,41 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. #ifndef __ASPNETCOREEVENT_H__ #define __ASPNETCOREEVENT_H__ /*++ - Module Name: +Copyright (c) 2005 Microsoft Corporation - aspnetcore_event.h +Module Name: - Abstract: +aspnetcore_event.h - Header file has been generated from mof file containing - IIS trace event descriptions +Abstract: + +Header file has been generated from mof file containing +IIS trace event descriptions --*/ + + // // Start of the new provider class WWWServerTraceProvider, // GUID: {3a2a4e84-4c21-4981-ae10-3fda0d9b0f83} // Description: IIS: WWW Server // +#include "httptrace.h" + class WWWServerTraceProvider { public: static - LPCGUID - GetProviderGuid( VOID ) - // return GUID for the current event class + LPCGUID + GetProviderGuid(VOID) + // return GUID for the current event class { - static const GUID ProviderGuid = - {0x3a2a4e84,0x4c21,0x4981,{0xae,0x10,0x3f,0xda,0x0d,0x9b,0x0f,0x83}}; + static const GUID ProviderGuid = + { 0x3a2a4e84,0x4c21,0x4981,{ 0xae,0x10,0x3f,0xda,0x0d,0x9b,0x0f,0x83 } }; return &ProviderGuid; }; enum enumAreaFlags @@ -40,10 +44,10 @@ public: ANCM = 0x10000 }; static - LPCWSTR - TranslateEnumAreaFlagsToString( enum enumAreaFlags EnumValue) + LPCWSTR + TranslateEnumAreaFlagsToString(enum enumAreaFlags EnumValue) { - switch( (DWORD) EnumValue ) + switch ((DWORD)EnumValue) { case 0x10000: return L"ANCM"; } @@ -51,26 +55,26 @@ public: }; static - BOOL - CheckTracingEnabled( - IHttpTraceContext * pHttpTraceContext, - enumAreaFlags AreaFlags, - DWORD dwVerbosity ) + BOOL + CheckTracingEnabled( + IHttpTraceContext * pHttpTraceContext, + enumAreaFlags AreaFlags, + DWORD dwVerbosity) { HRESULT hr; HTTP_TRACE_CONFIGURATION TraceConfig; TraceConfig.pProviderGuid = GetProviderGuid(); - hr = pHttpTraceContext->GetTraceConfiguration( &TraceConfig ); - if ( FAILED( hr ) || !TraceConfig.fProviderEnabled ) + hr = pHttpTraceContext->GetTraceConfiguration(&TraceConfig); + if (FAILED(hr) || !TraceConfig.fProviderEnabled) { return FALSE; } - if ( TraceConfig.dwVerbosity >= dwVerbosity && - ( TraceConfig.dwAreas == (DWORD) AreaFlags || - ( TraceConfig.dwAreas & (DWORD)AreaFlags ) == (DWORD)AreaFlags ) ) - { + if (TraceConfig.dwVerbosity >= dwVerbosity && + (TraceConfig.dwAreas == (DWORD)AreaFlags || + (TraceConfig.dwAreas & (DWORD)AreaFlags) == (DWORD)AreaFlags)) + { return TRUE; - } + } return FALSE; }; }; @@ -85,12 +89,12 @@ class ANCMEvents { public: static - LPCGUID - GetAreaGuid( VOID ) - // return GUID for the current event class + LPCGUID + GetAreaGuid(VOID) + // return GUID for the current event class { - static const GUID AreaGuid = - {0x82adead7,0x12b2,0x4781,{0xbd,0xca,0x5a,0x4b,0x6c,0x75,0x71,0x91}}; + static const GUID AreaGuid = + { 0x82adead7,0x12b2,0x4781,{ 0xbd,0xca,0x5a,0x4b,0x6c,0x75,0x71,0x91 } }; return &AreaGuid; }; @@ -101,24 +105,24 @@ public: // EventType: 1 // EventLevel: 4 // - + class ANCM_START_APPLICATION_SUCCESS { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId, - LPCWSTR pAppDescription - ) - // - // Raise ANCM_START_APPLICATION_SUCCESS Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + LPCWSTR pAppDescription + ) + // + // Raise ANCM_START_APPLICATION_SUCCESS Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 1; Event.pszEventName = L"ANCM_START_APPLICATION_SUCCESS"; @@ -129,36 +133,36 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[ 2 ]; - Items[ 0 ].pszName = L"ContextId"; - Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[ 0 ].pbData = (PBYTE) pContextId; - Items[ 0 ].cbData = 16; - Items[ 0 ].pszDataDescription = NULL; - Items[ 1 ].pszName = L"AppDescription"; - Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_LPCWSTR; // mof type (string) - Items[ 1 ].pbData = (PBYTE) pAppDescription; - Items[ 1 ].cbData = - ( Items[ 1 ].pbData == NULL )? 0 : ( sizeof(WCHAR) * (1 + (DWORD) wcslen( (PWSTR) Items[ 1 ].pbData ) ) ); - Items[ 1 ].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[2]; + Items[0].pszName = L"ContextId"; + Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[0].pbData = (PBYTE)pContextId; + Items[0].cbData = 16; + Items[0].pszDataDescription = NULL; + Items[1].pszName = L"AppDescription"; + Items[1].dwDataType = HTTP_TRACE_TYPE_LPCWSTR; // mof type (string) + Items[1].pbData = (PBYTE)pAppDescription; + Items[1].cbData = + (Items[1].pbData == NULL) ? 0 : (sizeof(WCHAR) * (1 + (DWORD)wcslen((PWSTR)Items[1].pbData))); + Items[1].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent( &Event ); + pHttpTraceContext->RaiseTraceEvent(&Event); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext ) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 4 ); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4); //Verbosity }; }; // @@ -168,24 +172,24 @@ public: // EventType: 2 // EventLevel: 2 // - + class ANCM_START_APPLICATION_FAIL { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId, - LPCWSTR pFailureDescription - ) - // - // Raise ANCM_START_APPLICATION_FAIL Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + LPCWSTR pFailureDescription + ) + // + // Raise ANCM_START_APPLICATION_FAIL Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 2; Event.pszEventName = L"ANCM_START_APPLICATION_FAIL"; @@ -196,36 +200,36 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[ 2 ]; - Items[ 0 ].pszName = L"ContextId"; - Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[ 0 ].pbData = (PBYTE) pContextId; - Items[ 0 ].cbData = 16; - Items[ 0 ].pszDataDescription = NULL; - Items[ 1 ].pszName = L"FailureDescription"; - Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_LPCWSTR; // mof type (string) - Items[ 1 ].pbData = (PBYTE) pFailureDescription; - Items[ 1 ].cbData = - ( Items[ 1 ].pbData == NULL )? 0 : ( sizeof(WCHAR) * (1 + (DWORD) wcslen( (PWSTR) Items[ 1 ].pbData ) ) ); - Items[ 1 ].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[2]; + Items[0].pszName = L"ContextId"; + Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[0].pbData = (PBYTE)pContextId; + Items[0].cbData = 16; + Items[0].pszDataDescription = NULL; + Items[1].pszName = L"FailureDescription"; + Items[1].dwDataType = HTTP_TRACE_TYPE_LPCWSTR; // mof type (string) + Items[1].pbData = (PBYTE)pFailureDescription; + Items[1].cbData = + (Items[1].pbData == NULL) ? 0 : (sizeof(WCHAR) * (1 + (DWORD)wcslen((PWSTR)Items[1].pbData))); + Items[1].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent( &Event ); + pHttpTraceContext->RaiseTraceEvent(&Event); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext ) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 2 ); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 2); //Verbosity }; }; // @@ -235,23 +239,23 @@ public: // EventType: 3 // EventLevel: 4 // - + class ANCM_REQUEST_FORWARD_START { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId - ) - // - // Raise ANCM_REQUEST_FORWARD_START Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_REQUEST_FORWARD_START Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 3; Event.pszEventName = L"ANCM_REQUEST_FORWARD_START"; @@ -262,30 +266,30 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[ 1 ]; - Items[ 0 ].pszName = L"ContextId"; - Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[ 0 ].pbData = (PBYTE) pContextId; - Items[ 0 ].cbData = 16; - Items[ 0 ].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[1]; + Items[0].pszName = L"ContextId"; + Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[0].pbData = (PBYTE)pContextId; + Items[0].cbData = 16; + Items[0].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent( &Event ); + pHttpTraceContext->RaiseTraceEvent(&Event); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext ) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 4 ); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4); //Verbosity }; }; // @@ -295,23 +299,23 @@ public: // EventType: 4 // EventLevel: 4 // - + class ANCM_REQUEST_FORWARD_END { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId - ) - // - // Raise ANCM_REQUEST_FORWARD_END Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_REQUEST_FORWARD_END Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 4; Event.pszEventName = L"ANCM_REQUEST_FORWARD_END"; @@ -322,30 +326,30 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[ 1 ]; - Items[ 0 ].pszName = L"ContextId"; - Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[ 0 ].pbData = (PBYTE) pContextId; - Items[ 0 ].cbData = 16; - Items[ 0 ].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[1]; + Items[0].pszName = L"ContextId"; + Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[0].pbData = (PBYTE)pContextId; + Items[0].cbData = 16; + Items[0].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent( &Event ); + pHttpTraceContext->RaiseTraceEvent(&Event); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext ) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 4 ); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4); //Verbosity }; }; // @@ -355,24 +359,24 @@ public: // EventType: 5 // EventLevel: 2 // - + class ANCM_REQUEST_FORWARD_FAIL { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId, - ULONG ErrorCode - ) - // - // Raise ANCM_REQUEST_FORWARD_FAIL Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + ULONG ErrorCode + ) + // + // Raise ANCM_REQUEST_FORWARD_FAIL Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 5; Event.pszEventName = L"ANCM_REQUEST_FORWARD_FAIL"; @@ -383,35 +387,35 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[ 2 ]; - Items[ 0 ].pszName = L"ContextId"; - Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[ 0 ].pbData = (PBYTE) pContextId; - Items[ 0 ].cbData = 16; - Items[ 0 ].pszDataDescription = NULL; - Items[ 1 ].pszName = L"ErrorCode"; - Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) - Items[ 1 ].pbData = (PBYTE) &ErrorCode; - Items[ 1 ].cbData = 4; - Items[ 1 ].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[2]; + Items[0].pszName = L"ContextId"; + Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[0].pbData = (PBYTE)pContextId; + Items[0].cbData = 16; + Items[0].pszDataDescription = NULL; + Items[1].pszName = L"ErrorCode"; + Items[1].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) + Items[1].pbData = (PBYTE)&ErrorCode; + Items[1].cbData = 4; + Items[1].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent( &Event ); + pHttpTraceContext->RaiseTraceEvent(&Event); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext ) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 2 ); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 2); //Verbosity }; }; // @@ -421,24 +425,24 @@ public: // EventType: 6 // EventLevel: 4 // - + class ANCM_WINHTTP_CALLBACK { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId, - ULONG InternetStatus - ) - // - // Raise ANCM_WINHTTP_CALLBACK Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + ULONG InternetStatus + ) + // + // Raise ANCM_WINHTTP_CALLBACK Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 6; Event.pszEventName = L"ANCM_WINHTTP_CALLBACK"; @@ -449,101 +453,467 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[ 2 ]; - Items[ 0 ].pszName = L"ContextId"; - Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[ 0 ].pbData = (PBYTE) pContextId; - Items[ 0 ].cbData = 16; - Items[ 0 ].pszDataDescription = NULL; - Items[ 1 ].pszName = L"InternetStatus"; - Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) - Items[ 1 ].pbData = (PBYTE) &InternetStatus; - Items[ 1 ].cbData = 4; - Items[ 1 ].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[2]; + Items[0].pszName = L"ContextId"; + Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[0].pbData = (PBYTE)pContextId; + Items[0].cbData = 16; + Items[0].pszDataDescription = NULL; + Items[1].pszName = L"InternetStatus"; + Items[1].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) + Items[1].pbData = (PBYTE)&InternetStatus; + Items[1].cbData = 4; + Items[1].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent( &Event ); + pHttpTraceContext->RaiseTraceEvent(&Event); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext ) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 4 ); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4); //Verbosity }; }; // - // Event: mof class name ANCMForwardEnd, - // Description: Inprocess executing request failure - // EventTypeName: ANCM_EXECUTE_REQUEST_FAIL - // EventType: 7 - // EventLevel: 2 + // Event: mof class name ANCMExecuteStart, + // Description: Starting inprocess execute request + // EventTypeName: ANCM_INPROC_EXECUTE_REQUEST_START + // EventType: 8 + // EventLevel: 4 // - - class ANCM_EXECUTE_REQUEST_FAIL + + class ANCM_INPROC_EXECUTE_REQUEST_START { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId, - ULONG ErrorCode - ) - // - // Raise ANCM_EXECUTE_REQUEST_FAIL Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_INPROC_EXECUTE_REQUEST_START Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); - Event.dwEvent = 7; - Event.pszEventName = L"ANCM_EXECUTE_REQUEST_FAIL"; + Event.dwEvent = 8; + Event.pszEventName = L"ANCM_INPROC_EXECUTE_REQUEST_START"; Event.dwEventVersion = 1; - Event.dwVerbosity = 2; + Event.dwVerbosity = 4; + Event.cEventItems = 1; + Event.pActivityGuid = NULL; + Event.pRelatedActivityGuid = NULL; + Event.dwTimeStamp = 0; + Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; + + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS + + HTTP_TRACE_EVENT_ITEM Items[1]; + Items[0].pszName = L"ContextId"; + Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[0].pbData = (PBYTE)pContextId; + Items[0].cbData = 16; + Items[0].pszDataDescription = NULL; + Event.pEventItems = Items; + pHttpTraceContext->RaiseTraceEvent(&Event); + return S_OK; + }; + + static + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext) + // Check if tracing for this event is enabled + { + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4); //Verbosity + }; + }; + // + // Event: mof class name ANCMExecuteEnd, + // Description: Ending inprocess execute request + // EventTypeName: ANCM_INPROC_EXECUTE_REQUEST_COMPLETION + // EventType: 10 + // EventLevel: 5 + // + + class ANCM_INPROC_EXECUTE_REQUEST_COMPLETION + { + public: + static + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + ULONG requestStatus + ) + // + // Raise ANCM_INPROC_EXECUTE_REQUEST_COMPLETION Event + // + { + HTTP_TRACE_EVENT Event; + Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); + Event.dwArea = WWWServerTraceProvider::ANCM; + Event.pAreaGuid = ANCMEvents::GetAreaGuid(); + Event.dwEvent = 10; + Event.pszEventName = L"ANCM_INPROC_EXECUTE_REQUEST_COMPLETION"; + Event.dwEventVersion = 1; + Event.dwVerbosity = 5; Event.cEventItems = 2; Event.pActivityGuid = NULL; Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[ 2 ]; - Items[ 0 ].pszName = L"ContextId"; - Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[ 0 ].pbData = (PBYTE) pContextId; - Items[ 0 ].cbData = 16; - Items[ 0 ].pszDataDescription = NULL; - Items[ 1 ].pszName = L"ErrorCode"; - Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) - Items[ 1 ].pbData = (PBYTE) &ErrorCode; - Items[ 1 ].cbData = 4; - Items[ 1 ].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[2]; + Items[0].pszName = L"ContextId"; + Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[0].pbData = (PBYTE)pContextId; + Items[0].cbData = 16; + Items[0].pszDataDescription = NULL; + Items[1].pszName = L"requestStatus"; + Items[1].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) + Items[1].pbData = (PBYTE)&requestStatus; + Items[1].cbData = 4; + Items[1].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent( &Event ); + pHttpTraceContext->RaiseTraceEvent(&Event); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext ) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 2 ); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 5); //Verbosity + }; + }; + // + // Event: mof class name ANCMAsyncStart, + // Description: Starting inprocess async completion + // EventTypeName: ANCM_INPROC_ASYNC_COMPLETION_START + // EventType: 8 + // EventLevel: 5 + // + + class ANCM_INPROC_ASYNC_COMPLETION_START + { + public: + static + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_INPROC_ASYNC_COMPLETION_START Event + // + { + HTTP_TRACE_EVENT Event; + Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); + Event.dwArea = WWWServerTraceProvider::ANCM; + Event.pAreaGuid = ANCMEvents::GetAreaGuid(); + Event.dwEvent = 8; + Event.pszEventName = L"ANCM_INPROC_ASYNC_COMPLETION_START"; + Event.dwEventVersion = 1; + Event.dwVerbosity = 5; + Event.cEventItems = 1; + Event.pActivityGuid = NULL; + Event.pRelatedActivityGuid = NULL; + Event.dwTimeStamp = 0; + Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; + + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS + + HTTP_TRACE_EVENT_ITEM Items[1]; + Items[0].pszName = L"ContextId"; + Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[0].pbData = (PBYTE)pContextId; + Items[0].cbData = 16; + Items[0].pszDataDescription = NULL; + Event.pEventItems = Items; + pHttpTraceContext->RaiseTraceEvent(&Event); + return S_OK; + }; + + static + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext) + // Check if tracing for this event is enabled + { + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 5); //Verbosity + }; + }; + // + // Event: mof class name ANCMAsyncEnd, + // Description: Ending inprocess async completion + // EventTypeName: ANCM_INPROC_ASYNC_COMPLETION_COMPLETION + // EventType: 10 + // EventLevel: 5 + // + + class ANCM_INPROC_ASYNC_COMPLETION_COMPLETION + { + public: + static + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + ULONG requestStatus + ) + // + // Raise ANCM_INPROC_ASYNC_COMPLETION_COMPLETION Event + // + { + HTTP_TRACE_EVENT Event; + Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); + Event.dwArea = WWWServerTraceProvider::ANCM; + Event.pAreaGuid = ANCMEvents::GetAreaGuid(); + Event.dwEvent = 10; + Event.pszEventName = L"ANCM_INPROC_ASYNC_COMPLETION_COMPLETION"; + Event.dwEventVersion = 1; + Event.dwVerbosity = 5; + Event.cEventItems = 2; + Event.pActivityGuid = NULL; + Event.pRelatedActivityGuid = NULL; + Event.dwTimeStamp = 0; + Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; + + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS + + HTTP_TRACE_EVENT_ITEM Items[2]; + Items[0].pszName = L"ContextId"; + Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[0].pbData = (PBYTE)pContextId; + Items[0].cbData = 16; + Items[0].pszDataDescription = NULL; + Items[1].pszName = L"requestStatus"; + Items[1].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) + Items[1].pbData = (PBYTE)&requestStatus; + Items[1].cbData = 4; + Items[1].pszDataDescription = NULL; + Event.pEventItems = Items; + pHttpTraceContext->RaiseTraceEvent(&Event); + return S_OK; + }; + + static + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext) + // Check if tracing for this event is enabled + { + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 5); //Verbosity + }; + }; + // + // Event: mof class name ANCMRequestShutdown, + // Description: Inprocess app shutdown + // EventTypeName: ANCM_INPROC_REQUEST_SHUTDOWN + // EventType: 11 + // EventLevel: 4 + // + + class ANCM_INPROC_REQUEST_SHUTDOWN + { + public: + static + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_INPROC_REQUEST_SHUTDOWN Event + // + { + HTTP_TRACE_EVENT Event; + Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); + Event.dwArea = WWWServerTraceProvider::ANCM; + Event.pAreaGuid = ANCMEvents::GetAreaGuid(); + Event.dwEvent = 11; + Event.pszEventName = L"ANCM_INPROC_REQUEST_SHUTDOWN"; + Event.dwEventVersion = 1; + Event.dwVerbosity = 4; + Event.cEventItems = 1; + Event.pActivityGuid = NULL; + Event.pRelatedActivityGuid = NULL; + Event.dwTimeStamp = 0; + Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; + + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS + + HTTP_TRACE_EVENT_ITEM Items[1]; + Items[0].pszName = L"ContextId"; + Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[0].pbData = (PBYTE)pContextId; + Items[0].cbData = 16; + Items[0].pszDataDescription = NULL; + Event.pEventItems = Items; + pHttpTraceContext->RaiseTraceEvent(&Event); + return S_OK; + }; + + static + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext) + // Check if tracing for this event is enabled + { + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4); //Verbosity + }; + }; + // + // Event: mof class name ANCMRequestDisconnect, + // Description: Inprocess request disconnect + // EventTypeName: ANCM_INPROC_REQUEST_DISCONNECT + // EventType: 12 + // EventLevel: 4 + // + + class ANCM_INPROC_REQUEST_DISCONNECT + { + public: + static + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_INPROC_REQUEST_DISCONNECT Event + // + { + HTTP_TRACE_EVENT Event; + Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); + Event.dwArea = WWWServerTraceProvider::ANCM; + Event.pAreaGuid = ANCMEvents::GetAreaGuid(); + Event.dwEvent = 12; + Event.pszEventName = L"ANCM_INPROC_REQUEST_DISCONNECT"; + Event.dwEventVersion = 1; + Event.dwVerbosity = 4; + Event.cEventItems = 1; + Event.pActivityGuid = NULL; + Event.pRelatedActivityGuid = NULL; + Event.dwTimeStamp = 0; + Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; + + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS + + HTTP_TRACE_EVENT_ITEM Items[1]; + Items[0].pszName = L"ContextId"; + Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[0].pbData = (PBYTE)pContextId; + Items[0].cbData = 16; + Items[0].pszDataDescription = NULL; + Event.pEventItems = Items; + pHttpTraceContext->RaiseTraceEvent(&Event); + return S_OK; + }; + + static + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext) + // Check if tracing for this event is enabled + { + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4); //Verbosity + }; + }; + // + // Event: mof class name ANCMManagedRequestCompletion, + // Description: Indicate managed request complete + // EventTypeName: ANCM_INPROC_MANAGED_REQUEST_COMPLETION + // EventType: 12 + // EventLevel: 4 + // + + class ANCM_INPROC_MANAGED_REQUEST_COMPLETION + { + public: + static + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_INPROC_MANAGED_REQUEST_COMPLETION Event + // + { + HTTP_TRACE_EVENT Event; + Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); + Event.dwArea = WWWServerTraceProvider::ANCM; + Event.pAreaGuid = ANCMEvents::GetAreaGuid(); + Event.dwEvent = 12; + Event.pszEventName = L"ANCM_INPROC_MANAGED_REQUEST_COMPLETION"; + Event.dwEventVersion = 1; + Event.dwVerbosity = 4; + Event.cEventItems = 1; + Event.pActivityGuid = NULL; + Event.pRelatedActivityGuid = NULL; + Event.dwTimeStamp = 0; + Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; + + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS + + HTTP_TRACE_EVENT_ITEM Items[1]; + Items[0].pszName = L"ContextId"; + Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[0].pbData = (PBYTE)pContextId; + Items[0].cbData = 16; + Items[0].pszDataDescription = NULL; + Event.pEventItems = Items; + pHttpTraceContext->RaiseTraceEvent(&Event); + return S_OK; + }; + + static + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext) + // Check if tracing for this event is enabled + { + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4); //Verbosity }; }; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm index 4675db7cdb..b558d83d5e 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm @@ -35,7 +35,7 @@

For more information visit: - https://go.microsoft.com/fwlink/?LinkID=808681 + https://go.microsoft.com/fwlink/?LinkID=808681

diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp index 49f2142fd4..aafb2c799f 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp @@ -17,6 +17,7 @@ #include "WebConfigConfigurationSource.h" #include "ConfigurationLoadException.h" #include "StartupExceptionApplication.h" +#include "aspnetcore_event.h" DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_inprocess.dll"); diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index c8fc89956e..75d555e053 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -3,10 +3,10 @@ #include "inprocesshandler.h" #include "inprocessapplication.h" -#include "aspnetcore_event.h" #include "IOutputManager.h" #include "ShuttingDownApplication.h" #include "ntassert.h" +#include "ModuleTracer.h" ALLOC_CACHE_HANDLER * IN_PROCESS_HANDLER::sm_pAlloc = NULL; @@ -25,7 +25,8 @@ IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( m_pRequestHandler(pRequestHandler), m_pRequestHandlerContext(pRequestHandlerContext), m_pAsyncCompletionHandler(pAsyncCompletion), - m_pDisconnectHandler(pDisconnectHandler) + m_pDisconnectHandler(pDisconnectHandler), + m_moduleTracer(pW3Context->GetTraceContext()) { } @@ -34,32 +35,11 @@ REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::OnExecuteRequestHandler() { // FREB log - - if (ANCMEvents::ANCM_START_APPLICATION_SUCCESS::IsEnabled(m_pW3Context->GetTraceContext())) - { - ANCMEvents::ANCM_START_APPLICATION_SUCCESS::RaiseEvent( - m_pW3Context->GetTraceContext(), - NULL, - L"InProcess Application"); - } + m_moduleTracer.ExecuteRequestStart(); if (m_pRequestHandler == NULL) { - // - // return error as the application did not register callback - // - if (ANCMEvents::ANCM_EXECUTE_REQUEST_FAIL::IsEnabled(m_pW3Context->GetTraceContext())) - { - ANCMEvents::ANCM_EXECUTE_REQUEST_FAIL::RaiseEvent(m_pW3Context->GetTraceContext(), - NULL, - (ULONG)E_APPLICATION_ACTIVATION_EXEC_FAILURE); - } - - m_pW3Context->GetResponse()->SetStatus(500, - "Internal Server Error", - 0, - (ULONG)E_APPLICATION_ACTIVATION_EXEC_FAILURE); - + m_moduleTracer.ExecuteRequestEnd(RQ_NOTIFICATION_FINISH_REQUEST); return RQ_NOTIFICATION_FINISH_REQUEST; } else if (m_pApplication->QueryBlockCallbacksIntoManaged()) @@ -67,7 +47,9 @@ IN_PROCESS_HANDLER::OnExecuteRequestHandler() return ServerShutdownMessage(); } - return m_pRequestHandler(this, m_pRequestHandlerContext); + auto status = m_pRequestHandler(this, m_pRequestHandlerContext); + m_moduleTracer.ExecuteRequestEnd(status); + return status; } __override @@ -77,10 +59,13 @@ IN_PROCESS_HANDLER::OnAsyncCompletion( HRESULT hrCompletionStatus ) { + m_moduleTracer.AsyncCompletionStart(); + if (m_fManagedRequestComplete) { // means PostCompletion has been called and this is the associated callback. - return m_requestNotificationStatus; + m_moduleTracer.AsyncCompletionEnd(m_requestNotificationStatus); + return m_requestNotificationStatus; } if (m_pApplication->QueryBlockCallbacksIntoManaged()) { @@ -92,11 +77,15 @@ IN_PROCESS_HANDLER::OnAsyncCompletion( assert(m_pManagedHttpContext != nullptr); // Call the managed handler for async completion. - return m_pAsyncCompletionHandler(m_pManagedHttpContext, hrCompletionStatus, cbCompletion); + + auto status = m_pAsyncCompletionHandler(m_pManagedHttpContext, hrCompletionStatus, cbCompletion); + m_moduleTracer.AsyncCompletionEnd(status); + return status; } -REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::ServerShutdownMessage() const +REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::ServerShutdownMessage() { + m_moduleTracer.RequestShutdown(); return ShuttingDownHandler::ServerShutdownMessage(m_pW3Context); } @@ -109,6 +98,8 @@ IN_PROCESS_HANDLER::NotifyDisconnect() return; } + m_moduleTracer.RequestDisconnect(); + assert(m_pManagedHttpContext != nullptr); m_pDisconnectHandler(m_pManagedHttpContext); } @@ -120,6 +111,7 @@ IN_PROCESS_HANDLER::IndicateManagedRequestComplete( { m_fManagedRequestComplete = TRUE; m_pManagedHttpContext = nullptr; + m_moduleTracer.ManagedCompletion(); } VOID diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h index c1fae5dfc7..177c25e329 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h @@ -7,6 +7,7 @@ #include #include "iapplication.h" #include "inprocessapplication.h" +#include "ModuleTracer.h" class IN_PROCESS_APPLICATION; @@ -71,7 +72,7 @@ public: private: REQUEST_NOTIFICATION_STATUS - ServerShutdownMessage() const; + ServerShutdownMessage(); PVOID m_pManagedHttpContext; BOOL m_fManagedRequestComplete; @@ -83,4 +84,5 @@ private: PFN_ASYNC_COMPLETION_HANDLER m_pAsyncCompletionHandler; PFN_DISCONNECT_HANDLER m_pDisconnectHandler; static ALLOC_CACHE_HANDLER * sm_pAlloc; + ModuleTracer m_moduleTracer; }; diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs index 594e373b08..61ab2a323f 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs @@ -61,6 +61,77 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogFile", Path.Combine(path, "std"))); } + public static void EnableFreb(this IISDeploymentParameters deploymentParameters, string verbosity, string folderPath) + { + if (!deploymentParameters.PublishApplicationBeforeDeployment) + { + throw new InvalidOperationException("Testing freb requires site to be published."); + } + + deploymentParameters.EnableModule("FailedRequestsTracingModule", "%IIS_BIN%\\iisfreb.dll"); + + // Set the TraceFailedRequestsSection to listend to ANCM events + deploymentParameters.ServerConfigActionList.Add( + (element, _) => + { + var webServerElement = element + .RequiredElement("system.webServer"); + + var addElement = webServerElement + .GetOrAdd("tracing") + .GetOrAdd("traceFailedRequests") + .GetOrAdd("add"); + + addElement.SetAttributeValue("path", "*"); + + addElement.GetOrAdd("failureDefinitions") + .SetAttributeValue("statusCodes", "200-999"); + + var traceAreasElement = addElement + .GetOrAdd("traceAreas"); + var innerAddElement = traceAreasElement.GetOrAdd("add", "provider", "WWW Server"); + + innerAddElement.SetAttributeValue("areas", "ANCM"); + innerAddElement.SetAttributeValue("verbosity", verbosity); + }); + + // Set the ANCM traceProviderDefinition to 65536 + deploymentParameters.ServerConfigActionList.Add( + (element, _) => + { + var webServerElement = element + .RequiredElement("system.webServer"); + + var traceProviderDefinitionsElement = webServerElement + .GetOrAdd("tracing") + .GetOrAdd("traceProviderDefinitions"); + + var innerAddElement = traceProviderDefinitionsElement.GetOrAdd("add", "name", "WWW Server"); + + innerAddElement.SetAttributeValue("name", "WWW Server"); + innerAddElement.SetAttributeValue("guid", "{3a2a4e84-4c21-4981-ae10-3fda0d9b0f83}"); + + var areasElement = innerAddElement.GetOrAdd("areas"); + var iae = areasElement.GetOrAdd("add", "name", "ANCM"); + + iae.SetAttributeValue("value", "65536"); + }); + + // Set the freb directory to the published app directory. + deploymentParameters.ServerConfigActionList.Add( + (element, contentRoot) => + { + var traceFailedRequestsElement = element + .RequiredElement("system.applicationHost") + .Element("sites") + .Element("siteDefaults") + .Element("traceFailedRequestsLogging"); + traceFailedRequestsElement.SetAttributeValue("directory", folderPath); + traceFailedRequestsElement.SetAttributeValue("enabled", "true"); + traceFailedRequestsElement.SetAttributeValue("maxLogFileSizeKB", "1024"); + }); + } + public static void TransformPath(this IISDeploymentParameters parameters, Func transformation) { parameters.WebConfigActionList.Add( @@ -89,7 +160,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } parameters.ServerConfigActionList.Add( - (element, _) => { + (element, _) => + { var webServerElement = element .RequiredElement("system.webServer"); diff --git a/test/Common.FunctionalTests/Inprocess/FrebTests.cs b/test/Common.FunctionalTests/Inprocess/FrebTests.cs new file mode 100644 index 0000000000..cf9d423ea1 --- /dev/null +++ b/test/Common.FunctionalTests/Inprocess/FrebTests.cs @@ -0,0 +1,118 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class FrebTests : LogFileTestBase + { + private readonly PublishedSitesFixture _fixture; + public FrebTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static ISet FrebChecks() + { + var set = new HashSet(); + set.Add(new string[] { "ANCM_INPROC_EXECUTE_REQUEST_START" }); + set.Add(new string[] { "ANCM_INPROC_EXECUTE_REQUEST_COMPLETION", "1" }); + set.Add(new string[] { "ANCM_INPROC_ASYNC_COMPLETION_START" }); + set.Add(new string[] { "ANCM_INPROC_ASYNC_COMPLETION_COMPLETION", "0" }); + set.Add(new string[] { "ANCM_INPROC_MANAGED_REQUEST_COMPLETION" }); + return set; + } + + [ConditionalFact] + [RequiresIIS(IISCapability.FailedRequestTracingModule)] + public async Task CheckCommonFrebEvents() + { + var result = await SetupFrebApp(); + + await result.HttpClient.GetAsync("HelloWorld"); + + StopServer(); + + foreach (var data in FrebChecks()) + { + AssertFrebLogs(result, data); + } + } + + [ConditionalFact] + [RequiresIIS(IISCapability.FailedRequestTracingModule)] + public async Task CheckFailedRequestEvents() + { + var result = await SetupFrebApp(); + + await result.HttpClient.GetAsync("Throw"); + + StopServer(); + + AssertFrebLogs(result, "ANCM_INPROC_ASYNC_COMPLETION_COMPLETION", "2"); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.FailedRequestTracingModule)] + public async Task CheckFrebDisconnect() + { + var result = await SetupFrebApp(); + + using (var connection = new TestConnection(result.HttpClient.BaseAddress.Port)) + { + await connection.Send( + "GET /WaitForAbort HTTP/1.1", + "Host: localhost", + "Connection: close", + "", + ""); + await result.HttpClient.RetryRequestAsync("/WaitingRequestCount", async message => await message.Content.ReadAsStringAsync() == "1"); + } + + StopServer(); + + AssertFrebLogs(result, "ANCM_INPROC_REQUEST_DISCONNECT"); + } + + private async Task SetupFrebApp() + { + var parameters = _fixture.GetBaseDeploymentParameters(publish: true); + parameters.EnableFreb("Verbose", _logFolderPath); + + Directory.CreateDirectory(_logFolderPath); + var result = await DeployAsync(parameters); + return result; + } + + private void AssertFrebLogs(IISDeploymentResult result, params string[] data) + { + var folderPath = Helpers.GetFrebFolder(_logFolderPath, result); + var fileString = Directory.GetFiles(folderPath).Where(f => f.EndsWith("xml")).OrderBy(x => x).Last(); + + var xDocument = XDocument.Load(fileString).Root; + var nameSpace = (XNamespace)"http://schemas.microsoft.com/win/2004/08/events/event"; + var elements = xDocument.Descendants(nameSpace + "Event"); + var element = elements.Where(el => el.Descendants(nameSpace + "RenderingInfo").Single().Descendants(nameSpace + "Opcode").Single().Value == data[0]); + + Assert.Single(element); + + if (data.Length > 1) + { + var requestStatus = element.Single().Element(nameSpace + "EventData").Descendants().Where(el => el.Attribute("Name").Value == "requestStatus").Single(); + Assert.Equal(data[1], requestStatus.Value); + } + } + } +} diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 87cb5c5898..f3cf2ba70d 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -63,6 +63,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await Task.WhenAll(tasks); } + public static string GetFrebFolder(string folder, IISDeploymentResult result) + { + if (result.DeploymentParameters.ServerType == ServerType.IISExpress) + { + return Path.Combine(folder, result.DeploymentParameters.SiteName); + } + else + { + return Path.Combine(folder, "W3SVC1"); + } + } + public static void CopyFiles(DirectoryInfo source, DirectoryInfo target, ILogger logger) { foreach (DirectoryInfo directoryInfo in source.GetDirectories()) @@ -113,6 +125,27 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return response; } + public static async Task Retry(Func func, int attempts, int msDelay) + { + var exceptions = new List(); + + for (var attempt = 0; attempt < attempts; attempt++) + { + try + { + await func(); + return; + } + catch (Exception e) + { + exceptions.Add(e); + } + await Task.Delay(msDelay); + } + + throw new AggregateException(exceptions); + } + public static void AssertWorkerProcessStop(this IISDeploymentResult deploymentResult, int? timeout = null) { var hostProcess = deploymentResult.HostProcess; diff --git a/test/Common.FunctionalTests/Utilities/IISCapability.cs b/test/Common.FunctionalTests/Utilities/IISCapability.cs index 30c270fa77..750326cb5d 100644 --- a/test/Common.FunctionalTests/Utilities/IISCapability.cs +++ b/test/Common.FunctionalTests/Utilities/IISCapability.cs @@ -15,6 +15,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests ShutdownToken = 8, DynamicCompression = 16, ApplicationInitialization = 32, - TracingModule = 64 + TracingModule = 64, + FailedRequestTracingModule = 128 } } diff --git a/test/IIS.FunctionalTests/RequiresIISAttribute.cs b/test/IIS.FunctionalTests/RequiresIISAttribute.cs index f78de73d47..2aacfed0db 100644 --- a/test/IIS.FunctionalTests/RequiresIISAttribute.cs +++ b/test/IIS.FunctionalTests/RequiresIISAttribute.cs @@ -24,6 +24,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private static readonly bool _dynamicCompressionAvailable; private static readonly bool _applicationInitializationModule; private static readonly bool _tracingModuleAvailable; + private static readonly bool _frebTracingModuleAvailable; static RequiresIISAttribute() { @@ -90,6 +91,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _tracingModuleAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "iisetw.dll")); + _frebTracingModuleAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "iisfreb.dll")); + + var iisRegistryKey = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\InetStp", writable: false); if (iisRegistryKey == null) { @@ -161,12 +165,22 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } + if (capabilities.HasFlag(IISCapability.TracingModule)) { IsMet &= _tracingModuleAvailable; if (!_tracingModuleAvailable) { - SkipReason += "The machine does not have IIS TracingModule installed."; + SkipReason += "The machine does not have IIS Failed Request Tracing Module installed."; + } + } + + if (capabilities.HasFlag(IISCapability.FailedRequestTracingModule)) + { + IsMet &= _frebTracingModuleAvailable; + if (!_frebTracingModuleAvailable) + { + SkipReason += "The machine does not have IIS Failed Request Tracing Module installed."; } } } diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs index cc270d9afa..349f72d7bf 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs @@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // ANCM v2 does retry on port collisions, so no retries should be required. var attempts = (ancmVersion == AncmVersion.AspNetCoreModule) ? 2 : 1; - return Retry(async () => + return Helpers.Retry(async () => { const int numApps = 10; @@ -75,27 +75,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } }, - attempts: attempts); - } - - private async Task Retry(Func func, int attempts) - { - var exceptions = new List(); - - for (var attempt = 0; attempt < attempts; attempt++) - { - try - { - await func(); - return; - } - catch (Exception e) - { - exceptions.Add(e); - } - } - - throw new AggregateException(exceptions); + attempts: attempts, msDelay: 0); } } } From f2fbd803b9d42cacc53a7e12addbc4c2bf3ce0ef Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 9 Oct 2018 16:11:52 -0700 Subject: [PATCH 316/363] Flow request trace context to CreateApplication (#1480) --- .../AspNetCore/ApplicationFactory.h | 14 +++++++++----- .../AspNetCore/applicationinfo.cpp | 15 ++++++++------- .../AspNetCore/applicationinfo.h | 8 ++++---- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h b/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h index 30a0a3359b..4d29b4fb39 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h +++ b/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h @@ -31,13 +31,17 @@ public: HRESULT Execute( _In_ IHttpServer *pServer, - _In_ const IHttpApplication *pHttpApplication, - _Outptr_ IAPPLICATION **pApplication) const noexcept + _In_ IHttpContext *pHttpContext, + _Outptr_ IAPPLICATION **pApplication) const { - std::array parameters { - {"InProcessExeLocation", m_location.data()} + std::array parameters { + { + {"InProcessExeLocation", m_location.data()}, + {"TraceContext", pHttpContext->GetTraceContext()} + } }; - return m_pfnAspNetCoreCreateApplication(pServer, pHttpApplication, parameters.data(), static_cast(parameters.size()), pApplication); + + return m_pfnAspNetCoreCreateApplication(pServer, pHttpContext->GetApplication(), parameters.data(), static_cast(parameters.size()), pApplication); } private: diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index 9b95d94f16..36b0c2d902 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -43,7 +43,7 @@ APPLICATION_INFO::CreateHandler( // check if other thread created application RETURN_IF_FAILED(hr = TryCreateHandler(pHttpContext, pHandler)); - // In some cases (adding and removing app_offline quickly) application might start and stop immediately + // In some cases (adding and removing app_offline quickly) application might start and stop immediately // so retry until we get valid handler or error while (hr != S_OK) { @@ -59,7 +59,7 @@ APPLICATION_INFO::CreateHandler( m_pApplicationFactory = nullptr; } - RETURN_IF_FAILED(CreateApplication(*pHttpContext.GetApplication())); + RETURN_IF_FAILED(CreateApplication(pHttpContext)); RETURN_IF_FAILED(hr = TryCreateHandler(pHttpContext, pHandler)); } @@ -69,8 +69,9 @@ APPLICATION_INFO::CreateHandler( } HRESULT -APPLICATION_INFO::CreateApplication(const IHttpApplication& pHttpApplication) +APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext) { + auto& pHttpApplication = *pHttpContext.GetApplication(); if (AppOfflineApplication::ShouldBeStarted(pHttpApplication)) { LOG_INFO(L"Detected app_offline file, creating polling application"); @@ -85,7 +86,7 @@ APPLICATION_INFO::CreateApplication(const IHttpApplication& pHttpApplication) const WebConfigConfigurationSource configurationSource(m_pServer.GetAdminManager(), pHttpApplication); ShimOptions options(configurationSource); - const auto hr = TryCreateApplication(pHttpApplication, options); + const auto hr = TryCreateApplication(pHttpContext, options); if (FAILED_LOG(hr)) { @@ -130,15 +131,15 @@ APPLICATION_INFO::CreateApplication(const IHttpApplication& pHttpApplication) } HRESULT -APPLICATION_INFO::TryCreateApplication(const IHttpApplication& pHttpApplication, const ShimOptions& options) +APPLICATION_INFO::TryCreateApplication(IHttpContext& pHttpContext, const ShimOptions& options) { - RETURN_IF_FAILED(m_handlerResolver.GetApplicationFactory(pHttpApplication, m_pApplicationFactory, options)); + RETURN_IF_FAILED(m_handlerResolver.GetApplicationFactory(*pHttpContext.GetApplication(), m_pApplicationFactory, options)); LOG_INFO(L"Creating handler application"); IAPPLICATION * newApplication; RETURN_IF_FAILED(m_pApplicationFactory->Execute( &m_pServer, - &pHttpApplication, + &pHttpContext, &newApplication)); m_pApplication.reset(newApplication); diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h index 4b190007dd..b40e0a8ba9 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h +++ b/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h @@ -50,7 +50,7 @@ public: CreateHandler( IHttpContext& pHttpContext, std::unique_ptr& pHandler); - + bool ConfigurationPathApplies(const std::wstring& path) { // We need to check that the last character of the config path @@ -67,17 +67,17 @@ public: } private: - + HRESULT TryCreateHandler( IHttpContext& pHttpContext, std::unique_ptr& pHandler); HRESULT - CreateApplication(const IHttpApplication& pHttpApplication); + CreateApplication(IHttpContext& pHttpContext); HRESULT - TryCreateApplication(const IHttpApplication& pHttpApplication, const ShimOptions& options); + TryCreateApplication(IHttpContext& pHttpContext, const ShimOptions& options); IHttpServer &m_pServer; HandlerResolver &m_handlerResolver; From 7a09638afee198b5a87761ff33999aa72060340b Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 9 Oct 2018 16:12:01 -0700 Subject: [PATCH 317/363] Modernize startup error pages (#1476) --- .../AspNetCore/InProcessShimStaticHtml.htm | 121 ++++++++++++------ .../AspNetCore/OutOfProcessShimStaticHtml.htm | 119 +++++++++++------ .../AspNetCore/ServerErrorApplication.h | 3 +- .../CommonLib/ServerErrorHandler.h | 73 ++++++++++- .../CommonLib/file_utility.cpp | 20 --- .../CommonLib/requesthandler.h | 26 ---- .../InProcessRhStaticHtml.htm | 115 +++++++++++------ .../StartupExceptionApplication.h | 5 +- .../HtmlResponses.rc | 68 ++++++++++ .../OutOfProcessRequestHandler.vcxproj | 5 + .../OutOfProcessRhStaticHtml.htm | 85 ++++++++++++ .../OutOfProcessRequestHandler/dllmain.cpp | 2 + .../forwardinghandler.cpp | 44 +------ .../forwardinghandler.h | 1 + .../OutOfProcessRequestHandler/resource.h | 16 +++ .../InProcess/ErrorPagesTests.cs | 106 +++++++++++++++ .../InProcess/StartupTests.cs | 4 +- .../OutOfProcess/GlobalVersionTests.cs | 2 +- 18 files changed, 598 insertions(+), 217 deletions(-) create mode 100644 src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc create mode 100644 src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm create mode 100644 src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h create mode 100644 test/IISExpress.FunctionalTests/InProcess/ErrorPagesTests.cs diff --git a/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm b/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm index b7e575552a..a8c9d7fe1f 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm +++ b/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm @@ -1,45 +1,84 @@ - - + + + + + HTTP Error 500.0 - ANCM In-Process Handler Load Failure + - + h1, h2, h3, h4, h5 { + /*font-family: 'Segoe UI',Tahoma,Arial,Helvetica,sans-serif;*/ + font-weight: 100; + } - -
-
-

HTTP Error 500.0 - ANCM InProcess Startup Failure

-
-
-
-

Common causes of this issue:

-
    -
  • The specified version of Microsoft.NetCore.App or Microsoft.AspNetCore.App was not found.
    • -
  • The in process request handler, Microsoft.AspNetCore.Server.IIS, was not referenced in the application.
    • -
  • ANCM could not find dotnet.
    • -
-
-
-
-
-

Troubleshooting steps:

-
    -
  • Check the system event log for error messages
    • -
  • Enable logging the application process' stdout messages
    • -
  • Attach a debugger to the application process and inspect
    • -
-
-
-

For more information visit: - - https://go.microsoft.com/fwlink/?LinkID=808681 - -

-
-
-
- + h1 { + color: #44525e; + margin: 15px 0 15px 0; + } + h2 { + margin: 10px 5px 0 0; + } + + h3 { + color: #363636; + margin: 5px 5px 0 0; + } + + code { + font-family: Consolas, "Courier New", courier, monospace; + } + + body .titleerror { + padding: 3px 3px 6px 3px; + display: block; + font-size: 1.5em; + font-weight: 100; + } + + a { + color: #1ba1e2; + text-decoration: none; + } + + a:hover { + color: #13709e; + text-decoration: underline; + } + + li { + margin: 5px; + } + + + + +

HTTP Error 500.0 - ANCM In-Process Handler Load Failure

+ +

Common causes of this issue:

+ +
    +
  • The specified version of Microsoft.NetCore.App or Microsoft.AspNetCore.App was not found.
    • +
  • The in process request handler, Microsoft.AspNetCore.Server.IIS, was not referenced in the application.
    • +
  • ANCM could not find dotnet.
    • +
+ +

Troubleshooting steps:

+ +
    +
  • Check the system event log for error messages
    • +
  • Enable logging the application process' stdout messages
    • +
  • Attach a debugger to the application process and inspect
    • +
+ +

+ For more information visit: + %s https://go.microsoft.com/fwlink/?LinkID=2028526 +

+ diff --git a/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm b/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm index 475ce26956..1194cf4025 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm +++ b/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm @@ -1,44 +1,81 @@ - - + + + + + HTTP Error 500.0 - ANCM Out-Of-Process Handler Load Failure + - + h1, h2, h3, h4, h5 { + /*font-family: 'Segoe UI',Tahoma,Arial,Helvetica,sans-serif;*/ + font-weight: 100; + } - -
-
-

HTTP Error 500.0 - ANCM OutOfProcess Startup Failure

-
-
-
-

Common causes of this issue:

-
    -
  • The out of process request handler, aspnetcorev2_outofprocess.dll, could not be found next to the aspnetcorev2.dll.
    • -
  • Could not read configuration correctly. Check the application's associated web.config.
    • -
-
-
-
-
-

Troubleshooting steps:

-
    -
  • Check the system event log for error messages
    • -
  • Enable logging the application process' stdout messages
    • -
  • Attach a debugger to the application process and inspect
    • -
-
-
-

For more information visit: - - https://go.microsoft.com/fwlink/?LinkID=808681 - -

-
-
-
- + h1 { + color: #44525e; + margin: 15px 0 15px 0; + } - \ No newline at end of file + h2 { + margin: 10px 5px 0 0; + } + + h3 { + color: #363636; + margin: 5px 5px 0 0; + } + + code { + font-family: Consolas, "Courier New", courier, monospace; + } + + body .titleerror { + padding: 3px 3px 6px 3px; + display: block; + font-size: 1.5em; + font-weight: 100; + } + + a { + color: #1ba1e2; + text-decoration: none; + } + + a:hover { + color: #13709e; + text-decoration: underline; + } + + li { + margin: 5px; + } + + + + +

HTTP Error 500.0 - ANCM Out-Of-Process Handler Load Failure

+ +

Common causes of this issue:

+
    +
  • The out of process request handler, aspnetcorev2_outofprocess.dll, could not be found next to the aspnetcorev2.dll.
    • +
  • Could not read configuration correctly. Check the application's associated web.config.
    • +
+ +

Troubleshooting steps:

+
    +
  • Check the system event log for error messages
    • +
  • Enable logging the application process' stdout messages
    • +
  • Attach a debugger to the application process and inspect
    • +
+ +

+ For more information visit: + %s https://go.microsoft.com/fwlink/?LinkID=2028526 +

+ + diff --git a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h index ac5bd85aaf..b5b86aa20c 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h +++ b/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h @@ -27,7 +27,7 @@ public: HRESULT CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override { - auto handler = std::make_unique(*pHttpContext, m_HR, m_moduleInstance, m_disableStartupPage, m_page); + auto handler = std::make_unique(*pHttpContext, 500ui16, 0ui16, "Internal Server Error", m_HR, m_moduleInstance, m_disableStartupPage, m_page); *pRequestHandler = handler.release(); return S_OK; } @@ -39,4 +39,3 @@ private: int m_page; HINSTANCE m_moduleInstance; }; - diff --git a/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h b/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h index 721c0d12eb..f6745768a7 100644 --- a/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h @@ -4,19 +4,27 @@ #pragma once #include "requesthandler.h" #include "file_utility.h" +#include "Environment.h" class ServerErrorHandler : public REQUEST_HANDLER { public: - ServerErrorHandler(IHttpContext &pContext, HRESULT hr, HINSTANCE moduleInstance, bool disableStartupPage, int page) - : m_pContext(pContext), m_HR(hr), m_disableStartupPage(disableStartupPage), m_page(page), m_moduleInstance(moduleInstance) + ServerErrorHandler(IHttpContext &pContext, USHORT statusCode, USHORT subStatusCode, std::string statusText, HRESULT hr, HINSTANCE moduleInstance, bool disableStartupPage, int page) + : m_pContext(pContext), + m_HR(hr), + m_disableStartupPage(disableStartupPage), + m_page(page), + m_moduleInstance(moduleInstance), + m_statusCode(statusCode), + m_subStatusCode(subStatusCode), + m_statusText(std::move(statusText)) { } REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override { - static std::string s_html500Page = FILE_UTILITY::GetHtml(m_moduleInstance, m_page); + static std::string s_html500Page = GetHtml(m_moduleInstance, m_page); WriteStaticResponse(m_pContext, s_html500Page, m_HR, m_disableStartupPage); @@ -24,9 +32,68 @@ public: } private: + void WriteStaticResponse(IHttpContext& pContext, std::string &page, HRESULT hr, bool disableStartupErrorPage) const + { + if (disableStartupErrorPage) + { + pContext.GetResponse()->SetStatus(m_statusCode, m_statusText.c_str(), m_subStatusCode, E_FAIL); + return; + } + + HTTP_DATA_CHUNK dataChunk = {}; + IHttpResponse* pResponse = pContext.GetResponse(); + pResponse->SetStatus(m_statusCode, m_statusText.c_str(), m_subStatusCode, hr, nullptr, true); + pResponse->SetHeader("Content-Type", + "text/html", + (USHORT)strlen("text/html"), + FALSE + ); + dataChunk.DataChunkType = HttpDataChunkFromMemory; + + dataChunk.FromMemory.pBuffer = page.data(); + dataChunk.FromMemory.BufferLength = static_cast(page.size()); + pResponse->WriteEntityChunkByReference(&dataChunk); + } + + static + std::string + GetHtml(HMODULE module, int page) + { + try + { + HRSRC rc = nullptr; + HGLOBAL rcData = nullptr; + const char* data = nullptr; + + THROW_LAST_ERROR_IF_NULL(rc = FindResource(module, MAKEINTRESOURCE(page), RT_HTML)); + THROW_LAST_ERROR_IF_NULL(rcData = LoadResource(module, rc)); + auto const size = SizeofResource(module, rc); + THROW_LAST_ERROR_IF(size == 0); + THROW_LAST_ERROR_IF_NULL(data = static_cast(LockResource(rcData))); + + auto additionalErrorLink = Environment::GetEnvironmentVariableValue(L"ANCM_ADDITIONAL_ERROR_PAGE_LINK"); + std::string additionalHtml; + + if (additionalErrorLink.has_value()) + { + additionalHtml = format(" %S and ", additionalErrorLink->c_str(), additionalErrorLink->c_str()); + } + + return format(data, additionalHtml.c_str()); + } + catch (...) + { + OBSERVE_CAUGHT_EXCEPTION(); + return ""; + } + } + IHttpContext &m_pContext; HRESULT m_HR; bool m_disableStartupPage; int m_page; HINSTANCE m_moduleInstance; + USHORT m_statusCode; + USHORT m_subStatusCode; + std::string m_statusText; }; diff --git a/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp b/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp index 228c1c0d66..2831eac64d 100644 --- a/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp @@ -167,23 +167,3 @@ Finished: return hr; } -std::string -FILE_UTILITY::GetHtml(HMODULE module, int page) -{ - HRESULT hr = S_OK; - HRSRC rc = nullptr; - HGLOBAL rcData = nullptr; - const char* data = nullptr; - DWORD size = 0; - - FINISHED_LAST_ERROR_IF_NULL(rc = FindResource(module, MAKEINTRESOURCE(page), RT_HTML)); - FINISHED_LAST_ERROR_IF_NULL(rcData = LoadResource(module, rc)); - size = SizeofResource(module, rc); - FINISHED_LAST_ERROR_IF(size == 0); - FINISHED_LAST_ERROR_IF_NULL(data = static_cast(LockResource(rcData))); - - return data; -Finished: - - return ""; -} diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h index b4cd3a0e35..a5e16bf022 100644 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h @@ -46,32 +46,6 @@ public: { } -protected: - - static - void WriteStaticResponse(IHttpContext& pContext, std::string &s_html500Page, HRESULT hr, bool disableStartupErrorPage) - { - if (disableStartupErrorPage) - { - pContext.GetResponse()->SetStatus(500, "Internal Server Error", 30, E_FAIL); - return; - } - - HTTP_DATA_CHUNK dataChunk = {}; - IHttpResponse* pResponse = pContext.GetResponse(); - pResponse->SetStatus(500, "Internal Server Error", 0, hr, nullptr, true); - pResponse->SetHeader("Content-Type", - "text/html", - (USHORT)strlen("text/html"), - FALSE - ); - dataChunk.DataChunkType = HttpDataChunkFromMemory; - - dataChunk.FromMemory.pBuffer = s_html500Page.data(); - dataChunk.FromMemory.BufferLength = static_cast(s_html500Page.size()); - pResponse->WriteEntityChunkByReference(&dataChunk); - } - private: mutable LONG m_cRefs = 1; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm index b558d83d5e..59d6b0dacb 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm @@ -1,44 +1,83 @@ - - + + + + + HTTP Error 500.30 - ANCM In-Process Start Failure + - - -
+ h1 { + color: #44525e; + margin: 15px 0 15px 0; + } -

HTTP Error 500.30 - ANCM In-Process Start Failure

-
+ h2 { + margin: 10px 5px 0 0; + } -
-

Common causes of this issue:

-
    -
  • The application failed to start
    • -
  • The application started but then stopped
    • -
  • The application started but threw an exception during startup
    • -
-
-
-
+ h3 { + color: #363636; + margin: 5px 5px 0 0; + } -
-

Troubleshooting steps:

-
    -
  • Check the system event log for error messages
    • -
  • Enable logging the application process' stdout messages
    • -
  • Attach a debugger to the application process and inspect
    • -
-
-
-

- For more information visit: - https://go.microsoft.com/fwlink/?LinkID=808681 -

-
-
-
- + code { + font-family: Consolas, "Courier New", courier, monospace; + } + + body .titleerror { + padding: 3px 3px 6px 3px; + display: block; + font-size: 1.5em; + font-weight: 100; + } + + a { + color: #1ba1e2; + text-decoration: none; + } + + a:hover { + color: #13709e; + text-decoration: underline; + } + + li { + margin: 5px; + } + + + + +

HTTP Error 500.30 - ANCM In-Process Start Failure

+ +

Common causes of this issue:

+
    +
  • The application failed to start
    • +
  • The application started but then stopped
    • +
  • The application started but threw an exception during startup
    • +
+ +

Troubleshooting steps:

+
    +
  • Check the system event log for error messages
    • +
  • Enable logging the application process' stdout messages
    • +
  • Attach a debugger to the application process and inspect
    • +
+ +

+ For more information visit: + %s https://go.microsoft.com/fwlink/?LinkID=2028265 +

+ + diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h index 7d8acc4e7e..72b26d857c 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h @@ -25,10 +25,9 @@ public: ~StartupExceptionApplication() = default; - HRESULT - CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler) + HRESULT CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler) { - *pRequestHandler = new ServerErrorHandler(*pHttpContext, m_HR,m_moduleInstance, m_disableLogs, IN_PROCESS_RH_STATIC_HTML); + *pRequestHandler = new ServerErrorHandler(*pHttpContext, 500, 30, "Internal Server Error", m_HR, m_moduleInstance, m_disableLogs, IN_PROCESS_RH_STATIC_HTML); return S_OK; } diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc new file mode 100644 index 0000000000..231f122fef --- /dev/null +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc @@ -0,0 +1,68 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// HTML +// + +OUT_OF_PROCESS_RH_STATIC_HTML HTML "OutOfProcessRhStaticHtml.htm" + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 3c4ee3b264..7d29672fa0 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -228,6 +228,7 @@ + @@ -268,9 +269,13 @@ + + + true + diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm new file mode 100644 index 0000000000..e7d2f04e7c --- /dev/null +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm @@ -0,0 +1,85 @@ + + + + + HTTP Error 502.5 - ANCM Out-Of-Process Startup Failure + + + +

HTTP Error 502.5 - ANCM Out-Of-Process Startup Failure

+ +

Common causes of this issue:

+ +
    +
  • The application process failed to start
    • +
  • The application process started but then stopped
    • +
  • The application process started but failed to listen on the configured port
    • +
+ +

Troubleshooting steps:

+ +
    +
  • Check the system event log for error messages
    • +
  • Enable logging the application process' stdout messages
    • +
  • Attach a debugger to the application process and inspect
    • +
+ +

+ For more information visit: + %s https://go.microsoft.com/fwlink/?LinkID=808681 +

+ + + diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp index b5f2014bf2..24c166a056 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp @@ -20,6 +20,7 @@ SRWLOCK g_srwLockRH; HINTERNET g_hWinhttpSession = NULL; IHttpServer * g_pHttpServer = NULL; HINSTANCE g_hWinHttpModule; +HINSTANCE g_hOutOfProcessRHModule; HINSTANCE g_hAspNetCoreModule; HANDLE g_hEventLog = NULL; @@ -223,6 +224,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: + g_hOutOfProcessRHModule = hModule; DisableThreadLibraryCalls(hModule); InitializeSRWLock(&g_srwLockRH); DebugInitialize(hModule); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp index c43241495d..d97a55a17e 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp @@ -4,6 +4,8 @@ #include "forwardinghandler.h" #include "url_utility.h" #include "exceptions.h" +#include "ServerErrorHandler.h" +#include "resource.h" // Just to be aware of the FORWARDING_HANDLER object size. C_ASSERT(sizeof(FORWARDING_HANDLER) <= 632); @@ -16,7 +18,6 @@ C_ASSERT(sizeof(FORWARDING_HANDLER) <= 632); #define FORWARDING_HANDLER_SIGNATURE ((DWORD)'FHLR') #define FORWARDING_HANDLER_SIGNATURE_FREE ((DWORD)'fhlr') -STRA FORWARDING_HANDLER::sm_pStra502ErrorMsg; ALLOC_CACHE_HANDLER * FORWARDING_HANDLER::sm_pAlloc = NULL; TRACE_LOG * FORWARDING_HANDLER::sm_pTraceLog = NULL; PROTOCOL_CONFIG FORWARDING_HANDLER::sm_ProtocolConfig; @@ -318,18 +319,8 @@ Failure: } else if (fFailedToStartKestrel && !m_pApplication->QueryConfig()->QueryDisableStartUpErrorPage()) { - HTTP_DATA_CHUNK DataChunk; - pResponse->SetStatus(502, "Bad Gateway", 5, hr, NULL, TRUE); - pResponse->SetHeader("Content-Type", - "text/html", - (USHORT)strlen("text/html"), - FALSE - ); - - DataChunk.DataChunkType = HttpDataChunkFromMemory; - DataChunk.FromMemory.pBuffer = (PVOID)sm_pStra502ErrorMsg.QueryStr(); - DataChunk.FromMemory.BufferLength = sm_pStra502ErrorMsg.QueryCB(); - pResponse->WriteEntityChunkByReference(&DataChunk); + ServerErrorHandler handler(*m_pW3Context, 502, 5, "Bad Gateway", hr, g_hOutOfProcessRHModule, m_pApplication->QueryConfig()->QueryDisableStartUpErrorPage(), OUT_OF_PROCESS_RH_STATIC_HTML); + handler.OnExecuteRequestHandler(); } else { @@ -728,31 +719,6 @@ HRESULT sm_pTraceLog = CreateRefTraceLog(10000, 0); } - sm_pStra502ErrorMsg.Copy( - " \ - \ - \ - \ - IIS 502.5 Error \ -
\ -

HTTP Error 502.5 - Process Failure

\ -
\ -

Common causes of this issue:

\ -
  • The application process failed to start
    • \ -
  • The application process started but then stopped
    • \ -
  • The application process started but failed to listen on the configured port
\ -
\ -
\ -

Troubleshooting steps:

\ -
  • Check the system event log for error messages
    • \ -
  • Enable logging the application process' stdout messages
    • \ -
  • Attach a debugger to the application process and inspect
\ -

For more information visit: \ - https://go.microsoft.com/fwlink/?LinkID=808681

\ -
\ -
\ -
"); - Finished: if (FAILED_LOG(hr)) { @@ -765,8 +731,6 @@ Finished: VOID FORWARDING_HANDLER::StaticTerminate() { - sm_pStra502ErrorMsg.Reset(); - if (sm_pResponseHeaderHash != NULL) { sm_pResponseHeaderHash->Clear(); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h index cb9255e16d..e30d69b6c0 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h @@ -1,6 +1,7 @@ #pragma once extern DWORD g_OptionalWinHttpFlags; +extern HINSTANCE g_hOutOfProcessRHModule; extern HINSTANCE g_hWinHttpModule; extern HINSTANCE g_hAspNetCoreModule; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h new file mode 100644 index 0000000000..4d54425300 --- /dev/null +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by HtmlResponses.rc +// +#define OUT_OF_PROCESS_RH_STATIC_HTML 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/test/IISExpress.FunctionalTests/InProcess/ErrorPagesTests.cs b/test/IISExpress.FunctionalTests/InProcess/ErrorPagesTests.cs new file mode 100644 index 0000000000..7669e7034a --- /dev/null +++ b/test/IISExpress.FunctionalTests/InProcess/ErrorPagesTests.cs @@ -0,0 +1,106 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class ErrorPagesTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public ErrorPagesTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task IncludesAdditionalErrorPageTextInProcessHandlerLoadFailure() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var response = await DeployAppWithStartupFailure(deploymentParameters); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + Assert.Contains("HTTP Error 500.0 - ANCM In-Process Handler Load Failure", await response.Content.ReadAsStringAsync()); + await AssertLink(response); + } + + [ConditionalFact] + public async Task IncludesAdditionalErrorPageTextOutOfProcessStartupFailure() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); + var response = await DeployAppWithStartupFailure(deploymentParameters); + + Assert.Equal(HttpStatusCode.BadGateway, response.StatusCode); + + StopServer(); + + Assert.Contains("HTTP Error 502.5 - ANCM Out-Of-Process Startup Failure", await response.Content.ReadAsStringAsync()); + await AssertLink(response); + } + + [ConditionalFact] + public async Task IncludesAdditionalErrorPageTextOutOfProcessHandlerLoadFailure() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); + deploymentParameters.HandlerSettings["handlerVersion"] = "88.93"; + deploymentParameters.EnvironmentVariables["ANCM_ADDITIONAL_ERROR_PAGE_LINK"] = "http://example"; + + var deploymentResult = await DeployAsync(deploymentParameters); + var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + Assert.Contains("HTTP Error 500.0 - ANCM Out-Of-Process Handler Load Failure", await response.Content.ReadAsStringAsync()); + await AssertLink(response); + } + + [ConditionalFact] + public async Task IncludesAdditionalErrorPageTextInProcessStartupFailure() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} EarlyReturn"); + deploymentParameters.EnvironmentVariables["ANCM_ADDITIONAL_ERROR_PAGE_LINK"] = "http://example"; + + var deploymentResult = await DeployAsync(deploymentParameters); + var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + Assert.Contains("HTTP Error 500.30 - ANCM In-Process Start Failure", await response.Content.ReadAsStringAsync()); + await AssertLink(response); + } + + private static async Task AssertLink(HttpResponseMessage response) + { + Assert.Contains(" http://example and ", await response.Content.ReadAsStringAsync()); + } + + private async Task DeployAppWithStartupFailure(IISDeploymentParameters deploymentParameters) + { + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", "doesnot")); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("arguments", "start")); + + deploymentParameters.EnvironmentVariables["ANCM_ADDITIONAL_ERROR_PAGE_LINK"] = "http://example"; + + var deploymentResult = await DeployAsync(deploymentParameters); + + return await deploymentResult.HttpClient.GetAsync("HelloWorld"); + } + } +} diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs index 662aba0727..037ab8eb2e 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs @@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EventLogHelpers.VerifyEventLogEvent(deploymentResult, $@"Application '{Regex.Escape(deploymentResult.ContentRoot)}\\' wasn't able to start. {subError}"); - Assert.Contains("HTTP Error 500.0 - ANCM InProcess Startup Failure", await response.Content.ReadAsStringAsync()); + Assert.Contains("HTTP Error 500.0 - ANCM In-Process Handler Load Failure", await response.Content.ReadAsStringAsync()); } [ConditionalFact] @@ -456,7 +456,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); - Assert.Contains("HTTP Error 500.0 - ANCM InProcess Startup Failure", await response.Content.ReadAsStringAsync()); + Assert.Contains("HTTP Error 500.0 - ANCM In-Process Handler Load Failure", await response.Content.ReadAsStringAsync()); StopServer(); } } diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index 855096e026..c92349ae3a 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var response = await deploymentResult.HttpClient.GetAsync(_helloWorldRequest); Assert.False(response.IsSuccessStatusCode); var responseString = await response.Content.ReadAsStringAsync(); - Assert.Contains("HTTP Error 500.0 - ANCM OutOfProcess Startup Failure", responseString); + Assert.Contains("HTTP Error 500.0 - ANCM Out-Of-Process Handler Load Failure", responseString); } [ConditionalTheory] From 80a01a751b0ae96be39cfb4f7fdbc02b404e948d Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 9 Oct 2018 16:20:05 -0700 Subject: [PATCH 318/363] Avoid double builds of dependencies in /t:PackageStressTestApp (#1483) * Upgrade dependencies * Avoid double builds of dependencies in /t:PackageStressTestApp --- build/dependencies.props | 58 ++++++++++++++++++++-------------------- build/repo.targets | 2 +- korebuild-lock.txt | 4 +-- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 3b4688b39b..5e973514aa 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,44 +4,44 @@ 0.10.13 - 2.2.0-preview1-20180918.1 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 0.6.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview2-20181004.6 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 0.6.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 15.6.82 15.6.82 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 + 2.2.0-preview3-35438 2.1.3 - 2.2.0-preview2-26905-02 + 2.2.0-preview3-27001-02 1.0.1 - 2.2.0-preview3-35301 + 2.2.0-preview3-35438 15.6.1 11.1.0 2.0.3 4.5.0 4.5.0 - 4.5.0 + 4.5.2 4.5.1 4.5.1 4.5.0 diff --git a/build/repo.targets b/build/repo.targets index 62c02eabbf..7c93b5b9a8 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -126,7 +126,7 @@ + Properties="TargetFramework=netcoreapp2.2;Configuration=$(Configuration);RuntimeIdentifier=win7-%(Platforms.Identity);PublishDir=$(StressAppPublishPath)\%(Identity);BuildProjectReferences=false" /> diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 8491de70e6..3e92dd5543 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180918.1 -commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800 +version:2.2.0-preview2-20181004.6 +commithash:c04c4b2f5018632647f96210ab01876661302dac From ac7a6b56d47fa39030d772fc8a5153e685d1e1dc Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 10 Oct 2018 10:00:13 -0700 Subject: [PATCH 319/363] Reenable client disconnect tests (#1485) --- test/IIS.Tests/ClientDisconnectTests.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/IIS.Tests/ClientDisconnectTests.cs b/test/IIS.Tests/ClientDisconnectTests.cs index 9c8855be47..2731c5665e 100644 --- a/test/IIS.Tests/ClientDisconnectTests.cs +++ b/test/IIS.Tests/ClientDisconnectTests.cs @@ -127,7 +127,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal("The client has disconnected", exception.Message); } - [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/1075")] + [ConditionalFact] public async Task WriterThrowsCancelledException() { var requestStartedCompletionSource = CreateTaskCompletionSource(); @@ -136,7 +136,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Exception exception = null; var cancellationTokenSource = new CancellationTokenSource(); - var data = new byte[1024]; + var data = new byte[1]; using (var testServer = await TestServer.Create(async ctx => { requestStartedCompletionSource.SetResult(true); @@ -167,7 +167,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.IsType(exception); } } - [ConditionalFact(Skip = "See: https://github.com/aspnet/IISIntegration/issues/1075")] + + [ConditionalFact] public async Task ReaderThrowsCancelledException() { var requestStartedCompletionSource = CreateTaskCompletionSource(); From ab124fc344608ddd588738116d68a367c4b64a13 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 10 Oct 2018 12:41:11 -0700 Subject: [PATCH 320/363] Fix applicationInitialization tests and disconnect handler (#1484) --- .../AspNetCore/proxymodule.cpp | 13 +++-- .../Core/IISHttpContext.cs | 18 ++++++- .../NativeMethods.cs | 6 ++- test/IIS.FunctionalTests/ServicesTests.cs | 48 +++++++++++++------ test/WebSites/InProcessWebSite/Program.cs | 5 +- test/WebSites/OutOfProcessWebSite/Program.cs | 27 ++++++++--- .../shared/SharedStartup/Startup.shared.cs | 13 ++--- 7 files changed, 94 insertions(+), 36 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index b1fa5568a8..7467c81b21 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -159,9 +159,16 @@ REQUEST_NOTIFICATION_STATUS ASPNET_CORE_PROXY_MODULE::HandleNotificationStatus(R void ASPNET_CORE_PROXY_MODULE::SetupDisconnectHandler(IHttpContext * pHttpContext) { - auto moduleContainer = pHttpContext - ->GetConnection() - ->GetModuleContextContainer(); + auto connection = pHttpContext + ->GetConnection(); + + // connection might be null in when applicationInitialization is running + if (connection == nullptr) + { + return; + } + + auto moduleContainer = connection->GetModuleContextContainer(); #pragma warning( push ) #pragma warning ( disable : 26466 ) // Disable "Don't use static_cast downcasts". We build without RTTI support so dynamic_cast is not available diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs index 45848183ba..b824c67c6c 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs @@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core KnownMethod = VerbId; StatusCode = 200; - var originalPath = RequestUriBuilder.DecodeAndUnescapePath(GetRawUrlInBytes()); + var originalPath = GetOriginalPath(); if (KnownMethod == HttpApiTypes.HTTP_VERB.HttpVerbOPTIONS && string.Equals(RawTarget, "*", StringComparison.Ordinal)) { @@ -172,6 +172,22 @@ namespace Microsoft.AspNetCore.Server.IIS.Core _bodyOutput = new OutputProducer(pipe); } + private string GetOriginalPath() + { + // applicationInitialization request might have trailing \0 character included in the length + // check and skip it + var rawUrlInBytes = GetRawUrlInBytes(); + if (rawUrlInBytes.Length > 0 && rawUrlInBytes[rawUrlInBytes.Length - 1] == 0) + { + var newRawUrlInBytes = new byte[rawUrlInBytes.Length - 1]; + Array.Copy(rawUrlInBytes, newRawUrlInBytes, newRawUrlInBytes.Length); + rawUrlInBytes = newRawUrlInBytes; + } + + var originalPath = RequestUriBuilder.DecodeAndUnescapePath(rawUrlInBytes); + return originalPath; + } + public int StatusCode { get { return _statusCode; } diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs index 51f4ad448f..4d24b3dd77 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs @@ -13,6 +13,7 @@ namespace Microsoft.AspNetCore.Server.IIS internal const int HR_OK = 0; internal const int ERROR_NOT_FOUND = unchecked((int)0x80070490); internal const int ERROR_OPERATION_ABORTED = unchecked((int)0x800703E3); + internal const int ERROR_INVALID_PARAMETER = unchecked((int)0x80070057); internal const int COR_E_IO = unchecked((int)0x80131620); private const string KERNEL32 = "kernel32.dll"; @@ -262,9 +263,10 @@ namespace Microsoft.AspNetCore.Server.IIS public static bool HttpTryCancelIO(IntPtr pInProcessHandler) { var hr = http_cancel_io(pInProcessHandler); - // Async operation finished + // ERROR_NOT_FOUND is expected if async operation finished // https://msdn.microsoft.com/en-us/library/windows/desktop/aa363792(v=vs.85).aspx - if (hr == ERROR_NOT_FOUND) + // ERROR_INVALID_PARAMETER is expected for "fake" requests like applicationInitialization ones + if (hr == ERROR_NOT_FOUND || hr == ERROR_INVALID_PARAMETER) { return false; } diff --git a/test/IIS.FunctionalTests/ServicesTests.cs b/test/IIS.FunctionalTests/ServicesTests.cs index 0fe723eae9..b91fc8aa20 100644 --- a/test/IIS.FunctionalTests/ServicesTests.cs +++ b/test/IIS.FunctionalTests/ServicesTests.cs @@ -1,7 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; +using System.IO; using System.ServiceProcess; +using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; @@ -27,24 +30,44 @@ namespace IIS.FunctionalTests [RequiresIIS(IISCapability.ApplicationInitialization)] [InlineData(HostingModel.InProcess)] [InlineData(HostingModel.OutOfProcess)] - public async Task ApplicationInitializationInitializedInProc(HostingModel hostingModel) + public async Task ApplicationPreloadStartsApp(HostingModel hostingModel) { - var baseDeploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel); - EnableAppInitialization(baseDeploymentParameters); + var baseDeploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); + baseDeploymentParameters.TransformArguments((args, contentRoot)=> $"{args} CreateFile \"{Path.Combine(contentRoot, "Started.txt")}\""); + EnablePreload(baseDeploymentParameters); var result = await DeployAsync(baseDeploymentParameters); - // Allow IIS a bit of time to complete starting before we start checking - await Task.Delay(100); - // There is always a race between which Init request arrives first - // retry couple times to see if we ever get the one comming from ApplicationInitialization module - await result.HttpClient.RetryRequestAsync("/ApplicationInitialization", async message => await message.Content.ReadAsStringAsync() == "True"); - + await Helpers.Retry(async () => await File.ReadAllTextAsync(Path.Combine(result.ContentRoot, "Started.txt")), 10, 200); StopServer(); EventLogHelpers.VerifyEventLogEvent(result, EventLogHelpers.Started(result)); } - private static void EnableAppInitialization(IISDeploymentParameters baseDeploymentParameters) + [ConditionalTheory] + [RequiresIIS(IISCapability.ApplicationInitialization)] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task ApplicationInitializationPageIsRequested(HostingModel hostingModel) + { + var baseDeploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); + EnablePreload(baseDeploymentParameters); + + baseDeploymentParameters.ServerConfigActionList.Add( + (config, _) => { + config + .RequiredElement("system.webServer") + .GetOrAdd("applicationInitialization") + .GetOrAdd("add", "initializationPage", "/CreateFile"); + }); + + var result = await DeployAsync(baseDeploymentParameters); + + await Helpers.Retry(async () => await File.ReadAllTextAsync(Path.Combine(result.ContentRoot, "Started.txt")), 10, 200); + StopServer(); + EventLogHelpers.VerifyEventLogEvent(result, EventLogHelpers.Started(result)); + } + + private static void EnablePreload(IISDeploymentParameters baseDeploymentParameters) { baseDeploymentParameters.ServerConfigActionList.Add( (config, _) => { @@ -60,11 +83,6 @@ namespace IIS.FunctionalTests .RequiredElement("site") .RequiredElement("application") .SetAttributeValue("preloadEnabled", true); - - config - .RequiredElement("system.webServer") - .GetOrAdd("applicationInitialization") - .GetOrAdd("add", "initializationPage", "/ApplicationInitialization?IISInit=true"); }); baseDeploymentParameters.EnableModule("ApplicationInitializationModule", "%IIS_BIN%\\warmup.dll"); diff --git a/test/WebSites/InProcessWebSite/Program.cs b/test/WebSites/InProcessWebSite/Program.cs index 43e9a563b2..c40448ee91 100644 --- a/test/WebSites/InProcessWebSite/Program.cs +++ b/test/WebSites/InProcessWebSite/Program.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO; using System.Linq; using System.Text; using System.Threading; @@ -21,7 +22,9 @@ namespace TestSite var mode = args.FirstOrDefault(); switch (mode) { - // Semicolons are appended to env variables; removing them. + case "CreateFile": + File.WriteAllText(args[1], ""); + return StartServer(); case "CheckLargeStdOutWrites": Console.WriteLine(new string('a', 30000)); break; diff --git a/test/WebSites/OutOfProcessWebSite/Program.cs b/test/WebSites/OutOfProcessWebSite/Program.cs index e5ce65cba1..90895237d2 100644 --- a/test/WebSites/OutOfProcessWebSite/Program.cs +++ b/test/WebSites/OutOfProcessWebSite/Program.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; +using System.Linq; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Logging; @@ -9,14 +10,27 @@ namespace TestSite { public static class Program { - public static void Main(string[] args) + public static int Main(string[] args) + { + var mode = args.FirstOrDefault(); + switch (mode) + { + case "CreateFile": + File.WriteAllText(args[1], ""); + return StartServer(); + } + + return StartServer(); + } + + private static int StartServer() { var host = new WebHostBuilder() - .ConfigureLogging((_, factory) => - { - factory.AddConsole(); - factory.AddFilter("Console", level => level >= LogLevel.Information); - }) + .ConfigureLogging( + (_, factory) => { + factory.AddConsole(); + factory.AddFilter("Console", level => level >= LogLevel.Information); + }) .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() .UseStartup() @@ -24,6 +38,7 @@ namespace TestSite .Build(); host.Run(); + return 0; } } } diff --git a/test/WebSites/shared/SharedStartup/Startup.shared.cs b/test/WebSites/shared/SharedStartup/Startup.shared.cs index 375902faea..d119932255 100644 --- a/test/WebSites/shared/SharedStartup/Startup.shared.cs +++ b/test/WebSites/shared/SharedStartup/Startup.shared.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -72,15 +73,11 @@ namespace TestSite await context.Response.WriteAsync(_waitingRequestCount.ToString()); } - private static bool _applicationInitializationCalled; - - public async Task ApplicationInitialization(HttpContext context) + public Task CreateFile(HttpContext context) { - if (context.Request.Query["IISInit"] == "true") - { - _applicationInitializationCalled = true; - } - await context.Response.WriteAsync(_applicationInitializationCalled.ToString()); + var hostingEnv = context.RequestServices.GetService(); + File.WriteAllText(System.IO.Path.Combine(hostingEnv.ContentRootPath, "Started.txt"), ""); + return Task.CompletedTask; } public Task OverrideServer(HttpContext context) From bfa583a9aa2acae53c6f7b3d903f689710a6e0c3 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 10 Oct 2018 14:34:55 -0700 Subject: [PATCH 321/363] Guard OnAsyncCompletion from completing request before OnExecuteRequestHandler exits (#1489) --- src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp | 8 ++++++++ src/AspNetCoreModuleV2/AspNetCore/proxymodule.h | 1 + 2 files changed, 9 insertions(+) diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index 7467c81b21..38eaf08c31 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -7,6 +7,7 @@ #include "applicationinfo.h" #include "exceptions.h" #include "DisconnectHandler.h" +#include "SRWExclusiveLock.h" extern BOOL g_fInShutdown; @@ -67,6 +68,7 @@ ASPNET_CORE_PROXY_MODULE::ASPNET_CORE_PROXY_MODULE(HTTP_MODULE_ID moduleId, std: m_moduleId(moduleId), m_pDisconnectHandler(nullptr) { + InitializeSRWLock(&m_requestLock); } ASPNET_CORE_PROXY_MODULE::~ASPNET_CORE_PROXY_MODULE() @@ -84,6 +86,9 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( HRESULT hr = S_OK; REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; + // We don't want OnAsyncCompletion to complete request before OnExecuteRequestHandler exits + auto lock = SRWExclusiveLock(m_requestLock); + try { if (g_fInShutdown) @@ -134,6 +139,9 @@ ASPNET_CORE_PROXY_MODULE::OnAsyncCompletion( IHttpCompletionInfo * pCompletionInfo ) { + // We don't want OnAsyncCompletion to complete request before OnExecuteRequestHandler exits + auto lock = SRWExclusiveLock(m_requestLock); + try { return HandleNotificationStatus(m_pHandler->OnAsyncCompletion( diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h index c5b290a36e..8f5b680e36 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h @@ -60,6 +60,7 @@ class ASPNET_CORE_PROXY_MODULE : NonCopyable, public CHttpModule std::unique_ptr m_pHandler; HTTP_MODULE_ID m_moduleId; DisconnectHandler * m_pDisconnectHandler; + SRWLOCK m_requestLock {}; }; class ASPNET_CORE_PROXY_MODULE_FACTORY : NonCopyable, public IHttpModuleFactory From aa4684f0f5fd97460d8c4a963fa377519ea08e1c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 10 Oct 2018 22:33:38 -0700 Subject: [PATCH 322/363] Fix flaky ClientDisconnect freb tests. (#1488) --- .../Inprocess/FrebTests.cs | 99 ++++++++++++++----- 1 file changed, 73 insertions(+), 26 deletions(-) diff --git a/test/Common.FunctionalTests/Inprocess/FrebTests.cs b/test/Common.FunctionalTests/Inprocess/FrebTests.cs index cf9d423ea1..2143659e33 100644 --- a/test/Common.FunctionalTests/Inprocess/FrebTests.cs +++ b/test/Common.FunctionalTests/Inprocess/FrebTests.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -24,15 +25,15 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _fixture = fixture; } - public static ISet FrebChecks() + public static IList FrebChecks() { - var set = new HashSet(); - set.Add(new string[] { "ANCM_INPROC_EXECUTE_REQUEST_START" }); - set.Add(new string[] { "ANCM_INPROC_EXECUTE_REQUEST_COMPLETION", "1" }); - set.Add(new string[] { "ANCM_INPROC_ASYNC_COMPLETION_START" }); - set.Add(new string[] { "ANCM_INPROC_ASYNC_COMPLETION_COMPLETION", "0" }); - set.Add(new string[] { "ANCM_INPROC_MANAGED_REQUEST_COMPLETION" }); - return set; + var list = new List(); + list.Add(new FrebLogItem("ANCM_INPROC_EXECUTE_REQUEST_START")); + list.Add(new FrebLogItem("ANCM_INPROC_EXECUTE_REQUEST_COMPLETION", "1")); + list.Add(new FrebLogItem("ANCM_INPROC_ASYNC_COMPLETION_START")); + list.Add(new FrebLogItem("ANCM_INPROC_ASYNC_COMPLETION_COMPLETION", "0")); + list.Add(new FrebLogItem("ANCM_INPROC_MANAGED_REQUEST_COMPLETION")); + return list; } [ConditionalFact] @@ -45,10 +46,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); - foreach (var data in FrebChecks()) - { - AssertFrebLogs(result, data); - } + AssertFrebLogs(result, FrebChecks()); } [ConditionalFact] @@ -61,7 +59,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); - AssertFrebLogs(result, "ANCM_INPROC_ASYNC_COMPLETION_COMPLETION", "2"); + AssertFrebLogs(result, new FrebLogItem("ANCM_INPROC_ASYNC_COMPLETION_COMPLETION", "2")); } [ConditionalFact] @@ -83,7 +81,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests StopServer(); - AssertFrebLogs(result, "ANCM_INPROC_REQUEST_DISCONNECT"); + // The order of freb logs is based on when the requests are complete. + // This is non-deterministic here, so we need to check both freb files for a request that was disconnected. + AssertFrebLogs(result, new FrebLogItem("ANCM_INPROC_REQUEST_DISCONNECT"), new FrebLogItem("ANCM_INPROC_MANAGED_REQUEST_COMPLETION")); } private async Task SetupFrebApp() @@ -96,22 +96,69 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return result; } - private void AssertFrebLogs(IISDeploymentResult result, params string[] data) + private void AssertFrebLogs(IISDeploymentResult result, params FrebLogItem[] expectedFrebEvents) + { + AssertFrebLogs(result, (IEnumerable)expectedFrebEvents); + } + + private void AssertFrebLogs(IISDeploymentResult result, IEnumerable expectedFrebEvents) + { + var frebEvent = GetFrebLogItems(result); + foreach (var expectedEvent in expectedFrebEvents) + { + Assert.Contains(expectedEvent, frebEvent); + } + } + + private IEnumerable GetFrebLogItems(IISDeploymentResult result) { var folderPath = Helpers.GetFrebFolder(_logFolderPath, result); - var fileString = Directory.GetFiles(folderPath).Where(f => f.EndsWith("xml")).OrderBy(x => x).Last(); + var xmlFiles = Directory.GetFiles(folderPath).Where(f => f.EndsWith("xml")); + var frebEvents = new List(); - var xDocument = XDocument.Load(fileString).Root; - var nameSpace = (XNamespace)"http://schemas.microsoft.com/win/2004/08/events/event"; - var elements = xDocument.Descendants(nameSpace + "Event"); - var element = elements.Where(el => el.Descendants(nameSpace + "RenderingInfo").Single().Descendants(nameSpace + "Opcode").Single().Value == data[0]); - - Assert.Single(element); - - if (data.Length > 1) + foreach (var xmlFile in xmlFiles) { - var requestStatus = element.Single().Element(nameSpace + "EventData").Descendants().Where(el => el.Attribute("Name").Value == "requestStatus").Single(); - Assert.Equal(data[1], requestStatus.Value); + var xDocument = XDocument.Load(xmlFile).Root; + var nameSpace = (XNamespace)"http://schemas.microsoft.com/win/2004/08/events/event"; + var eventElements = xDocument.Descendants(nameSpace + "Event"); + foreach (var eventElement in eventElements) + { + var eventElementWithOpCode = eventElement.Descendants(nameSpace + "RenderingInfo").Single().Descendants(nameSpace + "Opcode").Single(); + var requestStatus = eventElement.Element(nameSpace + "EventData").Descendants().Where(el => el.Attribute("Name").Value == "requestStatus").SingleOrDefault(); + frebEvents.Add(new FrebLogItem(eventElementWithOpCode.Value, requestStatus?.Value)); + } + } + + return frebEvents; + } + + public class FrebLogItem + { + private string _opCode; + private string _requestStatus; + + public FrebLogItem(string opCode) + { + _opCode = opCode; + } + + public FrebLogItem(string opCode, string requestStatus) + { + _opCode = opCode; + _requestStatus = requestStatus; + } + + public override bool Equals(object obj) + { + var item = obj as FrebLogItem; + return item != null && + _opCode == item._opCode && + _requestStatus == item._requestStatus; + } + + public override int GetHashCode() + { + return HashCode.Combine(_opCode, _requestStatus); } } } From 0e04527fb4f5005965332907cd6b265327f0e21e Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 11 Oct 2018 08:44:03 -0700 Subject: [PATCH 323/363] General cleanup for client disconnect handling. (#1446) --- .../AspNetCore/DisconnectHandler.cpp | 33 ++++++++++---- .../AspNetCore/DisconnectHandler.h | 12 ++++-- .../AspNetCore/proxymodule.cpp | 5 +-- .../inprocesshandler.cpp | 33 +++++++++++--- .../inprocesshandler.h | 2 + .../Core/IISHttpContext.IO.cs | 19 +++++--- .../Core/IISHttpContext.cs | 4 +- .../Core/IISHttpServer.cs | 1 - .../Inprocess/ClientDisconnectTests.cs | 43 +++++++++++++++++++ 9 files changed, 123 insertions(+), 29 deletions(-) diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp index 3e8e7754aa..ad2ff17b47 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp @@ -10,15 +10,16 @@ void DisconnectHandler::NotifyDisconnect() { try { - std::unique_ptr module; + std::unique_ptr pHandler; { SRWExclusiveLock lock(m_handlerLock); - m_pHandler.swap(module); + m_pHandler.swap(pHandler); + m_disconnectFired = true; } - if (module != nullptr) + if (pHandler != nullptr) { - module->NotifyDisconnect(); + pHandler->NotifyDisconnect(); } } catch (...) @@ -29,12 +30,28 @@ void DisconnectHandler::NotifyDisconnect() void DisconnectHandler::CleanupStoredContext() noexcept { - SetHandler(nullptr); delete this; } -void DisconnectHandler::SetHandler(std::unique_ptr handler) noexcept +void DisconnectHandler::SetHandler(std::unique_ptr handler) { - SRWExclusiveLock lock(m_handlerLock); - handler.swap(m_pHandler); + IREQUEST_HANDLER* pHandler = nullptr; + { + SRWExclusiveLock lock(m_handlerLock); + + handler.swap(m_pHandler); + pHandler = m_pHandler.get(); + } + + assert(pHandler != nullptr); + + if (pHandler != nullptr && (m_disconnectFired || m_pHttpConnection != nullptr && !m_pHttpConnection->IsConnected())) + { + pHandler->NotifyDisconnect(); + } +} + +void DisconnectHandler::RemoveHandler() noexcept +{ + m_pHandler = nullptr; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h index 63b7525356..36d404edd6 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h +++ b/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h @@ -11,8 +11,8 @@ class ASPNET_CORE_PROXY_MODULE; class DisconnectHandler final: public IHttpConnectionStoredContext { public: - DisconnectHandler() - : m_pHandler(nullptr) + DisconnectHandler(IHttpConnection* pHttpConnection) + : m_pHandler(nullptr), m_pHttpConnection(pHttpConnection), m_disconnectFired(false) { InitializeSRWLock(&m_handlerLock); } @@ -20,7 +20,7 @@ public: virtual ~DisconnectHandler() { - SetHandler(nullptr); + RemoveHandler(); } void @@ -30,10 +30,14 @@ public: CleanupStoredContext() noexcept override; void - SetHandler(std::unique_ptr handler) noexcept; + SetHandler(std::unique_ptr handler); + + void RemoveHandler() noexcept; private: SRWLOCK m_handlerLock {}; std::unique_ptr m_pHandler; + IHttpConnection* m_pHttpConnection; + bool m_disconnectFired; }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index 38eaf08c31..e6b234d667 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -96,7 +96,6 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS)); } - FINISHED_IF_FAILED(m_pApplicationManager->GetOrCreateApplicationInfo( *pHttpContext, m_pApplicationInfo)); @@ -185,7 +184,7 @@ void ASPNET_CORE_PROXY_MODULE::SetupDisconnectHandler(IHttpContext * pHttpContex if (pDisconnectHandler == nullptr) { - auto newHandler = std::make_unique(); + auto newHandler = std::make_unique(pHttpContext->GetConnection()); pDisconnectHandler = newHandler.get(); // ModuleContextContainer takes ownership of disconnectHandler // we are trusting that it would not release it before deleting the context @@ -207,6 +206,6 @@ void ASPNET_CORE_PROXY_MODULE::RemoveDisconnectHandler() noexcept if (handler != nullptr) { - handler->SetHandler(nullptr); + handler->RemoveHandler(); } } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 75d555e053..16938d0009 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -26,8 +26,10 @@ IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( m_pRequestHandlerContext(pRequestHandlerContext), m_pAsyncCompletionHandler(pAsyncCompletion), m_pDisconnectHandler(pDisconnectHandler), - m_moduleTracer(pW3Context->GetTraceContext()) + m_moduleTracer(pW3Context->GetTraceContext()), + m_disconnectFired(false) { + InitializeSRWLock(&m_srwDisconnectLock); } __override @@ -92,16 +94,29 @@ REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::ServerShutdownMessage() VOID IN_PROCESS_HANDLER::NotifyDisconnect() { + m_moduleTracer.RequestDisconnect(); + if (m_pApplication->QueryBlockCallbacksIntoManaged() || m_fManagedRequestComplete) { return; } - m_moduleTracer.RequestDisconnect(); + // NotifyDisconnect can be called before the m_pManagedHttpContext is set, + // so save that in a bool. + // Don't lock when calling m_pDisconnect to avoid the potential deadlock between this + // and SetManagedHttpContext + void* pManagedHttpContext = nullptr; + { + SRWExclusiveLock lock(m_srwDisconnectLock); + pManagedHttpContext = m_pManagedHttpContext; + m_disconnectFired = true; + } - assert(m_pManagedHttpContext != nullptr); - m_pDisconnectHandler(m_pManagedHttpContext); + if (pManagedHttpContext != nullptr) + { + m_pDisconnectHandler(m_pManagedHttpContext); + } } VOID @@ -127,7 +142,15 @@ IN_PROCESS_HANDLER::SetManagedHttpContext( PVOID pManagedHttpContext ) { - m_pManagedHttpContext = pManagedHttpContext; + { + SRWExclusiveLock lock(m_srwDisconnectLock); + m_pManagedHttpContext = pManagedHttpContext; + } + + if (m_disconnectFired && m_pManagedHttpContext != nullptr) + { + m_pDisconnectHandler(m_pManagedHttpContext); + } } // static diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h index 177c25e329..743c2323a1 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h @@ -85,4 +85,6 @@ private: PFN_DISCONNECT_HANDLER m_pDisconnectHandler; static ALLOC_CACHE_HANDLER * sm_pAlloc; ModuleTracer m_moduleTracer; + bool m_disconnectFired; + SRWLOCK m_srwDisconnectLock; }; diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs index 09c205d8de..724d2e55e1 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs @@ -190,13 +190,20 @@ namespace Microsoft.AspNetCore.Server.IIS.Core _bodyOutput.Dispose(); - try + var cts = _abortedCts; + if (cts != null) { - _abortedCts?.Cancel(); - } - catch (Exception) - { - // ignore + ThreadPool.QueueUserWorkItem(t => + { + try + { + cts.Cancel(); + } + catch (Exception) + { + // ignore + } + }); } } diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs index b824c67c6c..01aeeebec6 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs @@ -109,8 +109,6 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { _thisHandle = GCHandle.Alloc(this); - NativeMethods.HttpSetManagedContext(_pInProcessHandler, (IntPtr)_thisHandle); - Method = GetVerb(); RawTarget = GetRawUrl(); @@ -170,6 +168,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core resumeWriterThreshold: ResumeWriterTheshold, minimumSegmentSize: MinAllocBufferSize)); _bodyOutput = new OutputProducer(pipe); + + NativeMethods.HttpSetManagedContext(_pInProcessHandler, (IntPtr)_thisHandle); } private string GetOriginalPath() diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs index 7e540ddd83..7cde852570 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs @@ -213,7 +213,6 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { context?.Server._logger.LogError(0, ex, $"Unexpected exception in {nameof(IISHttpServer)}.{nameof(OnDisconnect)}."); } - } private static NativeMethods.REQUEST_NOTIFICATION_STATUS OnAsyncCompletion(IntPtr pvManagedHttpContext, int hr, int bytes) diff --git a/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs b/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs index 761c389d48..6e2d1bc752 100644 --- a/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs +++ b/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs @@ -1,8 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; +using System.Collections.Generic; +using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests @@ -61,5 +65,44 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await _fixture.Client.RetryRequestAsync("/WaitingRequestCount", async message => await message.Content.ReadAsStringAsync() == "0"); } + + [ConditionalFact] + public async Task ClientDisconnectCallbackStress() + { + // Fixture initialization fails if inside of the Task.Run, so send an + // initial request to initialize the fixture. + var response = await _fixture.Client.GetAsync("HelloWorld"); + var numTotalRequests = 0; + for (var j = 0; j < 20; j++) + { + // Windows has a max connection limit of 10 for the IIS server, + // so setting limit fairly low. + const int numRequests = 5; + async Task RunRequests() + { + using (var connection = _fixture.CreateTestConnection()) + { + await connection.Send( + "GET /WaitForAbort HTTP/1.1", + "Host: localhost", + "Connection: close", + "", + ""); + await _fixture.Client.RetryRequestAsync("/WaitingRequestCount", async message => await message.Content.ReadAsStringAsync() != "0"); + Interlocked.Increment(ref numTotalRequests); + } + } + + List tasks = new List(); + for (int i = 0; i < numRequests; i++) + { + tasks.Add(Task.Run(RunRequests)); + } + + await Task.WhenAll(tasks); + + await _fixture.Client.RetryRequestAsync("/WaitingRequestCount", async message => await message.Content.ReadAsStringAsync() == "0"); + } + } } } From 1132cad70b1defd3bddfbd74034ce9f36b87d95f Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 11 Oct 2018 10:54:00 -0700 Subject: [PATCH 324/363] public const string AuthenticationScheme (#1496) --- .../{IISDefaults.cs => IISServerDefaults.cs} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename src/Microsoft.AspNetCore.Server.IIS/{IISDefaults.cs => IISServerDefaults.cs} (60%) diff --git a/src/Microsoft.AspNetCore.Server.IIS/IISDefaults.cs b/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs similarity index 60% rename from src/Microsoft.AspNetCore.Server.IIS/IISDefaults.cs rename to src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs index 5be4a086f8..5ac1296597 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/IISDefaults.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs @@ -5,8 +5,6 @@ namespace Microsoft.AspNetCore.Server.IIS { public class IISServerDefaults { - public static readonly string AuthenticationScheme = "Windows"; - public const string Negotiate = "Negotiate"; - public const string Ntlm = "NTLM"; + public const string AuthenticationScheme = "Windows"; } } From 3108b1492bf4e387e5b1aa712ca2d4deb69cce80 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 11 Oct 2018 12:13:10 -0700 Subject: [PATCH 325/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 013a4d6a19..3806a70b83 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,39 +4,39 @@ 0.10.13 - 3.0.0-alpha1-20180919.1 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 0.7.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 + 3.0.0-alpha1-20181011.3 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 0.7.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 15.6.82 15.6.82 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 - 3.0.0-alpha1-10549 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 2.0.9 2.1.3 2.2.0-preview2-26905-02 1.0.1 - 3.0.0-alpha1-10549 + 3.0.0-alpha1-10605 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 9a87e4ccb7..b886680b23 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20180919.1 -commithash:3066ae0a230870ea07e3f132605b5e5493f8bbd4 +version:3.0.0-alpha1-20181011.3 +commithash:e7569d931e994629267ab2646e9926140962b4ac From 223ac3a17d02ef68ec47c471afc74c690c921ea6 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 11 Oct 2018 19:19:45 +0000 Subject: [PATCH 326/363] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 56 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 5e973514aa..3ca3dc430a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,38 +4,38 @@ 0.10.13 - 2.2.0-preview2-20181004.6 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 0.6.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 + 2.2.0-preview2-20181011.2 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 0.6.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 15.6.82 15.6.82 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 - 2.2.0-preview3-35438 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 + 2.2.0-preview3-35457 2.1.3 - 2.2.0-preview3-27001-02 + 2.2.0-preview3-27008-03 1.0.1 - 2.2.0-preview3-35438 + 2.2.0-preview3-35457 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 3e92dd5543..bda301982e 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview2-20181004.6 -commithash:c04c4b2f5018632647f96210ab01876661302dac +version:2.2.0-preview2-20181011.2 +commithash:09cd1592eb0fbbfa6ef5124120c173bc1d4e353a From 9b1fd75b7ef61f795162b2c5ac6d74b4cf08d759 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 11 Oct 2018 13:32:02 -0700 Subject: [PATCH 327/363] Include mof file in ANCMV2 package (#1499) --- nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec | 1 + 1 file changed, 1 insertion(+) diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec b/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec index c4d109d5ba..fb29b1adf5 100644 --- a/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec +++ b/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec @@ -37,6 +37,7 @@ + From 1fb57d9ed98888bb520a0db163bfdfa039652bc0 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 11 Oct 2018 14:03:50 -0700 Subject: [PATCH 328/363] Enable appverifier and dumps on jenkins (#1491) --- .vsts-pipelines/templates/build-steps.yml | 7 - build/buildpipeline/pipeline.groovy | 2 + build/buildpipeline/windows-appverif.groovy | 15 +++ build/buildpipeline/windows.groovy | 2 +- .../Common.FunctionalTests/AppOfflineTests.cs | 62 +++++---- .../Utilities/AppVerifier.cs | 83 ++++++++++++ test/IIS.FunctionalTests/ServicesTests.cs | 49 ++++--- tools/SetupTestEnvironment.ps1 | 120 +++++++++++------- 8 files changed, 239 insertions(+), 101 deletions(-) create mode 100644 build/buildpipeline/windows-appverif.groovy create mode 100644 test/Common.FunctionalTests/Utilities/AppVerifier.cs diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml index 2d6544e107..36219f533b 100644 --- a/.vsts-pipelines/templates/build-steps.yml +++ b/.vsts-pipelines/templates/build-steps.yml @@ -16,13 +16,6 @@ phases: artifactName: logs artifactType: Container pathtoPublish: artifacts/logs - - task: PublishBuildArtifacts@1 - displayName: Upload dumps - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - artifactName: dumps - artifactType: Container - pathtoPublish: artifacts/dumps - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools parameters: diff --git a/build/buildpipeline/pipeline.groovy b/build/buildpipeline/pipeline.groovy index f3be6756b9..e1c8b612e9 100644 --- a/build/buildpipeline/pipeline.groovy +++ b/build/buildpipeline/pipeline.groovy @@ -1,6 +1,7 @@ import org.dotnet.ci.pipelines.Pipeline def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') +def windowsAppverifPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows-appverif.groovy') def configurations = [ 'Debug', @@ -16,4 +17,5 @@ configurations.each { configuration -> windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params) windowsPipeline.triggerPipelineOnGithubPush(params) + windowsAppverifPipeline.triggerPipelineOnEveryGithubPR("Windows AppVerifier ${configuration} x64 Build", params) } diff --git a/build/buildpipeline/windows-appverif.groovy b/build/buildpipeline/windows-appverif.groovy new file mode 100644 index 0000000000..0c1a6affe8 --- /dev/null +++ b/build/buildpipeline/windows-appverif.groovy @@ -0,0 +1,15 @@ +@Library('dotnet-ci') _ + +// 'node' indicates to Jenkins that the enclosed block runs on a node that matches +// the label 'windows-with-vs' +simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { + stage ('Checking out source') { + checkout scm + bat 'git submodule update --init --recursive' + } + stage ('Build') { + def logFolder = getLogFolder() + def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" + bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 Setup;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\";" + } +} diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy index eb1a95bca3..35bb4737ae 100644 --- a/build/buildpipeline/windows.groovy +++ b/build/buildpipeline/windows.groovy @@ -10,6 +10,6 @@ simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { stage ('Build') { def logFolder = getLogFolder() def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" - bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;${environment};&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\"" + bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\";" } } diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/test/Common.FunctionalTests/AppOfflineTests.cs index c314a9dfab..7d8d661ef0 100644 --- a/test/Common.FunctionalTests/AppOfflineTests.cs +++ b/test/Common.FunctionalTests/AppOfflineTests.cs @@ -102,40 +102,46 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests [RequiresIIS(IISCapability.ShutdownToken)] public async Task AppOfflineDroppedWhileSiteStarting_SiteShutsDown_InProcess() { - var deploymentResult = await DeployApp(HostingModel.InProcess); - - for (int i = 0; i < 10; i++) + // This test often hits a race between debug logging and stdout redirection closing the handle + // we are fine having this race + using (AppVerifier.Disable(DeployerSelector.ServerType, 0x300)) { - // send first request and add app_offline while app is starting - var runningTask = AssertAppOffline(deploymentResult); + var deploymentResult = await DeployApp(HostingModel.InProcess); - // This test tries to hit a race where we drop app_offline file while - // in process application is starting, application start takes at least 400ms - // so we back off for 100ms to allow request to reach request handler - // Test itself is racy and can result in two scenarios - // 1. ANCM detects app_offline before it starts the request - if AssertAppOffline succeeds we've hit it - // 2. Intended scenario where app starts and then shuts down - // In first case we remove app_offline and try again - await Task.Delay(RetryDelay); - - AddAppOffline(deploymentResult.ContentRoot); - - try + for (int i = 0; i < 10; i++) { - await runningTask.DefaultTimeout(); + // send first request and add app_offline while app is starting + var runningTask = AssertAppOffline(deploymentResult); - // if AssertAppOffline succeeded ANCM have picked up app_offline before starting the app - // try again - RemoveAppOffline(deploymentResult.ContentRoot); - } - catch - { - deploymentResult.AssertWorkerProcessStop(); - return; + // This test tries to hit a race where we drop app_offline file while + // in process application is starting, application start takes at least 400ms + // so we back off for 100ms to allow request to reach request handler + // Test itself is racy and can result in two scenarios + // 1. ANCM detects app_offline before it starts the request - if AssertAppOffline succeeds we've hit it + // 2. Intended scenario where app starts and then shuts down + // In first case we remove app_offline and try again + await Task.Delay(RetryDelay); + + AddAppOffline(deploymentResult.ContentRoot); + + try + { + await runningTask.DefaultTimeout(); + + // if AssertAppOffline succeeded ANCM have picked up app_offline before starting the app + // try again + RemoveAppOffline(deploymentResult.ContentRoot); + } + catch + { + deploymentResult.AssertWorkerProcessStop(); + return; + } } + + Assert.True(false); + } - - Assert.True(false); } [ConditionalFact] diff --git a/test/Common.FunctionalTests/Utilities/AppVerifier.cs b/test/Common.FunctionalTests/Utilities/AppVerifier.cs new file mode 100644 index 0000000000..ab059d789d --- /dev/null +++ b/test/Common.FunctionalTests/Utilities/AppVerifier.cs @@ -0,0 +1,83 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Diagnostics; +using System.Linq; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + public class AppVerifier + { + private static readonly TimeSpan AppVerifierCommandTimeout = TimeSpan.FromSeconds(5); + + public static IDisposable Disable(ServerType serverType, int code) + { + // Set in SetupTestEnvironment.ps1 + var enabledCodes = (Environment.GetEnvironmentVariable("APPVERIFIER_ENABLED_CODES") ?? "").Split(' '); + string processName; + switch (serverType) + { + case ServerType.IISExpress: + processName = "iisexpress.exe"; + break; + case ServerType.IIS: + processName = "w3wp.exe"; + break; + default: + throw new ArgumentOutOfRangeException(nameof(serverType), serverType, null); + } + + if (!enabledCodes.Contains(code.ToString())) + { + return null; + } + + RunProcessAndWaitForExit("appverif.exe", $"-configure {code} -for {processName} -with ErrorReport=0", AppVerifierCommandTimeout); + return new AppVerifierToken(processName, code.ToString()); + } + + private static void RunProcessAndWaitForExit(string fileName, string arguments, TimeSpan timeout) + { + var startInfo = new ProcessStartInfo + { + FileName = fileName, + Arguments = arguments, + RedirectStandardOutput = true, + RedirectStandardError = true, + UseShellExecute = false, + }; + + var process = Process.Start(startInfo); + + if (!process.WaitForExit((int)timeout.TotalMilliseconds)) + { + process.Kill(); + } + + if (process.ExitCode != 0) + { + throw new InvalidOperationException($"Exit code {process.ExitCode} when running {fileName} {arguments}. Stdout: {process.StandardOutput.ReadToEnd()}"); + } + } + + public class AppVerifierToken : IDisposable + { + private readonly string _processName; + + private readonly string _codes; + + public AppVerifierToken(string processName, string codes) + { + _processName = processName; + _codes = codes; + } + + public void Dispose() + { + // + RunProcessAndWaitForExit("appverif.exe", $"-configure {_codes} -for {_processName} -with ErrorReport={Environment.GetEnvironmentVariable("APPVERIFIER_LEVEL")}", AppVerifierCommandTimeout); + } + } + } +} diff --git a/test/IIS.FunctionalTests/ServicesTests.cs b/test/IIS.FunctionalTests/ServicesTests.cs index b91fc8aa20..47e53b8d40 100644 --- a/test/IIS.FunctionalTests/ServicesTests.cs +++ b/test/IIS.FunctionalTests/ServicesTests.cs @@ -32,15 +32,20 @@ namespace IIS.FunctionalTests [InlineData(HostingModel.OutOfProcess)] public async Task ApplicationPreloadStartsApp(HostingModel hostingModel) { - var baseDeploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); - baseDeploymentParameters.TransformArguments((args, contentRoot)=> $"{args} CreateFile \"{Path.Combine(contentRoot, "Started.txt")}\""); - EnablePreload(baseDeploymentParameters); + // This test often hits a memory leak in warmup.dll module, it has been reported to IIS team + using (AppVerifier.Disable(DeployerSelector.ServerType, 0x900)) + { + var baseDeploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); + baseDeploymentParameters.TransformArguments( + (args, contentRoot) => $"{args} CreateFile \"{Path.Combine(contentRoot, "Started.txt")}\""); + EnablePreload(baseDeploymentParameters); - var result = await DeployAsync(baseDeploymentParameters); + var result = await DeployAsync(baseDeploymentParameters); - await Helpers.Retry(async () => await File.ReadAllTextAsync(Path.Combine(result.ContentRoot, "Started.txt")), 10, 200); - StopServer(); - EventLogHelpers.VerifyEventLogEvent(result, EventLogHelpers.Started(result)); + await Helpers.Retry(async () => await File.ReadAllTextAsync(Path.Combine(result.ContentRoot, "Started.txt")), 10, 200); + StopServer(); + EventLogHelpers.VerifyEventLogEvent(result, EventLogHelpers.Started(result)); + } } [ConditionalTheory] @@ -49,22 +54,26 @@ namespace IIS.FunctionalTests [InlineData(HostingModel.OutOfProcess)] public async Task ApplicationInitializationPageIsRequested(HostingModel hostingModel) { - var baseDeploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); - EnablePreload(baseDeploymentParameters); + // This test often hits a memory leak in warmup.dll module, it has been reported to IIS team + using (AppVerifier.Disable(DeployerSelector.ServerType, 0x900)) + { + var baseDeploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); + EnablePreload(baseDeploymentParameters); - baseDeploymentParameters.ServerConfigActionList.Add( - (config, _) => { - config - .RequiredElement("system.webServer") - .GetOrAdd("applicationInitialization") - .GetOrAdd("add", "initializationPage", "/CreateFile"); - }); + baseDeploymentParameters.ServerConfigActionList.Add( + (config, _) => { + config + .RequiredElement("system.webServer") + .GetOrAdd("applicationInitialization") + .GetOrAdd("add", "initializationPage", "/CreateFile"); + }); - var result = await DeployAsync(baseDeploymentParameters); + var result = await DeployAsync(baseDeploymentParameters); - await Helpers.Retry(async () => await File.ReadAllTextAsync(Path.Combine(result.ContentRoot, "Started.txt")), 10, 200); - StopServer(); - EventLogHelpers.VerifyEventLogEvent(result, EventLogHelpers.Started(result)); + await Helpers.Retry(async () => await File.ReadAllTextAsync(Path.Combine(result.ContentRoot, "Started.txt")), 10, 200); + StopServer(); + EventLogHelpers.VerifyEventLogEvent(result, EventLogHelpers.Started(result)); + } } private static void EnablePreload(IISDeploymentParameters baseDeploymentParameters) diff --git a/tools/SetupTestEnvironment.ps1 b/tools/SetupTestEnvironment.ps1 index dcdaa84f57..625b040e39 100644 --- a/tools/SetupTestEnvironment.ps1 +++ b/tools/SetupTestEnvironment.ps1 @@ -1,39 +1,10 @@ param($Mode) -function Setup-appverif($application) +$DumpFolder = "$env:ASPNETCORE_TEST_LOG_DIR\dumps" +if (!($DumpFolder)) { - appverif.exe -enable Exceptions Handles Heaps Leak Locks Memory Threadpool TLS SRWLock -for $application - $onlyLog = 0x1E1; - $codes = @( - # Exceptions - 0x650, - # Handles - 0x300, 0x301, 0x302, 0x303, 0x304, 0x305, - # Heaps - 0x001, 0x002, 0x003, 0x004, 0x005, 0x006, 0x007, 0x008, 0x009, 0x00A, 0x00B, 0x00C, 0x00D, 0x00E, 0x00F, 0x010, 0x011, 0x012, 0x013, 0x014, - # Leak - 0x900, 0x901, 0x902, 0x903, 0x904, 0x905, 0x906, - # Locks - 0x200, 0x201, 0x202, 0x203, 0x204, 0x205, 0x206, 0x207, 0x208, 0x209, 0x210, 0x211, 0x212, 0x213, 0x214, 0x215, - # Memory - 0x600, 0x601, 0x602, 0x603, 0x604, 0x605, 0x606, 0x607, 0x608, 0x609, 0x60A, 0x60B, 0x60C, 0x60D, 0x60E, 0x60F, 0x610, 0x612, 0x613, 0x614, 0x615, 0x616, 0x617, 0x618, 0x619, 0x61A, 0x61B, 0x61C, 0x61D, 0x61E, - # SRWLock - 0x250, 0x251, 0x252, 0x253, 0x254, 0x255, 0x256, 0x257, - # TSL - 0x350, 0x351, 0x352, - # ThreadPool - 0x700, 0x701, 0x702, 0x703, 0x704, 0x705, 0x706, 0x707, 0x708, 0x709, 0x70A, 0x70B, 0x70C, 0x70D - ); - appverif.exe -configure $codes -for $application -with ErrorReport=$onlyLog + $DumpFolder = "$PSScriptRoot\..\artifacts\dumps" } - -function Shutdown-appverif($application) -{ - appverif.exe -export log -for $application -with To=$LogsFolder\$application.xml Log=0 - appverif.exe -disable * -for $application -} - -$DumpFolder = "$PSScriptRoot\..\artifacts\dumps" if (!(Test-Path $DumpFolder)) { New-Item $DumpFolder -ItemType Directory; @@ -51,27 +22,56 @@ $werHive = "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting"; $ldHive = "$werHive\LocalDumps"; -$cdb = "c:\Program Files (x86)\Windows Kits\10\Debuggers\x64\cdb.exe" -if (!(Test-Path $cdb)) +function Setup-appverif($application) { - $downloadedFile = [System.IO.Path]::GetTempFileName(); - $downloadedFile = "$downloadedFile.exe"; - Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/p/?linkid=870807" -OutFile $downloadedFile; - & $downloadedFile /features OptionId.WindowsDesktopDebuggers /norestart /q; + appverif.exe -enable Exceptions Handles Heaps Leak Locks Memory Threadpool TLS SRWLock -for $application + $level = 0x1E1; + $codes = @( + # Exceptions + 0x650, + # Handles + 0x300, 0x301, 0x302, 0x303, 0x304, # 0x305, + # Heaps + 0x001, 0x002, 0x003, 0x004, 0x005, 0x006, 0x007, 0x008, 0x009, 0x00A, 0x00B, 0x00C, 0x00D, 0x00E, 0x00F, 0x010, 0x011, 0x012, 0x013, 0x014, + # Leak + 0x900, 0x901, 0x902, 0x903, 0x904, 0x905, 0x906, + # Locks + 0x200, 0x201, 0x202, 0x203, 0x204, 0x205, 0x206, 0x207, 0x208, 0x209, 0x210, 0x211, 0x212, 0x213, 0x214, 0x215, + # Memory + 0x600, 0x601, 0x602, 0x603, 0x604, 0x605, 0x606, 0x607, 0x608, 0x609, 0x60A, 0x60B, 0x60C, 0x60D, 0x60E, 0x60F, 0x610, 0x612, 0x613, 0x614, 0x615, 0x616, 0x617, 0x618, 0x619, 0x61A, 0x61B, 0x61C, 0x61D, 0x61E, + # SRWLock + 0x250, 0x251, 0x252, 0x253, 0x254, 0x255, 0x256, 0x257, + # TSL + 0x350, 0x351, 0x352, + # ThreadPool + 0x700, 0x701, 0x702, 0x703, 0x704, 0x705, 0x706, 0x707, 0x708, 0x709, 0x70A, 0x70B, 0x70C, 0x70D + ); + + setx APPVERIFIER_ENABLED_CODES "$codes"; + setx APPVERIFIER_LEVEL $level; + appverif.exe -configure $codes -for $application -with ErrorReport=$level + + # 0x305, - disabled because coreclr.dll!SetThreadName(void *) ofthen passes invalid handle (0xffffff) + appverif.exe -configure 0x305 -for $application -with ErrorReport=0 } -if ($Mode -eq "Setup") +function Shutdown-appverif($application) { - Move-Item $env:windir\System32\vsjitdebugger.exe $env:windir\System32\_vsjitdebugger.exe; + setx APPVERIFIER_ENABLED_CODES "`"`""; + setx APPVERIFIER_LEVEL "`"`""; - Setup-appverif w3wp.exe - Setup-appverif iisexpress.exe + appverif.exe -disable * -for $application +} +function Setup-Dumps() +{ if (!(Test-Path $ldHive )) { New-Item -Path $werHive -Name LocalDumps } + Move-Item $env:windir\System32\vsjitdebugger.exe $env:windir\System32\_vsjitdebugger.exe; + New-ItemProperty $werHive -Name "DontShowUI" -Value 1 -PropertyType "DWORD" -Force; New-ItemProperty $ldHive -Name "DumpFolder" -Value $DumpFolder -PropertyType "ExpandString" -Force; @@ -81,7 +81,7 @@ if ($Mode -eq "Setup") Restart-Service WerSvc } -if ($Mode -eq "Shutdown") +function Shutdown-Dumps() { Move-Item $env:windir\System32\_vsjitdebugger.exe $env:windir\System32\vsjitdebugger.exe; @@ -89,8 +89,14 @@ if ($Mode -eq "Shutdown") New-ItemProperty $werHive -Name "DontShowUI" -Value 0 -PropertyType "DWORD" -Force; - Shutdown-appverif w3wp.exe - Shutdown-appverif iisexpress.exe + $cdb = "c:\Program Files (x86)\Windows Kits\10\Debuggers\x64\cdb.exe" + if (!(Test-Path $cdb)) + { + $downloadedFile = [System.IO.Path]::GetTempFileName(); + $downloadedFile = "$downloadedFile.exe"; + Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/p/?linkid=870807" -OutFile $downloadedFile; + & $downloadedFile /features OptionId.WindowsDesktopDebuggers /norestart /q; + } foreach ($dump in (Get-ChildItem -Path $DumpFolder -Filter "*.dmp")) { @@ -102,4 +108,28 @@ if ($Mode -eq "Shutdown") } } +if ($Mode -eq "Setup") +{ + Setup-appverif w3wp.exe + Setup-appverif iisexpress.exe + + Setup-Dumps; +} + +if ($Mode -eq "SetupDumps") +{ + Shutdown-appverif w3wp.exe + Shutdown-appverif iisexpress.exe + + Setup-Dumps; +} + +if ($Mode -eq "Shutdown") +{ + Shutdown-appverif w3wp.exe + Shutdown-appverif iisexpress.exe + + Shutdown-Dumps; +} + Exit 0; \ No newline at end of file From 642e8e9d7ce7afe381d5ffd7abe0fef91993ac60 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 12 Oct 2018 12:03:11 -0700 Subject: [PATCH 329/363] Add Basic auth tests and fix Windows auth tests (#1502) --- .../IISDeploymentParameterExtensions.cs | 30 +++++- .../OutOfProcess/HelloWorldTest.cs | 2 +- .../Utilities/IISCapability.cs | 3 +- .../RequiresIISAttribute.cs | 95 ++++++------------- .../BasicAuthTests.cs | 70 ++++++++++++++ .../InProcess/AuthenticationTests.cs | 3 +- .../OutOfProcess/NtlmAuthentationTest.cs | 3 +- .../RequiresIISAttribute.cs | 2 +- .../WindowsAuthTests.cs | 14 ++- .../shared/SharedStartup/Startup.shared.cs | 4 + 10 files changed, 147 insertions(+), 79 deletions(-) create mode 100644 test/IISExpress.FunctionalTests/BasicAuthTests.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs index 61ab2a323f..8534add254 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs @@ -41,14 +41,40 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS }); } - public static void AddWindowsAuthToServerConfig(this IISDeploymentParameters parameters) + public static void SetWindowsAuth(this IISDeploymentParameters parameters, bool enabled = true) { + parameters.EnableModule("WindowsAuthenticationModule", "%IIS_BIN%\\authsspi.dll"); + parameters.AddServerConfigAction( element => { element.Descendants("windowsAuthentication") .Single() - .SetAttributeValue("enabled", "true"); + .SetAttributeValue("enabled", enabled); + }); + } + + public static void SetAnonymousAuth(this IISDeploymentParameters parameters, bool enabled = true) + { + parameters.AddServerConfigAction( + element => + { + element.Descendants("anonymousAuthentication") + .Single() + .SetAttributeValue("enabled", enabled); + }); + } + + public static void SetBasicAuth(this IISDeploymentParameters parameters, bool enabled = true) + { + parameters.EnableModule("BasicAuthenticationModule", "%IIS_BIN%\\authbas.dll"); + + parameters.AddServerConfigAction( + element => + { + element.Descendants("basicAuthentication") + .Single() + .SetAttributeValue("enabled", enabled); }); } diff --git a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs index edfd603e4c..f6e36613d7 100644 --- a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests response = await deploymentResult.HttpClient.GetAsync("/Auth"); responseText = await response.Content.ReadAsStringAsync(); - Assert.True("null".Equals(responseText), "Auth"); + Assert.Equal("null", responseText); Assert.Equal( $"ContentRootPath {deploymentResult.ContentRoot}" + Environment.NewLine + diff --git a/test/Common.FunctionalTests/Utilities/IISCapability.cs b/test/Common.FunctionalTests/Utilities/IISCapability.cs index 750326cb5d..0a080bb702 100644 --- a/test/Common.FunctionalTests/Utilities/IISCapability.cs +++ b/test/Common.FunctionalTests/Utilities/IISCapability.cs @@ -16,6 +16,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests DynamicCompression = 16, ApplicationInitialization = 32, TracingModule = 64, - FailedRequestTracingModule = 128 + FailedRequestTracingModule = 128, + BasicAuthentication = 256 } } diff --git a/test/IIS.FunctionalTests/RequiresIISAttribute.cs b/test/IIS.FunctionalTests/RequiresIISAttribute.cs index 2aacfed0db..6c47c4d090 100644 --- a/test/IIS.FunctionalTests/RequiresIISAttribute.cs +++ b/test/IIS.FunctionalTests/RequiresIISAttribute.cs @@ -15,16 +15,21 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] public sealed class RequiresIISAttribute : Attribute, ITestCondition { + private static readonly (IISCapability Capability, string DllName)[] Modules = + { + (IISCapability.Websockets, "iiswsock.dll"), + (IISCapability.WindowsAuthentication, "authsspi.dll"), + (IISCapability.DynamicCompression, "compdyn.dll"), + (IISCapability.ApplicationInitialization, "warmup.dll"), + (IISCapability.TracingModule, "iisetw.dll"), + (IISCapability.FailedRequestTracingModule, "iisfreb.dll"), + (IISCapability.BasicAuthentication, "authbas.dll"), + }; + private static readonly bool _isMetStatic; private static readonly string _skipReasonStatic; - - private static readonly bool _websocketsAvailable; - private static readonly bool _windowsAuthAvailable; private static readonly bool _poolEnvironmentVariablesAvailable; - private static readonly bool _dynamicCompressionAvailable; - private static readonly bool _applicationInitializationModule; - private static readonly bool _tracingModuleAvailable; - private static readonly bool _frebTracingModuleAvailable; + private static readonly IISCapability _modulesAvailable; static RequiresIISAttribute() { @@ -81,18 +86,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests _skipReasonStatic = _isMetStatic ? null : "IIS schema needs to be upgraded to support ANCM."; - _websocketsAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "iiswsock.dll")); - - _windowsAuthAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "authsspi.dll")); - - _dynamicCompressionAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "compdyn.dll")); - - _applicationInitializationModule = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "warmup.dll")); - - _tracingModuleAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "iisetw.dll")); - - _frebTracingModuleAvailable = File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "iisfreb.dll")); - + foreach (var module in Modules) + { + if (File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", module.DllName))) + { + _modulesAvailable |= module.Capability; + } + } var iisRegistryKey = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\InetStp", writable: false); if (iisRegistryKey == null) @@ -115,23 +115,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { IsMet = _isMetStatic; SkipReason = _skipReasonStatic; - if (capabilities.HasFlag(IISCapability.Websockets)) - { - IsMet &= _websocketsAvailable; - if (!_websocketsAvailable) - { - SkipReason += "The machine does not have IIS websockets installed."; - } - } - if (capabilities.HasFlag(IISCapability.WindowsAuthentication)) - { - IsMet &= _windowsAuthAvailable; - - if (!_windowsAuthAvailable) - { - SkipReason += "The machine does not have IIS windows authentication installed."; - } - } if (capabilities.HasFlag(IISCapability.PoolEnvironmentVariables)) { IsMet &= _poolEnvironmentVariablesAvailable; @@ -147,40 +130,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests SkipReason += "https://github.com/aspnet/IISIntegration/issues/1074"; } - if (capabilities.HasFlag(IISCapability.DynamicCompression)) + foreach (var module in Modules) { - IsMet &= _dynamicCompressionAvailable; - if (!_dynamicCompressionAvailable) + if (capabilities.HasFlag(module.Capability)) { - SkipReason += "The machine does not have IIS dynamic compression installed."; - } - } - - if (capabilities.HasFlag(IISCapability.ApplicationInitialization)) - { - IsMet &= _applicationInitializationModule; - if (!_applicationInitializationModule) - { - SkipReason += "The machine does not have IIS ApplicationInitialization installed."; - } - } - - - if (capabilities.HasFlag(IISCapability.TracingModule)) - { - IsMet &= _tracingModuleAvailable; - if (!_tracingModuleAvailable) - { - SkipReason += "The machine does not have IIS Failed Request Tracing Module installed."; - } - } - - if (capabilities.HasFlag(IISCapability.FailedRequestTracingModule)) - { - IsMet &= _frebTracingModuleAvailable; - if (!_frebTracingModuleAvailable) - { - SkipReason += "The machine does not have IIS Failed Request Tracing Module installed."; + var available = _modulesAvailable.HasFlag(module.Capability); + IsMet &= available; + if (!available) + { + SkipReason += $"The machine does have {module.Capability} available."; + } } } } diff --git a/test/IISExpress.FunctionalTests/BasicAuthTests.cs b/test/IISExpress.FunctionalTests/BasicAuthTests.cs new file mode 100644 index 0000000000..1011b678ed --- /dev/null +++ b/test/IISExpress.FunctionalTests/BasicAuthTests.cs @@ -0,0 +1,70 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Text; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class BasicAuthTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public BasicAuthTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22) + .WithApplicationTypes(ApplicationType.Portable) + .WithAllAncmVersions() + .WithAllHostingModels(); + + [ConditionalTheory(Skip = "This test is manual. To run it set ASPNETCORE_MODULE_TEST_USER and ASPNETCORE_MODULE_TEST_PASSWORD environment variables to existing user")] + [RequiresIIS(IISCapability.BasicAuthentication)] + [MemberData(nameof(TestVariants))] + public async Task BasicAuthTest(TestVariant variant) + { + var username = Environment.GetEnvironmentVariable("ASPNETCORE_MODULE_TEST_USER"); + var password = Environment.GetEnvironmentVariable("ASPNETCORE_MODULE_TEST_PASSWORD"); + + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + deploymentParameters.SetAnonymousAuth(enabled: false); + deploymentParameters.SetWindowsAuth(enabled: false); + deploymentParameters.SetBasicAuth(enabled: true); + + // The default in hosting sets windows auth to true. + var deploymentResult = await DeployAsync(deploymentParameters); + var request = new HttpRequestMessage(HttpMethod.Get, "/Auth"); + var byteArray = new UTF8Encoding().GetBytes(username + ":" + password); + request.Headers.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(byteArray)); + + var response = await deploymentResult.HttpClient.SendAsync(request); + + var responseText = await response.Content.ReadAsStringAsync(); + + if (variant.HostingModel == HostingModel.InProcess) + { + Assert.StartsWith("Windows", responseText); + Assert.Contains(username, responseText); + } + else + { + // We expect out-of-proc not allowing basic auth + Assert.Equal("Windows:", responseText); + } + } + } +} diff --git a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs index 333a7a055b..47fb3a6553 100644 --- a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs +++ b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs @@ -22,10 +22,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] + [RequiresIIS(IISCapability.WindowsAuthentication)] public async Task Authentication_InProcess() { var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); - deploymentParameters.AddWindowsAuthToServerConfig(); + deploymentParameters.SetWindowsAuth(); var deploymentResult = await DeployAsync(deploymentParameters); diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index 49365998a0..3ff46bf304 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -34,13 +34,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests .WithAllAncmVersions(); [ConditionalTheory] + [RequiresIIS(IISCapability.WindowsAuthentication)] [MemberData(nameof(TestVariants))] public async Task NtlmAuthentication(TestVariant variant) { var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); deploymentParameters.ApplicationBaseUriHint = $"https://localhost:0/"; - deploymentParameters.AddWindowsAuthToServerConfig(); + deploymentParameters.SetWindowsAuth(enabled: true); var result = await DeployAsync(deploymentParameters); var response = await result.HttpClient.GetAsync("/HelloWorld"); diff --git a/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs b/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs index 24d656332d..2e0a68b9f7 100644 --- a/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs +++ b/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public RequiresIISAttribute(IISCapability capabilities) { - // IISCapabilities aren't pretinent to IISExpress + // IISCapabilities aren't pertinent to IISExpress } } } diff --git a/test/IISExpress.FunctionalTests/WindowsAuthTests.cs b/test/IISExpress.FunctionalTests/WindowsAuthTests.cs index 5511d017a1..8431b15801 100644 --- a/test/IISExpress.FunctionalTests/WindowsAuthTests.cs +++ b/test/IISExpress.FunctionalTests/WindowsAuthTests.cs @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; +using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; @@ -23,24 +25,28 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) - .WithAllApplicationTypes() + .WithApplicationTypes(ApplicationType.Portable) .WithAllAncmVersions() .WithAllHostingModels(); [ConditionalTheory] + [RequiresIIS(IISCapability.WindowsAuthentication)] [MemberData(nameof(TestVariants))] public async Task WindowsAuthTest(TestVariant variant) { var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); - deploymentParameters.AddWindowsAuthToServerConfig(); + deploymentParameters.SetAnonymousAuth(enabled: false); + deploymentParameters.SetWindowsAuth(); // The default in hosting sets windows auth to true. var deploymentResult = await DeployAsync(deploymentParameters); - var response = await deploymentResult.HttpClient.GetAsync("/Auth"); + var client = deploymentResult.CreateClient(new HttpClientHandler { UseDefaultCredentials = true }); + var response = await client.GetAsync("/Auth"); var responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal("Windows", responseText); + Assert.StartsWith("Windows:", responseText); + Assert.Contains(Environment.UserName, responseText); } } } diff --git a/test/WebSites/shared/SharedStartup/Startup.shared.cs b/test/WebSites/shared/SharedStartup/Startup.shared.cs index d119932255..2c08c93fa6 100644 --- a/test/WebSites/shared/SharedStartup/Startup.shared.cs +++ b/test/WebSites/shared/SharedStartup/Startup.shared.cs @@ -44,6 +44,10 @@ namespace TestSite var authScheme = (await authProvider.GetAllSchemesAsync()).SingleOrDefault(); await ctx.Response.WriteAsync(authScheme?.Name ?? "null"); + if (ctx.User.Identity.Name != null) + { + await ctx.Response.WriteAsync(":" + ctx.User.Identity.Name); + } } public async Task GetClientCert(HttpContext context) From 897386ab3f3f91739b2af4764bb8825b73e7f133 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 12 Oct 2018 12:34:05 -0700 Subject: [PATCH 330/363] Temporary disable AppVerif tests in Jenkins (#1509) --- build/buildpipeline/pipeline.groovy | 3 --- 1 file changed, 3 deletions(-) diff --git a/build/buildpipeline/pipeline.groovy b/build/buildpipeline/pipeline.groovy index e1c8b612e9..7ccbca0b2a 100644 --- a/build/buildpipeline/pipeline.groovy +++ b/build/buildpipeline/pipeline.groovy @@ -1,7 +1,6 @@ import org.dotnet.ci.pipelines.Pipeline def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') -def windowsAppverifPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows-appverif.groovy') def configurations = [ 'Debug', @@ -16,6 +15,4 @@ configurations.each { configuration -> windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params) windowsPipeline.triggerPipelineOnGithubPush(params) - - windowsAppverifPipeline.triggerPipelineOnEveryGithubPR("Windows AppVerifier ${configuration} x64 Build", params) } From 0b5973e5014f17e7bbdbe57c28b90d2b9b1d2347 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Sat, 13 Oct 2018 10:54:20 -0700 Subject: [PATCH 331/363] Enable auth tests on IIS (#1511) * Enable auth tests on IIS * FB --- .../IISDeploymentParameterExtensions.cs | 46 ++++++++++++++++--- .../BasicAuthTests.cs | 5 +- .../RequiresEnvironmentVariableAttribute.cs | 24 ++++++++++ .../WindowsAuthTests.cs | 0 test/IIS.FunctionalTests/ServicesTests.cs | 6 +-- tools/SetupTestEnvironment.ps1 | 4 +- 6 files changed, 69 insertions(+), 16 deletions(-) rename test/{IISExpress.FunctionalTests => Common.FunctionalTests}/BasicAuthTests.cs (92%) create mode 100644 test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs rename test/{IISExpress.FunctionalTests => Common.FunctionalTests}/WindowsAuthTests.cs (100%) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs index 8534add254..90f76fd8c2 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs @@ -43,14 +43,22 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS public static void SetWindowsAuth(this IISDeploymentParameters parameters, bool enabled = true) { + parameters.EnsureSection("windowsAuthentication", "system.webServer", "security", "windowsAuthentication"); parameters.EnableModule("WindowsAuthenticationModule", "%IIS_BIN%\\authsspi.dll"); parameters.AddServerConfigAction( element => { - element.Descendants("windowsAuthentication") - .Single() - .SetAttributeValue("enabled", enabled); + var windowsAuthentication = element + .RequiredElement("system.webServer") + .RequiredElement("security") + .RequiredElement("authentication") + .GetOrAdd("windowsAuthentication"); + + windowsAuthentication.SetAttributeValue("enabled", enabled); + var providers = windowsAuthentication.GetOrAdd("providers"); + providers.GetOrAdd("add", "value", "Negotiate"); + providers.GetOrAdd("add", "value", "NTLM"); }); } @@ -59,8 +67,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS parameters.AddServerConfigAction( element => { - element.Descendants("anonymousAuthentication") - .Single() + element + .RequiredElement("system.webServer") + .RequiredElement("security") + .RequiredElement("authentication") + .GetOrAdd("anonymousAuthentication") .SetAttributeValue("enabled", enabled); }); } @@ -72,12 +83,33 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS parameters.AddServerConfigAction( element => { - element.Descendants("basicAuthentication") - .Single() + element + .RequiredElement("system.webServer") + .RequiredElement("security") + .RequiredElement("authentication") + .GetOrAdd("basicAuthentication") .SetAttributeValue("enabled", enabled); }); } + public static void EnsureSection(this IISDeploymentParameters parameters, string name, params string[] path) + { + parameters.ServerConfigActionList.Add( + (config, _) => { + + var element = config + .RequiredElement("configSections"); + + foreach (var s in path) + { + element = element.GetOrAdd("sectionGroup", "name", s); + } + + element.GetOrAdd("section", "name", "applicationInitialization") + .SetAttributeValue("overrideModeDefault", "Allow"); + }); + } + public static void EnableLogging(this IISDeploymentParameters deploymentParameters, string path) { deploymentParameters.WebConfigActionList.Add( diff --git a/test/IISExpress.FunctionalTests/BasicAuthTests.cs b/test/Common.FunctionalTests/BasicAuthTests.cs similarity index 92% rename from test/IISExpress.FunctionalTests/BasicAuthTests.cs rename to test/Common.FunctionalTests/BasicAuthTests.cs index 1011b678ed..1c7faf00b4 100644 --- a/test/IISExpress.FunctionalTests/BasicAuthTests.cs +++ b/test/Common.FunctionalTests/BasicAuthTests.cs @@ -32,7 +32,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests .WithAllAncmVersions() .WithAllHostingModels(); - [ConditionalTheory(Skip = "This test is manual. To run it set ASPNETCORE_MODULE_TEST_USER and ASPNETCORE_MODULE_TEST_PASSWORD environment variables to existing user")] + [ConditionalTheory] + [RequiresEnvironmentVariable("ASPNETCORE_MODULE_TEST_USER")] [RequiresIIS(IISCapability.BasicAuthentication)] [MemberData(nameof(TestVariants))] public async Task BasicAuthTest(TestVariant variant) @@ -63,7 +64,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests else { // We expect out-of-proc not allowing basic auth - Assert.Equal("Windows:", responseText); + Assert.Equal("Windows", responseText); } } } diff --git a/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs b/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs new file mode 100644 index 0000000000..d2749db547 --- /dev/null +++ b/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs @@ -0,0 +1,24 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class RequiresEnvironmentVariableAttribute : Attribute, ITestCondition + { + private readonly string _name; + + public RequiresEnvironmentVariableAttribute(string name) + { + _name = name; + } + + public bool IsMet => !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable(_name)); + + public string SkipReason => $"Environment variable {_name} is required to run this test."; + } +} diff --git a/test/IISExpress.FunctionalTests/WindowsAuthTests.cs b/test/Common.FunctionalTests/WindowsAuthTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/WindowsAuthTests.cs rename to test/Common.FunctionalTests/WindowsAuthTests.cs diff --git a/test/IIS.FunctionalTests/ServicesTests.cs b/test/IIS.FunctionalTests/ServicesTests.cs index 47e53b8d40..875b5b13be 100644 --- a/test/IIS.FunctionalTests/ServicesTests.cs +++ b/test/IIS.FunctionalTests/ServicesTests.cs @@ -78,13 +78,9 @@ namespace IIS.FunctionalTests private static void EnablePreload(IISDeploymentParameters baseDeploymentParameters) { + baseDeploymentParameters.EnsureSection("applicationInitialization", "system.webServer"); baseDeploymentParameters.ServerConfigActionList.Add( (config, _) => { - config - .RequiredElement("configSections") - .GetOrAdd("sectionGroup", "name", "system.webServer") - .GetOrAdd("section", "name", "applicationInitialization") - .SetAttributeValue("overrideModeDefault", "Allow"); config .RequiredElement("system.applicationHost") diff --git a/tools/SetupTestEnvironment.ps1 b/tools/SetupTestEnvironment.ps1 index 625b040e39..3adaf79045 100644 --- a/tools/SetupTestEnvironment.ps1 +++ b/tools/SetupTestEnvironment.ps1 @@ -57,8 +57,8 @@ function Setup-appverif($application) function Shutdown-appverif($application) { - setx APPVERIFIER_ENABLED_CODES "`"`""; - setx APPVERIFIER_LEVEL "`"`""; + setx APPVERIFIER_ENABLED_CODES "NONE"; + setx APPVERIFIER_LEVEL "NONE"; appverif.exe -disable * -for $application } From 2bd2c1870a236df4af389dbb74f04daca78d62b1 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 15 Oct 2018 09:17:12 -0700 Subject: [PATCH 332/363] Update dependencies.props (#1516) [auto-updated: dependencies] --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 3806a70b83..edb736edd6 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,39 +4,39 @@ 0.10.13 - 3.0.0-alpha1-20181011.3 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 0.7.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 + 3.0.0-alpha1-20181011.11 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 0.7.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 15.6.82 15.6.82 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 - 3.0.0-alpha1-10605 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 + 3.0.0-alpha1-10620 2.0.9 2.1.3 2.2.0-preview2-26905-02 1.0.1 - 3.0.0-alpha1-10605 + 3.0.0-alpha1-10620 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index b886680b23..1bb080533a 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20181011.3 -commithash:e7569d931e994629267ab2646e9926140962b4ac +version:3.0.0-alpha1-20181011.11 +commithash:f57aa8ddda0abdd74ada55853587bedb4f364065 From df51be447e52d8840ae62715d722db0ec9a81256 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 15 Oct 2018 09:17:19 -0700 Subject: [PATCH 333/363] Update dependencies.props (#1517) [auto-updated: dependencies] --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 3ca3dc430a..b4708cadc2 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,38 +4,38 @@ 0.10.13 - 2.2.0-preview2-20181011.2 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 0.6.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 + 2.2.0-preview2-20181011.10 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 0.6.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 15.6.82 15.6.82 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 - 2.2.0-preview3-35457 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 + 2.2.0-preview3-35496 2.1.3 2.2.0-preview3-27008-03 1.0.1 - 2.2.0-preview3-35457 + 2.2.0-preview3-35496 15.6.1 11.1.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index bda301982e..49afc832d9 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview2-20181011.2 -commithash:09cd1592eb0fbbfa6ef5124120c173bc1d4e353a +version:2.2.0-preview2-20181011.10 +commithash:224e1163a1145b60f324e0b432419ef4ba4880cc From b0deed05be7710d80e28a1ce95ff4e760939644b Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 15 Oct 2018 10:33:14 -0700 Subject: [PATCH 334/363] Add server abort tests (#1510) --- build/launchSettings.json | 11 ++-- build/testsite.props | 2 - .../Properties/launchSettings.json | 7 +- .../AspNetCore/HandlerResolver.cpp | 14 +++- test/Common.FunctionalTests/BasicAuthTests.cs | 1 - .../Inprocess/FixtureLoggedTest.cs | 2 +- .../ServerAbortTests.cs | 65 +++++++++++++++++++ .../Utilities/IISTestSiteCollection.cs | 13 ++++ .../Utilities/IISTestSiteFixture.cs | 28 +++++++- .../OutOfProcess/GlobalVersionTests.cs | 30 +++++++++ .../Properties/launchSettings.json | 11 ++-- .../Properties/launchSettings.json | 11 ++-- .../Properties/launchSettings.json | 11 ++-- .../shared/SharedStartup/Startup.shared.cs | 8 ++- 14 files changed, 182 insertions(+), 32 deletions(-) create mode 100644 test/Common.FunctionalTests/ServerAbortTests.cs diff --git a/build/launchSettings.json b/build/launchSettings.json index 9c963c0100..246b7a0b47 100644 --- a/build/launchSettings.json +++ b/build/launchSettings.json @@ -12,11 +12,11 @@ "commandName": "Executable", "executablePath": "$(IISExpressPath)", "commandLineArgs": "$(IISExpressArguments)", - "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -29,8 +29,9 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/build/testsite.props b/build/testsite.props index 861d44a563..1ef6bf81cc 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -36,8 +36,6 @@ /config:"$(IISExpressAppHostConfig)" /systray:false -h "$(IISAppHostConfig)" - $(AspNetCoreModuleV1ShimDll) - $(AspNetCoreModuleV2ShimDll) aspnetcorev2_inprocess.dll $(userprofile)\.dotnet\$(NativePlatform)\dotnet.exe diff --git a/samples/NativeIISSample/Properties/launchSettings.json b/samples/NativeIISSample/Properties/launchSettings.json index 9c963c0100..f62697de39 100644 --- a/samples/NativeIISSample/Properties/launchSettings.json +++ b/samples/NativeIISSample/Properties/launchSettings.json @@ -12,11 +12,11 @@ "commandName": "Executable", "executablePath": "$(IISExpressPath)", "commandLineArgs": "$(IISExpressArguments)", - "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", + "ANCM_PATH": "$(AncmPath)", + "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -31,6 +31,7 @@ "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", "ANCM_PATH": "$(AncmPath)", "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index 726229cc9e..44210d8b68 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -16,6 +16,7 @@ #include "WebConfigConfigurationSource.h" #include "ModuleHelpers.h" #include "BaseOutputManager.h" +#include "Environment.h" const PCWSTR HandlerResolver::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; const PCWSTR HandlerResolver::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; @@ -103,12 +104,12 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication LOG_INFOF(L"Loading request handler: '%ls'", handlerDllPath.c_str()); hRequestHandlerDll = LoadLibrary(handlerDllPath.c_str()); + RETURN_LAST_ERROR_IF_NULL(hRequestHandlerDll); if (preventUnload) { // Pin module in memory - GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_PIN, pstrHandlerDllName, &hRequestHandlerDll); + GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_PIN, handlerDllPath.c_str(), &hRequestHandlerDll); } - RETURN_LAST_ERROR_IF_NULL(hRequestHandlerDll); } auto pfnAspNetCoreCreateApplication = ModuleHelpers::GetKnownProcAddress(hRequestHandlerDll, "CreateApplication"); @@ -150,7 +151,7 @@ HandlerResolver::GetApplicationFactory(const IHttpApplication &pApplication, std m_loadedApplicationHostingModel = options.QueryHostingModel(); m_loadedApplicationId = pApplication.GetApplicationId(); RETURN_IF_FAILED(LoadRequestHandlerAssembly(pApplication, options, pApplicationFactory)); - + return S_OK; } @@ -171,6 +172,13 @@ HandlerResolver::FindNativeAssemblyFromGlobalLocation( { try { + auto handlerPath = Environment::GetEnvironmentVariableValue(L"ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER"); + if (handlerPath.has_value() && std::filesystem::is_regular_file(handlerPath.value())) + { + handlerDllPath = handlerPath.value(); + return S_OK; + } + std::wstring modulePath = GlobalVersionUtility::GetModuleName(m_hModule); modulePath = GlobalVersionUtility::RemoveFileNameFromFolderPath(modulePath); diff --git a/test/Common.FunctionalTests/BasicAuthTests.cs b/test/Common.FunctionalTests/BasicAuthTests.cs index 1c7faf00b4..d8607db21e 100644 --- a/test/Common.FunctionalTests/BasicAuthTests.cs +++ b/test/Common.FunctionalTests/BasicAuthTests.cs @@ -6,7 +6,6 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; diff --git a/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs b/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs index 4604687991..705af2b213 100644 --- a/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs +++ b/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs @@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { _fixture = fixture; } - + public override void Initialize(MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper) { base.Initialize(methodInfo, testMethodArguments, testOutputHelper); diff --git a/test/Common.FunctionalTests/ServerAbortTests.cs b/test/Common.FunctionalTests/ServerAbortTests.cs new file mode 100644 index 0000000000..8ebd70db12 --- /dev/null +++ b/test/Common.FunctionalTests/ServerAbortTests.cs @@ -0,0 +1,65 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public abstract class ServerAbortTests: FixtureLoggedTest + { + private readonly IISTestSiteFixture _fixture; + + [Collection(IISTestSiteCollection.Name)] + public class InProc: ServerAbortTests + { + public InProc(IISTestSiteFixture fixture) : base(fixture) { } + } + + [Collection(OutOfProcessTestSiteCollection.Name)] + public class OutOfProcess: ServerAbortTests + { + public OutOfProcess(OutOfProcessTestSiteFixture fixture) : base(fixture) { } + } + + [Collection(OutOfProcessV1TestSiteCollection.Name)] + public class OutOfProcessV1: ServerAbortTests + { + public OutOfProcessV1(OutOfProcessV1TestSiteFixture fixture) : base(fixture) { } + } + + protected ServerAbortTests(IISTestSiteFixture fixture) : base(fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task ClosesConnectionOnServerAbort() + { + try + { + var response = await _fixture.Client.GetAsync("/Abort").DefaultTimeout(); + + // 502 is expected for outofproc but not for inproc + if (_fixture.DeploymentResult.DeploymentParameters.HostingModel == HostingModel.OutOfProcess) + { + Assert.Equal(HttpStatusCode.BadGateway, response.StatusCode); + // 0x80072f78 ERROR_HTTP_INVALID_SERVER_RESPONSE The server returned an invalid or unrecognized response + Assert.Contains("0x80072f78", await response.Content.ReadAsStringAsync()); + } + else + { + Assert.True(false, "Should not reach here"); + } + } + catch (HttpRequestException) + { + // Connection reset is expected both for outofproc and inproc + } + } + } +} diff --git a/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs b/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs index 8d53affc98..562d63adbe 100644 --- a/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs +++ b/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs @@ -13,4 +13,17 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public const string Name = nameof(IISTestSiteCollection); } + + [CollectionDefinition(Name)] + public class OutOfProcessTestSiteCollection : ICollectionFixture + { + public const string Name = nameof(OutOfProcessTestSiteCollection); + } + + [CollectionDefinition(Name)] + public class OutOfProcessV1TestSiteCollection : ICollectionFixture + { + public const string Name = nameof(OutOfProcessV1TestSiteCollection); + } + } diff --git a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs index 5628a1acfb..e8cfd8f641 100644 --- a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Net.Http; -using System.Threading; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.Logging; @@ -12,6 +11,33 @@ using Microsoft.Extensions.Logging.Testing; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { + public class OutOfProcessTestSiteFixture : IISTestSiteFixture + { + public OutOfProcessTestSiteFixture() : base(Configure) + { + } + + private static void Configure(IISDeploymentParameters deploymentParameters) + { + deploymentParameters.ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(); + deploymentParameters.HostingModel = HostingModel.OutOfProcess; + } + } + + public class OutOfProcessV1TestSiteFixture : IISTestSiteFixture + { + public OutOfProcessV1TestSiteFixture() : base(Configure) + { + } + + private static void Configure(IISDeploymentParameters deploymentParameters) + { + deploymentParameters.ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(); + deploymentParameters.HostingModel = HostingModel.OutOfProcess; + deploymentParameters.AncmVersion = AncmVersion.AspNetCoreModule; + } + } + public class IISTestSiteFixture : IDisposable { private ApplicationDeployer _deployer; diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index c92349ae3a..4757c1d59b 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.IO; using System.Linq; using System.Net; @@ -52,6 +53,35 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(_helloWorldResponse, responseText); } + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public async Task GlobalVersion_EnvironmentVariableWorks() + { + var temporaryFile = Path.GetTempFileName(); + try + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + CopyShimToOutput(deploymentParameters); + deploymentParameters.PublishApplicationBeforeDeployment = true; + deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER"] = temporaryFile; + + var deploymentResult = await DeployAsync(deploymentParameters); + var requestHandlerPath = Path.Combine(GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20), "aspnetcorev2_outofprocess.dll"); + + File.Delete(temporaryFile); + File.Move(requestHandlerPath, temporaryFile); + + var response = await deploymentResult.HttpClient.GetAsync(_helloWorldRequest); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(_helloWorldResponse, responseText); + StopServer(); + } + finally + { + File.Delete(temporaryFile); + } + } + [ConditionalTheory] [InlineData("2.1.0")] [InlineData("2.1.0-preview")] diff --git a/test/WebSites/InProcessWebSite/Properties/launchSettings.json b/test/WebSites/InProcessWebSite/Properties/launchSettings.json index 9c963c0100..246b7a0b47 100644 --- a/test/WebSites/InProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/InProcessWebSite/Properties/launchSettings.json @@ -12,11 +12,11 @@ "commandName": "Executable", "executablePath": "$(IISExpressPath)", "commandLineArgs": "$(IISExpressArguments)", - "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -29,8 +29,9 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json index 9c963c0100..246b7a0b47 100644 --- a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json +++ b/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json @@ -12,11 +12,11 @@ "commandName": "Executable", "executablePath": "$(IISExpressPath)", "commandLineArgs": "$(IISExpressArguments)", - "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -29,8 +29,9 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/StressTestWebSite/Properties/launchSettings.json b/test/WebSites/StressTestWebSite/Properties/launchSettings.json index 9c963c0100..246b7a0b47 100644 --- a/test/WebSites/StressTestWebSite/Properties/launchSettings.json +++ b/test/WebSites/StressTestWebSite/Properties/launchSettings.json @@ -12,11 +12,11 @@ "commandName": "Executable", "executablePath": "$(IISExpressPath)", "commandLineArgs": "$(IISExpressArguments)", - "nativeDebugging": true, "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(TargetDir)\\$(AncmPath)", - "ANCMV2_PATH": "$(TargetDir)\\$(AncmV2Path)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", @@ -29,8 +29,9 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/WebSites/shared/SharedStartup/Startup.shared.cs b/test/WebSites/shared/SharedStartup/Startup.shared.cs index 2c08c93fa6..4035decb02 100644 --- a/test/WebSites/shared/SharedStartup/Startup.shared.cs +++ b/test/WebSites/shared/SharedStartup/Startup.shared.cs @@ -68,10 +68,16 @@ namespace TestSite } finally { - Interlocked.Decrement(ref _waitingRequestCount); + Interlocked.Decrement(ref _waitingRequestCount); } } + public Task Abort(HttpContext context) + { + context.Abort(); + return Task.CompletedTask; + } + public async Task WaitingRequestCount(HttpContext context) { await context.Response.WriteAsync(_waitingRequestCount.ToString()); From 24e2e5ad52d97ac4c83037e8ea26d72b31133bb6 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 15 Oct 2018 11:44:51 -0700 Subject: [PATCH 335/363] Port startup tests to IIS (#1513) --- .../IISDeployer.cs | 24 ++++++++++++------- .../Utilities/AppVerifier.cs | 2 +- .../Utilities/EventLogHelpers.cs | 2 +- .../Utilities/Helpers.cs | 8 ++++++- .../Inprocess}/StartupTests.cs | 7 ++++++ 5 files changed, 32 insertions(+), 11 deletions(-) rename test/{IISExpress.FunctionalTests/InProcess => IIS.FunctionalTests/Inprocess}/StartupTests.cs (98%) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs index a2c3360cf4..4f2e525e72 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs @@ -119,12 +119,18 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS key: "hostingModel", value: DeploymentParameters.HostingModel.ToString()); - if (DeploymentParameters.ApplicationType == ApplicationType.Portable) - { - yield return WebConfigHelpers.AddOrModifyAspNetCoreSection( - "processPath", - DotNetCommands.GetDotNetExecutable(DeploymentParameters.RuntimeArchitecture)); - } + yield return (element, _) => { + var aspNetCore = element + .Descendants("system.webServer") + .Single() + .GetOrAdd("aspNetCore"); + + // Expand path to dotnet because IIS process would not inherit PATH variable + if (aspNetCore.Attribute("processPath")?.Value.StartsWith("dotnet") == true) + { + aspNetCore.SetAttributeValue("processPath", DotNetCommands.GetDotNetExecutable(DeploymentParameters.RuntimeArchitecture)); + } + }; yield return WebConfigHelpers.AddOrModifyHandlerSection( key: "modules", @@ -399,8 +405,10 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS redirectionSection.Attributes["enabled"].Value = false; serverManager.CommitChanges(); - - Directory.Delete(_configPath, true); + if (Directory.Exists(_configPath)) + { + Directory.Delete(_configPath, true); + } }); } } diff --git a/test/Common.FunctionalTests/Utilities/AppVerifier.cs b/test/Common.FunctionalTests/Utilities/AppVerifier.cs index ab059d789d..7984193e29 100644 --- a/test/Common.FunctionalTests/Utilities/AppVerifier.cs +++ b/test/Common.FunctionalTests/Utilities/AppVerifier.cs @@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting if (process.ExitCode != 0) { - throw new InvalidOperationException($"Exit code {process.ExitCode} when running {fileName} {arguments}. Stdout: {process.StandardOutput.ReadToEnd()}"); + throw new InvalidOperationException($"Exit code {process.ExitCode} when running {fileName} {arguments}. Stdout: {process.StandardOutput.ReadToEnd()} Stderr: {process.StandardError.ReadToEnd()}"); } } diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index cf977b76f4..78c77fd2ca 100644 --- a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -146,7 +146,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string InProcessFailedToStop(IISDeploymentResult deploymentResult, string reason) { - return "Failed to gracefully shutdown application 'MACHINE/WEBROOT/APPHOST/HTTPTESTSITE'."; + return "Failed to gracefully shutdown application 'MACHINE/WEBROOT/APPHOST/.*?'."; } public static string InProcessThreadException(IISDeploymentResult deploymentResult, string reason) diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index f3cf2ba70d..4918a12781 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests @@ -203,5 +202,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var output = JsonConvert.SerializeObject(depsFileContent); File.WriteAllText(path, output); } + + public static void AllowNoLogs(this IISDeploymentResult deploymentResult) + { + File.AppendAllText( + Path.Combine(deploymentResult.DeploymentParameters.PublishedApplicationRootPath, "aspnetcore-debug.log"), + "Running test allowed log file to be empty." + Environment.NewLine); + } } } diff --git a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs b/test/IIS.FunctionalTests/Inprocess/StartupTests.cs similarity index 98% rename from test/IISExpress.FunctionalTests/InProcess/StartupTests.cs rename to test/IIS.FunctionalTests/Inprocess/StartupTests.cs index 037ab8eb2e..880a260582 100644 --- a/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs +++ b/test/IIS.FunctionalTests/Inprocess/StartupTests.cs @@ -120,9 +120,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task StartsWithPortableAndBootstraperExe() { var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + // We need the right dotnet on the path in IIS + deploymentParameters.EnvironmentVariables["PATH"] = Path.GetDirectoryName(DotNetCommands.GetDotNetExecutable(deploymentParameters.RuntimeArchitecture)); + // rest publisher as it doesn't support additional parameters deploymentParameters.ApplicationPublisher = null; // ReferenceTestTasks is workaround for https://github.com/dotnet/sdk/issues/2482 @@ -302,6 +306,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var result = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); Assert.Equal(HttpStatusCode.InternalServerError, result.StatusCode); + // Config load errors might not allow us to initialize log file + deploymentResult.AllowNoLogs(); + StopServer(); EventLogHelpers.VerifyEventLogEvents(deploymentResult, From 03084f8937855091578eaf1748f498633b6b5a0e Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 15 Oct 2018 14:45:30 -0700 Subject: [PATCH 336/363] Port more tests to IIS (#1518) --- .../Inprocess}/ErrorPagesTests.cs | 0 .../OutOfProcess/GlobalVersionTests.cs | 12 +----------- 2 files changed, 1 insertion(+), 11 deletions(-) rename test/{IISExpress.FunctionalTests/InProcess => Common.FunctionalTests/Inprocess}/ErrorPagesTests.cs (100%) rename test/{IISExpress.FunctionalTests => Common.FunctionalTests}/OutOfProcess/GlobalVersionTests.cs (94%) diff --git a/test/IISExpress.FunctionalTests/InProcess/ErrorPagesTests.cs b/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/InProcess/ErrorPagesTests.cs rename to test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs similarity index 94% rename from test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs rename to test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index 4757c1d59b..cb76b503c5 100644 --- a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -33,18 +33,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task GlobalVersion_DefaultWorks() { var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); - deploymentParameters.PublishApplicationBeforeDeployment = false; - deploymentParameters.AddServerConfigAction( - element => - { - var handlerVersionElement = new XElement("handlerSetting"); - handlerVersionElement.SetAttributeValue("name", "handlerVersion"); - handlerVersionElement.SetAttributeValue("value", _handlerVersion20); - - element.Descendants("aspNetCore").Single() - .Add(new XElement("handlerSettings", handlerVersionElement)); - }); + deploymentParameters.HandlerSettings["handlerVersion"] = _handlerVersion20; var deploymentResult = await DeployAsync(deploymentParameters); From 3ae18fb53975d7287a33e6bef3e5bd16f4998698 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 16 Oct 2018 09:26:16 -0700 Subject: [PATCH 337/363] Add skip conditions (#1520) --- test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs | 4 ++++ test/IIS.FunctionalTests/Inprocess/StartupTests.cs | 2 ++ 2 files changed, 6 insertions(+) diff --git a/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs b/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs index 7669e7034a..6b0e0b93b2 100644 --- a/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs +++ b/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs @@ -23,6 +23,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task IncludesAdditionalErrorPageTextInProcessHandlerLoadFailure() { var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); @@ -37,6 +38,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task IncludesAdditionalErrorPageTextOutOfProcessStartupFailure() { var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); @@ -51,6 +53,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task IncludesAdditionalErrorPageTextOutOfProcessHandlerLoadFailure() { var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); @@ -69,6 +72,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task IncludesAdditionalErrorPageTextInProcessStartupFailure() { var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); diff --git a/test/IIS.FunctionalTests/Inprocess/StartupTests.cs b/test/IIS.FunctionalTests/Inprocess/StartupTests.cs index 880a260582..fd77a400e3 100644 --- a/test/IIS.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IIS.FunctionalTests/Inprocess/StartupTests.cs @@ -31,6 +31,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private readonly string _dotnetLocation = DotNetCommands.GetDotNetExecutable(RuntimeArchitecture.x64); [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task ExpandEnvironmentVariableInWebConfig() { // Point to dotnet installed in user profile. @@ -90,6 +91,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalTheory] [InlineData("dotnet")] [InlineData("dotnet.EXE")] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] public async Task StartsWithDotnetOnThePath(string path) { var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); From 9a9a504da348d96968235ac124b125e04fc04594 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 16 Oct 2018 12:48:15 -0700 Subject: [PATCH 338/363] Update package branding for 2.2 RTM --- version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.props b/version.props index 378470ee63..6ccce8b1c1 100644 --- a/version.props +++ b/version.props @@ -7,7 +7,7 @@ 12 $(DotNetMinorVersion) $(DotNetPatchVersion) - preview3 + rtm $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From 6d076dafae199ec0a8e7c55bc237bbf718385031 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 16 Oct 2018 15:25:27 -0700 Subject: [PATCH 339/363] Update certificate info for .zip and .mof files --- build/repo.targets | 3 ++- korebuild-lock.txt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/repo.targets b/build/repo.targets index 7c93b5b9a8..5b63ccb152 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -64,8 +64,9 @@ noship - + + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 49afc832d9..e3cc145b03 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview2-20181011.10 -commithash:224e1163a1145b60f324e0b432419ef4ba4880cc +version:2.2.0-preview2-20181016.3 +commithash:17ee7986dbe75408d9e4efd94eab1003adcc3ad7 From 8f99140f308fa2cef5f49360694fb924f87d2cfb Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 16 Oct 2018 15:30:19 -0700 Subject: [PATCH 340/363] Add client disconnect logs (#1521) --- .../Core/IISHttpContext.IO.cs | 8 +++- .../Core/IISHttpContext.Log.cs | 39 +++++++++++++++++++ .../Core/IISHttpContext.cs | 10 ++++- .../Core/IISHttpContextOfT.cs | 5 ++- .../Core/IISHttpServer.cs | 8 ++-- test/IIS.Tests/ClientDisconnectTests.cs | 18 ++++++++- 6 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs index 724d2e55e1..bfe44d634c 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs @@ -6,6 +6,7 @@ using System.Buffers; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Http.Features; namespace Microsoft.AspNetCore.Server.IIS.Core { @@ -121,6 +122,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core catch (Exception ex) { error = ex; + Log.UnexpectedError(_logger, nameof(IISHttpContext), ex); } finally { @@ -174,6 +176,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core catch (Exception ex) { error = ex; + Log.UnexpectedError(_logger, nameof(IISHttpContext), ex); } finally { @@ -199,9 +202,9 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { cts.Cancel(); } - catch (Exception) + catch (Exception ex) { - // ignore + Log.ApplicationError(_logger, ((IHttpConnectionFeature)this).ConnectionId, TraceIdentifier, ex); } }); } @@ -219,6 +222,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core internal void ConnectionReset() { AbortIO(); + Log.ConnectionDisconnect(_logger, ((IHttpConnectionFeature)this).ConnectionId); } } } diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs new file mode 100644 index 0000000000..1056ac1479 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs @@ -0,0 +1,39 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Runtime.CompilerServices; +using Microsoft.Extensions.Logging; + +namespace Microsoft.AspNetCore.Server.IIS.Core +{ + internal abstract partial class IISHttpContext + { + private static class Log + { + private static readonly Action _connectionDisconnect = + LoggerMessage.Define(LogLevel.Debug, new EventId(1, "ConnectionDisconnect"), @"Connection ID ""{ConnectionId}"" disconnecting."); + + private static readonly Action _applicationError = + LoggerMessage.Define(LogLevel.Error, new EventId(2, "ApplicationError"), @"Connection ID ""{ConnectionId}"", Request ID ""{TraceIdentifier}"": An unhandled exception was thrown by the application."); + + private static readonly Action _unexpectedError = + LoggerMessage.Define(LogLevel.Error, new EventId(3, "UnexpectedError"), @"Unexpected exception in ""{ClassName}.{MethodName}""."); + + public static void ConnectionDisconnect(ILogger logger, string connectionId) + { + _connectionDisconnect(logger, connectionId, null); + } + + public static void ApplicationError(ILogger logger, string connectionId, string traceIdentifier, Exception ex) + { + _applicationError(logger, connectionId, traceIdentifier, ex); + } + + public static void UnexpectedError(ILogger logger, string className, Exception ex, [CallerMemberName] string methodName = null) + { + _unexpectedError(logger, className, methodName, ex); + } + } + } +} diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs index 01aeeebec6..09e478a989 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs @@ -17,9 +17,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.HttpSys.Internal; using Microsoft.AspNetCore.Server.IIS.Core.IO; using Microsoft.AspNetCore.WebUtilities; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.IIS.Core { @@ -50,6 +52,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private readonly MemoryPool _memoryPool; private readonly IISHttpServer _server; + private readonly ILogger _logger; + private GCHandle _thisHandle; protected Task _readBodyTask; protected Task _writeBodyTask; @@ -69,13 +73,15 @@ namespace Microsoft.AspNetCore.Server.IIS.Core MemoryPool memoryPool, IntPtr pInProcessHandler, IISServerOptions options, - IISHttpServer server) + IISHttpServer server, + ILogger logger) : base((HttpApiTypes.HTTP_REQUEST*)NativeMethods.HttpGetRawRequest(pInProcessHandler)) { _memoryPool = memoryPool; _pInProcessHandler = pInProcessHandler; _options = options; _server = server; + _logger = logger; } public Version HttpVersion { get; set; } @@ -450,6 +456,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { _applicationException = new AggregateException(_applicationException, ex); } + + Log.ApplicationError(_logger, ((IHttpConnectionFeature)this).ConnectionId, TraceIdentifier, ex); } public void PostCompletion(NativeMethods.REQUEST_NOTIFICATION_STATUS requestNotificationStatus) diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs index ec3fc006b2..bb104f5ac1 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs @@ -7,6 +7,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.IIS.Core { @@ -14,8 +15,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { private readonly IHttpApplication _application; - public IISHttpContextOfT(MemoryPool memoryPool, IHttpApplication application, IntPtr pInProcessHandler, IISServerOptions options, IISHttpServer server) - : base(memoryPool, pInProcessHandler, options, server) + public IISHttpContextOfT(MemoryPool memoryPool, IHttpApplication application, IntPtr pInProcessHandler, IISServerOptions options, IISHttpServer server, ILogger logger) + : base(memoryPool, pInProcessHandler, options, server, logger) { _application = application; } diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs index 7cde852570..bfabf61bd7 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs @@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core { _httpServerHandle = GCHandle.Alloc(this); - _iisContextFactory = new IISContextFactory(_memoryPool, application, _options, this); + _iisContextFactory = new IISContextFactory(_memoryPool, application, _options, this, _logger); _nativeApplication.RegisterCallbacks(_requestHandler, _shutdownHandler, _onDisconnect, _onAsyncCompletion, (IntPtr)_httpServerHandle, (IntPtr)_httpServerHandle); return Task.CompletedTask; } @@ -260,18 +260,20 @@ namespace Microsoft.AspNetCore.Server.IIS.Core private readonly MemoryPool _memoryPool; private readonly IISServerOptions _options; private readonly IISHttpServer _server; + private readonly ILogger _logger; - public IISContextFactory(MemoryPool memoryPool, IHttpApplication application, IISServerOptions options, IISHttpServer server) + public IISContextFactory(MemoryPool memoryPool, IHttpApplication application, IISServerOptions options, IISHttpServer server, ILogger logger) { _application = application; _memoryPool = memoryPool; _options = options; _server = server; + _logger = logger; } public IISHttpContext CreateHttpContext(IntPtr pInProcessHandler) { - return new IISHttpContextOfT(_memoryPool, _application, pInProcessHandler, _options, _server); + return new IISHttpContextOfT(_memoryPool, _application, pInProcessHandler, _options, _server, _logger); } } } diff --git a/test/IIS.Tests/ClientDisconnectTests.cs b/test/IIS.Tests/ClientDisconnectTests.cs index 2731c5665e..d8c7d4ef89 100644 --- a/test/IIS.Tests/ClientDisconnectTests.cs +++ b/test/IIS.Tests/ClientDisconnectTests.cs @@ -17,7 +17,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] public class ClientDisconnectTests : StrictTestServerTests { - [ConditionalFact] public async Task WritesSucceedAfterClientDisconnect() { @@ -48,6 +47,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await requestCompletedCompletionSource.Task.DefaultTimeout(); } + + AssertConnectionDisconnectLog(); } [ConditionalFact] @@ -88,6 +89,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.IsType(exception); } + + AssertConnectionDisconnectLog(); } [ConditionalFact] @@ -125,6 +128,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.IsType(exception); Assert.Equal("The client has disconnected", exception.Message); + + AssertConnectionDisconnectLog(); } [ConditionalFact] @@ -202,6 +207,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } Assert.IsType(exception); } + + AssertConnectionDisconnectLog(); } [ConditionalFact] @@ -253,6 +260,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.IsType(exception); Assert.Equal("The client has disconnected", exception.Message); + AssertConnectionDisconnectLog(); } [ConditionalFact] @@ -275,7 +283,15 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } await requestAborted.Task; } + + AssertConnectionDisconnectLog(); } + + private void AssertConnectionDisconnectLog() + { + Assert.Contains(TestSink.Writes, w => w.EventId.Name == "ConnectionDisconnect"); + } + private static async Task SendContentLength1Post(TestConnection connection) { await connection.Send( From 48d40e0e3650e6dc23ba516203f316bb52c80b4c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 18 Oct 2018 08:49:52 -0700 Subject: [PATCH 341/363] Add mitigations to HttpsClientCert_GetCertInformation flakiness (#1529) --- .../Properties/launchSettings.json | 10 +- .../ClientCertificateFixture.cs | 97 +++++++++---------- .../ClientCertificateTests.cs | 37 +++++-- 3 files changed, 83 insertions(+), 61 deletions(-) diff --git a/samples/NativeIISSample/Properties/launchSettings.json b/samples/NativeIISSample/Properties/launchSettings.json index f62697de39..246b7a0b47 100644 --- a/samples/NativeIISSample/Properties/launchSettings.json +++ b/samples/NativeIISSample/Properties/launchSettings.json @@ -14,8 +14,8 @@ "commandLineArgs": "$(IISExpressArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", @@ -29,9 +29,9 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AncmPath)", - "ANCMV2_PATH": "$(AncmV2Path)", - "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", "ASPNETCORE_ENVIRONMENT": "Development", "LAUNCHER_PATH": "$(DotNetPath)", diff --git a/test/Common.FunctionalTests/ClientCertificateFixture.cs b/test/Common.FunctionalTests/ClientCertificateFixture.cs index 4979865e8b..40b6f2265e 100644 --- a/test/Common.FunctionalTests/ClientCertificateFixture.cs +++ b/test/Common.FunctionalTests/ClientCertificateFixture.cs @@ -11,68 +11,57 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public class ClientCertificateFixture : IDisposable { private X509Certificate2 _certificate; + private const string _certIssuerPrefix = "CN=IISIntegrationTest_Root"; - public X509Certificate2 Certificate + public X509Certificate2 GetOrCreateCertificate() { - get + if (_certificate != null) { - if (_certificate != null) - { - return _certificate; - } + return _certificate; + } - using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) - { - store.Open(OpenFlags.ReadWrite); + using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) + { + store.Open(OpenFlags.ReadWrite); + var parentKey = CreateKeyMaterial(2048); - foreach (var cert in store.Certificates) - { - if (cert.Issuer != "CN=IISIntegrationTest_Root") - { - continue; - } - _certificate = cert; - store.Close(); - return cert; - } + // Create a cert name with a random guid to avoid name conflicts + var parentRequest = new CertificateRequest( + _certIssuerPrefix + Guid.NewGuid().ToString(), + parentKey, HashAlgorithmName.SHA256, + RSASignaturePadding.Pkcs1); - var parentKey = CreateKeyMaterial(2048); + parentRequest.CertificateExtensions.Add( + new X509BasicConstraintsExtension( + certificateAuthority: true, + hasPathLengthConstraint: false, + pathLengthConstraint: 0, + critical: true)); - // On first run of the test, creates the certificate in the trusted root certificate authorities. - var parentRequest = new CertificateRequest("CN=IISIntegrationTest_Root", parentKey, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); + parentRequest.CertificateExtensions.Add( + new X509KeyUsageExtension(X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.NonRepudiation, critical: true)); - parentRequest.CertificateExtensions.Add( - new X509BasicConstraintsExtension( - certificateAuthority: true, - hasPathLengthConstraint: false, - pathLengthConstraint: 0, - critical: true)); + parentRequest.CertificateExtensions.Add( + new X509SubjectKeyIdentifierExtension(parentRequest.PublicKey, false)); - parentRequest.CertificateExtensions.Add( - new X509KeyUsageExtension(X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.NonRepudiation, critical: true)); + var notBefore = DateTimeOffset.Now.AddDays(-1); + var notAfter = DateTimeOffset.Now.AddYears(5); - parentRequest.CertificateExtensions.Add( - new X509SubjectKeyIdentifierExtension(parentRequest.PublicKey, false)); + var parentCert = parentRequest.CreateSelfSigned(notBefore, notAfter); - var notBefore = DateTimeOffset.Now.AddDays(-1); - var notAfter = DateTimeOffset.Now.AddYears(5); + // Need to export/import the certificate to associate the private key with the cert. + var imported = parentCert; - var parentCert = parentRequest.CreateSelfSigned(notBefore, notAfter); + var export = parentCert.Export(X509ContentType.Pkcs12, ""); + imported = new X509Certificate2(export, "", X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable); + Array.Clear(export, 0, export.Length); - // Need to export/import the certificate to associate the private key with the cert. - var imported = parentCert; + // Add the cert to the cert store + _certificate = imported; - var export = parentCert.Export(X509ContentType.Pkcs12, ""); - imported = new X509Certificate2(export, "", X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable); - Array.Clear(export, 0, export.Length); - - // Add the cert to the cert store - _certificate = imported; - - store.Add(certificate: imported); - store.Close(); - return imported; - } + store.Add(certificate: imported); + store.Close(); + return imported; } } @@ -86,7 +75,17 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) { store.Open(OpenFlags.ReadWrite); - store.Remove(Certificate); + store.Remove(_certificate); + + // Remove any extra certs that were left by previous tests. + for (var i = store.Certificates.Count - 1; i >= 0; i--) + { + var cert = store.Certificates[i]; + if (cert.Issuer.StartsWith(_certIssuerPrefix)) + { + store.Remove(cert); + } + } store.Close(); } } diff --git a/test/Common.FunctionalTests/ClientCertificateTests.cs b/test/Common.FunctionalTests/ClientCertificateTests.cs index 289fb18c2f..43ccc83eff 100644 --- a/test/Common.FunctionalTests/ClientCertificateTests.cs +++ b/test/Common.FunctionalTests/ClientCertificateTests.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.Net.Http; +using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; @@ -9,6 +11,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; using Xunit; namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests @@ -54,31 +57,51 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests deploymentParameters.ApplicationBaseUriHint = $"https://localhost:{port}/"; deploymentParameters.AddHttpsToServerConfig(); - var deploymentResult = await DeployAsync(deploymentParameters); var handler = new HttpClientHandler { ServerCertificateCustomValidationCallback = (a, b, c, d) => true, ClientCertificateOptions = ClientCertificateOption.Manual, }; + X509Certificate2 cert = null; if (sendClientCert) { - Assert.NotNull(_certFixture.Certificate); - handler.ClientCertificates.Add(_certFixture.Certificate); + cert = _certFixture.GetOrCreateCertificate(); + handler.ClientCertificates.Add(cert); } + var deploymentResult = await DeployAsync(deploymentParameters); + var client = deploymentResult.CreateClient(handler); var response = await client.GetAsync("GetClientCert"); var responseText = await response.Content.ReadAsStringAsync(); - if (sendClientCert) + try { - Assert.Equal($"Enabled;{_certFixture.Certificate.GetCertHashString()}", responseText); + if (sendClientCert) + { + Assert.Equal($"Enabled;{cert.GetCertHashString()}", responseText); + } + else + { + Assert.Equal("Disabled", responseText); + } } - else + catch (Exception ex) { - Assert.Equal("Disabled", responseText); + Logger.LogError($"Certificate is invalid. Issuer name: {cert.Issuer}"); + using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) + { + Logger.LogError($"List of current certificates in root store:"); + store.Open(OpenFlags.ReadWrite); + foreach (var otherCert in store.Certificates) + { + Logger.LogError(otherCert.Issuer); + } + store.Close(); + } + throw ex; } } } From 55d849a0d0c085c1ebb82bdce10247329b9541fe Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 18 Oct 2018 12:17:32 -0700 Subject: [PATCH 342/363] Add compression pass through tests (#1525) --- build/dependencies.props | 3 +- .../CompressionTests.cs | 58 +++++++++++++++++++ .../Inprocess/CompressionTests.cs | 4 +- .../InProcessWebSite/InProcessWebSite.csproj | 1 + .../OutOfProcessWebSite.csproj | 1 + .../StressTestWebSite.csproj | 3 +- .../shared/SharedStartup/Startup.shared.cs | 18 ++++++ 7 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 test/Common.FunctionalTests/CompressionTests.cs diff --git a/build/dependencies.props b/build/dependencies.props index b4708cadc2..5c5ee5437f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) @@ -15,6 +15,7 @@ 2.2.0-preview3-35496 2.2.0-preview3-35496 2.2.0-preview3-35496 + 2.2.0-preview3-35496 0.6.0-preview3-35496 2.2.0-preview3-35496 2.2.0-preview3-35496 diff --git a/test/Common.FunctionalTests/CompressionTests.cs b/test/Common.FunctionalTests/CompressionTests.cs new file mode 100644 index 0000000000..c2d0277c4c --- /dev/null +++ b/test/Common.FunctionalTests/CompressionTests.cs @@ -0,0 +1,58 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Linq; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISCompressionSiteCollection.Name)] + public abstract class CompressionTests : FixtureLoggedTest + { + private readonly IISTestSiteFixture _fixture; + + [Collection(IISTestSiteCollection.Name)] + public class InProc: CompressionTests + { + public InProc(IISTestSiteFixture fixture) : base(fixture) { } + } + + [Collection(OutOfProcessTestSiteCollection.Name)] + public class OutOfProcess: CompressionTests + { + public OutOfProcess(OutOfProcessTestSiteFixture fixture) : base(fixture) { } + } + + [Collection(OutOfProcessV1TestSiteCollection.Name)] + public class OutOfProcessV1: CompressionTests + { + public OutOfProcessV1(OutOfProcessV1TestSiteFixture fixture) : base(fixture) { } + } + + protected CompressionTests(IISTestSiteFixture fixture) : base(fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task PassesThroughCompression() + { + var request = new HttpRequestMessage(HttpMethod.Get, "/CompressedData"); + + request.Headers.AcceptEncoding.Add(new StringWithQualityHeaderValue("gzip")); + + var response = await _fixture.Client.SendAsync(request); + Assert.Equal("gzip", response.Content.Headers.ContentEncoding.Single()); + Assert.Equal( + new byte[] { + 0x1F, 0x8B, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x04, 0x0B, 0x63, 0x60, 0xA0, 0x3D, 0x00, 0x00, + 0xCA, 0xC6, 0x88, 0x99, 0x64, 0x00, 0x00, 0x00 }, + await response.Content.ReadAsByteArrayAsync()); + } + } +} diff --git a/test/Common.FunctionalTests/Inprocess/CompressionTests.cs b/test/Common.FunctionalTests/Inprocess/CompressionTests.cs index 1a1218a526..ce1c84e609 100644 --- a/test/Common.FunctionalTests/Inprocess/CompressionTests.cs +++ b/test/Common.FunctionalTests/Inprocess/CompressionTests.cs @@ -13,11 +13,11 @@ using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [Collection(IISCompressionSiteCollection.Name)] - public class CompressionTests : FixtureLoggedTest + public class CompressionModuleTests : FixtureLoggedTest { private readonly IISCompressionSiteFixture _fixture; - public CompressionTests(IISCompressionSiteFixture fixture): base(fixture) + public CompressionModuleTests(IISCompressionSiteFixture fixture): base(fixture) { _fixture = fixture; } diff --git a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj index a8e89bf438..d007d2daa1 100644 --- a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj +++ b/test/WebSites/InProcessWebSite/InProcessWebSite.csproj @@ -20,6 +20,7 @@ + diff --git a/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj index 36ca6e2b54..14beb7394e 100644 --- a/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj +++ b/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj @@ -19,6 +19,7 @@ + diff --git a/test/WebSites/StressTestWebSite/StressTestWebSite.csproj b/test/WebSites/StressTestWebSite/StressTestWebSite.csproj index 9a1ed0692f..25ae032221 100644 --- a/test/WebSites/StressTestWebSite/StressTestWebSite.csproj +++ b/test/WebSites/StressTestWebSite/StressTestWebSite.csproj @@ -1,4 +1,4 @@ - + @@ -16,6 +16,7 @@ + diff --git a/test/WebSites/shared/SharedStartup/Startup.shared.cs b/test/WebSites/shared/SharedStartup/Startup.shared.cs index 4035decb02..b5d7f0305f 100644 --- a/test/WebSites/shared/SharedStartup/Startup.shared.cs +++ b/test/WebSites/shared/SharedStartup/Startup.shared.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; @@ -15,6 +16,11 @@ namespace TestSite { public partial class Startup { + public void ConfigureServices(IServiceCollection serviceCollection) + { + serviceCollection.AddResponseCompression(); + } + private async Task HostingEnvironment(HttpContext ctx) { var hostingEnv = ctx.RequestServices.GetService(); @@ -95,5 +101,17 @@ namespace TestSite context.Response.Headers["Server"] = "MyServer/7.8"; return Task.CompletedTask; } + + public void CompressedData(IApplicationBuilder builder) + { + builder.UseResponseCompression(); + // write random bytes to check that compressed data is passed through + builder.Run( + async context => + { + context.Response.ContentType = "text/html"; + await context.Response.Body.WriteAsync(new byte[100], 0, 100); + }); + } } } From 293d165a8012c2bfda0930b3f28920f319bcd8c6 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 18 Oct 2018 12:37:13 -0700 Subject: [PATCH 343/363] Fix flaky disconnect test (#1533) --- .../Core/IISHttpContext.IO.cs | 12 ++++++++---- .../Core/IO/AsyncIOEngine.cs | 4 +++- test/IIS.Tests/ClientDisconnectTests.cs | 6 +----- test/IIS.Tests/TestServerTest.cs | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs index bfe44d634c..e945500672 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs @@ -184,11 +184,11 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } } - private void AbortIO() + private bool AbortIO() { if (Interlocked.CompareExchange(ref _requestAborted, 1, 0) != 0) { - return; + return false; } _bodyOutput.Dispose(); @@ -208,6 +208,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core } }); } + + return true; } public void Abort(Exception reason) @@ -221,8 +223,10 @@ namespace Microsoft.AspNetCore.Server.IIS.Core internal void ConnectionReset() { - AbortIO(); - Log.ConnectionDisconnect(_logger, ((IHttpConnectionFeature)this).ConnectionId); + if (AbortIO()) + { + Log.ConnectionDisconnect(_logger, ((IHttpConnectionFeature)this).ConnectionId); + } } } } diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs index e7a01b331d..f169cebf77 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs @@ -52,7 +52,9 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO { if (_stopped) { - throw new IOException("IO stopped", NativeMethods.ERROR_OPERATION_ABORTED); + // Abort all operation after IO was stopped + ioOperation.Complete(NativeMethods.ERROR_OPERATION_ABORTED, 0); + return; } if (_runningOperation != null) diff --git a/test/IIS.Tests/ClientDisconnectTests.cs b/test/IIS.Tests/ClientDisconnectTests.cs index d8c7d4ef89..dbe562aa7c 100644 --- a/test/IIS.Tests/ClientDisconnectTests.cs +++ b/test/IIS.Tests/ClientDisconnectTests.cs @@ -2,13 +2,11 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.IO; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests @@ -207,8 +205,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } Assert.IsType(exception); } - - AssertConnectionDisconnectLog(); } [ConditionalFact] @@ -289,7 +285,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private void AssertConnectionDisconnectLog() { - Assert.Contains(TestSink.Writes, w => w.EventId.Name == "ConnectionDisconnect"); + Assert.Single(TestSink.Writes, w => w.EventId.Name == "ConnectionDisconnect"); } private static async Task SendContentLength1Post(TestConnection connection) diff --git a/test/IIS.Tests/TestServerTest.cs b/test/IIS.Tests/TestServerTest.cs index c168af99d8..40b538ea52 100644 --- a/test/IIS.Tests/TestServerTest.cs +++ b/test/IIS.Tests/TestServerTest.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [SkipIfHostableWebCoreNotAvailable] [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] - public class TestServerTest : LoggedTest + public class TestServerTest : StrictTestServerTests { [ConditionalFact] public async Task SingleProcessTestServer_HelloWorld() From b92c82e97f19f77c95752340066a64a337551e6d Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 18 Oct 2018 13:58:56 -0700 Subject: [PATCH 344/363] Add static shim test (#1505) --- .appveyor.yml | 2 +- .vsts-pipelines/templates/build-steps.yml | 1 + IISIntegration.NoV1.sln | 17 +++++- IISIntegration.sln | 23 ++++++++ build/build.msbuild | 34 ----------- build/buildpipeline/pipeline.groovy | 2 + build/buildpipeline/windows-staticshim.groovy | 15 +++++ build/buildpipeline/windows.groovy | 2 +- build/dependencies.props | 5 +- build/functional-test-assets.targets | 10 ++++ build/repo.props | 12 ++++ build/testsite.props | 1 - ...tCore.Server.IntegrationTesting.IIS.csproj | 29 +++------- .../Inprocess/StartupTests.cs | 0 .../OutOfProcess/GlobalVersionTests.cs | 1 + .../BackwardsCompatibilityTests.cs | 49 ++++++++++++++++ ...kwardsCompatibility.FunctionalTests.csproj | 56 +++++++++++++++++++ .../RequiresNewShim.cs | 17 ++++++ .../IIS.FunctionalTests.csproj | 3 + test/IIS.FunctionalTests/RequiresNewShim.cs | 17 ++++++ .../DeployerSelector.cs | 0 .../Inprocess/StdOutRedirectionTests.cs | 0 .../MofFileTests.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RequiresIISAttribute.cs | 2 +- .../ServicesTests.cs | 0 test/IIS.Tests/IIS.Tests.csproj | 5 +- .../IISExpress.FunctionalTests.csproj | 2 + .../RequiresNewShim.cs | 17 ++++++ 29 files changed, 258 insertions(+), 64 deletions(-) delete mode 100644 build/build.msbuild create mode 100644 build/buildpipeline/windows-staticshim.groovy create mode 100644 build/functional-test-assets.targets rename test/{IIS.FunctionalTests => Common.FunctionalTests}/Inprocess/StartupTests.cs (100%) create mode 100644 test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs create mode 100644 test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj create mode 100644 test/IIS.BackwardsCompatibility.FunctionalTests/RequiresNewShim.cs create mode 100644 test/IIS.FunctionalTests/RequiresNewShim.cs rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/DeployerSelector.cs (100%) rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/Inprocess/StdOutRedirectionTests.cs (100%) rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/MofFileTests.cs (100%) rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/Properties/AssemblyInfo.cs (100%) rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/RequiresIISAttribute.cs (99%) rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/ServicesTests.cs (100%) create mode 100644 test/IISExpress.FunctionalTests/RequiresNewShim.cs diff --git a/.appveyor.yml b/.appveyor.yml index 2bc93c45a8..f67ca4c0d5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -16,7 +16,7 @@ install: - git submodule update --init --recursive - net start w3svc build_script: - - ps: .\run.ps1 default-build + - ps: .\run.ps1 default-build /p:SkipIISBackwardsCompatibilityTests=true clone_depth: 1 environment: global: diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml index 36219f533b..780a42a356 100644 --- a/.vsts-pipelines/templates/build-steps.yml +++ b/.vsts-pipelines/templates/build-steps.yml @@ -2,6 +2,7 @@ phases: - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools parameters: agentOs: Windows + buildArgs: /p:SkipIISBackwardsCompatibilityTests=true beforeBuild: - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup" displayName: Prepare repo diff --git a/IISIntegration.NoV1.sln b/IISIntegration.NoV1.sln index cbe801fc32..2ee59d14bf 100644 --- a/IISIntegration.NoV1.sln +++ b/IISIntegration.NoV1.sln @@ -36,10 +36,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E ProjectSection(SolutionItems) = preProject build\applicationhost.config = build\applicationhost.config build\applicationhost.iis.config = build\applicationhost.iis.config - build\build.msbuild = build\build.msbuild build\Build.Settings = build\Build.Settings build\Config.Definitions.Props = build\Config.Definitions.Props build\dependencies.props = build\dependencies.props + build\functional-test-assets.targets = build\functional-test-assets.targets build\Key.snk = build\Key.snk build\launchSettings.json = build\launchSettings.json build\native.targets = build\native.targets @@ -113,6 +113,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "test\IIS.Tests EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "test\Common.Tests\Common.Tests.csproj", "{D17B7B35-5361-4A50-B499-E03E5C3CC095}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility.FunctionalTests", "test\IIS.BackwardsCompatibility.FunctionalTests\IIS.BackwardsCompatibility.FunctionalTests.csproj", "{582B07BC-73F4-4689-8557-B039298BD82C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -383,6 +385,18 @@ Global {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x64.Build.0 = Release|Any CPU {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x86.ActiveCfg = Release|Any CPU {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x86.Build.0 = Release|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x64.ActiveCfg = Debug|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x64.Build.0 = Debug|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x86.ActiveCfg = Debug|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x86.Build.0 = Debug|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|Any CPU.Build.0 = Release|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|x64.ActiveCfg = Release|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|x64.Build.0 = Release|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|x86.ActiveCfg = Release|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -413,6 +427,7 @@ Global {34135ED7-313D-4E68-860C-D6B51AA28523} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {C0310D84-BC2F-4B2E-870E-D35044DB3E3E} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {D17B7B35-5361-4A50-B499-E03E5C3CC095} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {582B07BC-73F4-4689-8557-B039298BD82C} = {EF30B533-D715-421A-92B7-92FEF460AC9C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/IISIntegration.sln b/IISIntegration.sln index 34a5050f7e..6e8b394d5a 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -121,6 +121,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "test\IIS.Tests EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "test\Common.Tests\Common.Tests.csproj", "{A641A208-2974-4E48-BCFF-54E3AAFA4FB9}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility.FunctionalTests", "test\IIS.BackwardsCompatibility.FunctionalTests\IIS.BackwardsCompatibility.FunctionalTests.csproj", "{28055B05-25D4-4F17-9F36-A1D09FDDA607}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -637,6 +639,26 @@ Global {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x64.Build.0 = Release|Any CPU {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x86.ActiveCfg = Release|Any CPU {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x86.Build.0 = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x64.ActiveCfg = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x64.Build.0 = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x86.ActiveCfg = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x86.Build.0 = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|x64.ActiveCfg = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|x86.ActiveCfg = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|Any CPU.Build.0 = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|x64.ActiveCfg = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|x86.ActiveCfg = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|Any CPU.Build.0 = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x64.ActiveCfg = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x64.Build.0 = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x86.ActiveCfg = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -670,6 +692,7 @@ Global {CE4FB142-91FB-4B34-BC96-A31120EF4009} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {A091777D-66B3-42E1-B95C-85322DE40706} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {A641A208-2974-4E48-BCFF-54E3AAFA4FB9} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {28055B05-25D4-4F17-9F36-A1D09FDDA607} = {EF30B533-D715-421A-92B7-92FEF460AC9C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/build/build.msbuild b/build/build.msbuild deleted file mode 100644 index c97f1a53b5..0000000000 --- a/build/build.msbuild +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/buildpipeline/pipeline.groovy b/build/buildpipeline/pipeline.groovy index 7ccbca0b2a..7d4b4aef15 100644 --- a/build/buildpipeline/pipeline.groovy +++ b/build/buildpipeline/pipeline.groovy @@ -1,6 +1,7 @@ import org.dotnet.ci.pipelines.Pipeline def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') +def windowBackwardsCompatibilityPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows-BackwardsCompatibility.groovy') def configurations = [ 'Debug', @@ -15,4 +16,5 @@ configurations.each { configuration -> windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params) windowsPipeline.triggerPipelineOnGithubPush(params) + windowBackwardsCompatibilityPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params) } diff --git a/build/buildpipeline/windows-staticshim.groovy b/build/buildpipeline/windows-staticshim.groovy new file mode 100644 index 0000000000..b6b81e2f0b --- /dev/null +++ b/build/buildpipeline/windows-staticshim.groovy @@ -0,0 +1,15 @@ +@Library('dotnet-ci') _ + +// 'node' indicates to Jenkins that the enclosed block runs on a node that matches +// the label 'windows-with-vs' +simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { + stage ('Checking out source') { + checkout scm + bat 'git submodule update --init --recursive' + } + stage ('Build') { + def logFolder = getLogFolder() + def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" + bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:Configuration=${params.Configuration}\";" + } +} diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy index 35bb4737ae..cc42e9ab4f 100644 --- a/build/buildpipeline/windows.groovy +++ b/build/buildpipeline/windows.groovy @@ -10,6 +10,6 @@ simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { stage ('Build') { def logFolder = getLogFolder() def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" - bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\";" + bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:SkipIISBackwardsCompatibilityTests=true /p:Configuration=${params.Configuration}\";" } } diff --git a/build/dependencies.props b/build/dependencies.props index 5c5ee5437f..5f13736d12 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -54,5 +54,8 @@ 2.4.0 - + + 2.2.0-preview3-35458 + 2.2.0-preview3-35458 + diff --git a/build/functional-test-assets.targets b/build/functional-test-assets.targets new file mode 100644 index 0000000000..81fb82b4a3 --- /dev/null +++ b/build/functional-test-assets.targets @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/build/repo.props b/build/repo.props index 77073056a2..fd4d80cb7a 100644 --- a/build/repo.props +++ b/build/repo.props @@ -13,6 +13,18 @@ + + + + + + + + + + + + Internal.AspNetCore.Universe.Lineup diff --git a/build/testsite.props b/build/testsite.props index 1ef6bf81cc..74f205b4cf 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -23,7 +23,6 @@ x64 - - - - diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy index 35bb4737ae..cc42e9ab4f 100644 --- a/build/buildpipeline/windows.groovy +++ b/build/buildpipeline/windows.groovy @@ -10,6 +10,6 @@ simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { stage ('Build') { def logFolder = getLogFolder() def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" - bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\";" + bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:SkipIISBackwardsCompatibilityTests=true /p:Configuration=${params.Configuration}\";" } } diff --git a/build/dependencies.props b/build/dependencies.props index 0c79d2d27c..00e1e18cdf 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -54,6 +54,18 @@ 2.3.1 2.4.0 - + + + 2.2.0-preview3-35458 + 2.2.0-preview3-35458 + + + 2.1.0 + 2.1.0 + 2.1.0 + 2.1.0 + 4.5.2 + 4.5.0 + diff --git a/build/functional-test-assets.targets b/build/functional-test-assets.targets new file mode 100644 index 0000000000..81fb82b4a3 --- /dev/null +++ b/build/functional-test-assets.targets @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/build/repo.props b/build/repo.props index a0d69a9923..83212e12d6 100644 --- a/build/repo.props +++ b/build/repo.props @@ -2,7 +2,6 @@ - Microsoft400 $(BuildDir)AspNetCoreModule.zip $(BuildDir)StressTestWebSite.zip @@ -13,6 +12,18 @@ + + + + + + + + + + + + Internal.AspNetCore.Universe.Lineup diff --git a/build/repo.targets b/build/repo.targets index 5b63ccb152..3e937d6bf9 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -35,22 +35,28 @@ + + $(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg + $(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg + + - + NuGetPackage Microsoft.AspNetCore.AspNetCoreModule $(PackageVersion) $(RepositoryRoot) - + + - + NuGetPackage Microsoft.AspNetCore.AspNetCoreModuleV2 $(PackageVersion) $(RepositoryRoot) - + ZipArchive @@ -66,7 +72,7 @@ - + diff --git a/build/testsite.props b/build/testsite.props index 1ef6bf81cc..74f205b4cf 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -23,7 +23,6 @@ x64 - Internal.AspNetCore.Universe.Lineup diff --git a/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs b/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs index 936ad852ac..bf45949491 100644 --- a/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs +++ b/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs @@ -82,6 +82,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + [RequiresNewHandler] public async Task IncludesAdditionalErrorPageTextInProcessStartupFailure_CorrectString() { var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); diff --git a/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/test/Common.FunctionalTests/Inprocess/StartupTests.cs index 5ca1733443..3bcc134cb2 100644 --- a/test/Common.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/Common.FunctionalTests/Inprocess/StartupTests.cs @@ -233,7 +233,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessFailedToFindRequestHandler(deploymentResult), Logger); + if (DeployerSelector.IsForwardsCompatibilityTest) + { + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessFailedToFindNativeDependencies(deploymentResult), Logger); + } + else + { + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessFailedToFindRequestHandler(deploymentResult), Logger); + } } [ConditionalFact] diff --git a/test/IIS.FunctionalTests/RequiresNewShim.cs b/test/Common.FunctionalTests/RequiresNewHandler.cs similarity index 57% rename from test/IIS.FunctionalTests/RequiresNewShim.cs rename to test/Common.FunctionalTests/RequiresNewHandler.cs index 1765ba2d1e..cbe43ec0c7 100644 --- a/test/IIS.FunctionalTests/RequiresNewShim.cs +++ b/test/Common.FunctionalTests/RequiresNewHandler.cs @@ -2,16 +2,15 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] - public sealed class RequiresNewShimAttribute : Attribute, ITestCondition + public sealed class RequiresNewHandlerAttribute : Attribute, ITestCondition { - public bool IsMet => true; + public bool IsMet => !DeployerSelector.IsForwardsCompatibilityTest; - public string SkipReason => "IIS.FunctionalTests always run against new shim."; + public string SkipReason => "Test verifies new behavior in the aspnetcorev2_inprocess.dll that isn't supported in earlier versions."; } } diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/RequiresNewShim.cs b/test/Common.FunctionalTests/RequiresNewShim.cs similarity index 87% rename from test/IIS.BackwardsCompatibility.FunctionalTests/RequiresNewShim.cs rename to test/Common.FunctionalTests/RequiresNewShim.cs index f14085b05b..b0bc50a83b 100644 --- a/test/IIS.BackwardsCompatibility.FunctionalTests/RequiresNewShim.cs +++ b/test/Common.FunctionalTests/RequiresNewShim.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests @@ -10,7 +9,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] public sealed class RequiresNewShimAttribute : Attribute, ITestCondition { - public bool IsMet => false; + public bool IsMet => !DeployerSelector.IsBackwardsCompatiblityTest; public string SkipReason => "Test verifies new behavior in the aspnetcorev2.dll that isn't supported in earlier versions."; } diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs index 733030dbc8..1e31126eab 100644 --- a/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -28,7 +28,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"),"test", "WebSites", name); } - public static string GetInProcessTestSitesPath() => GetTestWebSitePath("InProcessWebSite"); + public static string GetInProcessTestSitesPath() + { + return DeployerSelector.IsForwardsCompatibilityTest ? GetTestWebSitePath("InProcessForwardsCompatWebSite") : GetTestWebSitePath("InProcessWebSite"); + } public static string GetOutOfProcessTestSitesPath() => GetTestWebSitePath("OutOfProcessWebSite"); diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs b/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs index a7243b0272..891c16c061 100644 --- a/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs +++ b/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs @@ -1,24 +1,20 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Diagnostics; -using System.IO; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; -using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Sdk; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { - [Collection(PublishedSitesCollection.Name)] - public class BackwardsCompatibilityTests : IISFunctionalTestBase + [Collection(IISTestSiteCollection.Name)] + public class BackwardsCompatibilityTests : FixtureLoggedTest { - private readonly PublishedSitesFixture _fixture; + private readonly IISTestSiteFixture _fixture; - public BackwardsCompatibilityTests(PublishedSitesFixture fixture) + public BackwardsCompatibilityTests(IISTestSiteFixture fixture) : base(fixture) { _fixture = fixture; } @@ -26,24 +22,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalFact] public async Task CheckBackwardsCompatibilityIsUsed() { - var iisDeploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); - iisDeploymentParameters.PreservePublishedApplicationForDebugging = true; - var deploymentResult = await DeployAsync(iisDeploymentParameters); + var response = await _fixture.Client.GetAsync("/HelloWorld"); + var handles = _fixture.DeploymentResult.HostProcess.Modules; - var arch = iisDeploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? $@"x64\aspnetcorev2.dll" : $@"x86\aspnetcorev2.dll"; - - var fileInfo = FileVersionInfo.GetVersionInfo(Path.Combine(AppContext.BaseDirectory, arch)); - var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); - var handles = deploymentResult.HostProcess.Modules; foreach (ProcessModule handle in handles) { if (handle.ModuleName == "aspnetcorev2.dll") { - Assert.Equal("12.2.18283.0", handle.FileVersionInfo.FileVersion); + Assert.Equal("12.2.18289.0", handle.FileVersionInfo.FileVersion); return; } } - throw new XunitException($"Could not find aspnetcorev2.dll loaded in process {deploymentResult.HostProcess.ProcessName}"); + throw new XunitException($"Could not find aspnetcorev2.dll loaded in process {_fixture.DeploymentResult.HostProcess.ProcessName}"); } } } diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs b/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs index b6dc197e8a..5c6f3739a4 100644 --- a/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs +++ b/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs @@ -9,5 +9,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public static ServerType ServerType => ServerType.IIS; public static bool IsBackwardsCompatiblityTest => true; + public static bool IsForwardsCompatibilityTest => false; } } diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj index 58708fa85f..d3e2bbc530 100644 --- a/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj +++ b/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj @@ -43,14 +43,4 @@ - - - - - - - PreserveNewest - - - diff --git a/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs b/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs new file mode 100644 index 0000000000..bd7aabbe0f --- /dev/null +++ b/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs @@ -0,0 +1,14 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Server.IntegrationTesting; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public static class DeployerSelector + { + public static ServerType ServerType => ServerType.IIS; + public static bool IsBackwardsCompatiblityTest => false; + public static bool IsForwardsCompatibilityTest => true; + } +} diff --git a/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs b/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs new file mode 100644 index 0000000000..52c7da80ad --- /dev/null +++ b/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs @@ -0,0 +1,38 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Diagnostics; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; +using Xunit.Sdk; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class ForwardsCompatibilityTests : FixtureLoggedTest + { + private readonly IISTestSiteFixture _fixture; + + public ForwardsCompatibilityTests(IISTestSiteFixture fixture) : base(fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task CheckForwardsCompatibilityIsUsed() + { + var response = await _fixture.Client.GetAsync("/HelloWorld"); + var handles = _fixture.DeploymentResult.HostProcess.Modules; + foreach (ProcessModule handle in handles) + { + if (handle.ModuleName == "aspnetcorev2_inprocess.dll") + { + Assert.Equal("12.2.18289.0", handle.FileVersionInfo.FileVersion); + return; + } + } + throw new XunitException($"Could not find aspnetcorev2_inprocess.dll loaded in process {_fixture.DeploymentResult.HostProcess.ProcessName}"); + } + } +} diff --git a/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj new file mode 100644 index 0000000000..929f6ec6b0 --- /dev/null +++ b/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj @@ -0,0 +1,45 @@ + + + + netcoreapp2.2 + IISForwardsCompatibility.FunctionalTests + True + + + + + + + + + + False + + + False + + + False + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/IIS.FunctionalTests/DeployerSelector.cs b/test/IIS.FunctionalTests/DeployerSelector.cs index 2359de7226..f2e1be321e 100644 --- a/test/IIS.FunctionalTests/DeployerSelector.cs +++ b/test/IIS.FunctionalTests/DeployerSelector.cs @@ -9,5 +9,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public static ServerType ServerType => ServerType.IIS; public static bool IsBackwardsCompatiblityTest => false; + public static bool IsForwardsCompatibilityTest => false; } } diff --git a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index 47c316f65a..62dec62e60 100644 --- a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -43,14 +43,4 @@ - - - - - - - PreserveNewest - - - diff --git a/test/IISExpress.FunctionalTests/DeployerSelector.cs b/test/IISExpress.FunctionalTests/DeployerSelector.cs index c21900e0fb..ba6a1ec6e2 100644 --- a/test/IISExpress.FunctionalTests/DeployerSelector.cs +++ b/test/IISExpress.FunctionalTests/DeployerSelector.cs @@ -9,5 +9,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { public static ServerType ServerType => ServerType.IISExpress; public static bool IsBackwardsCompatiblityTest => false; + public static bool IsForwardsCompatibilityTest => false; } } diff --git a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index ff8fd55afb..988c2d5943 100644 --- a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -35,14 +35,4 @@ - - - - - - - PreserveNewest - - - diff --git a/test/IISExpress.FunctionalTests/RequiresNewShim.cs b/test/IISExpress.FunctionalTests/RequiresNewShim.cs deleted file mode 100644 index a43e9b8da7..0000000000 --- a/test/IISExpress.FunctionalTests/RequiresNewShim.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Testing.xunit; - -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests -{ - [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] - public sealed class RequiresNewShimAttribute : Attribute, ITestCondition - { - public bool IsMet => true; - - public string SkipReason => "IISExpress.FunctionalTests always run against new shim."; - } -} diff --git a/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj new file mode 100644 index 0000000000..f15a90bfd3 --- /dev/null +++ b/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj @@ -0,0 +1,32 @@ + + + + + + netcoreapp2.2 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json b/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json new file mode 100644 index 0000000000..246b7a0b47 --- /dev/null +++ b/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json @@ -0,0 +1,42 @@ +{ + "iisSettings": { + "windowsAuthentication": true, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:5762/", + "sslPort": 0 + } + }, + "profiles": { + "ANCM IIS Express": { + "commandName": "Executable", + "executablePath": "$(IISExpressPath)", + "commandLineArgs": "$(IISExpressArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + }, + "ANCM IIS": { + "commandName": "Executable", + "executablePath": "$(IISPath)", + "commandLineArgs": "$(IISArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + } + } +} From 5c3017524f8f59d0b205d20104ead3cdb2723436 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 24 Oct 2018 10:04:59 -0700 Subject: [PATCH 357/363] Fix upgrade deps and run upgrade deps (#1553) --- build/dependencies.props | 71 +++++++++---------- .../BackwardsCompatibilityTests.cs | 2 +- ...kwardsCompatibility.FunctionalTests.csproj | 4 +- .../ForwardsCompatibilityTests.cs | 2 +- .../InProcessWebSite.csproj | 2 +- 5 files changed, 39 insertions(+), 42 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 7e9a764869..2f9ebbca5b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,42 +1,42 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 0.10.13 - 2.2.0-preview2-20181016.3 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 0.6.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 + 2.2.0-preview2-20181019.5 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 0.6.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 15.6.82 15.6.82 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 - 2.2.0-rtm-35532 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 + 2.2.0-rtm-35541 2.1.3 - 2.2.0-preview3-27014-02 + 2.2.0-rtm-27023-02 1.0.1 - 2.2.0-rtm-35532 + 2.2.0-rtm-35541 15.6.1 11.1.0 2.0.3 @@ -53,14 +53,11 @@ 2.3.1 2.4.0 - - - 2.2.0-preview3-35504 - 2.2.0-preview3-35504 - 2.2.0-preview3-35504 - - + + 2.2.0-preview3-35497 + 2.2.0-preview3-35497 + 2.2.0-preview3-35497 2.1.0 2.1.0 2.1.0 diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs b/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs index 891c16c061..2e4a7b1c40 100644 --- a/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs +++ b/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs @@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { if (handle.ModuleName == "aspnetcorev2.dll") { - Assert.Equal("12.2.18289.0", handle.FileVersionInfo.FileVersion); + Assert.Equal("12.2.18287.0", handle.FileVersionInfo.FileVersion); return; } } diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj index d3e2bbc530..c819a03ab1 100644 --- a/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj +++ b/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj @@ -30,8 +30,8 @@ - - + + diff --git a/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs b/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs index 52c7da80ad..5f4ebb5608 100644 --- a/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs +++ b/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { if (handle.ModuleName == "aspnetcorev2_inprocess.dll") { - Assert.Equal("12.2.18289.0", handle.FileVersionInfo.FileVersion); + Assert.Equal("12.2.18287.0", handle.FileVersionInfo.FileVersion); return; } } diff --git a/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj index f15a90bfd3..4d0952108a 100644 --- a/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj +++ b/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj @@ -18,7 +18,7 @@ - + From de185b6a06c8a1e24c0c7d1872d3d3f4b7c7e2ec Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 25 Oct 2018 08:47:31 -0700 Subject: [PATCH 358/363] Duplicate debug log handle for console logging (#1558) --- src/AspNetCoreModuleV2/CommonLib/debugutil.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp index cbf48a3b20..3492be7354 100644 --- a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp +++ b/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp @@ -20,6 +20,7 @@ inline HANDLE g_logFile = INVALID_HANDLE_VALUE; inline HMODULE g_hModule; inline SRWLOCK g_logFileLock; +inline HANDLE g_stdOutHandle = INVALID_HANDLE_VALUE; HRESULT PrintDebugHeader() @@ -162,6 +163,14 @@ VOID DebugInitialize(HMODULE hModule) { g_hModule = hModule; + DuplicateHandle( + /* hSourceProcessHandle*/ GetCurrentProcess(), + /* hSourceHandle */ GetStdHandle(STD_OUTPUT_HANDLE), + /* hTargetProcessHandle */ GetCurrentProcess(), + /* lpTargetHandle */&g_stdOutHandle, + /* dwDesiredAccess */ 0, // dwDesired is ignored if DUPLICATE_SAME_ACCESS is specified + /* bInheritHandle */ TRUE, + /* dwOptions */ DUPLICATE_SAME_ACCESS); HKEY hKey; InitializeSRWLock(&g_logFileLock); @@ -270,6 +279,11 @@ DebugStop() { CloseHandle(g_logFile); } + + if (g_stdOutHandle != INVALID_HANDLE_VALUE) + { + CloseHandle(g_stdOutHandle); + } } BOOL @@ -316,7 +330,7 @@ DebugPrintW( { if (IsEnabled(ASPNETCORE_DEBUG_FLAG_CONSOLE)) { - WriteFileEncoded(GetConsoleOutputCP(), GetStdHandle(STD_OUTPUT_HANDLE), strOutput.QueryStr()); + WriteFileEncoded(GetConsoleOutputCP(), g_stdOutHandle, strOutput.QueryStr()); } if (g_logFile != INVALID_HANDLE_VALUE) From 044f6138045e6bb9e44908d71f9b384b006a6782 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 25 Oct 2018 08:48:21 -0700 Subject: [PATCH 359/363] Include failed HRESULTs and exceptions in FREB log (#1548) --- .../AspNetCore/AppOfflineHandler.cpp | 2 +- .../AspNetCore/AppOfflineHandler.h | 5 +- .../AspNetCore/ApplicationFactory.h | 4 +- src/AspNetCoreModuleV2/AspNetCore/ancm.mof | 73 +- .../AspNetCore/proxymodule.cpp | 4 +- .../CommonLib/CommonLib.vcxproj | 4 +- .../CommonLib/EventTracing.h | 28 + .../CommonLib/ModuleTracer.h | 98 -- .../CommonLib/ServerErrorHandler.h | 7 +- .../CommonLib/application.h | 2 + .../CommonLib/aspnetcore_event.h | 1045 ++++++++++------- src/AspNetCoreModuleV2/CommonLib/exceptions.h | 40 +- .../CommonLib/iapplication.h | 14 +- .../CommonLib/requesthandler.h | 34 +- .../ShuttingDownApplication.h | 6 +- .../InProcessRequestHandler/dllmain.cpp | 2 +- .../inprocessapplication.cpp | 8 +- .../inprocesshandler.cpp | 35 +- .../inprocesshandler.h | 8 +- .../OutOfProcessRequestHandler/dllmain.cpp | 3 +- .../forwardinghandler.cpp | 8 +- .../forwardinghandler.h | 4 +- .../OutOfProcessRequestHandler/stdafx.h | 2 +- .../Inprocess/FrebTests.cs | 20 +- test/Common.FunctionalTests/LogFileTests.cs | 2 +- 25 files changed, 852 insertions(+), 606 deletions(-) create mode 100644 src/AspNetCoreModuleV2/CommonLib/EventTracing.h delete mode 100644 src/AspNetCoreModuleV2/CommonLib/ModuleTracer.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp index f5098f71f6..e3574d88e8 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp @@ -5,7 +5,7 @@ #include "HandleWrapper.h" -REQUEST_NOTIFICATION_STATUS AppOfflineHandler::OnExecuteRequestHandler() +REQUEST_NOTIFICATION_STATUS AppOfflineHandler::ExecuteRequestHandler() { HTTP_DATA_CHUNK DataChunk {}; auto pResponse = m_pContext.GetResponse(); diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h index e0ffd5d7cc..87f729bf82 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h +++ b/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h @@ -10,12 +10,13 @@ class AppOfflineHandler: public REQUEST_HANDLER { public: AppOfflineHandler(IHttpContext& pContext, const std::string appOfflineContent) - : m_pContext(pContext), + : REQUEST_HANDLER(pContext), + m_pContext(pContext), m_strAppOfflineContent(appOfflineContent) { } - REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override; + REQUEST_NOTIFICATION_STATUS ExecuteRequestHandler() override; private: IHttpContext& m_pContext; diff --git a/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h b/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h index 4d29b4fb39..ed9733b68a 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h +++ b/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h @@ -34,9 +34,11 @@ public: _In_ IHttpContext *pHttpContext, _Outptr_ IAPPLICATION **pApplication) const { + // m_location.data() is const ptr copy to local to get mutable pointer + auto location = m_location; std::array parameters { { - {"InProcessExeLocation", m_location.data()}, + {"InProcessExeLocation", location.data()}, {"TraceContext", pHttpContext->GetTraceContext()} } }; diff --git a/src/AspNetCoreModuleV2/AspNetCore/ancm.mof b/src/AspNetCoreModuleV2/AspNetCore/ancm.mof index 289225477d..359806f8a2 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/ancm.mof +++ b/src/AspNetCoreModuleV2/AspNetCore/ancm.mof @@ -5,7 +5,7 @@ /* * AspNetCore module trace events layout * Uncomment the following class to run mof2trace to generate header file - * comment it back before checking it in + * comment it back before checking it in [Dynamic, Description("IIS: WWW Server"), Guid("{3a2a4e84-4c21-4981-ae10-3fda0d9b0f83}"), @@ -187,7 +187,7 @@ class ANCMWinHttpCallBack:ANCM_Events [Dynamic, Description("Starting inprocess execute request") : amended, - EventType(8), + EventType(7), EventLevel(4), EventTypeName("ANCM_INPROC_EXECUTE_REQUEST_START") : amended ] @@ -203,7 +203,7 @@ class ANCMExecuteStart:ANCM_Events [Dynamic, Description("Ending inprocess execute request") : amended, - EventType(10), + EventType(8), EventLevel(5), EventTypeName("ANCM_INPROC_EXECUTE_REQUEST_COMPLETION") : amended ] @@ -224,7 +224,7 @@ class ANCMExecuteEnd:ANCM_Events [Dynamic, Description("Starting inprocess async completion") : amended, - EventType(8), + EventType(9), EventLevel(5), EventTypeName("ANCM_INPROC_ASYNC_COMPLETION_START") : amended ] @@ -293,7 +293,7 @@ class ANCMRequestDisconnect:ANCM_Events [Dynamic, Description("Indicate managed request complete") : amended, - EventType(12), + EventType(13), EventLevel(4), EventTypeName("ANCM_INPROC_MANAGED_REQUEST_COMPLETION") : amended ] @@ -306,3 +306,66 @@ class ANCMManagedRequestCompletion:ANCM_Events read] object ContextId; }; + +[Dynamic, + Description("Failed HRESULT") : amended, + EventType(14), + EventLevel(3), + EventTypeName("ANCM_HRESULT_FAILED") : amended +] +class ANCMHRESULTFailed:ANCM_Events +{ + [WmiDataId(1), + Description("Context ID") : amended, + extension("Guid"), + ActivityID, + read] + object ContextId; + [WmiDataId(2), + Description("Failed source file location") : amended, + StringTermination("NullTerminated"), + read] + string File; + [WmiDataId(3), + Description("Failed line number") : amended, + format("d"), + read] + uint32 Line; + [WmiDataId(4), + Description("HResult") : amended, + format("x"), + read] + uint32 HResult; +}; + +[Dynamic, + Description("Caught exception") : amended, + EventType(15), + EventLevel(3), + EventTypeName("ANCM_EXCEPTION_CAUGHT") : amended +] +class ANCMExceptionCaughFailed:ANCM_Events +{ + [WmiDataId(1), + Description("Context ID") : amended, + extension("Guid"), + ActivityID, + read] + object ContextId; + [WmiDataId(2), + Description("Exception catch file location") : amended, + StringTermination("NullTerminated"), + read] + string File; + [WmiDataId(3), + Description("Exception catch line number") : amended, + format("d"), + read] + uint32 Line; + [WmiDataId(2), + Description("Exception description") : amended, + StringTermination("NullTerminated"), + read] + string Description; +}; + diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp index e6b234d667..01707ffa9e 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp @@ -86,6 +86,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler( HRESULT hr = S_OK; REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; + TraceContextScope traceScope(pHttpContext->GetTraceContext()); // We don't want OnAsyncCompletion to complete request before OnExecuteRequestHandler exits auto lock = SRWExclusiveLock(m_requestLock); @@ -131,13 +132,14 @@ Finished: __override REQUEST_NOTIFICATION_STATUS ASPNET_CORE_PROXY_MODULE::OnAsyncCompletion( - IHttpContext *, + IHttpContext * pHttpContext, DWORD, BOOL, IHttpEventProvider *, IHttpCompletionInfo * pCompletionInfo ) { + TraceContextScope traceScope(pHttpContext->GetTraceContext()); // We don't want OnAsyncCompletion to complete request before OnExecuteRequestHandler exits auto lock = SRWExclusiveLock(m_requestLock); diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 7968238f90..0ddec2fcb1 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -205,6 +205,7 @@ + @@ -219,8 +220,7 @@ - - + diff --git a/src/AspNetCoreModuleV2/CommonLib/EventTracing.h b/src/AspNetCoreModuleV2/CommonLib/EventTracing.h new file mode 100644 index 0000000000..3734068aae --- /dev/null +++ b/src/AspNetCoreModuleV2/CommonLib/EventTracing.h @@ -0,0 +1,28 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#include + +#pragma warning( push ) +#pragma warning ( disable : ALL_CODE_ANALYSIS_WARNINGS ) + +#include "aspnetcore_event.h" + +#pragma warning( pop ) + +template< class EVENT, typename ...Params > +void RaiseEvent(IHttpTraceContext * pTraceContext,Params&&... params) +{ + if (pTraceContext != nullptr && EVENT::IsEnabled(pTraceContext)) + { + EVENT::RaiseEvent(pTraceContext, std::forward(params)...); + } +} + +template< class EVENT, typename ...Params > +void RaiseEvent(IHttpContext * pHttpContext,Params&&... params) +{ + ::RaiseEvent(pHttpContext->GetTraceContext(), std::forward(params)...); +} diff --git a/src/AspNetCoreModuleV2/CommonLib/ModuleTracer.h b/src/AspNetCoreModuleV2/CommonLib/ModuleTracer.h deleted file mode 100644 index 6ef03fb53a..0000000000 --- a/src/AspNetCoreModuleV2/CommonLib/ModuleTracer.h +++ /dev/null @@ -1,98 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -#pragma once -#include "aspnetcore_event.h" - -class ModuleTracer -{ -public: - - ModuleTracer(IHttpTraceContext* traceContext) - { - m_traceContext = traceContext; - } - - VOID - ExecuteRequestStart() - { - if (ANCMEvents::ANCM_INPROC_EXECUTE_REQUEST_START::IsEnabled(m_traceContext)) - { - ANCMEvents::ANCM_INPROC_EXECUTE_REQUEST_START::RaiseEvent( - m_traceContext, - NULL); - } - } - - VOID - ExecuteRequestEnd(REQUEST_NOTIFICATION_STATUS status) - { - if (ANCMEvents::ANCM_INPROC_EXECUTE_REQUEST_COMPLETION::IsEnabled(m_traceContext)) - { - ANCMEvents::ANCM_INPROC_EXECUTE_REQUEST_COMPLETION::RaiseEvent( - m_traceContext, - NULL, - status); - } - } - - VOID - AsyncCompletionStart() - { - - if (ANCMEvents::ANCM_INPROC_ASYNC_COMPLETION_START::IsEnabled(m_traceContext)) - { - ANCMEvents::ANCM_INPROC_ASYNC_COMPLETION_START::RaiseEvent( - m_traceContext, - NULL); - } - } - - VOID - AsyncCompletionEnd(REQUEST_NOTIFICATION_STATUS status) - { - if (ANCMEvents::ANCM_INPROC_ASYNC_COMPLETION_COMPLETION::IsEnabled(m_traceContext)) - { - ANCMEvents::ANCM_INPROC_ASYNC_COMPLETION_COMPLETION::RaiseEvent( - m_traceContext, - NULL, - status); - } - } - - VOID - RequestShutdown() - { - if (ANCMEvents::ANCM_INPROC_REQUEST_SHUTDOWN::IsEnabled(m_traceContext)) - { - ANCMEvents::ANCM_INPROC_REQUEST_SHUTDOWN::RaiseEvent( - m_traceContext, - NULL); - } - } - - VOID - RequestDisconnect() - { - if (ANCMEvents::ANCM_INPROC_REQUEST_DISCONNECT::IsEnabled(m_traceContext)) - { - ANCMEvents::ANCM_INPROC_REQUEST_DISCONNECT::RaiseEvent( - m_traceContext, - NULL); - } - } - - VOID - ManagedCompletion() - { - if (ANCMEvents::ANCM_INPROC_MANAGED_REQUEST_COMPLETION::IsEnabled(m_traceContext)) - { - ANCMEvents::ANCM_INPROC_MANAGED_REQUEST_COMPLETION::RaiseEvent( - m_traceContext, - NULL); - } - } - -private: - IHttpTraceContext * m_traceContext; -}; diff --git a/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h b/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h index 69aa0d440a..eb493ce722 100644 --- a/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h @@ -10,8 +10,9 @@ class ServerErrorHandler : public REQUEST_HANDLER { public: - ServerErrorHandler(IHttpContext &pContext, USHORT statusCode, USHORT subStatusCode, std::string statusText, HRESULT hr, HINSTANCE moduleInstance, bool disableStartupPage, int page) - : m_pContext(pContext), + ServerErrorHandler(IHttpContext &pContext, USHORT statusCode, USHORT subStatusCode, std::string statusText, HRESULT hr, HINSTANCE moduleInstance, bool disableStartupPage, int page) noexcept + : REQUEST_HANDLER(pContext), + m_pContext(pContext), m_HR(hr), m_disableStartupPage(disableStartupPage), m_page(page), @@ -22,7 +23,7 @@ public: { } - REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override + REQUEST_NOTIFICATION_STATUS ExecuteRequestHandler() override { static std::string s_html500Page = GetHtml(m_moduleInstance, m_page); diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/AspNetCoreModuleV2/CommonLib/application.h index 814be8aae6..add050b208 100644 --- a/src/AspNetCoreModuleV2/CommonLib/application.h +++ b/src/AspNetCoreModuleV2/CommonLib/application.h @@ -7,6 +7,7 @@ #include "iapplication.h" #include "ntassert.h" #include "SRWExclusiveLock.h" +#include "exceptions.h" class APPLICATION : public IAPPLICATION { @@ -20,6 +21,7 @@ public: _In_ IHttpContext *pHttpContext, _Outptr_result_maybenull_ IREQUEST_HANDLER **pRequestHandler) override { + TraceContextScope traceScope(pHttpContext->GetTraceContext()); *pRequestHandler = nullptr; if (m_fStopCalled) diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h index f40dc0d2bb..d3ed02223a 100644 --- a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h +++ b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h @@ -3,16 +3,16 @@ #define __ASPNETCOREEVENT_H__ /*++ -Copyright (c) 2005 Microsoft Corporation + Copyright (c) 2005 Microsoft Corporation -Module Name: + Module Name: -aspnetcore_event.h + aspnetcore_event.h -Abstract: + Abstract: -Header file has been generated from mof file containing -IIS trace event descriptions + Header file has been generated from mof file containing + IIS trace event descriptions --*/ @@ -24,18 +24,16 @@ IIS trace event descriptions // Description: IIS: WWW Server // -#include "httptrace.h" - class WWWServerTraceProvider { public: static - LPCGUID - GetProviderGuid(VOID) - // return GUID for the current event class + LPCGUID + GetProviderGuid( VOID ) + // return GUID for the current event class { - static const GUID ProviderGuid = - { 0x3a2a4e84,0x4c21,0x4981,{ 0xae,0x10,0x3f,0xda,0x0d,0x9b,0x0f,0x83 } }; + static const GUID ProviderGuid = + {0x3a2a4e84,0x4c21,0x4981,{0xae,0x10,0x3f,0xda,0x0d,0x9b,0x0f,0x83}}; return &ProviderGuid; }; enum enumAreaFlags @@ -44,10 +42,10 @@ public: ANCM = 0x10000 }; static - LPCWSTR - TranslateEnumAreaFlagsToString(enum enumAreaFlags EnumValue) + LPCWSTR + TranslateEnumAreaFlagsToString( enum enumAreaFlags EnumValue) { - switch ((DWORD)EnumValue) + switch( (DWORD) EnumValue ) { case 0x10000: return L"ANCM"; } @@ -55,26 +53,26 @@ public: }; static - BOOL - CheckTracingEnabled( - IHttpTraceContext * pHttpTraceContext, - enumAreaFlags AreaFlags, - DWORD dwVerbosity) + BOOL + CheckTracingEnabled( + IHttpTraceContext * pHttpTraceContext, + enumAreaFlags AreaFlags, + DWORD dwVerbosity ) { HRESULT hr; HTTP_TRACE_CONFIGURATION TraceConfig; TraceConfig.pProviderGuid = GetProviderGuid(); - hr = pHttpTraceContext->GetTraceConfiguration(&TraceConfig); - if (FAILED(hr) || !TraceConfig.fProviderEnabled) + hr = pHttpTraceContext->GetTraceConfiguration( &TraceConfig ); + if ( FAILED( hr ) || !TraceConfig.fProviderEnabled ) { return FALSE; } - if (TraceConfig.dwVerbosity >= dwVerbosity && - (TraceConfig.dwAreas == (DWORD)AreaFlags || - (TraceConfig.dwAreas & (DWORD)AreaFlags) == (DWORD)AreaFlags)) - { + if ( TraceConfig.dwVerbosity >= dwVerbosity && + ( TraceConfig.dwAreas == (DWORD) AreaFlags || + ( TraceConfig.dwAreas & (DWORD)AreaFlags ) == (DWORD)AreaFlags ) ) + { return TRUE; - } + } return FALSE; }; }; @@ -89,12 +87,12 @@ class ANCMEvents { public: static - LPCGUID - GetAreaGuid(VOID) - // return GUID for the current event class + LPCGUID + GetAreaGuid( VOID ) + // return GUID for the current event class { - static const GUID AreaGuid = - { 0x82adead7,0x12b2,0x4781,{ 0xbd,0xca,0x5a,0x4b,0x6c,0x75,0x71,0x91 } }; + static const GUID AreaGuid = + {0x82adead7,0x12b2,0x4781,{0xbd,0xca,0x5a,0x4b,0x6c,0x75,0x71,0x91}}; return &AreaGuid; }; @@ -105,24 +103,24 @@ public: // EventType: 1 // EventLevel: 4 // - + class ANCM_START_APPLICATION_SUCCESS { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId, - LPCWSTR pAppDescription - ) - // - // Raise ANCM_START_APPLICATION_SUCCESS Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + LPCWSTR pAppDescription + ) + // + // Raise ANCM_START_APPLICATION_SUCCESS Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 1; Event.pszEventName = L"ANCM_START_APPLICATION_SUCCESS"; @@ -133,36 +131,36 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[2]; - Items[0].pszName = L"ContextId"; - Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[0].pbData = (PBYTE)pContextId; - Items[0].cbData = 16; - Items[0].pszDataDescription = NULL; - Items[1].pszName = L"AppDescription"; - Items[1].dwDataType = HTTP_TRACE_TYPE_LPCWSTR; // mof type (string) - Items[1].pbData = (PBYTE)pAppDescription; - Items[1].cbData = - (Items[1].pbData == NULL) ? 0 : (sizeof(WCHAR) * (1 + (DWORD)wcslen((PWSTR)Items[1].pbData))); - Items[1].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[ 2 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; + Items[ 1 ].pszName = L"AppDescription"; + Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_LPCWSTR; // mof type (string) + Items[ 1 ].pbData = (PBYTE) pAppDescription; + Items[ 1 ].cbData = + ( Items[ 1 ].pbData == NULL )? 0 : ( sizeof(WCHAR) * (1 + (DWORD) wcslen( (PWSTR) Items[ 1 ].pbData ) ) ); + Items[ 1 ].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent(&Event); + pHttpTraceContext->RaiseTraceEvent( &Event ); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 4); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4 ); //Verbosity }; }; // @@ -172,24 +170,24 @@ public: // EventType: 2 // EventLevel: 2 // - + class ANCM_START_APPLICATION_FAIL { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId, - LPCWSTR pFailureDescription - ) - // - // Raise ANCM_START_APPLICATION_FAIL Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + LPCWSTR pFailureDescription + ) + // + // Raise ANCM_START_APPLICATION_FAIL Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 2; Event.pszEventName = L"ANCM_START_APPLICATION_FAIL"; @@ -200,36 +198,36 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[2]; - Items[0].pszName = L"ContextId"; - Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[0].pbData = (PBYTE)pContextId; - Items[0].cbData = 16; - Items[0].pszDataDescription = NULL; - Items[1].pszName = L"FailureDescription"; - Items[1].dwDataType = HTTP_TRACE_TYPE_LPCWSTR; // mof type (string) - Items[1].pbData = (PBYTE)pFailureDescription; - Items[1].cbData = - (Items[1].pbData == NULL) ? 0 : (sizeof(WCHAR) * (1 + (DWORD)wcslen((PWSTR)Items[1].pbData))); - Items[1].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[ 2 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; + Items[ 1 ].pszName = L"FailureDescription"; + Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_LPCWSTR; // mof type (string) + Items[ 1 ].pbData = (PBYTE) pFailureDescription; + Items[ 1 ].cbData = + ( Items[ 1 ].pbData == NULL )? 0 : ( sizeof(WCHAR) * (1 + (DWORD) wcslen( (PWSTR) Items[ 1 ].pbData ) ) ); + Items[ 1 ].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent(&Event); + pHttpTraceContext->RaiseTraceEvent( &Event ); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 2); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 2 ); //Verbosity }; }; // @@ -239,23 +237,23 @@ public: // EventType: 3 // EventLevel: 4 // - + class ANCM_REQUEST_FORWARD_START { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId - ) - // - // Raise ANCM_REQUEST_FORWARD_START Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_REQUEST_FORWARD_START Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 3; Event.pszEventName = L"ANCM_REQUEST_FORWARD_START"; @@ -266,30 +264,30 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[1]; - Items[0].pszName = L"ContextId"; - Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[0].pbData = (PBYTE)pContextId; - Items[0].cbData = 16; - Items[0].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[ 1 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent(&Event); + pHttpTraceContext->RaiseTraceEvent( &Event ); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 4); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4 ); //Verbosity }; }; // @@ -299,23 +297,23 @@ public: // EventType: 4 // EventLevel: 4 // - + class ANCM_REQUEST_FORWARD_END { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId - ) - // - // Raise ANCM_REQUEST_FORWARD_END Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_REQUEST_FORWARD_END Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 4; Event.pszEventName = L"ANCM_REQUEST_FORWARD_END"; @@ -326,30 +324,30 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[1]; - Items[0].pszName = L"ContextId"; - Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[0].pbData = (PBYTE)pContextId; - Items[0].cbData = 16; - Items[0].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[ 1 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent(&Event); + pHttpTraceContext->RaiseTraceEvent( &Event ); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 4); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4 ); //Verbosity }; }; // @@ -359,24 +357,24 @@ public: // EventType: 5 // EventLevel: 2 // - + class ANCM_REQUEST_FORWARD_FAIL { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId, - ULONG ErrorCode - ) - // - // Raise ANCM_REQUEST_FORWARD_FAIL Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + ULONG ErrorCode + ) + // + // Raise ANCM_REQUEST_FORWARD_FAIL Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 5; Event.pszEventName = L"ANCM_REQUEST_FORWARD_FAIL"; @@ -387,35 +385,35 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[2]; - Items[0].pszName = L"ContextId"; - Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[0].pbData = (PBYTE)pContextId; - Items[0].cbData = 16; - Items[0].pszDataDescription = NULL; - Items[1].pszName = L"ErrorCode"; - Items[1].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) - Items[1].pbData = (PBYTE)&ErrorCode; - Items[1].cbData = 4; - Items[1].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[ 2 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; + Items[ 1 ].pszName = L"ErrorCode"; + Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) + Items[ 1 ].pbData = (PBYTE) &ErrorCode; + Items[ 1 ].cbData = 4; + Items[ 1 ].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent(&Event); + pHttpTraceContext->RaiseTraceEvent( &Event ); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 2); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 2 ); //Verbosity }; }; // @@ -425,24 +423,24 @@ public: // EventType: 6 // EventLevel: 4 // - + class ANCM_WINHTTP_CALLBACK { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId, - ULONG InternetStatus - ) - // - // Raise ANCM_WINHTTP_CALLBACK Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + ULONG InternetStatus + ) + // + // Raise ANCM_WINHTTP_CALLBACK Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 6; Event.pszEventName = L"ANCM_WINHTTP_CALLBACK"; @@ -453,63 +451,63 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[2]; - Items[0].pszName = L"ContextId"; - Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[0].pbData = (PBYTE)pContextId; - Items[0].cbData = 16; - Items[0].pszDataDescription = NULL; - Items[1].pszName = L"InternetStatus"; - Items[1].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) - Items[1].pbData = (PBYTE)&InternetStatus; - Items[1].cbData = 4; - Items[1].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[ 2 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; + Items[ 1 ].pszName = L"InternetStatus"; + Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) + Items[ 1 ].pbData = (PBYTE) &InternetStatus; + Items[ 1 ].cbData = 4; + Items[ 1 ].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent(&Event); + pHttpTraceContext->RaiseTraceEvent( &Event ); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 4); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4 ); //Verbosity }; }; // // Event: mof class name ANCMExecuteStart, // Description: Starting inprocess execute request // EventTypeName: ANCM_INPROC_EXECUTE_REQUEST_START - // EventType: 8 + // EventType: 7 // EventLevel: 4 // - + class ANCM_INPROC_EXECUTE_REQUEST_START { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId - ) - // - // Raise ANCM_INPROC_EXECUTE_REQUEST_START Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_INPROC_EXECUTE_REQUEST_START Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); - Event.dwEvent = 8; + Event.dwEvent = 7; Event.pszEventName = L"ANCM_INPROC_EXECUTE_REQUEST_START"; Event.dwEventVersion = 1; Event.dwVerbosity = 4; @@ -518,59 +516,59 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[1]; - Items[0].pszName = L"ContextId"; - Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[0].pbData = (PBYTE)pContextId; - Items[0].cbData = 16; - Items[0].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[ 1 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent(&Event); + pHttpTraceContext->RaiseTraceEvent( &Event ); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 4); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4 ); //Verbosity }; }; // // Event: mof class name ANCMExecuteEnd, // Description: Ending inprocess execute request // EventTypeName: ANCM_INPROC_EXECUTE_REQUEST_COMPLETION - // EventType: 10 + // EventType: 8 // EventLevel: 5 // - + class ANCM_INPROC_EXECUTE_REQUEST_COMPLETION { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId, - ULONG requestStatus - ) - // - // Raise ANCM_INPROC_EXECUTE_REQUEST_COMPLETION Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + ULONG requestStatus + ) + // + // Raise ANCM_INPROC_EXECUTE_REQUEST_COMPLETION Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); - Event.dwEvent = 10; + Event.dwEvent = 8; Event.pszEventName = L"ANCM_INPROC_EXECUTE_REQUEST_COMPLETION"; Event.dwEventVersion = 1; Event.dwVerbosity = 5; @@ -579,63 +577,63 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[2]; - Items[0].pszName = L"ContextId"; - Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[0].pbData = (PBYTE)pContextId; - Items[0].cbData = 16; - Items[0].pszDataDescription = NULL; - Items[1].pszName = L"requestStatus"; - Items[1].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) - Items[1].pbData = (PBYTE)&requestStatus; - Items[1].cbData = 4; - Items[1].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[ 2 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; + Items[ 1 ].pszName = L"requestStatus"; + Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) + Items[ 1 ].pbData = (PBYTE) &requestStatus; + Items[ 1 ].cbData = 4; + Items[ 1 ].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent(&Event); + pHttpTraceContext->RaiseTraceEvent( &Event ); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 5); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 5 ); //Verbosity }; }; // // Event: mof class name ANCMAsyncStart, // Description: Starting inprocess async completion // EventTypeName: ANCM_INPROC_ASYNC_COMPLETION_START - // EventType: 8 + // EventType: 9 // EventLevel: 5 // - + class ANCM_INPROC_ASYNC_COMPLETION_START { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId - ) - // - // Raise ANCM_INPROC_ASYNC_COMPLETION_START Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_INPROC_ASYNC_COMPLETION_START Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); - Event.dwEvent = 8; + Event.dwEvent = 9; Event.pszEventName = L"ANCM_INPROC_ASYNC_COMPLETION_START"; Event.dwEventVersion = 1; Event.dwVerbosity = 5; @@ -644,30 +642,30 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[1]; - Items[0].pszName = L"ContextId"; - Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[0].pbData = (PBYTE)pContextId; - Items[0].cbData = 16; - Items[0].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[ 1 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent(&Event); + pHttpTraceContext->RaiseTraceEvent( &Event ); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 5); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 5 ); //Verbosity }; }; // @@ -677,24 +675,24 @@ public: // EventType: 10 // EventLevel: 5 // - + class ANCM_INPROC_ASYNC_COMPLETION_COMPLETION { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId, - ULONG requestStatus - ) - // - // Raise ANCM_INPROC_ASYNC_COMPLETION_COMPLETION Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + ULONG requestStatus + ) + // + // Raise ANCM_INPROC_ASYNC_COMPLETION_COMPLETION Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 10; Event.pszEventName = L"ANCM_INPROC_ASYNC_COMPLETION_COMPLETION"; @@ -705,35 +703,35 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[2]; - Items[0].pszName = L"ContextId"; - Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[0].pbData = (PBYTE)pContextId; - Items[0].cbData = 16; - Items[0].pszDataDescription = NULL; - Items[1].pszName = L"requestStatus"; - Items[1].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) - Items[1].pbData = (PBYTE)&requestStatus; - Items[1].cbData = 4; - Items[1].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[ 2 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; + Items[ 1 ].pszName = L"requestStatus"; + Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) + Items[ 1 ].pbData = (PBYTE) &requestStatus; + Items[ 1 ].cbData = 4; + Items[ 1 ].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent(&Event); + pHttpTraceContext->RaiseTraceEvent( &Event ); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 5); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 5 ); //Verbosity }; }; // @@ -743,23 +741,23 @@ public: // EventType: 11 // EventLevel: 4 // - + class ANCM_INPROC_REQUEST_SHUTDOWN { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId - ) - // - // Raise ANCM_INPROC_REQUEST_SHUTDOWN Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_INPROC_REQUEST_SHUTDOWN Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 11; Event.pszEventName = L"ANCM_INPROC_REQUEST_SHUTDOWN"; @@ -770,30 +768,30 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[1]; - Items[0].pszName = L"ContextId"; - Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[0].pbData = (PBYTE)pContextId; - Items[0].cbData = 16; - Items[0].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[ 1 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent(&Event); + pHttpTraceContext->RaiseTraceEvent( &Event ); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 4); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4 ); //Verbosity }; }; // @@ -803,23 +801,23 @@ public: // EventType: 12 // EventLevel: 4 // - + class ANCM_INPROC_REQUEST_DISCONNECT { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId - ) - // - // Raise ANCM_INPROC_REQUEST_DISCONNECT Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_INPROC_REQUEST_DISCONNECT Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); Event.dwEvent = 12; Event.pszEventName = L"ANCM_INPROC_REQUEST_DISCONNECT"; @@ -830,58 +828,58 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[1]; - Items[0].pszName = L"ContextId"; - Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[0].pbData = (PBYTE)pContextId; - Items[0].cbData = 16; - Items[0].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[ 1 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent(&Event); + pHttpTraceContext->RaiseTraceEvent( &Event ); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 4); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4 ); //Verbosity }; }; // // Event: mof class name ANCMManagedRequestCompletion, // Description: Indicate managed request complete // EventTypeName: ANCM_INPROC_MANAGED_REQUEST_COMPLETION - // EventType: 12 + // EventType: 13 // EventLevel: 4 // - + class ANCM_INPROC_MANAGED_REQUEST_COMPLETION { public: static - HRESULT - RaiseEvent( - IHttpTraceContext * pHttpTraceContext, - LPCGUID pContextId - ) - // - // Raise ANCM_INPROC_MANAGED_REQUEST_COMPLETION Event - // + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId + ) + // + // Raise ANCM_INPROC_MANAGED_REQUEST_COMPLETION Event + // { HTTP_TRACE_EVENT Event; Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); - Event.dwArea = WWWServerTraceProvider::ANCM; + Event.dwArea = WWWServerTraceProvider::ANCM; Event.pAreaGuid = ANCMEvents::GetAreaGuid(); - Event.dwEvent = 12; + Event.dwEvent = 13; Event.pszEventName = L"ANCM_INPROC_MANAGED_REQUEST_COMPLETION"; Event.dwEventVersion = 1; Event.dwVerbosity = 4; @@ -890,31 +888,190 @@ public: Event.pRelatedActivityGuid = NULL; Event.dwTimeStamp = 0; Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; - + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS - - HTTP_TRACE_EVENT_ITEM Items[1]; - Items[0].pszName = L"ContextId"; - Items[0].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) - Items[0].pbData = (PBYTE)pContextId; - Items[0].cbData = 16; - Items[0].pszDataDescription = NULL; + + HTTP_TRACE_EVENT_ITEM Items[ 1 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; Event.pEventItems = Items; - pHttpTraceContext->RaiseTraceEvent(&Event); + pHttpTraceContext->RaiseTraceEvent( &Event ); return S_OK; }; - + static - BOOL - IsEnabled( - IHttpTraceContext * pHttpTraceContext) - // Check if tracing for this event is enabled + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled { - return WWWServerTraceProvider::CheckTracingEnabled( - pHttpTraceContext, - WWWServerTraceProvider::ANCM, - 4); //Verbosity + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 4 ); //Verbosity + }; + }; + // + // Event: mof class name ANCMHRESULTFailed, + // Description: Failed HRESULT + // EventTypeName: ANCM_HRESULT_FAILED + // EventType: 14 + // EventLevel: 3 + // + + class ANCM_HRESULT_FAILED + { + public: + static + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + LPCSTR pFile, + ULONG Line, + ULONG HResult + ) + // + // Raise ANCM_HRESULT_FAILED Event + // + { + HTTP_TRACE_EVENT Event; + Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); + Event.dwArea = WWWServerTraceProvider::ANCM; + Event.pAreaGuid = ANCMEvents::GetAreaGuid(); + Event.dwEvent = 14; + Event.pszEventName = L"ANCM_HRESULT_FAILED"; + Event.dwEventVersion = 1; + Event.dwVerbosity = 3; + Event.cEventItems = 4; + Event.pActivityGuid = NULL; + Event.pRelatedActivityGuid = NULL; + Event.dwTimeStamp = 0; + Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; + + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS + + HTTP_TRACE_EVENT_ITEM Items[ 4 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; + Items[ 1 ].pszName = L"File"; + Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_LPCSTR; // mof type (string) + Items[ 1 ].pbData = (PBYTE) pFile; + Items[ 1 ].cbData = + ( Items[ 1 ].pbData == NULL )? 0 : (1 + (DWORD) strlen( (PSTR) Items[ 1 ].pbData ) ); + Items[ 1 ].pszDataDescription = NULL; + Items[ 2 ].pszName = L"Line"; + Items[ 2 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) + Items[ 2 ].pbData = (PBYTE) &Line; + Items[ 2 ].cbData = 4; + Items[ 2 ].pszDataDescription = NULL; + Items[ 3 ].pszName = L"HResult"; + Items[ 3 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) + Items[ 3 ].pbData = (PBYTE) &HResult; + Items[ 3 ].cbData = 4; + Items[ 3 ].pszDataDescription = NULL; + Event.pEventItems = Items; + pHttpTraceContext->RaiseTraceEvent( &Event ); + return S_OK; + }; + + static + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled + { + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 3 ); //Verbosity + }; + }; + // + // Event: mof class name ANCMExceptionCaughFailed, + // Description: Caught exception + // EventTypeName: ANCM_EXCEPTION_CAUGHT + // EventType: 15 + // EventLevel: 3 + // + + class ANCM_EXCEPTION_CAUGHT + { + public: + static + HRESULT + RaiseEvent( + IHttpTraceContext * pHttpTraceContext, + LPCGUID pContextId, + LPCSTR pFile, + ULONG Line, + LPCSTR pDescription + ) + // + // Raise ANCM_EXCEPTION_CAUGHT Event + // + { + HTTP_TRACE_EVENT Event; + Event.pProviderGuid = WWWServerTraceProvider::GetProviderGuid(); + Event.dwArea = WWWServerTraceProvider::ANCM; + Event.pAreaGuid = ANCMEvents::GetAreaGuid(); + Event.dwEvent = 15; + Event.pszEventName = L"ANCM_EXCEPTION_CAUGHT"; + Event.dwEventVersion = 1; + Event.dwVerbosity = 3; + Event.cEventItems = 4; + Event.pActivityGuid = NULL; + Event.pRelatedActivityGuid = NULL; + Event.dwTimeStamp = 0; + Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS; + + // pActivityGuid, pRelatedActivityGuid, Timestamp to be filled in by IIS + + HTTP_TRACE_EVENT_ITEM Items[ 4 ]; + Items[ 0 ].pszName = L"ContextId"; + Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object) + Items[ 0 ].pbData = (PBYTE) pContextId; + Items[ 0 ].cbData = 16; + Items[ 0 ].pszDataDescription = NULL; + Items[ 1 ].pszName = L"File"; + Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_LPCSTR; // mof type (string) + Items[ 1 ].pbData = (PBYTE) pFile; + Items[ 1 ].cbData = + ( Items[ 1 ].pbData == NULL )? 0 : (1 + (DWORD) strlen( (PSTR) Items[ 1 ].pbData ) ); + Items[ 1 ].pszDataDescription = NULL; + Items[ 2 ].pszName = L"Line"; + Items[ 2 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32) + Items[ 2 ].pbData = (PBYTE) &Line; + Items[ 2 ].cbData = 4; + Items[ 2 ].pszDataDescription = NULL; + Items[ 3 ].pszName = L"Description"; + Items[ 3 ].dwDataType = HTTP_TRACE_TYPE_LPCSTR; // mof type (string) + Items[ 3 ].pbData = (PBYTE) pDescription; + Items[ 3 ].cbData = + ( Items[ 3 ].pbData == NULL )? 0 : (1 + (DWORD) strlen( (PSTR) Items[ 3 ].pbData ) ); + Items[ 3 ].pszDataDescription = NULL; + Event.pEventItems = Items; + pHttpTraceContext->RaiseTraceEvent( &Event ); + return S_OK; + }; + + static + BOOL + IsEnabled( + IHttpTraceContext * pHttpTraceContext ) + // Check if tracing for this event is enabled + { + return WWWServerTraceProvider::CheckTracingEnabled( + pHttpTraceContext, + WWWServerTraceProvider::ANCM, + 3 ); //Verbosity }; }; }; -#endif +#endif \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/AspNetCoreModuleV2/CommonLib/exceptions.h index f79b9e99e5..18115c0e48 100644 --- a/src/AspNetCoreModuleV2/CommonLib/exceptions.h +++ b/src/AspNetCoreModuleV2/CommonLib/exceptions.h @@ -9,6 +9,9 @@ #include "debugutil.h" #include "StringHelpers.h" #include "InvalidOperationException.h" +#include "ntassert.h" +#include "NonCopyable.h" +#include "EventTracing.h" #define LOCATION_INFO_ENABLED TRUE @@ -53,7 +56,7 @@ __pragma(warning(pop)) -#define FINISHED(hrr) do { _HR_RET(hrr); if (_CHECK_FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); } hr = __hrRet; _GOTO_FINISHED(); } while (0, 0) +#define FINISHED(hrr) do { _HR_RET(hrr); if (_CHECK_FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); } hr = __hrRet; _GOTO_FINISHED(); } while (0, 0) #define FINISHED_IF_FAILED(hrr) do { _HR_RET(hrr); if (FAILED(__hrRet)) { LogHResultFailed(LOCATION_INFO, __hrRet); hr = __hrRet; _GOTO_FINISHED(); }} while (0, 0) #define FINISHED_IF_NULL_ALLOC(ptr) do { if ((ptr) == nullptr) { hr = LogHResultFailed(LOCATION_INFO, E_OUTOFMEMORY); _GOTO_FINISHED(); }} while (0, 0) #define FINISHED_LAST_ERROR_IF(condition) do { if (condition) { hr = LogLastError(LOCATION_INFO); _GOTO_FINISHED(); }} while (0, 0) @@ -74,6 +77,18 @@ #define SUCCEEDED_LOG(hr) SUCCEEDED(LOG_IF_FAILED(hr)) #define FAILED_LOG(hr) FAILED(LOG_IF_FAILED(hr)) +inline thread_local IHttpTraceContext* g_traceContext; + + __declspec(noinline) inline VOID TraceHRESULT(LOCATION_ARGUMENTS HRESULT hr) +{ + ::RaiseEvent(g_traceContext, nullptr, fileName, lineNumber, hr); +} + + __declspec(noinline) inline VOID TraceException(LOCATION_ARGUMENTS const std::exception& exception) +{ + ::RaiseEvent(g_traceContext, nullptr, fileName, lineNumber, exception.what()); +} + class ResultException: public std::runtime_error { public: @@ -86,7 +101,7 @@ public: HRESULT GetResult() const noexcept { return m_hr; } private: - + #pragma warning( push ) #pragma warning ( disable : 26495 ) // bug in CA: m_hr is reported as uninitialized const HRESULT m_hr = S_OK; @@ -103,6 +118,7 @@ private: const auto lastError = GetLastError(); const auto hr = HRESULT_FROM_WIN32(lastError); + TraceHRESULT(LOCATION_CALL hr); DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, LOCATION_FORMAT "Operation failed with LastError: %d HR: 0x%x", LOCATION_CALL lastError, hr); return hr; @@ -120,6 +136,7 @@ private: __declspec(noinline) inline VOID ReportException(LOCATION_ARGUMENTS const std::exception& exception) { + TraceException(LOCATION_CALL exception); DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, "Exception '%s' caught at " LOCATION_FORMAT, exception.what(), LOCATION_CALL_ONLY); } @@ -127,6 +144,7 @@ private: { if (FAILED(hr)) { + TraceHRESULT(LOCATION_CALL hr); DebugPrintf(ASPNETCORE_DEBUG_FLAG_ERROR, "Failed HRESULT returned: 0x%x at " LOCATION_FORMAT, hr, LOCATION_CALL_ONLY); } return hr; @@ -178,3 +196,21 @@ __declspec(noinline) inline std::wstring GetUnexpectedExceptionMessage(const std { return format(L"Unexpected exception: %S", ex.what()); } + +class TraceContextScope: NonCopyable +{ +public: + TraceContextScope(IHttpTraceContext* pTraceContext) noexcept + { + m_pPreviousTraceContext = g_traceContext; + g_traceContext = pTraceContext; + } + + ~TraceContextScope() + { + g_traceContext = m_pPreviousTraceContext; + } + private: + IHttpTraceContext* m_pPreviousTraceContext; +}; + diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/AspNetCoreModuleV2/CommonLib/iapplication.h index 2e8660748f..52a1a7e2a9 100644 --- a/src/AspNetCoreModuleV2/CommonLib/iapplication.h +++ b/src/AspNetCoreModuleV2/CommonLib/iapplication.h @@ -9,7 +9,7 @@ struct APPLICATION_PARAMETER { LPCSTR pzName; - const void *pValue; + void *pValue; }; class IAPPLICATION @@ -61,3 +61,15 @@ std::unique_ptr make_application(Params&&... #pragma warning( pop ) } +template< class TYPE > +TYPE FindParameter(LPCSTR sRequiredParameter, APPLICATION_PARAMETER *pParameters, DWORD nParameters) +{ + for (DWORD i = 0; i < nParameters; i++) + { + if (_stricmp(pParameters[i].pzName, sRequiredParameter) == 0) + { + return reinterpret_cast(pParameters[i].pValue); + } + } + return nullptr; +} diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h index a5e16bf022..8bac2885b0 100644 --- a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h +++ b/src/AspNetCoreModuleV2/CommonLib/requesthandler.h @@ -5,14 +5,22 @@ #include "irequesthandler.h" #include "ntassert.h" +#include "exceptions.h" // // Pure abstract class // class REQUEST_HANDLER: public virtual IREQUEST_HANDLER { - public: + REQUEST_HANDLER(IHttpContext& pHttpContext) noexcept : m_pHttpContext(pHttpContext) + { + } + + virtual + REQUEST_NOTIFICATION_STATUS + ExecuteRequestHandler() = 0; + VOID ReferenceRequestHandler() noexcept override { @@ -30,7 +38,26 @@ public: } } - REQUEST_NOTIFICATION_STATUS OnAsyncCompletion(DWORD cbCompletion, HRESULT hrCompletionStatus) override + + REQUEST_NOTIFICATION_STATUS + OnExecuteRequestHandler() final + { + TraceContextScope traceScope(m_pHttpContext.GetTraceContext()); + return ExecuteRequestHandler(); + } + + REQUEST_NOTIFICATION_STATUS + OnAsyncCompletion( + DWORD cbCompletion, + HRESULT hrCompletionStatus + ) final + { + TraceContextScope traceScope(m_pHttpContext.GetTraceContext()); + return AsyncCompletion(cbCompletion, hrCompletionStatus); + }; + + virtual + REQUEST_NOTIFICATION_STATUS AsyncCompletion(DWORD cbCompletion, HRESULT hrCompletionStatus) { UNREFERENCED_PARAMETER(cbCompletion); UNREFERENCED_PARAMETER(hrCompletionStatus); @@ -47,5 +74,6 @@ public: } private: - mutable LONG m_cRefs = 1; + IHttpContext& m_pHttpContext; + mutable LONG m_cRefs = 1; }; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h index 6195877234..171ad4a2ef 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h @@ -8,11 +8,13 @@ class ShuttingDownHandler : public REQUEST_HANDLER { public: - ShuttingDownHandler(IHttpContext* pContext) : m_pContext(pContext) + ShuttingDownHandler(IHttpContext* pContext) + : REQUEST_HANDLER(*pContext), + m_pContext(pContext) { } - REQUEST_NOTIFICATION_STATUS OnExecuteRequestHandler() override + REQUEST_NOTIFICATION_STATUS ExecuteRequestHandler() override { return ServerShutdownMessage(m_pContext); } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp index aafb2c799f..eb84da2869 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp @@ -17,7 +17,6 @@ #include "WebConfigConfigurationSource.h" #include "ConfigurationLoadException.h" #include "StartupExceptionApplication.h" -#include "aspnetcore_event.h" DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_inprocess.dll"); @@ -100,6 +99,7 @@ CreateApplication( _Out_ IAPPLICATION **ppApplication ) { + TraceContextScope traceScope(FindParameter("TraceContext", pParameters, nParameters)); try { HRESULT hr = S_OK; diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index 44d2455251..c351dbc4c1 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -28,12 +28,10 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( { DBG_ASSERT(m_pConfig); - for (DWORD i = 0; i < nParameters; i++) + const auto knownLocation = FindParameter(s_exeLocationParameterName, pParameters, nParameters); + if (knownLocation != nullptr) { - if (_stricmp(pParameters[i].pzName, s_exeLocationParameterName) == 0) - { - m_dotnetExeKnownLocation = reinterpret_cast(pParameters[i].pValue); - } + m_dotnetExeKnownLocation = knownLocation; } } diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 16938d0009..8fee377a30 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -6,18 +6,18 @@ #include "IOutputManager.h" #include "ShuttingDownApplication.h" #include "ntassert.h" -#include "ModuleTracer.h" ALLOC_CACHE_HANDLER * IN_PROCESS_HANDLER::sm_pAlloc = NULL; IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( _In_ std::unique_ptr pApplication, - _In_ IHttpContext *pW3Context, + _In_ IHttpContext *pW3Context, _In_ PFN_REQUEST_HANDLER pRequestHandler, _In_ void * pRequestHandlerContext, _In_ PFN_DISCONNECT_HANDLER pDisconnectHandler, _In_ PFN_ASYNC_COMPLETION_HANDLER pAsyncCompletion -): m_pManagedHttpContext(nullptr), +): REQUEST_HANDLER(*pW3Context), + m_pManagedHttpContext(nullptr), m_requestNotificationStatus(RQ_NOTIFICATION_PENDING), m_fManagedRequestComplete(FALSE), m_pW3Context(pW3Context), @@ -26,7 +26,6 @@ IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( m_pRequestHandlerContext(pRequestHandlerContext), m_pAsyncCompletionHandler(pAsyncCompletion), m_pDisconnectHandler(pDisconnectHandler), - m_moduleTracer(pW3Context->GetTraceContext()), m_disconnectFired(false) { InitializeSRWLock(&m_srwDisconnectLock); @@ -34,14 +33,13 @@ IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( __override REQUEST_NOTIFICATION_STATUS -IN_PROCESS_HANDLER::OnExecuteRequestHandler() +IN_PROCESS_HANDLER::ExecuteRequestHandler() { - // FREB log - m_moduleTracer.ExecuteRequestStart(); + ::RaiseEvent(m_pW3Context, nullptr); if (m_pRequestHandler == NULL) { - m_moduleTracer.ExecuteRequestEnd(RQ_NOTIFICATION_FINISH_REQUEST); + ::RaiseEvent(m_pW3Context, nullptr, RQ_NOTIFICATION_FINISH_REQUEST); return RQ_NOTIFICATION_FINISH_REQUEST; } else if (m_pApplication->QueryBlockCallbacksIntoManaged()) @@ -50,24 +48,25 @@ IN_PROCESS_HANDLER::OnExecuteRequestHandler() } auto status = m_pRequestHandler(this, m_pRequestHandlerContext); - m_moduleTracer.ExecuteRequestEnd(status); + ::RaiseEvent(m_pW3Context, nullptr, status); return status; } __override REQUEST_NOTIFICATION_STATUS -IN_PROCESS_HANDLER::OnAsyncCompletion( +IN_PROCESS_HANDLER::AsyncCompletion( DWORD cbCompletion, HRESULT hrCompletionStatus ) { - m_moduleTracer.AsyncCompletionStart(); + + ::RaiseEvent(m_pW3Context, nullptr); if (m_fManagedRequestComplete) { // means PostCompletion has been called and this is the associated callback. - m_moduleTracer.AsyncCompletionEnd(m_requestNotificationStatus); - return m_requestNotificationStatus; + ::RaiseEvent(m_pW3Context, nullptr, m_requestNotificationStatus); + return m_requestNotificationStatus; } if (m_pApplication->QueryBlockCallbacksIntoManaged()) { @@ -81,20 +80,20 @@ IN_PROCESS_HANDLER::OnAsyncCompletion( // Call the managed handler for async completion. auto status = m_pAsyncCompletionHandler(m_pManagedHttpContext, hrCompletionStatus, cbCompletion); - m_moduleTracer.AsyncCompletionEnd(status); + ::RaiseEvent(m_pW3Context, nullptr, status); return status; } -REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::ServerShutdownMessage() +REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::ServerShutdownMessage() const { - m_moduleTracer.RequestShutdown(); + ::RaiseEvent(m_pW3Context, nullptr); return ShuttingDownHandler::ServerShutdownMessage(m_pW3Context); } VOID IN_PROCESS_HANDLER::NotifyDisconnect() { - m_moduleTracer.RequestDisconnect(); + ::RaiseEvent(m_pW3Context, nullptr); if (m_pApplication->QueryBlockCallbacksIntoManaged() || m_fManagedRequestComplete) @@ -126,7 +125,7 @@ IN_PROCESS_HANDLER::IndicateManagedRequestComplete( { m_fManagedRequestComplete = TRUE; m_pManagedHttpContext = nullptr; - m_moduleTracer.ManagedCompletion(); + ::RaiseEvent(m_pW3Context, nullptr); } VOID diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h index 743c2323a1..20a5192c18 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h @@ -7,7 +7,6 @@ #include #include "iapplication.h" #include "inprocessapplication.h" -#include "ModuleTracer.h" class IN_PROCESS_APPLICATION; @@ -26,11 +25,11 @@ public: __override REQUEST_NOTIFICATION_STATUS - OnExecuteRequestHandler() override; + ExecuteRequestHandler() override; __override REQUEST_NOTIFICATION_STATUS - OnAsyncCompletion( + AsyncCompletion( DWORD cbCompletion, HRESULT hrCompletionStatus ) override; @@ -72,7 +71,7 @@ public: private: REQUEST_NOTIFICATION_STATUS - ServerShutdownMessage(); + ServerShutdownMessage() const; PVOID m_pManagedHttpContext; BOOL m_fManagedRequestComplete; @@ -84,7 +83,6 @@ private: PFN_ASYNC_COMPLETION_HANDLER m_pAsyncCompletionHandler; PFN_DISCONNECT_HANDLER m_pDisconnectHandler; static ALLOC_CACHE_HANDLER * sm_pAlloc; - ModuleTracer m_moduleTracer; bool m_disconnectFired; SRWLOCK m_srwDisconnectLock; }; diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp index 24c166a056..981e3acd36 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp @@ -250,8 +250,7 @@ CreateApplication( _Out_ IAPPLICATION **ppApplication ) { - UNREFERENCED_PARAMETER(pParameters); - UNREFERENCED_PARAMETER(nParameters); + TraceContextScope traceScope(FindParameter("TraceContext", pParameters, nParameters)); InitializeGlobalConfiguration(pServer); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp index d97a55a17e..c8c0640803 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp @@ -26,7 +26,7 @@ RESPONSE_HEADER_HASH * FORWARDING_HANDLER::sm_pResponseHeaderHash = NULL; FORWARDING_HANDLER::FORWARDING_HANDLER( _In_ IHttpContext *pW3Context, _In_ std::unique_ptr pApplication -) : REQUEST_HANDLER(), +) : REQUEST_HANDLER(*pW3Context), m_Signature(FORWARDING_HANDLER_SIGNATURE), m_RequestStatus(FORWARDER_START), m_fClientDisconnected(FALSE), @@ -90,7 +90,7 @@ FORWARDING_HANDLER::~FORWARDING_HANDLER( __override REQUEST_NOTIFICATION_STATUS -FORWARDING_HANDLER::OnExecuteRequestHandler() +FORWARDING_HANDLER::ExecuteRequestHandler() { REQUEST_NOTIFICATION_STATUS retVal = RQ_NOTIFICATION_CONTINUE; HRESULT hr = S_OK; @@ -320,7 +320,7 @@ Failure: else if (fFailedToStartKestrel && !m_pApplication->QueryConfig()->QueryDisableStartUpErrorPage()) { ServerErrorHandler handler(*m_pW3Context, 502, 5, "Bad Gateway", hr, g_hOutOfProcessRHModule, m_pApplication->QueryConfig()->QueryDisableStartUpErrorPage(), OUT_OF_PROCESS_RH_STATIC_HTML); - handler.OnExecuteRequestHandler(); + handler.ExecuteRequestHandler(); } else { @@ -353,7 +353,7 @@ Finished: __override REQUEST_NOTIFICATION_STATUS -FORWARDING_HANDLER::OnAsyncCompletion( +FORWARDING_HANDLER::AsyncCompletion( DWORD cbCompletion, HRESULT hrCompletionStatus ) diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h index e30d69b6c0..cc855dfcf2 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h @@ -30,11 +30,11 @@ public: __override REQUEST_NOTIFICATION_STATUS - OnExecuteRequestHandler(); + ExecuteRequestHandler(); __override REQUEST_NOTIFICATION_STATUS - OnAsyncCompletion( + AsyncCompletion( DWORD cbCompletion, HRESULT hrCompletionStatus ); diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h index 0134ac111e..91b6b002dc 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h @@ -57,7 +57,7 @@ #include "requesthandler.h" #include "application.h" #include "resources.h" -#include "aspnetcore_event.h" +#include "EventTracing.h" #include "aspnetcore_msg.h" #include "requesthandler_config.h" diff --git a/test/Common.FunctionalTests/Inprocess/FrebTests.cs b/test/Common.FunctionalTests/Inprocess/FrebTests.cs index 2143659e33..12e2f6ae53 100644 --- a/test/Common.FunctionalTests/Inprocess/FrebTests.cs +++ b/test/Common.FunctionalTests/Inprocess/FrebTests.cs @@ -49,6 +49,22 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests AssertFrebLogs(result, FrebChecks()); } + [ConditionalFact] + [RequiresNewShim] + [RequiresIIS(IISCapability.FailedRequestTracingModule)] + public async Task FrebIncludesHResultFailures() + { + var parameters = _fixture.GetBaseDeploymentParameters(publish: true); + parameters.TransformArguments((args, _) => string.Empty); + var result = await SetupFrebApp(parameters); + + await result.HttpClient.GetAsync("HelloWorld"); + + StopServer(); + + AssertFrebLogs(result, new FrebLogItem("ANCM_HRESULT_FAILED"), new FrebLogItem("ANCM_EXCEPTION_CAUGHT")); + } + [ConditionalFact] [RequiresIIS(IISCapability.FailedRequestTracingModule)] public async Task CheckFailedRequestEvents() @@ -86,9 +102,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests AssertFrebLogs(result, new FrebLogItem("ANCM_INPROC_REQUEST_DISCONNECT"), new FrebLogItem("ANCM_INPROC_MANAGED_REQUEST_COMPLETION")); } - private async Task SetupFrebApp() + private async Task SetupFrebApp(IISDeploymentParameters parameters = null) { - var parameters = _fixture.GetBaseDeploymentParameters(publish: true); + parameters = parameters ?? _fixture.GetBaseDeploymentParameters(publish: true); parameters.EnableFreb("Verbose", _logFolderPath); Directory.CreateDirectory(_logFolderPath); diff --git a/test/Common.FunctionalTests/LogFileTests.cs b/test/Common.FunctionalTests/LogFileTests.cs index 829a736b6e..1e15cde5c2 100644 --- a/test/Common.FunctionalTests/LogFileTests.cs +++ b/test/Common.FunctionalTests/LogFileTests.cs @@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); await Helpers.AssertStarts(deploymentResult, path); - + StopServer(); var contents = Helpers.ReadAllTextFromFile(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath), Logger); From a9c5eb28d7f374af941f39a485573856ab3f0c18 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 25 Oct 2018 10:30:45 -0700 Subject: [PATCH 360/363] Fix test server shutdown issues (#1554) --- test/IIS.Tests/Utilities/TestServer.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/IIS.Tests/Utilities/TestServer.cs b/test/IIS.Tests/Utilities/TestServer.cs index cd3188bf83..351b826316 100644 --- a/test/IIS.Tests/Utilities/TestServer.cs +++ b/test/IIS.Tests/Utilities/TestServer.cs @@ -146,7 +146,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public void Dispose() { HttpClient.Dispose(); - WebCoreShutdown(false); + + // WebCoreShutdown occasionally AVs + // This causes the dotnet test process to crash + // To avoid this, we have to wait to shutdown + // and pass in true to immediately shutdown the hostable web core + // Both of these seem to be required. + Thread.Sleep(100); + WebCoreShutdown(immediate: true); WebCoreLock.Release(); } From 370490d2a36d46a6714e3b5321ad8139561f4000 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 30 Oct 2018 15:31:03 -0700 Subject: [PATCH 361/363] Fix master package verison (#1565) --- version.props | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/version.props b/version.props index 4bab1590f7..adb9762301 100644 --- a/version.props +++ b/version.props @@ -9,16 +9,6 @@ $(DotNetPatchVersion) alpha1 ancm-oob - 2 - 2 - 1 - 0 - $(DotNetMajorVersion).$(DotNetMinorVersion).$(DotNetPatchVersion) - 12 - 2 - $(DotNetPatchVersion) - rtm - ancm-oob $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From 7fbedc602cd1b600668e9ac54dc2d0322f09b1c4 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 31 Oct 2018 16:26:41 -0700 Subject: [PATCH 362/363] Move 22 into subfolder --- .appveyor.yml | 27 - .editorconfig | 24 - .gitattributes | 53 -- .gitmodules | 3 - .vsts-pipelines/builds/ci-internal-21.yml | 30 - .vsts-pipelines/builds/ci-internal.yml | 13 - .vsts-pipelines/builds/ci-public.yml | 15 - .vsts-pipelines/templates/build-steps.yml | 88 --- CONTRIBUTING.md | 4 - LICENSE.txt | 228 ------ NuGet.config | 7 - README.md | 18 - THIRD_PARTY_NOTICES | 42 - build.cmd | 2 - build.sh | 8 - korebuild-lock.txt | 2 - mv_to_src.sh | 35 + run.cmd | 2 - run.ps1 | 209 ----- run.sh | 256 ------ .gitignore => src/IISIntegration/.gitignore | 0 .../IISIntegration/Directory.Build.props | 0 .../IISIntegration/Directory.Build.targets | 0 .../IISIntegration/IISIntegration.NoV1.sln | 0 .../IISIntegration/IISIntegration.sln | 0 .../IISIntegration/NuGetPackageVerifier.json | 0 .../NuGetPackageVerifier.xplat.json | 0 .../IIS.Performance/FirstRequestConfig.cs | 0 .../IIS.Performance/IIS.Performance.csproj | 0 .../IIS.Performance/PlaintextBenchmark.cs | 0 .../IIS.Performance/StartupTimeBenchmark.cs | 0 .../IISIntegration/build}/Build.Settings | 0 .../build}/Config.Definitions.Props | 0 {build => src/IISIntegration/build}/Key.snk | Bin .../build}/applicationhost.config | 0 .../build}/applicationhost.iis.config | 0 .../IISIntegration/build}/assets.props | 0 .../build}/buildpipeline/pipeline.groovy | 36 +- .../buildpipeline/windows-appverif.groovy | 0 .../build}/buildpipeline/windows.groovy | 30 +- .../IISIntegration/build}/dependencies.props | 0 .../build}/functional-test-assets.targets | 0 .../IISIntegration/build}/launchSettings.json | 0 .../IISIntegration/build}/native.targets | 0 .../IISIntegration/build}/repo.props | 0 .../IISIntegration/build}/repo.targets | 0 .../IISIntegration/build}/sources.props | 0 .../IISIntegration/build}/testsite.props | 0 .../IISIntegration/korebuild.json | 0 ...crosoft.AspNetCore.AspNetCoreModule.nuspec | 0 ...icrosoft.AspNetCore.AspNetCoreModule.props | 0 ...osoft.AspNetCore.AspNetCoreModuleV2.nuspec | 0 ...oft.AspNetCore.AspNetCoreModuleV2.props.in | 0 .../samples}/IISSample/IISSample.csproj | 0 .../IISSample/Properties/launchSettings.json | 0 .../samples}/IISSample/Startup.cs | 0 .../samples}/IISSample/web.config | 0 .../NativeIISSample/NativeIISSample.csproj | 0 .../Properties/launchSettings.json | 0 .../samples}/NativeIISSample/Startup.cs | 0 .../samples}/NativeIISSample/web.config | 0 .../AspNetCore/AspNetCore.vcxproj | 0 .../AspNetCore/Inc/application.h | 0 .../AspNetCore/Inc/applicationmanager.h | 0 .../AspNetCore/Inc/aspnetcoreconfig.h | 0 .../AspNetCore/Inc/debugutil.h | 0 .../AspNetCore/Inc/environmentvariablehash.h | 0 .../AspNetCore/Inc/filewatcher.h | 0 .../AspNetCore/Inc/forwarderconnection.h | 0 .../AspNetCore/Inc/forwardinghandler.h | 0 .../AspNetCoreModuleV1/AspNetCore/Inc/path.h | 0 .../AspNetCore/Inc/processmanager.h | 0 .../AspNetCore/Inc/protocolconfig.h | 0 .../AspNetCore/Inc/proxymodule.h | 0 .../AspNetCore/Inc/resource.h | 0 .../AspNetCore/Inc/responseheaderhash.h | 0 .../AspNetCore/Inc/serverprocess.h | 0 .../AspNetCore/Inc/sttimer.h | 0 .../AspNetCore/Inc/websockethandler.h | 0 .../AspNetCore/Inc/winhttphelper.h | 0 .../AspNetCoreModuleV1/AspNetCore/Source.def | 0 .../AspNetCore/aspnetcore_msg.mc | 0 .../AspNetCore/aspnetcoremodule.rc | 0 .../AspNetCoreModuleV1/AspNetCore/resource.h | 0 .../AspNetCore/src/application.cxx | 0 .../AspNetCore/src/applicationmanager.cxx | 0 .../AspNetCore/src/aspnetcoreconfig.cxx | 0 .../AspNetCore/src/filewatcher.cxx | 0 .../AspNetCore/src/forwarderconnection.cxx | 0 .../AspNetCore/src/forwardinghandler.cxx | 0 .../AspNetCore/src/main.cxx | 0 .../AspNetCore/src/path.cxx | 0 .../AspNetCore/src/precomp.hxx | 0 .../AspNetCore/src/processmanager.cxx | 0 .../AspNetCore/src/protocolconfig.cxx | 0 .../AspNetCore/src/proxymodule.cxx | 0 .../AspNetCore/src/responseheaderhash.cxx | 0 .../AspNetCore/src/serverprocess.cxx | 0 .../AspNetCore/src/websockethandler.cxx | 0 .../AspNetCore/src/winhttphelper.cxx | 0 .../AspNetCoreModuleV1/IISLib/IISLib.vcxproj | 0 .../src}/AspNetCoreModuleV1/IISLib/acache.cxx | 0 .../src}/AspNetCoreModuleV1/IISLib/acache.h | 0 .../src}/AspNetCoreModuleV1/IISLib/ahutil.cpp | 0 .../src}/AspNetCoreModuleV1/IISLib/ahutil.h | 0 .../src}/AspNetCoreModuleV1/IISLib/base64.cpp | 0 .../src}/AspNetCoreModuleV1/IISLib/base64.h | 0 .../src}/AspNetCoreModuleV1/IISLib/buffer.h | 0 .../src}/AspNetCoreModuleV1/IISLib/datetime.h | 0 .../src}/AspNetCoreModuleV1/IISLib/dbgutil.h | 0 .../src}/AspNetCoreModuleV1/IISLib/hashfn.h | 0 .../AspNetCoreModuleV1/IISLib/hashtable.h | 0 .../AspNetCoreModuleV1/IISLib/listentry.h | 0 .../src}/AspNetCoreModuleV1/IISLib/macros.h | 0 .../AspNetCoreModuleV1/IISLib/multisz.cpp | 0 .../src}/AspNetCoreModuleV1/IISLib/multisz.h | 0 .../AspNetCoreModuleV1/IISLib/multisza.cpp | 0 .../src}/AspNetCoreModuleV1/IISLib/multisza.h | 0 .../src}/AspNetCoreModuleV1/IISLib/ntassert.h | 0 .../src}/AspNetCoreModuleV1/IISLib/percpu.h | 0 .../src}/AspNetCoreModuleV1/IISLib/precomp.h | 0 .../src}/AspNetCoreModuleV1/IISLib/prime.h | 0 .../src}/AspNetCoreModuleV1/IISLib/pudebug.h | 0 .../src}/AspNetCoreModuleV1/IISLib/reftrace.c | 0 .../src}/AspNetCoreModuleV1/IISLib/reftrace.h | 0 .../src}/AspNetCoreModuleV1/IISLib/rwlock.h | 0 .../AspNetCoreModuleV1/IISLib/stringa.cpp | 0 .../src}/AspNetCoreModuleV1/IISLib/stringa.h | 0 .../AspNetCoreModuleV1/IISLib/stringu.cpp | 0 .../src}/AspNetCoreModuleV1/IISLib/stringu.h | 0 .../src}/AspNetCoreModuleV1/IISLib/tracelog.c | 0 .../src}/AspNetCoreModuleV1/IISLib/tracelog.h | 0 .../src}/AspNetCoreModuleV1/IISLib/treehash.h | 0 .../src}/AspNetCoreModuleV1/IISLib/util.cxx | 0 .../AspNetCore/AppOfflineApplication.cpp | 0 .../AspNetCore/AppOfflineApplication.h | 0 .../AspNetCore/AppOfflineHandler.cpp | 0 .../AspNetCore/AppOfflineHandler.h | 0 .../AspNetCore/ApplicationFactory.h | 0 .../AspNetCore/AspNetCore.vcxproj | 608 +++++++------- .../AspNetCore/DisconnectHandler.cpp | 0 .../AspNetCore/DisconnectHandler.h | 0 .../AspNetCore/HandlerResolver.cpp | 0 .../AspNetCore/HandlerResolver.h | 0 .../AspNetCore/HtmlResponses.rc | Bin .../AspNetCore/InProcessShimStaticHtml.htm | 0 .../AspNetCore/OutOfProcessShimStaticHtml.htm | 0 .../PollingAppOfflineApplication.cpp | 0 .../AspNetCore/PollingAppOfflineApplication.h | 0 .../AspNetCore/ServerErrorApplication.h | 0 .../AspNetCore/ShimOptions.cpp | 0 .../AspNetCore/ShimOptions.h | 0 .../AspNetCoreModuleV2/AspNetCore/Source.def | 0 .../AspNetCoreModuleV2/AspNetCore/ancm.mof | 0 .../AspNetCore/applicationinfo.cpp | 0 .../AspNetCore/applicationinfo.h | 0 .../AspNetCore/applicationmanager.cpp | 0 .../AspNetCore/applicationmanager.h | 0 .../AspNetCore/aspnetcore_schema_v2.xml | 0 .../AspNetCore/aspnetcoremodule.rc | 0 .../AspNetCoreModuleV2/AspNetCore/dllmain.cpp | 0 .../AspNetCore/globalmodule.cpp | 0 .../AspNetCore/globalmodule.h | 0 .../AspNetCore/proxymodule.cpp | 0 .../AspNetCore/proxymodule.h | 0 .../AspNetCoreModuleV2/AspNetCore/resource.h | 0 .../AspNetCoreModuleV2/AspNetCore/stdafx.cpp | 0 .../AspNetCoreModuleV2/AspNetCore/stdafx.h | 0 .../CommonLib/BaseOutputManager.h | 0 .../CommonLib/CommonLib.vcxproj | 584 +++++++------- .../CommonLib/ConfigurationLoadException.h | 0 .../CommonLib/ConfigurationSection.cpp | 0 .../CommonLib/ConfigurationSection.h | 0 .../CommonLib/ConfigurationSource.cpp | 0 .../CommonLib/ConfigurationSource.h | 0 .../CommonLib/Environment.cpp | 0 .../CommonLib/Environment.h | 0 .../AspNetCoreModuleV2/CommonLib/EventLog.cpp | 0 .../AspNetCoreModuleV2/CommonLib/EventLog.h | 0 .../CommonLib/EventTracing.h | 0 .../CommonLib/FileOutputManager.cpp | 0 .../CommonLib/FileOutputManager.h | 0 .../CommonLib/GlobalVersionUtility.cpp | 0 .../CommonLib/GlobalVersionUtility.h | 0 .../CommonLib/HandleWrapper.cpp | 0 .../CommonLib/HandleWrapper.h | 0 .../CommonLib/IOutputManager.h | 0 .../CommonLib/InvalidOperationException.h | 0 .../CommonLib/LoggingHelpers.cpp | 0 .../CommonLib/LoggingHelpers.h | 0 .../CommonLib/ModuleHelpers.h | 0 .../CommonLib/NonCopyable.h | 0 .../CommonLib/NullOutputManager.h | 0 .../CommonLib/PipeOutputManager.cpp | 0 .../CommonLib/PipeOutputManager.h | 0 .../CommonLib/ResultException.h | 0 .../CommonLib/SRWExclusiveLock.cpp | 0 .../CommonLib/SRWExclusiveLock.h | 0 .../CommonLib/SRWSharedLock.cpp | 0 .../CommonLib/SRWSharedLock.h | 0 .../CommonLib/ServerErrorHandler.h | 0 .../CommonLib/StdWrapper.cpp | 0 .../AspNetCoreModuleV2/CommonLib/StdWrapper.h | 0 .../CommonLib/StringHelpers.cpp | 0 .../CommonLib/StringHelpers.h | 0 .../WebConfigConfigurationSection.cpp | 0 .../CommonLib/WebConfigConfigurationSection.h | 0 .../WebConfigConfigurationSource.cpp | 0 .../CommonLib/WebConfigConfigurationSource.h | 0 .../CommonLib/application.h | 0 .../CommonLib/aspnetcore_event.h | 0 .../CommonLib/aspnetcore_msg.mc | 0 .../CommonLib/config_utility.h | 0 .../CommonLib/debugutil.cpp | 0 .../AspNetCoreModuleV2/CommonLib/debugutil.h | 0 .../AspNetCoreModuleV2/CommonLib/exceptions.h | 0 .../CommonLib/file_utility.cpp | 0 .../CommonLib/file_utility.h | 0 .../AspNetCoreModuleV2/CommonLib/fx_ver.cpp | 0 .../AspNetCoreModuleV2/CommonLib/fx_ver.h | 0 .../CommonLib/hostfxr_utility.cpp | 0 .../CommonLib/hostfxr_utility.h | 0 .../CommonLib/hostfxroptions.cpp | 0 .../CommonLib/hostfxroptions.h | 0 .../CommonLib/iapplication.h | 0 .../CommonLib/irequesthandler.h | 0 .../CommonLib/requesthandler.h | 0 .../AspNetCoreModuleV2/CommonLib/resources.h | 0 .../AspNetCoreModuleV2/CommonLib/stdafx.cpp | 0 .../AspNetCoreModuleV2/CommonLib/stdafx.h | 0 .../AspNetCoreModuleV2/CommonLib/sttimer.h | 0 .../AspNetCoreModuleV2/CommonLib/targetver.h | 0 .../AspNetCoreModuleV2/DefaultRules.ruleset | 0 .../AspNetCoreModuleV2/IISLib/IISLib.vcxproj | 410 +++++----- .../src}/AspNetCoreModuleV2/IISLib/acache.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/acache.h | 0 .../src}/AspNetCoreModuleV2/IISLib/ahutil.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/ahutil.h | 0 .../src}/AspNetCoreModuleV2/IISLib/base64.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/base64.h | 0 .../src}/AspNetCoreModuleV2/IISLib/buffer.h | 0 .../src}/AspNetCoreModuleV2/IISLib/datetime.h | 0 .../src}/AspNetCoreModuleV2/IISLib/dbgutil.h | 0 .../src}/AspNetCoreModuleV2/IISLib/hashfn.h | 0 .../AspNetCoreModuleV2/IISLib/hashtable.h | 0 .../AspNetCoreModuleV2/IISLib/listentry.h | 0 .../src}/AspNetCoreModuleV2/IISLib/macros.h | 0 .../AspNetCoreModuleV2/IISLib/multisz.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/multisz.h | 0 .../AspNetCoreModuleV2/IISLib/multisza.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/multisza.h | 0 .../src}/AspNetCoreModuleV2/IISLib/ntassert.h | 0 .../src}/AspNetCoreModuleV2/IISLib/percpu.h | 0 .../src}/AspNetCoreModuleV2/IISLib/precomp.h | 0 .../src}/AspNetCoreModuleV2/IISLib/prime.h | 0 .../src}/AspNetCoreModuleV2/IISLib/reftrace.c | 0 .../src}/AspNetCoreModuleV2/IISLib/reftrace.h | 0 .../src}/AspNetCoreModuleV2/IISLib/rwlock.h | 0 .../AspNetCoreModuleV2/IISLib/stringa.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/stringa.h | 0 .../AspNetCoreModuleV2/IISLib/stringu.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/stringu.h | 0 .../src}/AspNetCoreModuleV2/IISLib/tracelog.c | 0 .../src}/AspNetCoreModuleV2/IISLib/tracelog.h | 0 .../src}/AspNetCoreModuleV2/IISLib/treehash.h | 0 .../src}/AspNetCoreModuleV2/IISLib/util.cpp | 0 .../InProcessRequestHandler/HtmlResponses.rc | Bin .../InProcessApplicationBase.cpp | 0 .../InProcessApplicationBase.h | 0 .../InProcessOptions.cpp | 0 .../InProcessOptions.h | 0 .../InProcessRequestHandler.vcxproj | 550 ++++++------- .../InProcessRhStaticHtml.htm | 0 .../ShuttingDownApplication.h | 0 .../InProcessRequestHandler/Source.def | 0 .../StartupExceptionApplication.h | 0 .../StartupExceptionHandler.h | 0 .../InProcessRequestHandler/dllmain.cpp | 0 .../inprocessapplication.cpp | 0 .../inprocessapplication.h | 0 .../inprocesshandler.cpp | 0 .../inprocesshandler.h | 0 .../inprocessrequesthandler.rc | 0 .../managedexports.cpp | 0 .../InProcessRequestHandler/resource.h | 0 .../InProcessRequestHandler/stdafx.cpp | 0 .../InProcessRequestHandler/stdafx.h | 0 .../HtmlResponses.rc | 0 .../OutOfProcessRequestHandler.vcxproj | 568 +++++++------- .../OutOfProcessRhStaticHtml.htm | 0 .../OutOfProcessRequestHandler/Source.def | 0 .../OutOfProcessRequestHandler/dllmain.cpp | 0 .../forwarderconnection.cpp | 0 .../forwarderconnection.h | 0 .../forwardinghandler.cpp | 0 .../forwardinghandler.h | 0 .../outofprocessrequesthandler.rc | 0 .../outprocessapplication.cpp | 0 .../outprocessapplication.h | 0 .../processmanager.cpp | 0 .../processmanager.h | 0 .../protocolconfig.cpp | 0 .../protocolconfig.h | 0 .../OutOfProcessRequestHandler/resource.h | 0 .../responseheaderhash.cpp | 0 .../responseheaderhash.h | 0 .../serverprocess.cpp | 0 .../serverprocess.h | 0 .../OutOfProcessRequestHandler/stdafx.cpp | 0 .../OutOfProcessRequestHandler/stdafx.h | 0 .../url_utility.cpp | 0 .../OutOfProcessRequestHandler/url_utility.h | 0 .../websockethandler.cpp | 0 .../websockethandler.h | 0 .../winhttphelper.cpp | 0 .../winhttphelper.h | 0 .../AppOfflineTrackingApplication.cpp | 0 .../AppOfflineTrackingApplication.h | 0 .../RequestHandlerLib.vcxproj | 0 .../environmentvariablehash.h | 0 .../environmentvariablehelpers.h | 0 .../RequestHandlerLib/filewatcher.cpp | 0 .../RequestHandlerLib/filewatcher.h | 0 .../requesthandler_config.cpp | 0 .../RequestHandlerLib/requesthandler_config.h | 0 .../RequestHandlerLib/stdafx.h | 0 .../src}/Directory.Build.props | 0 .../AppHostConfig/IIS.config | 0 .../Common.FunctionalTests/AppOfflineTests.cs | 0 .../Common.FunctionalTests/BasicAuthTests.cs | 0 .../ClientCertificateFixture.cs | 0 .../ClientCertificateTests.cs | 0 .../ClientDisconnectStress.cs | 0 .../CommonStartupTests.cs | 0 .../CompressionTests.cs | 0 .../ConfigurationChangeTests.cs | 0 .../Inprocess/ClientDisconnectTests.cs | 0 .../Inprocess/CompressionTests.cs | 0 .../Inprocess/EnvironmentVariableTests.cs | 0 .../Inprocess/ErrorPagesTests.cs | 0 .../Inprocess/EventLogTests.cs | 0 .../Inprocess/FeatureCollectionTests.cs | 0 .../Inprocess/FixtureLoggedTest.cs | 0 .../Inprocess/FrebTests.cs | 0 .../Inprocess/HelloWorldTests.cs | 0 .../Inprocess/HostingEnvironmentTests.cs | 0 .../InvalidReadWriteOperationTests.cs | 0 .../Inprocess/LargeResponseBodyTests.cs | 0 .../Inprocess/LogPipeTests.cs | 0 .../Inprocess/ResponseHeaderTests.cs | 0 .../Inprocess/ResponseInvalidOrderingTests.cs | 0 .../Inprocess/ServerVariablesTest.cs | 0 .../Inprocess/StartupExceptionTests.cs | 0 .../Inprocess/StartupTests.cs | 0 .../Inprocess/SynchronousReadAndWriteTests.cs | 0 .../Common.FunctionalTests/LogFileTests.cs | 0 .../MultiApplicationTests.cs | 0 .../OutOfProcess/AspNetCorePortTests.cs | 0 .../OutOfProcess/GlobalVersionTests.cs | 0 .../OutOfProcess/HelloWorldTest.cs | 0 .../PublishedSitesFixture.cs | 0 .../RequiresNewHandler.cs | 0 .../Common.FunctionalTests/RequiresNewShim.cs | 0 .../ServerAbortTests.cs | 0 .../SkipIfNotAdminAttribute.cs | 0 .../SkipVSTSAttribute.cs | 0 .../Utilities/AppVerifier.cs | 0 .../Utilities/EventLogHelpers.cs | 0 .../Utilities/FunctionalTestsBase.cs | 0 .../Utilities/Helpers.cs | 0 .../Utilities/IISCapability.cs | 0 .../Utilities/IISCompressionSiteCollection.cs | 0 .../Utilities/IISCompressionSiteFixture.cs | 0 .../Utilities/IISFunctionalTestBase.cs | 0 .../Utilities/IISTestSiteCollection.cs | 0 .../Utilities/IISTestSiteFixture.cs | 0 .../Utilities/LogFileTestBase.cs | 0 .../RequiresEnvironmentVariableAttribute.cs | 0 .../Utilities/SkipIfDebugAttribute.cs | 0 .../WindowsAuthTests.cs | 0 .../test}/Common.Tests/Common.Tests.csproj | 0 .../Common.Tests/Utilities/DisposableList.cs | 0 .../Common.Tests/Utilities/TestConnections.cs | 0 .../Utilities/TimeoutExtensions.cs | 0 .../CommonLibTests/CommonLibTests.vcxproj | 0 .../CommonLibTests/ConfigUtilityTests.cpp | 0 .../CommonLibTests/FileOutputManagerTests.cpp | 0 .../CommonLibTests/GlobalVersionTests.cpp | 0 .../test}/CommonLibTests/Helpers.cpp | 0 .../test}/CommonLibTests/Helpers.h | 0 .../test}/CommonLibTests/NativeTests.targets | 0 .../CommonLibTests/PipeOutputManagerTests.cpp | 0 .../exception_handler_tests.cpp | 0 .../test}/CommonLibTests/fakeclasses.h | 0 .../CommonLibTests/hostfxr_utility_tests.cpp | 0 .../inprocess_application_tests.cpp | 0 .../test}/CommonLibTests/main.cpp | 0 .../test}/CommonLibTests/stdafx.h | 0 .../test}/CommonLibTests/utility_tests.cpp | 0 .../test}/Directory.Build.props | 0 .../BackwardsCompatibilityTests.cs | 0 .../DeployerSelector.cs | 0 ...kwardsCompatibility.FunctionalTests.csproj | 0 .../DeployerSelector.cs | 0 .../ForwardsCompatibilityTests.cs | 0 ...rwardsCompatibility.FunctionalTests.csproj | 0 .../IIS.FunctionalTests/DeployerSelector.cs | 0 .../IIS.FunctionalTests.csproj | 0 .../Inprocess/StdOutRedirectionTests.cs | 0 .../MofFileTests.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RequiresIISAttribute.cs | 0 .../ServicesTests.cs | 0 .../AppHostConfig/HostableWebCore.config | 0 .../test}/IIS.Tests/ClientDisconnectTests.cs | 0 .../IIS.Tests/ConnectionIdFeatureTests.cs | 0 .../IIS.Tests/HttpBodyControlFeatureTests.cs | 0 .../test}/IIS.Tests/IIS.Tests.csproj | 0 .../test}/IIS.Tests/ResponseAbortTests.cs | 0 .../test}/IIS.Tests/StrictTestServerTests.cs | 0 .../test}/IIS.Tests/TestServerTest.cs | 0 ...pIfHostableWebCoreNotAvailibleAttribute.cs | 0 .../test}/IIS.Tests/Utilities/TestServer.cs | 0 .../DeployerSelector.cs | 0 .../IISExpress.FunctionalTests/HttpsTests.cs | 0 .../IISExpress.FunctionalTests.csproj | 0 .../InProcess/AuthenticationTests.cs | 0 .../InProcess/ShutdownTests.cs | 0 .../InProcess/WebSocketTests.cs | 0 .../OutOfProcess/MultipleAppTests.cs | 0 .../OutOfProcess/NtlmAuthentationTest.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RequiresIISAttribute.cs | 0 .../UpgradeFeatureDetectionTests.cs | 0 .../IISExtensionTests.cs | 0 .../IISMiddlewareTests.cs | 0 ...NetCore.Server.IISIntegration.Tests.csproj | 0 .../test}/TestTasks/InjectRequestHandler.cs | 0 .../test}/TestTasks/TestTasks.csproj | 0 .../test}/WebSites/Directory.Build.props | 0 .../InProcessWebSite.csproj | 0 .../Properties/launchSettings.json | 0 .../WebSites/InProcessWebSite/DummyServer.cs | 0 .../InProcessWebSite/InProcessWebSite.csproj | 0 .../WebSites/InProcessWebSite/Program.cs | 0 .../Properties/launchSettings.json | 0 .../InProcessWebSite/Startup.WebSockets.cs | 0 .../WebSites/InProcessWebSite/Startup.cs | 0 .../WebSites/InProcessWebSite/web.config | 0 .../InProcessWebSite/wwwroot/static.txt | 0 .../OutOfProcessWebSite.csproj | 0 .../WebSites/OutOfProcessWebSite/Program.cs | 0 .../Properties/launchSettings.json | 0 .../WebSites/OutOfProcessWebSite/Startup.cs | 0 .../OutOfProcessWebSite/wwwroot/static.txt | 0 .../WebSites/StressTestWebSite/Program.cs | 0 .../Properties/launchSettings.json | 0 .../WebSites/StressTestWebSite/Startup.cs | 0 .../StressTestWebSite.csproj | 0 .../shared/SharedStartup/Startup.shared.cs | 0 .../WebSites/shared/WebSockets/Constants.cs | 0 .../shared/WebSockets/HandshakeHelpers.cs | 0 .../WebSites/shared/WebSockets/TestStartup.cs | 0 .../IISIntegration/test}/gtest/gtest.vcxproj | 0 .../AssemblyInfo.cs | 0 .../Core/DuplexStream.cs | 0 .../Core/EmptyStream.cs | 0 .../Core/HttpRequestStream.cs | 0 .../Core/HttpResponseStream.cs | 0 .../Core/HttpStreamState.cs | 0 .../Core/HttpUpgradeStream.cs | 0 .../Core/IISConfigurationData.cs | 0 .../Core/IISHttpContext.FeatureCollection.cs | 0 .../Core/IISHttpContext.Features.cs | 0 .../IISHttpContext.IHttpConnectionFeature.cs | 0 ...tpContext.IHttpRequestIdentifierFeature.cs | 0 ...HttpContext.IHttpRequestLifetimeFeature.cs | 0 .../Core/IISHttpContext.IO.cs | 0 .../Core/IISHttpContext.Log.cs | 0 .../Core/IISHttpContext.cs | 0 .../Core/IISHttpContextOfT.cs | 0 .../Core/IISHttpServer.cs | 0 .../Core/IISNativeApplication.cs | 0 .../Core/IISServerAuthenticationHandler.cs | 0 .../Core/IISServerSetupFilter.cs | 0 .../Core/IO/AsyncIOEngine.Flush.cs | 0 .../Core/IO/AsyncIOEngine.Read.cs | 0 .../Core/IO/AsyncIOEngine.Write.cs | 0 .../Core/IO/AsyncIOEngine.cs | 0 .../Core/IO/AsyncIOOperation.cs | 0 .../Core/IO/AsyncWriteOperationBase.cs | 0 .../Core/IO/IAsyncIOEngine.cs | 0 .../IO/WebSocketsAsyncIOEngine.Initialize.cs | 0 .../Core/IO/WebSocketsAsyncIOEngine.Read.cs | 0 .../Core/IO/WebSocketsAsyncIOEngine.Write.cs | 0 .../Core/IO/WebSocketsAsyncIOEngine.cs | 0 .../Core/OutputProducer.cs | 0 .../Core/ReadOnlyStream.cs | 0 .../Core/Streams.cs | 0 .../ThrowingWasUpgradedWriteOnlyStream.cs | 0 .../Core/WrappingStream.cs | 0 .../Core/WriteOnlyStream.cs | 0 .../CoreStrings.resx | 0 .../HttpContextExtensions.cs | 0 .../IISServerDefaults.cs | 0 .../IISServerOptions.cs | 0 .../IServerVariableFeature.cs | 0 .../Microsoft.AspNetCore.Server.IIS.csproj | 0 .../Microsoft.AspNetCore.Server.IIS.targets | 0 .../NativeMethods.cs | 0 .../Properties/CoreStrings.Designer.cs | 0 .../WebHostBuilderIISExtensions.cs | 0 .../src}/Microsoft.AspNetCore.Server.IIS/_._ | 0 .../AuthenticationHandler.cs | 0 .../ForwardedTlsConnectionFeature.cs | 0 .../IISDefaults.cs | 0 .../IISHostingStartup.cs | 0 .../IISMiddleware.cs | 0 .../IISOptions.cs | 0 .../IISSetupFilter.cs | 0 ...ft.AspNetCore.Server.IISIntegration.csproj | 0 ...t.AspNetCore.Server.IISIntegration.targets | 0 .../NativeMethods.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../WebHostBuilderIISExtensions.cs | 0 .../baseline.netcore.json | 0 .../ApplicationDeployerFactory.cs | 0 .../Http.config | 0 .../IISDeployer.cs | 0 .../IISDeployerBase.cs | 0 .../IISDeploymentParameterExtensions.cs | 0 .../IISDeploymentParameters.cs | 0 .../IISDeploymentResult.cs | 0 .../IISExpressDeployer.cs | 0 .../LoggingHandler.cs | 0 ...tCore.Server.IntegrationTesting.IIS.csproj | 0 .../ProcessTracker.cs | 0 .../RetryHandler.cs | 0 .../WebConfigHelpers.cs | 0 .../XElementExtensions.cs | 0 .../AppHostConfig/IIS.config | 740 ++++++++++++++++++ .../Common.FunctionalTests/AppOfflineTests.cs | 287 +++++++ .../Common.FunctionalTests/BasicAuthTests.cs | 70 ++ .../ClientCertificateFixture.cs | 104 +++ .../ClientCertificateTests.cs | 108 +++ .../ClientDisconnectStress.cs | 65 ++ .../CommonStartupTests.cs | 44 ++ .../CompressionTests.cs | 58 ++ .../ConfigurationChangeTests.cs | 126 +++ .../Inprocess/ClientDisconnectTests.cs | 108 +++ .../Inprocess/CompressionTests.cs | 96 +++ .../Inprocess/EnvironmentVariableTests.cs | 51 ++ .../Inprocess/ErrorPagesTests.cs | 131 ++++ .../Inprocess/EventLogTests.cs | 46 ++ .../Inprocess/FeatureCollectionTests.cs | 29 + .../Inprocess/FixtureLoggedTest.cs | 31 + .../Inprocess/FrebTests.cs | 181 +++++ .../Inprocess/HelloWorldTests.cs | 30 + .../Inprocess/HostingEnvironmentTests.cs | 33 + .../InvalidReadWriteOperationTests.cs | 84 ++ .../Inprocess/LargeResponseBodyTests.cs | 36 + .../Inprocess/LogPipeTests.cs | 83 ++ .../Inprocess/ResponseHeaderTests.cs | 85 ++ .../Inprocess/ResponseInvalidOrderingTests.cs | 29 + .../Inprocess/ServerVariablesTest.cs | 59 ++ .../Inprocess/StartupExceptionTests.cs | 100 +++ .../Inprocess/StartupTests.cs | 479 ++++++++++++ .../Inprocess/SynchronousReadAndWriteTests.cs | 197 +++++ .../Common.FunctionalTests/LogFileTests.cs | 242 ++++++ .../MultiApplicationTests.cs | 144 ++++ .../OutOfProcess/AspNetCorePortTests.cs | 125 +++ .../OutOfProcess/GlobalVersionTests.cs | 252 ++++++ .../OutOfProcess/HelloWorldTest.cs | 81 ++ .../PublishedSitesFixture.cs | 65 ++ .../RequiresNewHandler.cs | 16 + .../Common.FunctionalTests/RequiresNewShim.cs | 16 + .../ServerAbortTests.cs | 65 ++ .../SkipIfNotAdminAttribute.cs | 25 + .../SkipVSTSAttribute.cs | 17 + .../Utilities/AppVerifier.cs | 83 ++ .../Utilities/EventLogHelpers.cs | 210 +++++ .../Utilities/FunctionalTestsBase.cs | 59 ++ .../Utilities/Helpers.cs | 241 ++++++ .../Utilities/IISCapability.cs | 22 + .../Utilities/IISCompressionSiteCollection.cs | 13 + .../Utilities/IISCompressionSiteFixture.cs | 44 ++ .../Utilities/IISFunctionalTestBase.cs | 15 + .../Utilities/IISTestSiteCollection.cs | 29 + .../Utilities/IISTestSiteFixture.cs | 191 +++++ .../Utilities/LogFileTestBase.cs | 34 + .../RequiresEnvironmentVariableAttribute.cs | 24 + .../Utilities/SkipIfDebugAttribute.cs | 22 + .../WindowsAuthTests.cs | 52 ++ .../test/Common.Tests/Common.Tests.csproj | 22 + .../Common.Tests/Utilities/DisposableList.cs | 25 + .../Common.Tests/Utilities/TestConnections.cs | 252 ++++++ .../Utilities/TimeoutExtensions.cs | 26 + .../CommonLibTests/CommonLibTests.vcxproj | 196 +++++ .../CommonLibTests/ConfigUtilityTests.cpp | 123 +++ .../CommonLibTests/FileOutputManagerTests.cpp | 152 ++++ .../CommonLibTests/GlobalVersionTests.cpp | 153 ++++ .../test/CommonLibTests/Helpers.cpp | 41 + .../test/CommonLibTests/Helpers.h | 28 + .../test/CommonLibTests/NativeTests.targets | 8 + .../CommonLibTests/PipeOutputManagerTests.cpp | 162 ++++ .../exception_handler_tests.cpp | 49 ++ .../test/CommonLibTests/fakeclasses.h | 190 +++++ .../CommonLibTests/hostfxr_utility_tests.cpp | 122 +++ .../inprocess_application_tests.cpp | 85 ++ .../test/CommonLibTests/main.cpp | 12 + .../test/CommonLibTests/stdafx.h | 59 ++ .../test/CommonLibTests/utility_tests.cpp | 75 ++ src/IISIntegration/test/Directory.Build.props | 16 + .../BackwardsCompatibilityTests.cs | 39 + .../DeployerSelector.cs | 14 + ...kwardsCompatibility.FunctionalTests.csproj | 46 ++ .../DeployerSelector.cs | 14 + .../ForwardsCompatibilityTests.cs | 38 + ...rwardsCompatibility.FunctionalTests.csproj | 45 ++ .../IIS.FunctionalTests/DeployerSelector.cs | 14 + .../IIS.FunctionalTests.csproj | 46 ++ .../Inprocess/StdOutRedirectionTests.cs | 150 ++++ .../MofFileTests.cs | 26 + .../Properties/AssemblyInfo.cs | 10 + .../RequiresIISAttribute.cs | 150 ++++ .../ServicesTests.cs | 96 +++ .../AppHostConfig/HostableWebCore.config | 198 +++++ .../test/IIS.Tests/ClientDisconnectTests.cs | 302 +++++++ .../IIS.Tests/ConnectionIdFeatureTests.cs | 54 ++ .../IIS.Tests/HttpBodyControlFeatureTests.cs | 31 + .../test/IIS.Tests/IIS.Tests.csproj | 32 + .../test/IIS.Tests/ResponseAbortTests.cs | 151 ++++ .../test/IIS.Tests/StrictTestServerTests.cs | 24 + .../test/IIS.Tests/TestServerTest.cs | 35 + ...pIfHostableWebCoreNotAvailibleAttribute.cs | 17 + .../test/IIS.Tests/Utilities/TestServer.cs | 211 +++++ .../DeployerSelector.cs | 14 + .../IISExpress.FunctionalTests/HttpsTests.cs | 60 ++ .../IISExpress.FunctionalTests.csproj | 38 + .../InProcess/AuthenticationTests.cs | 70 ++ .../InProcess/ShutdownTests.cs | 90 +++ .../InProcess/WebSocketTests.cs | 79 ++ .../OutOfProcess/MultipleAppTests.cs | 81 ++ .../OutOfProcess/NtlmAuthentationTest.cs | 87 ++ .../Properties/AssemblyInfo.cs | 10 + .../RequiresIISAttribute.cs | 24 + .../UpgradeFeatureDetectionTests.cs | 83 ++ .../IISExtensionTests.cs | 33 + .../IISMiddlewareTests.cs | 420 ++++++++++ ...NetCore.Server.IISIntegration.Tests.csproj | 18 + .../test/TestTasks/InjectRequestHandler.cs | 62 ++ .../test/TestTasks/TestTasks.csproj | 12 + .../test/WebSites/Directory.Build.props | 7 + .../InProcessWebSite.csproj | 32 + .../Properties/launchSettings.json | 42 + .../WebSites/InProcessWebSite/DummyServer.cs | 30 + .../InProcessWebSite/InProcessWebSite.csproj | 33 + .../test/WebSites/InProcessWebSite/Program.cs | 114 +++ .../Properties/launchSettings.json | 42 + .../InProcessWebSite/Startup.WebSockets.cs | 147 ++++ .../test/WebSites/InProcessWebSite/Startup.cs | 699 +++++++++++++++++ .../test/WebSites/InProcessWebSite/web.config | 16 + .../InProcessWebSite/wwwroot/static.txt | 0 .../OutOfProcessWebSite.csproj | 31 + .../WebSites/OutOfProcessWebSite/Program.cs | 45 ++ .../Properties/launchSettings.json | 42 + .../WebSites/OutOfProcessWebSite/Startup.cs | 105 +++ .../OutOfProcessWebSite/wwwroot/static.txt | 0 .../WebSites/StressTestWebSite/Program.cs | 26 + .../Properties/launchSettings.json | 42 + .../WebSites/StressTestWebSite/Startup.cs | 232 ++++++ .../StressTestWebSite.csproj | 25 + .../shared/SharedStartup/Startup.shared.cs | 117 +++ .../WebSites/shared/WebSockets/Constants.cs | 17 + .../shared/WebSockets/HandshakeHelpers.cs | 41 + .../WebSites/shared/WebSockets/TestStartup.cs | 38 + src/IISIntegration/test/gtest/gtest.vcxproj | 180 +++++ .../tools}/GenerateNativeAssets.ps1 | 0 .../tools}/SetupTestEnvironment.ps1 | 0 .../tools}/UpdateIISExpressCertificate.ps1 | 0 .../IISIntegration/tools}/certificate.ps1 | 0 .../IISIntegration/tools}/httpsys.ps1 | 0 .../IISIntegration/tools}/installancm.ps1 | 0 .../IISIntegration/tools}/update_schema.ps1 | 0 .../IISIntegration/version.props | 0 test/gtest/googletest | 1 - 686 files changed, 13828 insertions(+), 2425 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .editorconfig delete mode 100644 .gitattributes delete mode 100644 .gitmodules delete mode 100644 .vsts-pipelines/builds/ci-internal-21.yml delete mode 100644 .vsts-pipelines/builds/ci-internal.yml delete mode 100644 .vsts-pipelines/builds/ci-public.yml delete mode 100644 .vsts-pipelines/templates/build-steps.yml delete mode 100644 CONTRIBUTING.md delete mode 100644 LICENSE.txt delete mode 100644 NuGet.config delete mode 100644 README.md delete mode 100644 THIRD_PARTY_NOTICES delete mode 100644 build.cmd delete mode 100755 build.sh delete mode 100644 korebuild-lock.txt create mode 100644 mv_to_src.sh delete mode 100644 run.cmd delete mode 100644 run.ps1 delete mode 100755 run.sh rename .gitignore => src/IISIntegration/.gitignore (100%) rename Directory.Build.props => src/IISIntegration/Directory.Build.props (100%) rename Directory.Build.targets => src/IISIntegration/Directory.Build.targets (100%) rename IISIntegration.NoV1.sln => src/IISIntegration/IISIntegration.NoV1.sln (100%) rename IISIntegration.sln => src/IISIntegration/IISIntegration.sln (100%) rename NuGetPackageVerifier.json => src/IISIntegration/NuGetPackageVerifier.json (100%) rename NuGetPackageVerifier.xplat.json => src/IISIntegration/NuGetPackageVerifier.xplat.json (100%) rename {benchmarks => src/IISIntegration/benchmarks}/IIS.Performance/FirstRequestConfig.cs (100%) rename {benchmarks => src/IISIntegration/benchmarks}/IIS.Performance/IIS.Performance.csproj (100%) rename {benchmarks => src/IISIntegration/benchmarks}/IIS.Performance/PlaintextBenchmark.cs (100%) rename {benchmarks => src/IISIntegration/benchmarks}/IIS.Performance/StartupTimeBenchmark.cs (100%) rename {build => src/IISIntegration/build}/Build.Settings (100%) rename {build => src/IISIntegration/build}/Config.Definitions.Props (100%) rename {build => src/IISIntegration/build}/Key.snk (100%) rename {build => src/IISIntegration/build}/applicationhost.config (100%) rename {build => src/IISIntegration/build}/applicationhost.iis.config (100%) rename {build => src/IISIntegration/build}/assets.props (100%) rename {build => src/IISIntegration/build}/buildpipeline/pipeline.groovy (96%) rename {build => src/IISIntegration/build}/buildpipeline/windows-appverif.groovy (100%) rename {build => src/IISIntegration/build}/buildpipeline/windows.groovy (98%) rename {build => src/IISIntegration/build}/dependencies.props (100%) rename {build => src/IISIntegration/build}/functional-test-assets.targets (100%) rename {build => src/IISIntegration/build}/launchSettings.json (100%) rename {build => src/IISIntegration/build}/native.targets (100%) rename {build => src/IISIntegration/build}/repo.props (100%) rename {build => src/IISIntegration/build}/repo.targets (100%) rename {build => src/IISIntegration/build}/sources.props (100%) rename {build => src/IISIntegration/build}/testsite.props (100%) rename korebuild.json => src/IISIntegration/korebuild.json (100%) rename {nuget => src/IISIntegration/nuget}/Microsoft.AspNetCore.AspNetCoreModule.nuspec (100%) rename {nuget => src/IISIntegration/nuget}/Microsoft.AspNetCore.AspNetCoreModule.props (100%) rename {nuget => src/IISIntegration/nuget}/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec (100%) rename {nuget => src/IISIntegration/nuget}/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in (100%) rename {samples => src/IISIntegration/samples}/IISSample/IISSample.csproj (100%) rename {samples => src/IISIntegration/samples}/IISSample/Properties/launchSettings.json (100%) rename {samples => src/IISIntegration/samples}/IISSample/Startup.cs (100%) rename {samples => src/IISIntegration/samples}/IISSample/web.config (100%) rename {samples => src/IISIntegration/samples}/NativeIISSample/NativeIISSample.csproj (100%) rename {samples => src/IISIntegration/samples}/NativeIISSample/Properties/launchSettings.json (100%) rename {samples => src/IISIntegration/samples}/NativeIISSample/Startup.cs (100%) rename {samples => src/IISIntegration/samples}/NativeIISSample/web.config (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/application.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/path.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/resource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Source.def (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/resource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/application.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/main.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/path.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/IISLib.vcxproj (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/acache.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/acache.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/ahutil.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/ahutil.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/base64.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/base64.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/buffer.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/datetime.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/dbgutil.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/hashfn.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/hashtable.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/listentry.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/macros.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/multisz.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/multisz.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/multisza.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/multisza.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/ntassert.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/percpu.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/precomp.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/prime.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/pudebug.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/reftrace.c (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/reftrace.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/rwlock.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/stringa.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/stringa.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/stringu.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/stringu.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/tracelog.c (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/tracelog.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/treehash.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/util.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj (98%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/ShimOptions.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/Source.def (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/ancm.mof (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/applicationinfo.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/applicationmanager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/dllmain.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/globalmodule.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/proxymodule.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/resource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/stdafx.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/stdafx.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj (98%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/Environment.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/Environment.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/EventLog.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/EventLog.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/EventTracing.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/FileOutputManager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/HandleWrapper.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/IOutputManager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/NonCopyable.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/NullOutputManager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ResultException.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/StdWrapper.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/StringHelpers.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/application.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/config_utility.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/debugutil.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/debugutil.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/exceptions.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/file_utility.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/file_utility.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/fx_ver.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/fx_ver.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/hostfxroptions.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/iapplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/irequesthandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/requesthandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/resources.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/stdafx.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/stdafx.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/sttimer.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/targetver.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/DefaultRules.ruleset (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/IISLib.vcxproj (97%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/acache.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/acache.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/ahutil.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/ahutil.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/base64.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/base64.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/buffer.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/datetime.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/dbgutil.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/hashfn.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/hashtable.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/listentry.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/macros.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/multisz.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/multisz.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/multisza.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/multisza.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/ntassert.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/percpu.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/precomp.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/prime.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/reftrace.c (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/reftrace.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/rwlock.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/stringa.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/stringa.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/stringu.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/stringu.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/tracelog.c (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/tracelog.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/treehash.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/util.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj (98%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/Source.def (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/resource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj (98%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h (100%) rename src/{ => IISIntegration/src}/Directory.Build.props (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/AppHostConfig/IIS.config (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/AppOfflineTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/BasicAuthTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/ClientCertificateFixture.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/ClientCertificateTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/ClientDisconnectStress.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/CommonStartupTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/CompressionTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/ConfigurationChangeTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/CompressionTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/EventLogTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/FrebTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/HelloWorldTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/LogPipeTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/StartupTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/LogFileTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/MultiApplicationTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/PublishedSitesFixture.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/RequiresNewHandler.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/RequiresNewShim.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/ServerAbortTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/SkipIfNotAdminAttribute.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/SkipVSTSAttribute.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Utilities/AppVerifier.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Utilities/EventLogHelpers.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Utilities/Helpers.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Utilities/IISCapability.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Utilities/LogFileTestBase.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.FunctionalTests/WindowsAuthTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.Tests/Common.Tests.csproj (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.Tests/Utilities/DisposableList.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.Tests/Utilities/TestConnections.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Common.Tests/Utilities/TimeoutExtensions.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/CommonLibTests.vcxproj (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/ConfigUtilityTests.cpp (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/FileOutputManagerTests.cpp (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/GlobalVersionTests.cpp (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/Helpers.cpp (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/Helpers.h (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/NativeTests.targets (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/PipeOutputManagerTests.cpp (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/exception_handler_tests.cpp (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/fakeclasses.h (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/hostfxr_utility_tests.cpp (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/inprocess_application_tests.cpp (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/main.cpp (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/stdafx.h (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/CommonLibTests/utility_tests.cpp (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Directory.Build.props (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.FunctionalTests/DeployerSelector.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.FunctionalTests/IIS.FunctionalTests.csproj (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Shared.FunctionalTests/MofFileTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Shared.FunctionalTests/ServicesTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Tests/AppHostConfig/HostableWebCore.config (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Tests/ClientDisconnectTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Tests/ConnectionIdFeatureTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Tests/HttpBodyControlFeatureTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Tests/IIS.Tests.csproj (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Tests/ResponseAbortTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Tests/StrictTestServerTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Tests/TestServerTest.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IIS.Tests/Utilities/TestServer.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IISExpress.FunctionalTests/DeployerSelector.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IISExpress.FunctionalTests/HttpsTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IISExpress.FunctionalTests/RequiresIISAttribute.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/TestTasks/InjectRequestHandler.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/TestTasks/TestTasks.csproj (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/Directory.Build.props (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/InProcessWebSite/DummyServer.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/InProcessWebSite/InProcessWebSite.csproj (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/InProcessWebSite/Program.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/InProcessWebSite/Properties/launchSettings.json (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/InProcessWebSite/Startup.WebSockets.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/InProcessWebSite/Startup.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/InProcessWebSite/web.config (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/InProcessWebSite/wwwroot/static.txt (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/OutOfProcessWebSite/Program.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/OutOfProcessWebSite/Properties/launchSettings.json (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/OutOfProcessWebSite/Startup.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/OutOfProcessWebSite/wwwroot/static.txt (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/StressTestWebSite/Program.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/StressTestWebSite/Properties/launchSettings.json (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/StressTestWebSite/Startup.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/StressTestWebSite/StressTestWebSite.csproj (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/shared/SharedStartup/Startup.shared.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/shared/WebSockets/Constants.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/shared/WebSockets/HandshakeHelpers.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/WebSites/shared/WebSockets/TestStartup.cs (100%) rename {test => src/IISIntegration/src/IISIntegration/test}/gtest/gtest.vcxproj (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/_._ (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs (100%) create mode 100644 src/IISIntegration/test/Common.FunctionalTests/AppHostConfig/IIS.config create mode 100644 src/IISIntegration/test/Common.FunctionalTests/AppOfflineTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/ClientCertificateFixture.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/ClientDisconnectStress.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/ConfigurationChangeTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/CompressionTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/EventLogTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/FrebTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/MultiApplicationTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/RequiresNewHandler.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/RequiresNewShim.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/ServerAbortTests.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/SkipVSTSAttribute.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Utilities/AppVerifier.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Utilities/Helpers.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCapability.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs create mode 100644 src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs create mode 100644 src/IISIntegration/test/Common.Tests/Common.Tests.csproj create mode 100644 src/IISIntegration/test/Common.Tests/Utilities/DisposableList.cs create mode 100644 src/IISIntegration/test/Common.Tests/Utilities/TestConnections.cs create mode 100644 src/IISIntegration/test/Common.Tests/Utilities/TimeoutExtensions.cs create mode 100644 src/IISIntegration/test/CommonLibTests/CommonLibTests.vcxproj create mode 100644 src/IISIntegration/test/CommonLibTests/ConfigUtilityTests.cpp create mode 100644 src/IISIntegration/test/CommonLibTests/FileOutputManagerTests.cpp create mode 100644 src/IISIntegration/test/CommonLibTests/GlobalVersionTests.cpp create mode 100644 src/IISIntegration/test/CommonLibTests/Helpers.cpp create mode 100644 src/IISIntegration/test/CommonLibTests/Helpers.h create mode 100644 src/IISIntegration/test/CommonLibTests/NativeTests.targets create mode 100644 src/IISIntegration/test/CommonLibTests/PipeOutputManagerTests.cpp create mode 100644 src/IISIntegration/test/CommonLibTests/exception_handler_tests.cpp create mode 100644 src/IISIntegration/test/CommonLibTests/fakeclasses.h create mode 100644 src/IISIntegration/test/CommonLibTests/hostfxr_utility_tests.cpp create mode 100644 src/IISIntegration/test/CommonLibTests/inprocess_application_tests.cpp create mode 100644 src/IISIntegration/test/CommonLibTests/main.cpp create mode 100644 src/IISIntegration/test/CommonLibTests/stdafx.h create mode 100644 src/IISIntegration/test/CommonLibTests/utility_tests.cpp create mode 100644 src/IISIntegration/test/Directory.Build.props create mode 100644 src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs create mode 100644 src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs create mode 100644 src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj create mode 100644 src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs create mode 100644 src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs create mode 100644 src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj create mode 100644 src/IISIntegration/test/IIS.FunctionalTests/DeployerSelector.cs create mode 100644 src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj create mode 100644 src/IISIntegration/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs create mode 100644 src/IISIntegration/test/IIS.Shared.FunctionalTests/MofFileTests.cs create mode 100644 src/IISIntegration/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs create mode 100644 src/IISIntegration/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs create mode 100644 src/IISIntegration/test/IIS.Shared.FunctionalTests/ServicesTests.cs create mode 100644 src/IISIntegration/test/IIS.Tests/AppHostConfig/HostableWebCore.config create mode 100644 src/IISIntegration/test/IIS.Tests/ClientDisconnectTests.cs create mode 100644 src/IISIntegration/test/IIS.Tests/ConnectionIdFeatureTests.cs create mode 100644 src/IISIntegration/test/IIS.Tests/HttpBodyControlFeatureTests.cs create mode 100644 src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj create mode 100644 src/IISIntegration/test/IIS.Tests/ResponseAbortTests.cs create mode 100644 src/IISIntegration/test/IIS.Tests/StrictTestServerTests.cs create mode 100644 src/IISIntegration/test/IIS.Tests/TestServerTest.cs create mode 100644 src/IISIntegration/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs create mode 100644 src/IISIntegration/test/IIS.Tests/Utilities/TestServer.cs create mode 100644 src/IISIntegration/test/IISExpress.FunctionalTests/DeployerSelector.cs create mode 100644 src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs create mode 100644 src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj create mode 100644 src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs create mode 100644 src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs create mode 100644 src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs create mode 100644 src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs create mode 100644 src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs create mode 100644 src/IISIntegration/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs create mode 100644 src/IISIntegration/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs create mode 100644 src/IISIntegration/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs create mode 100644 src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs create mode 100644 src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs create mode 100644 src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj create mode 100644 src/IISIntegration/test/TestTasks/InjectRequestHandler.cs create mode 100644 src/IISIntegration/test/TestTasks/TestTasks.csproj create mode 100644 src/IISIntegration/test/WebSites/Directory.Build.props create mode 100644 src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj create mode 100644 src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json create mode 100644 src/IISIntegration/test/WebSites/InProcessWebSite/DummyServer.cs create mode 100644 src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj create mode 100644 src/IISIntegration/test/WebSites/InProcessWebSite/Program.cs create mode 100644 src/IISIntegration/test/WebSites/InProcessWebSite/Properties/launchSettings.json create mode 100644 src/IISIntegration/test/WebSites/InProcessWebSite/Startup.WebSockets.cs create mode 100644 src/IISIntegration/test/WebSites/InProcessWebSite/Startup.cs create mode 100644 src/IISIntegration/test/WebSites/InProcessWebSite/web.config create mode 100644 src/IISIntegration/test/WebSites/InProcessWebSite/wwwroot/static.txt create mode 100644 src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj create mode 100644 src/IISIntegration/test/WebSites/OutOfProcessWebSite/Program.cs create mode 100644 src/IISIntegration/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json create mode 100644 src/IISIntegration/test/WebSites/OutOfProcessWebSite/Startup.cs create mode 100644 src/IISIntegration/test/WebSites/OutOfProcessWebSite/wwwroot/static.txt create mode 100644 src/IISIntegration/test/WebSites/StressTestWebSite/Program.cs create mode 100644 src/IISIntegration/test/WebSites/StressTestWebSite/Properties/launchSettings.json create mode 100644 src/IISIntegration/test/WebSites/StressTestWebSite/Startup.cs create mode 100644 src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj create mode 100644 src/IISIntegration/test/WebSites/shared/SharedStartup/Startup.shared.cs create mode 100644 src/IISIntegration/test/WebSites/shared/WebSockets/Constants.cs create mode 100644 src/IISIntegration/test/WebSites/shared/WebSockets/HandshakeHelpers.cs create mode 100644 src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs create mode 100644 src/IISIntegration/test/gtest/gtest.vcxproj rename {tools => src/IISIntegration/tools}/GenerateNativeAssets.ps1 (100%) rename {tools => src/IISIntegration/tools}/SetupTestEnvironment.ps1 (100%) rename {tools => src/IISIntegration/tools}/UpdateIISExpressCertificate.ps1 (100%) rename {tools => src/IISIntegration/tools}/certificate.ps1 (100%) rename {tools => src/IISIntegration/tools}/httpsys.ps1 (100%) rename {tools => src/IISIntegration/tools}/installancm.ps1 (100%) rename {tools => src/IISIntegration/tools}/update_schema.ps1 (100%) rename version.props => src/IISIntegration/version.props (100%) delete mode 160000 test/gtest/googletest diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index bb08c43646..0000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,27 +0,0 @@ -init: - # Reset dynamic port range from AppVeyor setting (1025-65535) to Windows default (49152-65535), - # to prevent conflicts with ANCM random ports (1025-48000). - - netsh int ipv4 show dynamicport tcp - - netsh int ipv4 set dynamic tcp start=49152 num=16384 - - netsh int ipv4 show dynamicport tcp - - - git config --global core.autocrlf true -branches: - only: - - dev - - /^release\/.*$/ - - /^(.*\/)?ci-.*$/ -install: - - ps: .\tools\update_schema.ps1 - - git submodule update --init --recursive - - net start w3svc -build_script: - - ps: .\run.ps1 default-build /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISForwardsCompatibilityTests=true -clone_depth: 1 -environment: - global: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 -test: off -deploy: off -os: Visual Studio 2017 diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 17d90aec31..0000000000 --- a/.editorconfig +++ /dev/null @@ -1,24 +0,0 @@ -# EditorConfig is awesome:http://EditorConfig.org - -# top-most EditorConfig file -root = true - -[*] -indent_style = space -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.cs] -indent_size = 4 -dotnet_sort_system_directives_first = true:warning - -# Xml files -[*.{csproj,config,props,targets,ruleset,config,resx,xml}] -indent_size = 2 - -[*.{json, yml}] -indent_size = 2 - -[*.{ps1,sh}] -indent_size = 4 diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 204c7323a3..0000000000 --- a/.gitattributes +++ /dev/null @@ -1,53 +0,0 @@ -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain - -*.jpg binary -*.png binary -*.gif binary - -*.cs text=auto diff=csharp -*.vb text=auto -*.resx text=auto -*.c text=auto -*.cpp text=auto -*.cxx text=auto -*.h text=auto -*.hxx text=auto -*.py text=auto -*.rb text=auto -*.java text=auto -*.html text=auto -*.htm text=auto -*.css text=auto -*.scss text=auto -*.sass text=auto -*.less text=auto -*.js text=auto -*.lisp text=auto -*.clj text=auto -*.sql text=auto -*.php text=auto -*.lua text=auto -*.m text=auto -*.asm text=auto -*.erl text=auto -*.fs text=auto -*.fsx text=auto -*.hs text=auto -*.rc text=auto - -*.vcxproj text=auto -*.csproj text=auto -*.vbproj text=auto -*.fsproj text=auto -*.dbproj text=auto -*.sln text=auto eol=crlf -*.sh eol=lf diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 42ecc5d6c7..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "test/gtest/googletest"] - path = test/gtest/googletest - url = https://github.com/google/googletest diff --git a/.vsts-pipelines/builds/ci-internal-21.yml b/.vsts-pipelines/builds/ci-internal-21.yml deleted file mode 100644 index afb252eae8..0000000000 --- a/.vsts-pipelines/builds/ci-internal-21.yml +++ /dev/null @@ -1,30 +0,0 @@ -trigger: -- release/2.2 - -resources: - repositories: - - repository: buildtools - type: git - name: aspnet-BuildTools - ref: refs/heads/release/2.2 - -phases: -- template: .azure\templates\jobs\default-build.yml@buildtools - parameters: - agentOs: Windows - codeSign: false - buildArgs: /p:BuildServerIIS21=true /p:SkipIISExpressTests=true /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISForwardsCompatibilityTests=true - beforeBuild: - - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 SetupDumps" - displayName: Prepare repo - afterBuild: - - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown" - displayName: Stop AppVerifier - condition: always() - - task: PublishBuildArtifacts@1 - displayName: Upload logs - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - artifactName: logs - artifactType: Container - pathtoPublish: artifacts/logs \ No newline at end of file diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml deleted file mode 100644 index 260baf4536..0000000000 --- a/.vsts-pipelines/builds/ci-internal.yml +++ /dev/null @@ -1,13 +0,0 @@ -trigger: -- master -- release/* - -resources: - repositories: - - repository: buildtools - type: git - name: aspnet-BuildTools - ref: refs/heads/release/2.2 - -phases: -- template: ../templates/build-steps.yml diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml deleted file mode 100644 index 0ed1a241ab..0000000000 --- a/.vsts-pipelines/builds/ci-public.yml +++ /dev/null @@ -1,15 +0,0 @@ -trigger: -- master -- release/* - -# See https://github.com/aspnet/BuildTools -resources: - repositories: - - repository: buildtools - type: github - endpoint: DotNet-Bot GitHub Connection - name: aspnet/BuildTools - ref: refs/heads/release/2.2 - -phases: -- template: ../templates/build-steps.yml diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml deleted file mode 100644 index 4db5633ddc..0000000000 --- a/.vsts-pipelines/templates/build-steps.yml +++ /dev/null @@ -1,88 +0,0 @@ -phases: -- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - parameters: - agentOs: Windows - phaseName: IIS_Express_Tests - buildArgs: /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISForwardsCompatibilityTests=true - beforeBuild: - - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup" - displayName: Prepare repo - afterBuild: - - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown" - displayName: Stop AppVerifier - condition: always() - - task: PublishBuildArtifacts@1 - displayName: Upload logs - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - artifactName: logs - artifactType: Container - pathtoPublish: artifacts/logs - -- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - parameters: - agentOs: Windows - phaseName: IIS_Tests - buildArgs: /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true - beforeBuild: - - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup" - displayName: Prepare repo - afterBuild: - - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown" - displayName: Stop AppVerifier - condition: always() - - task: PublishBuildArtifacts@1 - displayName: Upload logs - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - artifactName: logs - artifactType: Container - pathtoPublish: artifacts/logs - -- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - parameters: - agentOs: Windows - phaseName: IIS_BackCompat_Tests - buildArgs: /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true - beforeBuild: - - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup" - displayName: Prepare repo - afterBuild: - - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown" - displayName: Stop AppVerifier - condition: always() - - task: PublishBuildArtifacts@1 - displayName: Upload logs - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - artifactName: logs - artifactType: Container - pathtoPublish: artifacts/logs - -- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - parameters: - agentOs: Windows - phaseName: IIS_ForwardsCompat_Tests - buildArgs: /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISBackwardsCompatibilityTests=true - beforeBuild: - - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup" - displayName: Prepare repo - afterBuild: - - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown" - displayName: Stop AppVerifier - condition: always() - - task: PublishBuildArtifacts@1 - displayName: Upload logs - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - artifactName: logs - artifactType: Container - pathtoPublish: artifacts/logs - -- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - parameters: - agentOs: macOS - -- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - parameters: - agentOs: Linux diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index eac4268e4c..0000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,4 +0,0 @@ -Contributing -====== - -Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) in the Home repo. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 1508c66d70..0000000000 --- a/LICENSE.txt +++ /dev/null @@ -1,228 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright (c) .NET Foundation and Contributors - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - -========================= - -ASP.NET Core Module - -Copyright (c) .NET Foundation -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the ""Software""), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index e32bddfd51..0000000000 --- a/NuGet.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/README.md b/README.md deleted file mode 100644 index 217e6fe345..0000000000 --- a/README.md +++ /dev/null @@ -1,18 +0,0 @@ -ASP.NET Core IISIntegration -======== -This repo hosts the ASP.NET Core middleware for IIS integration and the ASP.NET Core Module. - -This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. - -## Building from source -1. Install prerequisites - 1. Visual Studio 2017 - 1. Workload: `Desktop development with C++` - 1. Run `run.ps1 install vs` or install the following components - 1. Additional Component: `Windows 8.1 SDK and UCRT SDK` - 2. Additional Component: `Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64]` - 2. Workload: `ASP.NET and web development` -2. Clone with submodules - 1. `git clone --recurse-submodules IISIntegration` - 2. OR run `git submodule update --init --recursive` after initial clone -3. `build.cmd` diff --git a/THIRD_PARTY_NOTICES b/THIRD_PARTY_NOTICES deleted file mode 100644 index 12e1c32746..0000000000 --- a/THIRD_PARTY_NOTICES +++ /dev/null @@ -1,42 +0,0 @@ -.NET Core uses third-party libraries or other resources that may be -distributed under licenses different than the .NET Core software. - -In the event that we accidentally failed to list a required notice, please -bring it to our attention. Post an issue or email us: - - dotnet@microsoft.com - -The attached notices are provided for information only. - - -License notice for googletest ------------------------------------- - -"Copyright 2008, Google Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." diff --git a/build.cmd b/build.cmd deleted file mode 100644 index c0050bda12..0000000000 --- a/build.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' default-build %*; exit $LASTEXITCODE" diff --git a/build.sh b/build.sh deleted file mode 100755 index 98a4b22765..0000000000 --- a/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs) -chmod +x "$DIR/run.sh"; sync -"$DIR/run.sh" default-build "$@" diff --git a/korebuild-lock.txt b/korebuild-lock.txt deleted file mode 100644 index 0055dcb41f..0000000000 --- a/korebuild-lock.txt +++ /dev/null @@ -1,2 +0,0 @@ -version:2.2.0-preview2-20181019.5 -commithash:84a1c04b13bd7127728fee91989db8f2f58c8781 diff --git a/mv_to_src.sh b/mv_to_src.sh new file mode 100644 index 0000000000..2360a52087 --- /dev/null +++ b/mv_to_src.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +dir="$(pwd)" +name="IISIntegration" + +if [ "$skip_src" != false ]; then + echo "Moving $dir into src/$name/" + if [ -d "src/" ]; then + git mv src/ src_tmp/ + fi + mkdir -p "src/$name" + if [ -d "src_tmp/" ]; then + git mv src_tmp/ "src/$name/src/" + fi +fi + +files_to_mv=(NuGetPackageVerifier.json .gitignore README.md version.props Directory.Build.props Directory.Build.targets *.sln shared test tools samples build NuGet benchmarks korebuild.json nuget) +for f in "${files_to_mv[@]}"; do + if [ -e $f ]; then + echo "Moving $f" + git mv $f "src/$name/$f" + fi +done + +files_to_rm=(build.sh build.cmd run.cmd run.sh run.ps1 NuGet.config korebuild-lock.txt .github .vsts-pipelines .vscode .appveyor.yml .travis.yml CONTRIBUTING.md) +for f in "${files_to_rm[@]}"; do + if [ -e $f ]; then + echo "Removing $f" + git rm -r $f + fi +done + +echo "Reorganize source code from aspnet/$name into a subfolder" > .git/COMMIT_EDITMSG +echo "" >> .git/COMMIT_EDITMSG +echo "Prior to reorg, this source existed at https://github.com/aspnet/$name/tree/$(git rev-parse HEAD)" >> .git/COMMIT_EDITMSG \ No newline at end of file diff --git a/run.cmd b/run.cmd deleted file mode 100644 index d52d5c7e68..0000000000 --- a/run.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' %*; exit $LASTEXITCODE" diff --git a/run.ps1 b/run.ps1 deleted file mode 100644 index 34604c7175..0000000000 --- a/run.ps1 +++ /dev/null @@ -1,209 +0,0 @@ -#!/usr/bin/env powershell -#requires -version 4 - -<# -.SYNOPSIS -Executes KoreBuild commands. - -.DESCRIPTION -Downloads korebuild if required. Then executes the KoreBuild command. To see available commands, execute with `-Command help`. - -.PARAMETER Command -The KoreBuild command to run. - -.PARAMETER Path -The folder to build. Defaults to the folder containing this script. - -.PARAMETER Channel -The channel of KoreBuild to download. Overrides the value from the config file. - -.PARAMETER DotNetHome -The directory where .NET Core tools will be stored. - -.PARAMETER ToolsSource -The base url where build tools can be downloaded. Overrides the value from the config file. - -.PARAMETER Update -Updates KoreBuild to the latest version even if a lock file is present. - -.PARAMETER Reinstall -Re-installs KoreBuild - -.PARAMETER ConfigFile -The path to the configuration file that stores values. Defaults to korebuild.json. - -.PARAMETER ToolsSourceSuffix -The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores. - -.PARAMETER CI -Sets up CI specific settings and variables. - -.PARAMETER Arguments -Arguments to be passed to the command - -.NOTES -This function will create a file $PSScriptRoot/korebuild-lock.txt. This lock file can be committed to source, but does not have to be. -When the lockfile is not present, KoreBuild will create one using latest available version from $Channel. - -The $ConfigFile is expected to be an JSON file. It is optional, and the configuration values in it are optional as well. Any options set -in the file are overridden by command line parameters. - -.EXAMPLE -Example config file: -```json -{ - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", - "channel": "master", - "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" -} -``` -#> -[CmdletBinding(PositionalBinding = $false)] -param( - [Parameter(Mandatory = $true, Position = 0)] - [string]$Command, - [string]$Path = $PSScriptRoot, - [Alias('c')] - [string]$Channel, - [Alias('d')] - [string]$DotNetHome, - [Alias('s')] - [string]$ToolsSource, - [Alias('u')] - [switch]$Update, - [switch]$Reinstall, - [string]$ToolsSourceSuffix, - [string]$ConfigFile = $null, - [switch]$CI, - [Parameter(ValueFromRemainingArguments = $true)] - [string[]]$Arguments -) - -Set-StrictMode -Version 2 -$ErrorActionPreference = 'Stop' - -# -# Functions -# - -function Get-KoreBuild { - - $lockFile = Join-Path $Path 'korebuild-lock.txt' - - if (!(Test-Path $lockFile) -or $Update) { - Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile $ToolsSourceSuffix - } - - $version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1 - if (!$version) { - Write-Error "Failed to parse version from $lockFile. Expected a line that begins with 'version:'" - } - $version = $version.TrimStart('version:').Trim() - $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version) - - if ($Reinstall -and (Test-Path $korebuildPath)) { - Remove-Item -Force -Recurse $korebuildPath - } - - if (!(Test-Path $korebuildPath)) { - Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version" - New-Item -ItemType Directory -Path $korebuildPath | Out-Null - $remotePath = "$ToolsSource/korebuild/artifacts/$version/korebuild.$version.zip" - - try { - $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip" - Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix - if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) { - # Use built-in commands where possible as they are cross-plat compatible - Microsoft.PowerShell.Archive\Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath - } - else { - # Fallback to old approach for old installations of PowerShell - Add-Type -AssemblyName System.IO.Compression.FileSystem - [System.IO.Compression.ZipFile]::ExtractToDirectory($tmpfile, $korebuildPath) - } - } - catch { - Remove-Item -Recurse -Force $korebuildPath -ErrorAction Ignore - throw - } - finally { - Remove-Item $tmpfile -ErrorAction Ignore - } - } - - return $korebuildPath -} - -function Join-Paths([string]$path, [string[]]$childPaths) { - $childPaths | ForEach-Object { $path = Join-Path $path $_ } - return $path -} - -function Get-RemoteFile([string]$RemotePath, [string]$LocalPath, [string]$RemoteSuffix) { - if ($RemotePath -notlike 'http*') { - Copy-Item $RemotePath $LocalPath - return - } - - $retries = 10 - while ($retries -gt 0) { - $retries -= 1 - try { - Invoke-WebRequest -UseBasicParsing -Uri $($RemotePath + $RemoteSuffix) -OutFile $LocalPath - return - } - catch { - Write-Verbose "Request failed. $retries retries remaining" - } - } - - Write-Error "Download failed: '$RemotePath'." -} - -# -# Main -# - -# Load configuration or set defaults - -$Path = Resolve-Path $Path -if (!$ConfigFile) { $ConfigFile = Join-Path $Path 'korebuild.json' } - -if (Test-Path $ConfigFile) { - try { - $config = Get-Content -Raw -Encoding UTF8 -Path $ConfigFile | ConvertFrom-Json - if ($config) { - if (!($Channel) -and (Get-Member -Name 'channel' -InputObject $config)) { [string] $Channel = $config.channel } - if (!($ToolsSource) -and (Get-Member -Name 'toolsSource' -InputObject $config)) { [string] $ToolsSource = $config.toolsSource} - } - } - catch { - Write-Host -ForegroundColor Red $Error[0] - Write-Error "$ConfigFile contains invalid JSON." - exit 1 - } -} - -if (!$DotNetHome) { - $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } ` - elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} ` - elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}` - else { Join-Path $PSScriptRoot '.dotnet'} -} - -if (!$Channel) { $Channel = 'master' } -if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } - -# Execute - -$korebuildPath = Get-KoreBuild -Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') - -try { - Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI - Invoke-KoreBuildCommand $Command @Arguments -} -finally { - Remove-Module 'KoreBuild' -ErrorAction Ignore -} diff --git a/run.sh b/run.sh deleted file mode 100755 index 4c1fed5646..0000000000 --- a/run.sh +++ /dev/null @@ -1,256 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -# -# variables -# - -RESET="\033[0m" -RED="\033[0;31m" -YELLOW="\033[0;33m" -MAGENTA="\033[0;95m" -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" -verbose=false -update=false -reinstall=false -repo_path="$DIR" -channel='' -tools_source='' -tools_source_suffix='' -ci=false - -# -# Functions -# -__usage() { - echo "Usage: $(basename "${BASH_SOURCE[0]}") command [options] [[--] ...]" - echo "" - echo "Arguments:" - echo " command The command to be run." - echo " ... Arguments passed to the command. Variable number of arguments allowed." - echo "" - echo "Options:" - echo " --verbose Show verbose output." - echo " -c|--channel The channel of KoreBuild to download. Overrides the value from the config file.." - echo " --config-file The path to the configuration file that stores values. Defaults to korebuild.json." - echo " -d|--dotnet-home The directory where .NET Core tools will be stored. Defaults to '\$DOTNET_HOME' or '\$HOME/.dotnet." - echo " --path The directory to build. Defaults to the directory containing the script." - echo " -s|--tools-source|-ToolsSource The base url where build tools can be downloaded. Overrides the value from the config file." - echo " --tools-source-suffix|-ToolsSourceSuffix The suffix to append to tools-source. Useful for query strings." - echo " -u|--update Update to the latest KoreBuild even if the lock file is present." - echo " --reinstall Reinstall KoreBuild." - echo " --ci Apply CI specific settings and environment variables." - echo "" - echo "Description:" - echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be." - echo " When the lockfile is not present, KoreBuild will create one using latest available version from \$channel." - - if [[ "${1:-}" != '--no-exit' ]]; then - exit 2 - fi -} - -get_korebuild() { - local version - local lock_file="$repo_path/korebuild-lock.txt" - if [ ! -f "$lock_file" ] || [ "$update" = true ]; then - __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file" "$tools_source_suffix" - fi - version="$(grep 'version:*' -m 1 "$lock_file")" - if [[ "$version" == '' ]]; then - __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'" - return 1 - fi - version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" - local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version" - - if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then - rm -rf "$korebuild_path" - fi - - { - if [ ! -d "$korebuild_path" ]; then - mkdir -p "$korebuild_path" - local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip" - tmpfile="$(mktemp)" - echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}" - if __get_remote_file "$remote_path" "$tmpfile" "$tools_source_suffix"; then - unzip -q -d "$korebuild_path" "$tmpfile" - fi - rm "$tmpfile" || true - fi - - source "$korebuild_path/KoreBuild.sh" - } || { - if [ -d "$korebuild_path" ]; then - echo "Cleaning up after failed installation" - rm -rf "$korebuild_path" || true - fi - return 1 - } -} - -__error() { - echo -e "${RED}error: $*${RESET}" 1>&2 -} - -__warn() { - echo -e "${YELLOW}warning: $*${RESET}" -} - -__machine_has() { - hash "$1" > /dev/null 2>&1 - return $? -} - -__get_remote_file() { - local remote_path=$1 - local local_path=$2 - local remote_path_suffix=$3 - - if [[ "$remote_path" != 'http'* ]]; then - cp "$remote_path" "$local_path" - return 0 - fi - - local failed=false - if __machine_has wget; then - wget --tries 10 --quiet -O "$local_path" "${remote_path}${remote_path_suffix}" || failed=true - else - failed=true - fi - - if [ "$failed" = true ] && __machine_has curl; then - failed=false - curl --retry 10 -sSL -f --create-dirs -o "$local_path" "${remote_path}${remote_path_suffix}" || failed=true - fi - - if [ "$failed" = true ]; then - __error "Download failed: $remote_path" 1>&2 - return 1 - fi -} - -# -# main -# - -command="${1:-}" -shift - -while [[ $# -gt 0 ]]; do - case $1 in - -\?|-h|--help) - __usage --no-exit - exit 0 - ;; - -c|--channel|-Channel) - shift - channel="${1:-}" - [ -z "$channel" ] && __usage - ;; - --config-file|-ConfigFile) - shift - config_file="${1:-}" - [ -z "$config_file" ] && __usage - if [ ! -f "$config_file" ]; then - __error "Invalid value for --config-file. $config_file does not exist." - exit 1 - fi - ;; - -d|--dotnet-home|-DotNetHome) - shift - DOTNET_HOME="${1:-}" - [ -z "$DOTNET_HOME" ] && __usage - ;; - --path|-Path) - shift - repo_path="${1:-}" - [ -z "$repo_path" ] && __usage - ;; - -s|--tools-source|-ToolsSource) - shift - tools_source="${1:-}" - [ -z "$tools_source" ] && __usage - ;; - --tools-source-suffix|-ToolsSourceSuffix) - shift - tools_source_suffix="${1:-}" - [ -z "$tools_source_suffix" ] && __usage - ;; - -u|--update|-Update) - update=true - ;; - --reinstall|-[Rr]einstall) - reinstall=true - ;; - --ci|-[Cc][Ii]) - ci=true - ;; - --verbose|-Verbose) - verbose=true - ;; - --) - shift - break - ;; - *) - break - ;; - esac - shift -done - -if ! __machine_has unzip; then - __error 'Missing required command: unzip' - exit 1 -fi - -if ! __machine_has curl && ! __machine_has wget; then - __error 'Missing required command. Either wget or curl is required.' - exit 1 -fi - -[ -z "${config_file:-}" ] && config_file="$repo_path/korebuild.json" -if [ -f "$config_file" ]; then - if __machine_has jq ; then - if jq '.' "$config_file" >/dev/null ; then - config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" - config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - elif __machine_has python ; then - if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then - config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" - config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - elif __machine_has python3 ; then - if python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then - config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" - config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - else - __error 'Missing required command: jq or python. Could not parse the JSON file.' - exit 1 - fi - - [ ! -z "${config_channel:-}" ] && channel="$config_channel" - [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" -fi - -[ -z "$channel" ] && channel='master' -[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' - -get_korebuild -set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci" -invoke_korebuild_command "$command" "$@" diff --git a/.gitignore b/src/IISIntegration/.gitignore similarity index 100% rename from .gitignore rename to src/IISIntegration/.gitignore diff --git a/Directory.Build.props b/src/IISIntegration/Directory.Build.props similarity index 100% rename from Directory.Build.props rename to src/IISIntegration/Directory.Build.props diff --git a/Directory.Build.targets b/src/IISIntegration/Directory.Build.targets similarity index 100% rename from Directory.Build.targets rename to src/IISIntegration/Directory.Build.targets diff --git a/IISIntegration.NoV1.sln b/src/IISIntegration/IISIntegration.NoV1.sln similarity index 100% rename from IISIntegration.NoV1.sln rename to src/IISIntegration/IISIntegration.NoV1.sln diff --git a/IISIntegration.sln b/src/IISIntegration/IISIntegration.sln similarity index 100% rename from IISIntegration.sln rename to src/IISIntegration/IISIntegration.sln diff --git a/NuGetPackageVerifier.json b/src/IISIntegration/NuGetPackageVerifier.json similarity index 100% rename from NuGetPackageVerifier.json rename to src/IISIntegration/NuGetPackageVerifier.json diff --git a/NuGetPackageVerifier.xplat.json b/src/IISIntegration/NuGetPackageVerifier.xplat.json similarity index 100% rename from NuGetPackageVerifier.xplat.json rename to src/IISIntegration/NuGetPackageVerifier.xplat.json diff --git a/benchmarks/IIS.Performance/FirstRequestConfig.cs b/src/IISIntegration/benchmarks/IIS.Performance/FirstRequestConfig.cs similarity index 100% rename from benchmarks/IIS.Performance/FirstRequestConfig.cs rename to src/IISIntegration/benchmarks/IIS.Performance/FirstRequestConfig.cs diff --git a/benchmarks/IIS.Performance/IIS.Performance.csproj b/src/IISIntegration/benchmarks/IIS.Performance/IIS.Performance.csproj similarity index 100% rename from benchmarks/IIS.Performance/IIS.Performance.csproj rename to src/IISIntegration/benchmarks/IIS.Performance/IIS.Performance.csproj diff --git a/benchmarks/IIS.Performance/PlaintextBenchmark.cs b/src/IISIntegration/benchmarks/IIS.Performance/PlaintextBenchmark.cs similarity index 100% rename from benchmarks/IIS.Performance/PlaintextBenchmark.cs rename to src/IISIntegration/benchmarks/IIS.Performance/PlaintextBenchmark.cs diff --git a/benchmarks/IIS.Performance/StartupTimeBenchmark.cs b/src/IISIntegration/benchmarks/IIS.Performance/StartupTimeBenchmark.cs similarity index 100% rename from benchmarks/IIS.Performance/StartupTimeBenchmark.cs rename to src/IISIntegration/benchmarks/IIS.Performance/StartupTimeBenchmark.cs diff --git a/build/Build.Settings b/src/IISIntegration/build/Build.Settings similarity index 100% rename from build/Build.Settings rename to src/IISIntegration/build/Build.Settings diff --git a/build/Config.Definitions.Props b/src/IISIntegration/build/Config.Definitions.Props similarity index 100% rename from build/Config.Definitions.Props rename to src/IISIntegration/build/Config.Definitions.Props diff --git a/build/Key.snk b/src/IISIntegration/build/Key.snk similarity index 100% rename from build/Key.snk rename to src/IISIntegration/build/Key.snk diff --git a/build/applicationhost.config b/src/IISIntegration/build/applicationhost.config similarity index 100% rename from build/applicationhost.config rename to src/IISIntegration/build/applicationhost.config diff --git a/build/applicationhost.iis.config b/src/IISIntegration/build/applicationhost.iis.config similarity index 100% rename from build/applicationhost.iis.config rename to src/IISIntegration/build/applicationhost.iis.config diff --git a/build/assets.props b/src/IISIntegration/build/assets.props similarity index 100% rename from build/assets.props rename to src/IISIntegration/build/assets.props diff --git a/build/buildpipeline/pipeline.groovy b/src/IISIntegration/build/buildpipeline/pipeline.groovy similarity index 96% rename from build/buildpipeline/pipeline.groovy rename to src/IISIntegration/build/buildpipeline/pipeline.groovy index 7ccbca0b2a..13fd8d9add 100644 --- a/build/buildpipeline/pipeline.groovy +++ b/src/IISIntegration/build/buildpipeline/pipeline.groovy @@ -1,18 +1,18 @@ -import org.dotnet.ci.pipelines.Pipeline - -def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') - -def configurations = [ - 'Debug', - 'Release' -] - -configurations.each { configuration -> - - def params = [ - 'Configuration': configuration - ] - - windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params) - windowsPipeline.triggerPipelineOnGithubPush(params) -} +import org.dotnet.ci.pipelines.Pipeline + +def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') + +def configurations = [ + 'Debug', + 'Release' +] + +configurations.each { configuration -> + + def params = [ + 'Configuration': configuration + ] + + windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params) + windowsPipeline.triggerPipelineOnGithubPush(params) +} diff --git a/build/buildpipeline/windows-appverif.groovy b/src/IISIntegration/build/buildpipeline/windows-appverif.groovy similarity index 100% rename from build/buildpipeline/windows-appverif.groovy rename to src/IISIntegration/build/buildpipeline/windows-appverif.groovy diff --git a/build/buildpipeline/windows.groovy b/src/IISIntegration/build/buildpipeline/windows.groovy similarity index 98% rename from build/buildpipeline/windows.groovy rename to src/IISIntegration/build/buildpipeline/windows.groovy index e3efa6193f..c482e84079 100644 --- a/build/buildpipeline/windows.groovy +++ b/src/IISIntegration/build/buildpipeline/windows.groovy @@ -1,15 +1,15 @@ -@Library('dotnet-ci') _ - -// 'node' indicates to Jenkins that the enclosed block runs on a node that matches -// the label 'windows-with-vs' -simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { - stage ('Checking out source') { - checkout scm - bat 'git submodule update --init --recursive' - } - stage ('Build') { - def logFolder = getLogFolder() - def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" - bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISForwardsCompatibilityTests=true /p:Configuration=${params.Configuration}\";" - } -} +@Library('dotnet-ci') _ + +// 'node' indicates to Jenkins that the enclosed block runs on a node that matches +// the label 'windows-with-vs' +simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { + stage ('Checking out source') { + checkout scm + bat 'git submodule update --init --recursive' + } + stage ('Build') { + def logFolder = getLogFolder() + def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" + bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISForwardsCompatibilityTests=true /p:Configuration=${params.Configuration}\";" + } +} diff --git a/build/dependencies.props b/src/IISIntegration/build/dependencies.props similarity index 100% rename from build/dependencies.props rename to src/IISIntegration/build/dependencies.props diff --git a/build/functional-test-assets.targets b/src/IISIntegration/build/functional-test-assets.targets similarity index 100% rename from build/functional-test-assets.targets rename to src/IISIntegration/build/functional-test-assets.targets diff --git a/build/launchSettings.json b/src/IISIntegration/build/launchSettings.json similarity index 100% rename from build/launchSettings.json rename to src/IISIntegration/build/launchSettings.json diff --git a/build/native.targets b/src/IISIntegration/build/native.targets similarity index 100% rename from build/native.targets rename to src/IISIntegration/build/native.targets diff --git a/build/repo.props b/src/IISIntegration/build/repo.props similarity index 100% rename from build/repo.props rename to src/IISIntegration/build/repo.props diff --git a/build/repo.targets b/src/IISIntegration/build/repo.targets similarity index 100% rename from build/repo.targets rename to src/IISIntegration/build/repo.targets diff --git a/build/sources.props b/src/IISIntegration/build/sources.props similarity index 100% rename from build/sources.props rename to src/IISIntegration/build/sources.props diff --git a/build/testsite.props b/src/IISIntegration/build/testsite.props similarity index 100% rename from build/testsite.props rename to src/IISIntegration/build/testsite.props diff --git a/korebuild.json b/src/IISIntegration/korebuild.json similarity index 100% rename from korebuild.json rename to src/IISIntegration/korebuild.json diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec b/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec similarity index 100% rename from nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec rename to src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props b/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.props similarity index 100% rename from nuget/Microsoft.AspNetCore.AspNetCoreModule.props rename to src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.props diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec b/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec similarity index 100% rename from nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec rename to src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in b/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in similarity index 100% rename from nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in rename to src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in diff --git a/samples/IISSample/IISSample.csproj b/src/IISIntegration/samples/IISSample/IISSample.csproj similarity index 100% rename from samples/IISSample/IISSample.csproj rename to src/IISIntegration/samples/IISSample/IISSample.csproj diff --git a/samples/IISSample/Properties/launchSettings.json b/src/IISIntegration/samples/IISSample/Properties/launchSettings.json similarity index 100% rename from samples/IISSample/Properties/launchSettings.json rename to src/IISIntegration/samples/IISSample/Properties/launchSettings.json diff --git a/samples/IISSample/Startup.cs b/src/IISIntegration/samples/IISSample/Startup.cs similarity index 100% rename from samples/IISSample/Startup.cs rename to src/IISIntegration/samples/IISSample/Startup.cs diff --git a/samples/IISSample/web.config b/src/IISIntegration/samples/IISSample/web.config similarity index 100% rename from samples/IISSample/web.config rename to src/IISIntegration/samples/IISSample/web.config diff --git a/samples/NativeIISSample/NativeIISSample.csproj b/src/IISIntegration/samples/NativeIISSample/NativeIISSample.csproj similarity index 100% rename from samples/NativeIISSample/NativeIISSample.csproj rename to src/IISIntegration/samples/NativeIISSample/NativeIISSample.csproj diff --git a/samples/NativeIISSample/Properties/launchSettings.json b/src/IISIntegration/samples/NativeIISSample/Properties/launchSettings.json similarity index 100% rename from samples/NativeIISSample/Properties/launchSettings.json rename to src/IISIntegration/samples/NativeIISSample/Properties/launchSettings.json diff --git a/samples/NativeIISSample/Startup.cs b/src/IISIntegration/samples/NativeIISSample/Startup.cs similarity index 100% rename from samples/NativeIISSample/Startup.cs rename to src/IISIntegration/samples/NativeIISSample/Startup.cs diff --git a/samples/NativeIISSample/web.config b/src/IISIntegration/samples/NativeIISSample/web.config similarity index 100% rename from samples/NativeIISSample/web.config rename to src/IISIntegration/samples/NativeIISSample/web.config diff --git a/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/application.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/path.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Source.def b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Source.def similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Source.def rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Source.def diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc diff --git a/src/AspNetCoreModuleV1/AspNetCore/resource.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/resource.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/resource.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/resource.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/application.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/main.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/path.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx diff --git a/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj diff --git a/src/AspNetCoreModuleV1/IISLib/acache.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.cxx similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/acache.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.cxx diff --git a/src/AspNetCoreModuleV1/IISLib/acache.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/acache.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.h diff --git a/src/AspNetCoreModuleV1/IISLib/ahutil.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.cpp similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/ahutil.cpp rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.cpp diff --git a/src/AspNetCoreModuleV1/IISLib/ahutil.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/ahutil.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.h diff --git a/src/AspNetCoreModuleV1/IISLib/base64.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.cpp similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/base64.cpp rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.cpp diff --git a/src/AspNetCoreModuleV1/IISLib/base64.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/base64.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.h diff --git a/src/AspNetCoreModuleV1/IISLib/buffer.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/buffer.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/buffer.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/buffer.h diff --git a/src/AspNetCoreModuleV1/IISLib/datetime.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/datetime.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/datetime.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/datetime.h diff --git a/src/AspNetCoreModuleV1/IISLib/dbgutil.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/dbgutil.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/dbgutil.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/dbgutil.h diff --git a/src/AspNetCoreModuleV1/IISLib/hashfn.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashfn.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/hashfn.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashfn.h diff --git a/src/AspNetCoreModuleV1/IISLib/hashtable.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashtable.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/hashtable.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashtable.h diff --git a/src/AspNetCoreModuleV1/IISLib/listentry.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/listentry.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/listentry.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/listentry.h diff --git a/src/AspNetCoreModuleV1/IISLib/macros.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/macros.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/macros.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/macros.h diff --git a/src/AspNetCoreModuleV1/IISLib/multisz.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.cpp similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/multisz.cpp rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.cpp diff --git a/src/AspNetCoreModuleV1/IISLib/multisz.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/multisz.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.h diff --git a/src/AspNetCoreModuleV1/IISLib/multisza.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.cpp similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/multisza.cpp rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.cpp diff --git a/src/AspNetCoreModuleV1/IISLib/multisza.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/multisza.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.h diff --git a/src/AspNetCoreModuleV1/IISLib/ntassert.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ntassert.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/ntassert.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ntassert.h diff --git a/src/AspNetCoreModuleV1/IISLib/percpu.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/percpu.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/percpu.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/percpu.h diff --git a/src/AspNetCoreModuleV1/IISLib/precomp.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/precomp.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/precomp.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/precomp.h diff --git a/src/AspNetCoreModuleV1/IISLib/prime.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/prime.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/prime.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/prime.h diff --git a/src/AspNetCoreModuleV1/IISLib/pudebug.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/pudebug.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/pudebug.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/pudebug.h diff --git a/src/AspNetCoreModuleV1/IISLib/reftrace.c b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.c similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/reftrace.c rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.c diff --git a/src/AspNetCoreModuleV1/IISLib/reftrace.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/reftrace.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.h diff --git a/src/AspNetCoreModuleV1/IISLib/rwlock.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/rwlock.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/rwlock.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/rwlock.h diff --git a/src/AspNetCoreModuleV1/IISLib/stringa.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.cpp similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/stringa.cpp rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.cpp diff --git a/src/AspNetCoreModuleV1/IISLib/stringa.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/stringa.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.h diff --git a/src/AspNetCoreModuleV1/IISLib/stringu.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.cpp similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/stringu.cpp rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.cpp diff --git a/src/AspNetCoreModuleV1/IISLib/stringu.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/stringu.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.h diff --git a/src/AspNetCoreModuleV1/IISLib/tracelog.c b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.c similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/tracelog.c rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.c diff --git a/src/AspNetCoreModuleV1/IISLib/tracelog.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/tracelog.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.h diff --git a/src/AspNetCoreModuleV1/IISLib/treehash.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/treehash.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/treehash.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/treehash.h diff --git a/src/AspNetCoreModuleV1/IISLib/util.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/util.cxx similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/util.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/util.cxx diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj similarity index 98% rename from src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index 4b2c6129e8..98c5920ed4 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -1,305 +1,305 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} - Win32Proj - AspNetCoreModule - AspNetCore - aspnetcorev2 - false - 10.0.15063.0 - - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - - Level4 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - stdafx.h - $(IntDir)$(TargetName).pch - ..\IISLib;.\Inc;..\CommonLib - ProgramDatabase - MultiThreadedDebug - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - Source.def - UseLinkTimeCodeGeneration - - - ..\Commonlib - - - - - Level4 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - stdafx.h - $(IntDir)$(TargetName).pch - ..\IISLib;.\Inc;..\CommonLib - ProgramDatabase - MultiThreadedDebug - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - Source.def - UseLinkTimeCodeGeneration - - - ..\Commonlib - - - - - Level4 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - ..\IISLib;.\Inc;..\CommonLib - stdafx.h - MultiThreaded - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - false - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - Source.def - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - UseLinkTimeCodeGeneration - - - ..\Commonlib - - - - - Level4 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - stdafx.h - ..\IISLib;.\Inc;..\CommonLib - MultiThreaded - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - false - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - Source.def - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - UseLinkTimeCodeGeneration - - - ..\Commonlib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - {55494e58-e061-4c4c-a0a8-837008e72f85} - - - {09d9d1d6-2951-4e14-bc35-76a23cf9391a} - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - - - - - - true - - - true - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} + Win32Proj + AspNetCoreModule + AspNetCore + aspnetcorev2 + false + 10.0.15063.0 + + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + + Level4 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) + stdafx.h + $(IntDir)$(TargetName).pch + ..\IISLib;.\Inc;..\CommonLib + ProgramDatabase + MultiThreadedDebug + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + Source.def + UseLinkTimeCodeGeneration + + + ..\Commonlib + + + + + Level4 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) + stdafx.h + $(IntDir)$(TargetName).pch + ..\IISLib;.\Inc;..\CommonLib + ProgramDatabase + MultiThreadedDebug + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + Source.def + UseLinkTimeCodeGeneration + + + ..\Commonlib + + + + + Level4 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) + ..\IISLib;.\Inc;..\CommonLib + stdafx.h + MultiThreaded + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + false + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + Source.def + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + UseLinkTimeCodeGeneration + + + ..\Commonlib + + + + + Level4 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) + stdafx.h + ..\IISLib;.\Inc;..\CommonLib + MultiThreaded + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + false + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + Source.def + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + UseLinkTimeCodeGeneration + + + ..\Commonlib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {09d9d1d6-2951-4e14-bc35-76a23cf9391a} + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + + + + + + true + + + true + + + + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc diff --git a/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm diff --git a/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm diff --git a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/Source.def b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Source.def similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Source.def rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Source.def diff --git a/src/AspNetCoreModuleV2/AspNetCore/ancm.mof b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ancm.mof similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/ancm.mof rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ancm.mof diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc diff --git a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/globalmodule.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/proxymodule.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/resource.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/resource.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/resource.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/resource.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/stdafx.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/stdafx.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/stdafx.h diff --git a/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj similarity index 98% rename from src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 0ddec2fcb1..2386dfc6ee 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -1,293 +1,293 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {55494E58-E061-4C4C-A0A8-837008E72F85} - Win32Proj - NewCommon - 10.0.15063.0 - - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - true - Unicode - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - false - Unicode - - - - - - - - - - - - - - - - - - - - - true - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - true - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - false - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - false - C:\AspNetCoreModule\src\IISLib;$(IncludePath) - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - - Use - Level4 - true - Disabled - false - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - true - MultiThreadedDebug - false - ProgramDatabase - ..\iislib; - true - stdcpp17 - stdafx.h - - - Windows - true - - - - - Use - Level4 - true - Disabled - false - _DEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - true - ProgramDatabase - false - MultiThreadedDebug - false - ..\iislib; - true - stdcpp17 - stdafx.h - - - Windows - true - - - - - Use - Level4 - true - MaxSpeed - true - true - false - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - true - MultiThreaded - false - ..\iislib; - true - stdcpp17 - stdafx.h - - - Windows - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - true - - - - - Use - Level4 - true - MaxSpeed - true - true - false - NDEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - true - ..\iislib; - true - - - MultiThreaded - false - stdcpp17 - stdafx.h - - - Windows - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - true - - - ..\iislib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - - - - - Document - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {55494E58-E061-4C4C-A0A8-837008E72F85} + Win32Proj + NewCommon + 10.0.15063.0 + + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + false + Unicode + + + + + + + + + + + + + + + + + + + + + true + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + true + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + false + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + false + C:\AspNetCoreModule\src\IISLib;$(IncludePath) + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + + Use + Level4 + true + Disabled + false + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + MultiThreadedDebug + false + ProgramDatabase + ..\iislib; + true + stdcpp17 + stdafx.h + + + Windows + true + + + + + Use + Level4 + true + Disabled + false + _DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + ProgramDatabase + false + MultiThreadedDebug + false + ..\iislib; + true + stdcpp17 + stdafx.h + + + Windows + true + + + + + Use + Level4 + true + MaxSpeed + true + true + false + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + MultiThreaded + false + ..\iislib; + true + stdcpp17 + stdafx.h + + + Windows + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + true + + + + + Use + Level4 + true + MaxSpeed + true + true + false + NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + ..\iislib; + true + + + MultiThreaded + false + stdcpp17 + stdafx.h + + + Windows + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + true + + + ..\iislib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + + + + Document + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h diff --git a/src/AspNetCoreModuleV2/CommonLib/Environment.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/Environment.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/Environment.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/Environment.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/Environment.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/Environment.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/Environment.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/Environment.h diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/EventLog.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventLog.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/EventLog.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventLog.h diff --git a/src/AspNetCoreModuleV2/CommonLib/EventTracing.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventTracing.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/EventTracing.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventTracing.h diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h diff --git a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h diff --git a/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/IOutputManager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h diff --git a/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h diff --git a/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/NonCopyable.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h diff --git a/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/ResultException.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ResultException.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ResultException.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ResultException.h diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h diff --git a/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h diff --git a/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/StdWrapper.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h diff --git a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/StringHelpers.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/application.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/application.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/application.h diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc diff --git a/src/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/config_utility.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/config_utility.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/config_utility.h diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/debugutil.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/debugutil.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.h diff --git a/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/exceptions.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/exceptions.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/exceptions.h diff --git a/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/file_utility.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/file_utility.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/file_utility.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/file_utility.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/file_utility.h diff --git a/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/fx_ver.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/fx_ver.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.h diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/iapplication.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/iapplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/iapplication.h diff --git a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/irequesthandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/requesthandler.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/requesthandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/requesthandler.h diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/resources.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/resources.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/resources.h diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/stdafx.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/stdafx.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.h diff --git a/src/AspNetCoreModuleV2/CommonLib/sttimer.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/sttimer.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/sttimer.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/sttimer.h diff --git a/src/AspNetCoreModuleV2/CommonLib/targetver.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/targetver.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/targetver.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/targetver.h diff --git a/src/AspNetCoreModuleV2/DefaultRules.ruleset b/src/IISIntegration/src/AspNetCoreModuleV2/DefaultRules.ruleset similarity index 100% rename from src/AspNetCoreModuleV2/DefaultRules.ruleset rename to src/IISIntegration/src/AspNetCoreModuleV2/DefaultRules.ruleset diff --git a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj similarity index 97% rename from src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index 8a78b19664..15d4ef1317 100644 --- a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -1,206 +1,206 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {09D9D1D6-2951-4E14-BC35-76A23CF9391A} - Win32Proj - IISLib - IISLib - 10.0.15063.0 - - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - true - Unicode - - - StaticLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - MultiThreadedDebug - false - true - true - - - Windows - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - MultiThreadedDebug - false - true - true - - - Windows - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - - - Windows - true - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - - - Windows - true - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {09D9D1D6-2951-4E14-BC35-76A23CF9391A} + Win32Proj + IISLib + IISLib + 10.0.15063.0 + + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + ProgramDatabase + MultiThreadedDebug + false + true + true + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + ProgramDatabase + MultiThreadedDebug + false + true + true + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + + + Windows + true + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + + + Windows + true + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/IISLib/acache.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/acache.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/acache.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/acache.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.h diff --git a/src/AspNetCoreModuleV2/IISLib/ahutil.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/ahutil.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/ahutil.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/ahutil.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.h diff --git a/src/AspNetCoreModuleV2/IISLib/base64.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/base64.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/base64.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/base64.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.h diff --git a/src/AspNetCoreModuleV2/IISLib/buffer.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/buffer.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/buffer.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/buffer.h diff --git a/src/AspNetCoreModuleV2/IISLib/datetime.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/datetime.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/datetime.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/datetime.h diff --git a/src/AspNetCoreModuleV2/IISLib/dbgutil.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/dbgutil.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/dbgutil.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/dbgutil.h diff --git a/src/AspNetCoreModuleV2/IISLib/hashfn.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashfn.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/hashfn.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashfn.h diff --git a/src/AspNetCoreModuleV2/IISLib/hashtable.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashtable.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/hashtable.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashtable.h diff --git a/src/AspNetCoreModuleV2/IISLib/listentry.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/listentry.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/listentry.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/listentry.h diff --git a/src/AspNetCoreModuleV2/IISLib/macros.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/macros.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/macros.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/macros.h diff --git a/src/AspNetCoreModuleV2/IISLib/multisz.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/multisz.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/multisz.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/multisz.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.h diff --git a/src/AspNetCoreModuleV2/IISLib/multisza.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/multisza.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/multisza.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/multisza.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.h diff --git a/src/AspNetCoreModuleV2/IISLib/ntassert.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ntassert.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/ntassert.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ntassert.h diff --git a/src/AspNetCoreModuleV2/IISLib/percpu.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/percpu.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/percpu.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/percpu.h diff --git a/src/AspNetCoreModuleV2/IISLib/precomp.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/precomp.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/precomp.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/precomp.h diff --git a/src/AspNetCoreModuleV2/IISLib/prime.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/prime.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/prime.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/prime.h diff --git a/src/AspNetCoreModuleV2/IISLib/reftrace.c b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.c similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/reftrace.c rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.c diff --git a/src/AspNetCoreModuleV2/IISLib/reftrace.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/reftrace.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.h diff --git a/src/AspNetCoreModuleV2/IISLib/rwlock.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/rwlock.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/rwlock.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/rwlock.h diff --git a/src/AspNetCoreModuleV2/IISLib/stringa.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/stringa.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/stringa.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/stringa.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.h diff --git a/src/AspNetCoreModuleV2/IISLib/stringu.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/stringu.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/stringu.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/stringu.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.h diff --git a/src/AspNetCoreModuleV2/IISLib/tracelog.c b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.c similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/tracelog.c rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.c diff --git a/src/AspNetCoreModuleV2/IISLib/tracelog.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/tracelog.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.h diff --git a/src/AspNetCoreModuleV2/IISLib/treehash.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/treehash.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/treehash.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/treehash.h diff --git a/src/AspNetCoreModuleV2/IISLib/util.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/util.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/util.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/util.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj similarity index 98% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 5e3fe5c6c1..69435f32d6 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -1,276 +1,276 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {D57EA297-6DC2-4BC0-8C91-334863327863} - Win32Proj - InProcessRequestHandler - 10.0.15063.0 - InProcessRequestHandler - - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - - aspnetcorev2_inprocess - - - false - - - false - - - - Use - Level4 - Disabled - WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdafx.h - $(IntDir)$(TargetName).pch - ProgramDatabase - MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - stdcpp17 - stdafx.h - true - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - Source.def - UseLinkTimeCodeGeneration - - - - - Use - Level4 - Disabled - WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdafx.h - $(IntDir)$(TargetName).pch - ProgramDatabase - MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - stdcpp17 - stdafx.h - true - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - Source.def - UseLinkTimeCodeGeneration - - - - - Level4 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) - stdafx.h - MultiThreaded - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - stdcpp17 - stdafx.h - true - - - Windows - false - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - Source.def - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - UseLinkTimeCodeGeneration - - - - - Level4 - Use - MaxSpeed - true - true - NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdafx.h - MultiThreaded - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - stdcpp17 - stdafx.h - true - - - Windows - false - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - Source.def - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - UseLinkTimeCodeGeneration - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - {55494e58-e061-4c4c-a0a8-837008e72f85} - - - {09d9d1d6-2951-4e14-bc35-76a23cf9391a} - - - {1533e271-f61b-441b-8b74-59fb61df0552} - - - - - - - - - true - - - - - - - + + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {D57EA297-6DC2-4BC0-8C91-334863327863} + Win32Proj + InProcessRequestHandler + 10.0.15063.0 + InProcessRequestHandler + + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + aspnetcorev2_inprocess + + + false + + + false + + + + Use + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + stdafx.h + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + stdcpp17 + stdafx.h + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + Source.def + UseLinkTimeCodeGeneration + + + + + Use + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + stdafx.h + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + stdcpp17 + stdafx.h + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + Source.def + UseLinkTimeCodeGeneration + + + + + Level4 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) + stdafx.h + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + stdcpp17 + stdafx.h + true + + + Windows + false + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + Source.def + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + UseLinkTimeCodeGeneration + + + + + Level4 + Use + MaxSpeed + true + true + NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + stdafx.h + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + stdcpp17 + stdafx.h + true + + + Windows + false + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + Source.def + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + UseLinkTimeCodeGeneration + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {09d9d1d6-2951-4e14-bc35-76a23cf9391a} + + + {1533e271-f61b-441b-8b74-59fb61df0552} + + + + + + + + + true + + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj similarity index 98% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 7d29672fa0..ca2bc0f4aa 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -1,285 +1,285 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {7F87406C-A3C8-4139-A68D-E4C344294A67} - Win32Proj - OutOfProcessRequestHandler - 10.0.15063.0 - OutOfProcessRequestHandler - - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - - aspnetcorev2_outofprocess - - - false - - - false - - - - Use - Level4 - Disabled - WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdafx.h - $(IntDir)$(TargetName).pch - ProgramDatabase - MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib - Source.def - UseLinkTimeCodeGeneration - - - - - Use - Level4 - Disabled - WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdafx.h - $(IntDir)$(TargetName).pch - ProgramDatabase - MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib - Source.def - UseLinkTimeCodeGeneration - - - - - Level4 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) - stdafx.h - MultiThreaded - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - false - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - Source.def - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib - UseLinkTimeCodeGeneration - - - - - Level4 - Use - MaxSpeed - true - true - NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdafx.h - MultiThreaded - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - false - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - Source.def - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib - UseLinkTimeCodeGeneration - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - {55494e58-e061-4c4c-a0a8-837008e72f85} - - - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - - - {1533e271-f61b-441b-8b74-59fb61df0552} - - - - - - - - - true - - - - - - - + + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {7F87406C-A3C8-4139-A68D-E4C344294A67} + Win32Proj + OutOfProcessRequestHandler + 10.0.15063.0 + OutOfProcessRequestHandler + + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + aspnetcorev2_outofprocess + + + false + + + false + + + + Use + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + stdafx.h + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib + Source.def + UseLinkTimeCodeGeneration + + + + + Use + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + stdafx.h + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib + Source.def + UseLinkTimeCodeGeneration + + + + + Level4 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) + stdafx.h + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + false + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + Source.def + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib + UseLinkTimeCodeGeneration + + + + + Level4 + Use + MaxSpeed + true + true + NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + stdafx.h + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + false + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + Source.def + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib + UseLinkTimeCodeGeneration + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + + {1533e271-f61b-441b-8b74-59fb61df0552} + + + + + + + + + true + + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h diff --git a/src/Directory.Build.props b/src/IISIntegration/src/Directory.Build.props similarity index 100% rename from src/Directory.Build.props rename to src/IISIntegration/src/Directory.Build.props diff --git a/test/Common.FunctionalTests/AppHostConfig/IIS.config b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/AppHostConfig/IIS.config similarity index 100% rename from test/Common.FunctionalTests/AppHostConfig/IIS.config rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/AppHostConfig/IIS.config diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/AppOfflineTests.cs similarity index 100% rename from test/Common.FunctionalTests/AppOfflineTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/AppOfflineTests.cs diff --git a/test/Common.FunctionalTests/BasicAuthTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs similarity index 100% rename from test/Common.FunctionalTests/BasicAuthTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs diff --git a/test/Common.FunctionalTests/ClientCertificateFixture.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateFixture.cs similarity index 100% rename from test/Common.FunctionalTests/ClientCertificateFixture.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateFixture.cs diff --git a/test/Common.FunctionalTests/ClientCertificateTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs similarity index 100% rename from test/Common.FunctionalTests/ClientCertificateTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs diff --git a/test/Common.FunctionalTests/ClientDisconnectStress.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/ClientDisconnectStress.cs similarity index 100% rename from test/Common.FunctionalTests/ClientDisconnectStress.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/ClientDisconnectStress.cs diff --git a/test/Common.FunctionalTests/CommonStartupTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs similarity index 100% rename from test/Common.FunctionalTests/CommonStartupTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs diff --git a/test/Common.FunctionalTests/CompressionTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs similarity index 100% rename from test/Common.FunctionalTests/CompressionTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs diff --git a/test/Common.FunctionalTests/ConfigurationChangeTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/ConfigurationChangeTests.cs similarity index 100% rename from test/Common.FunctionalTests/ConfigurationChangeTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/ConfigurationChangeTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/CompressionTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/CompressionTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/CompressionTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/CompressionTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EventLogTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/EventLogTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EventLogTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs diff --git a/test/Common.FunctionalTests/Inprocess/FrebTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FrebTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/FrebTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FrebTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/LogPipeTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs diff --git a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/StartupTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs diff --git a/test/Common.FunctionalTests/LogFileTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs similarity index 100% rename from test/Common.FunctionalTests/LogFileTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs diff --git a/test/Common.FunctionalTests/MultiApplicationTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/MultiApplicationTests.cs similarity index 100% rename from test/Common.FunctionalTests/MultiApplicationTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/MultiApplicationTests.cs diff --git a/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs similarity index 100% rename from test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs diff --git a/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs similarity index 100% rename from test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs diff --git a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs similarity index 100% rename from test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs diff --git a/test/Common.FunctionalTests/PublishedSitesFixture.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs similarity index 100% rename from test/Common.FunctionalTests/PublishedSitesFixture.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs diff --git a/test/Common.FunctionalTests/RequiresNewHandler.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/RequiresNewHandler.cs similarity index 100% rename from test/Common.FunctionalTests/RequiresNewHandler.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/RequiresNewHandler.cs diff --git a/test/Common.FunctionalTests/RequiresNewShim.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/RequiresNewShim.cs similarity index 100% rename from test/Common.FunctionalTests/RequiresNewShim.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/RequiresNewShim.cs diff --git a/test/Common.FunctionalTests/ServerAbortTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/ServerAbortTests.cs similarity index 100% rename from test/Common.FunctionalTests/ServerAbortTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/ServerAbortTests.cs diff --git a/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs similarity index 100% rename from test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs diff --git a/test/Common.FunctionalTests/SkipVSTSAttribute.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/SkipVSTSAttribute.cs similarity index 100% rename from test/Common.FunctionalTests/SkipVSTSAttribute.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/SkipVSTSAttribute.cs diff --git a/test/Common.FunctionalTests/Utilities/AppVerifier.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/AppVerifier.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/AppVerifier.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/AppVerifier.cs diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/EventLogHelpers.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/Helpers.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/Helpers.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/Helpers.cs diff --git a/test/Common.FunctionalTests/Utilities/IISCapability.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCapability.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/IISCapability.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCapability.cs diff --git a/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs diff --git a/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs diff --git a/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs diff --git a/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs diff --git a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs diff --git a/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/LogFileTestBase.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs diff --git a/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs diff --git a/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs diff --git a/test/Common.FunctionalTests/WindowsAuthTests.cs b/src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs similarity index 100% rename from test/Common.FunctionalTests/WindowsAuthTests.cs rename to src/IISIntegration/src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs diff --git a/test/Common.Tests/Common.Tests.csproj b/src/IISIntegration/src/IISIntegration/test/Common.Tests/Common.Tests.csproj similarity index 100% rename from test/Common.Tests/Common.Tests.csproj rename to src/IISIntegration/src/IISIntegration/test/Common.Tests/Common.Tests.csproj diff --git a/test/Common.Tests/Utilities/DisposableList.cs b/src/IISIntegration/src/IISIntegration/test/Common.Tests/Utilities/DisposableList.cs similarity index 100% rename from test/Common.Tests/Utilities/DisposableList.cs rename to src/IISIntegration/src/IISIntegration/test/Common.Tests/Utilities/DisposableList.cs diff --git a/test/Common.Tests/Utilities/TestConnections.cs b/src/IISIntegration/src/IISIntegration/test/Common.Tests/Utilities/TestConnections.cs similarity index 100% rename from test/Common.Tests/Utilities/TestConnections.cs rename to src/IISIntegration/src/IISIntegration/test/Common.Tests/Utilities/TestConnections.cs diff --git a/test/Common.Tests/Utilities/TimeoutExtensions.cs b/src/IISIntegration/src/IISIntegration/test/Common.Tests/Utilities/TimeoutExtensions.cs similarity index 100% rename from test/Common.Tests/Utilities/TimeoutExtensions.cs rename to src/IISIntegration/src/IISIntegration/test/Common.Tests/Utilities/TimeoutExtensions.cs diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/CommonLibTests.vcxproj similarity index 100% rename from test/CommonLibTests/CommonLibTests.vcxproj rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/CommonLibTests.vcxproj diff --git a/test/CommonLibTests/ConfigUtilityTests.cpp b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/ConfigUtilityTests.cpp similarity index 100% rename from test/CommonLibTests/ConfigUtilityTests.cpp rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/ConfigUtilityTests.cpp diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/FileOutputManagerTests.cpp similarity index 100% rename from test/CommonLibTests/FileOutputManagerTests.cpp rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/FileOutputManagerTests.cpp diff --git a/test/CommonLibTests/GlobalVersionTests.cpp b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/GlobalVersionTests.cpp similarity index 100% rename from test/CommonLibTests/GlobalVersionTests.cpp rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/GlobalVersionTests.cpp diff --git a/test/CommonLibTests/Helpers.cpp b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/Helpers.cpp similarity index 100% rename from test/CommonLibTests/Helpers.cpp rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/Helpers.cpp diff --git a/test/CommonLibTests/Helpers.h b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/Helpers.h similarity index 100% rename from test/CommonLibTests/Helpers.h rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/Helpers.h diff --git a/test/CommonLibTests/NativeTests.targets b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/NativeTests.targets similarity index 100% rename from test/CommonLibTests/NativeTests.targets rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/NativeTests.targets diff --git a/test/CommonLibTests/PipeOutputManagerTests.cpp b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/PipeOutputManagerTests.cpp similarity index 100% rename from test/CommonLibTests/PipeOutputManagerTests.cpp rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/PipeOutputManagerTests.cpp diff --git a/test/CommonLibTests/exception_handler_tests.cpp b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/exception_handler_tests.cpp similarity index 100% rename from test/CommonLibTests/exception_handler_tests.cpp rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/exception_handler_tests.cpp diff --git a/test/CommonLibTests/fakeclasses.h b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/fakeclasses.h similarity index 100% rename from test/CommonLibTests/fakeclasses.h rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/fakeclasses.h diff --git a/test/CommonLibTests/hostfxr_utility_tests.cpp b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/hostfxr_utility_tests.cpp similarity index 100% rename from test/CommonLibTests/hostfxr_utility_tests.cpp rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/hostfxr_utility_tests.cpp diff --git a/test/CommonLibTests/inprocess_application_tests.cpp b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/inprocess_application_tests.cpp similarity index 100% rename from test/CommonLibTests/inprocess_application_tests.cpp rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/inprocess_application_tests.cpp diff --git a/test/CommonLibTests/main.cpp b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/main.cpp similarity index 100% rename from test/CommonLibTests/main.cpp rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/main.cpp diff --git a/test/CommonLibTests/stdafx.h b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/stdafx.h similarity index 100% rename from test/CommonLibTests/stdafx.h rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/stdafx.h diff --git a/test/CommonLibTests/utility_tests.cpp b/src/IISIntegration/src/IISIntegration/test/CommonLibTests/utility_tests.cpp similarity index 100% rename from test/CommonLibTests/utility_tests.cpp rename to src/IISIntegration/src/IISIntegration/test/CommonLibTests/utility_tests.cpp diff --git a/test/Directory.Build.props b/src/IISIntegration/src/IISIntegration/test/Directory.Build.props similarity index 100% rename from test/Directory.Build.props rename to src/IISIntegration/src/IISIntegration/test/Directory.Build.props diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs b/src/IISIntegration/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs similarity index 100% rename from test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs b/src/IISIntegration/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs similarity index 100% rename from test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/IISIntegration/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj similarity index 100% rename from test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj rename to src/IISIntegration/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj diff --git a/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs b/src/IISIntegration/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs similarity index 100% rename from test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs diff --git a/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs b/src/IISIntegration/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs similarity index 100% rename from test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs diff --git a/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/IISIntegration/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj similarity index 100% rename from test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj rename to src/IISIntegration/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj diff --git a/test/IIS.FunctionalTests/DeployerSelector.cs b/src/IISIntegration/src/IISIntegration/test/IIS.FunctionalTests/DeployerSelector.cs similarity index 100% rename from test/IIS.FunctionalTests/DeployerSelector.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.FunctionalTests/DeployerSelector.cs diff --git a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/IISIntegration/src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj similarity index 100% rename from test/IIS.FunctionalTests/IIS.FunctionalTests.csproj rename to src/IISIntegration/src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj diff --git a/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/src/IISIntegration/src/IISIntegration/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs similarity index 100% rename from test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs diff --git a/test/IIS.Shared.FunctionalTests/MofFileTests.cs b/src/IISIntegration/src/IISIntegration/test/IIS.Shared.FunctionalTests/MofFileTests.cs similarity index 100% rename from test/IIS.Shared.FunctionalTests/MofFileTests.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.Shared.FunctionalTests/MofFileTests.cs diff --git a/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs b/src/IISIntegration/src/IISIntegration/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs similarity index 100% rename from test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs diff --git a/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs b/src/IISIntegration/src/IISIntegration/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs similarity index 100% rename from test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs diff --git a/test/IIS.Shared.FunctionalTests/ServicesTests.cs b/src/IISIntegration/src/IISIntegration/test/IIS.Shared.FunctionalTests/ServicesTests.cs similarity index 100% rename from test/IIS.Shared.FunctionalTests/ServicesTests.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.Shared.FunctionalTests/ServicesTests.cs diff --git a/test/IIS.Tests/AppHostConfig/HostableWebCore.config b/src/IISIntegration/src/IISIntegration/test/IIS.Tests/AppHostConfig/HostableWebCore.config similarity index 100% rename from test/IIS.Tests/AppHostConfig/HostableWebCore.config rename to src/IISIntegration/src/IISIntegration/test/IIS.Tests/AppHostConfig/HostableWebCore.config diff --git a/test/IIS.Tests/ClientDisconnectTests.cs b/src/IISIntegration/src/IISIntegration/test/IIS.Tests/ClientDisconnectTests.cs similarity index 100% rename from test/IIS.Tests/ClientDisconnectTests.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.Tests/ClientDisconnectTests.cs diff --git a/test/IIS.Tests/ConnectionIdFeatureTests.cs b/src/IISIntegration/src/IISIntegration/test/IIS.Tests/ConnectionIdFeatureTests.cs similarity index 100% rename from test/IIS.Tests/ConnectionIdFeatureTests.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.Tests/ConnectionIdFeatureTests.cs diff --git a/test/IIS.Tests/HttpBodyControlFeatureTests.cs b/src/IISIntegration/src/IISIntegration/test/IIS.Tests/HttpBodyControlFeatureTests.cs similarity index 100% rename from test/IIS.Tests/HttpBodyControlFeatureTests.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.Tests/HttpBodyControlFeatureTests.cs diff --git a/test/IIS.Tests/IIS.Tests.csproj b/src/IISIntegration/src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj similarity index 100% rename from test/IIS.Tests/IIS.Tests.csproj rename to src/IISIntegration/src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj diff --git a/test/IIS.Tests/ResponseAbortTests.cs b/src/IISIntegration/src/IISIntegration/test/IIS.Tests/ResponseAbortTests.cs similarity index 100% rename from test/IIS.Tests/ResponseAbortTests.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.Tests/ResponseAbortTests.cs diff --git a/test/IIS.Tests/StrictTestServerTests.cs b/src/IISIntegration/src/IISIntegration/test/IIS.Tests/StrictTestServerTests.cs similarity index 100% rename from test/IIS.Tests/StrictTestServerTests.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.Tests/StrictTestServerTests.cs diff --git a/test/IIS.Tests/TestServerTest.cs b/src/IISIntegration/src/IISIntegration/test/IIS.Tests/TestServerTest.cs similarity index 100% rename from test/IIS.Tests/TestServerTest.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.Tests/TestServerTest.cs diff --git a/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs b/src/IISIntegration/src/IISIntegration/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs similarity index 100% rename from test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs diff --git a/test/IIS.Tests/Utilities/TestServer.cs b/src/IISIntegration/src/IISIntegration/test/IIS.Tests/Utilities/TestServer.cs similarity index 100% rename from test/IIS.Tests/Utilities/TestServer.cs rename to src/IISIntegration/src/IISIntegration/test/IIS.Tests/Utilities/TestServer.cs diff --git a/test/IISExpress.FunctionalTests/DeployerSelector.cs b/src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/DeployerSelector.cs similarity index 100% rename from test/IISExpress.FunctionalTests/DeployerSelector.cs rename to src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/DeployerSelector.cs diff --git a/test/IISExpress.FunctionalTests/HttpsTests.cs b/src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/HttpsTests.cs rename to src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs diff --git a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj similarity index 100% rename from test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj rename to src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj diff --git a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs b/src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs rename to src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs diff --git a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs rename to src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs diff --git a/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs b/src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs rename to src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs b/src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs rename to src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs similarity index 100% rename from test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs rename to src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs diff --git a/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs b/src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs similarity index 100% rename from test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs rename to src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs diff --git a/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs b/src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs similarity index 100% rename from test/IISExpress.FunctionalTests/RequiresIISAttribute.cs rename to src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs diff --git a/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs b/src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs rename to src/IISIntegration/src/IISIntegration/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs b/src/IISIntegration/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs rename to src/IISIntegration/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs b/src/IISIntegration/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs rename to src/IISIntegration/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/src/IISIntegration/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj similarity index 100% rename from test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj rename to src/IISIntegration/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj diff --git a/test/TestTasks/InjectRequestHandler.cs b/src/IISIntegration/src/IISIntegration/test/TestTasks/InjectRequestHandler.cs similarity index 100% rename from test/TestTasks/InjectRequestHandler.cs rename to src/IISIntegration/src/IISIntegration/test/TestTasks/InjectRequestHandler.cs diff --git a/test/TestTasks/TestTasks.csproj b/src/IISIntegration/src/IISIntegration/test/TestTasks/TestTasks.csproj similarity index 100% rename from test/TestTasks/TestTasks.csproj rename to src/IISIntegration/src/IISIntegration/test/TestTasks/TestTasks.csproj diff --git a/test/WebSites/Directory.Build.props b/src/IISIntegration/src/IISIntegration/test/WebSites/Directory.Build.props similarity index 100% rename from test/WebSites/Directory.Build.props rename to src/IISIntegration/src/IISIntegration/test/WebSites/Directory.Build.props diff --git a/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj similarity index 100% rename from test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj rename to src/IISIntegration/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj diff --git a/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json similarity index 100% rename from test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json rename to src/IISIntegration/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json diff --git a/test/WebSites/InProcessWebSite/DummyServer.cs b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/DummyServer.cs similarity index 100% rename from test/WebSites/InProcessWebSite/DummyServer.cs rename to src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/DummyServer.cs diff --git a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj similarity index 100% rename from test/WebSites/InProcessWebSite/InProcessWebSite.csproj rename to src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj diff --git a/test/WebSites/InProcessWebSite/Program.cs b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/Program.cs similarity index 100% rename from test/WebSites/InProcessWebSite/Program.cs rename to src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/Program.cs diff --git a/test/WebSites/InProcessWebSite/Properties/launchSettings.json b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/Properties/launchSettings.json similarity index 100% rename from test/WebSites/InProcessWebSite/Properties/launchSettings.json rename to src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/Properties/launchSettings.json diff --git a/test/WebSites/InProcessWebSite/Startup.WebSockets.cs b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.WebSockets.cs similarity index 100% rename from test/WebSites/InProcessWebSite/Startup.WebSockets.cs rename to src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.WebSockets.cs diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.cs similarity index 100% rename from test/WebSites/InProcessWebSite/Startup.cs rename to src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.cs diff --git a/test/WebSites/InProcessWebSite/web.config b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/web.config similarity index 100% rename from test/WebSites/InProcessWebSite/web.config rename to src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/web.config diff --git a/test/WebSites/InProcessWebSite/wwwroot/static.txt b/src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/wwwroot/static.txt similarity index 100% rename from test/WebSites/InProcessWebSite/wwwroot/static.txt rename to src/IISIntegration/src/IISIntegration/test/WebSites/InProcessWebSite/wwwroot/static.txt diff --git a/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/IISIntegration/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj similarity index 100% rename from test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj rename to src/IISIntegration/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj diff --git a/test/WebSites/OutOfProcessWebSite/Program.cs b/src/IISIntegration/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Program.cs similarity index 100% rename from test/WebSites/OutOfProcessWebSite/Program.cs rename to src/IISIntegration/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Program.cs diff --git a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json b/src/IISIntegration/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json similarity index 100% rename from test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json rename to src/IISIntegration/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/src/IISIntegration/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Startup.cs similarity index 100% rename from test/WebSites/OutOfProcessWebSite/Startup.cs rename to src/IISIntegration/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Startup.cs diff --git a/test/WebSites/OutOfProcessWebSite/wwwroot/static.txt b/src/IISIntegration/src/IISIntegration/test/WebSites/OutOfProcessWebSite/wwwroot/static.txt similarity index 100% rename from test/WebSites/OutOfProcessWebSite/wwwroot/static.txt rename to src/IISIntegration/src/IISIntegration/test/WebSites/OutOfProcessWebSite/wwwroot/static.txt diff --git a/test/WebSites/StressTestWebSite/Program.cs b/src/IISIntegration/src/IISIntegration/test/WebSites/StressTestWebSite/Program.cs similarity index 100% rename from test/WebSites/StressTestWebSite/Program.cs rename to src/IISIntegration/src/IISIntegration/test/WebSites/StressTestWebSite/Program.cs diff --git a/test/WebSites/StressTestWebSite/Properties/launchSettings.json b/src/IISIntegration/src/IISIntegration/test/WebSites/StressTestWebSite/Properties/launchSettings.json similarity index 100% rename from test/WebSites/StressTestWebSite/Properties/launchSettings.json rename to src/IISIntegration/src/IISIntegration/test/WebSites/StressTestWebSite/Properties/launchSettings.json diff --git a/test/WebSites/StressTestWebSite/Startup.cs b/src/IISIntegration/src/IISIntegration/test/WebSites/StressTestWebSite/Startup.cs similarity index 100% rename from test/WebSites/StressTestWebSite/Startup.cs rename to src/IISIntegration/src/IISIntegration/test/WebSites/StressTestWebSite/Startup.cs diff --git a/test/WebSites/StressTestWebSite/StressTestWebSite.csproj b/src/IISIntegration/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj similarity index 100% rename from test/WebSites/StressTestWebSite/StressTestWebSite.csproj rename to src/IISIntegration/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj diff --git a/test/WebSites/shared/SharedStartup/Startup.shared.cs b/src/IISIntegration/src/IISIntegration/test/WebSites/shared/SharedStartup/Startup.shared.cs similarity index 100% rename from test/WebSites/shared/SharedStartup/Startup.shared.cs rename to src/IISIntegration/src/IISIntegration/test/WebSites/shared/SharedStartup/Startup.shared.cs diff --git a/test/WebSites/shared/WebSockets/Constants.cs b/src/IISIntegration/src/IISIntegration/test/WebSites/shared/WebSockets/Constants.cs similarity index 100% rename from test/WebSites/shared/WebSockets/Constants.cs rename to src/IISIntegration/src/IISIntegration/test/WebSites/shared/WebSockets/Constants.cs diff --git a/test/WebSites/shared/WebSockets/HandshakeHelpers.cs b/src/IISIntegration/src/IISIntegration/test/WebSites/shared/WebSockets/HandshakeHelpers.cs similarity index 100% rename from test/WebSites/shared/WebSockets/HandshakeHelpers.cs rename to src/IISIntegration/src/IISIntegration/test/WebSites/shared/WebSockets/HandshakeHelpers.cs diff --git a/test/WebSites/shared/WebSockets/TestStartup.cs b/src/IISIntegration/src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs similarity index 100% rename from test/WebSites/shared/WebSockets/TestStartup.cs rename to src/IISIntegration/src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs diff --git a/test/gtest/gtest.vcxproj b/src/IISIntegration/src/IISIntegration/test/gtest/gtest.vcxproj similarity index 100% rename from test/gtest/gtest.vcxproj rename to src/IISIntegration/src/IISIntegration/test/gtest/gtest.vcxproj diff --git a/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx diff --git a/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/_._ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/_._ similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/_._ rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/_._ diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs diff --git a/src/IISIntegration/test/Common.FunctionalTests/AppHostConfig/IIS.config b/src/IISIntegration/test/Common.FunctionalTests/AppHostConfig/IIS.config new file mode 100644 index 0000000000..bc24ef9639 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/AppHostConfig/IIS.config @@ -0,0 +1,740 @@ + + + + + + + + +
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/Common.FunctionalTests/AppOfflineTests.cs b/src/IISIntegration/test/Common.FunctionalTests/AppOfflineTests.cs new file mode 100644 index 0000000000..7d8d661ef0 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/AppOfflineTests.cs @@ -0,0 +1,287 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Net; +using System.Net.Http; +using System.Net.Sockets; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; +using Xunit; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; + +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class AppOfflineTests : IISFunctionalTestBase + { + private static readonly TimeSpan RetryDelay = TimeSpan.FromMilliseconds(100); + + private readonly PublishedSitesFixture _fixture; + + public AppOfflineTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task AppOfflineDroppedWhileSiteIsDown_SiteReturns503(HostingModel hostingModel) + { + var deploymentResult = await DeployApp(hostingModel); + + AddAppOffline(deploymentResult.ContentRoot); + + await AssertAppOffline(deploymentResult); + DeletePublishOutput(deploymentResult); + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task LockedAppOfflineDroppedWhileSiteIsDown_SiteReturns503(HostingModel hostingModel) + { + var deploymentResult = await DeployApp(hostingModel); + + // Add app_offline without shared access + using (var stream = File.Open(Path.Combine(deploymentResult.ContentRoot, "app_offline.htm"), FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None)) + using (var writer = new StreamWriter(stream)) + { + await writer.WriteLineAsync("App if offline but you wouldn't see this message"); + await writer.FlushAsync(); + await AssertAppOffline(deploymentResult, ""); + } + + DeletePublishOutput(deploymentResult); + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess, 500, "500.0")] + [InlineData(HostingModel.OutOfProcess, 502, "502.5")] + public async Task AppOfflineDroppedWhileSiteFailedToStartInShim_AppOfflineServed(HostingModel hostingModel, int statusCode, string content) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel: hostingModel, publish: true); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", "nonexistent")); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var result = await deploymentResult.HttpClient.GetAsync("/"); + Assert.Equal(statusCode, (int)result.StatusCode); + Assert.Contains(content, await result.Content.ReadAsStringAsync()); + + AddAppOffline(deploymentResult.ContentRoot); + + await AssertAppOffline(deploymentResult); + DeletePublishOutput(deploymentResult); + } + + [ConditionalFact(Skip = "https://github.com/aspnet/IISIntegration/issues/933")] + public async Task AppOfflineDroppedWhileSiteFailedToStartInRequestHandler_SiteStops_InProcess() + { + var deploymentResult = await DeployApp(HostingModel.InProcess); + + // Set file content to empty so it fails at runtime + File.WriteAllText(Path.Combine(deploymentResult.ContentRoot, "Microsoft.AspNetCore.Server.IIS.dll"), ""); + + var result = await deploymentResult.HttpClient.GetAsync("/"); + Assert.Equal(500, (int)result.StatusCode); + Assert.Contains("500.30", await result.Content.ReadAsStringAsync()); + + AddAppOffline(deploymentResult.ContentRoot); + + await deploymentResult.AssertRecycledAsync(() => AssertAppOffline(deploymentResult)); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.ShutdownToken)] + public async Task AppOfflineDroppedWhileSiteStarting_SiteShutsDown_InProcess() + { + // This test often hits a race between debug logging and stdout redirection closing the handle + // we are fine having this race + using (AppVerifier.Disable(DeployerSelector.ServerType, 0x300)) + { + var deploymentResult = await DeployApp(HostingModel.InProcess); + + for (int i = 0; i < 10; i++) + { + // send first request and add app_offline while app is starting + var runningTask = AssertAppOffline(deploymentResult); + + // This test tries to hit a race where we drop app_offline file while + // in process application is starting, application start takes at least 400ms + // so we back off for 100ms to allow request to reach request handler + // Test itself is racy and can result in two scenarios + // 1. ANCM detects app_offline before it starts the request - if AssertAppOffline succeeds we've hit it + // 2. Intended scenario where app starts and then shuts down + // In first case we remove app_offline and try again + await Task.Delay(RetryDelay); + + AddAppOffline(deploymentResult.ContentRoot); + + try + { + await runningTask.DefaultTimeout(); + + // if AssertAppOffline succeeded ANCM have picked up app_offline before starting the app + // try again + RemoveAppOffline(deploymentResult.ContentRoot); + } + catch + { + deploymentResult.AssertWorkerProcessStop(); + return; + } + } + + Assert.True(false); + + } + } + + [ConditionalFact] + public async Task AppOfflineDroppedWhileSiteRunning_SiteShutsDown_InProcess() + { + var deploymentResult = await AssertStarts(HostingModel.InProcess); + + AddAppOffline(deploymentResult.ContentRoot); + + await deploymentResult.AssertRecycledAsync(() => AssertAppOffline(deploymentResult)); + } + + [ConditionalFact] + public async Task AppOfflineDroppedWhileSiteRunning_SiteShutsDown_OutOfProcess() + { + var deploymentResult = await AssertStarts(HostingModel.OutOfProcess); + + // Repeat dropping file and restarting multiple times + for (int i = 0; i < 5; i++) + { + AddAppOffline(deploymentResult.ContentRoot); + await AssertAppOffline(deploymentResult); + RemoveAppOffline(deploymentResult.ContentRoot); + await AssertRunning(deploymentResult); + } + + AddAppOffline(deploymentResult.ContentRoot); + await AssertAppOffline(deploymentResult); + DeletePublishOutput(deploymentResult); + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task AppOfflineDropped_CanRemoveAppOfflineAfterAddingAndSiteWorks(HostingModel hostingModel) + { + var deploymentResult = await DeployApp(hostingModel); + + AddAppOffline(deploymentResult.ContentRoot); + + await AssertAppOffline(deploymentResult); + + RemoveAppOffline(deploymentResult.ContentRoot); + + await AssertRunning(deploymentResult); + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task AppOfflineAddedAndRemovedStress(HostingModel hostingModel) + { + var deploymentResult = await AssertStarts(hostingModel); + + var load = Helpers.StressLoad(deploymentResult.HttpClient, "/HelloWorld", response => { + var statusCode = (int)response.StatusCode; + Assert.True(statusCode == 200 || statusCode == 503, "Status code was " + statusCode); + }); + + for (int i = 0; i < 100; i++) + { + // AddAppOffline might fail if app_offline is being read by ANCM and deleted at the same time + RetryHelper.RetryOperation( + () => AddAppOffline(deploymentResult.ContentRoot), + e => Logger.LogError($"Failed to create app_offline : {e.Message}"), + retryCount: 3, + retryDelayMilliseconds: RetryDelay.Milliseconds); + RemoveAppOffline(deploymentResult.ContentRoot); + } + + try + { + await load; + } + catch (HttpRequestException ex) when (ex.InnerException is IOException | ex.InnerException is SocketException) + { + // IOException in InProcess is fine, just means process stopped + if (hostingModel != HostingModel.InProcess) + { + throw; + } + } + } + + private async Task DeployApp(HostingModel hostingModel = HostingModel.InProcess) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel: hostingModel, publish: true); + + return await DeployAsync(deploymentParameters); + } + + private void AddAppOffline(string appPath, string content = "The app is offline.") + { + File.WriteAllText(Path.Combine(appPath, "app_offline.htm"), content); + } + + private void RemoveAppOffline(string appPath) + { + RetryHelper.RetryOperation( + () => File.Delete(Path.Combine(appPath, "app_offline.htm")), + e => Logger.LogError($"Failed to remove app_offline : {e.Message}"), + retryCount: 3, + retryDelayMilliseconds: RetryDelay.Milliseconds); + } + + private async Task AssertAppOffline(IISDeploymentResult deploymentResult, string expectedResponse = "The app is offline.") + { + var response = await deploymentResult.HttpClient.RetryRequestAsync("HelloWorld", r => r.StatusCode == HttpStatusCode.ServiceUnavailable); + Assert.Equal(expectedResponse, await response.Content.ReadAsStringAsync()); + } + + private async Task AssertStarts(HostingModel hostingModel) + { + var deploymentResult = await DeployApp(hostingModel); + + await AssertRunning(deploymentResult); + + return deploymentResult; + } + + private static async Task AssertRunning(IISDeploymentResult deploymentResult) + { + var response = await deploymentResult.HttpClient.RetryRequestAsync("HelloWorld", r => r.IsSuccessStatusCode); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("Hello World", responseText); + } + + private void DeletePublishOutput(IISDeploymentResult deploymentResult) + { + foreach (var file in Directory.GetFiles(deploymentResult.ContentRoot, "*", SearchOption.AllDirectories)) + { + // Out of process module dll is allowed to be locked + var name = Path.GetFileName(file); + if (name == "aspnetcore.dll" || name == "aspnetcorev2.dll" || name == "aspnetcorev2_outofprocess.dll") + { + continue; + } + File.Delete(file); + } + } + + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs b/src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs new file mode 100644 index 0000000000..d8607db21e --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs @@ -0,0 +1,70 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Text; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class BasicAuthTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public BasicAuthTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22) + .WithApplicationTypes(ApplicationType.Portable) + .WithAllAncmVersions() + .WithAllHostingModels(); + + [ConditionalTheory] + [RequiresEnvironmentVariable("ASPNETCORE_MODULE_TEST_USER")] + [RequiresIIS(IISCapability.BasicAuthentication)] + [MemberData(nameof(TestVariants))] + public async Task BasicAuthTest(TestVariant variant) + { + var username = Environment.GetEnvironmentVariable("ASPNETCORE_MODULE_TEST_USER"); + var password = Environment.GetEnvironmentVariable("ASPNETCORE_MODULE_TEST_PASSWORD"); + + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + deploymentParameters.SetAnonymousAuth(enabled: false); + deploymentParameters.SetWindowsAuth(enabled: false); + deploymentParameters.SetBasicAuth(enabled: true); + + // The default in hosting sets windows auth to true. + var deploymentResult = await DeployAsync(deploymentParameters); + var request = new HttpRequestMessage(HttpMethod.Get, "/Auth"); + var byteArray = new UTF8Encoding().GetBytes(username + ":" + password); + request.Headers.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(byteArray)); + + var response = await deploymentResult.HttpClient.SendAsync(request); + + var responseText = await response.Content.ReadAsStringAsync(); + + if (variant.HostingModel == HostingModel.InProcess) + { + Assert.StartsWith("Windows", responseText); + Assert.Contains(username, responseText); + } + else + { + // We expect out-of-proc not allowing basic auth + Assert.Equal("Windows", responseText); + } + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateFixture.cs b/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateFixture.cs new file mode 100644 index 0000000000..40b6f2265e --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateFixture.cs @@ -0,0 +1,104 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Security.Cryptography; +using System.Security.Cryptography.X509Certificates; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class ClientCertificateFixture : IDisposable + { + private X509Certificate2 _certificate; + private const string _certIssuerPrefix = "CN=IISIntegrationTest_Root"; + + public X509Certificate2 GetOrCreateCertificate() + { + if (_certificate != null) + { + return _certificate; + } + + using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) + { + store.Open(OpenFlags.ReadWrite); + var parentKey = CreateKeyMaterial(2048); + + // Create a cert name with a random guid to avoid name conflicts + var parentRequest = new CertificateRequest( + _certIssuerPrefix + Guid.NewGuid().ToString(), + parentKey, HashAlgorithmName.SHA256, + RSASignaturePadding.Pkcs1); + + parentRequest.CertificateExtensions.Add( + new X509BasicConstraintsExtension( + certificateAuthority: true, + hasPathLengthConstraint: false, + pathLengthConstraint: 0, + critical: true)); + + parentRequest.CertificateExtensions.Add( + new X509KeyUsageExtension(X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.NonRepudiation, critical: true)); + + parentRequest.CertificateExtensions.Add( + new X509SubjectKeyIdentifierExtension(parentRequest.PublicKey, false)); + + var notBefore = DateTimeOffset.Now.AddDays(-1); + var notAfter = DateTimeOffset.Now.AddYears(5); + + var parentCert = parentRequest.CreateSelfSigned(notBefore, notAfter); + + // Need to export/import the certificate to associate the private key with the cert. + var imported = parentCert; + + var export = parentCert.Export(X509ContentType.Pkcs12, ""); + imported = new X509Certificate2(export, "", X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable); + Array.Clear(export, 0, export.Length); + + // Add the cert to the cert store + _certificate = imported; + + store.Add(certificate: imported); + store.Close(); + return imported; + } + } + + public void Dispose() + { + if (_certificate == null) + { + return; + } + + using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) + { + store.Open(OpenFlags.ReadWrite); + store.Remove(_certificate); + + // Remove any extra certs that were left by previous tests. + for (var i = store.Certificates.Count - 1; i >= 0; i--) + { + var cert = store.Certificates[i]; + if (cert.Issuer.StartsWith(_certIssuerPrefix)) + { + store.Remove(cert); + } + } + store.Close(); + } + } + + private RSA CreateKeyMaterial(int minimumKeySize) + { + var rsa = RSA.Create(minimumKeySize); + if (rsa.KeySize < minimumKeySize) + { + throw new InvalidOperationException($"Failed to create a key with a size of {minimumKeySize} bits"); + } + + return rsa; + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs b/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs new file mode 100644 index 0000000000..43ccc83eff --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs @@ -0,0 +1,108 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Net.Http; +using System.Security.Cryptography.X509Certificates; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.Common; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + [SkipIfNotAdmin] + public class ClientCertificateTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + private readonly ClientCertificateFixture _certFixture; + + public ClientCertificateTests(PublishedSitesFixture fixture, ClientCertificateFixture certFixture) + { + _fixture = fixture; + _certFixture = certFixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithAllApplicationTypes() + .WithAllAncmVersions() + .WithAllHostingModels(); + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public Task HttpsNoClientCert_NoClientCert(TestVariant variant) + { + return ClientCertTest(variant, sendClientCert: false); + } + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public Task HttpsClientCert_GetCertInformation(TestVariant variant) + { + return ClientCertTest(variant, sendClientCert: true); + } + + private async Task ClientCertTest(TestVariant variant, bool sendClientCert) + { + var port = TestPortHelper.GetNextSSLPort(); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); + deploymentParameters.ApplicationBaseUriHint = $"https://localhost:{port}/"; + deploymentParameters.AddHttpsToServerConfig(); + + var handler = new HttpClientHandler + { + ServerCertificateCustomValidationCallback = (a, b, c, d) => true, + ClientCertificateOptions = ClientCertificateOption.Manual, + }; + + X509Certificate2 cert = null; + if (sendClientCert) + { + cert = _certFixture.GetOrCreateCertificate(); + handler.ClientCertificates.Add(cert); + } + + var deploymentResult = await DeployAsync(deploymentParameters); + + var client = deploymentResult.CreateClient(handler); + var response = await client.GetAsync("GetClientCert"); + + var responseText = await response.Content.ReadAsStringAsync(); + + try + { + if (sendClientCert) + { + Assert.Equal($"Enabled;{cert.GetCertHashString()}", responseText); + } + else + { + Assert.Equal("Disabled", responseText); + } + } + catch (Exception ex) + { + Logger.LogError($"Certificate is invalid. Issuer name: {cert.Issuer}"); + using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) + { + Logger.LogError($"List of current certificates in root store:"); + store.Open(OpenFlags.ReadWrite); + foreach (var otherCert in store.Certificates) + { + Logger.LogError(otherCert.Issuer); + } + store.Close(); + } + throw ex; + } + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/ClientDisconnectStress.cs b/src/IISIntegration/test/Common.FunctionalTests/ClientDisconnectStress.cs new file mode 100644 index 0000000000..9deeae3f92 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/ClientDisconnectStress.cs @@ -0,0 +1,65 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class ClientDisconnectStressTests: FunctionalTestsBase + { + private readonly PublishedSitesFixture _fixture; + + public ClientDisconnectStressTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task ClientDisconnectStress(HostingModel hostingModel) + { + var site = await StartAsync(_fixture.GetBaseDeploymentParameters(hostingModel)); + var maxRequestSize = 1000; + var blockSize = 40; + var random = new Random(); + async Task RunRequests() + { + using (var connection = new TestConnection(site.HttpClient.BaseAddress.Port)) + { + await connection.Send( + "POST /ReadAndFlushEcho HTTP/1.1", + $"Content-Length: {maxRequestSize}", + "Host: localhost", + "Connection: close", + "", + ""); + + var disconnectAfter = random.Next(maxRequestSize); + var data = new byte[blockSize]; + for (int i = 0; i < disconnectAfter / blockSize; i++) + { + await connection.Stream.WriteAsync(data); + } + } + } + + List tasks = new List(); + for (int i = 0; i < 100; i++) + { + tasks.Add(Task.Run(RunRequests)); + } + + await Task.WhenAll(tasks); + + StopServer(); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs b/src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs new file mode 100644 index 0000000000..e2bcf2a8f9 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs @@ -0,0 +1,44 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class CommonStartupTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public CommonStartupTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22) + .WithAllApplicationTypes() + .WithAllAncmVersions() + .WithAllHostingModels(); + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task StartupStress(TestVariant variant) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + + var deploymentResult = await DeployAsync(deploymentParameters); + + await Helpers.StressLoad(deploymentResult.HttpClient, "/HelloWorld", response => { + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal("Hello World", response.Content.ReadAsStringAsync().GetAwaiter().GetResult()); + }); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs b/src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs new file mode 100644 index 0000000000..c2d0277c4c --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs @@ -0,0 +1,58 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Linq; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISCompressionSiteCollection.Name)] + public abstract class CompressionTests : FixtureLoggedTest + { + private readonly IISTestSiteFixture _fixture; + + [Collection(IISTestSiteCollection.Name)] + public class InProc: CompressionTests + { + public InProc(IISTestSiteFixture fixture) : base(fixture) { } + } + + [Collection(OutOfProcessTestSiteCollection.Name)] + public class OutOfProcess: CompressionTests + { + public OutOfProcess(OutOfProcessTestSiteFixture fixture) : base(fixture) { } + } + + [Collection(OutOfProcessV1TestSiteCollection.Name)] + public class OutOfProcessV1: CompressionTests + { + public OutOfProcessV1(OutOfProcessV1TestSiteFixture fixture) : base(fixture) { } + } + + protected CompressionTests(IISTestSiteFixture fixture) : base(fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task PassesThroughCompression() + { + var request = new HttpRequestMessage(HttpMethod.Get, "/CompressedData"); + + request.Headers.AcceptEncoding.Add(new StringWithQualityHeaderValue("gzip")); + + var response = await _fixture.Client.SendAsync(request); + Assert.Equal("gzip", response.Content.Headers.ContentEncoding.Single()); + Assert.Equal( + new byte[] { + 0x1F, 0x8B, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x04, 0x0B, 0x63, 0x60, 0xA0, 0x3D, 0x00, 0x00, + 0xCA, 0xC6, 0x88, 0x99, 0x64, 0x00, 0x00, 0x00 }, + await response.Content.ReadAsByteArrayAsync()); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/ConfigurationChangeTests.cs b/src/IISIntegration/test/Common.FunctionalTests/ConfigurationChangeTests.cs new file mode 100644 index 0000000000..099cefb97a --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/ConfigurationChangeTests.cs @@ -0,0 +1,126 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Net.Sockets; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class ConfigurationChangeTests : IISFunctionalTestBase + { + private static readonly TimeSpan RetryDelay = TimeSpan.FromMilliseconds(100); + private readonly PublishedSitesFixture _fixture; + + public ConfigurationChangeTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task ConfigurationChangeStopsInProcess() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.InProcess, publish: true); + + var deploymentResult = await DeployAsync(deploymentParameters); + + await deploymentResult.AssertStarts(); + + // Just "touching" web.config should be enough + deploymentResult.ModifyWebConfig(element => {}); + + await deploymentResult.AssertRecycledAsync(); + } + + [ConditionalTheory] + [InlineData(AncmVersion.AspNetCoreModule)] + [InlineData(AncmVersion.AspNetCoreModuleV2)] + public async Task ConfigurationChangeForcesChildProcessRestart(AncmVersion version) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); + deploymentParameters.AncmVersion = version; + + var deploymentResult = await DeployAsync(deploymentParameters); + + var processBefore = await deploymentResult.HttpClient.GetStringAsync("/ProcessId"); + + // Just "touching" web.config should be enough + deploymentResult.ModifyWebConfig(element => {}); + + // Have to retry here to allow ANCM to receive notification and react to it + // Verify that worker process gets restarted with new process id + await deploymentResult.HttpClient.RetryRequestAsync("/ProcessId", async r => await r.Content.ReadAsStringAsync() != processBefore); + } + + [ConditionalFact] + public async Task OutOfProcessToInProcessHostingModelSwitchWorks() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); + + var deploymentResult = await DeployAsync(deploymentParameters); + + await deploymentResult.AssertStarts(); + + deploymentResult.ModifyWebConfig(element => element + .Descendants("system.webServer") + .Single() + .GetOrAdd("aspNetCore") + .SetAttributeValue("hostingModel", "inprocess")); + + // Have to retry here to allow ANCM to receive notification and react to it + // Verify that inprocess application was created and tried to start + await deploymentResult.HttpClient.RetryRequestAsync("/HelloWorld", r => r.StatusCode == HttpStatusCode.InternalServerError); + + StopServer(); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Could not find the assembly 'aspnetcorev2_inprocess.dll'", Logger); + } + + [ConditionalTheory] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task ConfigurationTouchedStress(HostingModel hostingModel) + { + var deploymentResult = await DeployAsync(_fixture.GetBaseDeploymentParameters(hostingModel, publish: true)); + + await deploymentResult.AssertStarts(); + var load = Helpers.StressLoad(deploymentResult.HttpClient, "/HelloWorld", response => { + var statusCode = (int)response.StatusCode; + Assert.True(statusCode == 200 || statusCode == 503, "Status code was " + statusCode); + }); + + for (int i = 0; i < 100; i++) + { + // ModifyWebConfig might fail if web.config is being read by IIS + RetryHelper.RetryOperation( + () => deploymentResult.ModifyWebConfig(element => {}), + e => Logger.LogError($"Failed to touch web.config : {e.Message}"), + retryCount: 3, + retryDelayMilliseconds: RetryDelay.Milliseconds); + } + + try + { + await load; + } + catch (HttpRequestException ex) when (ex.InnerException is IOException | ex.InnerException is SocketException) + { + // IOException in InProcess is fine, just means process stopped + if (hostingModel != HostingModel.InProcess) + { + throw; + } + } + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs new file mode 100644 index 0000000000..6e2d1bc752 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs @@ -0,0 +1,108 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class ClientDisconnectTests: FixtureLoggedTest + { + private readonly IISTestSiteFixture _fixture; + + public ClientDisconnectTests(IISTestSiteFixture fixture): base(fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task ServerWorksAfterClientDisconnect() + { + using (var connection = _fixture.CreateTestConnection()) + { + var message = "Hello"; + await connection.Send( + "POST /ReadAndWriteSynchronously HTTP/1.1", + $"Content-Length: {100000}", + "Host: localhost", + "Connection: close", + "", + ""); + + await connection.Send(message); + + await connection.Receive( + "HTTP/1.1 200 OK", + ""); + } + + var response = await _fixture.Client.GetAsync("HelloWorld"); + + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("Hello World", responseText); + } + + [ConditionalFact] + public async Task RequestAbortedTokenFires() + { + using (var connection = _fixture.CreateTestConnection()) + { + await connection.Send( + "GET /WaitForAbort HTTP/1.1", + "Host: localhost", + "Connection: close", + "", + ""); + + await _fixture.Client.RetryRequestAsync("/WaitingRequestCount", async message => await message.Content.ReadAsStringAsync() == "1"); + } + + await _fixture.Client.RetryRequestAsync("/WaitingRequestCount", async message => await message.Content.ReadAsStringAsync() == "0"); + } + + [ConditionalFact] + public async Task ClientDisconnectCallbackStress() + { + // Fixture initialization fails if inside of the Task.Run, so send an + // initial request to initialize the fixture. + var response = await _fixture.Client.GetAsync("HelloWorld"); + var numTotalRequests = 0; + for (var j = 0; j < 20; j++) + { + // Windows has a max connection limit of 10 for the IIS server, + // so setting limit fairly low. + const int numRequests = 5; + async Task RunRequests() + { + using (var connection = _fixture.CreateTestConnection()) + { + await connection.Send( + "GET /WaitForAbort HTTP/1.1", + "Host: localhost", + "Connection: close", + "", + ""); + await _fixture.Client.RetryRequestAsync("/WaitingRequestCount", async message => await message.Content.ReadAsStringAsync() != "0"); + Interlocked.Increment(ref numTotalRequests); + } + } + + List tasks = new List(); + for (int i = 0; i < numRequests; i++) + { + tasks.Add(Task.Run(RunRequests)); + } + + await Task.WhenAll(tasks); + + await _fixture.Client.RetryRequestAsync("/WaitingRequestCount", async message => await message.Content.ReadAsStringAsync() == "0"); + } + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/CompressionTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/CompressionTests.cs new file mode 100644 index 0000000000..ce1c84e609 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/CompressionTests.cs @@ -0,0 +1,96 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Net; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISCompressionSiteCollection.Name)] + public class CompressionModuleTests : FixtureLoggedTest + { + private readonly IISCompressionSiteFixture _fixture; + + public CompressionModuleTests(IISCompressionSiteFixture fixture): base(fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [RequiresIIS(IISCapability.DynamicCompression)] + [InlineData(true)] + [InlineData(false)] + public async Task BufferingDisabled(bool compression) + { + using (var connection = _fixture.CreateTestConnection()) + { + var requestLength = 0; + var messages = new List(); + for (var i = 1; i < 100; i++) + { + var message = i + Environment.NewLine; + requestLength += message.Length; + messages.Add(message); + } + + await connection.Send( + "POST /ReadAndWriteEchoLinesNoBuffering HTTP/1.1", + $"Content-Length: {requestLength}", + "Accept-Encoding: " + (compression ? "gzip": "identity"), + "Response-Content-Type: text/event-stream", + "Host: localhost", + "Connection: close", + "", + ""); + + await connection.Receive( + "HTTP/1.1 200 OK", + ""); + await connection.ReceiveHeaders(); + + foreach (var message in messages) + { + await connection.Send(message); + await connection.ReceiveChunk(message); + } + + await connection.Send("\r\n"); + await connection.ReceiveChunk(""); + await connection.WaitForConnectionClose(); + } + } + + [ConditionalFact] + [RequiresIIS(IISCapability.DynamicCompression)] + public async Task DynamicResponsesAreCompressed() + { + var handler = new HttpClientHandler + { + AutomaticDecompression = DecompressionMethods.GZip + }; + var client = new HttpClient(handler) + { + BaseAddress = _fixture.Client.BaseAddress, + }; + client.DefaultRequestHeaders.AcceptEncoding.Add(new StringWithQualityHeaderValue("gzip")); + client.DefaultRequestHeaders.AcceptEncoding.Add(new StringWithQualityHeaderValue("identity", 0)); + client.DefaultRequestHeaders.Add("Response-Content-Type", "text/event-stream"); + var messages = "Message1\r\nMessage2\r\n"; + + // Send messages with terminator + var response = await client.PostAsync("ReadAndWriteEchoLines", new StringContent(messages + "\r\n")); + Assert.Equal(messages, await response.Content.ReadAsStringAsync()); + Assert.True(response.Content.Headers.TryGetValues("Content-Type", out var contentTypes)); + Assert.Single(contentTypes, "text/event-stream"); + // Not the cleanest check but I wasn't able to figure out other way to check + // that response was compressed + Assert.Contains("gzip", response.Content.GetType().FullName, StringComparison.OrdinalIgnoreCase); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs new file mode 100644 index 0000000000..ae8fde39ed --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs @@ -0,0 +1,51 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// 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.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class EnvironmentVariableTests: FixtureLoggedTest + { + private readonly IISTestSiteFixture _fixture; + + public EnvironmentVariableTests(IISTestSiteFixture fixture): base(fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task GetUniqueEnvironmentVariable() + { + Assert.Equal("foobar", await _fixture.Client.GetStringAsync("/CheckEnvironmentVariable")); + } + + [ConditionalFact] + public async Task GetLongEnvironmentVariable() + { + Assert.Equal( + "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + + "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + + "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + + "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + + "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative" + + "AReallyLongValueThatIsGreaterThan300CharactersToForceResizeInNative", + await _fixture.Client.GetStringAsync("/CheckEnvironmentLongValueVariable")); + } + + [ConditionalFact] + public async Task GetExistingEnvironmentVariable() + { + Assert.Contains(";foobarbaz", await _fixture.Client.GetStringAsync("/CheckAppendedEnvironmentVariable")); + } + + [ConditionalFact] + public async Task AuthHeaderEnvironmentVariableRemoved() + { + Assert.DoesNotContain("shouldberemoved", await _fixture.Client.GetStringAsync("/CheckRemoveAuthEnvironmentVariable")); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs new file mode 100644 index 0000000000..bf45949491 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs @@ -0,0 +1,131 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class ErrorPagesTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public ErrorPagesTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public async Task IncludesAdditionalErrorPageTextInProcessHandlerLoadFailure_CorrectString() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var response = await DeployAppWithStartupFailure(deploymentParameters); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + var responseString = await response.Content.ReadAsStringAsync(); + Assert.Contains("HTTP Error 500.0 - ANCM In-Process Handler Load Failure", responseString); + VerifyNoExtraTrailingBytes(responseString); + + await AssertLink(response); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public async Task IncludesAdditionalErrorPageTextOutOfProcessStartupFailure_CorrectString() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); + var response = await DeployAppWithStartupFailure(deploymentParameters); + + Assert.Equal(HttpStatusCode.BadGateway, response.StatusCode); + + StopServer(); + + var responseString = await response.Content.ReadAsStringAsync(); + Assert.Contains("HTTP Error 502.5 - ANCM Out-Of-Process Startup Failure", responseString); + VerifyNoExtraTrailingBytes(responseString); + + await AssertLink(response); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public async Task IncludesAdditionalErrorPageTextOutOfProcessHandlerLoadFailure_CorrectString() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); + deploymentParameters.HandlerSettings["handlerVersion"] = "88.93"; + deploymentParameters.EnvironmentVariables["ANCM_ADDITIONAL_ERROR_PAGE_LINK"] = "http://example"; + + var deploymentResult = await DeployAsync(deploymentParameters); + var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + var responseString = await response.Content.ReadAsStringAsync(); + Assert.Contains("HTTP Error 500.0 - ANCM Out-Of-Process Handler Load Failure", responseString); + VerifyNoExtraTrailingBytes(responseString); + + await AssertLink(response); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + [RequiresNewHandler] + public async Task IncludesAdditionalErrorPageTextInProcessStartupFailure_CorrectString() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} EarlyReturn"); + deploymentParameters.EnvironmentVariables["ANCM_ADDITIONAL_ERROR_PAGE_LINK"] = "http://example"; + + var deploymentResult = await DeployAsync(deploymentParameters); + var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + var responseString = await response.Content.ReadAsStringAsync(); + Assert.Contains("HTTP Error 500.30 - ANCM In-Process Start Failure", responseString); + VerifyNoExtraTrailingBytes(responseString); + + await AssertLink(response); + } + + private static void VerifyNoExtraTrailingBytes(string responseString) + { + if (!DeployerSelector.IsBackwardsCompatiblityTest) + { + Assert.EndsWith("\r\n", responseString); + } + } + + private static async Task AssertLink(HttpResponseMessage response) + { + Assert.Contains(" http://example and ", await response.Content.ReadAsStringAsync()); + } + + private async Task DeployAppWithStartupFailure(IISDeploymentParameters deploymentParameters) + { + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", "doesnot")); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("arguments", "start")); + + deploymentParameters.EnvironmentVariables["ANCM_ADDITIONAL_ERROR_PAGE_LINK"] = "http://example"; + + var deploymentResult = await DeployAsync(deploymentParameters); + + return await deploymentResult.HttpClient.GetAsync("HelloWorld"); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EventLogTests.cs new file mode 100644 index 0000000000..1df7f3c077 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EventLogTests.cs @@ -0,0 +1,46 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// 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.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class EventLogTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public EventLogTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task CheckStartupEventLogMessage() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + + var deploymentResult = await DeployAsync(deploymentParameters); + await deploymentResult.AssertStarts(); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Application '.+' started the coreclr in-process successfully."); + } + + [ConditionalFact] + public async Task CheckShutdownEventLogMessage() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var deploymentResult = await DeployAsync(deploymentParameters); + await deploymentResult.AssertStarts(); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Application '.+' has shutdown."); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs new file mode 100644 index 0000000000..e31dc3dbaa --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs @@ -0,0 +1,29 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// 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.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class FeatureCollectionTest + { + private readonly IISTestSiteFixture _fixture; + + public FeatureCollectionTest(IISTestSiteFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [InlineData("FeatureCollectionSetRequestFeatures")] + [InlineData("FeatureCollectionSetResponseFeatures")] + [InlineData("FeatureCollectionSetConnectionFeatures")] + public async Task FeatureCollectionTest_SetHttpContextFeatures(string path) + { + Assert.Equal("Success", await _fixture.Client.GetStringAsync(path + "/path" + "?query")); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs new file mode 100644 index 0000000000..705af2b213 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs @@ -0,0 +1,31 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Reflection; +using Microsoft.Extensions.Logging.Testing; +using Xunit.Abstractions; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class FixtureLoggedTest: LoggedTest + { + private readonly IISTestSiteFixture _fixture; + + public FixtureLoggedTest(IISTestSiteFixture fixture) + { + _fixture = fixture; + } + + public override void Initialize(MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper) + { + base.Initialize(methodInfo, testMethodArguments, testOutputHelper); + _fixture.Attach(this); + } + + public override void Dispose() + { + _fixture.Detach(this); + base.Dispose(); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FrebTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FrebTests.cs new file mode 100644 index 0000000000..12e2f6ae53 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FrebTests.cs @@ -0,0 +1,181 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class FrebTests : LogFileTestBase + { + private readonly PublishedSitesFixture _fixture; + public FrebTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static IList FrebChecks() + { + var list = new List(); + list.Add(new FrebLogItem("ANCM_INPROC_EXECUTE_REQUEST_START")); + list.Add(new FrebLogItem("ANCM_INPROC_EXECUTE_REQUEST_COMPLETION", "1")); + list.Add(new FrebLogItem("ANCM_INPROC_ASYNC_COMPLETION_START")); + list.Add(new FrebLogItem("ANCM_INPROC_ASYNC_COMPLETION_COMPLETION", "0")); + list.Add(new FrebLogItem("ANCM_INPROC_MANAGED_REQUEST_COMPLETION")); + return list; + } + + [ConditionalFact] + [RequiresIIS(IISCapability.FailedRequestTracingModule)] + public async Task CheckCommonFrebEvents() + { + var result = await SetupFrebApp(); + + await result.HttpClient.GetAsync("HelloWorld"); + + StopServer(); + + AssertFrebLogs(result, FrebChecks()); + } + + [ConditionalFact] + [RequiresNewShim] + [RequiresIIS(IISCapability.FailedRequestTracingModule)] + public async Task FrebIncludesHResultFailures() + { + var parameters = _fixture.GetBaseDeploymentParameters(publish: true); + parameters.TransformArguments((args, _) => string.Empty); + var result = await SetupFrebApp(parameters); + + await result.HttpClient.GetAsync("HelloWorld"); + + StopServer(); + + AssertFrebLogs(result, new FrebLogItem("ANCM_HRESULT_FAILED"), new FrebLogItem("ANCM_EXCEPTION_CAUGHT")); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.FailedRequestTracingModule)] + public async Task CheckFailedRequestEvents() + { + var result = await SetupFrebApp(); + + await result.HttpClient.GetAsync("Throw"); + + StopServer(); + + AssertFrebLogs(result, new FrebLogItem("ANCM_INPROC_ASYNC_COMPLETION_COMPLETION", "2")); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.FailedRequestTracingModule)] + public async Task CheckFrebDisconnect() + { + var result = await SetupFrebApp(); + + using (var connection = new TestConnection(result.HttpClient.BaseAddress.Port)) + { + await connection.Send( + "GET /WaitForAbort HTTP/1.1", + "Host: localhost", + "Connection: close", + "", + ""); + await result.HttpClient.RetryRequestAsync("/WaitingRequestCount", async message => await message.Content.ReadAsStringAsync() == "1"); + } + + StopServer(); + + // The order of freb logs is based on when the requests are complete. + // This is non-deterministic here, so we need to check both freb files for a request that was disconnected. + AssertFrebLogs(result, new FrebLogItem("ANCM_INPROC_REQUEST_DISCONNECT"), new FrebLogItem("ANCM_INPROC_MANAGED_REQUEST_COMPLETION")); + } + + private async Task SetupFrebApp(IISDeploymentParameters parameters = null) + { + parameters = parameters ?? _fixture.GetBaseDeploymentParameters(publish: true); + parameters.EnableFreb("Verbose", _logFolderPath); + + Directory.CreateDirectory(_logFolderPath); + var result = await DeployAsync(parameters); + return result; + } + + private void AssertFrebLogs(IISDeploymentResult result, params FrebLogItem[] expectedFrebEvents) + { + AssertFrebLogs(result, (IEnumerable)expectedFrebEvents); + } + + private void AssertFrebLogs(IISDeploymentResult result, IEnumerable expectedFrebEvents) + { + var frebEvent = GetFrebLogItems(result); + foreach (var expectedEvent in expectedFrebEvents) + { + Assert.Contains(expectedEvent, frebEvent); + } + } + + private IEnumerable GetFrebLogItems(IISDeploymentResult result) + { + var folderPath = Helpers.GetFrebFolder(_logFolderPath, result); + var xmlFiles = Directory.GetFiles(folderPath).Where(f => f.EndsWith("xml")); + var frebEvents = new List(); + + foreach (var xmlFile in xmlFiles) + { + var xDocument = XDocument.Load(xmlFile).Root; + var nameSpace = (XNamespace)"http://schemas.microsoft.com/win/2004/08/events/event"; + var eventElements = xDocument.Descendants(nameSpace + "Event"); + foreach (var eventElement in eventElements) + { + var eventElementWithOpCode = eventElement.Descendants(nameSpace + "RenderingInfo").Single().Descendants(nameSpace + "Opcode").Single(); + var requestStatus = eventElement.Element(nameSpace + "EventData").Descendants().Where(el => el.Attribute("Name").Value == "requestStatus").SingleOrDefault(); + frebEvents.Add(new FrebLogItem(eventElementWithOpCode.Value, requestStatus?.Value)); + } + } + + return frebEvents; + } + + public class FrebLogItem + { + private string _opCode; + private string _requestStatus; + + public FrebLogItem(string opCode) + { + _opCode = opCode; + } + + public FrebLogItem(string opCode, string requestStatus) + { + _opCode = opCode; + _requestStatus = requestStatus; + } + + public override bool Equals(object obj) + { + var item = obj as FrebLogItem; + return item != null && + _opCode == item._opCode && + _requestStatus == item._requestStatus; + } + + public override int GetHashCode() + { + return HashCode.Combine(_opCode, _requestStatus); + } + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs new file mode 100644 index 0000000000..1b2ad70600 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs @@ -0,0 +1,30 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// 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.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class HelloWorldInProcessTests + { + private readonly IISTestSiteFixture _fixture; + + public HelloWorldInProcessTests(IISTestSiteFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task HelloWorld_InProcess() + { + Assert.Equal("Hello World", await _fixture.Client.GetStringAsync("/HelloWorld")); + + Assert.Equal("/Path??", await _fixture.Client.GetStringAsync("/HelloWorld/Path%3F%3F?query")); + + Assert.Equal("?query", await _fixture.Client.GetStringAsync("/HelloWorld/Query%3F%3F?query")); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs new file mode 100644 index 0000000000..061b828a6c --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs @@ -0,0 +1,33 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class HostingEnvironmentTests: FixtureLoggedTest + { + private readonly IISTestSiteFixture _fixture; + + public HostingEnvironmentTests(IISTestSiteFixture fixture): base(fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + [RequiresIIS(IISCapability.ShutdownToken)] + public async Task HostingEnvironmentIsCorrect() + { + Assert.Equal( + $"ContentRootPath {_fixture.DeploymentResult.ContentRoot}" + Environment.NewLine + + $"WebRootPath {_fixture.DeploymentResult.ContentRoot}\\wwwroot" + Environment.NewLine + + $"CurrentDirectory {Path.GetDirectoryName(_fixture.DeploymentResult.HostProcess.MainModule.FileName)}", + await _fixture.Client.GetStringAsync("/HostingEnvironment")); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs new file mode 100644 index 0000000000..95c05308bd --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs @@ -0,0 +1,84 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class InvalidReadWriteOperationTests + { + private readonly IISTestSiteFixture _fixture; + + public InvalidReadWriteOperationTests(IISTestSiteFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task TestReadOffsetWorks() + { + var result = await _fixture.Client.PostAsync($"/TestReadOffsetWorks", new StringContent("Hello World")); + Assert.Equal("Hello World", await result.Content.ReadAsStringAsync()); + } + + [ConditionalTheory] + [InlineData("/InvalidOffsetSmall")] + [InlineData("/InvalidOffsetLarge")] + [InlineData("/InvalidCountSmall")] + [InlineData("/InvalidCountLarge")] + [InlineData("/InvalidCountWithOffset")] + public async Task TestInvalidReadOperations(string operation) + { + var result = await _fixture.Client.GetStringAsync($"/TestInvalidReadOperations{operation}"); + Assert.Equal("Success", result); + } + + [ConditionalTheory] + [InlineData("/NullBuffer")] + [InlineData("/InvalidCountZeroRead")] + public async Task TestValidReadOperations(string operation) + { + var result = await _fixture.Client.GetStringAsync($"/TestValidReadOperations{operation}"); + Assert.Equal("Success", result); + } + + [ConditionalTheory] + [InlineData("/NullBufferPost")] + [InlineData("/InvalidCountZeroReadPost")] + public async Task TestValidReadOperationsPost(string operation) + { + var result = await _fixture.Client.PostAsync($"/TestValidReadOperations{operation}", new StringContent("hello")); + Assert.Equal("Success", await result.Content.ReadAsStringAsync()); + } + + [ConditionalTheory] + [InlineData("/InvalidOffsetSmall")] + [InlineData("/InvalidOffsetLarge")] + [InlineData("/InvalidCountSmall")] + [InlineData("/InvalidCountLarge")] + [InlineData("/InvalidCountWithOffset")] + public async Task TestInvalidWriteOperations(string operation) + { + var result = await _fixture.Client.GetStringAsync($"/TestInvalidWriteOperations{operation}"); + Assert.Equal("Success", result); + } + + [ConditionalFact] + public async Task TestValidWriteOperations() + { + var result = await _fixture.Client.GetStringAsync($"/TestValidWriteOperations/NullBuffer"); + Assert.Equal("Success", result); + } + + [ConditionalFact] + public async Task TestValidWriteOperationsPost() + { + var result = await _fixture.Client.PostAsync($"/TestValidWriteOperations/NullBufferPost", new StringContent("hello")); + Assert.Equal("Success", await result.Content.ReadAsStringAsync()); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs new file mode 100644 index 0000000000..40db2cfdb8 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs @@ -0,0 +1,36 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// 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.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class LargeResponseBodyTests + { + private readonly IISTestSiteFixture _fixture; + + public LargeResponseBodyTests(IISTestSiteFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [InlineData(65000)] + [InlineData(1000000)] + [InlineData(10000000)] + [InlineData(100000000)] + public async Task LargeResponseBodyTest_CheckAllResponseBodyBytesWritten(int query) + { + Assert.Equal(new string('a', query), await _fixture.Client.GetStringAsync($"/LargeResponseBody?length={query}")); + } + + [ConditionalFact] + public async Task LargeResponseBodyFromFile_CheckAllResponseBodyBytesWritten() + { + Assert.Equal(200000000, (await _fixture.Client.GetStringAsync($"/LargeResponseFile")).Length); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs new file mode 100644 index 0000000000..4d34c3154f --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs @@ -0,0 +1,83 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class LogPipeTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public LogPipeTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [InlineData("ConsoleErrorWrite")] + [InlineData("ConsoleWrite")] + public async Task CheckStdoutLoggingToPipe_DoesNotCrashProcess(string path) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var deploymentResult = await DeployAsync(deploymentParameters); + + await Helpers.AssertStarts(deploymentResult, path); + + StopServer(); + + if (deploymentParameters.ServerType == ServerType.IISExpress) + { + Assert.Contains(TestSink.Writes, context => context.Message.Contains("TEST MESSAGE")); + } + } + + [ConditionalTheory] + [InlineData("ConsoleErrorWriteStartServer")] + [InlineData("ConsoleWriteStartServer")] + public async Task CheckStdoutLoggingToPipeWithFirstWrite(string path) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + + var firstWriteString = "TEST MESSAGE"; + + deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); + + var deploymentResult = await DeployAsync(deploymentParameters); + + await Helpers.AssertStarts(deploymentResult); + + StopServer(); + + if (deploymentParameters.ServerType == ServerType.IISExpress) + { + // We can't read stdout logs from IIS as they aren't redirected. + Assert.Contains(TestSink.Writes, context => context.Message.Contains(firstWriteString)); + } + } + + [ConditionalFact] + public async Task CheckUnicodePipe() + { + var path = "CheckConsoleFunctions"; + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync(path); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", "(.*)彡⾔(.*)")); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs new file mode 100644 index 0000000000..fec5c227ec --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs @@ -0,0 +1,85 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Linq; +using System.Net; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Net.Http.Headers; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class ResponseHeaders + { + private readonly IISTestSiteFixture _fixture; + + public ResponseHeaders(IISTestSiteFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task AddResponseHeaders_HeaderValuesAreSetCorrectly() + { + var response = await _fixture.Client.GetAsync("ResponseHeaders"); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal("Request Complete", responseText); + + Assert.True(response.Headers.TryGetValues("UnknownHeader", out var headerValues)); + Assert.Equal("test123=foo", headerValues.First()); + + Assert.True(response.Content.Headers.TryGetValues(HeaderNames.ContentType, out headerValues)); + Assert.Equal("text/plain", headerValues.First()); + + Assert.True(response.Headers.TryGetValues("MultiHeader", out headerValues)); + Assert.Equal(2, headerValues.Count()); + Assert.Equal("1", headerValues.First()); + Assert.Equal("2", headerValues.Last()); + } + + [ConditionalFact] + public async Task ErrorCodeIsSetForExceptionDuringRequest() + { + var response = await _fixture.Client.GetAsync("Throw"); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.Equal("Internal Server Error", response.ReasonPhrase); + } + + [ConditionalTheory] + [InlineData(200, "custom", "custom", null)] + [InlineData(200, "custom", "custom", "Custom body")] + [InlineData(200, "custom", "custom", "")] + + + [InlineData(500, "", "Internal Server Error", null)] + [InlineData(500, "", "Internal Server Error", "Custom body")] + [InlineData(500, "", "Internal Server Error", "")] + + [InlineData(400, "custom", "custom", null)] + [InlineData(400, "", "Bad Request", "Custom body")] + [InlineData(400, "", "Bad Request", "")] + + [InlineData(999, "", "", null)] + [InlineData(999, "", "", "Custom body")] + [InlineData(999, "", "", "")] + public async Task CustomErrorCodeWorks(int code, string reason, string expectedReason, string body) + { + var response = await _fixture.Client.GetAsync($"SetCustomErorCode?code={code}&reason={reason}&writeBody={body != null}&body={body}"); + Assert.Equal((HttpStatusCode)code, response.StatusCode); + Assert.Equal(expectedReason, response.ReasonPhrase); + + // ReadAsStringAsync returns empty string for empty results + Assert.Equal(body ?? string.Empty, await response.Content.ReadAsStringAsync()); + } + + [ConditionalFact] + public async Task ServerHeaderIsOverriden() + { + var response = await _fixture.Client.GetAsync("OverrideServer"); + Assert.Equal("MyServer/7.8", response.Headers.Server.Single().Product.ToString()); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs new file mode 100644 index 0000000000..c39e155e77 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs @@ -0,0 +1,29 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// 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.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class ResponseInvalidOrderingTest + { + private readonly IISTestSiteFixture _fixture; + + public ResponseInvalidOrderingTest(IISTestSiteFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [InlineData("SetStatusCodeAfterWrite")] + [InlineData("SetHeaderAfterWrite")] + public async Task ResponseInvalidOrderingTests_ExpectFailure(string path) + { + Assert.Equal($"Started_{path}Threw_Finished", await _fixture.Client.GetStringAsync("/ResponseInvalidOrdering/" + path)); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs new file mode 100644 index 0000000000..d18c4c7f09 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs @@ -0,0 +1,59 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class ServerVariablesTest + { + private readonly IISTestSiteFixture _fixture; + + public ServerVariablesTest(IISTestSiteFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task ProvidesAccessToServerVariables() + { + var port = _fixture.Client.BaseAddress.Port; + Assert.Equal("SERVER_PORT: " + port, await _fixture.Client.GetStringAsync("/ServerVariable?q=SERVER_PORT")); + Assert.Equal("QUERY_STRING: q=QUERY_STRING", await _fixture.Client.GetStringAsync("/ServerVariable?q=QUERY_STRING")); + } + + [ConditionalFact] + public async Task ReturnsNullForUndefinedServerVariable() + { + Assert.Equal("THIS_VAR_IS_UNDEFINED: (null)", await _fixture.Client.GetStringAsync("/ServerVariable?q=THIS_VAR_IS_UNDEFINED")); + } + + [ConditionalFact] + public async Task CanSetAndReadVariable() + { + Assert.Equal("ROUNDTRIP: 1", await _fixture.Client.GetStringAsync("/ServerVariable?v=1&q=ROUNDTRIP")); + } + + [ConditionalFact] + public async Task BasePathIsNotPrefixedBySlashSlashQuestionMark() + { + Assert.DoesNotContain(@"\\?\", await _fixture.Client.GetStringAsync("/BasePath")); + } + + [ConditionalFact] + public async Task GetServerVariableDoesNotCrash() + { + await Helpers.StressLoad(_fixture.Client, "/GetServerVariableStress", response => { + var text = response.Content.ReadAsStringAsync().Result; + Assert.StartsWith("Response Begin", text); + Assert.EndsWith("Response End", text); + }); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs new file mode 100644 index 0000000000..cadfed9781 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -0,0 +1,100 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class StartupExceptionTests : LogFileTestBase + { + private readonly PublishedSitesFixture _fixture; + + public StartupExceptionTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [InlineData("CheckLargeStdErrWrites")] + [InlineData("CheckLargeStdOutWrites")] + [InlineData("CheckOversizedStdErrWrites")] + [InlineData("CheckOversizedStdOutWrites")] + public async Task CheckStdoutWithLargeWrites_TestSink(string mode) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} {mode}"); + var deploymentResult = await DeployAsync(deploymentParameters); + + await AssertFailsToStart(deploymentResult); + var expectedString = new string('a', 30000); + Assert.Contains(TestSink.Writes, context => context.Message.Contains(expectedString)); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", expectedString)); + } + + [ConditionalTheory] + [InlineData("CheckLargeStdErrWrites")] + [InlineData("CheckLargeStdOutWrites")] + [InlineData("CheckOversizedStdErrWrites")] + [InlineData("CheckOversizedStdOutWrites")] + public async Task CheckStdoutWithLargeWrites_LogFile(string mode) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} {mode}"); + deploymentParameters.EnableLogging(_logFolderPath); + + var deploymentResult = await DeployAsync(deploymentParameters); + + await AssertFailsToStart(deploymentResult); + + var contents = GetLogFileContent(deploymentResult); + var expectedString = new string('a', 30000); + + Assert.Contains(expectedString, contents); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", expectedString)); + } + + [ConditionalFact] + public async Task CheckValidConsoleFunctions() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} CheckConsoleFunctions"); + + var deploymentResult = await DeployAsync(deploymentParameters); + + await AssertFailsToStart(deploymentResult); + + Assert.Contains(TestSink.Writes, context => context.Message.Contains("Is Console redirection: True")); + } + + private async Task AssertFailsToStart(IISDeploymentResult deploymentResult) + { + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + } + + [ConditionalFact] + public async Task Gets500_30_ErrorPage() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} EarlyReturn"); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + Assert.False(response.IsSuccessStatusCode); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Contains("500.30 - ANCM In-Process Start Failure", responseText); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs new file mode 100644 index 0000000000..3bcc134cb2 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs @@ -0,0 +1,479 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Newtonsoft.Json; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class StartupTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public StartupTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + private readonly string _dotnetLocation = DotNetCommands.GetDotNetExecutable(RuntimeArchitecture.x64); + + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public async Task ExpandEnvironmentVariableInWebConfig() + { + // Point to dotnet installed in user profile. + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + deploymentParameters.EnvironmentVariables["DotnetPath"] = _dotnetLocation; + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", "%DotnetPath%")); + await StartAsync(deploymentParameters); + } + + [ConditionalTheory] + [InlineData("bogus", "", @"Executable was not found at '.*?\\bogus.exe")] + [InlineData("c:\\random files\\dotnet.exe", "something.dll", @"Could not find dotnet.exe at '.*?\\dotnet.exe'")] + [InlineData(".\\dotnet.exe", "something.dll", @"Could not find dotnet.exe at '.*?\\.\\dotnet.exe'")] + [InlineData("dotnet.exe", "", @"Application arguments are empty.")] + [InlineData("dotnet.zip", "", @"Process path 'dotnet.zip' doesn't have '.exe' extension.")] + public async Task InvalidProcessPath_ExpectServerError(string path, string arguments, string subError) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", path)); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("arguments", arguments)); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, $@"Application '{Regex.Escape(deploymentResult.ContentRoot)}\\' wasn't able to start. {subError}"); + + Assert.Contains("HTTP Error 500.0 - ANCM In-Process Handler Load Failure", await response.Content.ReadAsStringAsync()); + } + + [ConditionalFact] + public async Task StartsWithDotnetLocationWithoutExe() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + + var dotnetLocationWithoutExtension = _dotnetLocation.Substring(0, _dotnetLocation.LastIndexOf(".")); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", dotnetLocationWithoutExtension)); + + await StartAsync(deploymentParameters); + } + + [ConditionalFact] + public async Task StartsWithDotnetLocationUppercase() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + + var dotnetLocationWithoutExtension = _dotnetLocation.Substring(0, _dotnetLocation.LastIndexOf(".")).ToUpperInvariant(); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", dotnetLocationWithoutExtension)); + + await StartAsync(deploymentParameters); + } + + [ConditionalTheory] + [InlineData("dotnet")] + [InlineData("dotnet.EXE")] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public async Task StartsWithDotnetOnThePath(string path) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + + deploymentParameters.EnvironmentVariables["PATH"] = Path.GetDirectoryName(_dotnetLocation); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", path)); + + var deploymentResult = await DeployAsync(deploymentParameters); + await deploymentResult.AssertStarts(); + + StopServer(); + // Verify that in this scenario where.exe was invoked only once by shim and request handler uses cached value + Assert.Equal(1, TestSink.Writes.Count(w => w.Message.Contains("Invoking where.exe to find dotnet.exe"))); + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22) + .WithAllApplicationTypes() + .WithAncmV2InProcess(); + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task HelloWorld(TestVariant variant) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + await StartAsync(deploymentParameters); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + public async Task StartsWithPortableAndBootstraperExe() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + // We need the right dotnet on the path in IIS + deploymentParameters.EnvironmentVariables["PATH"] = Path.GetDirectoryName(DotNetCommands.GetDotNetExecutable(deploymentParameters.RuntimeArchitecture)); + + // rest publisher as it doesn't support additional parameters + deploymentParameters.ApplicationPublisher = null; + // ReferenceTestTasks is workaround for https://github.com/dotnet/sdk/issues/2482 + deploymentParameters.AdditionalPublishParameters = "-p:RuntimeIdentifier=win7-x64 -p:UseAppHost=true -p:SelfContained=false -p:ReferenceTestTasks=false"; + var deploymentResult = await DeployAsync(deploymentParameters); + + Assert.True(File.Exists(Path.Combine(deploymentResult.ContentRoot, "InProcessWebSite.exe"))); + Assert.False(File.Exists(Path.Combine(deploymentResult.ContentRoot, "hostfxr.dll"))); + Assert.Contains("InProcessWebSite.exe", Helpers.ReadAllTextFromFile(Path.Combine(deploymentResult.ContentRoot, "web.config"), Logger)); + + await deploymentResult.AssertStarts(); + } + + [ConditionalFact] + public async Task DetectsOverriddenServer() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} OverriddenServer"); + + var deploymentResult = await DeployAsync(deploymentParameters); + var response = await deploymentResult.HttpClient.GetAsync("/"); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.InProcessFailedToStart(deploymentResult, "CLR worker thread exited prematurely"), + EventLogHelpers.InProcessThreadException(deploymentResult, ".*?Application is running inside IIS process but is not configured to use IIS server")); + } + + [ConditionalFact] + public async Task LogsStartupExceptionExitError() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} Throw"); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/"); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.InProcessFailedToStart(deploymentResult, "CLR worker thread exited prematurely"), + EventLogHelpers.InProcessThreadException(deploymentResult, ", exception code = '0xe0434352'")); + } + + [ConditionalFact] + public async Task LogsUnexpectedThreadExitError() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} EarlyReturn"); + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.InProcessFailedToStart(deploymentResult, "CLR worker thread exited prematurely"), + EventLogHelpers.InProcessThreadExit(deploymentResult, "12")); + } + + [ConditionalFact] + public async Task RemoveHostfxrFromApp_InProcessHostfxrInvalid() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.ApplicationType = ApplicationType.Standalone; + var deploymentResult = await DeployAsync(deploymentParameters); + + File.Copy( + Path.Combine(deploymentResult.ContentRoot, "aspnetcorev2_inprocess.dll"), + Path.Combine(deploymentResult.ContentRoot, "hostfxr.dll"), + true); + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessHostfxrInvalid(deploymentResult), Logger); + } + + [ConditionalFact] + public async Task TargedDifferenceSharedFramework_FailedToFindNativeDependencies() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + var deploymentResult = await DeployAsync(deploymentParameters); + + Helpers.ModifyFrameworkVersionInRuntimeConfig(deploymentResult); + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessFailedToFindNativeDependencies(deploymentResult), Logger); + } + + [ConditionalFact] + public async Task RemoveInProcessReference_FailedToFindRequestHandler() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.ApplicationType = ApplicationType.Standalone; + var deploymentResult = await DeployAsync(deploymentParameters); + + File.Delete(Path.Combine(deploymentResult.ContentRoot, "aspnetcorev2_inprocess.dll")); + + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + + if (DeployerSelector.IsForwardsCompatibilityTest) + { + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessFailedToFindNativeDependencies(deploymentResult), Logger); + } + else + { + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessFailedToFindRequestHandler(deploymentResult), Logger); + } + } + + [ConditionalFact] + public async Task StartupTimeoutIsApplied() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} Hang"); + deploymentParameters.WebConfigActionList.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection("startupTimeLimit", "1")); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/"); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.InProcessFailedToStart(deploymentResult, "Managed server didn't initialize after 1000 ms.") + ); + } + + [ConditionalFact] + public async Task ShutdownTimeoutIsApplied() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} HangOnStop"); + deploymentParameters.WebConfigActionList.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection("shutdownTimeLimit", "1")); + + var deploymentResult = await DeployAsync(deploymentParameters); + + Assert.Equal("Hello World", await deploymentResult.HttpClient.GetStringAsync("/HelloWorld")); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.InProcessStarted(deploymentResult), + EventLogHelpers.InProcessFailedToStop(deploymentResult, "")); + } + + [ConditionalFact] + public async Task CheckInvalidHostingModelParameter() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("hostingModel", "bogus")); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.ConfigurationLoadError(deploymentResult, "Unknown hosting model 'bogus'. Please specify either hostingModel=\"inprocess\" or hostingModel=\"outofprocess\" in the web.config file.") + ); + } + + private static Dictionary)> InvalidConfigTransformations = InitInvalidConfigTransformations(); + public static IEnumerable InvalidConfigTransformationsScenarios => InvalidConfigTransformations.ToTheoryData(); + + [ConditionalTheory] + [MemberData(nameof(InvalidConfigTransformationsScenarios))] + public async Task ReportsWebConfigAuthoringErrors(string scenario) + { + var (expectedError, action) = InvalidConfigTransformations[scenario]; + var iisDeploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + iisDeploymentParameters.WebConfigActionList.Add((element, _) => action(element)); + var deploymentResult = await DeployAsync(iisDeploymentParameters); + var result = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + Assert.Equal(HttpStatusCode.InternalServerError, result.StatusCode); + + // Config load errors might not allow us to initialize log file + deploymentResult.AllowNoLogs(); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvents(deploymentResult, + EventLogHelpers.ConfigurationLoadError(deploymentResult, expectedError) + ); + } + + public static Dictionary)> InitInvalidConfigTransformations() + { + var dictionary = new Dictionary)>(); + dictionary.Add("Empty process path", + ( + "Attribute 'processPath' is required.", + element => element.Descendants("aspNetCore").Single().SetAttributeValue("processPath", "") + )); + dictionary.Add("Unknown hostingModel", + ( + "Unknown hosting model 'asdf'.", + element => element.Descendants("aspNetCore").Single().SetAttributeValue("hostingModel", "asdf") + )); + dictionary.Add("environmentVariables with add", + ( + "Unable to get required configuration section 'system.webServer/aspNetCore'. Possible reason is web.config authoring error.", + element => element.Descendants("aspNetCore").Single().GetOrAdd("environmentVariables").GetOrAdd("add") + )); + return dictionary; + } + + private static Dictionary> PortableConfigTransformations = InitPortableWebConfigTransformations(); + public static IEnumerable PortableConfigTransformationsScenarios => PortableConfigTransformations.ToTheoryData(); + + [ConditionalTheory] + [MemberData(nameof(PortableConfigTransformationsScenarios))] + public async Task StartsWithWebConfigVariationsPortable(string scenario) + { + var action = PortableConfigTransformations[scenario]; + var iisDeploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + var expectedArguments = action(iisDeploymentParameters); + var result = await DeployAsync(iisDeploymentParameters); + Assert.Equal(expectedArguments, await result.HttpClient.GetStringAsync("/CommandLineArgs")); + } + + public static Dictionary> InitPortableWebConfigTransformations() + { + var dictionary = new Dictionary>(); + var pathWithSpace = "\u03c0 \u2260 3\u00b714"; + + dictionary.Add("App in bin subdirectory full path to dll using exec and quotes", + parameters => { + MoveApplication(parameters, "bin"); + parameters.TransformArguments((arguments, root) => "exec " + Path.Combine(root, "bin", arguments)); + return ""; + }); + + dictionary.Add("App in subdirectory with space", + parameters => { + MoveApplication(parameters, pathWithSpace); + parameters.TransformArguments((arguments, root) => Path.Combine(pathWithSpace, arguments)); + return ""; + }); + + dictionary.Add("App in subdirectory with space and full path to dll", + parameters => { + MoveApplication(parameters, pathWithSpace); + parameters.TransformArguments((arguments, root) => Path.Combine(root, pathWithSpace, arguments)); + return ""; + }); + + dictionary.Add("App in bin subdirectory with space full path to dll using exec and quotes", + parameters => { + MoveApplication(parameters, pathWithSpace); + parameters.TransformArguments((arguments, root) => "exec \"" + Path.Combine(root, pathWithSpace, arguments) + "\" extra arguments"); + return "extra|arguments"; + }); + + dictionary.Add("App in bin subdirectory and quoted argument", + parameters => { + MoveApplication(parameters, "bin"); + parameters.TransformArguments((arguments, root) => Path.Combine("bin", arguments) + " \"extra argument\""); + return "extra argument"; + }); + + dictionary.Add("App in bin subdirectory full path to dll", + parameters => { + MoveApplication(parameters, "bin"); + parameters.TransformArguments((arguments, root) => Path.Combine(root, "bin", arguments) + " extra arguments"); + return "extra|arguments"; + }); + return dictionary; + } + + + private static Dictionary> StandaloneConfigTransformations = InitStandaloneConfigTransformations(); + public static IEnumerable StandaloneConfigTransformationsScenarios => StandaloneConfigTransformations.ToTheoryData(); + + [ConditionalTheory] + [MemberData(nameof(StandaloneConfigTransformationsScenarios))] + public async Task StartsWithWebConfigVariationsStandalone(string scenario) + { + var action = StandaloneConfigTransformations[scenario]; + var iisDeploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + iisDeploymentParameters.ApplicationType = ApplicationType.Standalone; + var expectedArguments = action(iisDeploymentParameters); + var result = await DeployAsync(iisDeploymentParameters); + Assert.Equal(expectedArguments, await result.HttpClient.GetStringAsync("/CommandLineArgs")); + } + + public static Dictionary> InitStandaloneConfigTransformations() + { + var dictionary = new Dictionary>(); + var pathWithSpace = "\u03c0 \u2260 3\u00b714"; + + dictionary.Add("App in subdirectory", + parameters => { + MoveApplication(parameters, pathWithSpace); + parameters.TransformPath((path, root) => Path.Combine(pathWithSpace, path)); + parameters.TransformArguments((arguments, root) => "\"additional argument\""); + return "additional argument"; + }); + + dictionary.Add("App in bin subdirectory full path", + parameters => { + MoveApplication(parameters, pathWithSpace); + parameters.TransformPath((path, root) => Path.Combine(root, pathWithSpace, path)); + parameters.TransformArguments((arguments, root) => "additional arguments"); + return "additional|arguments"; + }); + + return dictionary; + } + + private static void MoveApplication( + IISDeploymentParameters parameters, + string subdirectory) + { + parameters.WebConfigActionList.Add((config, contentRoot) => + { + var source = new DirectoryInfo(contentRoot); + var subDirectoryPath = source.CreateSubdirectory(subdirectory); + + // Copy everything into a subfolder + Helpers.CopyFiles(source, subDirectoryPath, null); + // Cleanup files + foreach (var fileSystemInfo in source.GetFiles()) + { + fileSystemInfo.Delete(); + } + }); + } + + private async Task AssertSiteFailsToStartWithInProcessStaticContent(IISDeploymentResult deploymentResult) + { + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.Contains("HTTP Error 500.0 - ANCM In-Process Handler Load Failure", await response.Content.ReadAsStringAsync()); + StopServer(); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs new file mode 100644 index 0000000000..03aa0e16e6 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs @@ -0,0 +1,197 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class SynchronousReadAndWriteTests: FixtureLoggedTest + { + private readonly IISTestSiteFixture _fixture; + + public SynchronousReadAndWriteTests(IISTestSiteFixture fixture): base(fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task ReadAndWriteSynchronously() + { + for (int i = 0; i < 100; i++) + { + var content = new StringContent(new string('a', 100000)); + var response = await _fixture.Client.PostAsync("ReadAndWriteSynchronously", content); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(expected: 110000, actual: responseText.Length); + } + } + + [ConditionalFact] + public async Task ReadAndWriteEcho() + { + var body = new string('a', 100000); + var content = new StringContent(body); + var response = await _fixture.Client.PostAsync("ReadAndWriteEcho", content); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(body, responseText); + } + + [ConditionalFact] + public async Task ReadAndWriteCopyToAsync() + { + var body = new string('a', 100000); + var content = new StringContent(body); + var response = await _fixture.Client.PostAsync("ReadAndWriteCopyToAsync", content); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(body, responseText); + } + + [ConditionalFact] + public async Task ReadAndWriteEchoTwice() + { + var requestBody = new string('a', 10000); + var content = new StringContent(requestBody); + var response = await _fixture.Client.PostAsync("ReadAndWriteEchoTwice", content); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(requestBody.Length * 2, responseText.Length); + } + + [ConditionalFact] + public async Task ReadSetHeaderWrite() + { + var body = "Body text"; + var content = new StringContent(body); + var response = await _fixture.Client.PostAsync("SetHeaderFromBody", content); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(body, response.Headers.GetValues("BodyAsString").Single()); + Assert.Equal(body, responseText); + } + + [ConditionalFact] + public async Task ReadAndWriteSlowConnection() + { + using (var connection = _fixture.CreateTestConnection()) + { + var testString = "hello world"; + var request = $"POST /ReadAndWriteSlowConnection HTTP/1.0\r\n" + + $"Content-Length: {testString.Length}\r\n" + + "Host: " + "localhost\r\n" + + "\r\n" + testString; + + foreach (var c in request) + { + await connection.Send(c.ToString()); + await Task.Delay(10); + } + + await connection.Receive( + "HTTP/1.1 200 OK", + ""); + await connection.ReceiveHeaders(); + + for (int i = 0; i < 100; i++) + { + foreach (var c in testString) + { + await connection.Receive(c.ToString()); + } + await Task.Delay(10); + } + await connection.WaitForConnectionClose(); + } + } + + [ConditionalFact] + public async Task ReadAndWriteInterleaved() + { + using (var connection = _fixture.CreateTestConnection()) + { + var requestLength = 0; + var messages = new List(); + for (var i = 1; i < 100; i++) + { + var message = i + Environment.NewLine; + requestLength += message.Length; + messages.Add(message); + } + + await connection.Send( + "POST /ReadAndWriteEchoLines HTTP/1.0", + $"Content-Length: {requestLength}", + "Host: localhost", + "", + ""); + + await connection.Receive( + "HTTP/1.1 200 OK", + ""); + await connection.ReceiveHeaders(); + + foreach (var message in messages) + { + await connection.Send(message); + await connection.Receive(message); + } + + await connection.Send("\r\n"); + await connection.WaitForConnectionClose(); + } + } + + [ConditionalFact] + public async Task ConsumePartialBody() + { + using (var connection = _fixture.CreateTestConnection()) + { + var message = "Hello"; + await connection.Send( + "POST /ReadPartialBody HTTP/1.1", + $"Content-Length: {100}", + "Host: localhost", + "Connection: close", + "", + ""); + + await connection.Send(message); + + await connection.Receive( + "HTTP/1.1 200 OK", + ""); + + // This test can return both content length or chunked response + // depending on if appfunc managed to complete before write was + // issued + var headers = await connection.ReceiveHeaders(); + if (headers.Contains("Content-Length: 5")) + { + await connection.Receive("Hello"); + } + else + { + await connection.Receive( + "5", + message, + ""); + await connection.Receive( + "0", + "", + ""); + } + + await connection.WaitForConnectionClose(); + } + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs b/src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs new file mode 100644 index 0000000000..1e15cde5c2 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs @@ -0,0 +1,242 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class LoggingTests : LogFileTestBase + { + private readonly PublishedSitesFixture _fixture; + + public LoggingTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22) + .WithAllApplicationTypes() + .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) + .WithAllHostingModels(); + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task CheckStdoutLoggingToFile(TestVariant variant) + { + await CheckStdoutToFile(variant, "ConsoleWrite"); + } + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task CheckStdoutErrLoggingToFile(TestVariant variant) + { + await CheckStdoutToFile(variant, "ConsoleErrorWrite"); + } + + private async Task CheckStdoutToFile(TestVariant variant, string path) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + deploymentParameters.EnableLogging(_logFolderPath); + + var deploymentResult = await DeployAsync(deploymentParameters); + + await Helpers.AssertStarts(deploymentResult, path); + + StopServer(); + + var contents = Helpers.ReadAllTextFromFile(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath), Logger); + + Assert.Contains("TEST MESSAGE", contents); + } + + // Move to separate file + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task InvalidFilePathForLogs_ServerStillRuns(TestVariant variant) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + + deploymentParameters.WebConfigActionList.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogEnabled", "true")); + deploymentParameters.WebConfigActionList.Add( + WebConfigHelpers.AddOrModifyAspNetCoreSection("stdoutLogFile", Path.Combine("Q:", "std"))); + + var deploymentResult = await DeployAsync(deploymentParameters); + + await Helpers.AssertStarts(deploymentResult, "HelloWorld"); + + StopServer(); + if (variant.HostingModel == HostingModel.InProcess) + { + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Could not start stdout redirection in (.*)aspnetcorev2.dll. Exception message: HRESULT 0x80070003"); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Could not stop stdout redirection in (.*)aspnetcorev2.dll. Exception message: HRESULT 0x80070002"); + } + } + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task StartupMessagesAreLoggedIntoDebugLogFile(TestVariant variant) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + deploymentParameters.HandlerSettings["debugLevel"] = "file"; + deploymentParameters.HandlerSettings["debugFile"] = "debug.txt"; + + var deploymentResult = await DeployAsync(deploymentParameters); + + await deploymentResult.HttpClient.GetAsync("/"); + + AssertLogs(Path.Combine(deploymentResult.ContentRoot, "debug.txt")); + } + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task StartupMessagesAreLoggedIntoDefaultDebugLogFile(TestVariant variant) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + deploymentParameters.HandlerSettings["debugLevel"] = "file"; + + var deploymentResult = await DeployAsync(deploymentParameters); + + await deploymentResult.HttpClient.GetAsync("/"); + + AssertLogs(Path.Combine(deploymentResult.ContentRoot, "aspnetcore-debug.log")); + } + + [ConditionalTheory] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + [MemberData(nameof(TestVariants))] + public async Task StartupMessagesAreLoggedIntoDefaultDebugLogFileWhenEnabledWithEnvVar(TestVariant variant) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG"] = "file"; + // Add empty debugFile handler setting to prevent IIS deployer from overriding debug settings + deploymentParameters.HandlerSettings["debugFile"] = ""; + var deploymentResult = await DeployAsync(deploymentParameters); + + await deploymentResult.HttpClient.GetAsync("/"); + + AssertLogs(Path.Combine(deploymentResult.ContentRoot, "aspnetcore-debug.log")); + } + + [ConditionalTheory] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + [MemberData(nameof(TestVariants))] + public async Task StartupMessagesLogFileSwitchedWhenLogFilePresentInWebConfig(TestVariant variant) + { + var firstTempFile = Path.GetTempFileName(); + var secondTempFile = Path.GetTempFileName(); + + try + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_DEBUG_FILE"] = firstTempFile; + deploymentParameters.AddDebugLogToWebConfig(secondTempFile); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/"); + + StopServer(); + var logContents = Helpers.ReadAllTextFromFile(firstTempFile, Logger); + + Assert.Contains("Switching debug log files to", logContents); + + AssertLogs(secondTempFile); + } + finally + { + File.Delete(firstTempFile); + File.Delete(secondTempFile); + } + } + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + + public async Task DebugLogsAreWrittenToEventLog(TestVariant variant) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + deploymentParameters.HandlerSettings["debugLevel"] = "file,eventlog"; + var deploymentResult = await StartAsync(deploymentParameters); + StopServer(); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, @"\[aspnetcorev2.dll\] Initializing logs for .*?Description: IIS ASP.NET Core Module V2"); + } + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task CheckUTF8File(TestVariant variant) + { + var path = "CheckConsoleFunctions"; + + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, variant.HostingModel, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); // For standalone this will need to remove space + + var logFolderPath = _logFolderPath + "\\彡⾔"; + deploymentParameters.EnableLogging(logFolderPath); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync(path); + + Assert.False(response.IsSuccessStatusCode); + + StopServer(); + + var contents = Helpers.ReadAllTextFromFile(Helpers.GetExpectedLogName(deploymentResult, logFolderPath), Logger); + Assert.Contains("彡⾔", contents); + + if (variant.HostingModel == HostingModel.InProcess) + { + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", "(.*)彡⾔(.*)")); + } + else + { + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.OutOfProcessFailedToStart(deploymentResult)); + } + } + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task OnlyOneFileCreatedWithProcessStartTime(TestVariant variant) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + + deploymentParameters.EnableLogging(_logFolderPath); + + var deploymentResult = await DeployAsync(deploymentParameters); + await Helpers.AssertStarts(deploymentResult, "ConsoleWrite"); + + StopServer(); + + Assert.Single(Directory.GetFiles(_logFolderPath), Helpers.GetExpectedLogName(deploymentResult, _logFolderPath)); + } + + private static string ReadLogs(string logPath) + { + using (var stream = File.Open(logPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) + using (var streamReader = new StreamReader(stream)) + { + return streamReader.ReadToEnd(); + } + } + + private static void AssertLogs(string logPath) + { + var logContents = ReadLogs(logPath); + Assert.Contains("[aspnetcorev2.dll]", logContents); + Assert.True(logContents.Contains("[aspnetcorev2_inprocess.dll]") || logContents.Contains("[aspnetcorev2_outofprocess.dll]")); + Assert.Contains("Description: IIS ASP.NET Core Module V2. Commit:", logContents); + Assert.Contains("Description: IIS ASP.NET Core Module V2 Request Handler. Commit:", logContents); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/MultiApplicationTests.cs b/src/IISIntegration/test/Common.FunctionalTests/MultiApplicationTests.cs new file mode 100644 index 0000000000..3723369c89 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/MultiApplicationTests.cs @@ -0,0 +1,144 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class MultiApplicationTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + private PublishedApplication _publishedApplication; + private PublishedApplication _rootApplication; + + public MultiApplicationTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task RunsTwoOutOfProcessApps() + { + var parameters = _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); + parameters.ServerConfigActionList.Add(DuplicateApplication); + var result = await DeployAsync(parameters); + var id1 = await result.HttpClient.GetStringAsync("/app1/ProcessId"); + var id2 = await result.HttpClient.GetStringAsync("/app2/ProcessId"); + Assert.NotEqual(id2, id1); + } + + [ConditionalFact] + public async Task FailsAndLogsWhenRunningTwoInProcessApps() + { + var parameters = _fixture.GetBaseDeploymentParameters(HostingModel.InProcess, publish: true); + parameters.ServerConfigActionList.Add(DuplicateApplication); + + var result = await DeployAsync(parameters); + var result1 = await result.HttpClient.GetAsync("/app1/HelloWorld"); + var result2 = await result.HttpClient.GetAsync("/app2/HelloWorld"); + Assert.Equal(200, (int)result1.StatusCode); + Assert.Equal(500, (int)result2.StatusCode); + StopServer(); + EventLogHelpers.VerifyEventLogEvent(result, "Only one inprocess application is allowed per IIS application pool"); + } + + [ConditionalTheory] + [InlineData(HostingModel.OutOfProcess)] + [InlineData(HostingModel.InProcess)] + public async Task FailsAndLogsEventLogForMixedHostingModel(HostingModel firstApp) + { + var parameters = _fixture.GetBaseDeploymentParameters(firstApp, publish: true); + parameters.ServerConfigActionList.Add(DuplicateApplication); + var result = await DeployAsync(parameters); + + // Modify hosting model of other app to be the opposite + var otherApp = firstApp == HostingModel.InProcess ? HostingModel.OutOfProcess : HostingModel.InProcess; + SetHostingModel(_publishedApplication.Path, otherApp); + + var result1 = await result.HttpClient.GetAsync("/app1/HelloWorld"); + var result2 = await result.HttpClient.GetAsync("/app2/HelloWorld"); + Assert.Equal(200, (int)result1.StatusCode); + Assert.Equal(500, (int)result2.StatusCode); + StopServer(); + EventLogHelpers.VerifyEventLogEvent(result, "Mixed hosting model is not supported."); + } + + private void SetHostingModel(string directory, HostingModel model) + { + var webConfigLocation = GetWebConfigLocation(directory); + XDocument webConfig = XDocument.Load(webConfigLocation); + webConfig.Root + .Descendants("system.webServer") + .Single() + .GetOrAdd("aspNetCore") + .SetAttributeValue("hostingModel", model.ToString()); + webConfig.Save(webConfigLocation); + } + + private void DuplicateApplication(XElement config, string contentRoot) + { + var siteElement = config + .RequiredElement("system.applicationHost") + .RequiredElement("sites") + .RequiredElement("site"); + + var application = siteElement + .RequiredElement("application"); + + application.SetAttributeValue("path", "/app1"); + + var source = new DirectoryInfo(contentRoot); + + var destination = new DirectoryInfo(contentRoot + "anotherApp"); + destination.Create(); + Helpers.CopyFiles(source, destination, Logger); + + _publishedApplication = new PublishedApplication(destination.FullName, Logger); + + var newApplication = new XElement(application); + newApplication.SetAttributeValue("path", "/app2"); + newApplication.RequiredElement("virtualDirectory") + .SetAttributeValue("physicalPath", destination.FullName); + + siteElement.Add(newApplication); + + // IIS Express requires root application to exist + var rootApplicationDirectory = new DirectoryInfo(contentRoot + "rootApp"); + rootApplicationDirectory.Create(); + + _rootApplication = new PublishedApplication(rootApplicationDirectory.FullName, Logger); + File.WriteAllText(GetWebConfigLocation(rootApplicationDirectory.FullName), ""); + + var rootApplication = new XElement(application); + rootApplication.SetAttributeValue("path", "/"); + rootApplication.RequiredElement("virtualDirectory") + .SetAttributeValue("physicalPath", rootApplicationDirectory.FullName); + + siteElement.Add(rootApplication); + } + + private static string GetWebConfigLocation(string siteRoot) + { + return Path.Combine(siteRoot, "web.config"); + } + + public override void Dispose() + { + base.Dispose(); + _rootApplication.Dispose(); + _publishedApplication.Dispose(); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs b/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs new file mode 100644 index 0000000000..3b86662717 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs @@ -0,0 +1,125 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Sockets; +using System.Threading.Tasks; +using Xunit; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class AspNetCorePortTests : IISFunctionalTestBase + { + // Port range allowed by ANCM config + private const int _minPort = 1025; + private const int _maxPort = 48000; + + private static readonly Random _random = new Random(); + + private readonly PublishedSitesFixture _fixture; + + public AspNetCorePortTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22) + .WithApplicationTypes(ApplicationType.Portable) + .WithAllAncmVersions(); + + public static IEnumerable InvalidTestVariants + => from v in TestVariants.Select(v => v.Single()) + from s in new string[] { (_minPort - 1).ToString(), (_maxPort + 1).ToString(), "noninteger" } + select new object[] { v, s }; + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task EnvVarInWebConfig_Valid(TestVariant variant) + { + // Must publish to set env vars in web.config + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + var port = GetUnusedRandomPort(); + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_PORT"] = port.ToString(); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var responseText = await deploymentResult.HttpClient.GetStringAsync("/ServerAddresses"); + + Assert.Equal(port, new Uri(responseText).Port); + } + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task EnvVarInWebConfig_Empty(TestVariant variant) + { + // Must publish to set env vars in web.config + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_PORT"] = string.Empty; + + var deploymentResult = await DeployAsync(deploymentParameters); + + var responseText = await deploymentResult.HttpClient.GetStringAsync("/ServerAddresses"); + + // If env var is empty, ANCM should assign a random port (same as no env var) + Assert.InRange(new Uri(responseText).Port, _minPort, _maxPort); + } + + [ConditionalTheory] + [MemberData(nameof(InvalidTestVariants))] + public async Task EnvVarInWebConfig_Invalid(TestVariant variant, string port) + { + // Must publish to set env vars in web.config + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant, publish: true); + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_PORT"] = port; + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/ServerAddresses"); + + Assert.Equal(HttpStatusCode.BadGateway, response.StatusCode); + } + + private static int GetUnusedRandomPort() + { + // Large number of retries to prevent test failures due to port collisions, but not infinite + // to prevent infinite loop in case Bind() fails repeatedly for some other reason. + const int retries = 100; + + List exceptions = null; + + for (var i = 0; i < retries; i++) + { + var port = _random.Next(_minPort, _maxPort); + + using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) + { + try + { + socket.Bind(new IPEndPoint(IPAddress.Loopback, port)); + return port; + } + catch (Exception e) + { + // Bind failed, most likely because port is in use. Save exception and retry. + if (exceptions == null) + { + exceptions = new List(retries); + } + exceptions.Add(e); + } + } + } + + throw new AggregateException($"Unable to find unused random port after {retries} retries.", exceptions); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs new file mode 100644 index 0000000000..f9e6836b6f --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -0,0 +1,252 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Net; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class GlobalVersionTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public GlobalVersionTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + private const string _handlerVersion20 = "2.0.0"; + private const string _helloWorldRequest = "HelloWorld"; + private const string _helloWorldResponse = "Hello World"; + + [ConditionalFact] + public async Task GlobalVersion_DefaultWorks() + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + + deploymentParameters.HandlerSettings["handlerVersion"] = _handlerVersion20; + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync(_helloWorldRequest); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(_helloWorldResponse, responseText); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + [RequiresNewShim] + public async Task GlobalVersion_EnvironmentVariableWorks() + { + var temporaryFile = Path.GetTempFileName(); + try + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + CopyShimToOutput(deploymentParameters); + deploymentParameters.PublishApplicationBeforeDeployment = true; + deploymentParameters.EnvironmentVariables["ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER"] = temporaryFile; + + var deploymentResult = await DeployAsync(deploymentParameters); + var requestHandlerPath = Path.Combine(GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20), "aspnetcorev2_outofprocess.dll"); + + File.Delete(temporaryFile); + File.Move(requestHandlerPath, temporaryFile); + + var response = await deploymentResult.HttpClient.GetAsync(_helloWorldRequest); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(_helloWorldResponse, responseText); + StopServer(); + } + finally + { + File.Delete(temporaryFile); + } + } + + [ConditionalTheory] + [InlineData("2.1.0")] + [InlineData("2.1.0-preview")] + public async Task GlobalVersion_NewVersionNumber_Fails(string version) + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + deploymentParameters.HandlerSettings["handlerVersion"] = version; + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync(_helloWorldRequest); + Assert.False(response.IsSuccessStatusCode); + var responseString = await response.Content.ReadAsStringAsync(); + Assert.Contains("HTTP Error 500.0 - ANCM Out-Of-Process Handler Load Failure", responseString); + } + + [ConditionalTheory] + [InlineData("2.1.0")] + [InlineData("2.1.0-preview")] + public async Task GlobalVersion_NewVersionNumber(string version) + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + CopyShimToOutput(deploymentParameters); + deploymentParameters.HandlerSettings["handlerVersion"] = version; + + var deploymentResult = await DeployAsync(deploymentParameters); + + var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); + var newANCMPath = GetANCMRequestHandlerPath(deploymentResult, version); + Directory.Move(originalANCMPath, newANCMPath); + + var response = await deploymentResult.HttpClient.GetAsync(_helloWorldRequest); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(_helloWorldResponse, responseText); + AssertLoadedVersion(version); + } + + [ConditionalTheory] + [InlineData("2.1.0")] + [InlineData("2.1.0-preview")] + public async Task GlobalVersion_MultipleRequestHandlers_PicksHighestOne(string version) + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + CopyShimToOutput(deploymentParameters); + var deploymentResult = await DeployAsync(deploymentParameters); + + var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); + + var newANCMPath = GetANCMRequestHandlerPath(deploymentResult, version); + + CopyDirectory(originalANCMPath, newANCMPath); + + deploymentResult.HttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); + var response = await deploymentResult.HttpClient.GetAsync("CheckRequestHandlerVersion"); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(_helloWorldResponse, responseText); + AssertLoadedVersion(version); + } + + [ConditionalTheory] + [InlineData("2.1.0")] + [InlineData("2.1.0-preview")] + public async Task GlobalVersion_MultipleRequestHandlers_UpgradeWorks(string version) + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + CopyShimToOutput(deploymentParameters); + var deploymentResult = await DeployAsync(deploymentParameters); + + var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); + + deploymentResult.HttpClient.DefaultRequestHeaders.Add("ANCMRHPath", originalANCMPath); + var response = await deploymentResult.HttpClient.GetAsync("CheckRequestHandlerVersion"); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(_helloWorldResponse, responseText); + + StopServer(); + + deploymentResult = await DeployAsync(deploymentParameters); + + originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); + + var newANCMPath = GetANCMRequestHandlerPath(deploymentResult, version); + + CopyDirectory(originalANCMPath, newANCMPath); + + deploymentResult.HttpClient.DefaultRequestHeaders.Add("ANCMRHPath", newANCMPath); + response = await deploymentResult.HttpClient.GetAsync("CheckRequestHandlerVersion"); + responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal(_helloWorldResponse, responseText); + AssertLoadedVersion(version); + } + + [ConditionalFact] + public async Task DoesNotCrashWhenNoVersionsAvailable() + { + var deploymentParameters = GetGlobalVersionBaseDeploymentParameters(); + CopyShimToOutput(deploymentParameters); + var deploymentResult = await DeployAsync(deploymentParameters); + + var originalANCMPath = GetANCMRequestHandlerPath(deploymentResult, _handlerVersion20); + Directory.Delete(originalANCMPath, true); + var response = await deploymentResult.HttpClient.GetAsync("HelloWorld"); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + } + + private IISDeploymentParameters GetGlobalVersionBaseDeploymentParameters() + { + return _fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess, publish: true); + } + + private void CopyDirectory(string from, string to) + { + var toInfo = new DirectoryInfo(to); + toInfo.Create(); + + foreach (var file in new DirectoryInfo(from).GetFiles()) + { + file.CopyTo(Path.Combine(toInfo.FullName, file.Name)); + } + } + + private string GetANCMRequestHandlerPath(IISDeploymentResult deploymentResult, string version) + { + return Path.Combine(deploymentResult.ContentRoot, + deploymentResult.DeploymentParameters.RuntimeArchitecture.ToString(), + version); + } + + private void AssertLoadedVersion(string version) + { + StopServer(); + Assert.Contains(TestSink.Writes, context => context.Message.Contains(version + @"\aspnetcorev2_outofprocess.dll")); + } + + private static void CopyShimToOutput(IISDeploymentParameters parameters) + { + parameters.AddServerConfigAction( + (config, contentRoot) => { + var moduleNodes = config.DescendantNodesAndSelf() + .OfType() + .Where(element => + element.Name == "add" && + element.Attribute("name")?.Value.StartsWith("AspNetCoreModule") == true && + element.Attribute("image") != null); + + var sourceDirectory = new DirectoryInfo(Path.GetDirectoryName(moduleNodes.First().Attribute("image").Value)); + var destinationDirectory = new DirectoryInfo(Path.Combine(contentRoot, sourceDirectory.Name)); + destinationDirectory.Create(); + foreach (var element in moduleNodes) + { + var imageAttribute = element.Attribute("image"); + imageAttribute.Value = imageAttribute.Value.Replace(sourceDirectory.FullName, destinationDirectory.FullName); + } + CopyFiles(sourceDirectory, destinationDirectory); + }); + } + + private static void CopyFiles(DirectoryInfo source, DirectoryInfo target) + { + foreach (DirectoryInfo directoryInfo in source.GetDirectories()) + { + CopyFiles(directoryInfo, target.CreateSubdirectory(directoryInfo.Name)); + } + + foreach (FileInfo fileInfo in source.GetFiles()) + { + var destFileName = Path.Combine(target.FullName, fileInfo.Name); + fileInfo.CopyTo(destFileName); + } + } + + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs new file mode 100644 index 0000000000..f6e36613d7 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -0,0 +1,81 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Diagnostics; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class HelloWorldTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public HelloWorldTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithAllApplicationTypes() + .WithAllAncmVersions(); + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task HelloWorld(TestVariant variant) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); + deploymentParameters.ServerConfigActionList.Add( + (element, _) => { + element + .RequiredElement("system.webServer") + .RequiredElement("security") + .RequiredElement("authentication") + .Element("windowsAuthentication") + ?.SetAttributeValue("enabled", "false"); + }); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal("Hello World", responseText); + + response = await deploymentResult.HttpClient.GetAsync("/Path/%3F%3F?query"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("/??", responseText); + + response = await deploymentResult.HttpClient.GetAsync("/Query/%3FPath?query?"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("?query?", responseText); + + response = await deploymentResult.HttpClient.GetAsync("/BodyLimit"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("null", responseText); + + response = await deploymentResult.HttpClient.GetAsync("/Auth"); + responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal("null", responseText); + + Assert.Equal( + $"ContentRootPath {deploymentResult.ContentRoot}" + Environment.NewLine + + $"WebRootPath {deploymentResult.ContentRoot}\\wwwroot" + Environment.NewLine + + $"CurrentDirectory {deploymentResult.ContentRoot}", + await deploymentResult.HttpClient.GetStringAsync("/HostingEnvironment")); + + var expectedDll = variant.AncmVersion == AncmVersion.AspNetCoreModule ? "aspnetcore.dll" : "aspnetcorev2.dll"; + Assert.Contains(deploymentResult.HostProcess.Modules.OfType(), m=> m.FileName.Contains(expectedDll)); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs b/src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs new file mode 100644 index 0000000000..282ee26109 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs @@ -0,0 +1,65 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + /// + /// This type just maps collection names to available fixtures + /// + [CollectionDefinition(Name)] + public class PublishedSitesCollection : ICollectionFixture, ICollectionFixture + { + public const string Name = nameof(PublishedSitesCollection); + } + + public class PublishedSitesFixture : IDisposable + { + public CachingApplicationPublisher InProcessTestSite { get; } = new CachingApplicationPublisher(Helpers.GetInProcessTestSitesPath()); + public CachingApplicationPublisher OutOfProcessTestSite { get; } = new CachingApplicationPublisher(Helpers.GetOutOfProcessTestSitesPath()); + + public void Dispose() + { + InProcessTestSite.Dispose(); + OutOfProcessTestSite.Dispose(); + } + + public IISDeploymentParameters GetBaseDeploymentParameters(HostingModel hostingModel = HostingModel.InProcess, bool publish = false) + { + var publisher = hostingModel == HostingModel.InProcess ? InProcessTestSite : OutOfProcessTestSite; + return GetBaseDeploymentParameters(publisher, hostingModel, publish); + } + public IISDeploymentParameters GetBaseDeploymentParameters(TestVariant variant, bool publish = false) + { + var publisher = variant.HostingModel == HostingModel.InProcess ? InProcessTestSite : OutOfProcessTestSite; + return GetBaseDeploymentParameters(publisher, new DeploymentParameters(variant), publish); + } + + public IISDeploymentParameters GetBaseDeploymentParameters(ApplicationPublisher publisher, HostingModel hostingModel = HostingModel.InProcess, bool publish = false) + { + return GetBaseDeploymentParameters( + publisher, + new DeploymentParameters(publisher.ApplicationPath, DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + { + HostingModel = hostingModel, + TargetFramework = "netcoreapp2.2", + AncmVersion = AncmVersion.AspNetCoreModuleV2 + }, + publish); + } + + public IISDeploymentParameters GetBaseDeploymentParameters(ApplicationPublisher publisher, DeploymentParameters baseParameters, bool publish = false) + { + return new IISDeploymentParameters(baseParameters) + { + ApplicationPublisher = publisher, + ApplicationPath = publisher.ApplicationPath, + PublishApplicationBeforeDeployment = publish + }; + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/RequiresNewHandler.cs b/src/IISIntegration/test/Common.FunctionalTests/RequiresNewHandler.cs new file mode 100644 index 0000000000..cbe43ec0c7 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/RequiresNewHandler.cs @@ -0,0 +1,16 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class RequiresNewHandlerAttribute : Attribute, ITestCondition + { + public bool IsMet => !DeployerSelector.IsForwardsCompatibilityTest; + + public string SkipReason => "Test verifies new behavior in the aspnetcorev2_inprocess.dll that isn't supported in earlier versions."; + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/RequiresNewShim.cs b/src/IISIntegration/test/Common.FunctionalTests/RequiresNewShim.cs new file mode 100644 index 0000000000..b0bc50a83b --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/RequiresNewShim.cs @@ -0,0 +1,16 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class RequiresNewShimAttribute : Attribute, ITestCondition + { + public bool IsMet => !DeployerSelector.IsBackwardsCompatiblityTest; + + public string SkipReason => "Test verifies new behavior in the aspnetcorev2.dll that isn't supported in earlier versions."; + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/ServerAbortTests.cs b/src/IISIntegration/test/Common.FunctionalTests/ServerAbortTests.cs new file mode 100644 index 0000000000..8ebd70db12 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/ServerAbortTests.cs @@ -0,0 +1,65 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public abstract class ServerAbortTests: FixtureLoggedTest + { + private readonly IISTestSiteFixture _fixture; + + [Collection(IISTestSiteCollection.Name)] + public class InProc: ServerAbortTests + { + public InProc(IISTestSiteFixture fixture) : base(fixture) { } + } + + [Collection(OutOfProcessTestSiteCollection.Name)] + public class OutOfProcess: ServerAbortTests + { + public OutOfProcess(OutOfProcessTestSiteFixture fixture) : base(fixture) { } + } + + [Collection(OutOfProcessV1TestSiteCollection.Name)] + public class OutOfProcessV1: ServerAbortTests + { + public OutOfProcessV1(OutOfProcessV1TestSiteFixture fixture) : base(fixture) { } + } + + protected ServerAbortTests(IISTestSiteFixture fixture) : base(fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task ClosesConnectionOnServerAbort() + { + try + { + var response = await _fixture.Client.GetAsync("/Abort").DefaultTimeout(); + + // 502 is expected for outofproc but not for inproc + if (_fixture.DeploymentResult.DeploymentParameters.HostingModel == HostingModel.OutOfProcess) + { + Assert.Equal(HttpStatusCode.BadGateway, response.StatusCode); + // 0x80072f78 ERROR_HTTP_INVALID_SERVER_RESPONSE The server returned an invalid or unrecognized response + Assert.Contains("0x80072f78", await response.Content.ReadAsStringAsync()); + } + else + { + Assert.True(false, "Should not reach here"); + } + } + catch (HttpRequestException) + { + // Connection reset is expected both for outofproc and inproc + } + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs b/src/IISIntegration/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs new file mode 100644 index 0000000000..d2acb70415 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs @@ -0,0 +1,25 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Security.Principal; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class SkipIfNotAdminAttribute : Attribute, ITestCondition + { + public bool IsMet + { + get + { + var identity = WindowsIdentity.GetCurrent(); + var principal = new WindowsPrincipal(identity); + return principal.IsInRole(WindowsBuiltInRole.Administrator); + } + } + + public string SkipReason => "The current process is not running as admin."; + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/SkipVSTSAttribute.cs b/src/IISIntegration/test/Common.FunctionalTests/SkipVSTSAttribute.cs new file mode 100644 index 0000000000..8e88fc8c26 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/SkipVSTSAttribute.cs @@ -0,0 +1,17 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class SkipInVSTSAttribute : Attribute, ITestCondition + { + public bool IsMet => string.IsNullOrEmpty(Environment.GetEnvironmentVariable("SYSTEM_TASKDEFINITIONSURI")); + + public string SkipReason => "Running in VSTS"; + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/AppVerifier.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/AppVerifier.cs new file mode 100644 index 0000000000..7984193e29 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/AppVerifier.cs @@ -0,0 +1,83 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Diagnostics; +using System.Linq; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + public class AppVerifier + { + private static readonly TimeSpan AppVerifierCommandTimeout = TimeSpan.FromSeconds(5); + + public static IDisposable Disable(ServerType serverType, int code) + { + // Set in SetupTestEnvironment.ps1 + var enabledCodes = (Environment.GetEnvironmentVariable("APPVERIFIER_ENABLED_CODES") ?? "").Split(' '); + string processName; + switch (serverType) + { + case ServerType.IISExpress: + processName = "iisexpress.exe"; + break; + case ServerType.IIS: + processName = "w3wp.exe"; + break; + default: + throw new ArgumentOutOfRangeException(nameof(serverType), serverType, null); + } + + if (!enabledCodes.Contains(code.ToString())) + { + return null; + } + + RunProcessAndWaitForExit("appverif.exe", $"-configure {code} -for {processName} -with ErrorReport=0", AppVerifierCommandTimeout); + return new AppVerifierToken(processName, code.ToString()); + } + + private static void RunProcessAndWaitForExit(string fileName, string arguments, TimeSpan timeout) + { + var startInfo = new ProcessStartInfo + { + FileName = fileName, + Arguments = arguments, + RedirectStandardOutput = true, + RedirectStandardError = true, + UseShellExecute = false, + }; + + var process = Process.Start(startInfo); + + if (!process.WaitForExit((int)timeout.TotalMilliseconds)) + { + process.Kill(); + } + + if (process.ExitCode != 0) + { + throw new InvalidOperationException($"Exit code {process.ExitCode} when running {fileName} {arguments}. Stdout: {process.StandardOutput.ReadToEnd()} Stderr: {process.StandardError.ReadToEnd()}"); + } + } + + public class AppVerifierToken : IDisposable + { + private readonly string _processName; + + private readonly string _codes; + + public AppVerifierToken(string processName, string codes) + { + _processName = processName; + _codes = codes; + } + + public void Dispose() + { + // + RunProcessAndWaitForExit("appverif.exe", $"-configure {_codes} -for {_processName} -with ErrorReport={Environment.GetEnvironmentVariable("APPVERIFIER_LEVEL")}", AppVerifierCommandTimeout); + } + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs new file mode 100644 index 0000000000..78c77fd2ca --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -0,0 +1,210 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text.RegularExpressions; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.Extensions.Logging; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class EventLogHelpers + { + public static void VerifyEventLogEvent(IISDeploymentResult deploymentResult, string expectedRegexMatchString) + { + Assert.True(deploymentResult.HostProcess.HasExited); + + var entries = GetEntries(deploymentResult); + AssertSingleEntry(expectedRegexMatchString, entries); + } + + public static void VerifyEventLogEvent(IISDeploymentResult deploymentResult, string expectedRegexMatchString, ILogger logger) + { + Assert.True(deploymentResult.HostProcess.HasExited); + + var entries = GetEntries(deploymentResult); + try + { + AssertSingleEntry(expectedRegexMatchString, entries); + } + catch (Exception ex) + { + foreach (var entry in entries) + { + logger.LogInformation(entry.Message); + } + throw ex; + } + } + + public static void VerifyEventLogEvents(IISDeploymentResult deploymentResult, params string[] expectedRegexMatchString) + { + Assert.True(deploymentResult.HostProcess.HasExited); + + var entries = GetEntries(deploymentResult).ToList(); + foreach (var regexString in expectedRegexMatchString) + { + var matchedEntries = AssertSingleEntry(regexString, entries); + + foreach (var matchedEntry in matchedEntries) + { + entries.Remove(matchedEntry); + } + } + + Assert.True(0 == entries.Count, $"Some entries were not matched by any regex {FormatEntries(entries)}"); + } + + private static EventLogEntry[] AssertSingleEntry(string regexString, IEnumerable entries) + { + var expectedRegex = new Regex(regexString, RegexOptions.Singleline); + var matchedEntries = entries.Where(entry => expectedRegex.IsMatch(entry.Message)).ToArray(); + Assert.True(matchedEntries.Length > 0, $"No entries matched by '{regexString}'"); + Assert.True(matchedEntries.Length < 2, $"Multiple entries matched by '{regexString}': {FormatEntries(matchedEntries)}"); + return matchedEntries; + } + + private static string FormatEntries(IEnumerable entries) + { + return string.Join(",", entries.Select(e => e.Message)); + } + + private static IEnumerable GetEntries(IISDeploymentResult deploymentResult) + { + var eventLog = new EventLog("Application"); + + // Eventlog is already sorted based on time of event in ascending time. + // Check results in reverse order. + var processIdString = $"Process Id: {deploymentResult.HostProcess.Id}."; + + // Event log messages round down to the nearest second, so subtract a second + var processStartTime = deploymentResult.HostProcess.StartTime.AddSeconds(-1); + for (var i = eventLog.Entries.Count - 1; i >= 0; i--) + { + var eventLogEntry = eventLog.Entries[i]; + if (eventLogEntry.TimeGenerated < processStartTime) + { + // If event logs is older than the process start time, we didn't find a match. + break; + } + + if (eventLogEntry.ReplacementStrings == null || + eventLogEntry.ReplacementStrings.Length < 3) + { + continue; + } + + // ReplacementStings == EventData collection in EventLog + // This is unaffected if event providers are not registered correctly + if (eventLogEntry.Source == AncmVersionToMatch(deploymentResult) && + processIdString == eventLogEntry.ReplacementStrings[1]) + { + yield return eventLogEntry; + } + } + } + + private static string AncmVersionToMatch(IISDeploymentResult deploymentResult) + { + return "IIS " + + (deploymentResult.DeploymentParameters.ServerType == ServerType.IISExpress ? "Express " : "") + + "AspNetCore Module" + + (deploymentResult.DeploymentParameters.AncmVersion == AncmVersion.AspNetCoreModuleV2 ? " V2" : ""); + } + + public static string Started(IISDeploymentResult deploymentResult) + { + if (deploymentResult.DeploymentParameters.HostingModel == HostingModel.InProcess) + { + return InProcessStarted(deploymentResult); + } + else + { + return OutOfProcessStarted(deploymentResult); + } + } + + public static string InProcessStarted(IISDeploymentResult deploymentResult) + { + return $"Application '{EscapedContentRoot(deploymentResult)}' started the coreclr in-process successfully"; + } + + public static string OutOfProcessStarted(IISDeploymentResult deploymentResult) + { + return $"Application '/LM/W3SVC/1/ROOT' started process '\\d+' successfully and process '\\d+' is listening on port '\\d+'."; + } + + public static string InProcessFailedToStart(IISDeploymentResult deploymentResult, string reason) + { + return $"Application '/LM/W3SVC/1/ROOT' with physical root '{EscapedContentRoot(deploymentResult)}' failed to load clr and managed application. {reason}"; + } + + public static string InProcessFailedToStop(IISDeploymentResult deploymentResult, string reason) + { + return "Failed to gracefully shutdown application 'MACHINE/WEBROOT/APPHOST/.*?'."; + } + + public static string InProcessThreadException(IISDeploymentResult deploymentResult, string reason) + { + return $"Application '/LM/W3SVC/1/ROOT' with physical root '{EscapedContentRoot(deploymentResult)}' hit unexpected managed exception{reason}"; + } + + public static string InProcessThreadExit(IISDeploymentResult deploymentResult, string code) + { + return $"Application '/LM/W3SVC/1/ROOT' with physical root '{EscapedContentRoot(deploymentResult)}' hit unexpected managed background thread exit, exit code = '{code}'."; + } + public static string InProcessThreadExitStdOut(IISDeploymentResult deploymentResult, string code, string output) + { + return $"Application '/LM/W3SVC/1/ROOT' with physical root '{EscapedContentRoot(deploymentResult)}' hit unexpected managed background thread exit, exit code = '{code}'. Last 4KB characters of captured stdout and stderr logs:\r\n{output}"; + } + + public static string FailedToStartApplication(IISDeploymentResult deploymentResult, string code) + { + return $"Failed to start application '/LM/W3SVC/1/ROOT', ErrorCode '{code}'."; + } + + public static string ConfigurationLoadError(IISDeploymentResult deploymentResult, string reason) + { + return $"Could not load configuration. Exception message: {reason}"; + } + + public static string OutOfProcessFailedToStart(IISDeploymentResult deploymentResult) + { + return $"Application '/LM/W3SVC/1/ROOT' with physical root '{EscapedContentRoot(deploymentResult)}' failed to start process with " + + $"commandline '(.*)' with multiple retries. " + + $"The last try of listening port is '(.*)'. See previous warnings for details."; + } + + public static string InProcessHostfxrInvalid(IISDeploymentResult deploymentResult) + { + return $"Hostfxr version used does not support 'hostfxr_get_native_search_directories', update the version of hostfxr to a higher version. Path to hostfxr: '(.*)'."; + } + + public static string InProcessFailedToFindNativeDependencies(IISDeploymentResult deploymentResult) + { + return "Invoking hostfxr to find the inprocess request handler failed without finding any native dependencies. " + + "This most likely means the app is misconfigured, please check the versions of Microsoft.NetCore.App and Microsoft.AspNetCore.App that " + + "are targeted by the application and are installed on the machine."; + } + + public static string InProcessFailedToFindRequestHandler(IISDeploymentResult deploymentResult) + { + return "Could not find the assembly '(.*)' referenced for the in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application."; + } + + private static string EscapedContentRoot(IISDeploymentResult deploymentResult) + { + var contentRoot = deploymentResult.ContentRoot; + if (!contentRoot.EndsWith('\\')) + { + contentRoot += '\\'; + } + return Regex.Escape(contentRoot); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs new file mode 100644 index 0000000000..1a1a4ce490 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -0,0 +1,59 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.Extensions.Logging.Testing; +using Xunit.Abstractions; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + public class FunctionalTestsBase : LoggedTest + { + private const string DebugEnvironmentVariable = "ASPNETCORE_MODULE_DEBUG"; + + public FunctionalTestsBase(ITestOutputHelper output = null) : base(output) + { + } + + protected IISDeployerBase _deployer; + + protected ApplicationDeployer CreateDeployer(IISDeploymentParameters parameters) + { + if (parameters.ServerType == ServerType.IISExpress && + !parameters.EnvironmentVariables.ContainsKey(DebugEnvironmentVariable)) + { + parameters.EnvironmentVariables[DebugEnvironmentVariable] = "console"; + } + + return IISApplicationDeployerFactory.Create(parameters, LoggerFactory); + } + + protected virtual async Task DeployAsync(IISDeploymentParameters parameters) + { + _deployer = (IISDeployerBase)CreateDeployer(parameters); + return (IISDeploymentResult)await _deployer.DeployAsync(); + } + + protected virtual async Task StartAsync(IISDeploymentParameters parameters) + { + var result = await DeployAsync(parameters); + await result.AssertStarts(); + return result; + } + + public override void Dispose() + { + StopServer(false); + } + + public void StopServer(bool gracefulShutdown = true) + { + _deployer?.Dispose(gracefulShutdown); + _deployer = null; + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/Helpers.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/Helpers.cs new file mode 100644 index 0000000000..1e31126eab --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -0,0 +1,241 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Net.Http; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public static class Helpers + { + private static readonly TimeSpan RetryRequestDelay = TimeSpan.FromMilliseconds(100); + private static readonly int RetryRequestCount = 10; + + public static string GetTestWebSitePath(string name) + { + return Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"),"test", "WebSites", name); + } + + public static string GetInProcessTestSitesPath() + { + return DeployerSelector.IsForwardsCompatibilityTest ? GetTestWebSitePath("InProcessForwardsCompatWebSite") : GetTestWebSitePath("InProcessWebSite"); + } + + public static string GetOutOfProcessTestSitesPath() => GetTestWebSitePath("OutOfProcessWebSite"); + + public static async Task AssertStarts(this IISDeploymentResult deploymentResult, string path = "/HelloWorld") + { + var response = await deploymentResult.HttpClient.GetAsync(path); + + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.Equal("Hello World", responseText); + } + + public static async Task StressLoad(HttpClient httpClient, string path, Action action) + { + async Task RunRequests() + { + var connection = new HttpClient() { BaseAddress = httpClient.BaseAddress }; + + for (int j = 0; j < 10; j++) + { + var response = await connection.GetAsync(path); + action(response); + } + } + + List tasks = new List(); + for (int i = 0; i < 10; i++) + { + tasks.Add(Task.Run(RunRequests)); + } + + await Task.WhenAll(tasks); + } + + public static string GetFrebFolder(string folder, IISDeploymentResult result) + { + if (result.DeploymentParameters.ServerType == ServerType.IISExpress) + { + return Path.Combine(folder, result.DeploymentParameters.SiteName); + } + else + { + return Path.Combine(folder, "W3SVC1"); + } + } + + public static void CopyFiles(DirectoryInfo source, DirectoryInfo target, ILogger logger) + { + foreach (DirectoryInfo directoryInfo in source.GetDirectories()) + { + if (directoryInfo.FullName != target.FullName) + { + CopyFiles(directoryInfo, target.CreateSubdirectory(directoryInfo.Name), logger); + } + } + logger?.LogDebug($"Processing {target.FullName}"); + foreach (FileInfo fileInfo in source.GetFiles()) + { + logger?.LogDebug($" Copying {fileInfo.Name}"); + var destFileName = Path.Combine(target.FullName, fileInfo.Name); + fileInfo.CopyTo(destFileName); + } + } + + public static void ModifyWebConfig(this DeploymentResult deploymentResult, Action action) + { + var webConfigPath = Path.Combine(deploymentResult.ContentRoot, "web.config"); + var document = XDocument.Load(webConfigPath); + action(document.Root); + document.Save(webConfigPath); + } + + public static Task RetryRequestAsync(this HttpClient client, string uri, Func predicate) + { + return RetryRequestAsync(client, uri, message => Task.FromResult(predicate(message))); + } + + public static async Task RetryRequestAsync(this HttpClient client, string uri, Func> predicate) + { + HttpResponseMessage response = await client.GetAsync(uri); + + for (var i = 0; i < RetryRequestCount && !await predicate(response); i++) + { + // Keep retrying until app_offline is present. + response = await client.GetAsync(uri); + await Task.Delay(RetryRequestDelay); + } + + if (!await predicate(response)) + { + throw new InvalidOperationException($"Didn't get response that satisfies predicate after {RetryRequestCount} retries"); + } + + return response; + } + + public static async Task Retry(Func func, int attempts, int msDelay) + { + var exceptions = new List(); + + for (var attempt = 0; attempt < attempts; attempt++) + { + try + { + await func(); + return; + } + catch (Exception e) + { + exceptions.Add(e); + } + await Task.Delay(msDelay); + } + + throw new AggregateException(exceptions); + } + + public static void AssertWorkerProcessStop(this IISDeploymentResult deploymentResult, int? timeout = null) + { + var hostProcess = deploymentResult.HostProcess; + Assert.True(hostProcess.WaitForExit(timeout ?? (int)TimeoutExtensions.DefaultTimeoutValue.TotalMilliseconds)); + + if (deploymentResult.DeploymentParameters.ServerType == ServerType.IISExpress) + { + Assert.Equal(0, hostProcess.ExitCode); + } + } + + + public static async Task AssertRecycledAsync(this IISDeploymentResult deploymentResult, Func verificationAction = null) + { + if (deploymentResult.DeploymentParameters.HostingModel != HostingModel.InProcess) + { + throw new NotSupportedException(); + } + + deploymentResult.AssertWorkerProcessStop(); + if (deploymentResult.DeploymentParameters.ServerType == ServerType.IIS) + { + verificationAction = verificationAction ?? (() => deploymentResult.AssertStarts()); + await verificationAction(); + } + } + + public static IEnumerable ToTheoryData(this Dictionary dictionary) + { + return dictionary.Keys.Select(k => new[] { k }); + } + + public static string GetExpectedLogName(IISDeploymentResult deploymentResult, string logFolderPath) + { + var startTime = deploymentResult.HostProcess.StartTime.ToUniversalTime(); + + if (deploymentResult.DeploymentParameters.HostingModel == HostingModel.InProcess) + { + return Path.Combine(logFolderPath, $"std_{startTime.Year}{startTime.Month:D2}" + + $"{startTime.Day:D2}{startTime.Hour:D2}" + + $"{startTime.Minute:D2}{startTime.Second:D2}_" + + $"{deploymentResult.HostProcess.Id}.log"); + } + else + { + return Directory.GetFiles(logFolderPath).Single(); + } + } + + public static void ModifyFrameworkVersionInRuntimeConfig(IISDeploymentResult deploymentResult) + { + var path = Path.Combine(deploymentResult.ContentRoot, "InProcessWebSite.runtimeconfig.json"); + dynamic depsFileContent = JsonConvert.DeserializeObject(File.ReadAllText(path)); + depsFileContent["runtimeOptions"]["framework"]["version"] = "2.9.9"; + var output = JsonConvert.SerializeObject(depsFileContent); + File.WriteAllText(path, output); + } + + public static void AllowNoLogs(this IISDeploymentResult deploymentResult) + { + File.AppendAllText( + Path.Combine(deploymentResult.DeploymentParameters.PublishedApplicationRootPath, "aspnetcore-debug.log"), + "Running test allowed log file to be empty." + Environment.NewLine); + } + + public static string ReadAllTextFromFile(string filename, ILogger logger) + { + try + { + return File.ReadAllText(filename); + } + catch (Exception ex) + { + // check if there is a dotnet.exe, iisexpress.exe, or w3wp.exe processes still running. + var hostingProcesses = Process.GetProcessesByName("dotnet") + .Concat(Process.GetProcessesByName("iisexpress")) + .Concat(Process.GetProcessesByName("w3wp")); + + logger.LogError($"Could not read file content. Exception message {ex.Message}"); + logger.LogError("Current hosting exes running:"); + + foreach (var hostingProcess in hostingProcesses) + { + logger.LogError($"{hostingProcess.ProcessName} pid: {hostingProcess.Id} hasExited: {hostingProcess.HasExited.ToString()}"); + } + throw ex; + } + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCapability.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCapability.cs new file mode 100644 index 0000000000..0a080bb702 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCapability.cs @@ -0,0 +1,22 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Flags] + public enum IISCapability + { + None = 0, + Websockets = 1, + WindowsAuthentication = 2, + PoolEnvironmentVariables = 4, + ShutdownToken = 8, + DynamicCompression = 16, + ApplicationInitialization = 32, + TracingModule = 64, + FailedRequestTracingModule = 128, + BasicAuthentication = 256 + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs new file mode 100644 index 0000000000..2c424943f3 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs @@ -0,0 +1,13 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [CollectionDefinition(Name)] + public class IISCompressionSiteCollection : ICollectionFixture + { + public const string Name = nameof(IISCompressionSiteCollection); + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs new file mode 100644 index 0000000000..3aff68d11b --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs @@ -0,0 +1,44 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Net.Http; +using System.Threading; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class IISCompressionSiteFixture : IISTestSiteFixture + { + public IISCompressionSiteFixture() : base(Configure) + { + } + + private static void Configure(IISDeploymentParameters deploymentParameters) + { + // Enable dynamic compression + deploymentParameters.ServerConfigActionList.Add( + (element, _) => { + var webServerElement = element + .RequiredElement("system.webServer"); + + webServerElement + .GetOrAdd("urlCompression") + .SetAttributeValue("doDynamicCompression", "true"); + + webServerElement + .GetOrAdd("httpCompression") + .GetOrAdd("dynamicTypes") + .GetOrAdd("add", "mimeType", "text/*") + .SetAttributeValue("enabled", "true"); + + }); + + deploymentParameters.EnableModule("DynamicCompressionModule", "%IIS_BIN%\\compdyn.dll"); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs new file mode 100644 index 0000000000..a20a5e2e0e --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs @@ -0,0 +1,15 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Xunit.Abstractions; + +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities +{ + public class IISFunctionalTestBase : FunctionalTestsBase + { + public IISFunctionalTestBase(ITestOutputHelper output = null) : base(output) + { + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs new file mode 100644 index 0000000000..562d63adbe --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs @@ -0,0 +1,29 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + /// + /// This type just maps collection names to available fixtures + /// + [CollectionDefinition(Name)] + public class IISTestSiteCollection : ICollectionFixture + { + public const string Name = nameof(IISTestSiteCollection); + } + + [CollectionDefinition(Name)] + public class OutOfProcessTestSiteCollection : ICollectionFixture + { + public const string Name = nameof(OutOfProcessTestSiteCollection); + } + + [CollectionDefinition(Name)] + public class OutOfProcessV1TestSiteCollection : ICollectionFixture + { + public const string Name = nameof(OutOfProcessV1TestSiteCollection); + } + +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs new file mode 100644 index 0000000000..e8cfd8f641 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -0,0 +1,191 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Net.Http; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class OutOfProcessTestSiteFixture : IISTestSiteFixture + { + public OutOfProcessTestSiteFixture() : base(Configure) + { + } + + private static void Configure(IISDeploymentParameters deploymentParameters) + { + deploymentParameters.ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(); + deploymentParameters.HostingModel = HostingModel.OutOfProcess; + } + } + + public class OutOfProcessV1TestSiteFixture : IISTestSiteFixture + { + public OutOfProcessV1TestSiteFixture() : base(Configure) + { + } + + private static void Configure(IISDeploymentParameters deploymentParameters) + { + deploymentParameters.ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(); + deploymentParameters.HostingModel = HostingModel.OutOfProcess; + deploymentParameters.AncmVersion = AncmVersion.AspNetCoreModule; + } + } + + public class IISTestSiteFixture : IDisposable + { + private ApplicationDeployer _deployer; + private ILoggerFactory _loggerFactory; + private ForwardingProvider _forwardingProvider; + private IISDeploymentResult _deploymentResult; + private readonly Action _configure; + + public IISTestSiteFixture() : this(_ => { }) + { + } + + public IISTestSiteFixture(Action configure) + { + var logging = AssemblyTestLog.ForAssembly(typeof(IISTestSiteFixture).Assembly); + _loggerFactory = logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture)); + + _forwardingProvider = new ForwardingProvider(); + _loggerFactory.AddProvider(_forwardingProvider); + + _configure = configure; + } + + public HttpClient Client => DeploymentResult.HttpClient; + public IISDeploymentResult DeploymentResult + { + get + { + EnsureInitialized(); + return _deploymentResult; + } + } + + public TestConnection CreateTestConnection() + { + return new TestConnection(Client.BaseAddress.Port); + } + + public void Dispose() + { + _deployer?.Dispose(); + } + + public void Attach(LoggedTest test) + { + if (_forwardingProvider.LoggerFactory != null) + { + throw new InvalidOperationException("Test instance is already attached to this fixture"); + } + + _forwardingProvider.LoggerFactory = test.LoggerFactory; + } + + public void Detach(LoggedTest test) + { + if (_forwardingProvider.LoggerFactory != test.LoggerFactory) + { + throw new InvalidOperationException("Different test is attached to this fixture"); + } + + _forwardingProvider.LoggerFactory = null; + } + + private void EnsureInitialized() + { + if (_deployer != null) + { + return; + } + + var deploymentParameters = new IISDeploymentParameters(Helpers.GetInProcessTestSitesPath(), + DeployerSelector.ServerType, + RuntimeFlavor.CoreClr, + RuntimeArchitecture.x64) + { + TargetFramework = Tfm.NetCoreApp22, + AncmVersion = AncmVersion.AspNetCoreModuleV2, + HostingModel = HostingModel.InProcess, + PublishApplicationBeforeDeployment = true, + }; + + _configure(deploymentParameters); + + _deployer = IISApplicationDeployerFactory.Create(deploymentParameters, _loggerFactory); + _deploymentResult = (IISDeploymentResult)_deployer.DeployAsync().Result; + } + + private class ForwardingProvider : ILoggerProvider + { + private readonly List _loggers = new List(); + + private ILoggerFactory _loggerFactory; + + public ILoggerFactory LoggerFactory + { + get => _loggerFactory; + set + { + + lock (_loggers) + { + _loggerFactory = value; + foreach (var logger in _loggers) + { + logger.Logger = _loggerFactory?.CreateLogger("FIXTURE:" + logger.Name); + } + } + } + } + + public void Dispose() + { + lock (_loggers) + { + _loggers.Clear(); + } + } + + public ILogger CreateLogger(string categoryName) + { + lock (_loggers) + { + var logger = new ForwardingLogger(categoryName); + _loggers.Add(logger); + return logger; + } + } + } + + internal class ForwardingLogger : ILogger + { + public ForwardingLogger(string name) + { + Name = name; + } + + public ILogger Logger { get; set; } + public string Name { get; set; } + + public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) + { + Logger?.Log(logLevel, eventId, state, exception, formatter); + } + + public bool IsEnabled(LogLevel logLevel) => Logger?.IsEnabled(logLevel) == true; + + public IDisposable BeginScope(TState state) => Logger?.BeginScope(state); + } + } + +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs new file mode 100644 index 0000000000..17885f3547 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs @@ -0,0 +1,34 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Xunit.Abstractions; + +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities +{ + public class LogFileTestBase : IISFunctionalTestBase + { + protected string _logFolderPath; + + public LogFileTestBase(ITestOutputHelper output = null) : base(output) + { + _logFolderPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); + } + public override void Dispose() + { + base.Dispose(); + if (Directory.Exists(_logFolderPath)) + { + Directory.Delete(_logFolderPath, true); + } + } + + public string GetLogFileContent(IISDeploymentResult deploymentResult) + { + return Helpers.ReadAllTextFromFile(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath), Logger); + } + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs new file mode 100644 index 0000000000..d2749db547 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs @@ -0,0 +1,24 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class RequiresEnvironmentVariableAttribute : Attribute, ITestCondition + { + private readonly string _name; + + public RequiresEnvironmentVariableAttribute(string name) + { + _name = name; + } + + public bool IsMet => !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable(_name)); + + public string SkipReason => $"Environment variable {_name} is required to run this test."; + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs new file mode 100644 index 0000000000..6cdd725392 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs @@ -0,0 +1,22 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class SkipIfDebugAttribute : Attribute, ITestCondition + { + public bool IsMet => + #if DEBUG + false; + #else + true; + #endif + + public string SkipReason => "Test cannot be run in Debug mode."; + } +} diff --git a/src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs b/src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs new file mode 100644 index 0000000000..8431b15801 --- /dev/null +++ b/src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs @@ -0,0 +1,52 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class WindowsAuthTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public WindowsAuthTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithApplicationTypes(ApplicationType.Portable) + .WithAllAncmVersions() + .WithAllHostingModels(); + + [ConditionalTheory] + [RequiresIIS(IISCapability.WindowsAuthentication)] + [MemberData(nameof(TestVariants))] + public async Task WindowsAuthTest(TestVariant variant) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); + deploymentParameters.SetAnonymousAuth(enabled: false); + deploymentParameters.SetWindowsAuth(); + + // The default in hosting sets windows auth to true. + var deploymentResult = await DeployAsync(deploymentParameters); + + var client = deploymentResult.CreateClient(new HttpClientHandler { UseDefaultCredentials = true }); + var response = await client.GetAsync("/Auth"); + var responseText = await response.Content.ReadAsStringAsync(); + + Assert.StartsWith("Windows:", responseText); + Assert.Contains(Environment.UserName, responseText); + } + } +} diff --git a/src/IISIntegration/test/Common.Tests/Common.Tests.csproj b/src/IISIntegration/test/Common.Tests/Common.Tests.csproj new file mode 100644 index 0000000000..ede80732ee --- /dev/null +++ b/src/IISIntegration/test/Common.Tests/Common.Tests.csproj @@ -0,0 +1,22 @@ + + + + netcoreapp2.2 + false + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/Common.Tests/Utilities/DisposableList.cs b/src/IISIntegration/test/Common.Tests/Utilities/DisposableList.cs new file mode 100644 index 0000000000..78f76e41c2 --- /dev/null +++ b/src/IISIntegration/test/Common.Tests/Utilities/DisposableList.cs @@ -0,0 +1,25 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + public class DisposableList : List, IDisposable where T : IDisposable + { + public DisposableList() : base() { } + + public DisposableList(IEnumerable collection) : base(collection) { } + + public DisposableList(int capacity) : base(capacity) { } + + public void Dispose() + { + foreach (var item in this) + { + item?.Dispose(); + } + } + } +} diff --git a/src/IISIntegration/test/Common.Tests/Utilities/TestConnections.cs b/src/IISIntegration/test/Common.Tests/Utilities/TestConnections.cs new file mode 100644 index 0000000000..3b7a870cf3 --- /dev/null +++ b/src/IISIntegration/test/Common.Tests/Utilities/TestConnections.cs @@ -0,0 +1,252 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Net; +using System.Net.Sockets; +using System.Text; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + /// + /// Summary description for TestConnection + /// + public class TestConnection : IDisposable + { + private static readonly TimeSpan Timeout = TimeSpan.FromMinutes(1); + + private readonly bool _ownsSocket; + private readonly Socket _socket; + private readonly NetworkStream _stream; + + public TestConnection(int port) + : this(port, AddressFamily.InterNetwork) + { + } + + public TestConnection(int port, AddressFamily addressFamily) + : this(CreateConnectedLoopbackSocket(port, addressFamily), ownsSocket: true) + { + } + + public TestConnection(Socket socket) + : this(socket, ownsSocket: false) + { + } + + private TestConnection(Socket socket, bool ownsSocket) + { + _ownsSocket = ownsSocket; + _socket = socket; + _stream = new NetworkStream(_socket, ownsSocket: false); + } + + public Socket Socket => _socket; + public Stream Stream => _stream; + + public void Dispose() + { + _stream.Dispose(); + + if (_ownsSocket) + { + _socket.Dispose(); + } + } + + public async Task Send(params string[] lines) + { + var bytes = Encoding.ASCII.GetBytes(string.Join("\r\n", lines)); + + for (var index = 0; index < bytes.Length; index++) + { + await _stream.WriteAsync(bytes, index, 1).ConfigureAwait(false); + await _stream.FlushAsync().ConfigureAwait(false); + // Re-add delay to help find socket input consumption bugs more consistently + //await Task.Delay(TimeSpan.FromMilliseconds(5)); + } + } + + public async Task ReadCharAsync() + { + var bytes = new byte[1]; + return (await _stream.ReadAsync(bytes, 0, 1) == 1) ? bytes[0] : -1; + } + + public async Task ReadLineAsync() + { + var builder = new StringBuilder(); + var current = await ReadCharAsync(); + while (current != '\r') + { + builder.Append((char)current); + current = await ReadCharAsync(); + } + + // Consume \n + await ReadCharAsync(); + + return builder.ToString(); + } + + public async Task> ReceiveChunk() + { + var length = int.Parse(await ReadLineAsync(), System.Globalization.NumberStyles.HexNumber); + + var bytes = await Receive(length); + + await ReadLineAsync(); + + return bytes; + } + + public async Task ReceiveChunk(string expected) + { + Assert.Equal(expected, Encoding.ASCII.GetString((await ReceiveChunk()).Span)); + } + + public async Task Receive(params string[] lines) + { + var expected = string.Join("\r\n", lines); + var actual = await Receive(expected.Length); + + Assert.Equal(expected, Encoding.ASCII.GetString(actual.Span)); + } + + private async Task> Receive(int length) + { + var actual = new byte[length]; + int offset = 0; + try + { + while (offset < length) + { + var task = _stream.ReadAsync(actual, offset, actual.Length - offset); + if (!Debugger.IsAttached) + { + task = task.TimeoutAfter(Timeout); + } + + var count = await task.ConfigureAwait(false); + if (count == 0) + { + break; + } + + offset += count; + } + } + catch (TimeoutException ex) when (offset != 0) + { + throw new TimeoutException( + $"Did not receive a complete response within {Timeout}.{Environment.NewLine}{Environment.NewLine}" + + $"Expected:{Environment.NewLine}{length} bytes of data{Environment.NewLine}{Environment.NewLine}" + + $"Actual:{Environment.NewLine}{Encoding.ASCII.GetString(actual, 0, offset)}{Environment.NewLine}", + ex); + } + + return actual.AsMemory(0, offset); + } + + public async Task ReceiveStartsWith(string prefix, int maxLineLength = 1024) + { + var actual = new byte[maxLineLength]; + var offset = 0; + + while (offset < maxLineLength) + { + // Read one char at a time so we don't read past the end of the line. + var task = _stream.ReadAsync(actual, offset, 1); + if (!Debugger.IsAttached) + { + Assert.True(task.Wait(4000), "timeout"); + } + var count = await task.ConfigureAwait(false); + if (count == 0) + { + break; + } + + Assert.True(count == 1); + offset++; + + if (actual[offset - 1] == '\n') + { + break; + } + } + + var actualLine = Encoding.ASCII.GetString(actual, 0, offset); + Assert.StartsWith(prefix, actualLine); + } + + public async Task ReceiveHeaders(params string[] lines) + { + List headers = new List(); + string line; + do + { + line = await ReadLineAsync(); + headers.Add(line); + } while (line != ""); + + foreach (var s in lines) + { + Assert.Contains(s, headers); + } + + return headers.ToArray(); + } + + public Task WaitForConnectionClose() + { + var tcs = new TaskCompletionSource(); + var eventArgs = new SocketAsyncEventArgs(); + eventArgs.SetBuffer(new byte[128], 0, 128); + eventArgs.Completed += ReceiveAsyncCompleted; + eventArgs.UserToken = tcs; + + if (!_socket.ReceiveAsync(eventArgs)) + { + ReceiveAsyncCompleted(this, eventArgs); + } + + return tcs.Task; + } + + private void ReceiveAsyncCompleted(object sender, SocketAsyncEventArgs e) + { + var tcs = (TaskCompletionSource)e.UserToken; + if (e.BytesTransferred == 0) + { + tcs.SetResult(null); + } + else + { + tcs.SetException(new IOException( + $"Expected connection close, received data instead: \"{Encoding.ASCII.GetString(e.Buffer, 0, e.BytesTransferred)}\"")); + } + } + + public static Socket CreateConnectedLoopbackSocket(int port, AddressFamily addressFamily) + { + if (addressFamily != AddressFamily.InterNetwork && addressFamily != AddressFamily.InterNetworkV6) + { + throw new ArgumentException($"TestConnection does not support address family of type {addressFamily}", nameof(addressFamily)); + } + + var socket = new Socket(addressFamily, SocketType.Stream, ProtocolType.Tcp); + var address = addressFamily == AddressFamily.InterNetworkV6 + ? IPAddress.IPv6Loopback + : IPAddress.Loopback; + socket.Connect(new IPEndPoint(address, port)); + return socket; + } + } +} diff --git a/src/IISIntegration/test/Common.Tests/Utilities/TimeoutExtensions.cs b/src/IISIntegration/test/Common.Tests/Utilities/TimeoutExtensions.cs new file mode 100644 index 0000000000..ce7175dff9 --- /dev/null +++ b/src/IISIntegration/test/Common.Tests/Utilities/TimeoutExtensions.cs @@ -0,0 +1,26 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Runtime.CompilerServices; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing; + +namespace Microsoft.AspNetCore.Server.IntegrationTesting +{ + + public static class TimeoutExtensions + { + public static TimeSpan DefaultTimeoutValue = TimeSpan.FromSeconds(300); + + public static Task DefaultTimeout(this Task task, [CallerFilePath] string filePath = null, [CallerLineNumber] int lineNumber = -1) + { + return task.TimeoutAfter(DefaultTimeoutValue, filePath, lineNumber); + } + + public static Task DefaultTimeout(this Task task, [CallerFilePath] string filePath = null, [CallerLineNumber] int lineNumber = -1) + { + return task.TimeoutAfter(DefaultTimeoutValue, filePath, lineNumber); + } + } +} diff --git a/src/IISIntegration/test/CommonLibTests/CommonLibTests.vcxproj b/src/IISIntegration/test/CommonLibTests/CommonLibTests.vcxproj new file mode 100644 index 0000000000..87dbd16675 --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/CommonLibTests.vcxproj @@ -0,0 +1,196 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {1eac8125-1765-4e2d-8cbe-56dc98a1c8c1} + Win32Proj + 10.0.15063.0 + Application + v141 + Unicode + + + + + + + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + + + + + + + + + + + + + + + + + + {ec82302f-d2f0-4727-99d1-eabc0dd9dc3b} + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {09d9d1d6-2951-4e14-bc35-76a23cf9391a} + + + {1533e271-f61b-441b-8b74-59fb61df0552} + + + {cac1267b-8778-4257-aac6-caf481723b01} + + + {d57ea297-6dc2-4bc0-8c91-334863327863} + + + + + + + NotUsing + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + EnableFastChecks + MultiThreadedDebug + Level3 + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ + /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" + stdcpp17 + + + true + Console + ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration + + + + + + + + + NotUsing + Disabled + X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + EnableFastChecks + MultiThreadedDebug + Level3 + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ + /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" + stdcpp17 + + + true + Console + ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration + + + + + + + + + NotUsing + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + MultiThreaded + Level3 + ProgramDatabase + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ + /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" + stdcpp17 + + + true + Console + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + true + ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\$(Configuration)\; + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration + + + + + + + + + NotUsing + X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + MultiThreaded + Level3 + ProgramDatabase + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ + /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" + stdcpp17 + + + true + Console + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + true + ..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\x64\$(Configuration)\; + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration + + + + + + + + \ No newline at end of file diff --git a/src/IISIntegration/test/CommonLibTests/ConfigUtilityTests.cpp b/src/IISIntegration/test/CommonLibTests/ConfigUtilityTests.cpp new file mode 100644 index 0000000000..9b5bf6e9e6 --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/ConfigUtilityTests.cpp @@ -0,0 +1,123 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "gmock/gmock.h" +using ::testing::_; +using ::testing::NiceMock; + +namespace ConfigUtilityTests +{ + using ::testing::Test; + + class ConfigUtilityTest : public Test + { + protected: + void TestHandlerVersion(std::wstring key, std::wstring value, std::wstring expected, HRESULT(*func)(IAppHostElement*, STRU&)) + { + IAppHostElement* retElement = NULL; + + STRU handlerVersion; + + // NiceMock removes warnings about "uninteresting calls", + auto element = std::make_unique>(); + auto innerElement = std::make_unique>(); + auto collection = std::make_unique>(); + auto nameElement = std::make_unique>(); + auto mockProperty = std::make_unique>(); + + ON_CALL(*element, GetElementByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); + ON_CALL(*innerElement, get_Collection(_)) + .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); + ON_CALL(*collection, get_Count(_)) + .WillByDefault(DoAll(testing::SetArgPointee<0>(1), testing::Return(S_OK))); + ON_CALL(*collection, get_Item(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); + ON_CALL(*nameElement, GetPropertyByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); + EXPECT_CALL(*mockProperty, get_StringValue(_)) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(key.c_str())), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(value.c_str())), testing::Return(S_OK))); + + HRESULT hr = func(element.get(), handlerVersion); + + EXPECT_EQ(hr, S_OK); + EXPECT_STREQ(handlerVersion.QueryStr(), expected.c_str()); + } + }; + + TEST_F(ConfigUtilityTest, CheckHandlerVersionKeysAndValues) + { + auto func = ConfigUtility::FindHandlerVersion; + TestHandlerVersion(L"handlerVersion", L"value", L"value", func); + TestHandlerVersion(L"handlerversion", L"value", L"value", func); + TestHandlerVersion(L"HandlerversioN", L"value", L"value", func); + TestHandlerVersion(L"randomvalue", L"value", L"", func); + TestHandlerVersion(L"", L"value", L"", func); + TestHandlerVersion(L"", L"", L"", func); + } + + TEST_F(ConfigUtilityTest, CheckDebugLogFile) + { + auto func = ConfigUtility::FindDebugFile; + + TestHandlerVersion(L"debugFile", L"value", L"value", func); + TestHandlerVersion(L"debugFILE", L"value", L"value", func); + } + + TEST_F(ConfigUtilityTest, CheckDebugLevel) + { + auto func = ConfigUtility::FindDebugLevel; + + TestHandlerVersion(L"debugLevel", L"value", L"value", func); + TestHandlerVersion(L"debugLEVEL", L"value", L"value", func); + } + + TEST(ConfigUtilityTestSingle, MultipleElements) + { + IAppHostElement* retElement = NULL; + STRU handlerVersion; + + auto element = std::make_unique>(); + auto innerElement = std::make_unique>(); + auto collection = std::make_unique>(); + auto nameElement = std::make_unique>(); + auto mockProperty = std::make_unique>(); + + ON_CALL(*element, GetElementByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(innerElement.get()), testing::Return(S_OK))); + ON_CALL(*innerElement, get_Collection(_)) + .WillByDefault(testing::DoAll(testing::SetArgPointee<0>(collection.get()), testing::Return(S_OK))); + ON_CALL(*collection, get_Count(_)) + .WillByDefault(DoAll(testing::SetArgPointee<0>(2), testing::Return(S_OK))); + ON_CALL(*collection, get_Item(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(nameElement.get()), testing::Return(S_OK))); + ON_CALL(*nameElement, GetPropertyByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(mockProperty.get()), testing::Return(S_OK))); + EXPECT_CALL(*mockProperty, get_StringValue(_)) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"key")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"handlerVersion")), testing::Return(S_OK))) + .WillOnce(DoAll(testing::SetArgPointee<0>(SysAllocString(L"value2")), testing::Return(S_OK))); + + HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), handlerVersion); + + EXPECT_EQ(hr, S_OK); + EXPECT_STREQ(handlerVersion.QueryStr(), L"value2"); + } + + TEST(ConfigUtilityTestSingle, IgnoresFailedGetElement) + { + STRU handlerVersion; + + auto element = std::make_unique>(); + ON_CALL(*element, GetElementByName(_, _)) + .WillByDefault(DoAll(testing::SetArgPointee<1>(nullptr), testing::Return(HRESULT_FROM_WIN32( ERROR_INVALID_INDEX )))); + + HRESULT hr = ConfigUtility::FindHandlerVersion(element.get(), handlerVersion); + + EXPECT_EQ(hr, S_OK); + EXPECT_STREQ(handlerVersion.QueryStr(), L""); + } +} diff --git a/src/IISIntegration/test/CommonLibTests/FileOutputManagerTests.cpp b/src/IISIntegration/test/CommonLibTests/FileOutputManagerTests.cpp new file mode 100644 index 0000000000..66a9ff7f0b --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/FileOutputManagerTests.cpp @@ -0,0 +1,152 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "gtest/internal/gtest-port.h" +#include "FileOutputManager.h" + +class FileManagerWrapper +{ +public: + FileOutputManager* manager; + FileManagerWrapper(FileOutputManager* m) + : manager(m) + { + manager->Start(); + } + + ~FileManagerWrapper() + { + delete manager; + } +}; + +namespace FileOutManagerStartupTests +{ + using ::testing::Test; + class FileOutputManagerTest : public Test + { + protected: + void + Test(std::wstring fileNamePrefix, FILE* out) + { + PCWSTR expected = L"test"; + + auto tempDirectory = TempDirectory(); + FileOutputManager* pManager = new FileOutputManager(fileNamePrefix, tempDirectory.path()); + + { + FileManagerWrapper wrapper(pManager); + + wprintf(expected, out); + } + + for (auto & p : std::filesystem::directory_iterator(tempDirectory.path())) + { + std::wstring filename(p.path().filename()); + ASSERT_EQ(filename.substr(0, fileNamePrefix.size()), fileNamePrefix); + + std::wstring content = Helpers::ReadFileContent(std::wstring(p.path())); + } + } + }; + + TEST_F(FileOutputManagerTest, WriteToFileCheckContentsWritten) + { + Test(L"", stdout); + Test(L"log", stdout); + } + + TEST_F(FileOutputManagerTest, WriteToFileCheckContentsWrittenErr) + { + Test(L"", stderr); + Test(L"log", stderr); + } +} + +namespace FileOutManagerOutputTests +{ + TEST(FileOutManagerOutputTest, StdOut) + { + PCWSTR expected = L"test"; + + auto tempDirectory = TempDirectory(); + + FileOutputManager* pManager = new FileOutputManager(L"", tempDirectory.path()); + { + FileManagerWrapper wrapper(pManager); + + fwprintf(stdout, expected); + pManager->Stop(); + + auto output = pManager->GetStdOutContent(); + ASSERT_FALSE(output.empty()); + + ASSERT_STREQ(output.c_str(), expected); + } + } + + TEST(FileOutManagerOutputTest, StdErr) + { + PCWSTR expected = L"test"; + + auto tempDirectory = TempDirectory(); + + FileOutputManager* pManager = new FileOutputManager(L"", tempDirectory.path().c_str()); + { + FileManagerWrapper wrapper(pManager); + + fwprintf(stderr, expected); + pManager->Stop(); + + auto output = pManager->GetStdOutContent(); + ASSERT_FALSE(output.empty()); + + ASSERT_STREQ(output.c_str(), expected); + } + } + + TEST(FileOutManagerOutputTest, CapAt30KB) + { + PCWSTR expected = L"hello world"; + + auto tempDirectory = TempDirectory(); + + FileOutputManager* pManager = new FileOutputManager(L"", tempDirectory.path()); + { + FileManagerWrapper wrapper(pManager); + + for (int i = 0; i < 3000; i++) + { + wprintf(expected); + } + pManager->Stop(); + auto output = pManager->GetStdOutContent(); + ASSERT_FALSE(output.empty()); + + ASSERT_EQ(output.size(), 30000); + } + } + + TEST(FileOutManagerOutputTest, StartStopRestoresCorrectly) + { + PCWSTR expected = L"test"; + + auto tempDirectory = TempDirectory(); + + for (int i = 0; i < 10; i++) + { + FileOutputManager* pManager = new FileOutputManager(L"", tempDirectory.path()); + { + FileManagerWrapper wrapper(pManager); + + wprintf(expected); + pManager->Stop(); + auto output = pManager->GetStdOutContent(); + ASSERT_FALSE(output.empty()); + + ASSERT_STREQ(output.c_str(), expected); + } + } + } +} diff --git a/src/IISIntegration/test/CommonLibTests/GlobalVersionTests.cpp b/src/IISIntegration/test/CommonLibTests/GlobalVersionTests.cpp new file mode 100644 index 0000000000..f38c9361d2 --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/GlobalVersionTests.cpp @@ -0,0 +1,153 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "gtest/internal/gtest-port.h" + +namespace GlobalVersionTests +{ + using ::testing::Test; + namespace fs = std::filesystem; + + class GlobalVersionTest : public Test + { + protected: + void + RemoveFileNamePath(PCWSTR dllPath, PCWSTR expected) + { + std::wstring res = GlobalVersionUtility::RemoveFileNameFromFolderPath(dllPath); + EXPECT_STREQ(res.c_str(), expected); + } + }; + + TEST_F(GlobalVersionTest, RemovesPathCorrectly) + { + RemoveFileNamePath(L"test\\log.txt", L"test"); + RemoveFileNamePath(L"test\\log", L"test"); + RemoveFileNamePath(L"C:\\Program Files\\IIS\\aspnetcorev2.dll", L"C:\\Program Files\\IIS"); + RemoveFileNamePath(L"test\\log.txt", L"test"); + } + + TEST(GetRequestHandlerVersions, GetFolders) + { + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / L"2.0.0")); + + auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.path().c_str()); + EXPECT_EQ(res.size(), 1); + EXPECT_EQ(res.at(0), fx_ver_t(2, 0, 0, std::wstring())); + } + + TEST(GetRequestHandlerVersions, GetFolderPreview) + { + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / L"2.0.0-preview")); + + auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.path().c_str()); + EXPECT_EQ(res.size(), 1); + EXPECT_EQ(res.at(0), fx_ver_t(2, 0, 0, std::wstring(L"-preview"))); + } + + TEST(GetRequestHandlerVersions, GetFolderManyVersions) + { + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / + L"2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / + L"1.9.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / + L"2.1.0")); + + auto res = GlobalVersionUtility::GetRequestHandlerVersions(tempPath.path().c_str()); + EXPECT_EQ(res.size(), 3); + EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(1, 9, 0, std::wstring())) != std::end(res)); + EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(2, 0, 0, std::wstring())) != std::end(res)); + EXPECT_TRUE(std::find(res.begin(), res.end(), fx_ver_t(2, 1, 0, std::wstring())) != std::end(res)); + } + + TEST(FindHighestGlobalVersion, HighestVersionWithSingleFolder) + { + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.path().c_str()); + + EXPECT_STREQ(res.c_str(), L"2.0.0"); + } + + TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersions) + { + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0")); + + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.path().c_str()); + + EXPECT_STREQ(res.c_str(), L"2.1.0"); + } + + TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersionsPreview) + { + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.2.0-preview")); + + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.path().c_str()); + + EXPECT_STREQ(res.c_str(), L"2.2.0-preview"); + } + + TEST(FindHighestGlobalVersion, HighestVersionWithMultipleVersionNoPreview) + { + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0-preview")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0")); + + auto res = GlobalVersionUtility::FindHighestGlobalVersion(tempPath.path().c_str()); + + EXPECT_STREQ(res.c_str(), L"2.1.0"); + } + + TEST(GetGlobalRequestHandlerPath, FindHighestVersionNoHandlerName) + { + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.path().c_str(), L"", L"aspnetcorev2_outofprocess.dll"); + + EXPECT_STREQ(result.c_str(), (tempPath.path() / L"2.0.0\\aspnetcorev2_outofprocess.dll").c_str()); + } + + TEST(GetGlobalRequestHandlerPath, FindHighestVersionPreviewWins) + { + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0-preview")); + + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.path().c_str(), L"", L"aspnetcorev2_outofprocess.dll"); + + EXPECT_STREQ(result.c_str(), (tempPath.path() / L"2.1.0-preview\\aspnetcorev2_outofprocess.dll").c_str()); + } + + TEST(GetGlobalRequestHandlerPath, FindHighestVersionSpecificVersion) + { + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0-preview")); + + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.path().c_str(), L"2.0.0", L"aspnetcorev2_outofprocess.dll"); + + EXPECT_STREQ(result.c_str(), (tempPath.path() / L"2.0.0\\aspnetcorev2_outofprocess.dll").c_str()); + } + + TEST(GetGlobalRequestHandlerPath, FindHighestVersionSpecificPreview) + { + auto tempPath = TempDirectory(); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.0.0")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.1.0-preview")); + EXPECT_TRUE(fs::create_directories(tempPath.path() / "2.2.0")); + + + auto result = GlobalVersionUtility::GetGlobalRequestHandlerPath(tempPath.path().c_str(), L"2.1.0-preview", L"aspnetcorev2_outofprocess.dll"); + + EXPECT_STREQ(result.c_str(), (tempPath.path() / L"2.1.0-preview\\aspnetcorev2_outofprocess.dll").c_str()); + } +} diff --git a/src/IISIntegration/test/CommonLibTests/Helpers.cpp b/src/IISIntegration/test/CommonLibTests/Helpers.cpp new file mode 100644 index 0000000000..ccca6cad5b --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/Helpers.cpp @@ -0,0 +1,41 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#include "stdafx.h" + +std::wstring +Helpers::ReadFileContent(std::wstring file) +{ + std::wcout << file << std::endl; + + std::fstream t(file); + std::stringstream buffer; + buffer << t.rdbuf(); + + int nChars = MultiByteToWideChar(CP_ACP, 0, buffer.str().c_str(), -1, NULL, 0); + + std::wstring retVal(nChars, '\0'); + + MultiByteToWideChar(CP_UTF8, 0, buffer.str().c_str(), -1, retVal.data(), nChars); + + return retVal; +} + +TempDirectory::TempDirectory() +{ + UUID uuid; + UuidCreate(&uuid); + RPC_CSTR szUuid = NULL; + if (UuidToStringA(&uuid, &szUuid) == RPC_S_OK) + { + m_path = std::filesystem::temp_directory_path() / reinterpret_cast(szUuid); + RpcStringFreeA(&szUuid); + return; + } + throw std::exception("Cannot create temp directory"); +} + +TempDirectory::~TempDirectory() +{ + std::filesystem::remove_all(m_path); +} diff --git a/src/IISIntegration/test/CommonLibTests/Helpers.h b/src/IISIntegration/test/CommonLibTests/Helpers.h new file mode 100644 index 0000000000..67256966bb --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/Helpers.h @@ -0,0 +1,28 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +class Helpers +{ +public: + static + std::wstring + ReadFileContent(std::wstring file); +}; + +class TempDirectory +{ +public: + + TempDirectory(); + + ~TempDirectory(); + + std::filesystem::path path() const + { + return m_path; + } + +private: + std::filesystem::path m_path; +}; diff --git a/src/IISIntegration/test/CommonLibTests/NativeTests.targets b/src/IISIntegration/test/CommonLibTests/NativeTests.targets new file mode 100644 index 0000000000..f3d2caf930 --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/NativeTests.targets @@ -0,0 +1,8 @@ + + + $(VCIDEInstallDir)..\CommonExtensions\Microsoft\TestWindow\vstest.console.exe + + + + + \ No newline at end of file diff --git a/src/IISIntegration/test/CommonLibTests/PipeOutputManagerTests.cpp b/src/IISIntegration/test/CommonLibTests/PipeOutputManagerTests.cpp new file mode 100644 index 0000000000..385d6df9e0 --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/PipeOutputManagerTests.cpp @@ -0,0 +1,162 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "gtest/internal/gtest-port.h" +#include "PipeOutputManager.h" + +class FileManagerWrapper +{ +public: + PipeOutputManager * manager; + FileManagerWrapper(PipeOutputManager* m) + : manager(m) + { + manager->Start(); + } + + ~FileManagerWrapper() + { + delete manager; + } +}; + +namespace PipeOutputManagerTests +{ + TEST(PipeManagerOutputTest, StdOut) + { + PCWSTR expected = L"test"; + + PipeOutputManager* pManager = new PipeOutputManager(true); + + pManager->Start(); + fwprintf(stdout, expected); + pManager->Stop(); + + auto output = pManager->GetStdOutContent(); + ASSERT_STREQ(output.c_str(), expected); + delete pManager; + } + + TEST(PipeManagerOutputTest, StdOutMultiToWide) + { + PipeOutputManager* pManager = new PipeOutputManager(true); + + pManager->Start(); + fprintf(stdout, "test"); + pManager->Stop(); + + auto output = pManager->GetStdOutContent(); + ASSERT_STREQ(output.c_str(), L"test"); + delete pManager; + } + + TEST(PipeManagerOutputTest, StdErr) + { + PCWSTR expected = L"test"; + + PipeOutputManager* pManager = new PipeOutputManager(); + + pManager->Start(); + fwprintf(stderr, expected); + pManager->Stop(); + + auto output = pManager->GetStdOutContent(); + ASSERT_STREQ(output.c_str(), expected); + delete pManager; + } + + TEST(PipeManagerOutputTest, CheckMaxPipeSize) + { + std::wstring test; + for (int i = 0; i < 3000; i++) + { + test.append(L"hello world"); + } + + PipeOutputManager* pManager = new PipeOutputManager(); + + pManager->Start(); + wprintf(test.c_str()); + pManager->Stop(); + + auto output = pManager->GetStdOutContent(); + ASSERT_EQ(output.size(), (DWORD)30000); + delete pManager; + } + + TEST(PipeManagerOutputTest, SetInvalidHandlesForErrAndOut) + { + auto m_fdPreviousStdOut = _dup(_fileno(stdout)); + auto m_fdPreviousStdErr = _dup(_fileno(stderr)); + + SetStdHandle(STD_ERROR_HANDLE, INVALID_HANDLE_VALUE); + SetStdHandle(STD_OUTPUT_HANDLE, INVALID_HANDLE_VALUE); + + PCWSTR expected = L"test"; + + PipeOutputManager* pManager = new PipeOutputManager(); + pManager->Start(); + + _dup2(m_fdPreviousStdOut, _fileno(stdout)); + _dup2(m_fdPreviousStdErr, _fileno(stderr)); + + // Test will fail if we didn't redirect stdout back to a file descriptor. + // This is because gtest relies on console output to know if a test succeeded or failed. + // If the output still points to a file/pipe, the test (and all other tests after it) will fail. + delete pManager; + } + + TEST(PipeManagerOutputTest, CreateDeleteMultipleTimesStdOutWorks) + { + for (int i = 0; i < 10; i++) + { + auto stdoutBefore = _fileno(stdout); + auto stderrBefore = _fileno(stderr); + PCWSTR expected = L"test"; + + PipeOutputManager* pManager = new PipeOutputManager(); + + pManager->Start(); + fwprintf(stdout, expected); + + pManager->Stop(); + + auto output = pManager->GetStdOutContent(); + ASSERT_STREQ(output.c_str(), expected); + ASSERT_EQ(stdoutBefore, _fileno(stdout)); + ASSERT_EQ(stderrBefore, _fileno(stderr)); + delete pManager; + } + // When this returns, we get an AV from gtest. + } + + TEST(PipeManagerOutputTest, CreateDeleteKeepOriginalStdErr) + { + for (int i = 0; i < 10; i++) + { + auto stdoutBefore = _fileno(stdout); + auto stderrBefore = _fileno(stderr); + auto stdoutHandle = GetStdHandle(STD_OUTPUT_HANDLE); + auto stderrHandle = GetStdHandle(STD_ERROR_HANDLE); + PCWSTR expected = L"test"; + + PipeOutputManager* pManager = new PipeOutputManager(); + + pManager->Start(); + fwprintf(stderr, expected); + pManager->Stop(); + + auto output = pManager->GetStdOutContent(); + ASSERT_STREQ(output.c_str(), expected); + ASSERT_EQ(stdoutBefore, _fileno(stdout)); + + ASSERT_EQ(stderrBefore, _fileno(stderr)); + + delete pManager; + } + + wprintf(L"Hello!"); + } +} + diff --git a/src/IISIntegration/test/CommonLibTests/exception_handler_tests.cpp b/src/IISIntegration/test/CommonLibTests/exception_handler_tests.cpp new file mode 100644 index 0000000000..d0a9e97fdb --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/exception_handler_tests.cpp @@ -0,0 +1,49 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" + +TEST(CaughtExceptionHResult, ReturnsOutOfMemoryForBadAlloc) +{ + HRESULT hr; + try + { + throw std::bad_alloc(); + } + catch(...) + { + hr = CaughtExceptionHResult(); + } + + EXPECT_EQ(E_OUTOFMEMORY, hr); +} + +TEST(CaughtExceptionHResult, ReturnsValueForSystemError) +{ + HRESULT hr; + try + { + throw std::system_error(E_INVALIDARG, std::system_category()); + } + catch(...) + { + hr = CaughtExceptionHResult(); + } + + EXPECT_EQ(E_INVALIDARG, hr); +} + +TEST(CaughtExceptionHResult, ReturnsUhandledExceptionForOtherExceptions) +{ + HRESULT hr; + try + { + throw E_INVALIDARG; + } + catch(...) + { + hr = CaughtExceptionHResult(); + } + + EXPECT_EQ(HRESULT_FROM_WIN32(ERROR_UNHANDLED_EXCEPTION), hr); +} diff --git a/src/IISIntegration/test/CommonLibTests/fakeclasses.h b/src/IISIntegration/test/CommonLibTests/fakeclasses.h new file mode 100644 index 0000000000..a6f4a3e111 --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/fakeclasses.h @@ -0,0 +1,190 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#pragma once + +#include "gtest/gtest.h" +#include "gmock/gmock.h" +#include "InProcessOptions.h" + +class MockProperty : public IAppHostProperty +{ +public: + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, QueryInterface, HRESULT(REFIID riid, void ** ppvObject)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, AddRef, ULONG()); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Release, ULONG()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Name, HRESULT(BSTR* pbstrValue)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Value, HRESULT(VARIANT * pVariant)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, put_Value, HRESULT(VARIANT value)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Clear, HRESULT()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_StringValue, HRESULT(BSTR* pbstrValue)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Exception, HRESULT(IAppHostPropertyException ** ppException)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT * pValue)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, SetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT value)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Schema, HRESULT(IAppHostPropertySchema ** ppSchema)); +}; + +class MockCollection : public IAppHostElementCollection +{ +public: + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, QueryInterface, HRESULT(REFIID riid, void ** ppvObject)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, AddRef, ULONG()); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Release, ULONG()); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Clear, HRESULT()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Schema, HRESULT(IAppHostCollectionSchema** pSchema)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Count, HRESULT(DWORD * dwordElem)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, get_Item, HRESULT(VARIANT cIndex, IAppHostElement ** ppElement)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, AddElement, HRESULT(IAppHostElement * pElement, INT cPosition)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, DeleteElement, HRESULT(VARIANT cIndex)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, CreateNewElement, HRESULT(BSTR bstrElementName, IAppHostElement** ppElement)); +}; + +class MockElement : public IAppHostElement +{ +public: + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, QueryInterface, HRESULT(REFIID riid, void ** ppvObject)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, AddRef, ULONG()); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Release, ULONG()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Name, HRESULT(BSTR * pbstrName)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Collection, HRESULT(IAppHostElementCollection ** ppCollection)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Properties, HRESULT(IAppHostPropertyCollection ** ppProperties)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_ChildElements, HRESULT(IAppHostChildElementCollection ** ppElements)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT * pValue)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, SetMetadata, HRESULT(BSTR bstrMetadataType, VARIANT value)); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Schema, HRESULT(IAppHostElementSchema** pSchema)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetElementByName, HRESULT(BSTR bstrSubName, IAppHostElement ** ppElement)); + MOCK_METHOD2_WITH_CALLTYPE(__stdcall, GetPropertyByName, HRESULT(BSTR bstrSubName, IAppHostProperty ** ppProperty)); + MOCK_METHOD0_WITH_CALLTYPE(__stdcall, Clear, HRESULT()); + MOCK_METHOD1_WITH_CALLTYPE(__stdcall, get_Methods, HRESULT(IAppHostMethodCollection ** ppMethods)); +}; + +class MockHttpServer : public IHttpServer +{ + // Inherited via IHttpServer + virtual BOOL IsCommandLineLaunch(VOID) const override + { + return 0; + } + virtual PCWSTR GetAppPoolName(VOID) const override + { + return PCWSTR(); + } + virtual HRESULT AssociateWithThreadPool(HANDLE hHandle, LPOVERLAPPED_COMPLETION_ROUTINE completionRoutine) override + { + return E_NOTIMPL; + } + virtual VOID IncrementThreadCount(VOID) override + { + return VOID(); + } + virtual VOID DecrementThreadCount(VOID) override + { + return VOID(); + } + virtual VOID ReportUnhealthy(PCWSTR pszReasonString, HRESULT hrReason) override + { + return VOID(); + } + virtual VOID RecycleProcess(PCWSTR pszReason) override + { + return VOID(); + } + virtual IAppHostAdminManager * GetAdminManager(VOID) const override + { + return nullptr; + } + virtual HRESULT GetFileInfo(PCWSTR pszPhysicalPath, HANDLE hUserToken, PSID pSid, PCWSTR pszChangeNotificationPath, HANDLE hChangeNotificationToken, BOOL fCache, IHttpFileInfo ** ppFileInfo, IHttpTraceContext * pHttpTraceContext = NULL) override + { + return E_NOTIMPL; + } + virtual HRESULT FlushKernelCache(PCWSTR pszUrl) override + { + return E_NOTIMPL; + } + virtual HRESULT DoCacheOperation(CACHE_OPERATION cacheOperation, IHttpCacheKey * pCacheKey, IHttpCacheSpecificData ** ppCacheSpecificData, IHttpTraceContext * pHttpTraceContext = NULL) override + { + return E_NOTIMPL; + } + virtual GLOBAL_NOTIFICATION_STATUS NotifyCustomNotification(ICustomNotificationProvider * pCustomOutput) override + { + return GLOBAL_NOTIFICATION_STATUS(); + } + virtual IHttpPerfCounterInfo * GetPerfCounterInfo(VOID) override + { + return nullptr; + } + virtual VOID RecycleApplication(PCWSTR pszAppConfigPath) override + { + return VOID(); + } + virtual VOID NotifyConfigurationChange(PCWSTR pszPath) override + { + return VOID(); + } + virtual VOID NotifyFileChange(PCWSTR pszFileName) override + { + return VOID(); + } + virtual IDispensedHttpModuleContextContainer * DispenseContainer(VOID) override + { + return nullptr; + } + virtual HRESULT AddFragmentToCache(HTTP_DATA_CHUNK * pDataChunk, PCWSTR pszFragmentName) override + { + return E_NOTIMPL; + } + virtual HRESULT ReadFragmentFromCache(PCWSTR pszFragmentName, BYTE * pvBuffer, DWORD cbSize, DWORD * pcbCopied) override + { + return E_NOTIMPL; + } + virtual HRESULT RemoveFragmentFromCache(PCWSTR pszFragmentName) override + { + return E_NOTIMPL; + } + virtual HRESULT GetWorkerProcessSettings(IWpfSettings ** ppWorkerProcessSettings) override + { + return E_NOTIMPL; + } + virtual HRESULT GetProtocolManagerCustomInterface(PCWSTR pProtocolManagerDll, PCWSTR pProtocolManagerDllInitFunction, DWORD dwCustomInterfaceId, PVOID * ppCustomInterface) override + { + return E_NOTIMPL; + } + virtual BOOL SatisfiesPrecondition(PCWSTR pszPrecondition, BOOL * pfUnknownPrecondition = NULL) const override + { + return 0; + } + virtual IHttpTraceContext * GetTraceContext(VOID) const override + { + return nullptr; + } + virtual HRESULT RegisterFileChangeMonitor(PCWSTR pszPath, HANDLE hToken, IHttpFileMonitor ** ppFileMonitor) override + { + return E_NOTIMPL; + } + virtual HRESULT GetExtendedInterface(HTTP_SERVER_INTERFACE_VERSION version, PVOID * ppInterface) override + { + return E_NOTIMPL; + } +}; + + +class MockHttpApplication: public IHttpApplication +{ +public: + MOCK_CONST_METHOD0(GetApplicationPhysicalPath, PCWSTR ()); + MOCK_CONST_METHOD0(GetApplicationId, PCWSTR ()); + MOCK_CONST_METHOD0(GetAppConfigPath, PCWSTR ()); + MOCK_METHOD0(GetModuleContextContainer, IHttpModuleContextContainer* ()); +}; + +class MockInProcessOptions : public InProcessOptions +{ +public: + static + MockInProcessOptions* + CreateConfig() + { + return new MockInProcessOptions; + } +}; + diff --git a/src/IISIntegration/test/CommonLibTests/hostfxr_utility_tests.cpp b/src/IISIntegration/test/CommonLibTests/hostfxr_utility_tests.cpp new file mode 100644 index 0000000000..01c9541429 --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/hostfxr_utility_tests.cpp @@ -0,0 +1,122 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include +#include +#include +#include "hostfxr_utility.h" +#include "Environment.h" + +TEST(ParseHostFxrArguments, BasicHostFxrArguments) +{ + std::vector bstrArray; + + HOSTFXR_UTILITY::AppendArguments( + L"exec \"test.dll\"", // args + L"invalid", // physical path to application + bstrArray); // args array. + + EXPECT_EQ(2, bstrArray.size()); + ASSERT_STREQ(L"exec", bstrArray[0].c_str()); + ASSERT_STREQ(L"test.dll", bstrArray[1].c_str()); +} + +TEST(ParseHostFxrArguments, NoExecProvided) +{ + std::vector bstrArray; + + HOSTFXR_UTILITY::AppendArguments( + L"test.dll", // args + L"ignored", // physical path to application + bstrArray); // args array. + + EXPECT_EQ(1, bstrArray.size()); + ASSERT_STREQ(L"test.dll", bstrArray[0].c_str()); +} + +TEST(ParseHostFxrArguments, ConvertDllToAbsolutePath) +{ + std::vector bstrArray; + // we need to use existing dll so let's use ntdll that we know exists everywhere + auto system32 = Environment::ExpandEnvironmentVariables(L"%WINDIR%\\System32"); + HOSTFXR_UTILITY::AppendArguments( + L"exec \"ntdll.dll\"", // args + system32, // physical path to application + bstrArray, // args array. + true); // expandDllPaths + + EXPECT_EQ(2, bstrArray.size()); + ASSERT_STREQ(L"exec", bstrArray[0].c_str()); + ASSERT_STREQ((system32 + L"\\ntdll.dll").c_str(), bstrArray[1].c_str()); +} + +TEST(ParseHostFxrArguments, ProvideNoArgs_InvalidArgs) +{ + std::vector bstrArray; + std::filesystem::path struHostFxrDllLocation; + std::filesystem::path struExeLocation; + + EXPECT_THROW(HOSTFXR_UTILITY::GetHostFxrParameters( + L"dotnet", // processPath + L"some\\path", // application physical path, ignored. + L"", //arguments + struHostFxrDllLocation, + struExeLocation, + bstrArray), // args array. + InvalidOperationException); +} + +TEST(GetAbsolutePathToDotnetFromProgramFiles, BackupWorks) +{ + STRU struAbsolutePathToDotnet; + BOOL fDotnetInProgramFiles; + BOOL is64Bit; + BOOL fIsWow64 = FALSE; + SYSTEM_INFO systemInfo; + IsWow64Process(GetCurrentProcess(), &fIsWow64); + if (fIsWow64) + { + is64Bit = FALSE; + } + else + { + GetNativeSystemInfo(&systemInfo); + is64Bit = systemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64; + } + + if (is64Bit) + { + fDotnetInProgramFiles = std::filesystem::is_regular_file(L"C:/Program Files/dotnet/dotnet.exe"); + } + else + { + fDotnetInProgramFiles = std::filesystem::is_regular_file(L"C:/Program Files (x86)/dotnet/dotnet.exe"); + } + + auto dotnetPath = HOSTFXR_UTILITY::GetAbsolutePathToDotnetFromProgramFiles(); + if (fDotnetInProgramFiles) + { + EXPECT_TRUE(dotnetPath.has_value()); + } + else + { + EXPECT_FALSE(dotnetPath.has_value()); + } +} + +TEST(GetHostFxrArguments, InvalidParams) +{ + std::vector bstrArray; + std::filesystem::path struHostFxrDllLocation; + std::filesystem::path struExeLocation; + + EXPECT_THROW(HOSTFXR_UTILITY::GetHostFxrParameters( + L"bogus", // processPath + L"", // application physical path, ignored. + L"ignored", //arguments + struHostFxrDllLocation, + struExeLocation, + bstrArray), // args array. + InvalidOperationException); +} diff --git a/src/IISIntegration/test/CommonLibTests/inprocess_application_tests.cpp b/src/IISIntegration/test/CommonLibTests/inprocess_application_tests.cpp new file mode 100644 index 0000000000..d2ec985723 --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/inprocess_application_tests.cpp @@ -0,0 +1,85 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" + +#include +#include "inprocessapplication.h" +#include "fakeclasses.h" + +using ::testing::_; +using ::testing::NiceMock; + +// Externals defined in inprocess +BOOL g_fProcessDetach; +HANDLE g_hEventLog; + +namespace InprocessTests +{ + TEST(InProcessTest, NoNullRefForExePath) + { + MockHttpServer server; + NiceMock application; + + ON_CALL(application, GetApplicationPhysicalPath()) + .WillByDefault(testing::Return(L"Some path")); + + ON_CALL(application, GetAppConfigPath()) + .WillByDefault(testing::Return(L"")); + + ON_CALL(application, GetApplicationId()) + .WillByDefault(testing::Return(L"")); + + auto requestHandlerConfig = std::unique_ptr(MockInProcessOptions::CreateConfig()); + + std::wstring exePath(L"hello"); + + std::array parameters{ + {"InProcessExeLocation", exePath.data()} + }; + + IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), parameters.data(), 1); + + ASSERT_STREQ(app->QueryExeLocation().c_str(), L"hello"); + } + + TEST(InProcessTest, GeneratesVirtualPath) + { + MockHttpServer server; + NiceMock application; + + ON_CALL(application, GetApplicationPhysicalPath()) + .WillByDefault(testing::Return(L"Some path")); + + ON_CALL(application, GetAppConfigPath()) + .WillByDefault(testing::Return(L"SECTION1/SECTION2/SECTION3/SECTION4/SECTION5")); + + ON_CALL(application, GetApplicationId()) + .WillByDefault(testing::Return(L"")); + + auto requestHandlerConfig = std::unique_ptr(MockInProcessOptions::CreateConfig()); + IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), nullptr, 0); + + ASSERT_STREQ(app->QueryApplicationVirtualPath().c_str(), L"/SECTION5"); + } + + TEST(InProcessTest, GeneratesVirtualPathForDefaultApp) + { + MockHttpServer server; + NiceMock application; + + ON_CALL(application, GetApplicationPhysicalPath()) + .WillByDefault(testing::Return(L"Some path")); + + ON_CALL(application, GetAppConfigPath()) + .WillByDefault(testing::Return(L"SECTION1/SECTION2/SECTION3/SECTION4")); + + ON_CALL(application, GetApplicationId()) + .WillByDefault(testing::Return(L"")); + + auto requestHandlerConfig = std::unique_ptr(MockInProcessOptions::CreateConfig()); + IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), nullptr, 0); + + ASSERT_STREQ(app->QueryApplicationVirtualPath().c_str(), L"/"); + } +} diff --git a/src/IISIntegration/test/CommonLibTests/main.cpp b/src/IISIntegration/test/CommonLibTests/main.cpp new file mode 100644 index 0000000000..1ad0a10ccd --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/main.cpp @@ -0,0 +1,12 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" + +DECLARE_DEBUG_PRINT_OBJECT2("tests", ASPNETCORE_DEBUG_FLAG_INFO | ASPNETCORE_DEBUG_FLAG_CONSOLE); + +int wmain(int argc, wchar_t* argv[]) +{ + ::testing::InitGoogleTest(&argc, argv); + RUN_ALL_TESTS(); +} diff --git a/src/IISIntegration/test/CommonLibTests/stdafx.h b/src/IISIntegration/test/CommonLibTests/stdafx.h new file mode 100644 index 0000000000..4b9ac7cd27 --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/stdafx.h @@ -0,0 +1,59 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +#define WIN32_LEAN_AND_MEAN + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include "stringa.h" +#include "stringu.h" +#include "dbgutil.h" +#include "ahutil.h" +#include "multisz.h" +#include "multisza.h" +#include "base64.h" +#include +#include +#include +#include +#include + +#include "stringu.h" +#include "stringa.h" +#include "multisz.h" +#include "dbgutil.h" +#include "hashfn.h" + +#include "requesthandler_config.h" +#include "hostfxr_utility.h" +#include "config_utility.h" +#include "environmentvariablehash.h" +#include "iapplication.h" +#include "debugutil.h" +#include "requesthandler.h" +#include "resources.h" +#include "aspnetcore_msg.h" +#include "Helpers.h" +#include "GlobalVersionUtility.h" + +#undef assert // Macro redefinition in IISLib. +#include "gtest/gtest.h" +#include "fakeclasses.h" + diff --git a/src/IISIntegration/test/CommonLibTests/utility_tests.cpp b/src/IISIntegration/test/CommonLibTests/utility_tests.cpp new file mode 100644 index 0000000000..ee69d79054 --- /dev/null +++ b/src/IISIntegration/test/CommonLibTests/utility_tests.cpp @@ -0,0 +1,75 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +#include "stdafx.h" +#include "Environment.h" +#include "StringHelpers.h" + +TEST(PassUnexpandedEnvString, ExpandsResult) +{ + HRESULT hr = S_OK; + PCWSTR unexpandedString = L"ANCM_TEST_ENV_VAR"; + PCWSTR unexpandedStringValue = L"foobar"; + STRU struExpandedString; + SetEnvironmentVariable(L"ANCM_TEST_ENV_VAR", unexpandedStringValue); + + hr = struExpandedString.CopyAndExpandEnvironmentStrings(L"%ANCM_TEST_ENV_VAR%"); + EXPECT_EQ(hr, S_OK); + EXPECT_STREQ(L"foobar", struExpandedString.QueryStr()); +} + +TEST(PassUnexpandedEnvString, LongStringExpandsResults) +{ + HRESULT hr = S_OK; + PCWSTR unexpandedString = L"ANCM_TEST_ENV_VAR_LONG"; + STRU struStringValue; + STACK_STRU(struExpandedString, MAX_PATH); + + struStringValue.Append(L"TestValueThatIsLongerThan256CharactersLongToTriggerResize"); + struStringValue.Append(L"TestValueThatIsLongerThan256CharactersLongToTriggerResize"); + struStringValue.Append(L"TestValueThatIsLongerThan256CharactersLongToTriggerResize"); + struStringValue.Append(L"TestValueThatIsLongerThan256CharactersLongToTriggerResize"); + struStringValue.Append(L"TestValueThatIsLongerThan256CharactersLongToTriggerResize"); + struStringValue.Append(L"TestValueThatIsLongerThan256CharactersLongToTriggerResize"); + + SetEnvironmentVariable(unexpandedString, struStringValue.QueryStr()); + + hr = struExpandedString.CopyAndExpandEnvironmentStrings(L"%ANCM_TEST_ENV_VAR_LONG%"); + EXPECT_EQ(hr, S_OK); + EXPECT_EQ(struStringValue.QueryCCH(), struExpandedString.QueryCCH()); + // The values are exactly the same, however EXPECT_EQ is returning false. + //EXPECT_EQ(struStringValue.QueryStr(), struExpandedString.QueryStr()); + EXPECT_STREQ(struStringValue.QueryStr(), struExpandedString.QueryStr()); +} + + +TEST(GetEnvironmentVariableValue, ReturnsCorrectLenght) +{ + SetEnvironmentVariable(L"RANDOM_ENV_VAR_1", L"test"); + + auto result = Environment::GetEnvironmentVariableValue(L"RANDOM_ENV_VAR_1"); + EXPECT_TRUE(result.has_value()); + EXPECT_EQ(result.value().length(), 4); + EXPECT_STREQ(result.value().c_str(), L"test"); +} + + +TEST(GetEnvironmentVariableValue, ReturnsNulloptWhenNotFound) +{ + auto result = Environment::GetEnvironmentVariableValue(L"RANDOM_ENV_VAR_2"); + EXPECT_FALSE(result.has_value()); +} + +TEST(CheckStringHelpers, FormatWithoutContentDoesNotIncreaseSizeString) +{ + std::string testString = "test"; + auto result = format(testString); + EXPECT_EQ(testString.size(), result.size()); +} + +TEST(CheckStringHelpers, FormatWithoutContentDoesNotIncreaseSizeWstring) +{ + std::wstring testString = L"test"; + auto result = format(testString); + EXPECT_EQ(testString.size(), result.size()); +} diff --git a/src/IISIntegration/test/Directory.Build.props b/src/IISIntegration/test/Directory.Build.props new file mode 100644 index 0000000000..edfd666254 --- /dev/null +++ b/src/IISIntegration/test/Directory.Build.props @@ -0,0 +1,16 @@ + + + + + + netcoreapp2.2 + $(DeveloperBuildTestTfms) + $(StandardTestTfms) + $(StandardTestTfms);net461 + + + + + + diff --git a/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs b/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs new file mode 100644 index 0000000000..2e4a7b1c40 --- /dev/null +++ b/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs @@ -0,0 +1,39 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Diagnostics; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; +using Xunit.Sdk; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class BackwardsCompatibilityTests : FixtureLoggedTest + { + private readonly IISTestSiteFixture _fixture; + + public BackwardsCompatibilityTests(IISTestSiteFixture fixture) : base(fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task CheckBackwardsCompatibilityIsUsed() + { + var response = await _fixture.Client.GetAsync("/HelloWorld"); + var handles = _fixture.DeploymentResult.HostProcess.Modules; + + foreach (ProcessModule handle in handles) + { + if (handle.ModuleName == "aspnetcorev2.dll") + { + Assert.Equal("12.2.18287.0", handle.FileVersionInfo.FileVersion); + return; + } + } + throw new XunitException($"Could not find aspnetcorev2.dll loaded in process {_fixture.DeploymentResult.HostProcess.ProcessName}"); + } + } +} diff --git a/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs b/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs new file mode 100644 index 0000000000..5c6f3739a4 --- /dev/null +++ b/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs @@ -0,0 +1,14 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Server.IntegrationTesting; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public static class DeployerSelector + { + public static ServerType ServerType => ServerType.IIS; + public static bool IsBackwardsCompatiblityTest => true; + public static bool IsForwardsCompatibilityTest => false; + } +} diff --git a/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj new file mode 100644 index 0000000000..c819a03ab1 --- /dev/null +++ b/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj @@ -0,0 +1,46 @@ + + + + netcoreapp2.2 + IISBackwardsCompatibility.FunctionalTests + True + + + + + + + + + + + False + + + False + + + False + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs b/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs new file mode 100644 index 0000000000..bd7aabbe0f --- /dev/null +++ b/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs @@ -0,0 +1,14 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Server.IntegrationTesting; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public static class DeployerSelector + { + public static ServerType ServerType => ServerType.IIS; + public static bool IsBackwardsCompatiblityTest => false; + public static bool IsForwardsCompatibilityTest => true; + } +} diff --git a/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs b/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs new file mode 100644 index 0000000000..5f4ebb5608 --- /dev/null +++ b/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs @@ -0,0 +1,38 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Diagnostics; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; +using Xunit.Sdk; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + public class ForwardsCompatibilityTests : FixtureLoggedTest + { + private readonly IISTestSiteFixture _fixture; + + public ForwardsCompatibilityTests(IISTestSiteFixture fixture) : base(fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task CheckForwardsCompatibilityIsUsed() + { + var response = await _fixture.Client.GetAsync("/HelloWorld"); + var handles = _fixture.DeploymentResult.HostProcess.Modules; + foreach (ProcessModule handle in handles) + { + if (handle.ModuleName == "aspnetcorev2_inprocess.dll") + { + Assert.Equal("12.2.18287.0", handle.FileVersionInfo.FileVersion); + return; + } + } + throw new XunitException($"Could not find aspnetcorev2_inprocess.dll loaded in process {_fixture.DeploymentResult.HostProcess.ProcessName}"); + } + } +} diff --git a/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj new file mode 100644 index 0000000000..929f6ec6b0 --- /dev/null +++ b/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj @@ -0,0 +1,45 @@ + + + + netcoreapp2.2 + IISForwardsCompatibility.FunctionalTests + True + + + + + + + + + + False + + + False + + + False + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/IIS.FunctionalTests/DeployerSelector.cs b/src/IISIntegration/test/IIS.FunctionalTests/DeployerSelector.cs new file mode 100644 index 0000000000..f2e1be321e --- /dev/null +++ b/src/IISIntegration/test/IIS.FunctionalTests/DeployerSelector.cs @@ -0,0 +1,14 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Server.IntegrationTesting; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public static class DeployerSelector + { + public static ServerType ServerType => ServerType.IIS; + public static bool IsBackwardsCompatiblityTest => false; + public static bool IsForwardsCompatibilityTest => false; + } +} diff --git a/src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj new file mode 100644 index 0000000000..62dec62e60 --- /dev/null +++ b/src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -0,0 +1,46 @@ + + + + netcoreapp2.2 + IIS.FunctionalTests + True + + + + + + + + + + + False + + + False + + + False + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/src/IISIntegration/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs new file mode 100644 index 0000000000..35f10b13ab --- /dev/null +++ b/src/IISIntegration/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs @@ -0,0 +1,150 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Newtonsoft.Json; +using Xunit; + +namespace IIS.FunctionalTests.Inprocess +{ + [Collection(PublishedSitesCollection.Name)] + public class StdOutRedirectionTests : LogFileTestBase + { + private readonly PublishedSitesFixture _fixture; + + public StdOutRedirectionTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + [SkipIfDebug] + public async Task FrameworkNotFoundExceptionLogged_Pipe() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + + var deploymentResult = await DeployAsync(deploymentParameters); + + Helpers.ModifyFrameworkVersionInRuntimeConfig(deploymentResult); + + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + Assert.False(response.IsSuccessStatusCode); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, + "The specified framework 'Microsoft.NETCore.App', version '2.9.9' was not found."); + } + + [ConditionalFact] + [SkipIfDebug] + public async Task FrameworkNotFoundExceptionLogged_File() + { + var deploymentParameters = + _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + + deploymentParameters.EnableLogging(_logFolderPath); + + var deploymentResult = await DeployAsync(deploymentParameters); + + Helpers.ModifyFrameworkVersionInRuntimeConfig(deploymentResult); + + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + Assert.False(response.IsSuccessStatusCode); + + StopServer(); + + var contents = Helpers.ReadAllTextFromFile(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath), Logger); + var expectedString = "The specified framework 'Microsoft.NETCore.App', version '2.9.9' was not found."; + EventLogHelpers.VerifyEventLogEvent(deploymentResult, expectedString); + Assert.Contains(expectedString, contents); + } + + [ConditionalFact] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + [SkipIfDebug] + public async Task EnableCoreHostTraceLogging_TwoLogFilesCreated() + { + var deploymentParameters = + _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.TransformArguments((a, _) => $"{a} CheckLargeStdOutWrites"); + + deploymentParameters.EnvironmentVariables["COREHOST_TRACE"] = "1"; + + deploymentParameters.EnableLogging(_logFolderPath); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + Assert.False(response.IsSuccessStatusCode); + + StopServer(); + + var fileInDirectory = Directory.GetFiles(_logFolderPath).Single(); + var contents = Helpers.ReadAllTextFromFile(fileInDirectory, Logger); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Invoked hostfxr"); + Assert.Contains("Invoked hostfxr", contents); + } + + [ConditionalTheory] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + [SkipIfDebug] + [InlineData("CheckLargeStdErrWrites")] + [InlineData("CheckLargeStdOutWrites")] + [InlineData("CheckOversizedStdErrWrites")] + [InlineData("CheckOversizedStdOutWrites")] + public async Task EnableCoreHostTraceLogging_PipeCaptureNativeLogs(string path) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.EnvironmentVariables["COREHOST_TRACE"] = "1"; + deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + + Assert.False(response.IsSuccessStatusCode); + + StopServer(); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Invoked hostfxr"); + } + + [ConditionalTheory] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + [SkipIfDebug] + [InlineData("CheckLargeStdErrWrites")] + [InlineData("CheckLargeStdOutWrites")] + [InlineData("CheckOversizedStdErrWrites")] + [InlineData("CheckOversizedStdOutWrites")] + public async Task EnableCoreHostTraceLogging_FileCaptureNativeLogs(string path) + { + var deploymentParameters = + _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true); + deploymentParameters.EnvironmentVariables["COREHOST_TRACE"] = "1"; + deploymentParameters.TransformArguments((a, _) => $"{a} {path}"); + + deploymentParameters.EnableLogging(_logFolderPath); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + Assert.False(response.IsSuccessStatusCode); + + StopServer(); + + var fileInDirectory = Directory.GetFiles(_logFolderPath).First(); + var contents = Helpers.ReadAllTextFromFile(fileInDirectory, Logger); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, "Invoked hostfxr"); + Assert.Contains("Invoked hostfxr", contents); + } + } +} diff --git a/src/IISIntegration/test/IIS.Shared.FunctionalTests/MofFileTests.cs b/src/IISIntegration/test/IIS.Shared.FunctionalTests/MofFileTests.cs new file mode 100644 index 0000000000..a054225ac5 --- /dev/null +++ b/src/IISIntegration/test/IIS.Shared.FunctionalTests/MofFileTests.cs @@ -0,0 +1,26 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Diagnostics; +using System.IO; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Testing; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace IIS.FunctionalTests +{ + public class MofFileTests + { + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] + [RequiresIIS(IISCapability.TracingModule)] + public void CheckMofFile() + { + var path = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "src", "aspnetcoremodulev2", "aspnetcore", "ancm.mof"); + var process = Process.Start("mofcomp.exe", path); + process.WaitForExit(); + Assert.Equal(0, process.ExitCode); + } + } +} diff --git a/src/IISIntegration/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs b/src/IISIntegration/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..b26f48a815 --- /dev/null +++ b/src/IISIntegration/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs @@ -0,0 +1,10 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.Extensions.Logging.Testing; +using Xunit; + +[assembly: CollectionBehavior(DisableTestParallelization = true)] +[assembly: RequiresIIS] +[assembly: ShortClassName] diff --git a/src/IISIntegration/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs b/src/IISIntegration/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs new file mode 100644 index 0000000000..cfbbf70486 --- /dev/null +++ b/src/IISIntegration/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs @@ -0,0 +1,150 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; +using System.Security.Principal; +using System.Xml.Linq; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Win32; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class RequiresIISAttribute : Attribute, ITestCondition + { + private static readonly (IISCapability Capability, string DllName)[] Modules = + { + (IISCapability.Websockets, "iiswsock.dll"), + (IISCapability.WindowsAuthentication, "authsspi.dll"), + (IISCapability.DynamicCompression, "compdyn.dll"), + (IISCapability.ApplicationInitialization, "warmup.dll"), + (IISCapability.TracingModule, "iisetw.dll"), + (IISCapability.FailedRequestTracingModule, "iisfreb.dll"), + (IISCapability.BasicAuthentication, "authbas.dll"), + }; + + private static readonly bool _isMetStatic; + private static readonly string _skipReasonStatic; + private static readonly bool _poolEnvironmentVariablesAvailable; + private static readonly IISCapability _modulesAvailable; + + static RequiresIISAttribute() + { + if (Environment.GetEnvironmentVariable("ASPNETCORE_TEST_SKIP_IIS") == "true") + { + _skipReasonStatic = "Test skipped using ASPNETCORE_TEST_SKIP_IIS environment variable"; + return; + } + + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + _skipReasonStatic = "IIS tests can only be run on Windows"; + return; + } + + var identity = WindowsIdentity.GetCurrent(); + var principal = new WindowsPrincipal(identity); + if (!principal.IsInRole(WindowsBuiltInRole.Administrator)) + { + _skipReasonStatic += "The current console is not running as admin."; + return; + } + + if (!File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", "w3wp.exe"))) + { + _skipReasonStatic += "The machine does not have IIS installed."; + return; + } + + var ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema_v2.xml"); + + if (!File.Exists(ancmConfigPath)) + { + _skipReasonStatic = "IIS Schema is not installed."; + return; + } + + XDocument ancmConfig; + + try + { + ancmConfig = XDocument.Load(ancmConfigPath); + } + catch + { + _skipReasonStatic = "Could not read ANCM schema configuration"; + return; + } + + _isMetStatic = ancmConfig + .Root + .Descendants("attribute") + .Any(n => "hostingModel".Equals(n.Attribute("name")?.Value, StringComparison.Ordinal)); + + _skipReasonStatic = _isMetStatic ? null : "IIS schema needs to be upgraded to support ANCM."; + + foreach (var module in Modules) + { + if (File.Exists(Path.Combine(Environment.SystemDirectory, "inetsrv", module.DllName))) + { + _modulesAvailable |= module.Capability; + } + } + + var iisRegistryKey = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\InetStp", writable: false); + if (iisRegistryKey == null) + { + _poolEnvironmentVariablesAvailable = false; + } + else + { + var majorVersion = (int)iisRegistryKey.GetValue("MajorVersion", -1); + var minorVersion = (int)iisRegistryKey.GetValue("MinorVersion", -1); + var version = new Version(majorVersion, minorVersion); + _poolEnvironmentVariablesAvailable = version >= new Version(10, 0); + } + } + + public RequiresIISAttribute() + : this(IISCapability.None) { } + + public RequiresIISAttribute(IISCapability capabilities) + { + IsMet = _isMetStatic; + SkipReason = _skipReasonStatic; + if (capabilities.HasFlag(IISCapability.PoolEnvironmentVariables)) + { + IsMet &= _poolEnvironmentVariablesAvailable; + if (!_poolEnvironmentVariablesAvailable) + { + SkipReason += "The machine does allow for setting environment variables on application pools."; + } + } + + if (capabilities.HasFlag(IISCapability.ShutdownToken)) + { + IsMet = false; + SkipReason += "https://github.com/aspnet/IISIntegration/issues/1074"; + } + + foreach (var module in Modules) + { + if (capabilities.HasFlag(module.Capability)) + { + var available = _modulesAvailable.HasFlag(module.Capability); + IsMet &= available; + if (!available) + { + SkipReason += $"The machine does have {module.Capability} available."; + } + } + } + } + + public bool IsMet { get; } + public string SkipReason { get; } + } +} diff --git a/src/IISIntegration/test/IIS.Shared.FunctionalTests/ServicesTests.cs b/src/IISIntegration/test/IIS.Shared.FunctionalTests/ServicesTests.cs new file mode 100644 index 0000000000..875b5b13be --- /dev/null +++ b/src/IISIntegration/test/IIS.Shared.FunctionalTests/ServicesTests.cs @@ -0,0 +1,96 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.ServiceProcess; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace IIS.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class ApplicationInitializationTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public ApplicationInitializationTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [RequiresIIS(IISCapability.ApplicationInitialization)] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task ApplicationPreloadStartsApp(HostingModel hostingModel) + { + // This test often hits a memory leak in warmup.dll module, it has been reported to IIS team + using (AppVerifier.Disable(DeployerSelector.ServerType, 0x900)) + { + var baseDeploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); + baseDeploymentParameters.TransformArguments( + (args, contentRoot) => $"{args} CreateFile \"{Path.Combine(contentRoot, "Started.txt")}\""); + EnablePreload(baseDeploymentParameters); + + var result = await DeployAsync(baseDeploymentParameters); + + await Helpers.Retry(async () => await File.ReadAllTextAsync(Path.Combine(result.ContentRoot, "Started.txt")), 10, 200); + StopServer(); + EventLogHelpers.VerifyEventLogEvent(result, EventLogHelpers.Started(result)); + } + } + + [ConditionalTheory] + [RequiresIIS(IISCapability.ApplicationInitialization)] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task ApplicationInitializationPageIsRequested(HostingModel hostingModel) + { + // This test often hits a memory leak in warmup.dll module, it has been reported to IIS team + using (AppVerifier.Disable(DeployerSelector.ServerType, 0x900)) + { + var baseDeploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); + EnablePreload(baseDeploymentParameters); + + baseDeploymentParameters.ServerConfigActionList.Add( + (config, _) => { + config + .RequiredElement("system.webServer") + .GetOrAdd("applicationInitialization") + .GetOrAdd("add", "initializationPage", "/CreateFile"); + }); + + var result = await DeployAsync(baseDeploymentParameters); + + await Helpers.Retry(async () => await File.ReadAllTextAsync(Path.Combine(result.ContentRoot, "Started.txt")), 10, 200); + StopServer(); + EventLogHelpers.VerifyEventLogEvent(result, EventLogHelpers.Started(result)); + } + } + + private static void EnablePreload(IISDeploymentParameters baseDeploymentParameters) + { + baseDeploymentParameters.EnsureSection("applicationInitialization", "system.webServer"); + baseDeploymentParameters.ServerConfigActionList.Add( + (config, _) => { + + config + .RequiredElement("system.applicationHost") + .RequiredElement("sites") + .RequiredElement("site") + .RequiredElement("application") + .SetAttributeValue("preloadEnabled", true); + }); + + baseDeploymentParameters.EnableModule("ApplicationInitializationModule", "%IIS_BIN%\\warmup.dll"); + } + } +} diff --git a/src/IISIntegration/test/IIS.Tests/AppHostConfig/HostableWebCore.config b/src/IISIntegration/test/IIS.Tests/AppHostConfig/HostableWebCore.config new file mode 100644 index 0000000000..5e994d2855 --- /dev/null +++ b/src/IISIntegration/test/IIS.Tests/AppHostConfig/HostableWebCore.config @@ -0,0 +1,198 @@ + + + + + + + + +
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+ + +
+
+
+
+ +
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/IIS.Tests/ClientDisconnectTests.cs b/src/IISIntegration/test/IIS.Tests/ClientDisconnectTests.cs new file mode 100644 index 0000000000..dbe562aa7c --- /dev/null +++ b/src/IISIntegration/test/IIS.Tests/ClientDisconnectTests.cs @@ -0,0 +1,302 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [SkipIfHostableWebCoreNotAvailable] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] + public class ClientDisconnectTests : StrictTestServerTests + { + [ConditionalFact] + public async Task WritesSucceedAfterClientDisconnect() + { + var requestStartedCompletionSource = CreateTaskCompletionSource(); + var clientDisconnectedCompletionSource = CreateTaskCompletionSource(); + var requestCompletedCompletionSource = CreateTaskCompletionSource(); + + var data = new byte[1024]; + using (var testServer = await TestServer.Create( + async ctx => + { + requestStartedCompletionSource.SetResult(true); + await clientDisconnectedCompletionSource.Task; + for (var i = 0; i < 1000; i++) + { + await ctx.Response.Body.WriteAsync(data); + } + + requestCompletedCompletionSource.SetResult(true); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await requestStartedCompletionSource.Task.DefaultTimeout(); + } + clientDisconnectedCompletionSource.SetResult(true); + + await requestCompletedCompletionSource.Task.DefaultTimeout(); + } + + AssertConnectionDisconnectLog(); + } + + [ConditionalFact] + public async Task WritesCancelledWhenUsingAbortedToken() + { + var requestStartedCompletionSource = CreateTaskCompletionSource(); + var requestCompletedCompletionSource = CreateTaskCompletionSource(); + + Exception exception = null; + + var data = new byte[1]; + using (var testServer = await TestServer.Create(async ctx => + { + requestStartedCompletionSource.SetResult(true); + try + { + while (true) + { + await ctx.Response.Body.WriteAsync(data, ctx.RequestAborted); + } + } + catch (Exception e) + { + exception = e; + } + + requestCompletedCompletionSource.SetResult(true); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + + await requestStartedCompletionSource.Task.DefaultTimeout(); + } + + await requestCompletedCompletionSource.Task.DefaultTimeout(); + + Assert.IsType(exception); + } + + AssertConnectionDisconnectLog(); + } + + [ConditionalFact] + public async Task ReadThrowsAfterClientDisconnect() + { + var requestStartedCompletionSource = CreateTaskCompletionSource(); + var requestCompletedCompletionSource = CreateTaskCompletionSource(); + + Exception exception = null; + + var data = new byte[1024]; + using (var testServer = await TestServer.Create(async ctx => + { + requestStartedCompletionSource.SetResult(true); + try + { + await ctx.Request.Body.ReadAsync(data); + } + catch (Exception e) + { + exception = e; + } + + requestCompletedCompletionSource.SetResult(true); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await requestStartedCompletionSource.Task.DefaultTimeout(); + } + + await requestCompletedCompletionSource.Task.DefaultTimeout(); + } + + Assert.IsType(exception); + Assert.Equal("The client has disconnected", exception.Message); + + AssertConnectionDisconnectLog(); + } + + [ConditionalFact] + public async Task WriterThrowsCancelledException() + { + var requestStartedCompletionSource = CreateTaskCompletionSource(); + var requestCompletedCompletionSource = CreateTaskCompletionSource(); + + Exception exception = null; + var cancellationTokenSource = new CancellationTokenSource(); + + var data = new byte[1]; + using (var testServer = await TestServer.Create(async ctx => + { + requestStartedCompletionSource.SetResult(true); + try + { + while (true) + { + await ctx.Response.Body.WriteAsync(data, cancellationTokenSource.Token); + } + } + catch (Exception e) + { + exception = e; + } + + requestCompletedCompletionSource.SetResult(true); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + + await requestStartedCompletionSource.Task.DefaultTimeout(); + cancellationTokenSource.Cancel(); + await requestCompletedCompletionSource.Task.DefaultTimeout(); + } + + Assert.IsType(exception); + } + } + + [ConditionalFact] + public async Task ReaderThrowsCancelledException() + { + var requestStartedCompletionSource = CreateTaskCompletionSource(); + var requestCompletedCompletionSource = CreateTaskCompletionSource(); + + Exception exception = null; + var cancellationTokenSource = new CancellationTokenSource(); + + var data = new byte[1024]; + using (var testServer = await TestServer.Create(async ctx => + { + requestStartedCompletionSource.SetResult(true); + try + { + await ctx.Request.Body.ReadAsync(data, cancellationTokenSource.Token); + } + catch (Exception e) + { + exception = e; + } + + requestCompletedCompletionSource.SetResult(true); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await requestStartedCompletionSource.Task.DefaultTimeout(); + cancellationTokenSource.Cancel(); + await requestCompletedCompletionSource.Task.DefaultTimeout(); + } + Assert.IsType(exception); + } + } + + [ConditionalFact] + public async Task ReaderThrowsResetExceptionOnInvalidBody() + { + var requestStartedCompletionSource = CreateTaskCompletionSource(); + var requestCompletedCompletionSource = CreateTaskCompletionSource(); + + Exception exception = null; + + var data = new byte[1024]; + using (var testServer = await TestServer.Create(async ctx => + { + requestStartedCompletionSource.SetResult(true); + try + { + await ctx.Request.Body.ReadAsync(data); + } + catch (Exception e) + { + exception = e; + } + + requestCompletedCompletionSource.SetResult(true); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await connection.Send( + "POST / HTTP/1.1", + "Transfer-Encoding: chunked", + "Host: localhost", + "Connection: close", + "", + ""); + + await requestStartedCompletionSource.Task; + await connection.Send( + "ZZZZZZZZZZZZZ"); + + await connection.Receive( + "HTTP/1.1 400 Bad Request", + "" + ); + + } + await requestCompletedCompletionSource.Task.DefaultTimeout(); + } + + Assert.IsType(exception); + Assert.Equal("The client has disconnected", exception.Message); + AssertConnectionDisconnectLog(); + } + + [ConditionalFact] + public async Task RequestAbortedIsTrippedWithoutIO() + { + var requestStarted = CreateTaskCompletionSource(); + var requestAborted = CreateTaskCompletionSource(); + + using (var testServer = await TestServer.Create( + async ctx => { + ctx.RequestAborted.Register(() => requestAborted.SetResult(true)); + requestStarted.SetResult(true); + await requestAborted.Task; + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await requestStarted.Task; + } + await requestAborted.Task; + } + + AssertConnectionDisconnectLog(); + } + + private void AssertConnectionDisconnectLog() + { + Assert.Single(TestSink.Writes, w => w.EventId.Name == "ConnectionDisconnect"); + } + + private static async Task SendContentLength1Post(TestConnection connection) + { + await connection.Send( + "POST / HTTP/1.1", + "Content-Length: 1", + "Host: localhost", + "Connection: close", + "", + ""); + } + } +} diff --git a/src/IISIntegration/test/IIS.Tests/ConnectionIdFeatureTests.cs b/src/IISIntegration/test/IIS.Tests/ConnectionIdFeatureTests.cs new file mode 100644 index 0000000000..37e69b3a32 --- /dev/null +++ b/src/IISIntegration/test/IIS.Tests/ConnectionIdFeatureTests.cs @@ -0,0 +1,54 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [SkipIfHostableWebCoreNotAvailable] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] + public class HttpBodyControlFeatureTests : StrictTestServerTests + { + [ConditionalFact] + public async Task ThrowsOnSyncReadOrWrite() + { + Exception writeException = null; + Exception readException = null; + using (var testServer = await TestServer.Create( + ctx => { + var bodyControl = ctx.Features.Get(); + bodyControl.AllowSynchronousIO = false; + + try + { + ctx.Response.Body.Write(new byte[10]); + } + catch (Exception ex) + { + writeException = ex; + } + + try + { + ctx.Request.Body.Read(new byte[10]); + } + catch (Exception ex) + { + readException = ex; + } + + return Task.CompletedTask; + }, LoggerFactory)) + { + await testServer.HttpClient.GetStringAsync("/"); + } + + Assert.IsType(readException); + Assert.IsType(writeException); + } + } +} diff --git a/src/IISIntegration/test/IIS.Tests/HttpBodyControlFeatureTests.cs b/src/IISIntegration/test/IIS.Tests/HttpBodyControlFeatureTests.cs new file mode 100644 index 0000000000..3d91c445ca --- /dev/null +++ b/src/IISIntegration/test/IIS.Tests/HttpBodyControlFeatureTests.cs @@ -0,0 +1,31 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// 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.Features; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [SkipIfHostableWebCoreNotAvailable] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] + public class ConnectionIdFeatureTests : StrictTestServerTests + { + [ConditionalFact] + public async Task ProvidesConnectionId() + { + string connectionId = null; + using (var testServer = await TestServer.Create(ctx => { + var connectionIdFeature = ctx.Features.Get(); + connectionId = connectionIdFeature.ConnectionId; + return Task.CompletedTask; + }, LoggerFactory)) + { + await testServer.HttpClient.GetStringAsync("/"); + } + + Assert.NotNull(connectionId); + } + } +} diff --git a/src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj b/src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj new file mode 100644 index 0000000000..3fdb2a5363 --- /dev/null +++ b/src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj @@ -0,0 +1,32 @@ + + + + netcoreapp2.2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/IIS.Tests/ResponseAbortTests.cs b/src/IISIntegration/test/IIS.Tests/ResponseAbortTests.cs new file mode 100644 index 0000000000..c7ec472586 --- /dev/null +++ b/src/IISIntegration/test/IIS.Tests/ResponseAbortTests.cs @@ -0,0 +1,151 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [SkipIfHostableWebCoreNotAvailable] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] + public class ResponseAbortTests : StrictTestServerTests + { + [ConditionalFact] + public async Task ClosesWithoutSendingAnything() + { + using (var testServer = await TestServer.Create( + ctx => { + ctx.Abort(); + return Task.CompletedTask; + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await connection.WaitForConnectionClose(); + } + } + } + + [ConditionalFact] + public async Task ClosesAfterDataSent() + { + var bodyReceived = CreateTaskCompletionSource(); + using (var testServer = await TestServer.Create( + async ctx => { + await ctx.Response.WriteAsync("Abort"); + await ctx.Response.Body.FlushAsync(); + await bodyReceived.Task.DefaultTimeout(); + ctx.Abort(); + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await connection.Receive( + "HTTP/1.1 200 OK", + ""); + await connection.ReceiveHeaders( + "Transfer-Encoding: chunked"); + + await connection.ReceiveChunk("Abort"); + bodyReceived.SetResult(true); + await connection.WaitForConnectionClose(); + } + } + } + + [ConditionalFact] + public async Task ReadsThrowAfterAbort() + { + Exception exception = null; + + using (var testServer = await TestServer.Create( + async ctx => { + ctx.Abort(); + try + { + var a = new byte[10]; + await ctx.Request.Body.ReadAsync(a); + } + catch (Exception e) + { + exception = e; + } + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await connection.WaitForConnectionClose(); + } + } + + Assert.IsType(exception); + } + + [ConditionalFact] + public async Task WritesNoopAfterAbort() + { + Exception exception = null; + + using (var testServer = await TestServer.Create( + async ctx => { + ctx.Abort(); + try + { + await ctx.Response.Body.WriteAsync(new byte[10]); + } + catch (Exception e) + { + exception = e; + } + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await connection.WaitForConnectionClose(); + } + } + + Assert.Null(exception); + } + + [ConditionalFact] + public async Task RequestAbortedIsTrippedAfterAbort() + { + bool tokenAborted = false; + using (var testServer = await TestServer.Create( + ctx => { + ctx.Abort(); + tokenAborted = ctx.RequestAborted.IsCancellationRequested; + return Task.CompletedTask; + }, LoggerFactory)) + { + using (var connection = testServer.CreateConnection()) + { + await SendContentLength1Post(connection); + await connection.WaitForConnectionClose(); + } + } + + Assert.True(tokenAborted); + } + + private static async Task SendContentLength1Post(TestConnection connection) + { + await connection.Send( + "POST / HTTP/1.1", + "Content-Length: 1", + "Host: localhost", + "", + ""); + } + } +} diff --git a/src/IISIntegration/test/IIS.Tests/StrictTestServerTests.cs b/src/IISIntegration/test/IIS.Tests/StrictTestServerTests.cs new file mode 100644 index 0000000000..c8f62beedb --- /dev/null +++ b/src/IISIntegration/test/IIS.Tests/StrictTestServerTests.cs @@ -0,0 +1,24 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class StrictTestServerTests: LoggedTest + { + public override void Dispose() + { + base.Dispose(); + Assert.DoesNotContain(TestSink.Writes, w => w.LogLevel > LogLevel.Information); + } + + protected static TaskCompletionSource CreateTaskCompletionSource() + { + return new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + } + } +} diff --git a/src/IISIntegration/test/IIS.Tests/TestServerTest.cs b/src/IISIntegration/test/IIS.Tests/TestServerTest.cs new file mode 100644 index 0000000000..40b538ea52 --- /dev/null +++ b/src/IISIntegration/test/IIS.Tests/TestServerTest.cs @@ -0,0 +1,35 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// 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.Testing.xunit; +using Microsoft.Extensions.Logging.Testing; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [SkipIfHostableWebCoreNotAvailable] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] + public class TestServerTest : StrictTestServerTests + { + [ConditionalFact] + public async Task SingleProcessTestServer_HelloWorld() + { + var helloWorld = "Hello World"; + var expectedPath = "/Path"; + + string path = null; + using (var testServer = await TestServer.Create(ctx => + { + path = ctx.Request.Path.ToString(); + return ctx.Response.WriteAsync(helloWorld); + }, LoggerFactory)) + { + var result = await testServer.HttpClient.GetAsync(expectedPath); + Assert.Equal(helloWorld, await result.Content.ReadAsStringAsync()); + Assert.Equal(expectedPath, path); + } + } + } +} diff --git a/src/IISIntegration/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs b/src/IISIntegration/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs new file mode 100644 index 0000000000..b63743f106 --- /dev/null +++ b/src/IISIntegration/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs @@ -0,0 +1,17 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class SkipIfHostableWebCoreNotAvailableAttribute : Attribute, ITestCondition + { + public bool IsMet { get; } = File.Exists(TestServer.HostableWebCoreLocation); + + public string SkipReason { get; } = $"Hostable Web Core not available, {TestServer.HostableWebCoreLocation} not found."; + } +} diff --git a/src/IISIntegration/test/IIS.Tests/Utilities/TestServer.cs b/src/IISIntegration/test/IIS.Tests/Utilities/TestServer.cs new file mode 100644 index 0000000000..351b826316 --- /dev/null +++ b/src/IISIntegration/test/IIS.Tests/Utilities/TestServer.cs @@ -0,0 +1,211 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Net.Http; +using System.Reflection; +using System.Runtime.InteropServices; +using System.Runtime.Loader; +using System.Threading; +using System.Threading.Tasks; +using System.Xml.Linq; +using System.Xml.XPath; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Extensions; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.Common; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public class TestServer: IDisposable, IStartup + { + private const string InProcessHandlerDll = "aspnetcorev2_inprocess.dll"; + private const string AspNetCoreModuleDll = "aspnetcorev2.dll"; + private const string HWebCoreDll = "hwebcore.dll"; + + internal static string HostableWebCoreLocation => Environment.ExpandEnvironmentVariables($@"%windir%\system32\inetsrv\{HWebCoreDll}"); + internal static string BasePath => Path.GetDirectoryName(new Uri(typeof(TestServer).Assembly.CodeBase).AbsolutePath); + + internal static string AspNetCoreModuleLocation => Path.Combine(BasePath, AspNetCoreModuleDll); + + private static readonly SemaphoreSlim WebCoreLock = new SemaphoreSlim(1, 1); + + private static readonly int PortRetryCount = 10; + + private readonly TaskCompletionSource _startedTaskCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + private readonly Action _appBuilder; + private readonly ILoggerFactory _loggerFactory; + private readonly hostfxr_main_fn _hostfxrMainFn; + + private Uri BaseUri => new Uri("http://localhost:" + _currentPort); + public HttpClient HttpClient { get; private set; } + public TestConnection CreateConnection() => new TestConnection(_currentPort); + + private IWebHost _host; + + private string _appHostConfigPath; + private int _currentPort; + + private TestServer(Action appBuilder, ILoggerFactory loggerFactory) + { + _hostfxrMainFn = Main; + _appBuilder = appBuilder; + _loggerFactory = loggerFactory; + } + + public static async Task Create(Action appBuilder, ILoggerFactory loggerFactory) + { + await WebCoreLock.WaitAsync(); + var server = new TestServer(appBuilder, loggerFactory); + server.Start(); + (await server.HttpClient.GetAsync("/start")).EnsureSuccessStatusCode(); + await server._startedTaskCompletionSource.Task; + return server; + } + + public static Task Create(RequestDelegate app, ILoggerFactory loggerFactory) + { + return Create(builder => builder.Run(app), loggerFactory); + } + + private void Start() + { + LoadLibrary(HostableWebCoreLocation); + _appHostConfigPath = Path.GetTempFileName(); + + set_main_handler(_hostfxrMainFn); + + Retry(() => + { + _currentPort = TestPortHelper.GetNextPort(); + + InitializeConfig(_currentPort); + + var startResult = WebCoreActivate(_appHostConfigPath, null, "Instance"); + if (startResult != 0) + { + throw new InvalidOperationException($"Error while running WebCoreActivate: {startResult} on port {_currentPort}"); + } + }, PortRetryCount); + + HttpClient = new HttpClient(new LoggingHandler(new SocketsHttpHandler(), _loggerFactory.CreateLogger())) + { + BaseAddress = BaseUri + }; + } + + private void InitializeConfig(int port) + { + var webHostConfig = XDocument.Load(Path.GetFullPath("HostableWebCore.config")); + webHostConfig.XPathSelectElement("/configuration/system.webServer/globalModules/add[@name='AspNetCoreModuleV2']") + .SetAttributeValue("image", AspNetCoreModuleLocation); + + var siteElement = webHostConfig.Root + .RequiredElement("system.applicationHost") + .RequiredElement("sites") + .RequiredElement("site"); + + siteElement + .RequiredElement("bindings") + .RequiredElement("binding") + .SetAttributeValue("bindingInformation", $":{port}:localhost"); + + webHostConfig.Save(_appHostConfigPath); + } + + private int Main(IntPtr argc, IntPtr argv) + { + _host = new WebHostBuilder() + .UseIIS() + .ConfigureServices(services => { + services.AddSingleton(this); + services.AddSingleton(_loggerFactory); + }) + .UseSetting(WebHostDefaults.ApplicationKey, typeof(TestServer).GetTypeInfo().Assembly.FullName) + .Build(); + + var doneEvent = new ManualResetEventSlim(); + var lifetime = _host.Services.GetService(); + + lifetime.ApplicationStopping.Register(() => doneEvent.Set()); + _host.Start(); + _startedTaskCompletionSource.SetResult(null); + doneEvent.Wait(); + _host.Dispose(); + return 0; + } + + public void Dispose() + { + HttpClient.Dispose(); + + // WebCoreShutdown occasionally AVs + // This causes the dotnet test process to crash + // To avoid this, we have to wait to shutdown + // and pass in true to immediately shutdown the hostable web core + // Both of these seem to be required. + Thread.Sleep(100); + WebCoreShutdown(immediate: true); + WebCoreLock.Release(); + } + + public IServiceProvider ConfigureServices(IServiceCollection services) + { + return services.BuildServiceProvider(); + } + + public void Configure(IApplicationBuilder app) + { + app.Map("/start", builder => builder.Run(context => context.Response.WriteAsync("Done"))); + _appBuilder(app); + } + + private delegate int hostfxr_main_fn(IntPtr argc, IntPtr argv); + + [DllImport(HWebCoreDll)] + private static extern int WebCoreActivate( + [In, MarshalAs(UnmanagedType.LPWStr)] + string appHostConfigPath, + [In, MarshalAs(UnmanagedType.LPWStr)] + string rootWebConfigPath, + [In, MarshalAs(UnmanagedType.LPWStr)] + string instanceName); + + [DllImport(HWebCoreDll)] + private static extern int WebCoreShutdown(bool immediate); + + [DllImport(InProcessHandlerDll)] + private static extern int set_main_handler(hostfxr_main_fn main); + + [DllImport("kernel32", SetLastError=true, CharSet = CharSet.Ansi)] + private static extern IntPtr LoadLibrary([MarshalAs(UnmanagedType.LPStr)] string lpFileName); + + private void Retry(Action func, int attempts) + { + var exceptions = new List(); + + for (var attempt = 0; attempt < attempts; attempt++) + { + try + { + func(); + return; + } + catch (Exception e) + { + exceptions.Add(e); + } + } + + throw new AggregateException(exceptions); + } + } +} diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/DeployerSelector.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/DeployerSelector.cs new file mode 100644 index 0000000000..ba6a1ec6e2 --- /dev/null +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/DeployerSelector.cs @@ -0,0 +1,14 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Server.IntegrationTesting; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + public static class DeployerSelector + { + public static ServerType ServerType => ServerType.IISExpress; + public static bool IsBackwardsCompatiblityTest => false; + public static bool IsForwardsCompatibilityTest => false; + } +} diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs new file mode 100644 index 0000000000..ac58f73c0e --- /dev/null +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs @@ -0,0 +1,60 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.Common; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class HttpsTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public HttpsTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithAllApplicationTypes() + .WithAllAncmVersions() + .WithAllHostingModels(); + + [ConditionalTheory] + [MemberData(nameof(TestVariants))] + public async Task HttpsHelloWorld(TestVariant variant) + { + var port = TestPortHelper.GetNextSSLPort(); + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); + deploymentParameters.ApplicationBaseUriHint = $"https://localhost:{port}/"; + deploymentParameters.AddHttpsToServerConfig(); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var handler = new HttpClientHandler + { + ServerCertificateCustomValidationCallback = (a, b, c, d) => true + }; + var client = deploymentResult.CreateClient(handler); + var response = await client.GetAsync("HttpsHelloWorld"); + var responseText = await response.Content.ReadAsStringAsync(); + if (variant.HostingModel == HostingModel.OutOfProcess) + { + Assert.Equal("Scheme:https; Original:http", responseText); + } + else + { + Assert.Equal("Scheme:https; Original:", responseText); + } + } + } +} diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj new file mode 100644 index 0000000000..988c2d5943 --- /dev/null +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -0,0 +1,38 @@ + + + + netcoreapp2.2 + True + + + + + + + + + + + False + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs new file mode 100644 index 0000000000..47fb3a6553 --- /dev/null +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs @@ -0,0 +1,70 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class AuthenticationTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public AuthenticationTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + [RequiresIIS(IISCapability.WindowsAuthentication)] + public async Task Authentication_InProcess() + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true); + deploymentParameters.SetWindowsAuth(); + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("/AuthenticationAnonymous"); + + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal("Anonymous?True", responseText); + + response = await deploymentResult.HttpClient.GetAsync("/AuthenticationRestricted"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString()); + Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString()); + + response = await deploymentResult.HttpClient.GetAsync("/AuthenticationRestrictedNTLM"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString()); + // Note we can't restrict a challenge to a specific auth type, the native auth modules always add themselves. + Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString()); + + response = await deploymentResult.HttpClient.GetAsync("/AuthenticationForbidden"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + + var httpClientHandler = new HttpClientHandler() { UseDefaultCredentials = true }; + var httpClient = deploymentResult.CreateHttpClient(httpClientHandler); + + response = await httpClient.GetAsync("/AuthenticationAnonymous"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal("Anonymous?True", responseText); + + response = await httpClient.GetAsync("/AuthenticationRestricted"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.NotEmpty(responseText); + } + } +} diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs new file mode 100644 index 0000000000..caaf728c64 --- /dev/null +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs @@ -0,0 +1,90 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Net.Http; +using System.Net.Sockets; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class ShutdownTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public ShutdownTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public async Task ServerShutsDownWhenMainExits() + { + var parameters = _fixture.GetBaseDeploymentParameters(publish: true); + var deploymentResult = await DeployAsync(parameters); + try + { + await deploymentResult.HttpClient.GetAsync("/Shutdown"); + } + catch (HttpRequestException ex) when (ex.InnerException is IOException) + { + // Server might close a connection before request completes + } + + deploymentResult.AssertWorkerProcessStop(); + } + + + [ConditionalFact] + public async Task ServerShutsDownWhenMainExitsStress() + { + var parameters = _fixture.GetBaseDeploymentParameters(publish: true); + var deploymentResult = await StartAsync(parameters); + + var load = Helpers.StressLoad(deploymentResult.HttpClient, "/HelloWorld", response => { + var statusCode = (int)response.StatusCode; + Assert.True(statusCode == 200 || statusCode == 503, "Status code was " + statusCode); + }); + + try + { + await deploymentResult.HttpClient.GetAsync("/Shutdown"); + await load; + } + catch (HttpRequestException ex) when (ex.InnerException is IOException | ex.InnerException is SocketException) + { + // Server might close a connection before request completes + } + + deploymentResult.AssertWorkerProcessStop(); + } + + [ConditionalFact] + public async Task GracefulShutdown_DoesNotCrashProcess() + { + var parameters = _fixture.GetBaseDeploymentParameters(publish: true); + var result = await DeployAsync(parameters); + + var response = await result.HttpClient.GetAsync("/HelloWorld"); + StopServer(gracefulShutdown: true); + Assert.True(result.HostProcess.ExitCode == 0); + } + + [ConditionalFact] + public async Task ForcefulShutdown_DoesCrashProcess() + { + var parameters = _fixture.GetBaseDeploymentParameters(publish: true); + var result = await DeployAsync(parameters); + + var response = await result.HttpClient.GetAsync("/HelloWorld"); + StopServer(gracefulShutdown: false); + Assert.True(result.HostProcess.ExitCode == 1); + } + } +} diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs new file mode 100644 index 0000000000..826001c96d --- /dev/null +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs @@ -0,0 +1,79 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Linq; +using System.Net.WebSockets; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(IISTestSiteCollection.Name)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "No supported on this platform")] + public class WebSocketsTests + { + private readonly string _webSocketUri; + + public WebSocketsTests(IISTestSiteFixture fixture) + { + _webSocketUri = fixture.DeploymentResult.ApplicationBaseUri.Replace("http:", "ws:"); + } + + [ConditionalFact] + public async Task OnStartedCalledForWebSocket() + { + var cws = new ClientWebSocket(); + await cws.ConnectAsync(new Uri(_webSocketUri + "WebSocketLifetimeEvents"), default); + + await ReceiveMessage(cws, "OnStarting"); + await ReceiveMessage(cws, "Upgraded"); + } + + [ConditionalFact] + public async Task WebReadBeforeUpgrade() + { + var cws = new ClientWebSocket(); + await cws.ConnectAsync(new Uri(_webSocketUri + "WebReadBeforeUpgrade"), default); + + await ReceiveMessage(cws, "Yay"); + } + + [ConditionalFact] + public async Task CanSendAndReceieveData() + { + var cws = new ClientWebSocket(); + await cws.ConnectAsync(new Uri(_webSocketUri + "WebSocketEcho"), default); + + for (int i = 0; i < 1000; i++) + { + var mesage = i.ToString(); + await SendMessage(cws, mesage); + await ReceiveMessage(cws, mesage); + } + } + + private async Task SendMessage(ClientWebSocket webSocket, string message) + { + await webSocket.SendAsync(new ArraySegment(Encoding.ASCII.GetBytes(message)), WebSocketMessageType.Text, true, default); + } + + private async Task ReceiveMessage(ClientWebSocket webSocket, string expectedMessage) + { + var received = new byte[expectedMessage.Length]; + + var offset = 0; + WebSocketReceiveResult result; + do + { + result = await webSocket.ReceiveAsync(new ArraySegment(received, offset, received.Length - offset), default); + offset += result.Count; + } while (!result.EndOfMessage); + + Assert.Equal(expectedMessage, Encoding.ASCII.GetString(received)); + } + } +} diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs new file mode 100644 index 0000000000..349f72d7bf --- /dev/null +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs @@ -0,0 +1,81 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class MultipleAppTests : IISFunctionalTestBase + { + private readonly PublishedSitesFixture _fixture; + + public MultipleAppTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalTheory] + [InlineData(AncmVersion.AspNetCoreModule)] + [InlineData(AncmVersion.AspNetCoreModuleV2)] + public Task Startup(AncmVersion ancmVersion) + { + // ANCM v1 currently does *not* retry if an app fails to start the first time due to a port collision. + // So, this test is expected to fail on v1 approximately 1 in 1,000 times (probably of at least one collision + // when 10 sites choose a random port from the range 1025-48000). Adding one retry should reduce the failure + // rate from 1 in 1,000 to 1 in 1,000,000. The previous product code (with "srand(GetTickCount())") should still + // fail the test reliably. + // https://github.com/aspnet/IISIntegration/issues/1350 + // + // ANCM v2 does retry on port collisions, so no retries should be required. + var attempts = (ancmVersion == AncmVersion.AspNetCoreModule) ? 2 : 1; + + return Helpers.Retry(async () => + { + const int numApps = 10; + + using (var deployers = new DisposableList()) + { + var deploymentResults = new List(); + + // Deploy all apps + for (var i = 0; i < numApps; i++) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel: IntegrationTesting.HostingModel.OutOfProcess); + deploymentParameters.AncmVersion = ancmVersion; + + var deployer = CreateDeployer(deploymentParameters); + deployers.Add(deployer); + deploymentResults.Add(await deployer.DeployAsync()); + } + + // Start all requests as quickly as possible, so apps are started as quickly as possible, + // to test possible race conditions when multiple apps start at the same time. + var requestTasks = new List>(); + foreach (var deploymentResult in deploymentResults) + { + requestTasks.Add(deploymentResult.HttpClient.GetAsync("/HelloWorld")); + } + + // Verify all apps started and return expected response + foreach (var requestTask in requestTasks) + { + var response = await requestTask; + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal("Hello World", responseText); + } + } + }, + attempts: attempts, msDelay: 0); + } + } +} diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs new file mode 100644 index 0000000000..3ff46bf304 --- /dev/null +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -0,0 +1,87 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class NtlmAuthenticationTests : IISFunctionalTestBase + { + // Test only runs on IISExpress today as our CI machines do not have + // Windows auth installed globally. + // TODO either enable windows auth on our CI or use containers to test this + // behavior + + private readonly PublishedSitesFixture _fixture; + + public NtlmAuthenticationTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + public static TestMatrix TestVariants + => TestMatrix.ForServers(DeployerSelector.ServerType) + .WithTfms(Tfm.NetCoreApp22, Tfm.Net461) + .WithAllAncmVersions(); + + [ConditionalTheory] + [RequiresIIS(IISCapability.WindowsAuthentication)] + [MemberData(nameof(TestVariants))] + public async Task NtlmAuthentication(TestVariant variant) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(variant); + deploymentParameters.ApplicationBaseUriHint = $"https://localhost:0/"; + + deploymentParameters.SetWindowsAuth(enabled: true); + + var result = await DeployAsync(deploymentParameters); + var response = await result.HttpClient.GetAsync("/HelloWorld"); + + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal("Hello World", responseText); + + var httpClient = result.HttpClient; + response = await httpClient.GetAsync("/Anonymous"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal("Anonymous?True", responseText); + + response = await httpClient.GetAsync("/Restricted"); + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString()); + Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString()); + + response = await httpClient.GetAsync("/RestrictedNTLM"); + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString()); + // Note we can't restrict a challenge to a specific auth type, the native auth modules always add themselves. + Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString()); + + response = await httpClient.GetAsync("/Forbidden"); + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + + var httpClientHandler = new HttpClientHandler() { UseDefaultCredentials = true }; + httpClient = result.CreateClient(httpClientHandler); + + response = await httpClient.GetAsync("/Anonymous"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal("Anonymous?True", responseText); + + response = await httpClient.GetAsync("/Restricted"); + responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.NotEmpty(responseText); + } + } +} diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..b26f48a815 --- /dev/null +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs @@ -0,0 +1,10 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.Extensions.Logging.Testing; +using Xunit; + +[assembly: CollectionBehavior(DisableTestParallelization = true)] +[assembly: RequiresIIS] +[assembly: ShortClassName] diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs new file mode 100644 index 0000000000..2e0a68b9f7 --- /dev/null +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs @@ -0,0 +1,24 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing.xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] + public sealed class RequiresIISAttribute : Attribute, ITestCondition + { + public bool IsMet => IISExpressAncmSchema.SupportsInProcessHosting; + + public string SkipReason => IISExpressAncmSchema.SkipReason; + + public RequiresIISAttribute() { } + + public RequiresIISAttribute(IISCapability capabilities) + { + // IISCapabilities aren't pertinent to IISExpress + } + } +} diff --git a/src/IISIntegration/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs new file mode 100644 index 0000000000..62d07c5fd9 --- /dev/null +++ b/src/IISIntegration/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs @@ -0,0 +1,83 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +{ + [Collection(PublishedSitesCollection.Name)] + public class UpgradeFeatureDetectionTests : IISFunctionalTestBase + { + private readonly string _isWebsocketsSupported = Environment.OSVersion.Version >= new Version(6, 2) ? "Enabled" : "Disabled"; + private readonly PublishedSitesFixture _fixture; + + public UpgradeFeatureDetectionTests(PublishedSitesFixture fixture) + { + _fixture = fixture; + } + + [ConditionalFact] + public Task UpgradeFeatureDetectionDisabled_InProcess() + { + // fails due to not modifying the apphost.config file. + return UpgradeFeatureDetectionDeployer( + disableWebSocket: true, + Helpers.GetInProcessTestSitesPath(), + "Disabled", HostingModel.InProcess); + } + + [ConditionalFact] + public Task UpgradeFeatureDetectionEnabled_InProcess() + { + return UpgradeFeatureDetectionDeployer( + disableWebSocket: false, + Helpers.GetInProcessTestSitesPath(), + _isWebsocketsSupported, HostingModel.InProcess); + } + + [ConditionalFact] + public Task UpgradeFeatureDetectionDisabled_OutOfProcess() + { + return UpgradeFeatureDetectionDeployer( + disableWebSocket: true, + Helpers.GetOutOfProcessTestSitesPath(), + "Disabled", HostingModel.OutOfProcess); + } + + [ConditionalFact] + public Task UpgradeFeatureDetectionEnabled_OutOfProcess() + { + return UpgradeFeatureDetectionDeployer( + disableWebSocket: false, + Helpers.GetOutOfProcessTestSitesPath(), + _isWebsocketsSupported, HostingModel.OutOfProcess); + } + + private async Task UpgradeFeatureDetectionDeployer(bool disableWebSocket, string sitePath, string expected, HostingModel hostingModel) + { + var deploymentParameters = _fixture.GetBaseDeploymentParameters(hostingModel, publish: true); + + if (disableWebSocket) + { + // For IIS, we need to modify the apphost.config file + deploymentParameters.AddServerConfigAction( + element => element.Descendants("webSocket") + .Single() + .SetAttributeValue("enabled", "false")); + } + + var deploymentResult = await DeployAsync(deploymentParameters); + + var response = await deploymentResult.HttpClient.GetAsync("UpgradeFeatureDetection"); + var responseText = await response.Content.ReadAsStringAsync(); + Assert.Equal(expected, responseText); + } + } +} diff --git a/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs new file mode 100644 index 0000000000..772fbde2c3 --- /dev/null +++ b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs @@ -0,0 +1,33 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Linq; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.TestHost; +using Microsoft.Extensions.DependencyInjection; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + public class IISExtensionTests + { + [Fact] + public void CallingUseIISIntegrationMultipleTimesWorks() + { + + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .UseIISIntegration() + .Configure(app => { }); + var server = new TestServer(builder); + + var filters = server.Host.Services.GetServices() + .OfType(); + + Assert.Single(filters); + } + } +} diff --git a/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs new file mode 100644 index 0000000000..0898b7ae21 --- /dev/null +++ b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs @@ -0,0 +1,420 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Net; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http.Features.Authentication; +using Microsoft.AspNetCore.TestHost; +using Microsoft.Extensions.DependencyInjection; +using Xunit; + +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + public class IISMiddlewareTests + { + [Fact] + public async Task MiddlewareSkippedIfTokenIsMissing() + { + var assertsExecuted = false; + + var builder = new WebHostBuilder() + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + app.Run(context => + { + var auth = context.Features.Get(); + Assert.Null(auth); + assertsExecuted = true; + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var req = new HttpRequestMessage(HttpMethod.Get, ""); + req.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + var response = await server.CreateClient().SendAsync(req); + Assert.True(assertsExecuted); + response.EnsureSuccessStatusCode(); + } + + [Fact] + public async Task MiddlewareRejectsRequestIfTokenHeaderIsMissing() + { + var assertsExecuted = false; + + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + app.Run(context => + { + var auth = context.Features.Get(); + Assert.Null(auth); + assertsExecuted = true; + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var req = new HttpRequestMessage(HttpMethod.Get, ""); + var response = await server.CreateClient().SendAsync(req); + Assert.False(assertsExecuted); + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); + } + + [Theory] + [InlineData("/", "/iisintegration", "shutdown")] + [InlineData("/", "/iisintegration", "Shutdown")] + [InlineData("/pathBase", "/pathBase/iisintegration", "shutdown")] + [InlineData("/pathBase", "/pathBase/iisintegration", "Shutdown")] + public async Task MiddlewareShutsdownGivenANCMShutdown(string pathBase, string requestPath, string shutdownEvent) + { + var requestExecuted = new ManualResetEvent(false); + var applicationStoppingFired = new ManualResetEvent(false); + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", pathBase) + .UseIISIntegration() + .Configure(app => + { + var appLifetime = app.ApplicationServices.GetRequiredService(); + appLifetime.ApplicationStopping.Register(() => applicationStoppingFired.Set()); + + app.Run(context => + { + requestExecuted.Set(); + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var request = new HttpRequestMessage(HttpMethod.Post, requestPath); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-EVENT", shutdownEvent); + var response = await server.CreateClient().SendAsync(request); + + Assert.True(applicationStoppingFired.WaitOne(TimeSpan.FromSeconds(5))); + Assert.False(requestExecuted.WaitOne(0)); + Assert.Equal(HttpStatusCode.Accepted, response.StatusCode); + } + + public static TheoryData InvalidShutdownMethods + { + get + { + return new TheoryData + { + HttpMethod.Put, + HttpMethod.Trace, + HttpMethod.Head, + HttpMethod.Get, + HttpMethod.Delete, + HttpMethod.Options + }; + } + } + + [Theory] + [MemberData(nameof(InvalidShutdownMethods))] + public async Task MiddlewareIgnoresShutdownGivenWrongMethod(HttpMethod method) + { + var requestExecuted = new ManualResetEvent(false); + var applicationStoppingFired = new ManualResetEvent(false); + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + var appLifetime = app.ApplicationServices.GetRequiredService(); + appLifetime.ApplicationStopping.Register(() => applicationStoppingFired.Set()); + + app.Run(context => + { + requestExecuted.Set(); + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var request = new HttpRequestMessage(method, "/iisintegration"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-EVENT", "shutdown"); + var response = await server.CreateClient().SendAsync(request); + + Assert.False(applicationStoppingFired.WaitOne(TimeSpan.FromSeconds(1))); + Assert.True(requestExecuted.WaitOne(0)); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Theory] + [InlineData("/")] + [InlineData("/path")] + [InlineData("/path/iisintegration")] + public async Task MiddlewareIgnoresShutdownGivenWrongPath(string path) + { + var requestExecuted = new ManualResetEvent(false); + var applicationStoppingFired = new ManualResetEvent(false); + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + var appLifetime = app.ApplicationServices.GetRequiredService(); + appLifetime.ApplicationStopping.Register(() => applicationStoppingFired.Set()); + + app.Run(context => + { + requestExecuted.Set(); + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var request = new HttpRequestMessage(HttpMethod.Post, path); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-EVENT", "shutdown"); + var response = await server.CreateClient().SendAsync(request); + + Assert.False(applicationStoppingFired.WaitOne(TimeSpan.FromSeconds(1))); + Assert.True(requestExecuted.WaitOne(0)); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Theory] + [InlineData("event")] + [InlineData("")] + [InlineData(null)] + public async Task MiddlewareIgnoresShutdownGivenWrongEvent(string shutdownEvent) + { + var requestExecuted = new ManualResetEvent(false); + var applicationStoppingFired = new ManualResetEvent(false); + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + var appLifetime = app.ApplicationServices.GetRequiredService(); + appLifetime.ApplicationStopping.Register(() => applicationStoppingFired.Set()); + + app.Run(context => + { + requestExecuted.Set(); + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var request = new HttpRequestMessage(HttpMethod.Post, "/iisintegration"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-EVENT", shutdownEvent); + var response = await server.CreateClient().SendAsync(request); + + Assert.False(applicationStoppingFired.WaitOne(TimeSpan.FromSeconds(1))); + Assert.True(requestExecuted.WaitOne(0)); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public void UrlDelayRegisteredAndPreferHostingUrlsSet() + { + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + app.Run(context => Task.FromResult(0)); + }); + + Assert.Null(builder.GetSetting(WebHostDefaults.ServerUrlsKey)); + Assert.Null(builder.GetSetting(WebHostDefaults.PreferHostingUrlsKey)); + + // Adds a server and calls Build() + var server = new TestServer(builder); + + Assert.Equal("http://127.0.0.1:12345", builder.GetSetting(WebHostDefaults.ServerUrlsKey)); + Assert.Equal("true", builder.GetSetting(WebHostDefaults.PreferHostingUrlsKey)); + } + + [Fact] + public void PathBaseHiddenFromServer() + { + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/pathBase") + .UseIISIntegration() + .Configure(app => + { + app.Run(context => Task.FromResult(0)); + }); + new TestServer(builder); + + Assert.Equal("http://127.0.0.1:12345", builder.GetSetting(WebHostDefaults.ServerUrlsKey)); + } + + [Fact] + public async Task AddsUsePathBaseMiddlewareWhenPathBaseSpecified() + { + var requestPathBase = string.Empty; + var requestPath = string.Empty; + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/pathbase") + .UseIISIntegration() + .Configure(app => + { + app.Run(context => + { + requestPathBase = context.Request.PathBase.Value; + requestPath = context.Request.Path.Value; + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var request = new HttpRequestMessage(HttpMethod.Get, "/PathBase/Path"); + request.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + var response = await server.CreateClient().SendAsync(request); + + Assert.Equal("/PathBase", requestPathBase); + Assert.Equal("/Path", requestPath); + } + + [Fact] + public async Task AddsAuthenticationHandlerByDefault() + { + var assertsExecuted = false; + + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .Configure(app => + { + app.Run(async context => + { + var auth = context.RequestServices.GetRequiredService(); + var windows = await auth.GetSchemeAsync(IISDefaults.AuthenticationScheme); + Assert.NotNull(windows); + Assert.Null(windows.DisplayName); + Assert.Equal("Microsoft.AspNetCore.Server.IISIntegration.AuthenticationHandler", windows.HandlerType.FullName); + assertsExecuted = true; + }); + }); + var server = new TestServer(builder); + + var req = new HttpRequestMessage(HttpMethod.Get, ""); + req.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + await server.CreateClient().SendAsync(req); + + Assert.True(assertsExecuted); + } + + [Theory] + [InlineData(true)] + [InlineData(false)] + public async Task OnlyAddAuthenticationHandlerIfForwardWindowsAuthentication(bool forward) + { + var assertsExecuted = false; + + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .ConfigureServices(services => + { + services.Configure(options => + { + options.ForwardWindowsAuthentication = forward; + }); + }) + .Configure(app => + { + app.Run(async context => + { + var auth = context.RequestServices.GetService(); + Assert.NotNull(auth); + var windowsAuth = await auth.GetSchemeAsync(IISDefaults.AuthenticationScheme); + if (forward) + { + Assert.NotNull(windowsAuth); + Assert.Null(windowsAuth.DisplayName); + Assert.Equal("AuthenticationHandler", windowsAuth.HandlerType.Name); + } + else + { + Assert.Null(windowsAuth); + } + assertsExecuted = true; + }); + }); + var server = new TestServer(builder); + + var req = new HttpRequestMessage(HttpMethod.Get, ""); + req.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + await server.CreateClient().SendAsync(req); + + Assert.True(assertsExecuted); + } + + [Theory] + [InlineData(true)] + [InlineData(false)] + public async Task DoesNotBlowUpWithoutAuth(bool forward) + { + var assertsExecuted = false; + + var builder = new WebHostBuilder() + .UseSetting("TOKEN", "TestToken") + .UseSetting("PORT", "12345") + .UseSetting("APPL_PATH", "/") + .UseIISIntegration() + .ConfigureServices(services => + { + services.Configure(options => + { + options.ForwardWindowsAuthentication = forward; + }); + }) + .Configure(app => + { + app.Run(context => + { + assertsExecuted = true; + return Task.FromResult(0); + }); + }); + var server = new TestServer(builder); + + var req = new HttpRequestMessage(HttpMethod.Get, ""); + req.Headers.TryAddWithoutValidation("MS-ASPNETCORE-TOKEN", "TestToken"); + await server.CreateClient().SendAsync(req); + + Assert.True(assertsExecuted); + } + } +} diff --git a/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj new file mode 100644 index 0000000000..ea19c2a1fc --- /dev/null +++ b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj @@ -0,0 +1,18 @@ + + + + $(StandardTestTfms) + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/TestTasks/InjectRequestHandler.cs b/src/IISIntegration/test/TestTasks/InjectRequestHandler.cs new file mode 100644 index 0000000000..4da8129d71 --- /dev/null +++ b/src/IISIntegration/test/TestTasks/InjectRequestHandler.cs @@ -0,0 +1,62 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Diagnostics; +using System.IO; +using System.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace TestTasks +{ + public class InjectRequestHandler + { + private static void Main(string[] args) + { + string rid = args[0]; + string libraryLocation = args[1]; + string depsFile = args[2]; + + JToken deps; + using (var file = File.OpenText(depsFile)) + using (JsonTextReader reader = new JsonTextReader(file)) + { + deps = JObject.ReadFrom(reader); + } + + var libraryName = "ANCMRH/1.0"; + var libraries = (JObject)deps["libraries"]; + var targetName = (JValue)deps["runtimeTarget"]["name"]; + + var target = (JObject)deps["targets"][targetName.Value]; + var targetLibrary = target.Properties().FirstOrDefault(p => p.Name == libraryName); + targetLibrary?.Remove(); + targetLibrary = + new JProperty(libraryName, new JObject( + new JProperty("runtimeTargets", new JObject( + new JProperty(libraryLocation.Replace('\\', '/'), new JObject( + new JProperty("rid", rid), + new JProperty("assetType", "native") + )))))); + target.AddFirst(targetLibrary); + + var library = libraries.Properties().FirstOrDefault(p => p.Name == libraryName); + library?.Remove(); + library = + new JProperty(libraryName, new JObject( + new JProperty("type", "package"), + new JProperty("serviceable", true), + new JProperty("sha512", ""), + new JProperty("path", libraryName), + new JProperty("hashPath", ""))); + libraries.AddFirst(library); + + using (var file = File.CreateText(depsFile)) + using (var writer = new JsonTextWriter(file) { Formatting = Formatting.Indented }) + { + deps.WriteTo(writer); + } + } + } +} diff --git a/src/IISIntegration/test/TestTasks/TestTasks.csproj b/src/IISIntegration/test/TestTasks/TestTasks.csproj new file mode 100644 index 0000000000..aa4c144936 --- /dev/null +++ b/src/IISIntegration/test/TestTasks/TestTasks.csproj @@ -0,0 +1,12 @@ + + + + Exe + $(StandardTestTfms) + + + + + + + diff --git a/src/IISIntegration/test/WebSites/Directory.Build.props b/src/IISIntegration/test/WebSites/Directory.Build.props new file mode 100644 index 0000000000..9b29d34f16 --- /dev/null +++ b/src/IISIntegration/test/WebSites/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj new file mode 100644 index 0000000000..4d0952108a --- /dev/null +++ b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj @@ -0,0 +1,32 @@ + + + + + + netcoreapp2.2 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json new file mode 100644 index 0000000000..246b7a0b47 --- /dev/null +++ b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json @@ -0,0 +1,42 @@ +{ + "iisSettings": { + "windowsAuthentication": true, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:5762/", + "sslPort": 0 + } + }, + "profiles": { + "ANCM IIS Express": { + "commandName": "Executable", + "executablePath": "$(IISExpressPath)", + "commandLineArgs": "$(IISExpressArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + }, + "ANCM IIS": { + "commandName": "Executable", + "executablePath": "$(IISPath)", + "commandLineArgs": "$(IISArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + } + } +} diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/DummyServer.cs b/src/IISIntegration/test/WebSites/InProcessWebSite/DummyServer.cs new file mode 100644 index 0000000000..d122f05776 --- /dev/null +++ b/src/IISIntegration/test/WebSites/InProcessWebSite/DummyServer.cs @@ -0,0 +1,30 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Http.Features; + +namespace TestSite +{ + public class DummyServer : IServer + { + public void Dispose() + { + } + + public Task StartAsync(IHttpApplication application, CancellationToken cancellationToken) + { + return Task.Delay(TimeSpan.MaxValue); + } + + public Task StopAsync(CancellationToken cancellationToken) + { + return Task.Delay(TimeSpan.MaxValue); + } + + public IFeatureCollection Features { get; } + } +} diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj b/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj new file mode 100644 index 0000000000..d007d2daa1 --- /dev/null +++ b/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj @@ -0,0 +1,33 @@ + + + + + + netcoreapp2.2 + true + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/Program.cs b/src/IISIntegration/test/WebSites/InProcessWebSite/Program.cs new file mode 100644 index 0000000000..c40448ee91 --- /dev/null +++ b/src/IISIntegration/test/WebSites/InProcessWebSite/Program.cs @@ -0,0 +1,114 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace TestSite +{ + public static class Program + { + public static int Main(string[] args) + { + var mode = args.FirstOrDefault(); + switch (mode) + { + case "CreateFile": + File.WriteAllText(args[1], ""); + return StartServer(); + case "CheckLargeStdOutWrites": + Console.WriteLine(new string('a', 30000)); + break; + case "CheckLargeStdErrWrites": + Console.Error.WriteLine(new string('a', 30000)); + Console.Error.Flush(); + break; + case "ConsoleWrite": + Console.WriteLine($"Random number: {args[1]}"); + break; + case "ConsoleErrorWrite": + Console.Error.WriteLine($"Random number: {args[1]}"); + Console.Error.Flush(); + break; + case "CheckOversizedStdErrWrites": + Console.WriteLine(new string('a', 31000)); + break; + case "CheckOversizedStdOutWrites": + Console.Error.WriteLine(new string('a', 31000)); + Console.Error.Flush(); + break; + case "Hang": + Thread.Sleep(Timeout.Infinite); + break; + case "Throw": + throw new InvalidOperationException("Program.Main exception"); + case "EarlyReturn": + return 12; + case "HangOnStop": + { + var host = new WebHostBuilder() + .UseIIS() + .UseStartup() + .Build(); + host.Run(); + + Thread.Sleep(Timeout.Infinite); + } + break; + case "CheckConsoleFunctions": + // Call a bunch of console functions and make sure none return invalid handle. + Console.OutputEncoding = Encoding.UTF8; + Console.Title = "Test"; + Console.WriteLine($"Is Console redirection: {Console.IsOutputRedirected}"); + Console.BackgroundColor = ConsoleColor.Blue; + Console.WriteLine("彡⾔"); + break; + case "OverriddenServer": + { + var host = new WebHostBuilder() + .UseIIS() + .ConfigureServices(services => services.AddSingleton()) + .Configure(builder => builder.Run(async context => { await context.Response.WriteAsync("I shouldn't work"); })) + .Build(); + host.Run(); + } + break; + case "ConsoleErrorWriteStartServer": + Console.Error.WriteLine("TEST MESSAGE"); + return StartServer(); + case "ConsoleWriteStartServer": + Console.WriteLine("TEST MESSAGE"); + return StartServer(); + default: + return StartServer(); + + } + return 12; + } + + private static int StartServer() + { + var host = new WebHostBuilder() + .ConfigureLogging((_, factory) => + { + factory.AddConsole(); + factory.AddFilter("Console", level => level >= LogLevel.Information); + }) + .UseIIS() + .UseStartup() + .Build(); + + host.Run(); + return 0; + } + } +} diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/InProcessWebSite/Properties/launchSettings.json new file mode 100644 index 0000000000..246b7a0b47 --- /dev/null +++ b/src/IISIntegration/test/WebSites/InProcessWebSite/Properties/launchSettings.json @@ -0,0 +1,42 @@ +{ + "iisSettings": { + "windowsAuthentication": true, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:5762/", + "sslPort": 0 + } + }, + "profiles": { + "ANCM IIS Express": { + "commandName": "Executable", + "executablePath": "$(IISExpressPath)", + "commandLineArgs": "$(IISExpressArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + }, + "ANCM IIS": { + "commandName": "Executable", + "executablePath": "$(IISPath)", + "commandLineArgs": "$(IISArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + } + } +} diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.WebSockets.cs b/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.WebSockets.cs new file mode 100644 index 0000000000..d658ebd03f --- /dev/null +++ b/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.WebSockets.cs @@ -0,0 +1,147 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Net.WebSockets; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.Extensions.DependencyInjection; +using Xunit; + +namespace TestSite +{ + public partial class Startup + { + + private void WebsocketRequest(IApplicationBuilder app) + { + app.Run(async context => + { + await context.Response.WriteAsync("test"); + }); + } + + private void WebReadBeforeUpgrade(IApplicationBuilder app) + { + app.Run(async context => { + + var singleByteArray = new byte[1]; + Assert.Equal(0, await context.Request.Body.ReadAsync(singleByteArray, 0, 1)); + + var ws = await Upgrade(context); + await SendMessages(ws, "Yay"); + }); + } + + private void WebSocketEcho(IApplicationBuilder app) + { + app.Run(async context => + { + var ws = await Upgrade(context); + + var appLifetime = app.ApplicationServices.GetRequiredService(); + + await Echo(ws, appLifetime.ApplicationStopping); + }); + } + + private void WebSocketLifetimeEvents(IApplicationBuilder app) + { + app.Run(async context => { + + var messages = new List(); + + context.Response.OnStarting(() => { + context.Response.Headers["custom-header"] = "value"; + messages.Add("OnStarting"); + return Task.CompletedTask; + }); + + var ws = await Upgrade(context); + messages.Add("Upgraded"); + + await SendMessages(ws, messages.ToArray()); + }); + } + + private static async Task SendMessages(WebSocket webSocket, params string[] messages) + { + foreach (var message in messages) + { + await webSocket.SendAsync(new ArraySegment(Encoding.ASCII.GetBytes(message)), WebSocketMessageType.Text, true, CancellationToken.None); + } + } + + private static async Task Upgrade(HttpContext context) + { + var upgradeFeature = context.Features.Get(); + + // Generate WebSocket response headers + string key = context.Request.Headers[Constants.Headers.SecWebSocketKey].ToString(); + var responseHeaders = HandshakeHelpers.GenerateResponseHeaders(key); + foreach (var headerPair in responseHeaders) + { + context.Response.Headers[headerPair.Key] = headerPair.Value; + } + + // Upgrade the connection + Stream opaqueTransport = await upgradeFeature.UpgradeAsync(); + + // Get the WebSocket object + var ws = WebSocketProtocol.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2)); + return ws; + } + + private async Task Echo(WebSocket webSocket, CancellationToken token) + { + var buffer = new byte[1024 * 4]; + var result = await webSocket.ReceiveAsync(new ArraySegment(buffer), token); + bool closeFromServer = false; + string closeFromServerCmd = "CloseFromServer"; + int closeFromServerLength = closeFromServerCmd.Length; + + while (!result.CloseStatus.HasValue && !token.IsCancellationRequested && !closeFromServer) + { + if (result.Count == closeFromServerLength && + Encoding.ASCII.GetString(buffer).Substring(0, result.Count) == closeFromServerCmd) + { + // The client sent "CloseFromServer" text message to request the server to close (a test scenario). + closeFromServer = true; + } + else + { + await webSocket.SendAsync(new ArraySegment(buffer, 0, result.Count), result.MessageType, result.EndOfMessage, token); + result = await webSocket.ReceiveAsync(new ArraySegment(buffer), token); + } + } + + if (result.CloseStatus.HasValue) + { + // Client-initiated close handshake + await webSocket.CloseAsync(result.CloseStatus.Value, result.CloseStatusDescription, CancellationToken.None); + } + else + { + // Server-initiated close handshake due to either of the two conditions: + // (1) The applicaton host is performing a graceful shutdown. + // (2) The client sent "CloseFromServer" text message to request the server to close (a test scenario). + await webSocket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, closeFromServerCmd, CancellationToken.None); + + // The server has sent the Close frame. + // Stop sending but keep receiving until we get the Close frame from the client. + while (!result.CloseStatus.HasValue) + { + result = await webSocket.ReceiveAsync(new ArraySegment(buffer), CancellationToken.None); + } + } + } + } +} diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.cs b/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.cs new file mode 100644 index 0000000000..eb84272b76 --- /dev/null +++ b/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.cs @@ -0,0 +1,699 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Net; +using System.Text; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Primitives; +using Xunit; + +namespace TestSite +{ + public partial class Startup + { + public void Configure(IApplicationBuilder app) + { + TestStartup.Register(app, this); + } + + private async Task ServerVariable(HttpContext ctx) + { + var varName = ctx.Request.Query["q"]; + var newValue = ctx.Request.Query["v"]; + var feature = ctx.Features.Get(); + if (newValue.Count != 0) + { + feature[varName] = newValue; + } + await ctx.Response.WriteAsync($"{varName}: {feature[varName] ?? "(null)"}"); + } + + private async Task AuthenticationAnonymous(HttpContext ctx) + { + await ctx.Response.WriteAsync("Anonymous?" + !ctx.User.Identity.IsAuthenticated); + } + + private async Task AuthenticationRestricted(HttpContext ctx) + { + if (ctx.User.Identity.IsAuthenticated) + { + await ctx.Response.WriteAsync(ctx.User.Identity.AuthenticationType); + } + else + { + await ctx.ChallengeAsync(IISServerDefaults.AuthenticationScheme); + } + } + + private async Task AuthenticationForbidden(HttpContext ctx) + { + await ctx.ForbidAsync(IISServerDefaults.AuthenticationScheme); + } + + private async Task AuthenticationRestrictedNTLM(HttpContext ctx) + { + if (string.Equals("NTLM", ctx.User.Identity.AuthenticationType, StringComparison.Ordinal)) + { + await ctx.Response.WriteAsync("NTLM"); + } + else + { + await ctx.ChallengeAsync(IISServerDefaults.AuthenticationScheme); + } + } + + private async Task FeatureCollectionSetRequestFeatures(HttpContext ctx) + { + try + { + Assert.Equal("GET", ctx.Request.Method); + ctx.Request.Method = "test"; + Assert.Equal("test", ctx.Request.Method); + + Assert.Equal("http", ctx.Request.Scheme); + ctx.Request.Scheme = "test"; + Assert.Equal("test", ctx.Request.Scheme); + + Assert.Equal("/FeatureCollectionSetRequestFeatures", ctx.Request.PathBase); + ctx.Request.PathBase = "/base"; + Assert.Equal("/base", ctx.Request.PathBase); + + Assert.Equal("/path", ctx.Request.Path); + ctx.Request.Path = "/path"; + Assert.Equal("/path", ctx.Request.Path); + + Assert.Equal("?query", ctx.Request.QueryString.Value); + ctx.Request.QueryString = QueryString.Empty; + Assert.Equal("", ctx.Request.QueryString.Value); + + Assert.Equal("HTTP/1.1", ctx.Request.Protocol); + ctx.Request.Protocol = "HTTP/1.0"; + Assert.Equal("HTTP/1.0", ctx.Request.Protocol); + + Assert.NotNull(ctx.Request.Headers); + var headers = new HeaderDictionary(); + ctx.Features.Get().Headers = headers; + Assert.Same(headers, ctx.Features.Get().Headers); + + Assert.NotNull(ctx.Request.Body); + var body = new MemoryStream(); + ctx.Request.Body = body; + Assert.Same(body, ctx.Request.Body); + + //Assert.NotNull(ctx.Features.Get().TraceIdentifier); + //Assert.NotEqual(CancellationToken.None, ctx.RequestAborted); + //var token = new CancellationTokenSource().Token; + //ctx.RequestAborted = token; + //Assert.Equal(token, ctx.RequestAborted); + + await ctx.Response.WriteAsync("Success"); + return; + } + catch (Exception exception) + { + ctx.Response.StatusCode = 500; + await ctx.Response.WriteAsync(exception.ToString()); + } + await ctx.Response.WriteAsync("_Failure"); + } + + private async Task FeatureCollectionSetResponseFeatures(HttpContext ctx) + { + try + { + Assert.Equal(200, ctx.Response.StatusCode); + ctx.Response.StatusCode = 404; + Assert.Equal(404, ctx.Response.StatusCode); + ctx.Response.StatusCode = 200; + + Assert.Null(ctx.Features.Get().ReasonPhrase); + ctx.Features.Get().ReasonPhrase = "Set Response"; + Assert.Equal("Set Response", ctx.Features.Get().ReasonPhrase); + + Assert.NotNull(ctx.Response.Headers); + var headers = new HeaderDictionary(); + ctx.Features.Get().Headers = headers; + Assert.Same(headers, ctx.Features.Get().Headers); + + var originalBody = ctx.Response.Body; + Assert.NotNull(originalBody); + var body = new MemoryStream(); + ctx.Response.Body = body; + Assert.Same(body, ctx.Response.Body); + ctx.Response.Body = originalBody; + + await ctx.Response.WriteAsync("Success"); + return; + } + catch (Exception exception) + { + ctx.Response.StatusCode = 500; + await ctx.Response.WriteAsync(exception.ToString()); + } + await ctx.Response.WriteAsync("_Failure"); + } + + private async Task FeatureCollectionSetConnectionFeatures(HttpContext ctx) + { + try + { + Assert.True(IPAddress.IsLoopback(ctx.Connection.LocalIpAddress)); + ctx.Connection.LocalIpAddress = IPAddress.IPv6Any; + Assert.Equal(IPAddress.IPv6Any, ctx.Connection.LocalIpAddress); + + Assert.True(IPAddress.IsLoopback(ctx.Connection.RemoteIpAddress)); + ctx.Connection.RemoteIpAddress = IPAddress.IPv6Any; + Assert.Equal(IPAddress.IPv6Any, ctx.Connection.RemoteIpAddress); + await ctx.Response.WriteAsync("Success"); + return; + } + catch (Exception exception) + { + ctx.Response.StatusCode = 500; + await ctx.Response.WriteAsync(exception.ToString()); + } + await ctx.Response.WriteAsync("_Failure"); + } + + private void Throw(HttpContext ctx) + { + throw new Exception(); + } + + private async Task SetCustomErorCode(HttpContext ctx) + { + var feature = ctx.Features.Get(); + feature.ReasonPhrase = ctx.Request.Query["reason"]; + feature.StatusCode = int.Parse(ctx.Request.Query["code"]); + if (ctx.Request.Query["writeBody"] == "True") + { + await ctx.Response.WriteAsync(ctx.Request.Query["body"]); + } + } + + private async Task HelloWorld(HttpContext ctx) + { + if (ctx.Request.Path.Value.StartsWith("/Path")) + { + await ctx.Response.WriteAsync(ctx.Request.Path.Value); + return; + } + if (ctx.Request.Path.Value.StartsWith("/Query")) + { + await ctx.Response.WriteAsync(ctx.Request.QueryString.Value); + return; + } + + await ctx.Response.WriteAsync("Hello World"); + } + + private async Task LargeResponseBody(HttpContext ctx) + { + if (int.TryParse(ctx.Request.Query["length"], out var length)) + { + await ctx.Response.WriteAsync(new string('a', length)); + } + } + + private async Task ResponseHeaders(HttpContext ctx) + { + ctx.Response.Headers["UnknownHeader"] = "test123=foo"; + ctx.Response.ContentType = "text/plain"; + ctx.Response.Headers["MultiHeader"] = new StringValues(new string[] { "1", "2" }); + await ctx.Response.WriteAsync("Request Complete"); + } + + private async Task ResponseInvalidOrdering(HttpContext ctx) + { + if (ctx.Request.Path.Equals("/SetStatusCodeAfterWrite")) + { + await ctx.Response.WriteAsync("Started_"); + try + { + ctx.Response.StatusCode = 200; + } + catch (InvalidOperationException) + { + await ctx.Response.WriteAsync("SetStatusCodeAfterWriteThrew_"); + } + await ctx.Response.WriteAsync("Finished"); + return; + } + else if (ctx.Request.Path.Equals("/SetHeaderAfterWrite")) + { + await ctx.Response.WriteAsync("Started_"); + try + { + ctx.Response.Headers["This will fail"] = "some value"; + } + catch (InvalidOperationException) + { + await ctx.Response.WriteAsync("SetHeaderAfterWriteThrew_"); + } + await ctx.Response.WriteAsync("Finished"); + return; + } + } + + private async Task CheckEnvironmentVariable(HttpContext ctx) + { + var variable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_TESTING_VALUE"); + await ctx.Response.WriteAsync(variable); + } + + private async Task CheckEnvironmentLongValueVariable(HttpContext ctx) + { + var variable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_TESTING_LONG_VALUE"); + await ctx.Response.WriteAsync(variable); + } + + private async Task CheckAppendedEnvironmentVariable(HttpContext ctx) + { + var variable = Environment.GetEnvironmentVariable("ProgramFiles"); + await ctx.Response.WriteAsync(variable); + } + + private async Task CheckRemoveAuthEnvironmentVariable(HttpContext ctx) + { + var variable = Environment.GetEnvironmentVariable("ASPNETCORE_IIS_HTTPAUTH"); + await ctx.Response.WriteAsync(variable); + } + private async Task ReadAndWriteSynchronously(HttpContext ctx) + { + var t2 = Task.Run(() => WriteManyTimesToResponseBody(ctx)); + var t1 = Task.Run(() => ReadRequestBody(ctx)); + await Task.WhenAll(t1, t2); + } + + private async Task ReadRequestBody(HttpContext ctx) + { + var readBuffer = new byte[1]; + var result = await ctx.Request.Body.ReadAsync(readBuffer, 0, 1); + while (result != 0) + { + result = await ctx.Request.Body.ReadAsync(readBuffer, 0, 1); + } + } + + private async Task WriteManyTimesToResponseBody(HttpContext ctx) + { + for (var i = 0; i < 10000; i++) + { + await ctx.Response.WriteAsync("hello world"); + } + } + + private async Task ReadAndWriteEcho(HttpContext ctx) + { + var readBuffer = new byte[4096]; + var result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + while (result != 0) + { + await ctx.Response.WriteAsync(Encoding.UTF8.GetString(readBuffer, 0, result)); + result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + } + } + private async Task ReadAndFlushEcho(HttpContext ctx) + { + var readBuffer = new byte[4096]; + var result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + while (result != 0) + { + await ctx.Response.WriteAsync(Encoding.UTF8.GetString(readBuffer, 0, result)); + await ctx.Response.Body.FlushAsync(); + result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + } + } + + private async Task ReadAndWriteEchoLines(HttpContext ctx) + { + if (ctx.Request.Headers.TryGetValue("Response-Content-Type", out var contentType)) + { + ctx.Response.ContentType = contentType; + } + + //Send headers + await ctx.Response.Body.FlushAsync(); + + var reader = new StreamReader(ctx.Request.Body); + while (!reader.EndOfStream) + { + var line = await reader.ReadLineAsync(); + if (line == "") + { + return; + } + await ctx.Response.WriteAsync(line + Environment.NewLine); + await ctx.Response.Body.FlushAsync(); + } + } + + private async Task ReadAndWriteEchoLinesNoBuffering(HttpContext ctx) + { + var feature = ctx.Features.Get(); + feature.DisableResponseBuffering(); + + if (ctx.Request.Headers.TryGetValue("Response-Content-Type", out var contentType)) + { + ctx.Response.ContentType = contentType; + } + + //Send headers + await ctx.Response.Body.FlushAsync(); + + var reader = new StreamReader(ctx.Request.Body); + while (!reader.EndOfStream) + { + var line = await reader.ReadLineAsync(); + if (line == "") + { + return; + } + await ctx.Response.WriteAsync(line + Environment.NewLine); + } + } + + private async Task ReadPartialBody(HttpContext ctx) + { + var data = new byte[5]; + var count = 0; + do + { + count += await ctx.Request.Body.ReadAsync(data, count, data.Length - count); + } while (count != data.Length); + await ctx.Response.Body.WriteAsync(data, 0, data.Length); + } + + private async Task SetHeaderFromBody(HttpContext ctx) + { + using (var reader = new StreamReader(ctx.Request.Body)) + { + var value = await reader.ReadToEndAsync(); + ctx.Response.Headers["BodyAsString"] = value; + await ctx.Response.WriteAsync(value); + } + } + + private async Task ReadAndWriteEchoTwice(HttpContext ctx) + { + var readBuffer = new byte[4096]; + var result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + while (result != 0) + { + await ctx.Response.WriteAsync(Encoding.UTF8.GetString(readBuffer, 0, result)); + await ctx.Response.Body.FlushAsync(); + await ctx.Response.WriteAsync(Encoding.UTF8.GetString(readBuffer, 0, result)); + await ctx.Response.Body.FlushAsync(); + result = await ctx.Request.Body.ReadAsync(readBuffer, 0, readBuffer.Length); + } + } + + private async Task ReadAndWriteSlowConnection(HttpContext ctx) + { + var t2 = Task.Run(() => WriteResponseBodyAFewTimes(ctx)); + var t1 = Task.Run(() => ReadRequestBody(ctx)); + await Task.WhenAll(t1, t2); + } + + private async Task WriteResponseBodyAFewTimes(HttpContext ctx) + { + for (var i = 0; i < 100; i++) + { + await ctx.Response.WriteAsync("hello world"); + } + } + + private async Task ReadAndWriteCopyToAsync(HttpContext ctx) + { + await ctx.Request.Body.CopyToAsync(ctx.Response.Body); + } + + private async Task UpgradeFeatureDetection(HttpContext ctx) + { + if (ctx.Features.Get() != null) + { + await ctx.Response.WriteAsync("Enabled"); + } + else + { + await ctx.Response.WriteAsync("Disabled"); + } + } + + private async Task TestReadOffsetWorks(HttpContext ctx) + { + var buffer = new byte[11]; + ctx.Request.Body.Read(buffer, 0, 6); + ctx.Request.Body.Read(buffer, 6, 5); + + await ctx.Response.WriteAsync(Encoding.UTF8.GetString(buffer)); + } + + private async Task TestInvalidReadOperations(HttpContext ctx) + { + var success = false; + if (ctx.Request.Path.StartsWithSegments("/NullBuffer")) + { + try + { + await ctx.Request.Body.ReadAsync(null, 0, 0); + } + catch (Exception) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidOffsetSmall")) + { + try + { + await ctx.Request.Body.ReadAsync(new byte[1], -1, 0); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidOffsetLarge")) + { + try + { + await ctx.Request.Body.ReadAsync(new byte[1], 2, 0); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountSmall")) + { + try + { + await ctx.Request.Body.ReadAsync(new byte[1], 0, -1); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountLarge")) + { + try + { + await ctx.Request.Body.ReadAsync(new byte[1], 0, -1); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountWithOffset")) + { + try + { + await ctx.Request.Body.ReadAsync(new byte[3], 1, 3); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + + + await ctx.Response.WriteAsync(success ? "Success" : "Failure"); + } + + private async Task TestValidReadOperations(HttpContext ctx) + { + var count = -1; + + if (ctx.Request.Path.StartsWithSegments("/NullBuffer")) + { + count = await ctx.Request.Body.ReadAsync(null, 0, 0); + } + else if (ctx.Request.Path.StartsWithSegments("/NullBufferPost")) + { + count = await ctx.Request.Body.ReadAsync(null, 0, 0); + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountZeroRead")) + { + count = await ctx.Request.Body.ReadAsync(new byte[1], 0, 0); + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountZeroReadPost")) + { + count = await ctx.Request.Body.ReadAsync(new byte[1], 0, 0); + } + + await ctx.Response.WriteAsync(count == 0 ? "Success" : "Failure"); + } + + private async Task TestInvalidWriteOperations(HttpContext ctx) + { + var success = false; + + if (ctx.Request.Path.StartsWithSegments("/InvalidOffsetSmall")) + { + try + { + await ctx.Response.Body.WriteAsync(new byte[1], -1, 0); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidOffsetLarge")) + { + try + { + await ctx.Response.Body.WriteAsync(new byte[1], 2, 0); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountSmall")) + { + try + { + await ctx.Response.Body.WriteAsync(new byte[1], 0, -1); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountLarge")) + { + try + { + await ctx.Response.Body.WriteAsync(new byte[1], 0, -1); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + else if (ctx.Request.Path.StartsWithSegments("/InvalidCountWithOffset")) + { + try + { + await ctx.Response.Body.WriteAsync(new byte[3], 1, 3); + } + catch (ArgumentOutOfRangeException) + { + success = true; + } + } + + await ctx.Response.WriteAsync(success ? "Success" : "Failure"); + } + + private async Task TestValidWriteOperations(HttpContext ctx) + { + if (ctx.Request.Path.StartsWithSegments("/NullBuffer")) + { + await ctx.Response.Body.WriteAsync(null, 0, 0); + } + else if (ctx.Request.Path.StartsWithSegments("/NullBufferPost")) + { + await ctx.Response.Body.WriteAsync(null, 0, 0); + } + + await ctx.Response.WriteAsync("Success"); + } + + private async Task LargeResponseFile(HttpContext ctx) + { + var tempFile = Path.GetTempFileName(); + var fileContent = new string('a', 200000); + var fileStream = File.OpenWrite(tempFile); + + for (var i = 0; i < 1000; i++) + { + await fileStream.WriteAsync(Encoding.UTF8.GetBytes(fileContent), 0, fileContent.Length); + } + fileStream.Close(); + + await ctx.Response.SendFileAsync(tempFile, 0, null); + + // Try to delete the file from the temp directory. If it fails, don't report an error + // to the application. File should eventually be cleaned up from the temp directory + // by OS. + try + { + File.Delete(tempFile); + } + catch (Exception) + { + } + } + + private async Task BasePath(HttpContext ctx) + { + await ctx.Response.WriteAsync(AppDomain.CurrentDomain.BaseDirectory); + } + + private async Task Shutdown(HttpContext ctx) + { + await ctx.Response.WriteAsync("Shutting down"); + ctx.RequestServices.GetService().StopApplication(); + } + + private async Task GetServerVariableStress(HttpContext ctx) + { + // This test simulates the scenario where native Flush call is being + // executed on background thread while request thread calls GetServerVariable + // concurrent native calls may cause native object corruption + + var serverVariableFeature = ctx.Features.Get(); + await ctx.Response.WriteAsync("Response Begin"); + for (int i = 0; i < 1000; i++) + { + await ctx.Response.WriteAsync(serverVariableFeature["REMOTE_PORT"]); + await ctx.Response.Body.FlushAsync(); + } + await ctx.Response.WriteAsync("Response End"); + } + + private async Task CommandLineArgs(HttpContext ctx) + { + await ctx.Response.WriteAsync(string.Join("|", Environment.GetCommandLineArgs().Skip(1))); + } + + public Task HttpsHelloWorld(HttpContext ctx) => + ctx.Response.WriteAsync("Scheme:" + ctx.Request.Scheme + "; Original:" + ctx.Request.Headers["x-original-proto"]); + } +} diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/web.config b/src/IISIntegration/test/WebSites/InProcessWebSite/web.config new file mode 100644 index 0000000000..2a9bd223c3 --- /dev/null +++ b/src/IISIntegration/test/WebSites/InProcessWebSite/web.config @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/WebSites/InProcessWebSite/wwwroot/static.txt b/src/IISIntegration/test/WebSites/InProcessWebSite/wwwroot/static.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj new file mode 100644 index 0000000000..14beb7394e --- /dev/null +++ b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj @@ -0,0 +1,31 @@ + + + + + + $(StandardTestTfms) + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Program.cs b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Program.cs new file mode 100644 index 0000000000..90895237d2 --- /dev/null +++ b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Program.cs @@ -0,0 +1,45 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.IO; +using System.Linq; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Logging; + +namespace TestSite +{ + public static class Program + { + public static int Main(string[] args) + { + var mode = args.FirstOrDefault(); + switch (mode) + { + case "CreateFile": + File.WriteAllText(args[1], ""); + return StartServer(); + } + + return StartServer(); + } + + private static int StartServer() + { + var host = new WebHostBuilder() + .ConfigureLogging( + (_, factory) => { + factory.AddConsole(); + factory.AddFilter("Console", level => level >= LogLevel.Information); + }) + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseIISIntegration() + .UseStartup() + .UseKestrel() + .Build(); + + host.Run(); + return 0; + } + } +} + diff --git a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json new file mode 100644 index 0000000000..246b7a0b47 --- /dev/null +++ b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json @@ -0,0 +1,42 @@ +{ + "iisSettings": { + "windowsAuthentication": true, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:5762/", + "sslPort": 0 + } + }, + "profiles": { + "ANCM IIS Express": { + "commandName": "Executable", + "executablePath": "$(IISExpressPath)", + "commandLineArgs": "$(IISExpressArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + }, + "ANCM IIS": { + "commandName": "Executable", + "executablePath": "$(IISPath)", + "commandLineArgs": "$(IISArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + } + } +} diff --git a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Startup.cs b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Startup.cs new file mode 100644 index 0000000000..de54a85a8a --- /dev/null +++ b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Startup.cs @@ -0,0 +1,105 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Security.Principal; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting.Server.Features; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IISIntegration; +using Microsoft.Extensions.DependencyInjection; +using Xunit; + +namespace TestSite +{ + public partial class Startup + { + private IServerAddressesFeature _serverAddresses; + + public void Configure(IApplicationBuilder app) + { + TestStartup.Register(app, this); + + _serverAddresses = app.ServerFeatures.Get(); + } + + public Task Path(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Request.Path.Value); + + public Task Query(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Request.QueryString.Value); + + public Task BodyLimit(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Features.Get()?.MaxRequestBodySize?.ToString() ?? "null"); + + + public Task HelloWorld(HttpContext ctx) => ctx.Response.WriteAsync("Hello World"); + + public Task HttpsHelloWorld(HttpContext ctx) => + ctx.Response.WriteAsync("Scheme:" + ctx.Request.Scheme + "; Original:" + ctx.Request.Headers["x-original-proto"]); + + public Task Anonymous(HttpContext context) => context.Response.WriteAsync("Anonymous?" + !context.User.Identity.IsAuthenticated); + + public Task Restricted(HttpContext context) + { + if (context.User.Identity.IsAuthenticated) + { + Assert.IsType(context.User); + return context.Response.WriteAsync(context.User.Identity.AuthenticationType); + } + else + { + return context.ChallengeAsync(IISDefaults.AuthenticationScheme); + } + } + + public Task Forbidden(HttpContext context) => context.ForbidAsync(IISDefaults.AuthenticationScheme); + + public Task RestrictedNTLM(HttpContext context) + { + if (string.Equals("NTLM", context.User.Identity.AuthenticationType, StringComparison.Ordinal)) + { + return context.Response.WriteAsync("NTLM"); + } + else + { + return context.ChallengeAsync(IISDefaults.AuthenticationScheme); + } + } + + public Task UpgradeFeatureDetection(HttpContext context) => + context.Response.WriteAsync(context.Features.Get() != null? "Enabled": "Disabled"); + + public Task CheckRequestHandlerVersion(HttpContext context) + { + // We need to check if the aspnetcorev2_outofprocess dll is loaded by iisexpress.exe + // As they aren't in the same process, we will try to delete the file and expect a file + // in use error + try + { + File.Delete(context.Request.Headers["ANCMRHPath"]); + } + catch(UnauthorizedAccessException) + { + // TODO calling delete on the file will succeed when running with IIS + return context.Response.WriteAsync("Hello World"); + } + + return context.Response.WriteAsync(context.Request.Headers["ANCMRHPath"]); + } + + private async Task ProcessId(HttpContext context) + { + await context.Response.WriteAsync(Process.GetCurrentProcess().Id.ToString()); + } + + private async Task ServerAddresses(HttpContext context) + { + await context.Response.WriteAsync(string.Join(",", _serverAddresses.Addresses)); + } + } +} diff --git a/src/IISIntegration/test/WebSites/OutOfProcessWebSite/wwwroot/static.txt b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/wwwroot/static.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/IISIntegration/test/WebSites/StressTestWebSite/Program.cs b/src/IISIntegration/test/WebSites/StressTestWebSite/Program.cs new file mode 100644 index 0000000000..e8e5392c2c --- /dev/null +++ b/src/IISIntegration/test/WebSites/StressTestWebSite/Program.cs @@ -0,0 +1,26 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Logging; + +namespace ANCMStressTestApp +{ + public class Program + { + public static void Main(string[] args) + { + var host = new WebHostBuilder() + .ConfigureLogging((_, factory) => + { + factory.AddConsole(); + }) + .UseKestrel() + .UseIISIntegration() + .UseStartup() + .Build(); + + host.Run(); + } + } +} diff --git a/src/IISIntegration/test/WebSites/StressTestWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/StressTestWebSite/Properties/launchSettings.json new file mode 100644 index 0000000000..246b7a0b47 --- /dev/null +++ b/src/IISIntegration/test/WebSites/StressTestWebSite/Properties/launchSettings.json @@ -0,0 +1,42 @@ +{ + "iisSettings": { + "windowsAuthentication": true, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:5762/", + "sslPort": 0 + } + }, + "profiles": { + "ANCM IIS Express": { + "commandName": "Executable", + "executablePath": "$(IISExpressPath)", + "commandLineArgs": "$(IISExpressArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + }, + "ANCM IIS": { + "commandName": "Executable", + "executablePath": "$(IISPath)", + "commandLineArgs": "$(IISArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + } + } +} diff --git a/src/IISIntegration/test/WebSites/StressTestWebSite/Startup.cs b/src/IISIntegration/test/WebSites/StressTestWebSite/Startup.cs new file mode 100644 index 0000000000..68f6eb1f77 --- /dev/null +++ b/src/IISIntegration/test/WebSites/StressTestWebSite/Startup.cs @@ -0,0 +1,232 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Threading; +using System.Text; +using System.Net.WebSockets; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.Net.Http.Headers; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Primitives; + +namespace ANCMStressTestApp +{ + public class Startup + { + // This method gets called by the runtime. Use this method to add services to the container. + // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 + public void ConfigureServices(IServiceCollection services) + { + } + + public void Configure(IApplicationBuilder app) + { + app.Map("/HelloWorld", HelloWorld); + app.Map("/ConnectionClose", ConnectionClose); + app.Map("/EchoPostData", EchoPostData); + app.Map("/LargeResponseBody", LargeResponseBody); + app.Map("/ResponseHeaders", ResponseHeaders); + app.Map("/EnvironmentVariables", EnvironmentVariables); + app.Map("/RequestInformation", RequestInformation); + app.Map("/WebSocket", WebSocket); + + app.Run(async context => + { + await context.Response.WriteAsync("Default Page"); + }); + } + + private void HelloWorld(IApplicationBuilder app) + { + app.Run(async context => + { + await context.Response.WriteAsync("Hello World"); + }); + } + + private void ConnectionClose(IApplicationBuilder app) + { + app.Run(async context => + { + context.Response.Headers[HeaderNames.Connection] = "close"; + await context.Response.WriteAsync("Connnection Close"); + await context.Response.Body.FlushAsync(); + }); + } + + private void EchoPostData(IApplicationBuilder app) + { + app.Run(async context => + { + string responseBody = string.Empty; + + if (string.Equals(context.Request.Method, "POST", StringComparison.OrdinalIgnoreCase)) + { + using (StreamReader reader = new StreamReader(context.Request.Body, Encoding.UTF8)) + { + responseBody = await reader.ReadToEndAsync(); + } + } + else + { + responseBody = "NoAction"; + } + + await context.Response.WriteAsync(responseBody); + }); + } + + private void LargeResponseBody(IApplicationBuilder app) + { + app.Run(async context => + { + if (int.TryParse(context.Request.Query["length"], out var length)) + { + await context.Response.WriteAsync(new string('a', length)); + } + }); + } + + private void ResponseHeaders(IApplicationBuilder app) + { + app.Run(async context => + { + context.Response.Headers["UnknownHeader"] = "test123=foo"; + context.Response.ContentType = "text/plain"; + context.Response.Headers["MultiHeader"] = new StringValues(new string[] { "1", "2" }); + await context.Response.WriteAsync("Request Complete"); + }); + } + + private void EnvironmentVariables(IApplicationBuilder app) + { + app.Run(async context => + { + context.Response.ContentType = "text/plain"; + await context.Response.WriteAsync("Environment Variables:" + Environment.NewLine); + var vars = Environment.GetEnvironmentVariables(); + foreach (var key in vars.Keys.Cast().OrderBy(key => key, StringComparer.OrdinalIgnoreCase)) + { + var value = vars[key]; + await context.Response.WriteAsync(key + ": " + value + Environment.NewLine); + } + await context.Response.WriteAsync(Environment.NewLine); + }); + } + + private void RequestInformation(IApplicationBuilder app) + { + app.Run(async context => + { + context.Response.ContentType = "text/plain"; + + await context.Response.WriteAsync("Address:" + Environment.NewLine); + await context.Response.WriteAsync("Scheme: " + context.Request.Scheme + Environment.NewLine); + await context.Response.WriteAsync("Host: " + context.Request.Headers["Host"] + Environment.NewLine); + await context.Response.WriteAsync("PathBase: " + context.Request.PathBase.Value + Environment.NewLine); + await context.Response.WriteAsync("Path: " + context.Request.Path.Value + Environment.NewLine); + await context.Response.WriteAsync("Query: " + context.Request.QueryString.Value + Environment.NewLine); + await context.Response.WriteAsync(Environment.NewLine); + + await context.Response.WriteAsync("Connection:" + Environment.NewLine); + await context.Response.WriteAsync("RemoteIp: " + context.Connection.RemoteIpAddress + Environment.NewLine); + await context.Response.WriteAsync("RemotePort: " + context.Connection.RemotePort + Environment.NewLine); + await context.Response.WriteAsync("LocalIp: " + context.Connection.LocalIpAddress + Environment.NewLine); + await context.Response.WriteAsync("LocalPort: " + context.Connection.LocalPort + Environment.NewLine); + await context.Response.WriteAsync(Environment.NewLine); + + await context.Response.WriteAsync("Headers:" + Environment.NewLine); + foreach (var header in context.Request.Headers) + { + await context.Response.WriteAsync(header.Key + ": " + header.Value + Environment.NewLine); + } + await context.Response.WriteAsync(Environment.NewLine); + }); + } + + private void WebSocket(IApplicationBuilder app) + { + app.Run(async context => + { + var upgradeFeature = context.Features.Get(); + + // Generate WebSocket response headers + string key = context.Request.Headers[Constants.Headers.SecWebSocketKey].ToString(); + var responseHeaders = HandshakeHelpers.GenerateResponseHeaders(key); + foreach (var headerPair in responseHeaders) + { + context.Response.Headers[headerPair.Key] = headerPair.Value; + } + + // Upgrade the connection + Stream opaqueTransport = await upgradeFeature.UpgradeAsync(); + + // Get the WebSocket object + var ws = WebSocketProtocol.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2)); + + var appLifetime = app.ApplicationServices.GetRequiredService(); + + await Echo(ws, appLifetime.ApplicationStopping); + }); + } + + private async Task Echo(WebSocket webSocket, CancellationToken token) + { + try + { + var buffer = new byte[1024 * 4]; + var result = await webSocket.ReceiveAsync(new ArraySegment(buffer), token); + bool closeFromServer = false; + string closeFromServerCmd = "CloseFromServer"; + int closeFromServerLength = closeFromServerCmd.Length; + + while (!result.CloseStatus.HasValue && !token.IsCancellationRequested && !closeFromServer) + { + if (result.Count == closeFromServerLength && + Encoding.ASCII.GetString(buffer).Substring(0, result.Count) == closeFromServerCmd) + { + // The client sent "CloseFromServer" text message to request the server to close (a test scenario). + closeFromServer = true; + } + else + { + await webSocket.SendAsync(new ArraySegment(buffer, 0, result.Count), result.MessageType, result.EndOfMessage, token); + result = await webSocket.ReceiveAsync(new ArraySegment(buffer), token); + } + } + + if (result.CloseStatus.HasValue) + { + // Client-initiated close handshake + await webSocket.CloseAsync(result.CloseStatus.Value, result.CloseStatusDescription, CancellationToken.None); + } + else + { + // Server-initiated close handshake due to either of the two conditions: + // (1) The applicaton host is performing a graceful shutdown. + // (2) The client sent "CloseFromServer" text message to request the server to close (a test scenario). + await webSocket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, closeFromServerCmd, CancellationToken.None); + + // The server has sent the Close frame. + // Stop sending but keep receiving until we get the Close frame from the client. + while (!result.CloseStatus.HasValue) + { + result = await webSocket.ReceiveAsync(new ArraySegment(buffer), CancellationToken.None); + } + } + } + catch (Exception e) + { + Console.WriteLine("{0} Exception caught!", e); + } + } + } +} diff --git a/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj b/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj new file mode 100644 index 0000000000..25ae032221 --- /dev/null +++ b/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj @@ -0,0 +1,25 @@ + + + + + + $(StandardTestTfms) + true + + + + + + + + + + + + + + + + + + diff --git a/src/IISIntegration/test/WebSites/shared/SharedStartup/Startup.shared.cs b/src/IISIntegration/test/WebSites/shared/SharedStartup/Startup.shared.cs new file mode 100644 index 0000000000..b5d7f0305f --- /dev/null +++ b/src/IISIntegration/test/WebSites/shared/SharedStartup/Startup.shared.cs @@ -0,0 +1,117 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; + +namespace TestSite +{ + public partial class Startup + { + public void ConfigureServices(IServiceCollection serviceCollection) + { + serviceCollection.AddResponseCompression(); + } + + private async Task HostingEnvironment(HttpContext ctx) + { + var hostingEnv = ctx.RequestServices.GetService(); + + await ctx.Response.WriteAsync("ContentRootPath " + hostingEnv.ContentRootPath + Environment.NewLine); + await ctx.Response.WriteAsync("WebRootPath " + hostingEnv.WebRootPath + Environment.NewLine); + await ctx.Response.WriteAsync("CurrentDirectory " + Environment.CurrentDirectory); + } + + private async Task ConsoleWrite(HttpContext ctx) + { + Console.WriteLine("TEST MESSAGE"); + + await ctx.Response.WriteAsync("Hello World"); + } + + private async Task ConsoleErrorWrite(HttpContext ctx) + { + Console.Error.WriteLine("TEST MESSAGE"); + + await ctx.Response.WriteAsync("Hello World"); + } + + public async Task Auth(HttpContext ctx) + { + var authProvider = ctx.RequestServices.GetService(); + var authScheme = (await authProvider.GetAllSchemesAsync()).SingleOrDefault(); + + await ctx.Response.WriteAsync(authScheme?.Name ?? "null"); + if (ctx.User.Identity.Name != null) + { + await ctx.Response.WriteAsync(":" + ctx.User.Identity.Name); + } + } + + public async Task GetClientCert(HttpContext context) + { + var clientCert = context.Connection.ClientCertificate; + await context.Response.WriteAsync(clientCert != null ? $"Enabled;{clientCert.GetCertHashString()}" : "Disabled"); + } + + private static int _waitingRequestCount; + + public Task WaitForAbort(HttpContext context) + { + Interlocked.Increment(ref _waitingRequestCount); + try + { + context.RequestAborted.WaitHandle.WaitOne(); + return Task.CompletedTask; + } + finally + { + Interlocked.Decrement(ref _waitingRequestCount); + } + } + + public Task Abort(HttpContext context) + { + context.Abort(); + return Task.CompletedTask; + } + + public async Task WaitingRequestCount(HttpContext context) + { + await context.Response.WriteAsync(_waitingRequestCount.ToString()); + } + + public Task CreateFile(HttpContext context) + { + var hostingEnv = context.RequestServices.GetService(); + File.WriteAllText(System.IO.Path.Combine(hostingEnv.ContentRootPath, "Started.txt"), ""); + return Task.CompletedTask; + } + + public Task OverrideServer(HttpContext context) + { + context.Response.Headers["Server"] = "MyServer/7.8"; + return Task.CompletedTask; + } + + public void CompressedData(IApplicationBuilder builder) + { + builder.UseResponseCompression(); + // write random bytes to check that compressed data is passed through + builder.Run( + async context => + { + context.Response.ContentType = "text/html"; + await context.Response.Body.WriteAsync(new byte[100], 0, 100); + }); + } + } +} diff --git a/src/IISIntegration/test/WebSites/shared/WebSockets/Constants.cs b/src/IISIntegration/test/WebSites/shared/WebSockets/Constants.cs new file mode 100644 index 0000000000..95b53003cc --- /dev/null +++ b/src/IISIntegration/test/WebSites/shared/WebSockets/Constants.cs @@ -0,0 +1,17 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests +{ + public static class Constants + { + public static class Headers + { + public const string Upgrade = "Upgrade"; + public const string UpgradeWebSocket = "websocket"; + public const string Connection = "Connection"; + public const string SecWebSocketKey = "Sec-WebSocket-Key"; + public const string SecWebSocketAccept = "Sec-WebSocket-Accept"; + } + } +} diff --git a/src/IISIntegration/test/WebSites/shared/WebSockets/HandshakeHelpers.cs b/src/IISIntegration/test/WebSites/shared/WebSockets/HandshakeHelpers.cs new file mode 100644 index 0000000000..b079ea3f85 --- /dev/null +++ b/src/IISIntegration/test/WebSites/shared/WebSockets/HandshakeHelpers.cs @@ -0,0 +1,41 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Security.Cryptography; +using System.Text; + +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests +{ + internal static class HandshakeHelpers + { + public static IEnumerable> GenerateResponseHeaders(string key) + { + yield return new KeyValuePair(Constants.Headers.Connection, Constants.Headers.Upgrade); + yield return new KeyValuePair(Constants.Headers.Upgrade, Constants.Headers.UpgradeWebSocket); + yield return new KeyValuePair(Constants.Headers.SecWebSocketAccept, CreateResponseKey(key)); + } + + public static string CreateResponseKey(string requestKey) + { + // "The value of this header field is constructed by concatenating /key/, defined above in step 4 + // in Section 4.2.2, with the string "258EAFA5- E914-47DA-95CA-C5AB0DC85B11", taking the SHA-1 hash of + // this concatenated value to obtain a 20-byte value and base64-encoding" + // https://tools.ietf.org/html/rfc6455#section-4.2.2 + + if (requestKey == null) + { + throw new ArgumentNullException(nameof(requestKey)); + } + + using (var algorithm = SHA1.Create()) + { + string merged = requestKey + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; + byte[] mergedBytes = Encoding.UTF8.GetBytes(merged); + byte[] hashedBytes = algorithm.ComputeHash(mergedBytes); + return Convert.ToBase64String(hashedBytes); + } + } + } +} diff --git a/src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs b/src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs new file mode 100644 index 0000000000..b1604e367a --- /dev/null +++ b/src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs @@ -0,0 +1,38 @@ +using System; +using System.Reflection; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; + +namespace Microsoft.AspNetCore.IISIntegration.FunctionalTests +{ + public static class TestStartup + { + public static void Register(IApplicationBuilder app, object startup) + { + var type = startup.GetType(); + foreach (var method in type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)) + { + var parameters = method.GetParameters(); + if (method.Name != "Configure" && + parameters.Length == 1) + { + Action appfunc = null; + if (parameters[0].ParameterType == typeof(IApplicationBuilder)) + { + appfunc = innerAppBuilder => method.Invoke(startup, new[] { innerAppBuilder }); + } + else if (parameters[0].ParameterType == typeof(HttpContext)) + { + appfunc = innerAppBuilder => innerAppBuilder.Run(ctx => (Task)method.Invoke(startup, new[] { ctx })); + } + + if (appfunc != null) + { + app.Map("/" + method.Name, appfunc); + } + } + } + } + } +} diff --git a/src/IISIntegration/test/gtest/gtest.vcxproj b/src/IISIntegration/test/gtest/gtest.vcxproj new file mode 100644 index 0000000000..924f26337d --- /dev/null +++ b/src/IISIntegration/test/gtest/gtest.vcxproj @@ -0,0 +1,180 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + 15.0 + {CAC1267B-8778-4257-AAC6-CAF481723B01} + Win32Proj + gtest + 10.0.15063.0 + + + + StaticLibrary + true + v141 + Unicode + gtestd + + + StaticLibrary + false + v141 + true + Unicode + gtest + + + StaticLibrary + true + v141 + Unicode + gtestd + + + StaticLibrary + false + v141 + true + Unicode + gtest + + + + + + + + + + + + + + + + + + + + + true + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_SourcePath); + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + true + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_SourcePath); + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + false + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_SourcePath); + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + false + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_SourcePath); + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + + NotUsing + Level3 + Disabled + true + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Windows + true + + + + + NotUsing + Level3 + Disabled + true + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Windows + true + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Windows + true + true + true + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/tools/GenerateNativeAssets.ps1 b/src/IISIntegration/tools/GenerateNativeAssets.ps1 similarity index 100% rename from tools/GenerateNativeAssets.ps1 rename to src/IISIntegration/tools/GenerateNativeAssets.ps1 diff --git a/tools/SetupTestEnvironment.ps1 b/src/IISIntegration/tools/SetupTestEnvironment.ps1 similarity index 100% rename from tools/SetupTestEnvironment.ps1 rename to src/IISIntegration/tools/SetupTestEnvironment.ps1 diff --git a/tools/UpdateIISExpressCertificate.ps1 b/src/IISIntegration/tools/UpdateIISExpressCertificate.ps1 similarity index 100% rename from tools/UpdateIISExpressCertificate.ps1 rename to src/IISIntegration/tools/UpdateIISExpressCertificate.ps1 diff --git a/tools/certificate.ps1 b/src/IISIntegration/tools/certificate.ps1 similarity index 100% rename from tools/certificate.ps1 rename to src/IISIntegration/tools/certificate.ps1 diff --git a/tools/httpsys.ps1 b/src/IISIntegration/tools/httpsys.ps1 similarity index 100% rename from tools/httpsys.ps1 rename to src/IISIntegration/tools/httpsys.ps1 diff --git a/tools/installancm.ps1 b/src/IISIntegration/tools/installancm.ps1 similarity index 100% rename from tools/installancm.ps1 rename to src/IISIntegration/tools/installancm.ps1 diff --git a/tools/update_schema.ps1 b/src/IISIntegration/tools/update_schema.ps1 similarity index 100% rename from tools/update_schema.ps1 rename to src/IISIntegration/tools/update_schema.ps1 diff --git a/version.props b/src/IISIntegration/version.props similarity index 100% rename from version.props rename to src/IISIntegration/version.props diff --git a/test/gtest/googletest b/test/gtest/googletest deleted file mode 160000 index 4e4df226fc..0000000000 --- a/test/gtest/googletest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4e4df226fc197c0dda6e37f5c8c3845ca1e73a49 From ebb0bfefb7fb57fc38c673b1c436d910928b715d Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 31 Oct 2018 16:57:49 -0700 Subject: [PATCH 363/363] Reorganize source code in preparation to move into aspnet/aspnetcore --- .appveyor.yml | 27 - .editorconfig | 24 - .gitattributes | 53 -- .gitmodules | 3 - .vsts-pipelines/builds/ci-internal-21.yml | 30 - .vsts-pipelines/builds/ci-internal.yml | 13 - .vsts-pipelines/builds/ci-public.yml | 15 - .vsts-pipelines/templates/build-steps.yml | 88 --- CONTRIBUTING.md | 4 - LICENSE.txt | 228 ------- NuGet.config | 7 - README.md | 18 - THIRD_PARTY_NOTICES | 42 -- build.cmd | 2 - build.sh | 8 - korebuild-lock.txt | 2 - run.cmd | 2 - run.ps1 | 209 ------ run.sh | 256 -------- .gitignore => src/IISIntegration/.gitignore | 0 .../IISIntegration/Directory.Build.props | 0 .../IISIntegration/Directory.Build.targets | 0 .../IISIntegration/IISIntegration.NoV1.sln | 0 .../IISIntegration/IISIntegration.sln | 0 .../IISIntegration/NuGetPackageVerifier.json | 0 .../NuGetPackageVerifier.xplat.json | 0 .../IIS.Performance/FirstRequestConfig.cs | 0 .../IIS.Performance/IIS.Performance.csproj | 0 .../IIS.Performance/PlaintextBenchmark.cs | 0 .../IIS.Performance/StartupTimeBenchmark.cs | 0 .../IISIntegration/build}/Build.Settings | 0 .../build}/Config.Definitions.Props | 0 {build => src/IISIntegration/build}/Key.snk | Bin .../build}/applicationhost.config | 0 .../build}/applicationhost.iis.config | 0 .../IISIntegration/build}/assets.props | 0 .../build}/buildpipeline/pipeline.groovy | 36 +- .../buildpipeline/windows-appverif.groovy | 0 .../build}/buildpipeline/windows.groovy | 30 +- .../IISIntegration/build}/dependencies.props | 0 .../build}/functional-test-assets.targets | 0 .../IISIntegration/build}/launchSettings.json | 0 .../IISIntegration/build}/native.targets | 0 .../IISIntegration/build}/repo.props | 0 .../IISIntegration/build}/repo.targets | 0 .../IISIntegration/build}/sources.props | 0 .../IISIntegration/build}/testsite.props | 0 .../IISIntegration/korebuild.json | 0 ...crosoft.AspNetCore.AspNetCoreModule.nuspec | 0 ...icrosoft.AspNetCore.AspNetCoreModule.props | 0 ...osoft.AspNetCore.AspNetCoreModuleV2.nuspec | 0 ...oft.AspNetCore.AspNetCoreModuleV2.props.in | 0 .../samples}/IISSample/IISSample.csproj | 0 .../IISSample/Properties/launchSettings.json | 0 .../samples}/IISSample/Startup.cs | 0 .../samples}/IISSample/web.config | 0 .../NativeIISSample/NativeIISSample.csproj | 0 .../Properties/launchSettings.json | 0 .../samples}/NativeIISSample/Startup.cs | 0 .../samples}/NativeIISSample/web.config | 0 .../AspNetCore/AspNetCore.vcxproj | 0 .../AspNetCore/Inc/application.h | 0 .../AspNetCore/Inc/applicationmanager.h | 0 .../AspNetCore/Inc/aspnetcoreconfig.h | 0 .../AspNetCore/Inc/debugutil.h | 0 .../AspNetCore/Inc/environmentvariablehash.h | 0 .../AspNetCore/Inc/filewatcher.h | 0 .../AspNetCore/Inc/forwarderconnection.h | 0 .../AspNetCore/Inc/forwardinghandler.h | 0 .../AspNetCoreModuleV1/AspNetCore/Inc/path.h | 0 .../AspNetCore/Inc/processmanager.h | 0 .../AspNetCore/Inc/protocolconfig.h | 0 .../AspNetCore/Inc/proxymodule.h | 0 .../AspNetCore/Inc/resource.h | 0 .../AspNetCore/Inc/responseheaderhash.h | 0 .../AspNetCore/Inc/serverprocess.h | 0 .../AspNetCore/Inc/sttimer.h | 0 .../AspNetCore/Inc/websockethandler.h | 0 .../AspNetCore/Inc/winhttphelper.h | 0 .../AspNetCoreModuleV1/AspNetCore/Source.def | 0 .../AspNetCore/aspnetcore_msg.mc | 0 .../AspNetCore/aspnetcoremodule.rc | 0 .../AspNetCoreModuleV1/AspNetCore/resource.h | 0 .../AspNetCore/src/application.cxx | 0 .../AspNetCore/src/applicationmanager.cxx | 0 .../AspNetCore/src/aspnetcoreconfig.cxx | 0 .../AspNetCore/src/filewatcher.cxx | 0 .../AspNetCore/src/forwarderconnection.cxx | 0 .../AspNetCore/src/forwardinghandler.cxx | 0 .../AspNetCore/src/main.cxx | 0 .../AspNetCore/src/path.cxx | 0 .../AspNetCore/src/precomp.hxx | 0 .../AspNetCore/src/processmanager.cxx | 0 .../AspNetCore/src/protocolconfig.cxx | 0 .../AspNetCore/src/proxymodule.cxx | 0 .../AspNetCore/src/responseheaderhash.cxx | 0 .../AspNetCore/src/serverprocess.cxx | 0 .../AspNetCore/src/websockethandler.cxx | 0 .../AspNetCore/src/winhttphelper.cxx | 0 .../AspNetCoreModuleV1/IISLib/IISLib.vcxproj | 0 .../src}/AspNetCoreModuleV1/IISLib/acache.cxx | 0 .../src}/AspNetCoreModuleV1/IISLib/acache.h | 0 .../src}/AspNetCoreModuleV1/IISLib/ahutil.cpp | 0 .../src}/AspNetCoreModuleV1/IISLib/ahutil.h | 0 .../src}/AspNetCoreModuleV1/IISLib/base64.cpp | 0 .../src}/AspNetCoreModuleV1/IISLib/base64.h | 0 .../src}/AspNetCoreModuleV1/IISLib/buffer.h | 0 .../src}/AspNetCoreModuleV1/IISLib/datetime.h | 0 .../src}/AspNetCoreModuleV1/IISLib/dbgutil.h | 0 .../src}/AspNetCoreModuleV1/IISLib/hashfn.h | 0 .../AspNetCoreModuleV1/IISLib/hashtable.h | 0 .../AspNetCoreModuleV1/IISLib/listentry.h | 0 .../src}/AspNetCoreModuleV1/IISLib/macros.h | 0 .../AspNetCoreModuleV1/IISLib/multisz.cpp | 0 .../src}/AspNetCoreModuleV1/IISLib/multisz.h | 0 .../AspNetCoreModuleV1/IISLib/multisza.cpp | 0 .../src}/AspNetCoreModuleV1/IISLib/multisza.h | 0 .../src}/AspNetCoreModuleV1/IISLib/ntassert.h | 0 .../src}/AspNetCoreModuleV1/IISLib/percpu.h | 0 .../src}/AspNetCoreModuleV1/IISLib/precomp.h | 0 .../src}/AspNetCoreModuleV1/IISLib/prime.h | 0 .../src}/AspNetCoreModuleV1/IISLib/pudebug.h | 0 .../src}/AspNetCoreModuleV1/IISLib/reftrace.c | 0 .../src}/AspNetCoreModuleV1/IISLib/reftrace.h | 0 .../src}/AspNetCoreModuleV1/IISLib/rwlock.h | 0 .../AspNetCoreModuleV1/IISLib/stringa.cpp | 0 .../src}/AspNetCoreModuleV1/IISLib/stringa.h | 0 .../AspNetCoreModuleV1/IISLib/stringu.cpp | 0 .../src}/AspNetCoreModuleV1/IISLib/stringu.h | 0 .../src}/AspNetCoreModuleV1/IISLib/tracelog.c | 0 .../src}/AspNetCoreModuleV1/IISLib/tracelog.h | 0 .../src}/AspNetCoreModuleV1/IISLib/treehash.h | 0 .../src}/AspNetCoreModuleV1/IISLib/util.cxx | 0 .../AspNetCore/AppOfflineApplication.cpp | 0 .../AspNetCore/AppOfflineApplication.h | 0 .../AspNetCore/AppOfflineHandler.cpp | 0 .../AspNetCore/AppOfflineHandler.h | 0 .../AspNetCore/ApplicationFactory.h | 0 .../AspNetCore/AspNetCore.vcxproj | 608 +++++++++--------- .../AspNetCore/DisconnectHandler.cpp | 0 .../AspNetCore/DisconnectHandler.h | 0 .../AspNetCore/HandlerResolver.cpp | 0 .../AspNetCore/HandlerResolver.h | 0 .../AspNetCore/HtmlResponses.rc | Bin .../AspNetCore/InProcessShimStaticHtml.htm | 0 .../AspNetCore/OutOfProcessShimStaticHtml.htm | 0 .../PollingAppOfflineApplication.cpp | 0 .../AspNetCore/PollingAppOfflineApplication.h | 0 .../AspNetCore/ServerErrorApplication.h | 0 .../AspNetCore/ShimOptions.cpp | 0 .../AspNetCore/ShimOptions.h | 0 .../AspNetCoreModuleV2/AspNetCore/Source.def | 0 .../AspNetCoreModuleV2/AspNetCore/ancm.mof | 0 .../AspNetCore/applicationinfo.cpp | 0 .../AspNetCore/applicationinfo.h | 0 .../AspNetCore/applicationmanager.cpp | 0 .../AspNetCore/applicationmanager.h | 0 .../AspNetCore/aspnetcore_schema_v2.xml | 0 .../AspNetCore/aspnetcoremodule.rc | 0 .../AspNetCoreModuleV2/AspNetCore/dllmain.cpp | 0 .../AspNetCore/globalmodule.cpp | 0 .../AspNetCore/globalmodule.h | 0 .../AspNetCore/proxymodule.cpp | 0 .../AspNetCore/proxymodule.h | 0 .../AspNetCoreModuleV2/AspNetCore/resource.h | 0 .../AspNetCoreModuleV2/AspNetCore/stdafx.cpp | 0 .../AspNetCoreModuleV2/AspNetCore/stdafx.h | 0 .../CommonLib/BaseOutputManager.h | 0 .../CommonLib/CommonLib.vcxproj | 584 ++++++++--------- .../CommonLib/ConfigurationLoadException.h | 0 .../CommonLib/ConfigurationSection.cpp | 0 .../CommonLib/ConfigurationSection.h | 0 .../CommonLib/ConfigurationSource.cpp | 0 .../CommonLib/ConfigurationSource.h | 0 .../CommonLib/Environment.cpp | 0 .../CommonLib/Environment.h | 0 .../AspNetCoreModuleV2/CommonLib/EventLog.cpp | 0 .../AspNetCoreModuleV2/CommonLib/EventLog.h | 0 .../CommonLib/EventTracing.h | 0 .../CommonLib/FileOutputManager.cpp | 0 .../CommonLib/FileOutputManager.h | 0 .../CommonLib/GlobalVersionUtility.cpp | 0 .../CommonLib/GlobalVersionUtility.h | 0 .../CommonLib/HandleWrapper.cpp | 0 .../CommonLib/HandleWrapper.h | 0 .../CommonLib/IOutputManager.h | 0 .../CommonLib/InvalidOperationException.h | 0 .../CommonLib/LoggingHelpers.cpp | 0 .../CommonLib/LoggingHelpers.h | 0 .../CommonLib/ModuleHelpers.h | 0 .../CommonLib/NonCopyable.h | 0 .../CommonLib/NullOutputManager.h | 0 .../CommonLib/PipeOutputManager.cpp | 0 .../CommonLib/PipeOutputManager.h | 0 .../CommonLib/ResultException.h | 0 .../CommonLib/SRWExclusiveLock.cpp | 0 .../CommonLib/SRWExclusiveLock.h | 0 .../CommonLib/SRWSharedLock.cpp | 0 .../CommonLib/SRWSharedLock.h | 0 .../CommonLib/ServerErrorHandler.h | 0 .../CommonLib/StdWrapper.cpp | 0 .../AspNetCoreModuleV2/CommonLib/StdWrapper.h | 0 .../CommonLib/StringHelpers.cpp | 0 .../CommonLib/StringHelpers.h | 0 .../WebConfigConfigurationSection.cpp | 0 .../CommonLib/WebConfigConfigurationSection.h | 0 .../WebConfigConfigurationSource.cpp | 0 .../CommonLib/WebConfigConfigurationSource.h | 0 .../CommonLib/application.h | 0 .../CommonLib/aspnetcore_event.h | 0 .../CommonLib/aspnetcore_msg.mc | 0 .../CommonLib/config_utility.h | 0 .../CommonLib/debugutil.cpp | 0 .../AspNetCoreModuleV2/CommonLib/debugutil.h | 0 .../AspNetCoreModuleV2/CommonLib/exceptions.h | 0 .../CommonLib/file_utility.cpp | 0 .../CommonLib/file_utility.h | 0 .../AspNetCoreModuleV2/CommonLib/fx_ver.cpp | 0 .../AspNetCoreModuleV2/CommonLib/fx_ver.h | 0 .../CommonLib/hostfxr_utility.cpp | 0 .../CommonLib/hostfxr_utility.h | 0 .../CommonLib/hostfxroptions.cpp | 0 .../CommonLib/hostfxroptions.h | 0 .../CommonLib/iapplication.h | 0 .../CommonLib/irequesthandler.h | 0 .../CommonLib/requesthandler.h | 0 .../AspNetCoreModuleV2/CommonLib/resources.h | 0 .../AspNetCoreModuleV2/CommonLib/stdafx.cpp | 0 .../AspNetCoreModuleV2/CommonLib/stdafx.h | 0 .../AspNetCoreModuleV2/CommonLib/sttimer.h | 0 .../AspNetCoreModuleV2/CommonLib/targetver.h | 0 .../AspNetCoreModuleV2/DefaultRules.ruleset | 0 .../AspNetCoreModuleV2/IISLib/IISLib.vcxproj | 410 ++++++------ .../src}/AspNetCoreModuleV2/IISLib/acache.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/acache.h | 0 .../src}/AspNetCoreModuleV2/IISLib/ahutil.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/ahutil.h | 0 .../src}/AspNetCoreModuleV2/IISLib/base64.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/base64.h | 0 .../src}/AspNetCoreModuleV2/IISLib/buffer.h | 0 .../src}/AspNetCoreModuleV2/IISLib/datetime.h | 0 .../src}/AspNetCoreModuleV2/IISLib/dbgutil.h | 0 .../src}/AspNetCoreModuleV2/IISLib/hashfn.h | 0 .../AspNetCoreModuleV2/IISLib/hashtable.h | 0 .../AspNetCoreModuleV2/IISLib/listentry.h | 0 .../src}/AspNetCoreModuleV2/IISLib/macros.h | 0 .../AspNetCoreModuleV2/IISLib/multisz.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/multisz.h | 0 .../AspNetCoreModuleV2/IISLib/multisza.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/multisza.h | 0 .../src}/AspNetCoreModuleV2/IISLib/ntassert.h | 0 .../src}/AspNetCoreModuleV2/IISLib/percpu.h | 0 .../src}/AspNetCoreModuleV2/IISLib/precomp.h | 0 .../src}/AspNetCoreModuleV2/IISLib/prime.h | 0 .../src}/AspNetCoreModuleV2/IISLib/reftrace.c | 0 .../src}/AspNetCoreModuleV2/IISLib/reftrace.h | 0 .../src}/AspNetCoreModuleV2/IISLib/rwlock.h | 0 .../AspNetCoreModuleV2/IISLib/stringa.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/stringa.h | 0 .../AspNetCoreModuleV2/IISLib/stringu.cpp | 0 .../src}/AspNetCoreModuleV2/IISLib/stringu.h | 0 .../src}/AspNetCoreModuleV2/IISLib/tracelog.c | 0 .../src}/AspNetCoreModuleV2/IISLib/tracelog.h | 0 .../src}/AspNetCoreModuleV2/IISLib/treehash.h | 0 .../src}/AspNetCoreModuleV2/IISLib/util.cpp | 0 .../InProcessRequestHandler/HtmlResponses.rc | Bin .../InProcessApplicationBase.cpp | 0 .../InProcessApplicationBase.h | 0 .../InProcessOptions.cpp | 0 .../InProcessOptions.h | 0 .../InProcessRequestHandler.vcxproj | 550 ++++++++-------- .../InProcessRhStaticHtml.htm | 0 .../ShuttingDownApplication.h | 0 .../InProcessRequestHandler/Source.def | 0 .../StartupExceptionApplication.h | 0 .../StartupExceptionHandler.h | 0 .../InProcessRequestHandler/dllmain.cpp | 0 .../inprocessapplication.cpp | 0 .../inprocessapplication.h | 0 .../inprocesshandler.cpp | 0 .../inprocesshandler.h | 0 .../inprocessrequesthandler.rc | 0 .../managedexports.cpp | 0 .../InProcessRequestHandler/resource.h | 0 .../InProcessRequestHandler/stdafx.cpp | 0 .../InProcessRequestHandler/stdafx.h | 0 .../HtmlResponses.rc | 0 .../OutOfProcessRequestHandler.vcxproj | 568 ++++++++-------- .../OutOfProcessRhStaticHtml.htm | 0 .../OutOfProcessRequestHandler/Source.def | 0 .../OutOfProcessRequestHandler/dllmain.cpp | 0 .../forwarderconnection.cpp | 0 .../forwarderconnection.h | 0 .../forwardinghandler.cpp | 0 .../forwardinghandler.h | 0 .../outofprocessrequesthandler.rc | 0 .../outprocessapplication.cpp | 0 .../outprocessapplication.h | 0 .../processmanager.cpp | 0 .../processmanager.h | 0 .../protocolconfig.cpp | 0 .../protocolconfig.h | 0 .../OutOfProcessRequestHandler/resource.h | 0 .../responseheaderhash.cpp | 0 .../responseheaderhash.h | 0 .../serverprocess.cpp | 0 .../serverprocess.h | 0 .../OutOfProcessRequestHandler/stdafx.cpp | 0 .../OutOfProcessRequestHandler/stdafx.h | 0 .../url_utility.cpp | 0 .../OutOfProcessRequestHandler/url_utility.h | 0 .../websockethandler.cpp | 0 .../websockethandler.h | 0 .../winhttphelper.cpp | 0 .../winhttphelper.h | 0 .../AppOfflineTrackingApplication.cpp | 0 .../AppOfflineTrackingApplication.h | 0 .../RequestHandlerLib.vcxproj | 0 .../environmentvariablehash.h | 0 .../environmentvariablehelpers.h | 0 .../RequestHandlerLib/filewatcher.cpp | 0 .../RequestHandlerLib/filewatcher.h | 0 .../requesthandler_config.cpp | 0 .../RequestHandlerLib/requesthandler_config.h | 0 .../RequestHandlerLib/stdafx.h | 0 .../src}/Directory.Build.props | 0 .../AssemblyInfo.cs | 0 .../Core/DuplexStream.cs | 0 .../Core/EmptyStream.cs | 0 .../Core/HttpRequestStream.cs | 0 .../Core/HttpResponseStream.cs | 0 .../Core/HttpStreamState.cs | 0 .../Core/HttpUpgradeStream.cs | 0 .../Core/IISConfigurationData.cs | 0 .../Core/IISHttpContext.FeatureCollection.cs | 0 .../Core/IISHttpContext.Features.cs | 0 .../IISHttpContext.IHttpConnectionFeature.cs | 0 ...tpContext.IHttpRequestIdentifierFeature.cs | 0 ...HttpContext.IHttpRequestLifetimeFeature.cs | 0 .../Core/IISHttpContext.IO.cs | 0 .../Core/IISHttpContext.Log.cs | 0 .../Core/IISHttpContext.cs | 0 .../Core/IISHttpContextOfT.cs | 0 .../Core/IISHttpServer.cs | 0 .../Core/IISNativeApplication.cs | 0 .../Core/IISServerAuthenticationHandler.cs | 0 .../Core/IISServerSetupFilter.cs | 0 .../Core/IO/AsyncIOEngine.Flush.cs | 0 .../Core/IO/AsyncIOEngine.Read.cs | 0 .../Core/IO/AsyncIOEngine.Write.cs | 0 .../Core/IO/AsyncIOEngine.cs | 0 .../Core/IO/AsyncIOOperation.cs | 0 .../Core/IO/AsyncWriteOperationBase.cs | 0 .../Core/IO/IAsyncIOEngine.cs | 0 .../IO/WebSocketsAsyncIOEngine.Initialize.cs | 0 .../Core/IO/WebSocketsAsyncIOEngine.Read.cs | 0 .../Core/IO/WebSocketsAsyncIOEngine.Write.cs | 0 .../Core/IO/WebSocketsAsyncIOEngine.cs | 0 .../Core/OutputProducer.cs | 0 .../Core/ReadOnlyStream.cs | 0 .../Core/Streams.cs | 0 .../ThrowingWasUpgradedWriteOnlyStream.cs | 0 .../Core/WrappingStream.cs | 0 .../Core/WriteOnlyStream.cs | 0 .../CoreStrings.resx | 0 .../HttpContextExtensions.cs | 0 .../IISServerDefaults.cs | 0 .../IISServerOptions.cs | 0 .../IServerVariableFeature.cs | 0 .../Microsoft.AspNetCore.Server.IIS.csproj | 0 .../Microsoft.AspNetCore.Server.IIS.targets | 0 .../NativeMethods.cs | 0 .../Properties/CoreStrings.Designer.cs | 0 .../WebHostBuilderIISExtensions.cs | 0 .../src}/Microsoft.AspNetCore.Server.IIS/_._ | 0 .../AuthenticationHandler.cs | 0 .../ForwardedTlsConnectionFeature.cs | 0 .../IISDefaults.cs | 0 .../IISHostingStartup.cs | 0 .../IISMiddleware.cs | 0 .../IISOptions.cs | 0 .../IISSetupFilter.cs | 0 ...ft.AspNetCore.Server.IISIntegration.csproj | 0 ...t.AspNetCore.Server.IISIntegration.targets | 0 .../NativeMethods.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../WebHostBuilderIISExtensions.cs | 0 .../baseline.netcore.json | 0 .../ApplicationDeployerFactory.cs | 0 .../Http.config | 0 .../IISDeployer.cs | 0 .../IISDeployerBase.cs | 0 .../IISDeploymentParameterExtensions.cs | 0 .../IISDeploymentParameters.cs | 0 .../IISDeploymentResult.cs | 0 .../IISExpressDeployer.cs | 0 .../LoggingHandler.cs | 0 ...tCore.Server.IntegrationTesting.IIS.csproj | 0 .../ProcessTracker.cs | 0 .../RetryHandler.cs | 0 .../WebConfigHelpers.cs | 0 .../XElementExtensions.cs | 0 .../AppHostConfig/IIS.config | 0 .../Common.FunctionalTests/AppOfflineTests.cs | 0 .../Common.FunctionalTests/BasicAuthTests.cs | 0 .../ClientCertificateFixture.cs | 0 .../ClientCertificateTests.cs | 0 .../ClientDisconnectStress.cs | 0 .../CommonStartupTests.cs | 0 .../CompressionTests.cs | 0 .../ConfigurationChangeTests.cs | 0 .../Inprocess/ClientDisconnectTests.cs | 0 .../Inprocess/CompressionTests.cs | 0 .../Inprocess/EnvironmentVariableTests.cs | 0 .../Inprocess/ErrorPagesTests.cs | 0 .../Inprocess/EventLogTests.cs | 0 .../Inprocess/FeatureCollectionTests.cs | 0 .../Inprocess/FixtureLoggedTest.cs | 0 .../Inprocess/FrebTests.cs | 0 .../Inprocess/HelloWorldTests.cs | 0 .../Inprocess/HostingEnvironmentTests.cs | 0 .../InvalidReadWriteOperationTests.cs | 0 .../Inprocess/LargeResponseBodyTests.cs | 0 .../Inprocess/LogPipeTests.cs | 0 .../Inprocess/ResponseHeaderTests.cs | 0 .../Inprocess/ResponseInvalidOrderingTests.cs | 0 .../Inprocess/ServerVariablesTest.cs | 0 .../Inprocess/StartupExceptionTests.cs | 0 .../Inprocess/StartupTests.cs | 0 .../Inprocess/SynchronousReadAndWriteTests.cs | 0 .../Common.FunctionalTests/LogFileTests.cs | 0 .../MultiApplicationTests.cs | 0 .../OutOfProcess/AspNetCorePortTests.cs | 0 .../OutOfProcess/GlobalVersionTests.cs | 0 .../OutOfProcess/HelloWorldTest.cs | 0 .../PublishedSitesFixture.cs | 0 .../RequiresNewHandler.cs | 0 .../Common.FunctionalTests/RequiresNewShim.cs | 0 .../ServerAbortTests.cs | 0 .../SkipIfNotAdminAttribute.cs | 0 .../SkipVSTSAttribute.cs | 0 .../Utilities/AppVerifier.cs | 0 .../Utilities/EventLogHelpers.cs | 0 .../Utilities/FunctionalTestsBase.cs | 0 .../Utilities/Helpers.cs | 0 .../Utilities/IISCapability.cs | 0 .../Utilities/IISCompressionSiteCollection.cs | 0 .../Utilities/IISCompressionSiteFixture.cs | 0 .../Utilities/IISFunctionalTestBase.cs | 0 .../Utilities/IISTestSiteCollection.cs | 0 .../Utilities/IISTestSiteFixture.cs | 0 .../Utilities/LogFileTestBase.cs | 0 .../RequiresEnvironmentVariableAttribute.cs | 0 .../Utilities/SkipIfDebugAttribute.cs | 0 .../WindowsAuthTests.cs | 0 .../test}/Common.Tests/Common.Tests.csproj | 0 .../Common.Tests/Utilities/DisposableList.cs | 0 .../Common.Tests/Utilities/TestConnections.cs | 0 .../Utilities/TimeoutExtensions.cs | 0 .../CommonLibTests/CommonLibTests.vcxproj | 0 .../CommonLibTests/ConfigUtilityTests.cpp | 0 .../CommonLibTests/FileOutputManagerTests.cpp | 0 .../CommonLibTests/GlobalVersionTests.cpp | 0 .../test}/CommonLibTests/Helpers.cpp | 0 .../test}/CommonLibTests/Helpers.h | 0 .../test}/CommonLibTests/NativeTests.targets | 0 .../CommonLibTests/PipeOutputManagerTests.cpp | 0 .../exception_handler_tests.cpp | 0 .../test}/CommonLibTests/fakeclasses.h | 0 .../CommonLibTests/hostfxr_utility_tests.cpp | 0 .../inprocess_application_tests.cpp | 0 .../test}/CommonLibTests/main.cpp | 0 .../test}/CommonLibTests/stdafx.h | 0 .../test}/CommonLibTests/utility_tests.cpp | 0 .../test}/Directory.Build.props | 0 .../BackwardsCompatibilityTests.cs | 0 .../DeployerSelector.cs | 0 ...kwardsCompatibility.FunctionalTests.csproj | 0 .../DeployerSelector.cs | 0 .../ForwardsCompatibilityTests.cs | 0 ...rwardsCompatibility.FunctionalTests.csproj | 0 .../IIS.FunctionalTests/DeployerSelector.cs | 0 .../IIS.FunctionalTests.csproj | 0 .../Inprocess/StdOutRedirectionTests.cs | 0 .../MofFileTests.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RequiresIISAttribute.cs | 0 .../ServicesTests.cs | 0 .../AppHostConfig/HostableWebCore.config | 0 .../test}/IIS.Tests/ClientDisconnectTests.cs | 0 .../IIS.Tests/ConnectionIdFeatureTests.cs | 0 .../IIS.Tests/HttpBodyControlFeatureTests.cs | 0 .../test}/IIS.Tests/IIS.Tests.csproj | 0 .../test}/IIS.Tests/ResponseAbortTests.cs | 0 .../test}/IIS.Tests/StrictTestServerTests.cs | 0 .../test}/IIS.Tests/TestServerTest.cs | 0 ...pIfHostableWebCoreNotAvailibleAttribute.cs | 0 .../test}/IIS.Tests/Utilities/TestServer.cs | 0 .../DeployerSelector.cs | 0 .../IISExpress.FunctionalTests/HttpsTests.cs | 0 .../IISExpress.FunctionalTests.csproj | 0 .../InProcess/AuthenticationTests.cs | 0 .../InProcess/ShutdownTests.cs | 0 .../InProcess/WebSocketTests.cs | 0 .../OutOfProcess/MultipleAppTests.cs | 0 .../OutOfProcess/NtlmAuthentationTest.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RequiresIISAttribute.cs | 0 .../UpgradeFeatureDetectionTests.cs | 0 .../IISExtensionTests.cs | 0 .../IISMiddlewareTests.cs | 0 ...NetCore.Server.IISIntegration.Tests.csproj | 0 .../test}/TestTasks/InjectRequestHandler.cs | 0 .../test}/TestTasks/TestTasks.csproj | 0 .../test}/WebSites/Directory.Build.props | 0 .../InProcessWebSite.csproj | 0 .../Properties/launchSettings.json | 0 .../WebSites/InProcessWebSite/DummyServer.cs | 0 .../InProcessWebSite/InProcessWebSite.csproj | 0 .../WebSites/InProcessWebSite/Program.cs | 0 .../Properties/launchSettings.json | 0 .../InProcessWebSite/Startup.WebSockets.cs | 0 .../WebSites/InProcessWebSite/Startup.cs | 0 .../WebSites/InProcessWebSite/web.config | 0 .../InProcessWebSite/wwwroot/static.txt | 0 .../OutOfProcessWebSite.csproj | 0 .../WebSites/OutOfProcessWebSite/Program.cs | 0 .../Properties/launchSettings.json | 0 .../WebSites/OutOfProcessWebSite/Startup.cs | 0 .../OutOfProcessWebSite/wwwroot/static.txt | 0 .../WebSites/StressTestWebSite/Program.cs | 0 .../Properties/launchSettings.json | 0 .../WebSites/StressTestWebSite/Startup.cs | 0 .../StressTestWebSite.csproj | 0 .../shared/SharedStartup/Startup.shared.cs | 0 .../WebSites/shared/WebSockets/Constants.cs | 0 .../shared/WebSockets/HandshakeHelpers.cs | 0 .../WebSites/shared/WebSockets/TestStartup.cs | 0 .../IISIntegration/test}/gtest/gtest.vcxproj | 0 .../tools}/GenerateNativeAssets.ps1 | 0 .../tools}/SetupTestEnvironment.ps1 | 0 .../tools}/UpdateIISExpressCertificate.ps1 | 0 .../IISIntegration/tools}/certificate.ps1 | 0 .../IISIntegration/tools}/httpsys.ps1 | 0 .../IISIntegration/tools}/installancm.ps1 | 0 .../IISIntegration/tools}/update_schema.ps1 | 0 .../IISIntegration/version.props | 0 test/gtest/googletest | 1 - 548 files changed, 1393 insertions(+), 2425 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .editorconfig delete mode 100644 .gitattributes delete mode 100644 .gitmodules delete mode 100644 .vsts-pipelines/builds/ci-internal-21.yml delete mode 100644 .vsts-pipelines/builds/ci-internal.yml delete mode 100644 .vsts-pipelines/builds/ci-public.yml delete mode 100644 .vsts-pipelines/templates/build-steps.yml delete mode 100644 CONTRIBUTING.md delete mode 100644 LICENSE.txt delete mode 100644 NuGet.config delete mode 100644 README.md delete mode 100644 THIRD_PARTY_NOTICES delete mode 100644 build.cmd delete mode 100755 build.sh delete mode 100644 korebuild-lock.txt delete mode 100644 run.cmd delete mode 100644 run.ps1 delete mode 100755 run.sh rename .gitignore => src/IISIntegration/.gitignore (100%) rename Directory.Build.props => src/IISIntegration/Directory.Build.props (100%) rename Directory.Build.targets => src/IISIntegration/Directory.Build.targets (100%) rename IISIntegration.NoV1.sln => src/IISIntegration/IISIntegration.NoV1.sln (100%) rename IISIntegration.sln => src/IISIntegration/IISIntegration.sln (100%) rename NuGetPackageVerifier.json => src/IISIntegration/NuGetPackageVerifier.json (100%) rename NuGetPackageVerifier.xplat.json => src/IISIntegration/NuGetPackageVerifier.xplat.json (100%) rename {benchmarks => src/IISIntegration/benchmarks}/IIS.Performance/FirstRequestConfig.cs (100%) rename {benchmarks => src/IISIntegration/benchmarks}/IIS.Performance/IIS.Performance.csproj (100%) rename {benchmarks => src/IISIntegration/benchmarks}/IIS.Performance/PlaintextBenchmark.cs (100%) rename {benchmarks => src/IISIntegration/benchmarks}/IIS.Performance/StartupTimeBenchmark.cs (100%) rename {build => src/IISIntegration/build}/Build.Settings (100%) rename {build => src/IISIntegration/build}/Config.Definitions.Props (100%) rename {build => src/IISIntegration/build}/Key.snk (100%) rename {build => src/IISIntegration/build}/applicationhost.config (100%) rename {build => src/IISIntegration/build}/applicationhost.iis.config (100%) rename {build => src/IISIntegration/build}/assets.props (100%) rename {build => src/IISIntegration/build}/buildpipeline/pipeline.groovy (96%) rename {build => src/IISIntegration/build}/buildpipeline/windows-appverif.groovy (100%) rename {build => src/IISIntegration/build}/buildpipeline/windows.groovy (98%) rename {build => src/IISIntegration/build}/dependencies.props (100%) rename {build => src/IISIntegration/build}/functional-test-assets.targets (100%) rename {build => src/IISIntegration/build}/launchSettings.json (100%) rename {build => src/IISIntegration/build}/native.targets (100%) rename {build => src/IISIntegration/build}/repo.props (100%) rename {build => src/IISIntegration/build}/repo.targets (100%) rename {build => src/IISIntegration/build}/sources.props (100%) rename {build => src/IISIntegration/build}/testsite.props (100%) rename korebuild.json => src/IISIntegration/korebuild.json (100%) rename {nuget => src/IISIntegration/nuget}/Microsoft.AspNetCore.AspNetCoreModule.nuspec (100%) rename {nuget => src/IISIntegration/nuget}/Microsoft.AspNetCore.AspNetCoreModule.props (100%) rename {nuget => src/IISIntegration/nuget}/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec (100%) rename {nuget => src/IISIntegration/nuget}/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in (100%) rename {samples => src/IISIntegration/samples}/IISSample/IISSample.csproj (100%) rename {samples => src/IISIntegration/samples}/IISSample/Properties/launchSettings.json (100%) rename {samples => src/IISIntegration/samples}/IISSample/Startup.cs (100%) rename {samples => src/IISIntegration/samples}/IISSample/web.config (100%) rename {samples => src/IISIntegration/samples}/NativeIISSample/NativeIISSample.csproj (100%) rename {samples => src/IISIntegration/samples}/NativeIISSample/Properties/launchSettings.json (100%) rename {samples => src/IISIntegration/samples}/NativeIISSample/Startup.cs (100%) rename {samples => src/IISIntegration/samples}/NativeIISSample/web.config (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/application.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/path.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/resource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/Source.def (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/resource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/application.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/main.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/path.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/IISLib.vcxproj (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/acache.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/acache.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/ahutil.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/ahutil.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/base64.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/base64.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/buffer.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/datetime.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/dbgutil.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/hashfn.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/hashtable.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/listentry.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/macros.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/multisz.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/multisz.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/multisza.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/multisza.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/ntassert.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/percpu.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/precomp.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/prime.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/pudebug.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/reftrace.c (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/reftrace.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/rwlock.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/stringa.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/stringa.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/stringu.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/stringu.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/tracelog.c (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/tracelog.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/treehash.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV1/IISLib/util.cxx (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj (98%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/ShimOptions.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/Source.def (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/ancm.mof (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/applicationinfo.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/applicationmanager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/dllmain.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/globalmodule.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/proxymodule.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/resource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/stdafx.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/AspNetCore/stdafx.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj (98%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/Environment.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/Environment.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/EventLog.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/EventLog.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/EventTracing.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/FileOutputManager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/HandleWrapper.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/IOutputManager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/NonCopyable.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/NullOutputManager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ResultException.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/StdWrapper.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/StringHelpers.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/application.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/config_utility.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/debugutil.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/debugutil.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/exceptions.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/file_utility.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/file_utility.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/fx_ver.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/fx_ver.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/hostfxroptions.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/iapplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/irequesthandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/requesthandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/resources.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/stdafx.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/stdafx.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/sttimer.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/CommonLib/targetver.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/DefaultRules.ruleset (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/IISLib.vcxproj (97%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/acache.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/acache.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/ahutil.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/ahutil.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/base64.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/base64.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/buffer.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/datetime.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/dbgutil.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/hashfn.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/hashtable.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/listentry.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/macros.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/multisz.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/multisz.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/multisza.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/multisza.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/ntassert.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/percpu.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/precomp.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/prime.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/reftrace.c (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/reftrace.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/rwlock.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/stringa.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/stringa.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/stringu.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/stringu.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/tracelog.c (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/tracelog.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/treehash.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/IISLib/util.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj (98%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/Source.def (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/resource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj (98%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h (100%) rename src/{ => IISIntegration/src}/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h (100%) rename src/{ => IISIntegration/src}/Directory.Build.props (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IIS/_._ (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs (100%) rename src/{ => IISIntegration/src}/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/AppHostConfig/IIS.config (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/AppOfflineTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/BasicAuthTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/ClientCertificateFixture.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/ClientCertificateTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/ClientDisconnectStress.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/CommonStartupTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/CompressionTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/ConfigurationChangeTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/CompressionTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/EventLogTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/FrebTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/HelloWorldTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/LogPipeTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/StartupTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/LogFileTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/MultiApplicationTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/PublishedSitesFixture.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/RequiresNewHandler.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/RequiresNewShim.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/ServerAbortTests.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/SkipIfNotAdminAttribute.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/SkipVSTSAttribute.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Utilities/AppVerifier.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Utilities/EventLogHelpers.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Utilities/Helpers.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Utilities/IISCapability.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Utilities/LogFileTestBase.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs (100%) rename {test => src/IISIntegration/test}/Common.FunctionalTests/WindowsAuthTests.cs (100%) rename {test => src/IISIntegration/test}/Common.Tests/Common.Tests.csproj (100%) rename {test => src/IISIntegration/test}/Common.Tests/Utilities/DisposableList.cs (100%) rename {test => src/IISIntegration/test}/Common.Tests/Utilities/TestConnections.cs (100%) rename {test => src/IISIntegration/test}/Common.Tests/Utilities/TimeoutExtensions.cs (100%) rename {test => src/IISIntegration/test}/CommonLibTests/CommonLibTests.vcxproj (100%) rename {test => src/IISIntegration/test}/CommonLibTests/ConfigUtilityTests.cpp (100%) rename {test => src/IISIntegration/test}/CommonLibTests/FileOutputManagerTests.cpp (100%) rename {test => src/IISIntegration/test}/CommonLibTests/GlobalVersionTests.cpp (100%) rename {test => src/IISIntegration/test}/CommonLibTests/Helpers.cpp (100%) rename {test => src/IISIntegration/test}/CommonLibTests/Helpers.h (100%) rename {test => src/IISIntegration/test}/CommonLibTests/NativeTests.targets (100%) rename {test => src/IISIntegration/test}/CommonLibTests/PipeOutputManagerTests.cpp (100%) rename {test => src/IISIntegration/test}/CommonLibTests/exception_handler_tests.cpp (100%) rename {test => src/IISIntegration/test}/CommonLibTests/fakeclasses.h (100%) rename {test => src/IISIntegration/test}/CommonLibTests/hostfxr_utility_tests.cpp (100%) rename {test => src/IISIntegration/test}/CommonLibTests/inprocess_application_tests.cpp (100%) rename {test => src/IISIntegration/test}/CommonLibTests/main.cpp (100%) rename {test => src/IISIntegration/test}/CommonLibTests/stdafx.h (100%) rename {test => src/IISIntegration/test}/CommonLibTests/utility_tests.cpp (100%) rename {test => src/IISIntegration/test}/Directory.Build.props (100%) rename {test => src/IISIntegration/test}/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs (100%) rename {test => src/IISIntegration/test}/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs (100%) rename {test => src/IISIntegration/test}/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj (100%) rename {test => src/IISIntegration/test}/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs (100%) rename {test => src/IISIntegration/test}/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs (100%) rename {test => src/IISIntegration/test}/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj (100%) rename {test => src/IISIntegration/test}/IIS.FunctionalTests/DeployerSelector.cs (100%) rename {test => src/IISIntegration/test}/IIS.FunctionalTests/IIS.FunctionalTests.csproj (100%) rename {test => src/IISIntegration/test}/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs (100%) rename {test => src/IISIntegration/test}/IIS.Shared.FunctionalTests/MofFileTests.cs (100%) rename {test => src/IISIntegration/test}/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs (100%) rename {test => src/IISIntegration/test}/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs (100%) rename {test => src/IISIntegration/test}/IIS.Shared.FunctionalTests/ServicesTests.cs (100%) rename {test => src/IISIntegration/test}/IIS.Tests/AppHostConfig/HostableWebCore.config (100%) rename {test => src/IISIntegration/test}/IIS.Tests/ClientDisconnectTests.cs (100%) rename {test => src/IISIntegration/test}/IIS.Tests/ConnectionIdFeatureTests.cs (100%) rename {test => src/IISIntegration/test}/IIS.Tests/HttpBodyControlFeatureTests.cs (100%) rename {test => src/IISIntegration/test}/IIS.Tests/IIS.Tests.csproj (100%) rename {test => src/IISIntegration/test}/IIS.Tests/ResponseAbortTests.cs (100%) rename {test => src/IISIntegration/test}/IIS.Tests/StrictTestServerTests.cs (100%) rename {test => src/IISIntegration/test}/IIS.Tests/TestServerTest.cs (100%) rename {test => src/IISIntegration/test}/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs (100%) rename {test => src/IISIntegration/test}/IIS.Tests/Utilities/TestServer.cs (100%) rename {test => src/IISIntegration/test}/IISExpress.FunctionalTests/DeployerSelector.cs (100%) rename {test => src/IISIntegration/test}/IISExpress.FunctionalTests/HttpsTests.cs (100%) rename {test => src/IISIntegration/test}/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj (100%) rename {test => src/IISIntegration/test}/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs (100%) rename {test => src/IISIntegration/test}/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs (100%) rename {test => src/IISIntegration/test}/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs (100%) rename {test => src/IISIntegration/test}/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs (100%) rename {test => src/IISIntegration/test}/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs (100%) rename {test => src/IISIntegration/test}/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs (100%) rename {test => src/IISIntegration/test}/IISExpress.FunctionalTests/RequiresIISAttribute.cs (100%) rename {test => src/IISIntegration/test}/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs (100%) rename {test => src/IISIntegration/test}/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs (100%) rename {test => src/IISIntegration/test}/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs (100%) rename {test => src/IISIntegration/test}/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj (100%) rename {test => src/IISIntegration/test}/TestTasks/InjectRequestHandler.cs (100%) rename {test => src/IISIntegration/test}/TestTasks/TestTasks.csproj (100%) rename {test => src/IISIntegration/test}/WebSites/Directory.Build.props (100%) rename {test => src/IISIntegration/test}/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj (100%) rename {test => src/IISIntegration/test}/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json (100%) rename {test => src/IISIntegration/test}/WebSites/InProcessWebSite/DummyServer.cs (100%) rename {test => src/IISIntegration/test}/WebSites/InProcessWebSite/InProcessWebSite.csproj (100%) rename {test => src/IISIntegration/test}/WebSites/InProcessWebSite/Program.cs (100%) rename {test => src/IISIntegration/test}/WebSites/InProcessWebSite/Properties/launchSettings.json (100%) rename {test => src/IISIntegration/test}/WebSites/InProcessWebSite/Startup.WebSockets.cs (100%) rename {test => src/IISIntegration/test}/WebSites/InProcessWebSite/Startup.cs (100%) rename {test => src/IISIntegration/test}/WebSites/InProcessWebSite/web.config (100%) rename {test => src/IISIntegration/test}/WebSites/InProcessWebSite/wwwroot/static.txt (100%) rename {test => src/IISIntegration/test}/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj (100%) rename {test => src/IISIntegration/test}/WebSites/OutOfProcessWebSite/Program.cs (100%) rename {test => src/IISIntegration/test}/WebSites/OutOfProcessWebSite/Properties/launchSettings.json (100%) rename {test => src/IISIntegration/test}/WebSites/OutOfProcessWebSite/Startup.cs (100%) rename {test => src/IISIntegration/test}/WebSites/OutOfProcessWebSite/wwwroot/static.txt (100%) rename {test => src/IISIntegration/test}/WebSites/StressTestWebSite/Program.cs (100%) rename {test => src/IISIntegration/test}/WebSites/StressTestWebSite/Properties/launchSettings.json (100%) rename {test => src/IISIntegration/test}/WebSites/StressTestWebSite/Startup.cs (100%) rename {test => src/IISIntegration/test}/WebSites/StressTestWebSite/StressTestWebSite.csproj (100%) rename {test => src/IISIntegration/test}/WebSites/shared/SharedStartup/Startup.shared.cs (100%) rename {test => src/IISIntegration/test}/WebSites/shared/WebSockets/Constants.cs (100%) rename {test => src/IISIntegration/test}/WebSites/shared/WebSockets/HandshakeHelpers.cs (100%) rename {test => src/IISIntegration/test}/WebSites/shared/WebSockets/TestStartup.cs (100%) rename {test => src/IISIntegration/test}/gtest/gtest.vcxproj (100%) rename {tools => src/IISIntegration/tools}/GenerateNativeAssets.ps1 (100%) rename {tools => src/IISIntegration/tools}/SetupTestEnvironment.ps1 (100%) rename {tools => src/IISIntegration/tools}/UpdateIISExpressCertificate.ps1 (100%) rename {tools => src/IISIntegration/tools}/certificate.ps1 (100%) rename {tools => src/IISIntegration/tools}/httpsys.ps1 (100%) rename {tools => src/IISIntegration/tools}/installancm.ps1 (100%) rename {tools => src/IISIntegration/tools}/update_schema.ps1 (100%) rename version.props => src/IISIntegration/version.props (100%) delete mode 160000 test/gtest/googletest diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 4894dc2fbb..0000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,27 +0,0 @@ -init: - # Reset dynamic port range from AppVeyor setting (1025-65535) to Windows default (49152-65535), - # to prevent conflicts with ANCM random ports (1025-48000). - - netsh int ipv4 show dynamicport tcp - - netsh int ipv4 set dynamic tcp start=49152 num=16384 - - netsh int ipv4 show dynamicport tcp - - - git config --global core.autocrlf true -branches: - only: - - master - - /^release\/.*$/ - - /^(.*\/)?ci-.*$/ -install: -- ps: .\tools\update_schema.ps1 -- git submodule update --init --recursive -- net start w3svc -build_script: - - ps: .\run.ps1 default-build /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISForwardsCompatibilityTests=true -clone_depth: 1 -environment: - global: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 -test: 'off' -deploy: 'off' -os: Visual Studio 2017 diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 17d90aec31..0000000000 --- a/.editorconfig +++ /dev/null @@ -1,24 +0,0 @@ -# EditorConfig is awesome:http://EditorConfig.org - -# top-most EditorConfig file -root = true - -[*] -indent_style = space -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.cs] -indent_size = 4 -dotnet_sort_system_directives_first = true:warning - -# Xml files -[*.{csproj,config,props,targets,ruleset,config,resx,xml}] -indent_size = 2 - -[*.{json, yml}] -indent_size = 2 - -[*.{ps1,sh}] -indent_size = 4 diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 204c7323a3..0000000000 --- a/.gitattributes +++ /dev/null @@ -1,53 +0,0 @@ -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain - -*.jpg binary -*.png binary -*.gif binary - -*.cs text=auto diff=csharp -*.vb text=auto -*.resx text=auto -*.c text=auto -*.cpp text=auto -*.cxx text=auto -*.h text=auto -*.hxx text=auto -*.py text=auto -*.rb text=auto -*.java text=auto -*.html text=auto -*.htm text=auto -*.css text=auto -*.scss text=auto -*.sass text=auto -*.less text=auto -*.js text=auto -*.lisp text=auto -*.clj text=auto -*.sql text=auto -*.php text=auto -*.lua text=auto -*.m text=auto -*.asm text=auto -*.erl text=auto -*.fs text=auto -*.fsx text=auto -*.hs text=auto -*.rc text=auto - -*.vcxproj text=auto -*.csproj text=auto -*.vbproj text=auto -*.fsproj text=auto -*.dbproj text=auto -*.sln text=auto eol=crlf -*.sh eol=lf diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 42ecc5d6c7..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "test/gtest/googletest"] - path = test/gtest/googletest - url = https://github.com/google/googletest diff --git a/.vsts-pipelines/builds/ci-internal-21.yml b/.vsts-pipelines/builds/ci-internal-21.yml deleted file mode 100644 index afb252eae8..0000000000 --- a/.vsts-pipelines/builds/ci-internal-21.yml +++ /dev/null @@ -1,30 +0,0 @@ -trigger: -- release/2.2 - -resources: - repositories: - - repository: buildtools - type: git - name: aspnet-BuildTools - ref: refs/heads/release/2.2 - -phases: -- template: .azure\templates\jobs\default-build.yml@buildtools - parameters: - agentOs: Windows - codeSign: false - buildArgs: /p:BuildServerIIS21=true /p:SkipIISExpressTests=true /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISForwardsCompatibilityTests=true - beforeBuild: - - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 SetupDumps" - displayName: Prepare repo - afterBuild: - - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown" - displayName: Stop AppVerifier - condition: always() - - task: PublishBuildArtifacts@1 - displayName: Upload logs - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - artifactName: logs - artifactType: Container - pathtoPublish: artifacts/logs \ No newline at end of file diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml deleted file mode 100644 index f0b1d1573d..0000000000 --- a/.vsts-pipelines/builds/ci-internal.yml +++ /dev/null @@ -1,13 +0,0 @@ -trigger: -- master -- release/* - -resources: - repositories: - - repository: buildtools - type: git - name: aspnet-BuildTools - ref: refs/heads/master - -phases: -- template: ../templates/build-steps.yml diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml deleted file mode 100644 index 448a5ed56d..0000000000 --- a/.vsts-pipelines/builds/ci-public.yml +++ /dev/null @@ -1,15 +0,0 @@ -trigger: -- master -- release/* - -# See https://github.com/aspnet/BuildTools -resources: - repositories: - - repository: buildtools - type: github - endpoint: DotNet-Bot GitHub Connection - name: aspnet/BuildTools - ref: refs/heads/master - -phases: -- template: ../templates/build-steps.yml diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml deleted file mode 100644 index 4db5633ddc..0000000000 --- a/.vsts-pipelines/templates/build-steps.yml +++ /dev/null @@ -1,88 +0,0 @@ -phases: -- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - parameters: - agentOs: Windows - phaseName: IIS_Express_Tests - buildArgs: /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISForwardsCompatibilityTests=true - beforeBuild: - - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup" - displayName: Prepare repo - afterBuild: - - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown" - displayName: Stop AppVerifier - condition: always() - - task: PublishBuildArtifacts@1 - displayName: Upload logs - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - artifactName: logs - artifactType: Container - pathtoPublish: artifacts/logs - -- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - parameters: - agentOs: Windows - phaseName: IIS_Tests - buildArgs: /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true - beforeBuild: - - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup" - displayName: Prepare repo - afterBuild: - - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown" - displayName: Stop AppVerifier - condition: always() - - task: PublishBuildArtifacts@1 - displayName: Upload logs - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - artifactName: logs - artifactType: Container - pathtoPublish: artifacts/logs - -- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - parameters: - agentOs: Windows - phaseName: IIS_BackCompat_Tests - buildArgs: /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true - beforeBuild: - - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup" - displayName: Prepare repo - afterBuild: - - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown" - displayName: Stop AppVerifier - condition: always() - - task: PublishBuildArtifacts@1 - displayName: Upload logs - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - artifactName: logs - artifactType: Container - pathtoPublish: artifacts/logs - -- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - parameters: - agentOs: Windows - phaseName: IIS_ForwardsCompat_Tests - buildArgs: /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISBackwardsCompatibilityTests=true - beforeBuild: - - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup" - displayName: Prepare repo - afterBuild: - - powershell: "& ./tools/SetupTestEnvironment.ps1 Shutdown" - displayName: Stop AppVerifier - condition: always() - - task: PublishBuildArtifacts@1 - displayName: Upload logs - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - artifactName: logs - artifactType: Container - pathtoPublish: artifacts/logs - -- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - parameters: - agentOs: macOS - -- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools - parameters: - agentOs: Linux diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index eac4268e4c..0000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,4 +0,0 @@ -Contributing -====== - -Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) in the Home repo. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 1508c66d70..0000000000 --- a/LICENSE.txt +++ /dev/null @@ -1,228 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright (c) .NET Foundation and Contributors - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - -========================= - -ASP.NET Core Module - -Copyright (c) .NET Foundation -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the ""Software""), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index e32bddfd51..0000000000 --- a/NuGet.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/README.md b/README.md deleted file mode 100644 index 217e6fe345..0000000000 --- a/README.md +++ /dev/null @@ -1,18 +0,0 @@ -ASP.NET Core IISIntegration -======== -This repo hosts the ASP.NET Core middleware for IIS integration and the ASP.NET Core Module. - -This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. - -## Building from source -1. Install prerequisites - 1. Visual Studio 2017 - 1. Workload: `Desktop development with C++` - 1. Run `run.ps1 install vs` or install the following components - 1. Additional Component: `Windows 8.1 SDK and UCRT SDK` - 2. Additional Component: `Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64]` - 2. Workload: `ASP.NET and web development` -2. Clone with submodules - 1. `git clone --recurse-submodules IISIntegration` - 2. OR run `git submodule update --init --recursive` after initial clone -3. `build.cmd` diff --git a/THIRD_PARTY_NOTICES b/THIRD_PARTY_NOTICES deleted file mode 100644 index 12e1c32746..0000000000 --- a/THIRD_PARTY_NOTICES +++ /dev/null @@ -1,42 +0,0 @@ -.NET Core uses third-party libraries or other resources that may be -distributed under licenses different than the .NET Core software. - -In the event that we accidentally failed to list a required notice, please -bring it to our attention. Post an issue or email us: - - dotnet@microsoft.com - -The attached notices are provided for information only. - - -License notice for googletest ------------------------------------- - -"Copyright 2008, Google Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." diff --git a/build.cmd b/build.cmd deleted file mode 100644 index c0050bda12..0000000000 --- a/build.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' default-build %*; exit $LASTEXITCODE" diff --git a/build.sh b/build.sh deleted file mode 100755 index 98a4b22765..0000000000 --- a/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs) -chmod +x "$DIR/run.sh"; sync -"$DIR/run.sh" default-build "$@" diff --git a/korebuild-lock.txt b/korebuild-lock.txt deleted file mode 100644 index 27b605e3c6..0000000000 --- a/korebuild-lock.txt +++ /dev/null @@ -1,2 +0,0 @@ -version:3.0.0-alpha1-20181011.11 -commithash:f57aa8ddda0abdd74ada55853587bedb4f364065 diff --git a/run.cmd b/run.cmd deleted file mode 100644 index d52d5c7e68..0000000000 --- a/run.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' %*; exit $LASTEXITCODE" diff --git a/run.ps1 b/run.ps1 deleted file mode 100644 index 34604c7175..0000000000 --- a/run.ps1 +++ /dev/null @@ -1,209 +0,0 @@ -#!/usr/bin/env powershell -#requires -version 4 - -<# -.SYNOPSIS -Executes KoreBuild commands. - -.DESCRIPTION -Downloads korebuild if required. Then executes the KoreBuild command. To see available commands, execute with `-Command help`. - -.PARAMETER Command -The KoreBuild command to run. - -.PARAMETER Path -The folder to build. Defaults to the folder containing this script. - -.PARAMETER Channel -The channel of KoreBuild to download. Overrides the value from the config file. - -.PARAMETER DotNetHome -The directory where .NET Core tools will be stored. - -.PARAMETER ToolsSource -The base url where build tools can be downloaded. Overrides the value from the config file. - -.PARAMETER Update -Updates KoreBuild to the latest version even if a lock file is present. - -.PARAMETER Reinstall -Re-installs KoreBuild - -.PARAMETER ConfigFile -The path to the configuration file that stores values. Defaults to korebuild.json. - -.PARAMETER ToolsSourceSuffix -The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores. - -.PARAMETER CI -Sets up CI specific settings and variables. - -.PARAMETER Arguments -Arguments to be passed to the command - -.NOTES -This function will create a file $PSScriptRoot/korebuild-lock.txt. This lock file can be committed to source, but does not have to be. -When the lockfile is not present, KoreBuild will create one using latest available version from $Channel. - -The $ConfigFile is expected to be an JSON file. It is optional, and the configuration values in it are optional as well. Any options set -in the file are overridden by command line parameters. - -.EXAMPLE -Example config file: -```json -{ - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", - "channel": "master", - "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" -} -``` -#> -[CmdletBinding(PositionalBinding = $false)] -param( - [Parameter(Mandatory = $true, Position = 0)] - [string]$Command, - [string]$Path = $PSScriptRoot, - [Alias('c')] - [string]$Channel, - [Alias('d')] - [string]$DotNetHome, - [Alias('s')] - [string]$ToolsSource, - [Alias('u')] - [switch]$Update, - [switch]$Reinstall, - [string]$ToolsSourceSuffix, - [string]$ConfigFile = $null, - [switch]$CI, - [Parameter(ValueFromRemainingArguments = $true)] - [string[]]$Arguments -) - -Set-StrictMode -Version 2 -$ErrorActionPreference = 'Stop' - -# -# Functions -# - -function Get-KoreBuild { - - $lockFile = Join-Path $Path 'korebuild-lock.txt' - - if (!(Test-Path $lockFile) -or $Update) { - Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile $ToolsSourceSuffix - } - - $version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1 - if (!$version) { - Write-Error "Failed to parse version from $lockFile. Expected a line that begins with 'version:'" - } - $version = $version.TrimStart('version:').Trim() - $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version) - - if ($Reinstall -and (Test-Path $korebuildPath)) { - Remove-Item -Force -Recurse $korebuildPath - } - - if (!(Test-Path $korebuildPath)) { - Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version" - New-Item -ItemType Directory -Path $korebuildPath | Out-Null - $remotePath = "$ToolsSource/korebuild/artifacts/$version/korebuild.$version.zip" - - try { - $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip" - Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix - if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) { - # Use built-in commands where possible as they are cross-plat compatible - Microsoft.PowerShell.Archive\Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath - } - else { - # Fallback to old approach for old installations of PowerShell - Add-Type -AssemblyName System.IO.Compression.FileSystem - [System.IO.Compression.ZipFile]::ExtractToDirectory($tmpfile, $korebuildPath) - } - } - catch { - Remove-Item -Recurse -Force $korebuildPath -ErrorAction Ignore - throw - } - finally { - Remove-Item $tmpfile -ErrorAction Ignore - } - } - - return $korebuildPath -} - -function Join-Paths([string]$path, [string[]]$childPaths) { - $childPaths | ForEach-Object { $path = Join-Path $path $_ } - return $path -} - -function Get-RemoteFile([string]$RemotePath, [string]$LocalPath, [string]$RemoteSuffix) { - if ($RemotePath -notlike 'http*') { - Copy-Item $RemotePath $LocalPath - return - } - - $retries = 10 - while ($retries -gt 0) { - $retries -= 1 - try { - Invoke-WebRequest -UseBasicParsing -Uri $($RemotePath + $RemoteSuffix) -OutFile $LocalPath - return - } - catch { - Write-Verbose "Request failed. $retries retries remaining" - } - } - - Write-Error "Download failed: '$RemotePath'." -} - -# -# Main -# - -# Load configuration or set defaults - -$Path = Resolve-Path $Path -if (!$ConfigFile) { $ConfigFile = Join-Path $Path 'korebuild.json' } - -if (Test-Path $ConfigFile) { - try { - $config = Get-Content -Raw -Encoding UTF8 -Path $ConfigFile | ConvertFrom-Json - if ($config) { - if (!($Channel) -and (Get-Member -Name 'channel' -InputObject $config)) { [string] $Channel = $config.channel } - if (!($ToolsSource) -and (Get-Member -Name 'toolsSource' -InputObject $config)) { [string] $ToolsSource = $config.toolsSource} - } - } - catch { - Write-Host -ForegroundColor Red $Error[0] - Write-Error "$ConfigFile contains invalid JSON." - exit 1 - } -} - -if (!$DotNetHome) { - $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } ` - elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} ` - elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}` - else { Join-Path $PSScriptRoot '.dotnet'} -} - -if (!$Channel) { $Channel = 'master' } -if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } - -# Execute - -$korebuildPath = Get-KoreBuild -Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') - -try { - Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI - Invoke-KoreBuildCommand $Command @Arguments -} -finally { - Remove-Module 'KoreBuild' -ErrorAction Ignore -} diff --git a/run.sh b/run.sh deleted file mode 100755 index 4c1fed5646..0000000000 --- a/run.sh +++ /dev/null @@ -1,256 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -# -# variables -# - -RESET="\033[0m" -RED="\033[0;31m" -YELLOW="\033[0;33m" -MAGENTA="\033[0;95m" -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" -verbose=false -update=false -reinstall=false -repo_path="$DIR" -channel='' -tools_source='' -tools_source_suffix='' -ci=false - -# -# Functions -# -__usage() { - echo "Usage: $(basename "${BASH_SOURCE[0]}") command [options] [[--] ...]" - echo "" - echo "Arguments:" - echo " command The command to be run." - echo " ... Arguments passed to the command. Variable number of arguments allowed." - echo "" - echo "Options:" - echo " --verbose Show verbose output." - echo " -c|--channel The channel of KoreBuild to download. Overrides the value from the config file.." - echo " --config-file The path to the configuration file that stores values. Defaults to korebuild.json." - echo " -d|--dotnet-home The directory where .NET Core tools will be stored. Defaults to '\$DOTNET_HOME' or '\$HOME/.dotnet." - echo " --path The directory to build. Defaults to the directory containing the script." - echo " -s|--tools-source|-ToolsSource The base url where build tools can be downloaded. Overrides the value from the config file." - echo " --tools-source-suffix|-ToolsSourceSuffix The suffix to append to tools-source. Useful for query strings." - echo " -u|--update Update to the latest KoreBuild even if the lock file is present." - echo " --reinstall Reinstall KoreBuild." - echo " --ci Apply CI specific settings and environment variables." - echo "" - echo "Description:" - echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be." - echo " When the lockfile is not present, KoreBuild will create one using latest available version from \$channel." - - if [[ "${1:-}" != '--no-exit' ]]; then - exit 2 - fi -} - -get_korebuild() { - local version - local lock_file="$repo_path/korebuild-lock.txt" - if [ ! -f "$lock_file" ] || [ "$update" = true ]; then - __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file" "$tools_source_suffix" - fi - version="$(grep 'version:*' -m 1 "$lock_file")" - if [[ "$version" == '' ]]; then - __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'" - return 1 - fi - version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" - local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version" - - if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then - rm -rf "$korebuild_path" - fi - - { - if [ ! -d "$korebuild_path" ]; then - mkdir -p "$korebuild_path" - local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip" - tmpfile="$(mktemp)" - echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}" - if __get_remote_file "$remote_path" "$tmpfile" "$tools_source_suffix"; then - unzip -q -d "$korebuild_path" "$tmpfile" - fi - rm "$tmpfile" || true - fi - - source "$korebuild_path/KoreBuild.sh" - } || { - if [ -d "$korebuild_path" ]; then - echo "Cleaning up after failed installation" - rm -rf "$korebuild_path" || true - fi - return 1 - } -} - -__error() { - echo -e "${RED}error: $*${RESET}" 1>&2 -} - -__warn() { - echo -e "${YELLOW}warning: $*${RESET}" -} - -__machine_has() { - hash "$1" > /dev/null 2>&1 - return $? -} - -__get_remote_file() { - local remote_path=$1 - local local_path=$2 - local remote_path_suffix=$3 - - if [[ "$remote_path" != 'http'* ]]; then - cp "$remote_path" "$local_path" - return 0 - fi - - local failed=false - if __machine_has wget; then - wget --tries 10 --quiet -O "$local_path" "${remote_path}${remote_path_suffix}" || failed=true - else - failed=true - fi - - if [ "$failed" = true ] && __machine_has curl; then - failed=false - curl --retry 10 -sSL -f --create-dirs -o "$local_path" "${remote_path}${remote_path_suffix}" || failed=true - fi - - if [ "$failed" = true ]; then - __error "Download failed: $remote_path" 1>&2 - return 1 - fi -} - -# -# main -# - -command="${1:-}" -shift - -while [[ $# -gt 0 ]]; do - case $1 in - -\?|-h|--help) - __usage --no-exit - exit 0 - ;; - -c|--channel|-Channel) - shift - channel="${1:-}" - [ -z "$channel" ] && __usage - ;; - --config-file|-ConfigFile) - shift - config_file="${1:-}" - [ -z "$config_file" ] && __usage - if [ ! -f "$config_file" ]; then - __error "Invalid value for --config-file. $config_file does not exist." - exit 1 - fi - ;; - -d|--dotnet-home|-DotNetHome) - shift - DOTNET_HOME="${1:-}" - [ -z "$DOTNET_HOME" ] && __usage - ;; - --path|-Path) - shift - repo_path="${1:-}" - [ -z "$repo_path" ] && __usage - ;; - -s|--tools-source|-ToolsSource) - shift - tools_source="${1:-}" - [ -z "$tools_source" ] && __usage - ;; - --tools-source-suffix|-ToolsSourceSuffix) - shift - tools_source_suffix="${1:-}" - [ -z "$tools_source_suffix" ] && __usage - ;; - -u|--update|-Update) - update=true - ;; - --reinstall|-[Rr]einstall) - reinstall=true - ;; - --ci|-[Cc][Ii]) - ci=true - ;; - --verbose|-Verbose) - verbose=true - ;; - --) - shift - break - ;; - *) - break - ;; - esac - shift -done - -if ! __machine_has unzip; then - __error 'Missing required command: unzip' - exit 1 -fi - -if ! __machine_has curl && ! __machine_has wget; then - __error 'Missing required command. Either wget or curl is required.' - exit 1 -fi - -[ -z "${config_file:-}" ] && config_file="$repo_path/korebuild.json" -if [ -f "$config_file" ]; then - if __machine_has jq ; then - if jq '.' "$config_file" >/dev/null ; then - config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" - config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - elif __machine_has python ; then - if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then - config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" - config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - elif __machine_has python3 ; then - if python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then - config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" - config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - else - __error 'Missing required command: jq or python. Could not parse the JSON file.' - exit 1 - fi - - [ ! -z "${config_channel:-}" ] && channel="$config_channel" - [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" -fi - -[ -z "$channel" ] && channel='master' -[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' - -get_korebuild -set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci" -invoke_korebuild_command "$command" "$@" diff --git a/.gitignore b/src/IISIntegration/.gitignore similarity index 100% rename from .gitignore rename to src/IISIntegration/.gitignore diff --git a/Directory.Build.props b/src/IISIntegration/Directory.Build.props similarity index 100% rename from Directory.Build.props rename to src/IISIntegration/Directory.Build.props diff --git a/Directory.Build.targets b/src/IISIntegration/Directory.Build.targets similarity index 100% rename from Directory.Build.targets rename to src/IISIntegration/Directory.Build.targets diff --git a/IISIntegration.NoV1.sln b/src/IISIntegration/IISIntegration.NoV1.sln similarity index 100% rename from IISIntegration.NoV1.sln rename to src/IISIntegration/IISIntegration.NoV1.sln diff --git a/IISIntegration.sln b/src/IISIntegration/IISIntegration.sln similarity index 100% rename from IISIntegration.sln rename to src/IISIntegration/IISIntegration.sln diff --git a/NuGetPackageVerifier.json b/src/IISIntegration/NuGetPackageVerifier.json similarity index 100% rename from NuGetPackageVerifier.json rename to src/IISIntegration/NuGetPackageVerifier.json diff --git a/NuGetPackageVerifier.xplat.json b/src/IISIntegration/NuGetPackageVerifier.xplat.json similarity index 100% rename from NuGetPackageVerifier.xplat.json rename to src/IISIntegration/NuGetPackageVerifier.xplat.json diff --git a/benchmarks/IIS.Performance/FirstRequestConfig.cs b/src/IISIntegration/benchmarks/IIS.Performance/FirstRequestConfig.cs similarity index 100% rename from benchmarks/IIS.Performance/FirstRequestConfig.cs rename to src/IISIntegration/benchmarks/IIS.Performance/FirstRequestConfig.cs diff --git a/benchmarks/IIS.Performance/IIS.Performance.csproj b/src/IISIntegration/benchmarks/IIS.Performance/IIS.Performance.csproj similarity index 100% rename from benchmarks/IIS.Performance/IIS.Performance.csproj rename to src/IISIntegration/benchmarks/IIS.Performance/IIS.Performance.csproj diff --git a/benchmarks/IIS.Performance/PlaintextBenchmark.cs b/src/IISIntegration/benchmarks/IIS.Performance/PlaintextBenchmark.cs similarity index 100% rename from benchmarks/IIS.Performance/PlaintextBenchmark.cs rename to src/IISIntegration/benchmarks/IIS.Performance/PlaintextBenchmark.cs diff --git a/benchmarks/IIS.Performance/StartupTimeBenchmark.cs b/src/IISIntegration/benchmarks/IIS.Performance/StartupTimeBenchmark.cs similarity index 100% rename from benchmarks/IIS.Performance/StartupTimeBenchmark.cs rename to src/IISIntegration/benchmarks/IIS.Performance/StartupTimeBenchmark.cs diff --git a/build/Build.Settings b/src/IISIntegration/build/Build.Settings similarity index 100% rename from build/Build.Settings rename to src/IISIntegration/build/Build.Settings diff --git a/build/Config.Definitions.Props b/src/IISIntegration/build/Config.Definitions.Props similarity index 100% rename from build/Config.Definitions.Props rename to src/IISIntegration/build/Config.Definitions.Props diff --git a/build/Key.snk b/src/IISIntegration/build/Key.snk similarity index 100% rename from build/Key.snk rename to src/IISIntegration/build/Key.snk diff --git a/build/applicationhost.config b/src/IISIntegration/build/applicationhost.config similarity index 100% rename from build/applicationhost.config rename to src/IISIntegration/build/applicationhost.config diff --git a/build/applicationhost.iis.config b/src/IISIntegration/build/applicationhost.iis.config similarity index 100% rename from build/applicationhost.iis.config rename to src/IISIntegration/build/applicationhost.iis.config diff --git a/build/assets.props b/src/IISIntegration/build/assets.props similarity index 100% rename from build/assets.props rename to src/IISIntegration/build/assets.props diff --git a/build/buildpipeline/pipeline.groovy b/src/IISIntegration/build/buildpipeline/pipeline.groovy similarity index 96% rename from build/buildpipeline/pipeline.groovy rename to src/IISIntegration/build/buildpipeline/pipeline.groovy index 7ccbca0b2a..13fd8d9add 100644 --- a/build/buildpipeline/pipeline.groovy +++ b/src/IISIntegration/build/buildpipeline/pipeline.groovy @@ -1,18 +1,18 @@ -import org.dotnet.ci.pipelines.Pipeline - -def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') - -def configurations = [ - 'Debug', - 'Release' -] - -configurations.each { configuration -> - - def params = [ - 'Configuration': configuration - ] - - windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params) - windowsPipeline.triggerPipelineOnGithubPush(params) -} +import org.dotnet.ci.pipelines.Pipeline + +def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') + +def configurations = [ + 'Debug', + 'Release' +] + +configurations.each { configuration -> + + def params = [ + 'Configuration': configuration + ] + + windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params) + windowsPipeline.triggerPipelineOnGithubPush(params) +} diff --git a/build/buildpipeline/windows-appverif.groovy b/src/IISIntegration/build/buildpipeline/windows-appverif.groovy similarity index 100% rename from build/buildpipeline/windows-appverif.groovy rename to src/IISIntegration/build/buildpipeline/windows-appverif.groovy diff --git a/build/buildpipeline/windows.groovy b/src/IISIntegration/build/buildpipeline/windows.groovy similarity index 98% rename from build/buildpipeline/windows.groovy rename to src/IISIntegration/build/buildpipeline/windows.groovy index e3efa6193f..c482e84079 100644 --- a/build/buildpipeline/windows.groovy +++ b/src/IISIntegration/build/buildpipeline/windows.groovy @@ -1,15 +1,15 @@ -@Library('dotnet-ci') _ - -// 'node' indicates to Jenkins that the enclosed block runs on a node that matches -// the label 'windows-with-vs' -simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { - stage ('Checking out source') { - checkout scm - bat 'git submodule update --init --recursive' - } - stage ('Build') { - def logFolder = getLogFolder() - def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" - bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISForwardsCompatibilityTests=true /p:Configuration=${params.Configuration}\";" - } -} +@Library('dotnet-ci') _ + +// 'node' indicates to Jenkins that the enclosed block runs on a node that matches +// the label 'windows-with-vs' +simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { + stage ('Checking out source') { + checkout scm + bat 'git submodule update --init --recursive' + } + stage ('Build') { + def logFolder = getLogFolder() + def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" + bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISForwardsCompatibilityTests=true /p:Configuration=${params.Configuration}\";" + } +} diff --git a/build/dependencies.props b/src/IISIntegration/build/dependencies.props similarity index 100% rename from build/dependencies.props rename to src/IISIntegration/build/dependencies.props diff --git a/build/functional-test-assets.targets b/src/IISIntegration/build/functional-test-assets.targets similarity index 100% rename from build/functional-test-assets.targets rename to src/IISIntegration/build/functional-test-assets.targets diff --git a/build/launchSettings.json b/src/IISIntegration/build/launchSettings.json similarity index 100% rename from build/launchSettings.json rename to src/IISIntegration/build/launchSettings.json diff --git a/build/native.targets b/src/IISIntegration/build/native.targets similarity index 100% rename from build/native.targets rename to src/IISIntegration/build/native.targets diff --git a/build/repo.props b/src/IISIntegration/build/repo.props similarity index 100% rename from build/repo.props rename to src/IISIntegration/build/repo.props diff --git a/build/repo.targets b/src/IISIntegration/build/repo.targets similarity index 100% rename from build/repo.targets rename to src/IISIntegration/build/repo.targets diff --git a/build/sources.props b/src/IISIntegration/build/sources.props similarity index 100% rename from build/sources.props rename to src/IISIntegration/build/sources.props diff --git a/build/testsite.props b/src/IISIntegration/build/testsite.props similarity index 100% rename from build/testsite.props rename to src/IISIntegration/build/testsite.props diff --git a/korebuild.json b/src/IISIntegration/korebuild.json similarity index 100% rename from korebuild.json rename to src/IISIntegration/korebuild.json diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec b/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec similarity index 100% rename from nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec rename to src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.nuspec diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props b/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.props similarity index 100% rename from nuget/Microsoft.AspNetCore.AspNetCoreModule.props rename to src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModule.props diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec b/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec similarity index 100% rename from nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec rename to src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.nuspec diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in b/src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in similarity index 100% rename from nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in rename to src/IISIntegration/nuget/Microsoft.AspNetCore.AspNetCoreModuleV2.props.in diff --git a/samples/IISSample/IISSample.csproj b/src/IISIntegration/samples/IISSample/IISSample.csproj similarity index 100% rename from samples/IISSample/IISSample.csproj rename to src/IISIntegration/samples/IISSample/IISSample.csproj diff --git a/samples/IISSample/Properties/launchSettings.json b/src/IISIntegration/samples/IISSample/Properties/launchSettings.json similarity index 100% rename from samples/IISSample/Properties/launchSettings.json rename to src/IISIntegration/samples/IISSample/Properties/launchSettings.json diff --git a/samples/IISSample/Startup.cs b/src/IISIntegration/samples/IISSample/Startup.cs similarity index 100% rename from samples/IISSample/Startup.cs rename to src/IISIntegration/samples/IISSample/Startup.cs diff --git a/samples/IISSample/web.config b/src/IISIntegration/samples/IISSample/web.config similarity index 100% rename from samples/IISSample/web.config rename to src/IISIntegration/samples/IISSample/web.config diff --git a/samples/NativeIISSample/NativeIISSample.csproj b/src/IISIntegration/samples/NativeIISSample/NativeIISSample.csproj similarity index 100% rename from samples/NativeIISSample/NativeIISSample.csproj rename to src/IISIntegration/samples/NativeIISSample/NativeIISSample.csproj diff --git a/samples/NativeIISSample/Properties/launchSettings.json b/src/IISIntegration/samples/NativeIISSample/Properties/launchSettings.json similarity index 100% rename from samples/NativeIISSample/Properties/launchSettings.json rename to src/IISIntegration/samples/NativeIISSample/Properties/launchSettings.json diff --git a/samples/NativeIISSample/Startup.cs b/src/IISIntegration/samples/NativeIISSample/Startup.cs similarity index 100% rename from samples/NativeIISSample/Startup.cs rename to src/IISIntegration/samples/NativeIISSample/Startup.cs diff --git a/samples/NativeIISSample/web.config b/src/IISIntegration/samples/NativeIISSample/web.config similarity index 100% rename from samples/NativeIISSample/web.config rename to src/IISIntegration/samples/NativeIISSample/web.config diff --git a/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/application.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/path.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/Source.def b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Source.def similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/Source.def rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Source.def diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc diff --git a/src/AspNetCoreModuleV1/AspNetCore/resource.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/resource.h similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/resource.h rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/resource.h diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/application.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/main.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/path.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx similarity index 100% rename from src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx diff --git a/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj diff --git a/src/AspNetCoreModuleV1/IISLib/acache.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.cxx similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/acache.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.cxx diff --git a/src/AspNetCoreModuleV1/IISLib/acache.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/acache.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.h diff --git a/src/AspNetCoreModuleV1/IISLib/ahutil.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.cpp similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/ahutil.cpp rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.cpp diff --git a/src/AspNetCoreModuleV1/IISLib/ahutil.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/ahutil.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.h diff --git a/src/AspNetCoreModuleV1/IISLib/base64.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.cpp similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/base64.cpp rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.cpp diff --git a/src/AspNetCoreModuleV1/IISLib/base64.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/base64.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.h diff --git a/src/AspNetCoreModuleV1/IISLib/buffer.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/buffer.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/buffer.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/buffer.h diff --git a/src/AspNetCoreModuleV1/IISLib/datetime.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/datetime.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/datetime.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/datetime.h diff --git a/src/AspNetCoreModuleV1/IISLib/dbgutil.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/dbgutil.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/dbgutil.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/dbgutil.h diff --git a/src/AspNetCoreModuleV1/IISLib/hashfn.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashfn.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/hashfn.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashfn.h diff --git a/src/AspNetCoreModuleV1/IISLib/hashtable.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashtable.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/hashtable.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashtable.h diff --git a/src/AspNetCoreModuleV1/IISLib/listentry.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/listentry.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/listentry.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/listentry.h diff --git a/src/AspNetCoreModuleV1/IISLib/macros.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/macros.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/macros.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/macros.h diff --git a/src/AspNetCoreModuleV1/IISLib/multisz.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.cpp similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/multisz.cpp rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.cpp diff --git a/src/AspNetCoreModuleV1/IISLib/multisz.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/multisz.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.h diff --git a/src/AspNetCoreModuleV1/IISLib/multisza.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.cpp similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/multisza.cpp rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.cpp diff --git a/src/AspNetCoreModuleV1/IISLib/multisza.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/multisza.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.h diff --git a/src/AspNetCoreModuleV1/IISLib/ntassert.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ntassert.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/ntassert.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ntassert.h diff --git a/src/AspNetCoreModuleV1/IISLib/percpu.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/percpu.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/percpu.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/percpu.h diff --git a/src/AspNetCoreModuleV1/IISLib/precomp.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/precomp.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/precomp.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/precomp.h diff --git a/src/AspNetCoreModuleV1/IISLib/prime.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/prime.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/prime.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/prime.h diff --git a/src/AspNetCoreModuleV1/IISLib/pudebug.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/pudebug.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/pudebug.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/pudebug.h diff --git a/src/AspNetCoreModuleV1/IISLib/reftrace.c b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.c similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/reftrace.c rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.c diff --git a/src/AspNetCoreModuleV1/IISLib/reftrace.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/reftrace.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.h diff --git a/src/AspNetCoreModuleV1/IISLib/rwlock.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/rwlock.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/rwlock.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/rwlock.h diff --git a/src/AspNetCoreModuleV1/IISLib/stringa.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.cpp similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/stringa.cpp rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.cpp diff --git a/src/AspNetCoreModuleV1/IISLib/stringa.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/stringa.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.h diff --git a/src/AspNetCoreModuleV1/IISLib/stringu.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.cpp similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/stringu.cpp rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.cpp diff --git a/src/AspNetCoreModuleV1/IISLib/stringu.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/stringu.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.h diff --git a/src/AspNetCoreModuleV1/IISLib/tracelog.c b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.c similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/tracelog.c rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.c diff --git a/src/AspNetCoreModuleV1/IISLib/tracelog.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/tracelog.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.h diff --git a/src/AspNetCoreModuleV1/IISLib/treehash.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/treehash.h similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/treehash.h rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/treehash.h diff --git a/src/AspNetCoreModuleV1/IISLib/util.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/util.cxx similarity index 100% rename from src/AspNetCoreModuleV1/IISLib/util.cxx rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/util.cxx diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineApplication.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AppOfflineHandler.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ApplicationFactory.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj similarity index 98% rename from src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index 4b2c6129e8..98c5920ed4 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -1,305 +1,305 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} - Win32Proj - AspNetCoreModule - AspNetCore - aspnetcorev2 - false - 10.0.15063.0 - - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - - Level4 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - stdafx.h - $(IntDir)$(TargetName).pch - ..\IISLib;.\Inc;..\CommonLib - ProgramDatabase - MultiThreadedDebug - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - Source.def - UseLinkTimeCodeGeneration - - - ..\Commonlib - - - - - Level4 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - stdafx.h - $(IntDir)$(TargetName).pch - ..\IISLib;.\Inc;..\CommonLib - ProgramDatabase - MultiThreadedDebug - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - Source.def - UseLinkTimeCodeGeneration - - - ..\Commonlib - - - - - Level4 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - ..\IISLib;.\Inc;..\CommonLib - stdafx.h - MultiThreaded - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - false - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - Source.def - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - UseLinkTimeCodeGeneration - - - ..\Commonlib - - - - - Level4 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) - stdafx.h - ..\IISLib;.\Inc;..\CommonLib - MultiThreaded - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - false - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - Source.def - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - UseLinkTimeCodeGeneration - - - ..\Commonlib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - {55494e58-e061-4c4c-a0a8-837008e72f85} - - - {09d9d1d6-2951-4e14-bc35-76a23cf9391a} - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - - - - - - true - - - true - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} + Win32Proj + AspNetCoreModule + AspNetCore + aspnetcorev2 + false + 10.0.15063.0 + + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + + Level4 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) + stdafx.h + $(IntDir)$(TargetName).pch + ..\IISLib;.\Inc;..\CommonLib + ProgramDatabase + MultiThreadedDebug + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + Source.def + UseLinkTimeCodeGeneration + + + ..\Commonlib + + + + + Level4 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) + stdafx.h + $(IntDir)$(TargetName).pch + ..\IISLib;.\Inc;..\CommonLib + ProgramDatabase + MultiThreadedDebug + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + Source.def + UseLinkTimeCodeGeneration + + + ..\Commonlib + + + + + Level4 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) + ..\IISLib;.\Inc;..\CommonLib + stdafx.h + MultiThreaded + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + false + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + Source.def + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + UseLinkTimeCodeGeneration + + + ..\Commonlib + + + + + Level4 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) + stdafx.h + ..\IISLib;.\Inc;..\CommonLib + MultiThreaded + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + false + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + Source.def + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + UseLinkTimeCodeGeneration + + + ..\Commonlib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {09d9d1d6-2951-4e14-bc35-76a23cf9391a} + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + + + + + + true + + + true + + + + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/DisconnectHandler.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc diff --git a/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm diff --git a/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm diff --git a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ShimOptions.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/Source.def b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Source.def similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/Source.def rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Source.def diff --git a/src/AspNetCoreModuleV2/AspNetCore/ancm.mof b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ancm.mof similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/ancm.mof rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ancm.mof diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationinfo.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/applicationmanager.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc diff --git a/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/dllmain.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/globalmodule.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/globalmodule.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/proxymodule.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/proxymodule.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/resource.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/resource.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/resource.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/resource.h diff --git a/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/stdafx.cpp diff --git a/src/AspNetCoreModuleV2/AspNetCore/stdafx.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/AspNetCore/stdafx.h rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/stdafx.h diff --git a/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/BaseOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj similarity index 98% rename from src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 0ddec2fcb1..2386dfc6ee 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -1,293 +1,293 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {55494E58-E061-4C4C-A0A8-837008E72F85} - Win32Proj - NewCommon - 10.0.15063.0 - - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - true - Unicode - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - false - Unicode - - - - - - - - - - - - - - - - - - - - - true - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - true - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - false - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - false - C:\AspNetCoreModule\src\IISLib;$(IncludePath) - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - - Use - Level4 - true - Disabled - false - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - true - MultiThreadedDebug - false - ProgramDatabase - ..\iislib; - true - stdcpp17 - stdafx.h - - - Windows - true - - - - - Use - Level4 - true - Disabled - false - _DEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - true - ProgramDatabase - false - MultiThreadedDebug - false - ..\iislib; - true - stdcpp17 - stdafx.h - - - Windows - true - - - - - Use - Level4 - true - MaxSpeed - true - true - false - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - true - MultiThreaded - false - ..\iislib; - true - stdcpp17 - stdafx.h - - - Windows - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - true - - - - - Use - Level4 - true - MaxSpeed - true - true - false - NDEBUG;_LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - true - ..\iislib; - true - - - MultiThreaded - false - stdcpp17 - stdafx.h - - - Windows - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - true - - - ..\iislib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - - - - - Document - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - mc %(FullPath) - Compiling Event Messages ... - %(Filename).rc;%(Filename).h;MSG0409.bin - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {55494E58-E061-4C4C-A0A8-837008E72F85} + Win32Proj + NewCommon + 10.0.15063.0 + + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + false + Unicode + + + + + + + + + + + + + + + + + + + + + true + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + true + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + false + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + false + C:\AspNetCoreModule\src\IISLib;$(IncludePath) + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + + Use + Level4 + true + Disabled + false + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + MultiThreadedDebug + false + ProgramDatabase + ..\iislib; + true + stdcpp17 + stdafx.h + + + Windows + true + + + + + Use + Level4 + true + Disabled + false + _DEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + ProgramDatabase + false + MultiThreadedDebug + false + ..\iislib; + true + stdcpp17 + stdafx.h + + + Windows + true + + + + + Use + Level4 + true + MaxSpeed + true + true + false + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + MultiThreaded + false + ..\iislib; + true + stdcpp17 + stdafx.h + + + Windows + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + true + + + + + Use + Level4 + true + MaxSpeed + true + true + false + NDEBUG;_LIB;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + true + ..\iislib; + true + + + MultiThreaded + false + stdcpp17 + stdafx.h + + + Windows + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + true + + + ..\iislib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + + + + Document + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + mc %(FullPath) + Compiling Event Messages ... + %(Filename).rc;%(Filename).h;MSG0409.bin + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationLoadException.h diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h diff --git a/src/AspNetCoreModuleV2/CommonLib/Environment.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/Environment.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/Environment.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/Environment.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/Environment.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/Environment.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/Environment.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/Environment.h diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/EventLog.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventLog.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/EventLog.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventLog.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/EventLog.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventLog.h diff --git a/src/AspNetCoreModuleV2/CommonLib/EventTracing.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventTracing.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/EventTracing.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/EventTracing.h diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/FileOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.h diff --git a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/HandleWrapper.h diff --git a/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/IOutputManager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/IOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/InvalidOperationException.h diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/LoggingHelpers.h diff --git a/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ModuleHelpers.h diff --git a/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/NonCopyable.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/NonCopyable.h diff --git a/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/NullOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/PipeOutputManager.h diff --git a/src/AspNetCoreModuleV2/CommonLib/ResultException.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ResultException.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ResultException.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ResultException.h diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWExclusiveLock.h diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWSharedLock.h diff --git a/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h diff --git a/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/StdWrapper.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StdWrapper.h diff --git a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/StringHelpers.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/StringHelpers.h diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.h diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSource.h diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/application.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/application.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/application.h diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc diff --git a/src/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/config_utility.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/config_utility.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/config_utility.h diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/debugutil.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/debugutil.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.h diff --git a/src/AspNetCoreModuleV2/CommonLib/exceptions.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/exceptions.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/exceptions.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/exceptions.h diff --git a/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/file_utility.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/file_utility.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/file_utility.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/file_utility.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/file_utility.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/file_utility.h diff --git a/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/fx_ver.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/fx_ver.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.h diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxroptions.h diff --git a/src/AspNetCoreModuleV2/CommonLib/iapplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/iapplication.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/iapplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/iapplication.h diff --git a/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/irequesthandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/irequesthandler.h diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/requesthandler.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/requesthandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/requesthandler.h diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/resources.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/resources.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/resources.h diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/stdafx.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/stdafx.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.h diff --git a/src/AspNetCoreModuleV2/CommonLib/sttimer.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/sttimer.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/sttimer.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/sttimer.h diff --git a/src/AspNetCoreModuleV2/CommonLib/targetver.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/targetver.h similarity index 100% rename from src/AspNetCoreModuleV2/CommonLib/targetver.h rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/targetver.h diff --git a/src/AspNetCoreModuleV2/DefaultRules.ruleset b/src/IISIntegration/src/AspNetCoreModuleV2/DefaultRules.ruleset similarity index 100% rename from src/AspNetCoreModuleV2/DefaultRules.ruleset rename to src/IISIntegration/src/AspNetCoreModuleV2/DefaultRules.ruleset diff --git a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj similarity index 97% rename from src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index 8a78b19664..15d4ef1317 100644 --- a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -1,206 +1,206 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {09D9D1D6-2951-4E14-BC35-76A23CF9391A} - Win32Proj - IISLib - IISLib - 10.0.15063.0 - - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - true - v141 - Unicode - - - StaticLibrary - false - v141 - true - Unicode - - - StaticLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - MultiThreadedDebug - false - true - true - - - Windows - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - MultiThreadedDebug - false - true - true - - - Windows - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - - - Windows - true - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - - - Windows - true - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {09D9D1D6-2951-4E14-BC35-76A23CF9391A} + Win32Proj + IISLib + IISLib + 10.0.15063.0 + + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + true + v141 + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + StaticLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + ProgramDatabase + MultiThreadedDebug + false + true + true + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + ProgramDatabase + MultiThreadedDebug + false + true + true + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + + + Windows + true + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + + + Windows + true + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/IISLib/acache.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/acache.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/acache.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/acache.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.h diff --git a/src/AspNetCoreModuleV2/IISLib/ahutil.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/ahutil.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/ahutil.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/ahutil.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.h diff --git a/src/AspNetCoreModuleV2/IISLib/base64.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/base64.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/base64.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/base64.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.h diff --git a/src/AspNetCoreModuleV2/IISLib/buffer.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/buffer.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/buffer.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/buffer.h diff --git a/src/AspNetCoreModuleV2/IISLib/datetime.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/datetime.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/datetime.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/datetime.h diff --git a/src/AspNetCoreModuleV2/IISLib/dbgutil.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/dbgutil.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/dbgutil.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/dbgutil.h diff --git a/src/AspNetCoreModuleV2/IISLib/hashfn.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashfn.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/hashfn.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashfn.h diff --git a/src/AspNetCoreModuleV2/IISLib/hashtable.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashtable.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/hashtable.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashtable.h diff --git a/src/AspNetCoreModuleV2/IISLib/listentry.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/listentry.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/listentry.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/listentry.h diff --git a/src/AspNetCoreModuleV2/IISLib/macros.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/macros.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/macros.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/macros.h diff --git a/src/AspNetCoreModuleV2/IISLib/multisz.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/multisz.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/multisz.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/multisz.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.h diff --git a/src/AspNetCoreModuleV2/IISLib/multisza.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/multisza.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/multisza.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/multisza.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.h diff --git a/src/AspNetCoreModuleV2/IISLib/ntassert.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ntassert.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/ntassert.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ntassert.h diff --git a/src/AspNetCoreModuleV2/IISLib/percpu.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/percpu.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/percpu.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/percpu.h diff --git a/src/AspNetCoreModuleV2/IISLib/precomp.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/precomp.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/precomp.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/precomp.h diff --git a/src/AspNetCoreModuleV2/IISLib/prime.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/prime.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/prime.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/prime.h diff --git a/src/AspNetCoreModuleV2/IISLib/reftrace.c b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.c similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/reftrace.c rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.c diff --git a/src/AspNetCoreModuleV2/IISLib/reftrace.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/reftrace.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.h diff --git a/src/AspNetCoreModuleV2/IISLib/rwlock.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/rwlock.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/rwlock.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/rwlock.h diff --git a/src/AspNetCoreModuleV2/IISLib/stringa.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/stringa.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/stringa.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/stringa.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.h diff --git a/src/AspNetCoreModuleV2/IISLib/stringu.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/stringu.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.cpp diff --git a/src/AspNetCoreModuleV2/IISLib/stringu.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/stringu.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.h diff --git a/src/AspNetCoreModuleV2/IISLib/tracelog.c b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.c similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/tracelog.c rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.c diff --git a/src/AspNetCoreModuleV2/IISLib/tracelog.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/tracelog.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.h diff --git a/src/AspNetCoreModuleV2/IISLib/treehash.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/treehash.h similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/treehash.h rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/treehash.h diff --git a/src/AspNetCoreModuleV2/IISLib/util.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/util.cpp similarity index 100% rename from src/AspNetCoreModuleV2/IISLib/util.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/util.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessApplicationBase.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj similarity index 98% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 5e3fe5c6c1..69435f32d6 100644 --- a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -1,276 +1,276 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {D57EA297-6DC2-4BC0-8C91-334863327863} - Win32Proj - InProcessRequestHandler - 10.0.15063.0 - InProcessRequestHandler - - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - - aspnetcorev2_inprocess - - - false - - - false - - - - Use - Level4 - Disabled - WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdafx.h - $(IntDir)$(TargetName).pch - ProgramDatabase - MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - stdcpp17 - stdafx.h - true - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - Source.def - UseLinkTimeCodeGeneration - - - - - Use - Level4 - Disabled - WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdafx.h - $(IntDir)$(TargetName).pch - ProgramDatabase - MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - stdcpp17 - stdafx.h - true - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - Source.def - UseLinkTimeCodeGeneration - - - - - Level4 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) - stdafx.h - MultiThreaded - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - stdcpp17 - stdafx.h - true - - - Windows - false - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - Source.def - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - UseLinkTimeCodeGeneration - - - - - Level4 - Use - MaxSpeed - true - true - NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdafx.h - MultiThreaded - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - stdcpp17 - stdafx.h - true - - - Windows - false - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - Source.def - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib - UseLinkTimeCodeGeneration - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - {55494e58-e061-4c4c-a0a8-837008e72f85} - - - {09d9d1d6-2951-4e14-bc35-76a23cf9391a} - - - {1533e271-f61b-441b-8b74-59fb61df0552} - - - - - - - - - true - - - - - - - + + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {D57EA297-6DC2-4BC0-8C91-334863327863} + Win32Proj + InProcessRequestHandler + 10.0.15063.0 + InProcessRequestHandler + + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + aspnetcorev2_inprocess + + + false + + + false + + + + Use + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + stdafx.h + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + stdcpp17 + stdafx.h + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + Source.def + UseLinkTimeCodeGeneration + + + + + Use + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + stdafx.h + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + stdcpp17 + stdafx.h + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + Source.def + UseLinkTimeCodeGeneration + + + + + Level4 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) + stdafx.h + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + stdcpp17 + stdafx.h + true + + + Windows + false + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + Source.def + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + UseLinkTimeCodeGeneration + + + + + Level4 + Use + MaxSpeed + true + true + NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + stdafx.h + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + stdcpp17 + stdafx.h + true + + + Windows + false + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + Source.def + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib + UseLinkTimeCodeGeneration + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {09d9d1d6-2951-4e14-bc35-76a23cf9391a} + + + {1533e271-f61b-441b-8b74-59fb61df0552} + + + + + + + + + true + + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionHandler.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/resource.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.cpp diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h b/src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h rename to src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/stdafx.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/HtmlResponses.rc diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj similarity index 98% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 7d29672fa0..ca2bc0f4aa 100644 --- a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -1,285 +1,285 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {7F87406C-A3C8-4139-A68D-E4C344294A67} - Win32Proj - OutOfProcessRequestHandler - 10.0.15063.0 - OutOfProcessRequestHandler - - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - - aspnetcorev2_outofprocess - - - false - - - false - - - - Use - Level4 - Disabled - WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdafx.h - $(IntDir)$(TargetName).pch - ProgramDatabase - MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib - Source.def - UseLinkTimeCodeGeneration - - - - - Use - Level4 - Disabled - WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdafx.h - $(IntDir)$(TargetName).pch - ProgramDatabase - MultiThreadedDebug - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - true - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib - Source.def - UseLinkTimeCodeGeneration - - - - - Level4 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) - stdafx.h - MultiThreaded - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - false - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - Source.def - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib - UseLinkTimeCodeGeneration - - - - - Level4 - Use - MaxSpeed - true - true - NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - stdafx.h - MultiThreaded - ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib - true - true - true - false - SyncCThrow - 8Bytes - true - false - true - CompileAsCpp - true - true - stdcpp17 - stdafx.h - - - Windows - false - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - Source.def - kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib - UseLinkTimeCodeGeneration - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - {55494e58-e061-4c4c-a0a8-837008e72f85} - - - {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} - - - {1533e271-f61b-441b-8b74-59fb61df0552} - - - - - - - - - true - - - - - - - + + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {7F87406C-A3C8-4139-A68D-E4C344294A67} + Win32Proj + OutOfProcessRequestHandler + 10.0.15063.0 + OutOfProcessRequestHandler + + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + aspnetcorev2_outofprocess + + + false + + + false + + + + Use + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + stdafx.h + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib + Source.def + UseLinkTimeCodeGeneration + + + + + Use + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + stdafx.h + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib + Source.def + UseLinkTimeCodeGeneration + + + + + Level4 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) + stdafx.h + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + false + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + Source.def + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib + UseLinkTimeCodeGeneration + + + + + Level4 + Use + MaxSpeed + true + true + NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + stdafx.h + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + true + stdcpp17 + stdafx.h + + + Windows + false + true + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + Source.def + kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib + UseLinkTimeCodeGeneration + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + + {1533e271-f61b-441b-8b74-59fb61df0552} + + + + + + + + + true + + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/protocolconfig.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/resource.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/stdafx.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h b/src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h similarity index 100% rename from src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h rename to src/IISIntegration/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h diff --git a/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/stdafx.h diff --git a/src/Directory.Build.props b/src/IISIntegration/src/Directory.Build.props similarity index 100% rename from src/Directory.Build.props rename to src/IISIntegration/src/Directory.Build.props diff --git a/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/DuplexStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/EmptyStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpRequestStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpResponseStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpStreamState.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/HttpUpgradeStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISConfigurationData.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Features.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpConnectionFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestIdentifierFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IHttpRequestLifetimeFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.IO.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.Log.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContextOfT.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISNativeApplication.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerAuthenticationHandler.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Flush.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Read.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.Write.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOOperation.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncWriteOperationBase.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/IAsyncIOEngine.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Initialize.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Read.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.Write.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/OutputProducer.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/ReadOnlyStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/Streams.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/ThrowingWasUpgradedWriteOnlyStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WrappingStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/WriteOnlyStream.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/CoreStrings.resx diff --git a/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/HttpContextExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IISServerDefaults.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IISServerOptions.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/IServerVariableFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Properties/CoreStrings.Designer.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.IIS/_._ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/_._ similarity index 100% rename from src/Microsoft.AspNetCore.Server.IIS/_._ rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/_._ diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.targets diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json similarity index 100% rename from src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ApplicationDeployerFactory.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Http.config diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameterExtensions.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentParameters.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeploymentResult.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISExpressDeployer.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/LoggingHandler.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/ProcessTracker.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/RetryHandler.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/XElementExtensions.cs diff --git a/test/Common.FunctionalTests/AppHostConfig/IIS.config b/src/IISIntegration/test/Common.FunctionalTests/AppHostConfig/IIS.config similarity index 100% rename from test/Common.FunctionalTests/AppHostConfig/IIS.config rename to src/IISIntegration/test/Common.FunctionalTests/AppHostConfig/IIS.config diff --git a/test/Common.FunctionalTests/AppOfflineTests.cs b/src/IISIntegration/test/Common.FunctionalTests/AppOfflineTests.cs similarity index 100% rename from test/Common.FunctionalTests/AppOfflineTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/AppOfflineTests.cs diff --git a/test/Common.FunctionalTests/BasicAuthTests.cs b/src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs similarity index 100% rename from test/Common.FunctionalTests/BasicAuthTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/BasicAuthTests.cs diff --git a/test/Common.FunctionalTests/ClientCertificateFixture.cs b/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateFixture.cs similarity index 100% rename from test/Common.FunctionalTests/ClientCertificateFixture.cs rename to src/IISIntegration/test/Common.FunctionalTests/ClientCertificateFixture.cs diff --git a/test/Common.FunctionalTests/ClientCertificateTests.cs b/src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs similarity index 100% rename from test/Common.FunctionalTests/ClientCertificateTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/ClientCertificateTests.cs diff --git a/test/Common.FunctionalTests/ClientDisconnectStress.cs b/src/IISIntegration/test/Common.FunctionalTests/ClientDisconnectStress.cs similarity index 100% rename from test/Common.FunctionalTests/ClientDisconnectStress.cs rename to src/IISIntegration/test/Common.FunctionalTests/ClientDisconnectStress.cs diff --git a/test/Common.FunctionalTests/CommonStartupTests.cs b/src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs similarity index 100% rename from test/Common.FunctionalTests/CommonStartupTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/CommonStartupTests.cs diff --git a/test/Common.FunctionalTests/CompressionTests.cs b/src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs similarity index 100% rename from test/Common.FunctionalTests/CompressionTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/CompressionTests.cs diff --git a/test/Common.FunctionalTests/ConfigurationChangeTests.cs b/src/IISIntegration/test/Common.FunctionalTests/ConfigurationChangeTests.cs similarity index 100% rename from test/Common.FunctionalTests/ConfigurationChangeTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/ConfigurationChangeTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/CompressionTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/CompressionTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/CompressionTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/CompressionTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/EventLogTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/EventLogTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/EventLogTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs diff --git a/test/Common.FunctionalTests/Inprocess/FrebTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/FrebTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/FrebTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/FrebTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/LogPipeTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs diff --git a/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/StartupTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs diff --git a/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs similarity index 100% rename from test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs diff --git a/test/Common.FunctionalTests/LogFileTests.cs b/src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs similarity index 100% rename from test/Common.FunctionalTests/LogFileTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/LogFileTests.cs diff --git a/test/Common.FunctionalTests/MultiApplicationTests.cs b/src/IISIntegration/test/Common.FunctionalTests/MultiApplicationTests.cs similarity index 100% rename from test/Common.FunctionalTests/MultiApplicationTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/MultiApplicationTests.cs diff --git a/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs b/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs similarity index 100% rename from test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs diff --git a/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs similarity index 100% rename from test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs diff --git a/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs similarity index 100% rename from test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs rename to src/IISIntegration/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs diff --git a/test/Common.FunctionalTests/PublishedSitesFixture.cs b/src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs similarity index 100% rename from test/Common.FunctionalTests/PublishedSitesFixture.cs rename to src/IISIntegration/test/Common.FunctionalTests/PublishedSitesFixture.cs diff --git a/test/Common.FunctionalTests/RequiresNewHandler.cs b/src/IISIntegration/test/Common.FunctionalTests/RequiresNewHandler.cs similarity index 100% rename from test/Common.FunctionalTests/RequiresNewHandler.cs rename to src/IISIntegration/test/Common.FunctionalTests/RequiresNewHandler.cs diff --git a/test/Common.FunctionalTests/RequiresNewShim.cs b/src/IISIntegration/test/Common.FunctionalTests/RequiresNewShim.cs similarity index 100% rename from test/Common.FunctionalTests/RequiresNewShim.cs rename to src/IISIntegration/test/Common.FunctionalTests/RequiresNewShim.cs diff --git a/test/Common.FunctionalTests/ServerAbortTests.cs b/src/IISIntegration/test/Common.FunctionalTests/ServerAbortTests.cs similarity index 100% rename from test/Common.FunctionalTests/ServerAbortTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/ServerAbortTests.cs diff --git a/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs b/src/IISIntegration/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs similarity index 100% rename from test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs rename to src/IISIntegration/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs diff --git a/test/Common.FunctionalTests/SkipVSTSAttribute.cs b/src/IISIntegration/test/Common.FunctionalTests/SkipVSTSAttribute.cs similarity index 100% rename from test/Common.FunctionalTests/SkipVSTSAttribute.cs rename to src/IISIntegration/test/Common.FunctionalTests/SkipVSTSAttribute.cs diff --git a/test/Common.FunctionalTests/Utilities/AppVerifier.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/AppVerifier.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/AppVerifier.cs rename to src/IISIntegration/test/Common.FunctionalTests/Utilities/AppVerifier.cs diff --git a/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/EventLogHelpers.cs rename to src/IISIntegration/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs rename to src/IISIntegration/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs diff --git a/test/Common.FunctionalTests/Utilities/Helpers.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/Helpers.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/Helpers.cs rename to src/IISIntegration/test/Common.FunctionalTests/Utilities/Helpers.cs diff --git a/test/Common.FunctionalTests/Utilities/IISCapability.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCapability.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/IISCapability.cs rename to src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCapability.cs diff --git a/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs rename to src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs diff --git a/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs rename to src/IISIntegration/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs diff --git a/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs rename to src/IISIntegration/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs diff --git a/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs rename to src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs diff --git a/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs rename to src/IISIntegration/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs diff --git a/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/LogFileTestBase.cs rename to src/IISIntegration/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs diff --git a/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs rename to src/IISIntegration/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs diff --git a/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs b/src/IISIntegration/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs similarity index 100% rename from test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs rename to src/IISIntegration/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs diff --git a/test/Common.FunctionalTests/WindowsAuthTests.cs b/src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs similarity index 100% rename from test/Common.FunctionalTests/WindowsAuthTests.cs rename to src/IISIntegration/test/Common.FunctionalTests/WindowsAuthTests.cs diff --git a/test/Common.Tests/Common.Tests.csproj b/src/IISIntegration/test/Common.Tests/Common.Tests.csproj similarity index 100% rename from test/Common.Tests/Common.Tests.csproj rename to src/IISIntegration/test/Common.Tests/Common.Tests.csproj diff --git a/test/Common.Tests/Utilities/DisposableList.cs b/src/IISIntegration/test/Common.Tests/Utilities/DisposableList.cs similarity index 100% rename from test/Common.Tests/Utilities/DisposableList.cs rename to src/IISIntegration/test/Common.Tests/Utilities/DisposableList.cs diff --git a/test/Common.Tests/Utilities/TestConnections.cs b/src/IISIntegration/test/Common.Tests/Utilities/TestConnections.cs similarity index 100% rename from test/Common.Tests/Utilities/TestConnections.cs rename to src/IISIntegration/test/Common.Tests/Utilities/TestConnections.cs diff --git a/test/Common.Tests/Utilities/TimeoutExtensions.cs b/src/IISIntegration/test/Common.Tests/Utilities/TimeoutExtensions.cs similarity index 100% rename from test/Common.Tests/Utilities/TimeoutExtensions.cs rename to src/IISIntegration/test/Common.Tests/Utilities/TimeoutExtensions.cs diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/src/IISIntegration/test/CommonLibTests/CommonLibTests.vcxproj similarity index 100% rename from test/CommonLibTests/CommonLibTests.vcxproj rename to src/IISIntegration/test/CommonLibTests/CommonLibTests.vcxproj diff --git a/test/CommonLibTests/ConfigUtilityTests.cpp b/src/IISIntegration/test/CommonLibTests/ConfigUtilityTests.cpp similarity index 100% rename from test/CommonLibTests/ConfigUtilityTests.cpp rename to src/IISIntegration/test/CommonLibTests/ConfigUtilityTests.cpp diff --git a/test/CommonLibTests/FileOutputManagerTests.cpp b/src/IISIntegration/test/CommonLibTests/FileOutputManagerTests.cpp similarity index 100% rename from test/CommonLibTests/FileOutputManagerTests.cpp rename to src/IISIntegration/test/CommonLibTests/FileOutputManagerTests.cpp diff --git a/test/CommonLibTests/GlobalVersionTests.cpp b/src/IISIntegration/test/CommonLibTests/GlobalVersionTests.cpp similarity index 100% rename from test/CommonLibTests/GlobalVersionTests.cpp rename to src/IISIntegration/test/CommonLibTests/GlobalVersionTests.cpp diff --git a/test/CommonLibTests/Helpers.cpp b/src/IISIntegration/test/CommonLibTests/Helpers.cpp similarity index 100% rename from test/CommonLibTests/Helpers.cpp rename to src/IISIntegration/test/CommonLibTests/Helpers.cpp diff --git a/test/CommonLibTests/Helpers.h b/src/IISIntegration/test/CommonLibTests/Helpers.h similarity index 100% rename from test/CommonLibTests/Helpers.h rename to src/IISIntegration/test/CommonLibTests/Helpers.h diff --git a/test/CommonLibTests/NativeTests.targets b/src/IISIntegration/test/CommonLibTests/NativeTests.targets similarity index 100% rename from test/CommonLibTests/NativeTests.targets rename to src/IISIntegration/test/CommonLibTests/NativeTests.targets diff --git a/test/CommonLibTests/PipeOutputManagerTests.cpp b/src/IISIntegration/test/CommonLibTests/PipeOutputManagerTests.cpp similarity index 100% rename from test/CommonLibTests/PipeOutputManagerTests.cpp rename to src/IISIntegration/test/CommonLibTests/PipeOutputManagerTests.cpp diff --git a/test/CommonLibTests/exception_handler_tests.cpp b/src/IISIntegration/test/CommonLibTests/exception_handler_tests.cpp similarity index 100% rename from test/CommonLibTests/exception_handler_tests.cpp rename to src/IISIntegration/test/CommonLibTests/exception_handler_tests.cpp diff --git a/test/CommonLibTests/fakeclasses.h b/src/IISIntegration/test/CommonLibTests/fakeclasses.h similarity index 100% rename from test/CommonLibTests/fakeclasses.h rename to src/IISIntegration/test/CommonLibTests/fakeclasses.h diff --git a/test/CommonLibTests/hostfxr_utility_tests.cpp b/src/IISIntegration/test/CommonLibTests/hostfxr_utility_tests.cpp similarity index 100% rename from test/CommonLibTests/hostfxr_utility_tests.cpp rename to src/IISIntegration/test/CommonLibTests/hostfxr_utility_tests.cpp diff --git a/test/CommonLibTests/inprocess_application_tests.cpp b/src/IISIntegration/test/CommonLibTests/inprocess_application_tests.cpp similarity index 100% rename from test/CommonLibTests/inprocess_application_tests.cpp rename to src/IISIntegration/test/CommonLibTests/inprocess_application_tests.cpp diff --git a/test/CommonLibTests/main.cpp b/src/IISIntegration/test/CommonLibTests/main.cpp similarity index 100% rename from test/CommonLibTests/main.cpp rename to src/IISIntegration/test/CommonLibTests/main.cpp diff --git a/test/CommonLibTests/stdafx.h b/src/IISIntegration/test/CommonLibTests/stdafx.h similarity index 100% rename from test/CommonLibTests/stdafx.h rename to src/IISIntegration/test/CommonLibTests/stdafx.h diff --git a/test/CommonLibTests/utility_tests.cpp b/src/IISIntegration/test/CommonLibTests/utility_tests.cpp similarity index 100% rename from test/CommonLibTests/utility_tests.cpp rename to src/IISIntegration/test/CommonLibTests/utility_tests.cpp diff --git a/test/Directory.Build.props b/src/IISIntegration/test/Directory.Build.props similarity index 100% rename from test/Directory.Build.props rename to src/IISIntegration/test/Directory.Build.props diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs b/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs similarity index 100% rename from test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs rename to src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs b/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs similarity index 100% rename from test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs rename to src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs diff --git a/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj similarity index 100% rename from test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj rename to src/IISIntegration/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj diff --git a/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs b/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs similarity index 100% rename from test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs rename to src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs diff --git a/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs b/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs similarity index 100% rename from test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs rename to src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs diff --git a/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj similarity index 100% rename from test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj rename to src/IISIntegration/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj diff --git a/test/IIS.FunctionalTests/DeployerSelector.cs b/src/IISIntegration/test/IIS.FunctionalTests/DeployerSelector.cs similarity index 100% rename from test/IIS.FunctionalTests/DeployerSelector.cs rename to src/IISIntegration/test/IIS.FunctionalTests/DeployerSelector.cs diff --git a/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj similarity index 100% rename from test/IIS.FunctionalTests/IIS.FunctionalTests.csproj rename to src/IISIntegration/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj diff --git a/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/src/IISIntegration/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs similarity index 100% rename from test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs rename to src/IISIntegration/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs diff --git a/test/IIS.Shared.FunctionalTests/MofFileTests.cs b/src/IISIntegration/test/IIS.Shared.FunctionalTests/MofFileTests.cs similarity index 100% rename from test/IIS.Shared.FunctionalTests/MofFileTests.cs rename to src/IISIntegration/test/IIS.Shared.FunctionalTests/MofFileTests.cs diff --git a/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs b/src/IISIntegration/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs similarity index 100% rename from test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs rename to src/IISIntegration/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs diff --git a/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs b/src/IISIntegration/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs similarity index 100% rename from test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs rename to src/IISIntegration/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs diff --git a/test/IIS.Shared.FunctionalTests/ServicesTests.cs b/src/IISIntegration/test/IIS.Shared.FunctionalTests/ServicesTests.cs similarity index 100% rename from test/IIS.Shared.FunctionalTests/ServicesTests.cs rename to src/IISIntegration/test/IIS.Shared.FunctionalTests/ServicesTests.cs diff --git a/test/IIS.Tests/AppHostConfig/HostableWebCore.config b/src/IISIntegration/test/IIS.Tests/AppHostConfig/HostableWebCore.config similarity index 100% rename from test/IIS.Tests/AppHostConfig/HostableWebCore.config rename to src/IISIntegration/test/IIS.Tests/AppHostConfig/HostableWebCore.config diff --git a/test/IIS.Tests/ClientDisconnectTests.cs b/src/IISIntegration/test/IIS.Tests/ClientDisconnectTests.cs similarity index 100% rename from test/IIS.Tests/ClientDisconnectTests.cs rename to src/IISIntegration/test/IIS.Tests/ClientDisconnectTests.cs diff --git a/test/IIS.Tests/ConnectionIdFeatureTests.cs b/src/IISIntegration/test/IIS.Tests/ConnectionIdFeatureTests.cs similarity index 100% rename from test/IIS.Tests/ConnectionIdFeatureTests.cs rename to src/IISIntegration/test/IIS.Tests/ConnectionIdFeatureTests.cs diff --git a/test/IIS.Tests/HttpBodyControlFeatureTests.cs b/src/IISIntegration/test/IIS.Tests/HttpBodyControlFeatureTests.cs similarity index 100% rename from test/IIS.Tests/HttpBodyControlFeatureTests.cs rename to src/IISIntegration/test/IIS.Tests/HttpBodyControlFeatureTests.cs diff --git a/test/IIS.Tests/IIS.Tests.csproj b/src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj similarity index 100% rename from test/IIS.Tests/IIS.Tests.csproj rename to src/IISIntegration/test/IIS.Tests/IIS.Tests.csproj diff --git a/test/IIS.Tests/ResponseAbortTests.cs b/src/IISIntegration/test/IIS.Tests/ResponseAbortTests.cs similarity index 100% rename from test/IIS.Tests/ResponseAbortTests.cs rename to src/IISIntegration/test/IIS.Tests/ResponseAbortTests.cs diff --git a/test/IIS.Tests/StrictTestServerTests.cs b/src/IISIntegration/test/IIS.Tests/StrictTestServerTests.cs similarity index 100% rename from test/IIS.Tests/StrictTestServerTests.cs rename to src/IISIntegration/test/IIS.Tests/StrictTestServerTests.cs diff --git a/test/IIS.Tests/TestServerTest.cs b/src/IISIntegration/test/IIS.Tests/TestServerTest.cs similarity index 100% rename from test/IIS.Tests/TestServerTest.cs rename to src/IISIntegration/test/IIS.Tests/TestServerTest.cs diff --git a/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs b/src/IISIntegration/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs similarity index 100% rename from test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs rename to src/IISIntegration/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs diff --git a/test/IIS.Tests/Utilities/TestServer.cs b/src/IISIntegration/test/IIS.Tests/Utilities/TestServer.cs similarity index 100% rename from test/IIS.Tests/Utilities/TestServer.cs rename to src/IISIntegration/test/IIS.Tests/Utilities/TestServer.cs diff --git a/test/IISExpress.FunctionalTests/DeployerSelector.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/DeployerSelector.cs similarity index 100% rename from test/IISExpress.FunctionalTests/DeployerSelector.cs rename to src/IISIntegration/test/IISExpress.FunctionalTests/DeployerSelector.cs diff --git a/test/IISExpress.FunctionalTests/HttpsTests.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/HttpsTests.cs rename to src/IISIntegration/test/IISExpress.FunctionalTests/HttpsTests.cs diff --git a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj similarity index 100% rename from test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj rename to src/IISIntegration/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj diff --git a/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs rename to src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs diff --git a/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs rename to src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs diff --git a/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs rename to src/IISIntegration/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs rename to src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs similarity index 100% rename from test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs rename to src/IISIntegration/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs diff --git a/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs similarity index 100% rename from test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs rename to src/IISIntegration/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs diff --git a/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs similarity index 100% rename from test/IISExpress.FunctionalTests/RequiresIISAttribute.cs rename to src/IISIntegration/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs diff --git a/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs b/src/IISIntegration/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs similarity index 100% rename from test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs rename to src/IISIntegration/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs rename to src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs rename to src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj similarity index 100% rename from test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj rename to src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj diff --git a/test/TestTasks/InjectRequestHandler.cs b/src/IISIntegration/test/TestTasks/InjectRequestHandler.cs similarity index 100% rename from test/TestTasks/InjectRequestHandler.cs rename to src/IISIntegration/test/TestTasks/InjectRequestHandler.cs diff --git a/test/TestTasks/TestTasks.csproj b/src/IISIntegration/test/TestTasks/TestTasks.csproj similarity index 100% rename from test/TestTasks/TestTasks.csproj rename to src/IISIntegration/test/TestTasks/TestTasks.csproj diff --git a/test/WebSites/Directory.Build.props b/src/IISIntegration/test/WebSites/Directory.Build.props similarity index 100% rename from test/WebSites/Directory.Build.props rename to src/IISIntegration/test/WebSites/Directory.Build.props diff --git a/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj similarity index 100% rename from test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj rename to src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/InProcessWebSite.csproj diff --git a/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json similarity index 100% rename from test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json rename to src/IISIntegration/test/WebSites/InProcessForwardsCompatWebSite/Properties/launchSettings.json diff --git a/test/WebSites/InProcessWebSite/DummyServer.cs b/src/IISIntegration/test/WebSites/InProcessWebSite/DummyServer.cs similarity index 100% rename from test/WebSites/InProcessWebSite/DummyServer.cs rename to src/IISIntegration/test/WebSites/InProcessWebSite/DummyServer.cs diff --git a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj b/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj similarity index 100% rename from test/WebSites/InProcessWebSite/InProcessWebSite.csproj rename to src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj diff --git a/test/WebSites/InProcessWebSite/Program.cs b/src/IISIntegration/test/WebSites/InProcessWebSite/Program.cs similarity index 100% rename from test/WebSites/InProcessWebSite/Program.cs rename to src/IISIntegration/test/WebSites/InProcessWebSite/Program.cs diff --git a/test/WebSites/InProcessWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/InProcessWebSite/Properties/launchSettings.json similarity index 100% rename from test/WebSites/InProcessWebSite/Properties/launchSettings.json rename to src/IISIntegration/test/WebSites/InProcessWebSite/Properties/launchSettings.json diff --git a/test/WebSites/InProcessWebSite/Startup.WebSockets.cs b/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.WebSockets.cs similarity index 100% rename from test/WebSites/InProcessWebSite/Startup.WebSockets.cs rename to src/IISIntegration/test/WebSites/InProcessWebSite/Startup.WebSockets.cs diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.cs similarity index 100% rename from test/WebSites/InProcessWebSite/Startup.cs rename to src/IISIntegration/test/WebSites/InProcessWebSite/Startup.cs diff --git a/test/WebSites/InProcessWebSite/web.config b/src/IISIntegration/test/WebSites/InProcessWebSite/web.config similarity index 100% rename from test/WebSites/InProcessWebSite/web.config rename to src/IISIntegration/test/WebSites/InProcessWebSite/web.config diff --git a/test/WebSites/InProcessWebSite/wwwroot/static.txt b/src/IISIntegration/test/WebSites/InProcessWebSite/wwwroot/static.txt similarity index 100% rename from test/WebSites/InProcessWebSite/wwwroot/static.txt rename to src/IISIntegration/test/WebSites/InProcessWebSite/wwwroot/static.txt diff --git a/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj similarity index 100% rename from test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj rename to src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj diff --git a/test/WebSites/OutOfProcessWebSite/Program.cs b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Program.cs similarity index 100% rename from test/WebSites/OutOfProcessWebSite/Program.cs rename to src/IISIntegration/test/WebSites/OutOfProcessWebSite/Program.cs diff --git a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json similarity index 100% rename from test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json rename to src/IISIntegration/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Startup.cs similarity index 100% rename from test/WebSites/OutOfProcessWebSite/Startup.cs rename to src/IISIntegration/test/WebSites/OutOfProcessWebSite/Startup.cs diff --git a/test/WebSites/OutOfProcessWebSite/wwwroot/static.txt b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/wwwroot/static.txt similarity index 100% rename from test/WebSites/OutOfProcessWebSite/wwwroot/static.txt rename to src/IISIntegration/test/WebSites/OutOfProcessWebSite/wwwroot/static.txt diff --git a/test/WebSites/StressTestWebSite/Program.cs b/src/IISIntegration/test/WebSites/StressTestWebSite/Program.cs similarity index 100% rename from test/WebSites/StressTestWebSite/Program.cs rename to src/IISIntegration/test/WebSites/StressTestWebSite/Program.cs diff --git a/test/WebSites/StressTestWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/StressTestWebSite/Properties/launchSettings.json similarity index 100% rename from test/WebSites/StressTestWebSite/Properties/launchSettings.json rename to src/IISIntegration/test/WebSites/StressTestWebSite/Properties/launchSettings.json diff --git a/test/WebSites/StressTestWebSite/Startup.cs b/src/IISIntegration/test/WebSites/StressTestWebSite/Startup.cs similarity index 100% rename from test/WebSites/StressTestWebSite/Startup.cs rename to src/IISIntegration/test/WebSites/StressTestWebSite/Startup.cs diff --git a/test/WebSites/StressTestWebSite/StressTestWebSite.csproj b/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj similarity index 100% rename from test/WebSites/StressTestWebSite/StressTestWebSite.csproj rename to src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj diff --git a/test/WebSites/shared/SharedStartup/Startup.shared.cs b/src/IISIntegration/test/WebSites/shared/SharedStartup/Startup.shared.cs similarity index 100% rename from test/WebSites/shared/SharedStartup/Startup.shared.cs rename to src/IISIntegration/test/WebSites/shared/SharedStartup/Startup.shared.cs diff --git a/test/WebSites/shared/WebSockets/Constants.cs b/src/IISIntegration/test/WebSites/shared/WebSockets/Constants.cs similarity index 100% rename from test/WebSites/shared/WebSockets/Constants.cs rename to src/IISIntegration/test/WebSites/shared/WebSockets/Constants.cs diff --git a/test/WebSites/shared/WebSockets/HandshakeHelpers.cs b/src/IISIntegration/test/WebSites/shared/WebSockets/HandshakeHelpers.cs similarity index 100% rename from test/WebSites/shared/WebSockets/HandshakeHelpers.cs rename to src/IISIntegration/test/WebSites/shared/WebSockets/HandshakeHelpers.cs diff --git a/test/WebSites/shared/WebSockets/TestStartup.cs b/src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs similarity index 100% rename from test/WebSites/shared/WebSockets/TestStartup.cs rename to src/IISIntegration/test/WebSites/shared/WebSockets/TestStartup.cs diff --git a/test/gtest/gtest.vcxproj b/src/IISIntegration/test/gtest/gtest.vcxproj similarity index 100% rename from test/gtest/gtest.vcxproj rename to src/IISIntegration/test/gtest/gtest.vcxproj diff --git a/tools/GenerateNativeAssets.ps1 b/src/IISIntegration/tools/GenerateNativeAssets.ps1 similarity index 100% rename from tools/GenerateNativeAssets.ps1 rename to src/IISIntegration/tools/GenerateNativeAssets.ps1 diff --git a/tools/SetupTestEnvironment.ps1 b/src/IISIntegration/tools/SetupTestEnvironment.ps1 similarity index 100% rename from tools/SetupTestEnvironment.ps1 rename to src/IISIntegration/tools/SetupTestEnvironment.ps1 diff --git a/tools/UpdateIISExpressCertificate.ps1 b/src/IISIntegration/tools/UpdateIISExpressCertificate.ps1 similarity index 100% rename from tools/UpdateIISExpressCertificate.ps1 rename to src/IISIntegration/tools/UpdateIISExpressCertificate.ps1 diff --git a/tools/certificate.ps1 b/src/IISIntegration/tools/certificate.ps1 similarity index 100% rename from tools/certificate.ps1 rename to src/IISIntegration/tools/certificate.ps1 diff --git a/tools/httpsys.ps1 b/src/IISIntegration/tools/httpsys.ps1 similarity index 100% rename from tools/httpsys.ps1 rename to src/IISIntegration/tools/httpsys.ps1 diff --git a/tools/installancm.ps1 b/src/IISIntegration/tools/installancm.ps1 similarity index 100% rename from tools/installancm.ps1 rename to src/IISIntegration/tools/installancm.ps1 diff --git a/tools/update_schema.ps1 b/src/IISIntegration/tools/update_schema.ps1 similarity index 100% rename from tools/update_schema.ps1 rename to src/IISIntegration/tools/update_schema.ps1 diff --git a/version.props b/src/IISIntegration/version.props similarity index 100% rename from version.props rename to src/IISIntegration/version.props diff --git a/test/gtest/googletest b/test/gtest/googletest deleted file mode 160000 index 4e4df226fc..0000000000 --- a/test/gtest/googletest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4e4df226fc197c0dda6e37f5c8c3845ca1e73a49